Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace

diff --cc NEWS
index 71aca12a15661bd6ea26c603c53135a21f4d3976,ff79a29bd7ce2180f420d26b6c0802acd2ebc8e8..d5d2cda7e4b3e3e07b2f852b2f6095f84002e934
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,23 -1,12 +1,25 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.19
 +?? ??? 2013, PHP 5.5.3
  
  - Core:
 -  . Fixed bug #65470 (Segmentation fault in zend_error() with 
++  . Fixed bug #65470 (Segmentation fault in zend_error() with
+     --enable-dtrace). (Chris Jones)
 +  . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
 +  . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van Hees)
 +
 +- Openssl:
 +  . Fixed bug #64802 (openssl_x509_parse fails to parse subject properly in
 +    some cases). (Mark Jones)
 +
 +15 Aug 2013, PHP 5.5.2
 +
 +- Core:
    . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
      fails). (Laruence)
 +  . Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was
 +    erroneously set to FILTER_SANITIZE_SPECIAL_CHARS value). (Andrey
 +    avp200681 gmail com).
    . 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)

diff --cc Zend/zend.c
Simple merge