MFH: Fixed bug #24827 (ob_gzhandler overrides Vary header)

diff --git a/NEWS b/NEWS
index b46026393166ba929fd1ec81ea4ef8f4c706fb28..6307f36add69e15f08b1ff35167ec682d19ad194 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ PHP 4                                                                      NEWS
   is used for background color. (Pierre-Alain Joye)
 - Fixed a bug that under certain circumstances could invalidate safe_mode.
   (Ilia)
+- Fixed bug #24827 (ob_gzhandler overrides Vary header). (Ilia)
 - Fixed bug #24783 (foreach($ar as $key => $val), $key not binary safe). (Zeev)
 - Fixed bug #24760 (non-default SNMP port number not working). (Jani)
 - Fixed bug #24752 (Unhandled "uniqueidentifier" field type). 

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index ac59b2c90d2f8adbbb0782e3be01a32dfc4268b9..8e4db8245103f1b2dc59342c30aa249c30759b24 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -980,7 +980,7 @@ PHP_FUNCTION(ob_gzhandler)
                                        if (sapi_add_header("Content-Encoding: gzip", sizeof("Content-Encoding: gzip") - 1, 1)==FAILURE) {
                                                return_original = 1;
                                        }
-                                       if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
+                                       if (sapi_add_header_ex("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1, 0 TSRMLS_CC)==FAILURE) {
                                                return_original = 1;
                                        }
                                        break;
@@ -988,7 +988,7 @@ PHP_FUNCTION(ob_gzhandler)
                                        if (sapi_add_header("Content-Encoding: deflate", sizeof("Content-Encoding: deflate") - 1, 1)==FAILURE) {
                                                return_original = 1;
                                        }
-                                       if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
+                                       if (sapi_add_header_ex("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 0, 0 TSRMLS_CC)==FAILURE) {
                                                return_original = 1;
                                        }
                                        break;