com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS
| From: | Adam Harvey | Date: | Fri, 02 May 2014 17:25:42 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77227@lists.php.net to get a copy of this message | ||
Commit: fbb0c4b8001bb6b57164d00337725aae9291cf44
Author: Adam Harvey <aharvey@php.net> Fri, 2 May 2014 10:25:42 -0700
Parents: 69b5ee61d029b5532cd47ccae6ab0546b6d53106 d8ff8f6f203a685dd831e3caf59c1729c74e7c40
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fbb0c4b8001bb6b57164d00337725aae9291cf44
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix author name on the #63228 patch.
Bugs:
https://bugs.php.net/63228
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index d0ce2f1,457b1e8..9b4f4e9
--- a/NEWS
+++ b/NEWS
@@@ -66,12 -73,9 +66,12 @@@ PH
- LDAP:
. Fixed issue with null bytes in LDAP bindings. (Matthew Daley)
-- mysqli:
- . Fixed problem in mysqli_commit()/mysqli_rollback() with second parameter
- (extra comma) and third parameters (lack of escaping). (Andrey)
+- litespeed
+ . Fixed bug #63228 (-Werror=format-security error in lsapi code).
- (George Wang)
++ (Elan Ruusamäe, George)
+
+- mysqlnd:
+ . Added a new fetching mode to mysqlnd. (Andrey)
- OpenSSL:
. Fix bug #66942 (memory leak in openssl_seal()). (Chuan Ma)