Ticket #4779: 4779.r8521.diff

http.php

@@ -536 +536 @@
                 if ( 'http' != $arrURL['scheme'] || 'https' != $arrURL['scheme'] )
                         $url = str_replace($arrURL['scheme'], 'http', $url);
 
-                $handle = fopen($url, 'rb');
+                $handle = fopen($url, 'r');
 
                 if (! $handle)
                         return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
@@ -553 +553 @@
                 while ( ! feof($handle) )
                         $strResponse .= fread($handle, 4096);
 
-                fclose($handle);
-
                 $theHeaders = '';
                 if ( function_exists('stream_get_meta_data') ) {
                         $meta = stream_get_meta_data($handle);
@@ -564 +562 @@
                 }
                 $processedHeaders = WP_Http::processHeaders($theHeaders);
 
+                fclose($handle);
                 return array('headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response']);
         }
 
@@ -635 +634 @@
 
                 $context = stream_context_create($arrContext);
 
-                $handle = fopen($url, 'rb', false, $context);
+                $handle = fopen($url, 'r', false, $context);
 
-                stream_set_timeout($handle, apply_filters('http_request_stream_timeout', $this->timeout) );
+                stream_set_timeout($handle, apply_filters('http_request_stream_timeout', $r['timeout']) );
 
                 if ( ! $handle)
                         return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
@@ -747 +746 @@
                         'timeout' => $r['timeout'],
                         'connecttimeout' => $r['timeout'],
                         'redirect' => $r['redirection'],
-                        'useragent' => $r['user_agent'],
+                        'useragent' => $r['user-agent'],
                         'headers' => $headers,
                 );
 
@@ -849 +848 @@
                         curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );
 
                 if ( $r['httpversion'] == '1.0' )
-                        curl_setopt( $headle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
+                        curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
                 else
-                        curl_setopt( $headle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+                        curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
 
                 if ( ! $r['blocking'] ) {
                         curl_close( $handle );
@@ -1084 +1083 @@
         return $response['body'];
 }
 
-?>
+?>
+ No newline at end of file