com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS Zend/zend_API.c Zend/zend_builtin_functions.c

Commit: 0f3977bc0fd31ee188ee50f44b130420812b93a9 Author: Dmitry Stogov <dmitry@zend.com> Thu, 29 Aug 2013 11:19:02 +0400 Parents: 94816ed9bfe16bd1507a1abc708793e41c06ad79 dfc6feb6e84f27094e6a2e3947caa094f7c35d26 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f3977bc0fd31ee188ee50f44b130420812b93a9 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien) Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien) Conflicts: NEWS Bugs: https://bugs.php.net/61759 Changed paths: MM NEWS MM Zend/zend_API.c MM Zend/zend_builtin_functions.c Diff: diff --cc NEWS index f695ada,6169cd0..86eb571 --- a/NEWS +++ b/NEWS @@@ -8,12 -9,24 +8,14 @@@ PH DTRACE_FUNCTION_*). (Chris Jones) . Fixed bug #65483 (quoted-printable encode stream filter incorrectly encoding spaces). (Michael M Slusarz) - . Fixed bug #65481 (shutdown segfault due to serialize) (Mike) - . Fixed bug #65470 (Segmentation fault in zend_error() with + . Fixed bug #65470 (Segmentation fault in zend_error() with --enable-dtrace). (Chris Jones, Kris Van Hees) - . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference - fails). (Laruence) - . Fixed bug #65304 (Use of max int in array_sum). (Laruence) - . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very - limited case). (Arpad) . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert) - . Improved fix for bug #63186 (compile failure on netbsd). (Matteo) . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van Hees) + . Fixed bug #61759 (class_alias() should accept classes with leading + backslashes). (Julien) - . Fixed bug #61345 (CGI mode - make install don't work). (Michael Heimpold) - . Cherry-picked some DTrace build commits (allowing builds on Linux, - bug #62691, and bug #63706) from PHP 5.5 branch - . Fixed bug #61268 (--enable-dtrace leads make to clobber - Zend/zend_dtrace.d) (Chris Jones) + . Fixed bug #46311 (Pointer aliasing issue results in miscompile on gcc4.4). + (Nikita Popov) - cURL: . Fixed bug #65458 (curl memory leak). (Adam)