com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/openssl/openssl.c
| From: | Daniel Lowrey | Date: | Thu, 05 Mar 2015 17:21:32 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85264@lists.php.net to get a copy of this message | ||
Commit: 5939de35a8fc6b439c8a60db02a5181a386edaa0
Author: Daniel Lowrey <rdlowrey@php.net> Thu, 5 Mar 2015 10:21:32 -0700
Parents: e8e5913e5e3500d2efee4a60fdfd77ab46fe2021 94140afa69e334405688d3cb09a47c07aeaef825
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5939de35a8fc6b439c8a60db02a5181a386edaa0
Log:
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
Bugs:
https://bugs.php.net/67403
Changed paths:
MM NEWS
MM ext/openssl/openssl.c
Diff:
diff --cc NEWS
index fa78889,d326677..0f86ea8
--- 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).