Changeset 11630

Timestamp:

06/23/2009 07:18:27 PM (17 years ago)

Author:

ryan

Message:

Revert [11524]. curl has its problems, but so does everything else. see #9998 fixes #10104 for trunk

File:

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

trunk/wp-includes/http.php

@@ -74 +74 @@
          * that object to be used later.
          *
-         * The order for the GET/HEAD requests are HTTP Extension, FSockopen Streams, 
-         * Fopen, and finally cURL. Whilst Fsockopen has the highest overhead, Its
-         * used 2nd due to high compatibility with most hosts, The HTTP Extension is
-         * tested first due to hosts which have it enabled, are likely to work
-         * correctly with it.
+         * The order for the GET/HEAD requests are Streams, HTTP Extension, Fopen,
+         * and finally Fsockopen. fsockopen() is used last, because it has the most
+         * overhead in its implementation. There isn't any real way around it, since
+         * redirects have to be supported, much the same way the other transports
+         * also handle redirects.
          *
          * There are currently issues with "localhost" not resolving correctly with
@@ -99 +99 @@
                                 $working_transport['exthttp'] = new WP_Http_ExtHttp();
                                 $blocking_transport[] = &$working_transport['exthttp'];
-                        } else if ( true === WP_Http_Fsockopen::test($args) ) {
-                                $working_transport['fsockopen'] = new WP_Http_Fsockopen();
-                                $blocking_transport[] = &$working_transport['fsockopen'];
+                        } else if ( true === WP_Http_Curl::test($args) ) {
+                                $working_transport['curl'] = new WP_Http_Curl();
+                                $blocking_transport[] = &$working_transport['curl'];
                         } else if ( true === WP_Http_Streams::test($args) ) {
                                 $working_transport['streams'] = new WP_Http_Streams();
@@ -108 +108 @@
                                 $working_transport['fopen'] = new WP_Http_Fopen();
                                 $blocking_transport[] = &$working_transport['fopen'];
-                        } else if ( true === WP_Http_Curl::test($args) ) {
-                                $working_transport['curl'] = new WP_Http_Curl();
-                                $blocking_transport[] = &$working_transport['curl'];
+                        } else if ( true === WP_Http_Fsockopen::test($args) ) {
+                                $working_transport['fsockopen'] = new WP_Http_Fsockopen();
+                                $blocking_transport[] = &$working_transport['fsockopen'];
                         }
 
@@ -150 +150 @@
                                 $working_transport['exthttp'] = new WP_Http_ExtHttp();
                                 $blocking_transport[] = &$working_transport['exthttp'];
+                        } else if ( true === WP_Http_Curl::test($args) ) {
+                                $working_transport['curl'] = new WP_Http_Curl();
+                                $blocking_transport[] = &$working_transport['curl'];
+                        } else if ( true === WP_Http_Streams::test($args) ) {
+                                $working_transport['streams'] = new WP_Http_Streams();
+                                $blocking_transport[] = &$working_transport['streams'];
                         } else if ( true === WP_Http_Fsockopen::test($args) ) {
                                 $working_transport['fsockopen'] = new WP_Http_Fsockopen();
                                 $blocking_transport[] = &$working_transport['fsockopen'];
-                        } else if ( true === WP_Http_Streams::test($args) ) {
-                                $working_transport['streams'] = new WP_Http_Streams();
-                                $blocking_transport[] = &$working_transport['streams'];
-                        } else if ( true === WP_Http_Curl::test($args) ) {
-                                $working_transport['curl'] = new WP_Http_Curl();
-                                $blocking_transport[] = &$working_transport['curl'];
                         }