svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c trunk/ext/zlib/zlib_fopen_wrapper.c

pajoye Sun, 26 Sep 2010 20:46:54 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=303772 Log: - fix bug #52926, zlib fopen wrapper does not use the context Bug: http://bugs.php.net/52926 (Analyzed) stream_context_set_default() does not work as intended with stream chaining Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c U php/php-src/trunk/ext/zlib/zlib_fopen_wrapper.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-09-26 20:16:25 UTC (rev 303771) +++ php/php-src/branches/PHP_5_3/NEWS 2010-09-26 20:46:54 UTC (rev 303772) @@ -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) Modified: php/php-src/branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c 2010-09-26 20:16:25 UTC (rev 303771) +++ php/php-src/branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c 2010-09-26 20:46:54 UTC (rev 303772) @@ -128,7 +128,7 @@ 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; Modified: php/php-src/trunk/ext/zlib/zlib_fopen_wrapper.c =================================================================== --- php/php-src/trunk/ext/zlib/zlib_fopen_wrapper.c 2010-09-26 20:16:25 UTC (rev 303771) +++ php/php-src/trunk/ext/zlib/zlib_fopen_wrapper.c 2010-09-26 20:46:54 UTC (rev 303772) @@ -128,7 +128,7 @@ 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;