Commit:    d24ac6953ec8ca147243363eeacc8772d265b6cc
Author:    Xinchen Hui <larue...@php.net>         Sun, 24 Feb 2013 12:58:39 
+0800
Parents:   064c62e4cf078cf08a40478dfe0e64bd51789e57 
1b58bd39a637e9ec4ea9e95903b74aefdbd1b596
Branches:  PHP-5.4

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

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

Conflicts:
        ext/spl/spl_fixedarray.c

Changed paths:
  MM  NEWS
  MM  ext/spl/spl_fixedarray.c


Diff:
diff --cc NEWS
index d8df7b6,a298c55..0c4d786
--- a/NEWS
+++ b/NEWS
@@@ -1,62 -1,25 +1,63 @@@
  PHP                                                                        
NEWS
  
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.3.23
 +?? ??? 2012, PHP 5.4.13
 +
 +- Core:
 +  . Fixed bug #64235 (Insteadof not work for class method in 5.4.11).
 +    (Laruence)
 +  . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell)
 +  . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi)
 +  . Fixed bug #64070 (Inheritance with Traits failed with error). (Dmitry)
 +
 +- CLI server:
 +  . Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi)
 +
 +- Mbstring:
 +  . mb_split() can now handle empty matches like preg_split() does. 
(Moriyoshi)
 +
 +- OpenSSL:
 +  . Fixed bug #61930 (openssl corrupts ssl key resource when using 
 +    openssl_get_publickey()). (Stas)
 +
 +- PDO_mysql:
 +  . Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs).
 +    (Johannes)
  
  - SPL:
+   . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence)
    . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
      (patch by kr...@krizalys.com, Laruence)
 +  . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended). 
 +    (Nikita Popov)
  
 -21 Feb 2013, PHP 5.3.22
 +- SNMP:
 +  . Fixed bug #64124 (IPv6 malformed). (Boris Lytochkin)
  
 -- Zend Engine:
 -  . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). 
(Johannes)
 -  . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence)
 +?? ??? 2012, PHP 5.4.12
  
 -- Core
 +- Core:
 +  . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). 
(Johannes)
 +  . Fixed bug #64011 (get_html_translation_table() output incomplete with
 +    HTML_ENTITIES and ISO-8859-1). (Gustavo)
 +  . Fixed bug #63982 (isset() inconsistently produces a fatal error on
 +    protected property). (Stas)
    . Fixed bug #63943 (Bad warning text from strpos() on empty needle).
      (Laruence)
 +  . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence)
 +  . Fixed bug #63893 (Poor efficiency of strtr() using array with keys of very
 +    different length). (Gustavo)
 +  . Fixed bug #63882 (zend_std_compare_objects crash on recursion). (Dmitry)
 +  . Fixed bug #63462 (Magic methods called twice for unset protected 
 +    properties). (Stas)
 +  . Fixed bug #62524 (fopen follows redirects for non-3xx statuses). 
 +    (Wes Mason) 
 +  . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars)
  
  - Date:
 -  . Fixed bug #55397 (comparsion of incomplete DateTime causes SIGSEGV).
 -    (Laruence, Derick)
 +  . Fixed bug #63699 (Performance improvements for various ext/date 
functions).
 +    (Lars, original patch by njaguar at gmail dot com)
 +  . Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. 
 +    (Derick)
  
  - FPM:
    . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam)


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

Reply via email to