Ticket #25716: 25716.diff

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

@@ -60 +60 @@
         $res = apply_filters( 'plugins_api', false, $action, $args );
 
         if ( false === $res ) {
-                $url = 'http://api.wordpress.org/plugins/info/1.0/';
-                if ( wp_http_supports( array( 'ssl' ) ) )
+                $url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
+                if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
                         $url = set_url_scheme( $url, 'https' );
 
-                $request = wp_remote_post( $url, array(
+                $args = array(
                         'timeout' => 15,
                         'body' => array(
                                 'action' => $action,
                                 'request' => serialize( $args )
                         )
-                ) );
+                );
+                $request = wp_remote_post( $url, $args );
 
+                if ( $ssl && is_wp_error( $request ) )
+                        $request = wp_remote_post( $http_url, $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() );
                 } else {