From: Daniel Lowrey <rdlowrey@php.net>
Date: Thu, 5 Mar 2015 17:21:32 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.7RC1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5939de35a8fc6b439c8a60db02a5181a386edaa0;p=php

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

5939de35a8fc6b439c8a60db02a5181a386edaa0
diff --cc NEWS
index fa78889146,d326677ba7..0f86ea8552
--- a/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).