cvs: php4 /ext/zlib zlib.c zlib_fopen_wrapper.c

wez Thu Aug 22 13:37:47 2002 EDT Modified files: /php4/ext/zlib zlib.c zlib_fopen_wrapper.c Log: Fix error messages. Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.146 php4/ext/zlib/zlib.c:1.147 --- php4/ext/zlib/zlib.c:1.146 Thu Aug 22 05:38:55 2002 +++ php4/ext/zlib/zlib.c Thu Aug 22 13:37:46 2002 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.146 2002/08/22 09:38:55 sr Exp $ */ +/* $Id: zlib.c,v 1.147 2002/08/22 17:37:46 wez Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -295,8 +295,7 @@ /* using a stream here is a bit more efficient (resource wise) than php_gzopen_wrapper */ stream = php_stream_gzopen(NULL, Z_STRVAL_PP(filename), "rb", use_include_path|ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, NULL STREAMS_CC TSRMLS_CC); if (stream == NULL) { - /* Error reporting is already done by stream code - php_error_docref(NULL TSRMLS_CC, E_WARNING, "gzFile(\"%s\") - %s", Z_STRVAL_PP(filename), strerror(errno)); */ + /* Error reporting is already done by stream code */ RETURN_FALSE; } Index: php4/ext/zlib/zlib_fopen_wrapper.c diff -u php4/ext/zlib/zlib_fopen_wrapper.c:1.26 php4/ext/zlib/zlib_fopen_wrapper.c:1.27 --- php4/ext/zlib/zlib_fopen_wrapper.c:1.26 Fri Apr 19 06:06:41 2002 +++ php4/ext/zlib/zlib_fopen_wrapper.c Thu Aug 22 13:37:46 2002 @@ -16,7 +16,7 @@ | Hartmut Holzgraefe <hartmut@six.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib_fopen_wrapper.c,v 1.26 2002/04/19 10:06:41 wez Exp $ */ +/* $Id: zlib_fopen_wrapper.c,v 1.27 2002/08/22 17:37:46 wez Exp $ */ #define IS_EXT_MODULE #define _GNU_SOURCE @@ -118,6 +118,8 @@ return stream; gzclose(self->gz_file); } + if (options & REPORT_ERRORS) + php_errordocref(NULL TSRMLS_CC, E_WARNING, "gzopen failed"); } } if (stream)