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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix for php bug #64802 includes test case

Conflicts:
	ext/openssl/openssl.c
---

bd29ff7c38a14a0273329180c0e9f4d7a12e0d74
diff --cc NEWS
index 948dcdc50d,1e4e0fb9bb..71aca12a15
--- a/NEWS
+++ b/NEWS
@@@ -1,13 -1,6 +1,16 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.19
 +?? ??? 2013, PHP 5.5.3
 +
 +- Core:
 +  . 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