MFH: Fix for bug #23488 zlib.output_compression overrides vary header.

It was already fixed for ob_gzhandler (#24827).

diff --git a/NEWS b/NEWS
index 7493a45db49d03ce5971635a212818033d43d99f..c4ec1c3663f9befa34793f54877d2ea31db8f4ba 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ PHP 4                                                                      NEWS
 - Fixed crash bug when non-existing save/serializer handler was used. (Jani)
 - Fixed memory leak in gethostbynamel() if an error occurs. (Sara)
 - Fixed FastCGI being unable to bind to a specific IP. (Sascha)
+- Fixed bug #23488 (zlib.output_compression overrides Vary header). (Stefan)
 - Fixed bug #25429 (fix copying of stdin using copy() function). (Ilia)
 - Fixed bug #25424 (ext/informix: lvarchar not supported in win32). (Jani)
 - Fixed bug #25404 (ext/pgsql: open transactions not closed when script ends). 

diff --git a/main/SAPI.c b/main/SAPI.c
index ab9f3916d32cd74b1cff16af8e8e26e287906332..94e4a8988378f298ec63be071d0dffcf74ce943d 100644 (file)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -721,7 +721,7 @@ SAPI_API int sapi_send_headers(TSRMLS_D)
                        if (len <= 0 || sapi_add_header(buf, len, 1) == FAILURE) {
                                return FAILURE;
                        }
-                       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 FAILURE;                 
                        }
                }