diff options
| author | Pierrick Charron <pierrick@php.net> | 2016-07-27 00:38:54 -0400 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2016-07-27 00:38:54 -0400 |
| commit | 6714f73545a8a186931f6fa91c23c4b700ba8ef7 (patch) | |
| tree | f08f9286f9d9a2da866f54fda64ad2756639b0a4 /main/streams/streams.c | |
| parent | 2597f5d66552051994ed55655107d9c5142f7d34 (diff) | |
| parent | 074b86d8451365c81d3ae76616fb4df1757ddc1f (diff) | |
| download | php-git-6714f73545a8a186931f6fa91c23c4b700ba8ef7.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
main/streams/streams.c
Diffstat (limited to 'main/streams/streams.c')
| -rw-r--r-- | main/streams/streams.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index e21d21a807..7ad2483da1 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1769,11 +1769,6 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, const if ((*p == ':') && (n > 1) && (!strncmp("//", p+1, 2) || (n == 4 && !memcmp("data:", path, 5)))) { protocol = path; - } else if (n == 5 && strncasecmp(path, "zlib:", 5) == 0) { - /* BC with older php scripts and zlib wrapper */ - protocol = "compress.zlib"; - n = 13; - php_error_docref(NULL, E_WARNING, "Use of \"zlib:\" wrapper is deprecated; please use \"compress.zlib://\" instead"); } if (protocol) { |