Changes from branches/2.7/wp-includes/http.php at r10321 to trunk/wp-includes/http.php at r10150

File:

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

trunk/wp-includes/http.php

@@ -243 +243 @@
 
         if ( is_null($r['body']) ) {
-            // Some servers fail when sending content without the content-length
-            // header being set.
-            $r['headers']['Content-Length'] = 0;
             $transports = WP_Http::_getTransport($r);
         } else {
@@ -394 +391 @@
      *
      * @param string $body Body content
-     * @return string Chunked decoded body on success or raw body on failure.
+     * @return bool|string|WP_Error False if not chunked encoded. WP_Error on failure. Chunked decoded body on success.
      */
     function chunkTransferDecode($body) {
@@ -405 +402 @@
         //$parsedHeaders = array(); Unsupported
 
-        while ( true ) {
+        $done = false;
+
+        do {
             $hasChunk = (bool) preg_match( '/^([0-9a-f]+)(\s|\n)+/mi', $body, $match );
 
             if ( $hasChunk ) {
-                if ( empty($match[1]) )
-                    return $body;
+                if ( empty($match[1]) ) {
+                    return new WP_Error('http_chunked_decode', __('Does not appear to be chunked encoded or body is malformed.') );
+                }
 
                 $length = hexdec( $match[1] );
@@ -420 +420 @@
                 $body = ltrim(str_replace(array($match[0], $strBody), '', $body), "\n");
 
-                if( "0" == trim($body) )
+                if( "0" == trim($body) ) {
+                    $done = true;
                     return $parsedBody; // Ignore footer headers.
+                    break;
+                }
             } else {
-                return $body;
+                return new WP_Error('http_chunked_decode', __('Does not appear to be chunked encoded or body is malformed.') );
             }
-        }
+        } while ( false === $done );
     }
 }
@@ -642 +645 @@
             return new WP_Error('http_request_failed', sprintf(__('Malformed URL: %s'), $url));
 
-        if ( 'http' != $arrURL['scheme'] && 'https' != $arrURL['scheme'] )
+        if ( 'http' != $arrURL['scheme'] || 'https' != $arrURL['scheme'] )
             $url = str_replace($arrURL['scheme'], 'http', $url);
 
@@ -748 +751 @@
             return new WP_Error('http_request_failed', sprintf(__('Malformed URL: %s'), $url));
 
-        if ( 'http' != $arrURL['scheme'] && 'https' != $arrURL['scheme'] )
+        if ( 'http' != $arrURL['scheme'] || 'https' != $arrURL['scheme'] )
             $url = str_replace($arrURL['scheme'], 'http', $url);
 
@@ -775 +778 @@
         $context = stream_context_create($arrContext);
 
-        if ( ! defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
+        if ( !defined('WP_DEBUG') || ( defined('WP_DEBUG') && false === WP_DEBUG ) )
             $handle = @fopen($url, 'r', false, $context);
         else
@@ -980 +983 @@
         }
 
-        // cURL extension will sometimes fail when the timeout is less than 1 as
-        // it may round down to 0, which gives it unlimited timeout.
+        // If timeout is a float less than 1, round it up to 1.
         if ( $r['timeout'] > 0 && $r['timeout'] < 1 )
             $r['timeout'] = 1;
@@ -988 +990 @@
         curl_setopt( $handle, CURLOPT_URL, $url);
 
-        // The cURL extension requires that the option be set for the HEAD to
-        // work properly.
         if ( 'HEAD' === $r['method'] ) {
             curl_setopt( $handle, CURLOPT_NOBODY, true );
@@ -1008 +1008 @@
         curl_setopt( $handle, CURLOPT_MAXREDIRS, $r['redirection'] );
 
-        // The option doesn't work with safe mode or when open_basedir is set.
         if ( !ini_get('safe_mode') && !ini_get('open_basedir') )
             curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, true );
@@ -1064 +1063 @@
      */
     function test() {
-        if ( function_exists('curl_init') && function_exists('curl_exec') )
+        if ( function_exists('curl_init') )
             return true;