From 79c7fb33fade4a8eb493383cd4a222987401e782 Mon Sep 17 00:00:00 2001 From: westi Date: Thu, 7 May 2009 21:18:20 +0000 Subject: [PATCH] Pass just the headers array to should_decode. Fixes #9754 props willnorris. git-svn-id: http://svn.automattic.com/wordpress/trunk@11236 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/http.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/http.php b/wp-includes/http.php index 63bbcc49f..eb17055c1 100644 --- a/wp-includes/http.php +++ b/wp-includes/http.php @@ -721,7 +721,7 @@ class WP_Http_Fsockopen { if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] ) $process['body'] = WP_Http::chunkTransferDecode($process['body']); - if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders) ) + if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders['headers']) ) $process['body'] = WP_Http_Encoding::decompress( $process['body'] ); return array('headers' => $arrHeaders['headers'], 'body' => $process['body'], 'response' => $arrHeaders['response'], 'cookies' => $arrHeaders['cookies']); @@ -835,7 +835,7 @@ class WP_Http_Fopen { if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] ) $strResponse = WP_Http::chunkTransferDecode($strResponse); - if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($processedHeaders) ) + if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($processedHeaders['headers']) ) $strResponse = WP_Http_Encoding::decompress( $strResponse ); return array('headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response'], 'cookies' => $processedHeaders['cookies']); @@ -1003,7 +1003,7 @@ class WP_Http_Streams { if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] ) $strResponse = WP_Http::chunkTransferDecode($strResponse); - if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($processedHeaders) ) + if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($processedHeaders['headers']) ) $strResponse = WP_Http_Encoding::decompress( $strResponse ); return array('headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response'], 'cookies' => $processedHeaders['cookies']); @@ -1159,7 +1159,7 @@ class WP_Http_ExtHTTP { $theBody = http_chunked_decode($theBody); } - if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders) ) + if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) ) $theBody = http_inflate( $theBody ); $theResponse = array(); @@ -1342,7 +1342,7 @@ class WP_Http_Curl { curl_close( $handle ); - if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders) ) + if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) ) $theBody = WP_Http_Encoding::decompress( $theBody ); return array('headers' => $theHeaders['headers'], 'body' => $theBody, 'response' => $response, 'cookies' => $theHeaders['cookies']);