From: Stanislav Malyshev <stas@php.net>
Date: Sun, 8 Jun 2014 21:18:24 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.14RC1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4946dc1ab98f93f53c741bf6630b5265138891ef;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Added support for parsing ssl certificates using GeneralizedTime format.
---

4946dc1ab98f93f53c741bf6630b5265138891ef
diff --cc NEWS
index 8a1a34930a,7354aa9dba..50e6bdbc76
--- a/NEWS
+++ b/NEWS
@@@ -14,16 -13,16 +13,21 @@@ PH
    . Fixed regression in fix for bug #67118 (constructor can't be called twice).
      (Remi)
  
- 
  - Fileinfo:
 -  . Fixed bug #67326 (fileinfo: cdf_read_short_sector insufficient boundary 
 -    check). 
 +  . Fixed bug #67326 (fileinfo: cdf_read_short_sector insufficient boundary check).
 +
 +- OPCache:
 +  . Fixed issue #183 (TMP_VAR is not only used once). (Dmitry, Laruence)
  
+ - OpenSSL:
 -  . Fixed bug #65698 (certificates validity parsing does not work past 2050). 
++  . Fixed bug #65698 (certificates validity parsing does not work past 2050).
+     (Paul Oehler)
 -  . Fixed bug #66636 (openssl_x509_parse warning with V_ASN1_GENERALIZEDTIME). 
++  . Fixed bug #66636 (openssl_x509_parse warning with V_ASN1_GENERALIZEDTIME).
+     (Paul Oehler)
+ 
 +- PDO-ODBC:
 +  . Fixed bug #50444 (PDO-ODBC changes for 64-bit).
 +
  - SPL:
    . Fixed bug #67359 (Segfault in recursiveDirectoryIterator). (Laruence)
    . Fixed bug #67360 (Missing element after ArrayObject::getIterator). (Adam)