Changeset 8522

Timestamp:

08/01/2008 09:24:03 PM (15 years ago)

Author:

ryan

Message:

Various http fixes from santosj. see #4779

File:

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

trunk/wp-includes/http.php

@@ -537 +537 @@
             $url = str_replace($arrURL['scheme'], 'http', $url);
 
-        $handle = fopen($url, 'rb');
+        $handle = fopen($url, 'r');
 
         if (! $handle)
@@ -553 +553 @@
         while ( ! feof($handle) )
             $strResponse .= fread($handle, 4096);
-
-        fclose($handle);
 
         $theHeaders = '';
@@ -565 +563 @@
         $processedHeaders = WP_Http::processHeaders($theHeaders);
 
+        fclose($handle);
         return array('headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response']);
     }
@@ -636 +635 @@
         $context = stream_context_create($arrContext);
 
-        $handle = fopen($url, 'rb', false, $context);
-
-        stream_set_timeout($handle, apply_filters('http_request_stream_timeout', $this->timeout) );
+        $handle = fopen($url, 'r', false, $context);
+
+        stream_set_timeout($handle, apply_filters('http_request_stream_timeout', $r['timeout']) );
 
         if ( ! $handle)
@@ -748 +747 @@
             'connecttimeout' => $r['timeout'],
             'redirect' => $r['redirection'],
-            'useragent' => $r['user_agent'],
+            'useragent' => $r['user-agent'],
             'headers' => $headers,
         );
@@ -850 +849 @@
 
         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'] ) {