Merge branch 'PHP-5.5' into PHP-5.6

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

diff --cc NEWS
index 597ea3085803df7b9fa9a0a2c80d9e4c428d1458,879ff28030db1a06ebc17e2098ca37f1a42141bc..d248f86483f6c94b55b3688de537e908b2c5aac8
--- 1/NEWS
--- 2/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)
  
 -19 Mar 2015, PHP 5.5.23
+ - Core:
+   . Fixed bug #68917 (parse_url fails on some partial urls). (Wei Dai)
+ 
++
 +19 Mar 2015, PHP 5.6.7
  
  - Core:
    . Fixed bug #69174 (leaks when unused inner class use traits precedence).