From b3f74b0b7d89ee8efe6897b9ed6397d8b80a15e0 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 12 Jul 2019 12:42:32 +0200 Subject: [PATCH] Deprecate allow_url_include --- Zend/tests/require_parse_exception.phpt | 1 + ext/opcache/tests/bug64353.phpt | 1 + ext/opcache/tests/bug65510.phpt | 1 + ext/standard/tests/file/include_userstream_003.phpt | 2 ++ ext/standard/tests/strings/highlight_file.phpt | 2 ++ main/main.c | 1 + 6 files changed, 8 insertions(+) diff --git a/Zend/tests/require_parse_exception.phpt b/Zend/tests/require_parse_exception.phpt index db6844c2ea..859589231e 100644 --- a/Zend/tests/require_parse_exception.phpt +++ b/Zend/tests/require_parse_exception.phpt @@ -42,6 +42,7 @@ var_dump("\u{ffffff}");'); ?> --EXPECT-- +Deprecated: Directive 'allow_url_include' is deprecated in Unknown on line 0 syntax error, unexpected end of file on line 2 syntax error, unexpected end of file on line 3 syntax error, unexpected end of file, expecting '(' on line 2 diff --git a/ext/opcache/tests/bug64353.phpt b/ext/opcache/tests/bug64353.phpt index b1f0c6e713..42cb45c915 100644 --- a/ext/opcache/tests/bug64353.phpt +++ b/ext/opcache/tests/bug64353.phpt @@ -26,4 +26,5 @@ include "php://filter/read=bug.test/resource=data://text/plain, --EXPECT-- +Deprecated: Directive 'allow_url_include' is deprecated in Unknown on line 0 OK diff --git a/ext/opcache/tests/bug65510.phpt b/ext/opcache/tests/bug65510.phpt index ba19d27d6f..9043b58e12 100644 --- a/ext/opcache/tests/bug65510.phpt +++ b/ext/opcache/tests/bug65510.phpt @@ -17,4 +17,5 @@ function parseQuery() { parseQuery(); echo "ok\n"; --EXPECT-- +Deprecated: Directive 'allow_url_include' is deprecated in Unknown on line 0 ok diff --git a/ext/standard/tests/file/include_userstream_003.phpt b/ext/standard/tests/file/include_userstream_003.phpt index d7701a5d6a..71f8920d53 100644 --- a/ext/standard/tests/file/include_userstream_003.phpt +++ b/ext/standard/tests/file/include_userstream_003.phpt @@ -94,6 +94,8 @@ include "test1://hello"; echo file_get_contents("test2://hello"),"\n"; include "test2://hello"; --EXPECTF-- +Deprecated: Directive 'allow_url_include' is deprecated in Unknown on line 0 + Warning: file_get_contents(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 86 Warning: file_get_contents(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 86 diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt index 9861c6c27f..4eba32aebc 100644 --- a/ext/standard/tests/strings/highlight_file.phpt +++ b/ext/standard/tests/strings/highlight_file.phpt @@ -37,6 +37,8 @@ var_dump(highlight_file($filename)); echo "Done\n"; ?> --EXPECTF-- +Deprecated: Directive 'allow_url_include' is deprecated in Unknown on line 0 + Warning: highlight_file() expects at least 1 parameter, 0 given in %s on line %d bool(false) diff --git a/main/main.c b/main/main.c index 809ebbfd5e..9c8e83cc42 100644 --- a/main/main.c +++ b/main/main.c @@ -2359,6 +2359,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod "Directive '%s' is deprecated", { "track_errors", + "allow_url_include", NULL } }, -- 2.50.1