Changeset 25957 for branches/3.7/src/wp-includes/update.php

Timestamp:

10/27/2013 09:09:49 PM (11 years ago)

Author:

nacin

Message:

When an HTTPS request to api.wordpress.org fails, try an insecure HTTP request and issue a warning.

Certain versions of cURL appear to claim OpenSSL support but fail to work. We need to not trap users on older versions while we work this out, and instead fall back to an insecure request.

Merges [25956] to the 3.7 branch.
fixes #25716 for the 3.7 branch.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-includes/update.php (modified) (4 diffs)

branches/3.7/src/wp-includes/update.php

@@ -94 +94 @@
         $post_body = array_merge( $post_body, $extra_stats );
 
-    $url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
-    if ( wp_http_supports( array( 'ssl' ) ) )
+    $url = $http_url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
+    if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
         $url = set_url_scheme( $url, 'https' );
 
@@ -109 +109 @@
 
     $response = wp_remote_post( $url, $options );
+    if ( $ssl && is_wp_error( $response ) ) {
+        trigger_error( __( '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>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+        $response = wp_remote_post( $http_url, $options );
+    }
 
     if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
@@ -247 +251 @@
     );
 
-    $url = 'http://api.wordpress.org/plugins/update-check/1.1/';
-    if ( wp_http_supports( array( 'ssl' ) ) )
+    $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
+    if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
         $url = set_url_scheme( $url, 'https' );
 
     $raw_response = wp_remote_post( $url, $options );
+    if ( $ssl && is_wp_error( $raw_response ) ) {
+        trigger_error( __( '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>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+        $raw_response = wp_remote_post( $http_url, $options );
+    }
 
     if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
@@ -383 +391 @@
     );
 
-    $url = 'http://api.wordpress.org/themes/update-check/1.1/';
-    if ( wp_http_supports( array( 'ssl' ) ) )
+    $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
+    if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
         $url = set_url_scheme( $url, 'https' );
 
     $raw_response = wp_remote_post( $url, $options );
+    if ( $ssl && is_wp_error( $raw_response ) ) {
+        trigger_error( __( '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>.' ) . ' ' . '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)', headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+        $raw_response = wp_remote_post( $http_url, $options );
+    }
 
     if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )