summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorPierrick Charron <pierrick@php.net>2016-07-27 00:39:47 -0400
committerPierrick Charron <pierrick@php.net>2016-07-27 00:39:47 -0400
commit929c1e0cdff7793fc5d9d4b4b1e74f1c810c4217 (patch)
tree1c5e02486103f4197b3200aef1f15396538831a5 /main
parenta8c4a4262ea2a73917da6c5ad3b17a9db6fdf730 (diff)
parent6714f73545a8a186931f6fa91c23c4b700ba8ef7 (diff)
downloadphp-git-929c1e0cdff7793fc5d9d4b4b1e74f1c810c4217.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'main')
-rw-r--r--main/streams/streams.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c
index cb21c8f620..d738970e07 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) {