<!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>[24843] trunk/wp-includes/class-http.php: WP_HTTP: Abstract out the Redirection handling code into it's own method and fix a bunch of redirection edgecases at the same time.</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/24843">24843</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-07-29 01:19:54 +0000 (Mon, 29 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>WP_HTTP: Abstract out the Redirection handling code into it's own method and fix a bunch of redirection edgecases at the same time.
Fixes <a href="http://core.trac.wordpress.org/ticket/17588">#17588</a>
Fixes 16889
Props wonderboymusic and kovshenin for initial patches</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 (24842 => 24843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2013-07-29 01:06:31 UTC (rev 24842)
+++ trunk/wp-includes/class-http.php 2013-07-29 01:19:54 UTC (rev 24843)
</span><span class="lines">@@ -593,6 +593,40 @@
</span><span class="cx">
</span><span class="cx"> return $absolute_path . '/' . ltrim( $path, '/' );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Handles HTTP Redirects and follows them if appropriate.
+ *
+ * @since 3.7
+ *
+ * @param $url The URL which was requested
+ * @param $args The Arguements which were used to make the request
+ * @param $response The Response of the HTTP request
+ * @return false|object False if no redirect is present, a WP_HTTP or WP_Error result otherwise
+ */
+ static function handle_redirects( $url, $args, $response ) {
+ // If no redirects are present, or, redirects were not requested, perform no action.
+ if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
+ return false;
+
+ // Only perform redirections on redirection http codes
+ if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
+ return false;
+
+ // Don't redirect if we've run out of redirects
+ if ( $args['redirection']-- <= 0 )
+ return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+
+ $redirect_location = WP_HTTP::make_absolute_url( $response['headers']['location'], $url );
+
+ // POST requests should not POST to a redirected location
+ if ( 'POST' == $args['method'] ) {
+ if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
+ $args['method'] = 'GET';
+ }
+
+ return wp_remote_request( $redirect_location, $args );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -804,15 +838,18 @@
</span><span class="cx">
</span><span class="cx"> $arrHeaders = WP_Http::processHeaders( $process['headers'] );
</span><span class="cx">
</span><del>- // If location is found, then assume redirect and redirect to location.
- if ( isset($arrHeaders['headers']['location']) && 0 !== $r['_redirection'] ) {
- if ( $r['redirection']-- > 0 ) {
- return wp_remote_request( WP_HTTP::make_absolute_url( $arrHeaders['headers']['location'], $url ), $r);
- } else {
- return new WP_Error('http_request_failed', __('Too many redirects.'));
- }
- }
</del><ins>+ $response = array(
+ 'headers' => $arrHeaders['headers'],
+ 'body' => null, // Not yet processed
+ 'response' => $arrHeaders['response'],
+ 'cookies' => $arrHeaders['cookies'],
+ 'filename' => $r['filename']
+ );
</ins><span class="cx">
</span><ins>+ // Handle redirects
+ if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+ return $redirect_response;
+
</ins><span class="cx"> // If the body was chunk encoded, then decode it.
</span><span class="cx"> if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] )
</span><span class="cx"> $process['body'] = WP_Http::chunkTransferDecode($process['body']);
</span><span class="lines">@@ -823,7 +860,9 @@
</span><span class="cx"> if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] )
</span><span class="cx"> $process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
</span><span class="cx">
</span><del>- return array( 'headers' => $arrHeaders['headers'], 'body' => $process['body'], 'response' => $arrHeaders['response'], 'cookies' => $arrHeaders['cookies'], 'filename' => $r['filename'] );
</del><ins>+ $response['body'] = $process['body'];
+
+ return $response;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -995,21 +1034,27 @@
</span><span class="cx"> else
</span><span class="cx"> $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']);
</span><span class="cx">
</span><del>- if ( ! empty( $processedHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections
- if ( $r['redirection']-- > 0 ) {
- return wp_remote_request( WP_HTTP::make_absolute_url( $processedHeaders['headers']['location'], $url ), $r );
- } else {
- return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
- }
- }
</del><ins>+ $response = array(
+ 'headers' => $processedHeaders['headers'],
+ 'body' => null,
+ 'response' => $processedHeaders['response'],
+ 'cookies' => $processedHeaders['cookies'],
+ 'filename' => $r['filename']
+ );
</ins><span class="cx">
</span><ins>+ // Handle redirects
+ if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+ return $redirect_response;
+
</ins><span class="cx"> if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] )
</span><span class="cx"> $strResponse = WP_Http::chunkTransferDecode($strResponse);
</span><span class="cx">
</span><span class="cx"> if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($processedHeaders['headers']) )
</span><span class="cx"> $strResponse = WP_Http_Encoding::decompress( $strResponse );
</span><span class="cx">
</span><del>- return array( 'headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response'], 'cookies' => $processedHeaders['cookies'], 'filename' => $r['filename'] );
</del><ins>+ $response['body'] = $strResponse;
+
+ return $response;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1262,19 +1307,24 @@
</span><span class="cx"> if ( $r['stream'] )
</span><span class="cx"> fclose( $this->stream_handle );
</span><span class="cx">
</span><del>- // See #11305 - When running under safe mode, redirection is disabled above. Handle it manually.
- if ( ! empty( $theHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections
- if ( $r['redirection']-- > 0 ) {
- return wp_remote_request( WP_HTTP::make_absolute_url( $theHeaders['headers']['location'], $url ), $r );
- } else {
- return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
- }
- }
</del><ins>+ $response = array(
+ 'headers' => $theHeaders['headers'],
+ 'body' => null,
+ 'response' => $response,
+ 'cookies' => $theHeaders['cookies'],
+ 'filename' => $r['filename']
+ );
</ins><span class="cx">
</span><ins>+ // Handle redirects
+ if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+ return $redirect_response;
+
</ins><span class="cx"> if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )
</span><span class="cx"> $theBody = WP_Http_Encoding::decompress( $theBody );
</span><span class="cx">
</span><del>- return array( 'headers' => $theHeaders['headers'], 'body' => $theBody, 'response' => $response, 'cookies' => $theHeaders['cookies'], 'filename' => $r['filename'] );
</del><ins>+ $response['body'] = $theBody;
+
+ return $response;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>