Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #67403 (Add signatureType to openssl_x509_parse)
  5.5.24 now

Conflicts:
	configure.in
	main/php_version.h

diff --cc NEWS
index fa788891462cfbcad46fe7866b4da6d27328125d,d326677ba79c28d1054eaad5de1f6f8e7b845ed8..0f86ea855279dfec5ff79076b6774d0fa28da099
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -33,14 -36,9 +33,15 @@@
    . Fixed bug #69038 (switch(SOMECONSTANT) misbehaves). (Laruence)
  
  - OpenSSL:
 -  . Fixed bugs #61285, #68329, #68046, #41631 (encrypted streams don't observe
 +  . Fixed bug #68912 (Segmentation fault at openssl_spki_new). (Laruence)
 +  . Fixed bug #61285, #68329, #68046, #41631 (encrypted streams don't observe
      socket timeouts). (Brad Broerman)
 -  . Fix bug #67403 (Add signatureType to openssl_x509_parse)
 +  . Fixed bug #68920 (use strict peer_fingerprint input checks)
 +    (Daniel Lowrey)
 +  . Fixed bug #68879 (IP Address fields in subjectAltNames not used)
 +    (Daniel Lowrey)
 +  . Fixed bug #68265 (SAN match fails with trailing DNS dot) (Daniel Lowrey)
++  . Fixed bug #67403 (Add signatureType to openssl_x509_parse) (Daniel Lowrey)
  
  - pgsql:
    . Fixed bug #68638 (pg_update() fails to store infinite values).

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