(bug 24007) Diff pages now mention the number of users having edited intermediate...

[lhc/web/wiklou.git] / includes / OutputHandler.php
diff --git a/includes/OutputHandler.php b/includes/OutputHandler.php

index 061f750..8f310da 100644 (file)
--- a/includes/OutputHandler.php
+++ b/includes/OutputHandler.php
@@ -1,4 +1,9 @@
  <?php
+/**
+ * Functions to be used with PHP's output buffer
+ *
+ * @file
+ */
  
  /**
   * Standard output handler for use with ob_start
@@ -74,12 +79,9 @@ function wfGzipHandler( $s ) {
                 return $s;
         }
  
-       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, 6 );
-               }
+       if( wfClientAcceptsGzip() ) {
+               header( 'Content-Encoding: gzip' );
+               $s = gzencode( $s, 6 );
         }
  
         // Set vary header if it hasn't been set already
@@ -93,7 +95,10 @@ function wfGzipHandler( $s ) {
         }
         if ( !$foundVary ) {
                 header( 'Vary: Accept-Encoding' );
-               header( 'X-Vary-Options: Accept-Encoding;list-contains=gzip' );
+               global $wgUseXVO;
+               if ( $wgUseXVO ) {
+                       header( 'X-Vary-Options: Accept-Encoding;list-contains=gzip' );
+               }
         }
         return $s;
  }
@@ -133,7 +138,7 @@ function wfHtmlValidationHandler( $s ) {
  
         $out = <<<EOT
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" dir="ltr">
  <head>
  <title>HTML validation error</title>
  <style>