cvs: php4(PHP_4_3) /ext/zlib zlib.c zlib_fopen_wrapper.c

wez Tue Dec 31 06:43:02 2002 EDT Modified files: (Branch: PHP_4_3) /php4/ext/zlib zlib.c zlib_fopen_wrapper.c Log: MFH: Fix for 21304 (gzopen not reporting errors, "a" mode broken). Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.153.2.3 php4/ext/zlib/zlib.c:1.153.2.4 --- php4/ext/zlib/zlib.c:1.153.2.3 Mon Dec 30 19:05:19 2002 +++ php4/ext/zlib/zlib.c Tue Dec 31 06:43:02 2002 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.153.2.3 2002/12/31 00:05:19 iliaa Exp $ */ +/* $Id: zlib.c,v 1.153.2.4 2002/12/31 11:43:02 wez Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -352,7 +352,7 @@ convert_to_string_ex(arg2); p = estrndup(Z_STRVAL_PP(arg2),Z_STRLEN_PP(arg2)); - stream = php_stream_gzopen(NULL, Z_STRVAL_PP(arg1), p, use_include_path|ENFORCE_SAFE_MODE, NULL, NULL STREAMS_CC TSRMLS_CC); + stream = php_stream_gzopen(NULL, Z_STRVAL_PP(arg1), p, use_include_path|ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, NULL STREAMS_CC TSRMLS_CC); if (!stream) { RETURN_FALSE; } Index: php4/ext/zlib/zlib_fopen_wrapper.c diff -u php4/ext/zlib/zlib_fopen_wrapper.c:1.33.2.3 php4/ext/zlib/zlib_fopen_wrapper.c:1.33.2.4 --- php4/ext/zlib/zlib_fopen_wrapper.c:1.33.2.3 Tue Nov 19 16:11:03 2002 +++ php4/ext/zlib/zlib_fopen_wrapper.c Tue Dec 31 06:43:02 2002 @@ -16,7 +16,7 @@ | Hartmut Holzgraefe <hartmut@six.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib_fopen_wrapper.c,v 1.33.2.3 2002/11/19 21:11:03 wez Exp $ */ +/* $Id: zlib_fopen_wrapper.c,v 1.33.2.4 2002/12/31 11:43:02 wez Exp $ */ #define IS_EXT_MODULE #define _GNU_SOURCE @@ -104,12 +104,6 @@ if (strchr(mode, '+')) { if (options & REPORT_ERRORS) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot open a zlib stream for reading and writing at the same time!"); - } - return NULL; - } - if (strchr(mode, 'a')) { - if (options & REPORT_ERRORS) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot append to a zlib stream!"); } return NULL; }