Merge branch 'PHP-5.4' into PHP-5.5

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

diff --cc NEWS
index 8a1a34930a609b54409ad590fb54e12bbb8a47ae,7354aa9dba97b56bb751767f30ad0b3a7d0104a9..50e6bdbc7668b3778a7b3736a5b24bdc69b6c471
--- 1/NEWS
--- 2/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)
  
 -  . Fixed bug #65698 (certificates validity parsing does not work past 2050). 
+ - OpenSSL:
 -  . Fixed bug #66636 (openssl_x509_parse warning with V_ASN1_GENERALIZEDTIME). 
++  . Fixed bug #65698 (certificates validity parsing does not work past 2050).
+     (Paul Oehler)
++  . 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)

diff --cc ext/openssl/openssl.c
Simple merge