From: Tjerk Meesters <datibbaw@php.net>
Date: Fri, 6 Mar 2015 12:58:20 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=469b5a9584b1647fdccb37b663dd076ba991d764;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68917 (parse_url fails on some partial urls)
---

469b5a9584b1647fdccb37b663dd076ba991d764
diff --cc NEWS
index 597ea30858,879ff28030..d248f86483
--- 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).