From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 29 Aug 2013 07:19:02 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~230^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f3977bc0fd31ee188ee50f44b130420812b93a9;p=php

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
---

0f3977bc0fd31ee188ee50f44b130420812b93a9
diff --cc NEWS
index f695ada3df,6169cd0902..86eb571210
--- 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)