Changeset 8586

Timestamp:

08/08/2008 12:02:11 AM (18 years ago)

Author:

ryan

Message:

Fix issues with fsockopen transport. Props santosj. see #4779

File:

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

trunk/wp-includes/http.php

@@ -126 +126 @@
                         if ( true === WP_Http_ExtHttp::test() && apply_filters('use_http_extension_transport', true) )
                                 $working_transport[] = new WP_Http_ExtHttp();
+                        else if ( true === WP_Http_Fsockopen::test() && apply_filters('use_fsockopen_transport', true) )
+                                $working_transport[] = new WP_Http_Fsockopen();
                         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();
                 }
 
@@ -196 +196 @@
                 }
 
-                if ( ! isset($headers['user-agent']) || ! isset($headers['User-Agent']) )
+                if ( isset($headers['User-Agent']) ) {
+                        $headers['user-agent'] = $headers['User-Agent'];
+                        unset($headers['User-Agent']);
+                }
+
+                if ( ! isset($headers['user-agent']) )
                         $headers['user-agent'] = $r['user-agent'];
 
@@ -442 +447 @@
                 $strHeaders .= 'Host: ' . $arrURL['host'] . "\r\n";
 
-                if ( is_array($header) ) {
-                        foreach ( (array) $this->getHeaders() as $header => $headerValue )
+                if ( is_array($headers) ) {
+                        foreach ( (array) $headers as $header => $headerValue )
                                 $strHeaders .= $header . ': ' . $headerValue . "\r\n";
                 } else {
-                        $strHeaders .= $header;
+                        $strHeaders .= $headers;
                 }