From 36b2df4606a5f10eac38ea4674e5a20743d86db1 Mon Sep 17 00:00:00 2001 From: azaozz Date: Thu, 7 Jan 2010 10:26:33 +0000 Subject: [PATCH] When decompressing try to raw-inflate first, props dd32, fixes #11600 git-svn-id: http://svn.automattic.com/wordpress/trunk@12642 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/http.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-includes/http.php b/wp-includes/http.php index 46b94c7c5..e8d1344cc 100644 --- a/wp-includes/http.php +++ b/wp-includes/http.php @@ -1816,18 +1816,18 @@ class WP_Http_Encoding { * @return string|bool False on failure. */ function decompress( $compressed, $length = null ) { - $decompressed = WP_Http_Encoding::compatible_gzinflate( $compressed ); - if ( false !== $decompressed ) + if ( false !== ( $decompressed = @gzinflate( $compressed ) ) ) return $decompressed; - $decompressed = gzuncompress( $compressed ); + if ( false !== ( $decompressed = WP_Http_Encoding::compatible_gzinflate( $compressed ) ) ) + return $decompressed; - if ( false !== $decompressed ) + if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) ) return $decompressed; if ( function_exists('gzdecode') ) { - $decompressed = gzdecode( $compressed ); + $decompressed = @gzdecode( $compressed ); if ( false !== $decompressed ) return $decompressed; @@ -1916,7 +1916,7 @@ class WP_Http_Encoding { if ( is_array( $headers ) ) { if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) ) return true; - } else if( is_string( $headers ) ) { + } else if ( is_string( $headers ) ) { return ( stripos($headers, 'content-encoding:') !== false ); }