sr              Wed Sep 10 04:49:47 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src    NEWS 
    /php-src/main       SAPI.c 
  Log:
  MFH: Fix for bug #23488 zlib.output_compression overrides vary header.
  It was already fixed for ob_gzhandler (#24827).
  
  
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.386 php-src/NEWS:1.1247.2.387
--- php-src/NEWS:1.1247.2.386   Tue Sep  9 21:28:34 2003
+++ php-src/NEWS        Wed Sep 10 04:49:45 2003
@@ -7,6 +7,7 @@
 - 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). 
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.155.2.13 php-src/main/SAPI.c:1.155.2.14
--- php-src/main/SAPI.c:1.155.2.13      Thu Aug 28 12:04:18 2003
+++ php-src/main/SAPI.c Wed Sep 10 04:49:46 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: SAPI.c,v 1.155.2.13 2003/08/28 16:04:18 sas Exp $ */
+/* $Id: SAPI.c,v 1.155.2.14 2003/09/10 08:49:46 sr Exp $ */
 
 #include <ctype.h>
 #include <sys/stat.h>
@@ -721,7 +721,7 @@
                        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;                 
                        }
                }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to