Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix binary-safety of parse_url

diff --cc ext/standard/tests/url/parse_url_basic_001.phpt
Simple merge

diff --cc ext/standard/tests/url/parse_url_basic_002.phpt
Simple merge

diff --cc ext/standard/tests/url/parse_url_basic_003.phpt
Simple merge

diff --cc ext/standard/tests/url/parse_url_basic_004.phpt
Simple merge

diff --cc ext/standard/tests/url/parse_url_basic_005.phpt
Simple merge

diff --cc ext/standard/tests/url/parse_url_basic_006.phpt
Simple merge

diff --cc ext/standard/tests/url/parse_url_basic_007.phpt
Simple merge

diff --cc ext/standard/tests/url/parse_url_basic_008.phpt
Simple merge

diff --cc ext/standard/tests/url/parse_url_basic_009.phpt
Simple merge

diff --cc ext/standard/tests/url/parse_url_unterminated.phpt
Simple merge

diff --cc ext/standard/url.c
index b149ca05800dbfe612602c20cd95eedc93dbe9bf,3b12e3171fa72dd6da9c96824a5eb6d3862f18d5..f710b2fe8a64326d165573fa0a8f1a5b73e786c0
--- 1/ext/standard/url.c
--- 2/ext/standard/url.c
+++ b/ext/standard/url.c
@@@ -81,7 -87,19 +81,18 @@@ PHPAPI php_url *php_url_parse(char cons
        return php_url_parse_ex(str, strlen(str));
  }
  
 -/* {{{ php_url_parse
 - */
+ static const char *binary_strcspn(const char *s, const char *e, const char *chars) {
+       while (*chars) {
+               const char *p = memchr(s, *chars, e - s);
+               if (p) {
+                       e = p;
+               }
+               chars++;
+       }
+       return e;
+ }
+ 
 +/* {{{ php_url_parse */
  PHPAPI php_url *php_url_parse_ex(char const *str, size_t length)
  {
        char port_buf[6];