Changeset 41605 for trunk/src/wp-admin/includes/dashboard.php

Timestamp:

09/27/2017 07:59:14 AM (9 years ago)

Author:

dd32

Message:

Standardise on performing api.WordPress.org requests over SSL when possible, falling back to non-SSL when appropriate.
This also standardises the User-Agent used when communicating with WordPress.org, allowing for more consistent version detection.

Fixes #42004.

File:

• trunk/src/wp-admin/includes/dashboard.php (modified) (1 diff)

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

@@ -1510 +1510 @@
 
         if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
+                // include an unmodified $wp_version
+                include( ABSPATH . WPINC . '/version.php' );
+
+                $url = 'http://api.wordpress.org/core/browse-happy/1.1/';
                 $options = array(
-                        'body'                  => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
-                        'user-agent'    => 'WordPress/' . get_bloginfo( 'version' ) . '; ' . home_url()
+                        'body'       => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
+                        'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' )
                 );
 
-                $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
+                if ( wp_http_supports( array( 'ssl' ) ) ) {
+                        $url = set_url_scheme( $url, 'https' );
+                }
+
+                $response = wp_remote_post( $url, $options );
 
                 if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )