From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 4 Nov 2020 13:56:54 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8f2531ff0ac6a5e7828debd56e8e37ee04a4d6a;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80266: parse_url silently drops port number 0
---

b8f2531ff0ac6a5e7828debd56e8e37ee04a4d6a
diff --cc NEWS
index 627913e9f7,ad8461690b..95aa4618a7
--- a/NEWS
+++ b/NEWS
@@@ -1,36 -1,8 +1,37 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2020, PHP 7.4.13
 +?? ??? ????, PHP 8.0.0RC4
 +
 +- FFI:
 +  . Fixed bug #79177 (FFI doesn't handle well PHP exceptions within callback).
 +    (cmb, Dmitry, Nikita)
 +
 +- ODBC:
 +  . Fixed bug #44618 (Fetching may rely on uninitialized data). (cmb)
 +
 +- Opcache:
 +  . Fixed run-time binding of preloaded dynamically declared function. (Dmitry)
 +
 +- Reflection:
 +  . Fixed bug #80299 (ReflectionFunction->invokeArgs confused in arguments).
 +    (Nikita)
 +
 +- SNMP:
 +  . Fixed bug #70461 (disable md5 code when it is not supported in net-snmp).
 +    (Alexander Bergmann, cmb)
 +
 +- Standard:
 +  . Don't force rebuild of symbol table, when populating $http_response_header
 +    variable by the HTTP stream wrapper. (Dmitry)
 +  . Fixed bug #80290 (Double free when ASSERT_CALLBACK is used with a dynamic
 +    message). (Nikita)
++  . Fixed bug #80266 (parse_url silently drops port number 0). (cmb, Nikita)
 +
 +29 Oct 2020, PHP 8.0.0RC3
  
  - Core:
 +  . Fixed bug #8055 (Abstract trait methods returning "self" cannot be
 +    fulfilled by traits). (Nikita)
    . Fixed bug #80280 (ADD_EXTENSION_DEP() fails for ext/standard and ext/date).
      (cmb)
    . Fixed bug #80258 (Windows Deduplication Enabled, randon permission errors).
diff --cc ext/standard/url.c
index 74d510951f,4c6190f3bc..a33091a86b
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@@ -92,8 -98,15 +92,16 @@@ static const char *binary_strcspn(cons
  	return e;
  }
  
 +/* {{{ php_url_parse */
  PHPAPI php_url *php_url_parse_ex(char const *str, size_t length)
+ {
+ 	zend_bool has_port;
+ 	return php_url_parse_ex2(str, length, &has_port);
+ }
+ 
+ /* {{{ php_url_parse_ex2
+  */
+ PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, zend_bool *has_port)
  {
  	char port_buf[6];
  	php_url *ret = ecalloc(1, sizeof(php_url));