com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/openssl/xp_ssl.c
| From: | rdlowrey@php.net | Date: | Tue, 09 Sep 2014 16:24:40 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81479@lists.php.net to get a copy of this message | ||
Commit: edb27993336545409d73335f3ac96d5895be13de
Author: Daniel Lowrey <rdlowrey@php.net> Tue, 9 Sep 2014 10:24:40 -0600
Parents: da7c87e2f873b7ef6f9f97b5e2cce8a34589a507 bf2f80b22356cd93748dd7551dfa0b54fb53e5b5
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=edb27993336545409d73335f3ac96d5895be13de
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Bug #41631: Fix regression from first attempt (6569db8)
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Bugs:
https://bugs.php.net/41631
https://bugs.php.net/67965
Changed paths:
MM NEWS
MM ext/openssl/xp_ssl.c
Diff:
diff --cc NEWS
index 67f8630,ba6eaaa..23f6bb2
--- a/NEWS
+++ b/NEWS
@@@ -13,33 -6,6 +13,35 @@@ PH
. Fixed bug #67985 (Incorrect last used array index copied to new array after
unset). (Tjerk)
+- Fileinfo:
+ . Fixed bug #67731 (finfo::file() returns invalid mime type
+ for binary files). (Anatol)
+
+- GD:
+ . Made fontFetch's path parser thread-safe. (Sara)
+
+- GMP:
+ . Fixed bug #67917 (Using GMP objects with overloaded operators can cause
+ memory exhaustion). (Nikita)
+ . Fixed bug #50175 (gmp_init() results 0 on given base and number starting
+ with 0x or 0b). (Nikita)
+ . Implemented gmp_import() and gmp_export(). (Leigh, Nikita)
+
+- MySQLi:
+ . Fixed bug #67839 (mysqli does not handle 4-byte floats correctly). (Keyur)
+
+- OpenSSL:
++ . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads).
++ (Daniel Lowrey)
+ . Fixed bug #67850 (extension won't build if openssl compiled without SSLv3).
+ (Daniel Lowrey)
+
+- DOM:
+ . Made DOMNode::textContent writeable. (Tjerk)
+
+- SOAP:
+ . Fixed bug #67955 (SoapClient prepends 0-byte to cookie names). (Philip Hofstetter)
+
- Session:
. Fixed bug #67972 (SessionHandler Invalid memory read create_sid()). (Adam)