Changeset 17598

Timestamp:

04/05/2011 06:09:43 AM (14 years ago)

Author:

dd32

Message:

Streamline WP_Http_*::test() methods: Check basic SSL requirements, only allow filters to disable transports, not enable them after ::test() has failed. Props mdawaffe for the initial patch. See #16606

File:

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

trunk/wp-includes/class-http.php

@@ -743 +743 @@
      */
     function test( $args = array() ) {
+        if ( ! function_exists( 'fsockopen' ) )
+            return false;
+
         if ( false !== ($option = get_option( 'disable_fsockopen' )) && time()-$option < 43200 ) // 12 hours
             return false;
 
-        $is_ssl = isset($args['ssl']) && $args['ssl'];
-
-        if ( ! $is_ssl && function_exists( 'fsockopen' ) )
-            $use = true;
-        elseif ( $is_ssl && extension_loaded('openssl') && function_exists( 'fsockopen' ) )
-            $use = true;
-        else
-            $use = false;
-
-        return apply_filters('use_fsockopen_transport', $use, $args);
+        $is_ssl = isset( $args['ssl'] ) && $args['ssl'];
+
+        if ( $is_ssl && ! extension_loaded( 'openssl' ) )
+            return false;
+
+        return apply_filters( 'use_fsockopen_transport', true, $args );
     }
 }
@@ -926 +925 @@
      * @return boolean False means this class can not be used, true means it can.
      */
-    function test($args = array()) {
-        if ( ! function_exists('fopen') || (function_exists('ini_get') && true != ini_get('allow_url_fopen')) )
+    function test( $args = array() ) {
+        if ( ! function_exists( 'fopen' ) )
             return false;
 
-        return apply_filters('use_streams_transport', true, $args);
+        if ( ! function_exists( 'ini_get' ) || true != ini_get( 'allow_url_fopen' ) )
+            return false;
+
+        $is_ssl = isset( $args['ssl'] ) && $args['ssl'];
+
+        if ( $is_ssl && ! extension_loaded( 'openssl' ) )
+            return false;
+
+        return apply_filters( 'use_streams_transport', true, $args );
     }
 }
@@ -1309 +1316 @@
      * @return boolean False means this class can not be used, true means it can.
      */
-    function test($args = array()) {
-        if ( function_exists('curl_init') && function_exists('curl_exec') )
-            return apply_filters('use_curl_transport', true, $args);
-
-        return false;
+    function test( $args = array() ) {
+        if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) )
+            return false;
+
+        $is_ssl = isset( $args['ssl'] ) && $args['ssl'];
+
+        if ( $is_ssl ) {
+            $curl_version = curl_version();
+            if ( ! (CURL_VERSION_SSL & $curl_version['features']) ) // Does this cURL version support SSL requests?
+                return false;
+        }
+
+        return apply_filters( 'use_curl_transport', true, $args );
     }
 }