Ticket #19555: 19555.patch

wp-includes/functions.php

@@ -2670 +2670 @@
 }
 
 /**
- * Determines if the blog can be accessed over SSL.
- *
- * Determines if blog can be accessed over SSL by using cURL to access the site
- * using the https in the siteurl. Requires cURL extension to work correctly.
- *
- * @since 2.5.0
- *
- * @param string $url
- * @return bool Whether SSL access is available
- */
-function url_is_accessable_via_ssl($url)
-{
-        if (in_array('curl', get_loaded_extensions())) {
-                $ssl = preg_replace( '/^http:\/\//', 'https://',  $url );
-
-                $ch = curl_init();
-                curl_setopt($ch, CURLOPT_URL, $ssl);
-                curl_setopt($ch, CURLOPT_FAILONERROR, true);
-                curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-                curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-                curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-
-                curl_exec($ch);
-
-                $status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-                curl_close ($ch);
-
-                if ($status == 200 || $status == 401) {
-                        return true;
-                }
-        }
-        return false;
-}
-
-/**
  * Marks a function as deprecated and informs when it has been used.
  *
  * There is a hook deprecated_function_run that will be called that can be used

wp-includes/deprecated.php

@@ -2866 +2866 @@
 
         return is_user_member_of_blog( get_current_user_id(), $blog_id );
 }
+
+/**
+ * Determines if the blog can be accessed over SSL.
+ *
+ * Determines if blog can be accessed over SSL by using cURL to access the site
+ * using the https in the siteurl. Requires cURL extension to work correctly.
+ *
+ * @since 2.5.0
+ * @deprecated 3.3
+ *
+ * @param string $url
+ * @return bool Whether SSL access is available
+ */
+function url_is_accessable_via_ssl($url)
+{
+        _deprecated_function( __FUNCTION__, '3.3', '' );
+        $ssl = preg_replace( '/^http:\/\//', 'https://',  $url );
+
+        $response = wp_remote_get( $ssl );
+
+        if( !is_wp_error( $response ) ) {
+                $status = $response['response']['code'];
+                if ($status == 200 || $status == 401) {
+                        return true;
+                }
+        }
+
+        return false;
+}