Commit:    33db8c0ef6f46917349fbe07514a06f4f98bff85
Author:    Dmitry Stogov <dmi...@tpl2.home>         Mon, 3 Sep 2012 11:51:17 
+0400
Parents:   0ab27c35a47901173f22d9e50ca75de0263c45a5 
485c09a3765b900aea182ddd2dded2286fb0749a
Branches:  PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=33db8c0ef6f46917349fbe07514a06f4f98bff85

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).

Bugs:
https://bugs.php.net/50997

Changed paths:
  MM  NEWS
  MM  ext/soap/php_encoding.c


Diff:
diff --cc NEWS
index 6d79a94,a0e8a68..e09664a
--- a/NEWS
+++ b/NEWS
@@@ -80,121 -43,57 +80,125 @@@ PH
  
  - Session:
    . Fixed bug (segfault due to retval is not initialized). (Laruence)
 +  . Fixed bug (segfault due to PS(mod_user_implemented) not be reseted 
 +    when close handler call exit). (Laruence)
  
+ - SOAP
+   . Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a 
choice).
+     (Dmitry)
+ 
  - SPL:
 -  . Bug #62987 (Assigning to ArrayObject[null][something] overrides all 
 -    undefined variables). (Laruence)
    . Fixed bug #62904 (Crash when cloning an object which inherits 
SplFixedArray)
      (Laruence)
 +  . Implemented FR #62840 (Add sort flag to ArrayObject::ksort). (Laruence)
 +
 +- Standard:
 +  . Fixed bug #62836 (Seg fault or broken object references on unserialize()).
 +    (Laruence)
 +
 +- FPM:
 +  . Merged PR 121 by minitux to add support for slow request counting on PHP
 +    FPM status page. (Lars)
 +
 +16 Aug 2012, PHP 5.4.6
 +
 +- CLI Server:
 +  . Implemented FR #62700 (have the console output 'Listening on 
 +    http://localhost:8000'). (pascal.chev...@free.fr)
 +
 +- Core:
 +  . Fixed bug #62661 (Interactive php-cli crashes if include() is used in
 +    auto_prepend_file). (Laruence)
 +  . Fixed bug #62653: (unset($array[$float]) causes a crash). (Nikita Popov,
 +    Laruence)
 +  . Fixed bug #62565 (Crashes due non-initialized internal properties_table).
 +    (Felipe)
 +  . Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK
 +    with run-test.php). (Laruence)
 +
 +- CURL:
 +  . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false).
 +    (r.hampartsum...@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....@gmail.com)
 +
 +- Intl:
 +  . Fixed bug #62564 (Extending MessageFormatter and adding property causes 
 +    crash). (Felipe)
 +
 +- MySQLnd:
 +  . Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode). (Laruence)
 +
 +- readline:
 +  . Fixed bug #62612 (readline extension compilation fails with
 +    sapi/cli/cli.h: No such file). (Johannes)
 +
 +- Reflection:
 +  . Implemented FR #61602 (Allow access to name of constant used as default 
 +    value). (reeze....@gmail.com)
 +  
 +- SimpleXML:
 +  . Implemented FR #55218 Get namespaces from current node. (Lonny)
 +
 +- SPL:
    . Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance
      gives Segmentation fault). (Laruence, Gustavo)
 +  . Fixed bug #61527 (ArrayIterator gives misleading notice on next() when 
 +    moved to the end). (reeze....@gmail.com)
  
 -- Enchant:
 -  . Fixed bug #62838 (enchant_dict_quick_check() destroys zval, but fails to 
 -  initialize it). (Tony, Mateusz Goik).
 -
 -19 Jul 2012, PHP 5.3.15
 +- Streams:
 +  . Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS 
build).
 +    (Laruence)
  
 -- Zend Engine:
 -  . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that
 -    includes a semi-colon). (Pierrick)
 +- Zlib:
 +  . Fixed bug #55544 (ob_gzhandler always conflicts with
 +    zlib.output_compression). (Laruence)
  
 -- COM:
 -  . Fixed bug #62146 com_dotnet cannot be built shared. (Johannes)
 +19 Jul 2012, PHP 5.4.5
  
  - Core:
 -  . Fixed potential overflow in _php_stream_scandir, CVE-2012-2688. (Jason 
 -    Powell, Stas)
 -  . Fixed bug #62432 (ReflectionMethod random corrupt memory on high
 -    concurrent). (Johannes)
    . 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)
  
 -- Fileinfo:
 -  . Fixed magic file regex support. (Felipe)
 +- EXIF:
 +  . Fixed information leak in ext exif (discovered by Martin Noga, 
 +    Matthew "j00ru" Jurczyk, Gynvael Coldwind)
  
  - FPM:
 -  . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
 +  . 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)
 -  . Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).
 -    (fat)
 -  . Fixed bug #62153 (when using unix sockets, multiples FPM instances
      can be launched without errors). (fat)
 -  . Fixed bug #62160 (Add process.priority to set nice(2) priorities). (fat)
 -  . Fixed bug #61218 (FPM drops connection while receiving some binary values
 -    in FastCGI requests). (fat)
 -  . Fixed bug #62205 (php-fpm segfaults (null passed to strstr)). (fat)
 +
 +- Iconv:
 +  . Fix bug #55042 (Erealloc in iconv.c unsafe). (Stas)
  
  - Intl:
    . Fixed bug #62083 (grapheme_extract() memory leaks). (Gustavo)


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to