diff options
| author | Wez Furlong <wez@php.net> | 2002-12-31 11:43:02 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2002-12-31 11:43:02 +0000 |
| commit | ac07cbb0cadbe08924f86b1887cffc6cef806be2 (patch) | |
| tree | ca0b2ea60134ae828216e733e971fc13c3a120f3 | |
| parent | ce2ae19703e32ad9d6a983f0641c013e392c6ecf (diff) | |
| download | php-git-ac07cbb0cadbe08924f86b1887cffc6cef806be2.tar.gz | |
MFH: Fix for 21304 (gzopen not reporting errors, "a" mode broken).
| -rw-r--r-- | ext/zlib/zlib.c | 2 | ||||
| -rw-r--r-- | ext/zlib/zlib_fopen_wrapper.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 7997839502..4498b02e70 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -352,7 +352,7 @@ PHP_FUNCTION(gzopen) 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; } diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c index e0b383c1cd..7f0587b97f 100644 --- a/ext/zlib/zlib_fopen_wrapper.c +++ b/ext/zlib/zlib_fopen_wrapper.c @@ -107,12 +107,6 @@ php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, char *path, char *mod } 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; - } self = emalloc(sizeof(*self)); |