Changeset 25308

Timestamp:

09/09/2013 07:53:15 AM (11 years ago)

Author:

dd32

Message:

Switch to using HTTPS connections for Plugin and Theme API requests when SSL is available. See #18577

Location:

trunk/src

Files:

• wp-admin/includes/plugin-install.php (modified) (1 diff)
• wp-admin/includes/theme.php (modified) (1 diff)
• wp-includes/update.php (modified) (3 diffs)

trunk/src/wp-admin/includes/plugin-install.php

@@ -42 +42 @@
 
     if ( false === $res ) {
-        $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array( 'timeout' => 15, 'body' => array('action' => $action, 'request' => serialize($args))) );
+        $url = 'http://api.wordpress.org/plugins/info/1.0/';
+        if ( wp_http_supports( array( 'ssl' ) ) )
+            $url = set_url_scheme( $url, 'https' );
+
+        $request = wp_remote_post( $url, array(
+            'timeout' => 15,
+            'body' => array(
+                'action' => $action,
+                'request' => serialize( $args )
+            )
+        ) );
+
         if ( is_wp_error($request) ) {
             $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );

trunk/src/wp-admin/includes/theme.php

@@ -283 +283 @@
 
     if ( ! $res ) {
-        $request = wp_remote_post('http://api.wordpress.org/themes/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) );
+        $url = 'http://api.wordpress.org/themes/info/1.0/';
+        if ( wp_http_supports( array( 'ssl' ) ) )
+            $url = set_url_scheme( $url, 'https' );
+
+        $request = wp_remote_post( $url, array(
+            'body' => array(
+                'action' => $action,
+                'request' => serialize( $args )
+            )
+        ) );
+
         if ( is_wp_error($request) ) {
             $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );

trunk/src/wp-includes/update.php

@@ -77 +77 @@
 
     $url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
-
     if ( wp_http_supports( array( 'ssl' ) ) )
         $url = set_url_scheme( $url, 'https' );
@@ -206 +205 @@
     );
 
-    $raw_response = wp_remote_post('http://api.wordpress.org/plugins/update-check/1.0/', $options);
+    $url = 'http://api.wordpress.org/plugins/update-check/1.0/';
+    if ( wp_http_supports( array( 'ssl' ) ) )
+        $url = set_url_scheme( $url, 'https' );
+
+    $raw_response = wp_remote_post( $url, $options );
 
     if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
@@ -311 +314 @@
     );
 
-    $raw_response = wp_remote_post( 'http://api.wordpress.org/themes/update-check/1.0/', $options );
+    $url = 'http://api.wordpress.org/themes/update-check/1.0/';
+    if ( wp_http_supports( array( 'ssl' ) ) )
+        $url = set_url_scheme( $url, 'https' );
+
+    $raw_response = wp_remote_post( $url, $options );
 
     if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )