Changeset 23601

Timestamp:

03/04/2013 03:33:12 AM (13 years ago)

Author:

dd32

Message:

WP_HTTP: Do not send a Accept-Encoding header when we're streaming to file, or decompression has been disabled by the caller, See #22913

File:

• trunk/wp-includes/class-http.php (modified) (2 diffs)

trunk/wp-includes/class-http.php

@@ -167 +167 @@
                 WP_Http::buildCookieHeader( $r );
 
-                if ( ! isset( $r['headers']['Accept-Encoding'] ) && WP_Http_Encoding::is_available() )
-                        $r['headers']['Accept-Encoding'] = WP_Http_Encoding::accept_encoding();
+                if ( ! isset( $r['headers']['Accept-Encoding'] ) ) {
+                        if ( $encoding = WP_Http_Encoding::accept_encoding( $url, $r ) )
+                                $r['headers']['Accept-Encoding'] = $encoding;
+                }
 
                 if ( ( ! is_null( $r['body'] ) && '' != $r['body'] ) || 'POST' == $r['method'] || 'PUT' == $r['method'] ) {
@@ -1731 +1733 @@
          * @return string Types of encoding to accept.
          */
-        public static function accept_encoding() {
+        public static function accept_encoding( $url, $args ) {
                 $type = array();
-                if ( function_exists( 'gzinflate' ) )
-                        $type[] = 'deflate;q=1.0';
-
-                if ( function_exists( 'gzuncompress' ) )
-                        $type[] = 'compress;q=0.5';
-
-                if ( function_exists( 'gzdecode' ) )
-                        $type[] = 'gzip;q=0.5';
+                $compression_enabled = WP_Http_Encoding::is_available();
+
+                if ( ! $args['decompress'] ) // decompression specifically disabled
+                        $compression_enabled = false;
+                elseif ( $args['stream'] ) // disable when streaming to file
+                        $compression_enabled = false;
+
+                if ( $compression_enabled ) {
+                        if ( function_exists( 'gzinflate' ) )
+                                $type[] = 'deflate;q=1.0';
+
+                        if ( function_exists( 'gzuncompress' ) )
+                                $type[] = 'compress;q=0.5';
+        
+                        if ( function_exists( 'gzdecode' ) )
+                                $type[] = 'gzip;q=0.5';
+                }
+
+                $type = apply_filters( 'wp_http_accept_encoding', $type, $url, $args );
 
                 return implode(', ', $type);