diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-18 18:27:01 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-18 23:36:36 +0200 |
| commit | 521c36c85560b104a1149b7dab71cbc15fb8b5a7 (patch) | |
| tree | aa240ba830d6092a12bf0114feee95ece498d56a /main | |
| parent | 7fe9df59783d42d8bd56cdcf81e3609f5e807e51 (diff) | |
| download | php-git-521c36c85560b104a1149b7dab71cbc15fb8b5a7.tar.gz | |
Remove IGNORE_URL_WIN macro
This macro is defined to zero as of PHP 5.0.0, and as the comment
indicates, is no longer relevant. Thus, we remove the definition and
all usages from the core and bundled extensions.
Closes GH-6351.
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | main/php_streams.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/main/main.c b/main/main.c index 4511453dce..8a860505f9 100644 --- a/main/main.c +++ b/main/main.c @@ -1450,7 +1450,7 @@ PHP_FUNCTION(set_time_limit) /* {{{ php_fopen_wrapper_for_zend */ static FILE *php_fopen_wrapper_for_zend(const char *filename, zend_string **opened_path) { - return php_stream_open_wrapper_as_file((char *)filename, "rb", USE_PATH|IGNORE_URL_WIN|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE, opened_path); + return php_stream_open_wrapper_as_file((char *)filename, "rb", USE_PATH|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE, opened_path); } /* }}} */ diff --git a/main/php_streams.h b/main/php_streams.h index 73740a7a79..1bd6668607 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -550,9 +550,6 @@ END_EXTERN_C() /* Allow blocking reads on anonymous pipes on Windows. */ #define STREAM_USE_BLOCKING_PIPE 0x00008000 -/* Antique - no longer has meaning */ -#define IGNORE_URL_WIN 0 - int php_init_stream_wrappers(int module_number); int php_shutdown_stream_wrappers(int module_number); void php_shutdown_stream_hashes(void); |