<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17598] trunk/wp-includes/class-http.php: Streamline WP_Http_*::test()
methods: Check basic SSL requirements,
only allow filters to disable transports, not enable them after ::test()
has failed.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17598">17598</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-04-05 06:09:43 +0000 (Tue, 05 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Streamline WP_Http_*::test() methods: Check basic SSL requirements, only allow filters to disable transports, not enable them after ::test() has failed. Props mdawaffe for the initial patch. See <a href="http://trac.wordpress.org/ticket/16606">#16606</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (17597 => 17598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2011-04-05 04:06:40 UTC (rev 17597)
+++ trunk/wp-includes/class-http.php 2011-04-05 06:09:43 UTC (rev 17598)
</span><span class="lines">@@ -742,19 +742,18 @@
</span><span class="cx"> * @return boolean False means this class can not be used, true means it can.
</span><span class="cx"> */
</span><span class="cx"> function test( $args = array() ) {
</span><ins>+ if ( ! function_exists( 'fsockopen' ) )
+ return false;
+
</ins><span class="cx"> if ( false !== ($option = get_option( 'disable_fsockopen' )) && time()-$option < 43200 ) // 12 hours
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $is_ssl = isset($args['ssl']) && $args['ssl'];
</del><ins>+ $is_ssl = isset( $args['ssl'] ) && $args['ssl'];
</ins><span class="cx">
</span><del>- if ( ! $is_ssl && function_exists( 'fsockopen' ) )
- $use = true;
- elseif ( $is_ssl && extension_loaded('openssl') && function_exists( 'fsockopen' ) )
- $use = true;
- else
- $use = false;
</del><ins>+ if ( $is_ssl && ! extension_loaded( 'openssl' ) )
+ return false;
</ins><span class="cx">
</span><del>- return apply_filters('use_fsockopen_transport', $use, $args);
</del><ins>+ return apply_filters( 'use_fsockopen_transport', true, $args );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -925,11 +924,19 @@
</span><span class="cx"> *
</span><span class="cx"> * @return boolean False means this class can not be used, true means it can.
</span><span class="cx"> */
</span><del>- function test($args = array()) {
- if ( ! function_exists('fopen') || (function_exists('ini_get') && true != ini_get('allow_url_fopen')) )
</del><ins>+ function test( $args = array() ) {
+ if ( ! function_exists( 'fopen' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- return apply_filters('use_streams_transport', true, $args);
</del><ins>+ if ( ! function_exists( 'ini_get' ) || true != ini_get( 'allow_url_fopen' ) )
+ return false;
+
+ $is_ssl = isset( $args['ssl'] ) && $args['ssl'];
+
+ if ( $is_ssl && ! extension_loaded( 'openssl' ) )
+ return false;
+
+ return apply_filters( 'use_streams_transport', true, $args );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1308,11 +1315,19 @@
</span><span class="cx"> *
</span><span class="cx"> * @return boolean False means this class can not be used, true means it can.
</span><span class="cx"> */
</span><del>- function test($args = array()) {
- if ( function_exists('curl_init') && function_exists('curl_exec') )
- return apply_filters('use_curl_transport', true, $args);
</del><ins>+ function test( $args = array() ) {
+ if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) )
+ return false;
</ins><span class="cx">
</span><del>- return false;
</del><ins>+ $is_ssl = isset( $args['ssl'] ) && $args['ssl'];
+
+ if ( $is_ssl ) {
+ $curl_version = curl_version();
+ if ( ! (CURL_VERSION_SSL & $curl_version['features']) ) // Does this cURL version support SSL requests?
+ return false;
+ }
+
+ return apply_filters( 'use_curl_transport', true, $args );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>