com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS
| From: | Tjerk Anne Meesters | Date: | Fri, 06 Mar 2015 12:58:20 +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-85290@lists.php.net to get a copy of this message | ||
Commit: 469b5a9584b1647fdccb37b663dd076ba991d764
Author: Tjerk Meesters <datibbaw@php.net> Fri, 6 Mar 2015 20:58:20 +0800
Parents: e82878a200b0e29da468c10e64beceaf6eb844fd d7fb52ea20aba5c9ef53dfa57af3b62717c9e9e5
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=469b5a9584b1647fdccb37b663dd076ba991d764
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68917 (parse_url fails on some partial urls)
Bugs:
https://bugs..php.net/68917
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index 597ea30,879ff28..d248f86
--- a/NEWS
+++ b/NEWS
@@@ -1,12 -1,11 +1,16 @@@
-PHP NEWS
+PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2015, PHP 5.5.24
+?? Apr 2015, PHP 5.6.8
+
+- OpenSSL
+ . Fixed bugs #68853, #65137 (Buffered crypto stream data breaks IO polling
+ in stream_select() contexts) (Chris Wright)
+ - Core:
+ . Fixed bug #68917 (parse_url fails on some partial urls). (Wei Dai)
+
-19 Mar 2015, PHP 5.5.23
++
+19 Mar 2015, PHP 5.6.7
- Core:
. Fixed bug #69174 (leaks when unused inner class use traits precedence).