Fix for #21304 (gzopen did not report errors on open; "a" mode broken)

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 798c2529f3c9699614bebc6763154e6590d5ad0e..2fc828d5c9a487b79b46ad349db643f2871c8073 100644 (file)
--- 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 6f50a5aa520dc85e98ac55dc9dbfc60c0cdac911..b9fff31bb44ad56b1a169fb11ba474f4ded3f442 100644 (file)
--- 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));