Commit:    bd29ff7c38a14a0273329180c0e9f4d7a12e0d74
Author:    Stanislav Malyshev <s...@php.net>         Sun, 18 Aug 2013 15:44:40 
-0700
Parents:   265224778bc340b16087e60a52b4ca4a3acb5c01 
9973658a44090cbf67cb8a1d93f00d46a4330356
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=bd29ff7c38a14a0273329180c0e9f4d7a12e0d74

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

Bugs:
https://bugs.php.net/64802

Changed paths:
  MM  NEWS
  MM  ext/openssl/openssl.c


Diff:
diff --cc NEWS
index 948dcdc,1e4e0fb..71aca12
--- 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


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to