<!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>[13151] trunk/wp-includes/functions.php: Update wp_get_http()
to handle redirections on HEAD requests.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13151">13151</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-14 11:23:32 +0000 (Sun, 14 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update wp_get_http() to handle redirections on HEAD requests. Un-deprecate $red header to track total redirections. See <a href="http://trac.wordpress.org/ticket/10624">#10624</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (13150 => 13151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-02-14 10:59:37 UTC (rev 13150)
+++ trunk/wp-includes/functions.php 2010-02-14 11:23:32 UTC (rev 13151)
</span><span class="lines">@@ -1236,15 +1236,15 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $url URL to fetch.
</span><span class="cx"> * @param string|bool $file_path Optional. File path to write request to.
</span><del>- * @param bool $deprecated Deprecated. Not used.
</del><ins>+ * @param int $red (private) The number of Redirects followed, Upon 5 being hit, returns false.
</ins><span class="cx"> * @return bool|string False on failure and string of headers if HEAD request.
</span><span class="cx"> */
</span><del>-function wp_get_http( $url, $file_path = false, $deprecated = false ) {
- if ( !empty( $deprecated ) )
- _deprecated_argument( __FUNCTION__, '2.7' );
-
</del><ins>+function wp_get_http( $url, $file_path = false, $red = 1 ) {
</ins><span class="cx"> @set_time_limit( 60 );
</span><span class="cx">
</span><ins>+ if ( $red > 5 )
+ return false;
+
</ins><span class="cx"> $options = array();
</span><span class="cx"> $options['redirection'] = 5;
</span><span class="cx">
</span><span class="lines">@@ -1261,6 +1261,11 @@
</span><span class="cx"> $headers = wp_remote_retrieve_headers( $response );
</span><span class="cx"> $headers['response'] = $response['response']['code'];
</span><span class="cx">
</span><ins>+ // WP_HTTP no longer follows redirects for HEAD requests.
+ if ( 'HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset( $headers['location'] ) ) {
+ return wp_get_http( $headers['location'], $file_path, ++$red );
+ }
+
</ins><span class="cx"> if ( false == $file_path )
</span><span class="cx"> return $headers;
</span><span class="cx">
</span><span class="lines">@@ -4032,4 +4037,4 @@
</span><span class="cx"> function _search_terms_tidy($t) {
</span><span class="cx"> return trim($t, "\"'\n\r ");
</span><span class="cx"> }
</span><del>-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>