From: Pierre Joye <pajoye@php.net>
Date: Sun, 26 Sep 2010 20:46:54 +0000 (+0000)
Subject: - fix bug #52926, zlib fopen wrapper does not use the context
X-Git-Tag: php-5.3.4RC1~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4839387edde2b6a551a757ebe316186f73739323;p=php

- fix bug #52926, zlib fopen wrapper does not use the context
---

diff --git a/NEWS b/NEWS
index f552236b3a..d902359f1e 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@
 - Fixed possible crash in mssql_fetch_batch(). (Kalle)
 - Fixed inconsistent backlog default value (-1) in FPM on many systems. (fat)
 
+- Fixed bug #52926 (zlib fopen wrapper does not use context). (Gustavo)
 - Fixed bug #52891 (Wrong data inserted with mysqli/mysqlnd when using
   mysqli_stmt_bind_param and value> PHP_INT_MAX). (Andrey)
 - Fixed bug #52849 (GNU MP invalid version match). (Adam)
diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c
index 8970c55a00..c0f9c249d9 100644
--- a/ext/zlib/zlib_fopen_wrapper.c
+++ b/ext/zlib/zlib_fopen_wrapper.c
@@ -128,7 +128,7 @@ php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mod
 		path += 5;
 	}
 	
-	innerstream = php_stream_open_wrapper(path, mode, STREAM_MUST_SEEK | options | STREAM_WILL_CAST, opened_path);
+	innerstream = php_stream_open_wrapper_ex(path, mode, STREAM_MUST_SEEK | options | STREAM_WILL_CAST, opened_path, context);
 	
 	if (innerstream) {
 		int fd;