]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorStanislav Malyshev <stas@php.net>
Wed, 27 Jan 2021 06:55:10 +0000 (22:55 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 27 Jan 2021 06:55:10 +0000 (22:55 -0800)
* PHP-7.3:
  Alternative fix for bug 77423

1  2 
ext/filter/logical_filters.c
ext/standard/tests/url/parse_url_basic_001.phpt
ext/standard/tests/url/parse_url_basic_003.phpt
ext/standard/tests/url/parse_url_basic_005.phpt
ext/standard/tests/url/parse_url_unterminated.phpt
ext/standard/url.c

Simple merge
Simple merge