Added "Vary: Accept-Encoding" header to zlib.output_compression

compressed output as with obgzhandler().
@ If zlib.output_compression is enabled and a page is compressed
@ a "Vary: Accept-Encoding" header is added. (Stefan)
# obgzhandler() sends this header, I think it is recommened by
# RFC 2616. If there are problems (e.g. with some browsers)
# it should be reverted.

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index f69a570b0ca9b8ce9e74a814592cda7628db33dc..0ce9884a7b341175201b1bbc45d357613e5f3d4f 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -971,11 +971,17 @@ int php_enable_output_compression(int buffer_size TSRMLS_DC)
                if (sapi_add_header("Content-Encoding: gzip", sizeof("Content-Encoding: gzip") - 1, 1)==FAILURE) {
                        return FAILURE;
                }
+               if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
+                       return FAILURE;                 
+               }
                ZLIBG(ob_gzip_coding) = CODING_GZIP;
        } else if(php_memnstr(Z_STRVAL_PP(a_encoding), "deflate", 7, Z_STRVAL_PP(a_encoding) + Z_STRLEN_PP(a_encoding))) {
                if (sapi_add_header("Content-Encoding: deflate", sizeof("Content-Encoding: deflate") - 1, 1)==FAILURE) {
                        return FAILURE;
                }
+               if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
+                       return FAILURE;                 
+               }
                ZLIBG(ob_gzip_coding) = CODING_DEFLATE;
        } else {
                return FAILURE;