Changeset 8524

Timestamp:

08/01/2008 11:13:48 PM (16 years ago)

Author:

ryan

Message:

Fixes process headers for fopen header return, fixes HTTP extension response array. Also adds Curl implementation and allows for it to be used when using headers. Props santosj. see #4779

File:

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

trunk/wp-includes/http.php

@@ -89 +89 @@
 
         if ( is_null($working_transport) ) {
-            if ( true === WP_Http_Streams::test() )
+            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_ExtHttp::test() )
-                $working_transport = new WP_Http_ExtHttp();
             else if ( true === WP_Http_Fopen::test() )
                 $working_transport = new WP_Http_Fopen();
@@ -120 +122 @@
 
         if ( is_null($working_transport) ) {
-            if ( true === WP_Http_Streams::test() )
+            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_ExtHttp::test() )
-                $working_transport = new WP_Http_ExtHttp();
             else if ( true === WP_Http_Fsockopen::test() )
                 $working_transport = new WP_Http_Fsockopen();
@@ -194 +196 @@
             $headers['user-agent'] = $r['user-agent'];
 
-        if ( is_null($body) || count($headers) > 1 )
+        if ( is_null($body) )
             $transport = WP_Http::_getTransport();
         else
             $transport = WP_Http::_postTransport();
 
-        return $transport->request($url, $headers, $body, $r);
+        return $transport->request($url, $r, $headers, $body);
     }
 
@@ -219 +221 @@
         $defaults = array('method' => 'POST');
         $r = wp_parse_args( $args, $defaults );
-        return $this->request($url, $headers, $body, $r);
+        return $this->request($url, $r, $headers, $body);
     }
 
@@ -239 +241 @@
         $defaults = array('method' => 'GET');
         $r = wp_parse_args( $args, $defaults );
-        return $this->request($url, $headers, $body, $r);
+        return $this->request($url, $r, $headers, $body);
     }
 
@@ -695 +697 @@
      * @param string $url
      * @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 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.
      * @return array 'headers', 'body', and 'response' keys.
@@ -937 +939 @@
     $objFetchSite = _wp_http_get_object();
 
-    return $objFetchSite->request($url, $headers, $body, $args);
+    return $objFetchSite->request($url, $args, $headers, $body);
 }
 
@@ -956 +958 @@
     $objFetchSite = _wp_http_get_object();
 
-    return $objFetchSite->get($url, $headers, $body, $args);
+    return $objFetchSite->get($url, $args, $headers, $body);
 }
 
@@ -975 +977 @@
     $objFetchSite = _wp_http_get_object();
 
-    return $objFetchSite->post($url, $headers, $body, $args);
+    return $objFetchSite->post($url, $args, $headers, $body);
 }
 
@@ -994 +996 @@
     $objFetchSite = _wp_http_get_object();
 
-    return $objFetchSite->head($url, $headers, $body, $args);
+    return $objFetchSite->head($url, $args, $headers, $body);
 }