Merge branch 'PHP-7.1'

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

diff --cc NEWS
index 3ccf5114fbcb8c578a5e6e17d10066c8b36d5dee,f77fa5fcc640fd14b5ae63326a4cea940fdecfb0..5e5e404d6f529eec56c86b1041f6bb67d270c141
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,16 -1,35 +1,18 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017, PHP 7.1.8
 +?? ??? ????, PHP 7.2.0alpha3
  
 -- Core:
 -  . Fixed bug #74780 (parse_url() borken when query string contains colon). 
 -    (jhdxr)
  
 -06 Jul 2017, PHP 7.1.7
 +22 Jun 2017, PHP 7.2.0alpha2
  
  - Core:
 -  . Fixed bug #74738 (Multiple [PATH=] and [HOST=] sections not properly
 -    parsed). (Manuel Mausz)
 -  . Fixed bug #74658 (Undefined constants in array properties result in broken
 -    properties). (Laruence)
 -  . Fixed misparsing of abstract unix domain socket names. (Sara)
 -
 -- Date:
 -  . Fixed bug #74639 (implement clone for DatePeriod and DateInterval).
 -    (andrewnester)
 -
 -- DOM:
 -  . Fixed bug #69373 (References to deleted XPath query results). (ttoohey)
 -
 -- Intl:
 -  . Fixed bug #73473 (Stack Buffer Overflow in msgfmt_parse_message). (libnex)
 -  . Fixed bug #74705 (Wrong reflection on Collator::getSortKey and
 -    collator_get_sort_key). (Tyson Andre, Remi)
 +  . Change PHP_OS_FAMILY value from "OSX" to "Darwin". (sb, kalle)
++  . Fixed bug #74780 (parse_url() borken when query string contains colon). 
++    (jhdxr)
  
 -- Mbstring:
 -  . Add oniguruma upstream fix (CVE-2017-9224, CVE-2017-9226, CVE-2017-9227,
 -    CVE-2017-9228, CVE-2017-9229) (Remi, Mamoru TASAKA)
 +- GD:
 +  . Fixed bug #74744 (gd.h: stdarg.h include missing for va_list use in
 +    gdErrorMethod). (rainer dot jung at kippdata dot de, cmb)
  
  - OCI8:
    . Add TAF callback (PR #2459). (KoenigsKind)

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