<!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>[17914] trunk/wp-includes: Introduce wp_http_supports as a much less hacky replacement for the http_transport_(get|post)_debug hooks that plugins could have </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, #logmsg > ol { margin-left: 0; 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://trac.wordpress.org/changeset/17914">17914</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2011-05-13 09:56:59 +0000 (Fri, 13 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce wp_http_supports as a much less hacky replacement for the http_transport_(get|post)_debug hooks that plugins could have
been using to detect if things like ssl requests were working.
See <a href="http://trac.wordpress.org/ticket/17251">#17251</a> props mdawaffe</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludeshttpphp">trunk/wp-includes/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 (17913 => 17914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2011-05-13 06:27:49 UTC (rev 17913)
+++ trunk/wp-includes/class-http.php 2011-05-13 09:56:59 UTC (rev 17914)
</span><span class="lines">@@ -27,10 +27,6 @@
</span><span class="cx"> *
</span><span class="cx"> * Debugging includes several actions, which pass different variables for debugging the HTTP API.
</span><span class="cx"> *
</span><del>- * <strong>http_transport_get_debug</strong> - gives working, nonblocking, and blocking transports.
- *
- * <strong>http_transport_post_debug</strong> - gives working, nonblocking, and blocking transports.
- *
</del><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage HTTP
</span><span class="cx"> * @since 2.7.0
</span><span class="lines">@@ -196,6 +192,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Tests which transports are capabable of supporting the request.
+ *
+ * @since 3.2.0
+ * @access private
+ *
+ * @param array $args Request arguments
+ * @param string $url URL to Request
+ *
+ * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request.
+ */
+ public function _get_first_available_transport( $args, $url = null ) {
+ $request_order = array( 'curl', 'streams', 'fsockopen' );
+
+ // Loop over each transport on each HTTP request looking for one which will serve this request's needs
+ foreach ( $request_order as $transport ) {
+ $class = 'WP_HTTP_' . $transport;
+
+ // Check to see if this transport is a possibility, calls the transport statically
+ if ( !call_user_func( array( $class, 'test' ), $args, $url ) )
+ continue;
+
+ return $class;
+ }
+
+ return false;
+ }
+
+ /**
</ins><span class="cx"> * Dispatches a HTTP request to a supporting transport.
</span><span class="cx"> *
</span><span class="cx"> * Tests each transport in order to find a transport which matches the request arguements.
</span><span class="lines">@@ -216,34 +240,25 @@
</span><span class="cx"> * @param array $args Request arguments
</span><span class="cx"> * @return array|object Array containing 'headers', 'body', 'response', 'cookies'. A WP_Error instance upon error
</span><span class="cx"> */
</span><del>- private function _dispatch_request($url, $args) {
</del><ins>+ private function _dispatch_request( $url, $args ) {
</ins><span class="cx"> static $transports = array();
</span><span class="cx">
</span><del>- $request_order = array('curl', 'streams', 'fsockopen');
</del><ins>+ $class = $this->_get_first_available_transport( $args, $url );
+ if ( !$class )
+ return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
</ins><span class="cx">
</span><del>- // Loop over each transport on each HTTP request looking for one which will serve this requests needs
- foreach ( $request_order as $transport ) {
- $class = 'WP_HTTP_' . $transport;
</del><ins>+ // Transport claims to support request, Instantate it and give it a whirl.
+ if ( empty( $transports[$class] ) )
+ $transports[$class] = new $class;
</ins><span class="cx">
</span><del>- // Check to see if this transport is a possibility, calls the transport statically
- if ( ! call_user_func( array($class, 'test'), $args, $url) )
- continue;
</del><ins>+ $response = $transports[$class]->request( $url, $args );
</ins><span class="cx">
</span><del>- // Transport claims to support request, Instantate it and give it a whirl.
- if ( empty( $transports[ $transport ] ) )
- $transports[ $transport ] = new $class;
</del><ins>+ do_action( 'http_api_debug', $response, 'response', $class );
</ins><span class="cx">
</span><del>- $response = $transports[ $transport ]->request( $url, $args );
</del><ins>+ if ( is_wp_error( $response ) )
+ return $response;
</ins><span class="cx">
</span><del>- do_action( 'http_api_debug', $response, 'response', $class );
-
- if ( is_wp_error( $response ) )
- return $response;
-
- return apply_filters( 'http_response', $response, $args, $url );
- }
-
- return new WP_Error('http_failure', __('There are no HTTP transports available which can complete the requested request.') );
</del><ins>+ return apply_filters( 'http_response', $response, $args, $url );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludeshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/http.php (17913 => 17914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/http.php 2011-05-13 06:27:49 UTC (rev 17913)
+++ trunk/wp-includes/http.php 2011-05-13 09:56:59 UTC (rev 17914)
</span><span class="lines">@@ -191,4 +191,34 @@
</span><span class="cx"> return $response['body'];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+/**
+ * Determins if there is an HTTP Transport that can process this request.
+ *
+ * @since 3.2.0
+ *
+ * @param array $capabilities Array of capabilities to test or a wp_remote_request() $args array.
+ * @param string $url Optional. If given, will check if the URL requires SSL and adds that requirement to the capabilities array.
+ *
+ * @return bool
+ */
+function wp_http_supports( $capabilities = array(), $url = null ) {
+ $objFetchSite = _wp_http_get_object();
+
+ $capabilities = wp_parse_args( $capabilities );
+
+ $count = count( $capabilities );
+
+ // If we have a numeric $capabilities array, spoof a wp_remote_request() associative $args array
+ if ( $count && count( array_filter( array_keys( $capabilities ), 'is_numeric' ) ) == $count ) {
+ $capabilities = array_combine( array_values( $capabilities ), array_fill( 0, $count, true ) );
+ }
+
+ if ( $url && !isset( $capabilities['ssl'] ) ) {
+ $scheme = parse_url( $url, PHP_URL_SCHEME );
+ if ( 'https' == $scheme || 'ssl' == $scheme ) {
+ $capabilities['ssl'] = true;
+ }
+ }
+
+ return (bool) $objFetchSite->_get_first_available_transport( $capabilities );
+}
</ins></span></pre>
</div>
</div>
</body>
</html>