From: Joe Watkins <krakjoe@php.net>
Date: Thu, 22 Jun 2017 10:52:20 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha3~58^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed1f64e0837dbc70496c4b17be24703373871c68;p=php

Merge branch 'PHP-7.0' into PHP-7.1

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

ed1f64e0837dbc70496c4b17be24703373871c68
diff --cc NEWS
index 90e43ec885,7a5194087a..f77fa5fcc6
--- a/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