<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[41605] trunk/src: Standardise on performing api.WordPress.org requests over SSL when possible, falling back to non-SSL when appropriate.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/41605">41605</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/41605","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-09-27 07:59:14 +0000 (Wed, 27 Sep 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/42004">#42004</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpcommunityeventsphp">trunk/src/wp-admin/includes/class-wp-community-events.php</a></li>
<li><a href="#trunksrcwpadminincludescreditsphp">trunk/src/wp-admin/includes/credits.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesimportphp">trunk/src/wp-admin/includes/import.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpcommunityeventsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-community-events.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-community-events.php 2017-09-26 21:14:28 UTC (rev 41604)
+++ trunk/src/wp-admin/includes/class-wp-community-events.php 2017-09-27 07:59:14 UTC (rev 41605)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,8 +92,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $cached_events;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $api_url = 'https://api.wordpress.org/events/1.0/';
- $request_args = $this->get_request_args( $location_search, $timezone );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // include an unmodified $wp_version
+ include( ABSPATH . WPINC . '/version.php' );
+
+ $api_url = 'http://api.wordpress.org/events/1.0/';
+ $request_args = $this->get_request_args( $location_search, $timezone );
+ $request_args['user-agent'] = 'WordPress/' . $wp_version . '; ' . home_url( '/' );
+
+ if ( wp_http_supports( array( 'ssl' ) ) ) {
+ $api_url = set_url_scheme( $api_url, 'https' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( $api_url, $request_args );
</span><span class="cx" style="display: block; padding: 0 10px"> $response_code = wp_remote_retrieve_response_code( $response );
</span><span class="cx" style="display: block; padding: 0 10px"> $response_body = json_decode( wp_remote_retrieve_body( $response ), true );
</span></span></pre></div>
<a id="trunksrcwpadminincludescreditsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/credits.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/credits.php 2017-09-26 21:14:28 UTC (rev 41604)
+++ trunk/src/wp-admin/includes/credits.php 2017-09-27 07:59:14 UTC (rev 41605)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|false A list of all of the contributors, or false on error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_credits() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_version = get_bloginfo( 'version' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // include an unmodified $wp_version
+ include( ABSPATH . WPINC . '/version.php' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $locale = get_user_locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = get_site_transient( 'wordpress_credits_' . $locale );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,8 +26,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> || false !== strpos( $wp_version, '-' )
</span><span class="cx" style="display: block; padding: 0 10px"> || ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version={$wp_version}&locale={$locale}" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = "http://api.wordpress.org/core/credits/1.1/?version={$wp_version}&locale={$locale}";
+ $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_http_supports( array( 'ssl' ) ) ) {
+ $url = set_url_scheme( $url, 'https' );
+ }
+
+ $response = wp_remote_get( $url, $options );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2017-09-26 21:14:28 UTC (rev 41604)
+++ trunk/src/wp-admin/includes/dashboard.php 2017-09-27 07:59:14 UTC (rev 41605)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1509,13 +1509,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $_SERVER['HTTP_USER_AGENT'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // include an unmodified $wp_version
+ include( ABSPATH . WPINC . '/version.php' );
+
+ $url = 'http://api.wordpress.org/core/browse-happy/1.1/';
</ins><span class="cx" style="display: block; padding: 0 10px"> $options = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'body' => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
- 'user-agent' => 'WordPress/' . get_bloginfo( 'version' ) . '; ' . home_url()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'body' => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
+ 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_http_supports( array( 'ssl' ) ) ) {
+ $url = set_url_scheme( $url, 'https' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = wp_remote_post( $url, $options );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/import.php 2017-09-26 21:14:28 UTC (rev 41604)
+++ trunk/src/wp-admin/includes/import.php 2017-09-27 07:59:14 UTC (rev 41605)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,10 +131,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $popular_importers ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'locale' => get_user_locale(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'locale' => $locale,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'version' => $wp_version,
</span><span class="cx" style="display: block; padding: 0 10px"> ), 'http://api.wordpress.org/core/importers/1.1/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
+
+ if ( wp_http_supports( array( 'ssl' ) ) ) {
+ $url = set_url_scheme( $url, 'https' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( $url, $options );
</span><span class="cx" style="display: block; padding: 0 10px"> $popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2017-09-26 21:14:28 UTC (rev 41604)
+++ trunk/src/wp-admin/includes/plugin-install.php 2017-09-27 07:59:14 UTC (rev 41605)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,12 +141,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $res = apply_filters( 'plugins_api', false, $action, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $res ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // include an unmodified $wp_version
+ include( ABSPATH . WPINC . '/version.php' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( $url, 'https' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $http_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'timeout' => 15,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'body' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => $action,
</span><span class="cx" style="display: block; padding: 0 10px"> 'request' => serialize( $args )
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2017-09-26 21:14:28 UTC (rev 41604)
+++ trunk/src/wp-admin/includes/theme.php 2017-09-27 07:59:14 UTC (rev 41605)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,11 +448,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $res = apply_filters( 'themes_api', false, $action, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $res ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // include an unmodified $wp_version
+ include( ABSPATH . WPINC . '/version.php' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( $url, 'https' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $http_args = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'body' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => $action,
</span><span class="cx" style="display: block; padding: 0 10px"> 'request' => serialize( $args )
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/update.php 2017-09-26 21:14:28 UTC (rev 41604)
+++ trunk/src/wp-includes/update.php 2017-09-27 07:59:14 UTC (rev 41605)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,7 +301,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'locale' => wp_json_encode( $locales ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'all' => wp_json_encode( true ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $extra_stats ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,7 +479,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'translations' => wp_json_encode( $translations ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'locale' => wp_json_encode( $locales ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $extra_stats ) {
</span></span></pre>
</div>
</div>
</body>
</html>