* (bug 11795) Be more paranoid about confirming accept-encoding header is present

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2d9412a..dcf93d7 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -120,6 +120,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 11744) Incorrect return value from Title::getParentCategories()
 * (bug 11762) Fix native language name of Akan (ak)
 * (bug 11722) Fix inconsistent case in unprotect tabs
+* (bug 11795) Be more paranoid about confirming accept-encoding header is present
 
 === API changes in 1.12 ===
 

diff --git a/includes/OutputHandler.php b/includes/OutputHandler.php
index d8ac12b..dd36498 100644 (file)
--- a/includes/OutputHandler.php
+++ b/includes/OutputHandler.php
@@ -61,10 +61,12 @@ function wfGzipHandler( $s ) {
                return $s;
        }
        
-       $tokens = preg_split( '/[,; ]/', $_SERVER['HTTP_ACCEPT_ENCODING'] );
-       if ( in_array( 'gzip', $tokens ) ) {
-               header( 'Content-Encoding: gzip' );
-               $s = gzencode( $s, 3 );
+       if( isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) {
+               $tokens = preg_split( '/[,; ]/', $_SERVER['HTTP_ACCEPT_ENCODING'] );
+               if ( in_array( 'gzip', $tokens ) ) {
+                       header( 'Content-Encoding: gzip' );
+                       $s = gzencode( $s, 3 );
+               }
        }
        
        // Set vary header if it hasn't been set already