From: Stanislav Malyshev <stas@php.net>
Date: Mon, 19 Aug 2013 00:22:50 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~21^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcf785fb6667194ff70ef6f903189a495c15eb40;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

bcf785fb6667194ff70ef6f903189a495c15eb40
diff --cc NEWS
index 71aca12a15,ff79a29bd7..d5d2cda7e4
--- a/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)