<!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>[25221] trunk/src/wp-includes/class-http.php: WP_HTTP: Clean up some comments style and remove outdated information.</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/25221">25221</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-09-03 08:36:05 +0000 (Tue, 03 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>WP_HTTP: Clean up some comments style and remove outdated information.
The change to the proxy block here is for consistency, WP_HTTP_Proxy::block_request() is never called before parse_url() has successfully operated on the URL, and in the event we cannot read the URL, it shouldn't be requested.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-http.php (25220 => 25221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-http.php 2013-09-03 07:11:35 UTC (rev 25220)
+++ trunk/src/wp-includes/class-http.php 2013-09-03 08:36:05 UTC (rev 25221)
</span><span class="lines">@@ -15,16 +15,10 @@
</span><span class="cx"> /**
</span><span class="cx"> * WordPress HTTP Class for managing HTTP Transports and making HTTP requests.
</span><span class="cx"> *
</span><del>- * This class is called for the functionality of making HTTP requests and replaces Snoopy
- * functionality. There is no available functionality to add HTTP transport implementations, since
- * most of the HTTP transports are added and available for use.
</del><ins>+ * This class is used to consistently make outgoing HTTP requests easy for developers
+ * while still being compatible with the many PHP configurations under which
+ * WordPress runs.
</ins><span class="cx"> *
</span><del>- * There are no properties, because none are needed and for performance reasons. Some of the
- * functions are static and while they do have some overhead over functions in PHP4, the purpose is
- * maintainability. When PHP5 is finally the requirement, it will be easy to add the static keyword
- * to the code. It is not as easy to convert a function to a method after enough code uses the old
- * way.
- *
</del><span class="cx"> * Debugging includes several actions, which pass different variables for debugging the HTTP API.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="lines">@@ -42,8 +36,7 @@
</span><span class="cx"> * using http_build_query().
</span><span class="cx"> *
</span><span class="cx"> * The only URI that are supported in the HTTP Transport implementation are the HTTP and HTTPS
</span><del>- * protocols. HTTP and HTTPS are assumed so the server might not know how to handle the send
- * headers. Other protocols are unsupported and most likely will fail.
</del><ins>+ * protocols.
</ins><span class="cx"> *
</span><span class="cx"> * The defaults are 'method', 'timeout', 'redirection', 'httpversion', 'blocking' and
</span><span class="cx"> * 'user-agent'.
</span><span class="lines">@@ -59,20 +52,13 @@
</span><span class="cx"> * replace the default user-agent, which is 'WordPress/WP_Version', where WP_Version is the
</span><span class="cx"> * value from $wp_version.
</span><span class="cx"> *
</span><del>- * 'blocking' is the default, which is used to tell the transport, whether it should halt PHP
- * while it performs the request or continue regardless. Actually, that isn't entirely correct.
- * Blocking mode really just means whether the fread should just pull what it can whenever it
- * gets bytes or if it should wait until it has enough in the buffer to read or finishes reading
- * the entire content. It doesn't actually always mean that PHP will continue going after making
- * the request.
</del><ins>+ * The 'blocking' parameter can be used to specify if the calling code requires the result of
+ * the HTTP request. If set to false, the request will be sent to the remote server, and
+ * processing returned to the calling code immediately, the caller will know if the request
+ * suceeded or failed, but will not receive any response from the remote server.
</ins><span class="cx"> *
</span><span class="cx"> * @access public
</span><span class="cx"> * @since 2.7.0
</span><del>- * @todo Refactor this code. The code in this method extends the scope of its original purpose
- * and should be refactored to allow for cleaner abstraction and reduce duplication of the
- * code. One suggestion is to create a class specifically for the arguments, however
- * preliminary refactoring to this affect has affect more than just the scope of the
- * arguments. Something to ponder at least.
</del><span class="cx"> *
</span><span class="cx"> * @param string $url URI resource.
</span><span class="cx"> * @param str|array $args Optional. Override the defaults.
</span><span class="lines">@@ -253,11 +239,6 @@
</span><span class="cx"> * The order for blocking requests is cURL, Streams, and finally Fsockopen.
</span><span class="cx"> * The order for non-blocking requests is cURL, Streams and Fsockopen().
</span><span class="cx"> *
</span><del>- * There are currently issues with "localhost" not resolving correctly with DNS. This may cause
- * an error "failed to open stream: A connection attempt failed because the connected party did
- * not properly respond after a period of time, or established connection failed because [the]
- * connected host has failed to respond."
- *
</del><span class="cx"> * @since 3.2.0
</span><span class="cx"> * @access private
</span><span class="cx"> *
</span><span class="lines">@@ -522,20 +503,10 @@
</span><span class="cx"> if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // parse_url() only handles http, https type URLs, and will emit E_WARNING on failure.
- // This will be displayed on blogs, which is not reasonable.
- $check = @parse_url($uri);
</del><ins>+ $check = parse_url($uri);
+ if ( ! $check )
+ return true;
</ins><span class="cx">
</span><del>- /* Malformed URL, can not process, but this could mean ssl, so let through anyway.
- *
- * This isn't very security sound. There are instances where a hacker might attempt
- * to bypass the proxy and this check. However, the reason for this behavior is that
- * WordPress does not do any checking currently for non-proxy requests, so it is keeps with
- * the default unsecure nature of the HTTP request.
- */
- if ( $check === false )
- return false;
-
</del><span class="cx"> $home = parse_url( get_option('siteurl') );
</span><span class="cx">
</span><span class="cx"> // Don't block requests back to ourselves by default
</span></span></pre>
</div>
</div>
</body>
</html>