When decompressing try to raw-inflate first, props dd32, fixes #11600
git-svn-id: https://develop.svn.wordpress.org/trunk@12642 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
754fe19661
commit
f992a598bb
|
@ -1816,18 +1816,18 @@ class WP_Http_Encoding {
|
||||||
* @return string|bool False on failure.
|
* @return string|bool False on failure.
|
||||||
*/
|
*/
|
||||||
function decompress( $compressed, $length = null ) {
|
function decompress( $compressed, $length = null ) {
|
||||||
$decompressed = WP_Http_Encoding::compatible_gzinflate( $compressed );
|
|
||||||
|
|
||||||
if ( false !== $decompressed )
|
if ( false !== ( $decompressed = @gzinflate( $compressed ) ) )
|
||||||
return $decompressed;
|
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;
|
return $decompressed;
|
||||||
|
|
||||||
if ( function_exists('gzdecode') ) {
|
if ( function_exists('gzdecode') ) {
|
||||||
$decompressed = gzdecode( $compressed );
|
$decompressed = @gzdecode( $compressed );
|
||||||
|
|
||||||
if ( false !== $decompressed )
|
if ( false !== $decompressed )
|
||||||
return $decompressed;
|
return $decompressed;
|
||||||
|
@ -1916,7 +1916,7 @@ class WP_Http_Encoding {
|
||||||
if ( is_array( $headers ) ) {
|
if ( is_array( $headers ) ) {
|
||||||
if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
|
if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
|
||||||
return true;
|
return true;
|
||||||
} else if( is_string( $headers ) ) {
|
} else if ( is_string( $headers ) ) {
|
||||||
return ( stripos($headers, 'content-encoding:') !== false );
|
return ( stripos($headers, 'content-encoding:') !== false );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue