Merge branch 'pull-request/91' into PHP-5.4

* pull-request/91:
  Fixed bug #61964 (finfo_open with directory cause invalid free)

diff --cc NEWS
index 7f8704db7af20266032620d84192fae8e2ddec09,5f1146ac85dff1183c75bc5295b75ad12ef679c9..5d2d96c6733eb59f40392c63c6faf2efd56d4f19
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,105 -1,8 +1,109 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2012, PHP 5.3.15
 +?? ??? 2012, PHP 5.4.6
  
 -?? ??? 2012, PHP 5.3.14
 +- Core:
 +  . Fixed bug #62565 (Crashes due non-initialized internal properties_table).
 +    (Felipe)
 +
 +- CURL:
 +  . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false).
 +    (r.hampartsumyan@gmail.com, Laruence)
 +
 +- DateTime:
 +  . Fixed Bug #62500 (Segfault in DateInterval class when extended). (Laruence)
 +  
++- Fileinfo:
++  . Fixed bug #61964 (finfo_open with directory causes invalid free). 
++  (reeze.xia@gmail.com)
++
 +- Intl:
 +  . Fixed bug #62564 (Extending MessageFormatter and adding property causes 
 +    crash). (Felipe)
 +
 +- SimpleXML:
 +  . Implemented FR #55218 Get namespaces from current node. (Lonny)
 +
 +?? ??? 2012, PHP 5.4.5
 +
 +- Core:
 +  . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed 
 +    Salt). (Anthony Ferrara)
 +  . Fixed bug #62432 (ReflectionMethod random corrupt memory on high
 +    concurrent). (Johannes)
 +  . Fixed bug #62373 (serialize() generates wrong reference to the object).
 +    (Moriyoshi)
 +  . Fixed bug #62357 (compile failure: (S) Arguments missing for built-in
 +    function __memcmp). (Laruence)
 +  . Fixed bug #61998 (Using traits with method aliases appears to result in
 +    crash during execution). (Dmitry)
 +  . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that
 +    includes a semi-colon). (Pierrick)
 +  . Fixed potential overflow in _php_stream_scandir (CVE-2012-2688). 
 +    (Jason Powell, Stas)
 +
 +- EXIF:
 +  . Fixed information leak in ext exif (discovered by Martin Noga, 
 +    Matthew "j00ru" Jurczyk, Gynvael Coldwind)
 +
 +- FPM:
 +  . Fixed bug #62205 (php-fpm segfaults (null passed to strstr)). (fat)
 +  . Fixed bug #62160 (Add process.priority to set nice(2) priorities). (fat)
 +  . Fixed bug #62153 (when using unix sockets, multiples FPM instances
 +  . Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).
 +    (fat)
 +  . Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm). (fat)
 +  . Fixed bug #61835 (php-fpm is not allowed to run as root). (fat)
 +  . Fixed bug #61295 (php-fpm should not fail with commented 'user'
 +  . Fixed bug #61218 (FPM drops connection while receiving some binary values
 +    in FastCGI requests). (fat)
 +  . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
 +    for non-root start). (fat)
 +  . Fixed bug #61026 (FPM pools can listen on the same address). (fat)
 +    can be launched without errors). (fat)
 +
 +- Iconv:
 +  . Fix bug #55042 (Erealloc in iconv.c unsafe). (Stas)
 +
 +- Intl:
 +  . Fixed bug #62083 (grapheme_extract() memory leaks). (Gustavo)
 +  . ResourceBundle constructor now accepts NULL for the first two arguments.
 +    (Gustavo)
 +  . Fixed bug #62081 (IntlDateFormatter constructor leaks memory when called
 +    twice). (Gustavo)
 +  . Fixed bug #62070 (Collator::getSortKey() returns garbage). (Gustavo)
 +  . Fixed bug #62017 (datefmt_create with incorrectly encoded timezone leaks
 +    pattern). (Gustavo)
 +  . Fixed bug #60785 (memory leak in IntlDateFormatter constructor). (Gustavo)
 +
 +- JSON:
 +  . Fixed bug #61359 (json_encode() calls too many reallocs). (Stas)
 +
 +- libxml:
 +  . Fixed bug #62266 (Custom extension segfaults during xmlParseFile with FPM
 +    SAPI). (Gustavo)
 +
 +- Phar:
 +  . Fixed bug #62227 (Invalid phar stream path causes crash). (Felipe)
 +
 +- Readline:
 +  . Fixed bug #62186 (readline fails to compile - void function should not
 +    return a value). (Johannes)
 +
 +- Reflection:
 +  . Fixed bug #62384 (Attempting to invoke a Closure more than once causes 
 +    segfault). (Felipe)
 +  . Fixed bug #62202 (ReflectionParameter::getDefaultValue() memory leaks 
 +    with constant). (Laruence)
 +
 +- Sockets:
 +  . Fixed bug #62025 (__ss_family was changed on AIX 5.3). (Felipe)
 +    
 +- SPL:
 +  . Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to
 +    dot files). (Laruence)
 +  . Fixed bug #62262 (RecursiveArrayIterator does not implement Countable).
 +    (Nikita Popov)
  
  - XML Writer:
    . Fixed bug #62064 (memory leak in the XML Writer module).