Changeset 18718

Timestamp:

09/19/2011 02:43:43 PM (15 years ago)

Author:

dd32

Message:

Add inflation support for java.util.zip.Deflater in WP_Http_Encoding::compatible_gzinflate(). Fixes #18273

File:

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

trunk/wp-includes/class-http.php

@@ -1637 +1637 @@
          */
         function compatible_gzinflate($gzData) {
+
+                // Compressed data might contain a full header, if so strip it for gzinflate()
                 if ( substr($gzData, 0, 3) == "\x1f\x8b\x08" ) {
                         $i = 10;
@@ -1652 +1654 @@
                                         $i = $i + 2;
                         }
-                        return gzinflate( substr($gzData, $i, -8) );
-                } else {
-                        return false;
-                }
+                        $decompressed = @gzinflate( substr($gzData, $i, -8) );
+                        if ( false !== $decompressed )
+                                return $decompressed;
+                }
+
+                // Compressed data from java.util.zip.Deflater amongst others.
+                $decompressed = @gzinflate( substr($gzData, 2) );
+                if ( false !== $decompressed )
+                        return $decompressed;
+
+                return false;
         }