<!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>[25957] branches/3.7: When an HTTPS request to api.wordpress.org fails, try an insecure HTTP request and issue a warning.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25957">25957</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-10-27 21:09:49 +0000 (Sun, 27 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/changeset/25956">[25956]</a> to the 3.7 branch.
fixes <a href="http://core.trac.wordpress.org/ticket/25716">#25716</a> for the 3.7 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches37srcwpadminaboutphp">branches/3.7/src/wp-admin/about.php</a></li>
<li><a href="#branches37srcwpadminincludesplugininstallphp">branches/3.7/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#branches37srcwpadminincludesthemephp">branches/3.7/src/wp-admin/includes/theme.php</a></li>
<li><a href="#branches37srcwpadminincludesupdatephp">branches/3.7/src/wp-admin/includes/update.php</a></li>
<li><a href="#branches37srcwpadminupdatecorephp">branches/3.7/src/wp-admin/update-core.php</a></li>
<li><a href="#branches37srcwpincludesupdatephp">branches/3.7/src/wp-includes/update.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches37">branches/3.7/</a></li>
<li><a href="#branches37src">branches/3.7/src/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.7
</span><span class="cx">===================================================================
</span><del>--- branches/3.7 2013-10-27 21:08:25 UTC (rev 25956)
</del><ins>+++ branches/3.7 2013-10-27 21:09:49 UTC (rev 25957)
</ins><a id="branches37"></a>
<div class="propset"><h4>Property changes: branches/3.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954
</del><ins>+/trunk:18512,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956
</ins><span class="cx">\ No newline at end of property
</span><span class="cx">Index: branches/3.7/src
</span><span class="cx">===================================================================
</span><del>--- branches/3.7/src 2013-10-27 21:08:25 UTC (rev 25956)
</del><ins>+++ branches/3.7/src 2013-10-27 21:09:49 UTC (rev 25957)
</ins><a id="branches37src"></a>
<div class="propset"><h4>Property changes: branches/3.7/src</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1/src:18031
</span><span class="cx"> /branches/3.3/src:20543
</span><span class="cx"> /branches/3.4/src:21757
</span><del>-/trunk/src:18512,25880,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954
</del><ins>+/trunk/src:18512,25880,25882-25884,25889,25891,25893,25895,25897,25899,25902,25915,25921,25923,25925,25929,25933,25954,25956
</ins><span class="cx">\ No newline at end of property
</span><a id="branches37srcwpadminaboutphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/about.php (25956 => 25957)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/about.php 2013-10-27 21:08:25 UTC (rev 25956)
+++ branches/3.7/src/wp-admin/about.php 2013-10-27 21:09:49 UTC (rev 25957)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> );
</span><span class="cx"> require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
</span><span class="cx"> $updater = new WP_Automatic_Updater;
</span><del>- $can_auto_update = wp_http_supports( 'ssl' ) && $updater->should_update( 'core', $future_minor_update, ABSPATH );
</del><ins>+ $can_auto_update = wp_http_supports( array( 'ssl' ) ) && $updater->should_update( 'core', $future_minor_update, ABSPATH );
</ins><span class="cx">
</span><span class="cx"> if ( $can_auto_update ) {
</span><span class="cx"> echo '<p class="about-auto-update cool">' . __( 'This site <strong>is</strong> able to apply these updates automatically. Cool!' ). '</p>';
</span></span></pre></div>
<a id="branches37srcwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/includes/plugin-install.php (25956 => 25957)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/includes/plugin-install.php 2013-10-27 21:08:25 UTC (rev 25956)
+++ branches/3.7/src/wp-admin/includes/plugin-install.php 2013-10-27 21:09:49 UTC (rev 25957)
</span><span class="lines">@@ -60,18 +60,24 @@
</span><span class="cx"> $res = apply_filters( 'plugins_api', false, $action, $args );
</span><span class="cx">
</span><span class="cx"> if ( false === $res ) {
</span><del>- $url = 'http://api.wordpress.org/plugins/info/1.0/';
- if ( wp_http_supports( array( 'ssl' ) ) )
</del><ins>+ $url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
+ if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
</ins><span class="cx"> $url = set_url_scheme( $url, 'https' );
</span><span class="cx">
</span><del>- $request = wp_remote_post( $url, array(
</del><ins>+ $args = array(
</ins><span class="cx"> 'timeout' => 15,
</span><span class="cx"> 'body' => array(
</span><span class="cx"> 'action' => $action,
</span><span class="cx"> 'request' => serialize( $args )
</span><span class="cx"> )
</span><del>- ) );
</del><ins>+ );
+ $request = wp_remote_post( $url, $args );
</ins><span class="cx">
</span><ins>+ if ( $ssl && is_wp_error( $request ) ) {
+ trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’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 );
+ $request = wp_remote_post( $http_url, $args );
+ }
+
</ins><span class="cx"> if ( is_wp_error($request) ) {
</span><span class="cx"> $res = new WP_Error('plugins_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="branches37srcwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/includes/theme.php (25956 => 25957)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/includes/theme.php 2013-10-27 21:08:25 UTC (rev 25956)
+++ branches/3.7/src/wp-admin/includes/theme.php 2013-10-27 21:09:49 UTC (rev 25957)
</span><span class="lines">@@ -282,17 +282,23 @@
</span><span class="cx"> $res = apply_filters('themes_api', false, $action, $args); //NOTE: Allows a theme to completely override the builtin WordPress.org API.
</span><span class="cx">
</span><span class="cx"> if ( ! $res ) {
</span><del>- $url = 'http://api.wordpress.org/themes/info/1.0/';
- if ( wp_http_supports( array( 'ssl' ) ) )
</del><ins>+ $url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
+ if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
</ins><span class="cx"> $url = set_url_scheme( $url, 'https' );
</span><span class="cx">
</span><del>- $request = wp_remote_post( $url, array(
</del><ins>+ $args = array(
</ins><span class="cx"> 'body' => array(
</span><span class="cx"> 'action' => $action,
</span><span class="cx"> 'request' => serialize( $args )
</span><span class="cx"> )
</span><del>- ) );
</del><ins>+ );
+ $request = wp_remote_post( $url, $args );
</ins><span class="cx">
</span><ins>+ if ( $ssl && is_wp_error( $request ) ) {
+ trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’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 );
+ $request = wp_remote_post( $http_url, $args );
+ }
+
</ins><span class="cx"> if ( is_wp_error($request) ) {
</span><span class="cx"> $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the <a href="http://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="branches37srcwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/includes/update.php (25956 => 25957)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/includes/update.php 2013-10-27 21:08:25 UTC (rev 25956)
+++ branches/3.7/src/wp-admin/includes/update.php 2013-10-27 21:09:49 UTC (rev 25957)
</span><span class="lines">@@ -103,9 +103,9 @@
</span><span class="cx"> function get_core_checksums( $version, $locale ) {
</span><span class="cx"> $return = array();
</span><span class="cx">
</span><del>- $url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
</del><ins>+ $url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
</ins><span class="cx">
</span><del>- if ( wp_http_supports( array( 'ssl' ) ) )
</del><ins>+ if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
</ins><span class="cx"> $url = set_url_scheme( $url, 'https' );
</span><span class="cx">
</span><span class="cx"> $options = array(
</span><span class="lines">@@ -113,6 +113,10 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $response = wp_remote_get( $url, $options );
</span><ins>+ if ( $ssl && is_wp_error( $response ) ) {
+ trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’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_get( $http_url, $options );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branches37srcwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/update-core.php (25956 => 25957)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/update-core.php 2013-10-27 21:08:25 UTC (rev 25956)
+++ branches/3.7/src/wp-admin/update-core.php 2013-10-27 21:09:49 UTC (rev 25957)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> echo '<h3>';
</span><span class="cx"> _e('You have the latest version of WordPress.');
</span><span class="cx">
</span><del>- if ( wp_http_supports( 'ssl' ) ) {
</del><ins>+ if ( wp_http_supports( array( 'ssl' ) ) ) {
</ins><span class="cx"> require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
</span><span class="cx"> $upgrader = new WP_Automatic_Updater;
</span><span class="cx"> $future_minor_update = (object) array(
</span></span></pre></div>
<a id="branches37srcwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/update.php (25956 => 25957)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/update.php 2013-10-27 21:08:25 UTC (rev 25956)
+++ branches/3.7/src/wp-includes/update.php 2013-10-27 21:09:49 UTC (rev 25957)
</span><span class="lines">@@ -93,8 +93,8 @@
</span><span class="cx"> if ( $extra_stats )
</span><span class="cx"> $post_body = array_merge( $post_body, $extra_stats );
</span><span class="cx">
</span><del>- $url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
- if ( wp_http_supports( array( 'ssl' ) ) )
</del><ins>+ $url = $http_url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
+ if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
</ins><span class="cx"> $url = set_url_scheme( $url, 'https' );
</span><span class="cx">
</span><span class="cx"> $options = array(
</span><span class="lines">@@ -108,6 +108,10 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $response = wp_remote_post( $url, $options );
</span><ins>+ if ( $ssl && is_wp_error( $response ) ) {
+ trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’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 );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -246,11 +250,15 @@
</span><span class="cx"> 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $url = 'http://api.wordpress.org/plugins/update-check/1.1/';
- if ( wp_http_supports( array( 'ssl' ) ) )
</del><ins>+ $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
+ if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
</ins><span class="cx"> $url = set_url_scheme( $url, 'https' );
</span><span class="cx">
</span><span class="cx"> $raw_response = wp_remote_post( $url, $options );
</span><ins>+ if ( $ssl && is_wp_error( $raw_response ) ) {
+ trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’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 );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -382,11 +390,15 @@
</span><span class="cx"> 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $url = 'http://api.wordpress.org/themes/update-check/1.1/';
- if ( wp_http_supports( array( 'ssl' ) ) )
</del><ins>+ $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
+ if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
</ins><span class="cx"> $url = set_url_scheme( $url, 'https' );
</span><span class="cx">
</span><span class="cx"> $raw_response = wp_remote_post( $url, $options );
</span><ins>+ if ( $ssl && is_wp_error( $raw_response ) ) {
+ trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’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 );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) )
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>