Merge branch 'PHP-7.0' into PHP-7.1

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/urls.inc
Simple merge

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