- Fixed bug #48994 (zlib.output_compression does not ouput HTTP headers when set...

# also fixes bug #35936 (ini.zlib.output-compression Documentation :)

diff --git a/NEWS b/NEWS
index c80b7a40712953b554a4aadecd7d8cef6640441c..6f23918fc928555440256519235b840c0ac6bd82 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,8 @@ PHP                                                                        NEWS
   (Jani)
 - Fixed bug #49026 (proc_open() can bypass safe_mode_protected_env_vars
   restrictions). (Ilia)
+- Fixed bug #48994 (zlib.output_compression does not ouput HTTP headers when
+  set to a string value). (Jani)
 - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe)
 - Fixed bug #48962 (cURL does not upload files with specified filename).
   (Ilia)

diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
index 1a2d3a4bf3489dccd848906f0fb2701bca9688ec..a7ef59a9de30b3b10946f4e5a7583812d797c5e8 100644 (file)
--- a/ext/zlib/php_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -35,6 +35,8 @@ ZEND_BEGIN_MODULE_GLOBALS(zlib)
        char *output_handler;
 ZEND_END_MODULE_GLOBALS(zlib)
 
+PHPAPI ZEND_EXTERN_MODULE_GLOBALS(zlib)
+
 extern php_stream_filter_factory php_zlib_filter_factory;
 extern zend_module_entry php_zlib_module_entry;
 #define zlib_module_ptr &php_zlib_module_entry

diff --git a/main/SAPI.c b/main/SAPI.c
index 3205e4cb6aa455533d040b1103f5b0fa51de0317..5c022d0aaf867a24c9d93b993709b7809789c22b 100644 (file)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -768,7 +768,7 @@ SAPI_API int sapi_send_headers(TSRMLS_D)
        /* Add output compression headers at this late stage in order to make
           it possible to switch it off inside the script. */
 
-       if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0)) {
+       if (ZLIBG(output_compression)) {
                zval nm_zlib_get_coding_type;
                zval *uf_result = NULL;