Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix bug #74780 parse_url() borken when query string contains colon

diff --cc NEWS
index 90e43ec885ef53d65199bf6d3f141b17c690cae3,7a5194087aa02f802b33825dcefc216398fc6147..f77fa5fcc640fd14b5ae63326a4cea940fdecfb0
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,10 -1,12 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.22
 +?? ??? 2017, PHP 7.1.8
  
- 
+ - Core:
+   . Fixed bug #74780 (parse_url() borken when query string contains colon). 
+     (jhdxr)
  
 -06 Jul 2017 PHP 7.0.21
 +06 Jul 2017, PHP 7.1.7
  
  - Core:
    . Fixed bug #74738 (Multiple [PATH=] and [HOST=] sections not properly

diff --cc ext/standard/url.c
Simple merge