Changeset 10283

Timestamp:

12/31/2008 03:02:53 AM (18 years ago)

Author:

ryan

Message:

Chunked decoding fix from jacobsantos. fixes #8618

File:

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

trunk/wp-includes/http.php

@@ -413 +413 @@
          *
          * @param string $body Body content
-         * @return bool|string|WP_Error False if not chunked encoded. WP_Error on failure. Chunked decoded body on success.
+         * @return string Chunked decoded body on success or raw body on failure.
          */
         function chunkTransferDecode($body) {
@@ -424 +424 @@
                 //$parsedHeaders = array(); Unsupported
 
-                $done = false;
-
-                do {
+                while ( true ) {
                         $hasChunk = (bool) preg_match( '/^([0-9a-f]+)(\s|\n)+/mi', $body, $match );
 
                         if ( $hasChunk ) {
-                                if ( empty($match[1]) ) {
+                                if ( empty( $match[1] ) )
                                         return $body;
-                                }
 
                                 $length = hexdec( $match[1] );
@@ -442 +439 @@
                                 $body = ltrim(str_replace(array($match[0], $strBody), '', $body), "\n");
 
-                                if( "0" == trim($body) ) {
-                                        $done = true;
+                                if( "0" == trim($body) )
                                         return $parsedBody; // Ignore footer headers.
-                                        break;
-                                }
                         } else {
                                 return $body;
                         }
-                } while ( true === $done );
+                }
         }
 }