Ticket #9078: 9078.3.diff

wp-includes/http.php

@@ -228 +228 @@
                 static $working_transport, $blocking_transport, $nonblocking_transport;
 
                 if ( is_null($working_transport) ) {
-                        if ( true === WP_Http_ExtHttp::test() && apply_filters('use_http_extension_transport', true) ) {
+                        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() && apply_filters('use_curl_transport', true) ) {
+                        } 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() && apply_filters('use_streams_transport', true) ) {
+                        } 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() && apply_filters('use_fopen_transport', true) && ( isset($args['ssl']) && !$args['ssl'] ) ) {
+                        } 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() && apply_filters('use_fsockopen_transport', true) && ( isset($args['ssl']) && !$args['ssl'] ) ) {
+                        } else if ( true === WP_Http_Fsockopen::test($args) ) {
                                 $working_transport['fsockopen'] = new WP_Http_Fsockopen();
                                 $blocking_transport[] = &$working_transport['fsockopen'];
                         }
@@ -279 +279 @@
                 static $working_transport, $blocking_transport, $nonblocking_transport;
 
                 if ( is_null($working_transport) ) {
-                        if ( true === WP_Http_ExtHttp::test() && apply_filters('use_http_extension_transport', true) ) {
+                        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() && apply_filters('use_curl_transport', true) ) {
+                        } 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() && apply_filters('use_streams_transport', true) ) {
+                        } 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() && apply_filters('use_fsockopen_transport', true) && ( isset($args['ssl']) && !$args['ssl'] ) ) {
+                        } else if ( true === WP_Http_Fsockopen::test($args) ) {
                                 $working_transport['fsockopen'] = new WP_Http_Fsockopen();
                                 $blocking_transport[] = &$working_transport['fsockopen'];
                         }
@@ -382 +382 @@
                 else
                         $r['ssl'] = false;
 
+                // Determine if this request is to OUR install of WordPress
+                if ( stristr(get_bloginfo('url'), $arrURL['host']) )
+                        $r['local'] = true;
+                else 
+                        $r['local'] = false;
+
                 if ( is_null( $r['headers'] ) )
                         $r['headers'] = array();
 
@@ -793 +799 @@
          * @static
          * @return boolean False means this class can not be used, true means it can.
          */
-        function test() {
-                if ( false !== ($option = get_option( 'disable_fsockopen' )) && time()-$option < 43200 ) // 12 hours
+        function test($args = array()) {
+                if ( false !== ($option = get_option( 'disable_fsockopen' )) && time()-$option < 43200 && true != apply_filters('use_fsockopen_transport', true) ) // 12 hours
                         return false;
 
-                if ( function_exists( 'fsockopen' ) )
-                        return true;
+                if ( function_exists( 'fsockopen' ) ) {
+                        if ( isset($args['ssl']) && !$args['ssl'] )
+                                return true;
+                }
 
                 return false;
         }
@@ -906 +914 @@
          * @static
          * @return boolean False means this class can not be used, true means it can.
          */
-        function test() {
-                if ( ! function_exists('fopen') || (function_exists('ini_get') && true != ini_get('allow_url_fopen')) )
-                        return false;
+        function test($args = array()) {
+                if ( function_exists('fopen') && (function_exists('ini_get') && true == ini_get('allow_url_fopen')) && true == apply_filters('use_fopen_transport', true) ) {
+                        if ( 
+                                ( isset($args['ssl']) && !$args['ssl'] ) || 
+                                ( isset($args['local']) && $args['local'] == true && apply_filters('https_local_ssl_verify', true) != true ) || 
+                                ( isset($args['local']) && $args['local'] == false && apply_filters('https_ssl_verify', true) != true ) || 
+                                ( isset($args['sslverify']) && !$args['sslverify'] ) 
+                        ) 
+                                return true;
+                }
 
-                return true;
+                return false;           
         }
 }
 
@@ -1041 +1056 @@
          *
          * @return boolean False means this class can not be used, true means it can.
          */
-        function test() {
-                if ( ! function_exists('fopen') || (function_exists('ini_get') && true != ini_get('allow_url_fopen')) )
+        function test($args = array()) {
+                if ( ! function_exists('fopen') && (function_exists('ini_get') && true != ini_get('allow_url_fopen')) && true != apply_filters('use_streams_transport', true) )
                         return false;
 
                 if ( version_compare(PHP_VERSION, '5.0', '<') )
@@ -1166 +1181 @@
          *
          * @return boolean False means this class can not be used, true means it can.
          */
-        function test() {
-                if ( function_exists('http_request') )
+        function test($args = array()) {
+                if ( function_exists('http_request') && true == apply_filters('use_http_extension_transport', true) )
                         return true;
 
                 return false;
@@ -1318 +1333 @@
          *
          * @return boolean False means this class can not be used, true means it can.
          */
-        function test() {
-                if ( function_exists('curl_init') && function_exists('curl_exec') )
+        function test($args = array()) {
+                if ( function_exists('curl_init') && function_exists('curl_exec') && true == apply_filters('use_curl_transport', true) )
                         return true;
 
                 return false;