Changeset 8533

Timestamp:

08/04/2008 04:28:12 PM (16 years ago)

Author:

ryan

Message:

Cycle through available transports trying each one. Props jacobsantos. see #4779

File:

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

trunk/wp-includes/http.php

@@ -89 +89 @@
 
         if ( is_null($working_transport) ) {
-            if ( true === WP_Http_ExtHttp::test() )
-                $working_transport = new WP_Http_ExtHttp();
-            else if ( true === WP_Http_Curl::test() )
-                $working_transport = new WP_Http_Curl();
-            else if ( true === WP_Http_Streams::test() )
-                $working_transport = new WP_Http_Streams();
-            else if ( true === WP_Http_Fopen::test() )
-                $working_transport = new WP_Http_Fopen();
-            else if ( true === WP_Http_Fsockopen::test() )
-                $working_transport = new WP_Http_Fsockopen();
+            if ( true === WP_Http_ExtHttp::test() && apply_filters('use_http_extension_transport', true) )
+                $working_transport[] = new WP_Http_ExtHttp();
+            else if ( true === WP_Http_Curl::test() && apply_filters('use_curl_transport', true) )
+                $working_transport[] = new WP_Http_Curl();
+            else if ( true === WP_Http_Streams::test() && apply_filters('use_streams_transport', true) )
+                $working_transport[] = new WP_Http_Streams();
+            else if ( true === WP_Http_Fopen::test() && apply_filters('use_fopen_transport', true) )
+                $working_transport[] = new WP_Http_Fopen();
+            else if ( true === WP_Http_Fsockopen::test() && apply_filters('use_fsockopen_transport', true) )
+                $working_transport[] = new WP_Http_Fsockopen();
         }
 
@@ -122 +122 @@
 
         if ( is_null($working_transport) ) {
-            if ( true === WP_Http_ExtHttp::test() )
-                $working_transport = new WP_Http_ExtHttp();
-            else if ( true === WP_Http_Streams::test() )
-                $working_transport = new WP_Http_Streams();
-            else if ( true === WP_Http_Fsockopen::test() )
-                $working_transport = new WP_Http_Fsockopen();
+            if ( true === WP_Http_ExtHttp::test() && apply_filters('use_http_extension_transport', true) )
+                $working_transport[] = new WP_Http_ExtHttp();
+            else if ( true === WP_Http_Streams::test() && apply_filters('use_streams_transport', true) )
+                $working_transport[] = new WP_Http_Streams();
+            else if ( true === WP_Http_Fsockopen::test() && apply_filters('use_fsockopen_transport', true) )
+                $working_transport[] = new WP_Http_Fsockopen();
         }
 
@@ -171 +171 @@
      * @param str|array $args Optional. Override the defaults.
      * @param string|array $headers Optional. Either the header string or array of Header name and value pairs. Expects sanitized.
-     * @param string $body Optional. The body that should be sent. Expected to be already processed.
+     * @param string $body Optional. The body that should be sent. Will be automatically escaped and processed.
      * @return boolean
      */
@@ -178 +178 @@
 
         $defaults = array(
-            'method' => 'GET', 'timeout' => 3,
+            'method' => 'GET', 'timeout' => apply_filters('http_request_timeout', 3),
             'redirection' => 5, 'httpversion' => '1.0',
             'user-agent' => apply_filters('http_headers_useragent', 'WordPress/' . $wp_version ),
@@ -196 +196 @@
             $headers['user-agent'] = $r['user-agent'];
 
-        if ( is_null($body) )
-            $transport = WP_Http::_getTransport();
-        else
-            $transport = WP_Http::_postTransport();
-
-        return $transport->request($url, $r, $headers, $body);
+        if ( is_null($body) ) {
+            if ( ! is_string($body) )
+                $body = http_build_query($body);
+
+            $transports = WP_Http::_getTransport();
+        } else
+            $transports = WP_Http::_postTransport();
+
+        $response = array( 'headers' => array(), 'body' => '', 'response' => array('code', 'message') );
+        foreach( (array) $transports as $transport ) {
+            $response = $transport->request($url, $r, $headers, $body);
+
+            if( !is_wp_error($response) )
+                break;
+        }
+
+        return $response;
     }
 
@@ -415 +426 @@
             $error_reporting = error_reporting(0);
 
-        $handle = fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, apply_filters('http_request_timeout', absint($r['timeout']) ) );
+        $handle = fsockopen($arrURL['host'], $arrURL['port'], $iError, $strError, $r['timeout'] );
 
         if ( false === $handle )
@@ -539 +550 @@
 
         if ( function_exists('stream_set_timeout') )
-            stream_set_timeout($handle, apply_filters('http_request_timeout', $r['timeout']) );
+            stream_set_timeout($handle, $r['timeout'] );
 
         if ( ! $r['blocking'] ) {
@@ -613 +624 @@
         $r = wp_parse_args( $args, $defaults );
 
+        if ( isset($headers['User-Agent']) ) {
+            $r['user-agent'] = $headers['User-Agent'];
+            unset($headers['User-Agent']);
+        } else if( isset($headers['user-agent']) ) {
+            $r['user-agent'] = $headers['user-agent'];
+            unset($headers['user-agent']);
+        } else {
+            $r['user-agent'] = apply_filters('http_headers_useragent', 'WordPress/' . $wp_version );
+        }
+
         $arrURL = parse_url($url);
 
@@ -621 +642 @@
             array(
                 'method' => strtoupper($r['method']),
-                'user-agent' => $headers['User-Agent'],
+                'user-agent' => $r['user-agent'],
                 'max_redirects' => $r['redirection'],
                 'protocol_version' => (float) $r['httpversion'],
@@ -629 +650 @@
         );
 
+        var_dump($arrContext);
         if ( ! is_null($body) )
             $arrContext['http']['content'] = $body;
@@ -639 +661 @@
             return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $url));
 
-        stream_set_timeout($handle, apply_filters('http_request_stream_timeout', $r['timeout']) );
+        stream_set_timeout($handle, $r['timeout'] );
 
         if ( ! $r['blocking'] ) {