MFH: Fix for 21304 (gzopen not reporting errors, "a" mode broken).

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 7997839502f2792e543d6ae4be37f8c37982013c..4498b02e70e04aad907148dc3ee74e4ece79c2fe 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 e0b383c1cd434e69af60d4c0d8c83e1ab28f378b..7f0587b97fae5523f0e2e3188c2b44cab954b0dc 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));