Ticket #14786: 14786.2.patch

wp-includes/class-http.php

@@ -88 +88 @@
         function &_getTransport( $args = array() ) {
                 static $working_transport, $blocking_transport, $nonblocking_transport;
 
-                if ( is_null($working_transport) ) {
-                        if ( true === WP_Http_ExtHttp::test($args) ) {
-                                $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_Fopen::test($args) ) {
-                                $working_transport['fopen'] = new WP_Http_Fopen();
-                                $blocking_transport[] = &$working_transport['fopen'];
-                        } else if ( true === WP_Http_Fsockopen::test($args) ) {
-                                $working_transport['fsockopen'] = new WP_Http_Fsockopen();
-                                $blocking_transport[] = &$working_transport['fsockopen'];
-                        }
+                if ( is_null( $working_transport ) ) {
+                        $transports = array(
+                                'exthttp'   => 'ExtHTTP',
+                                'curl'      => 'Curl',
+                                'streams'   => 'Streams',
+                                'fopen'     => 'Fopen',
+                                'fsockopen' => 'Fsockopen',
+                        );
 
-                        foreach ( array('curl', 'streams', 'fopen', 'fsockopen', 'exthttp') as $transport ) {
-                                if ( isset($working_transport[$transport]) )
-                                        $nonblocking_transport[] = &$working_transport[$transport];
+                        foreach( $transports as $name => $spec) {
+                                $class = 'WP_Http_' . $spec;
+                                if ( !call_user_func( array( $class, 'test' ), $args ) )
+                                        continue;
+
+                                $wp_http = new $class();
+
+                                $working_transport[$name] = &$wp_http; 
+                                $blocking_transport[]     = &$wp_http;
+                                $nonblocking_transport[]  = &$wp_http;
+                                
+                                break;
                         }
                 }