<!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>[25046] trunk: WP_HTTP: Cookies: When following redirects, include the request cookies in the redirected requests.</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/25046">25046</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-08-17 01:19:04 +0000 (Sat, 17 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>WP_HTTP: Cookies: When following redirects, include the request cookies in the redirected requests. Fixes <a href="http://core.trac.wordpress.org/ticket/24987">#24987</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
<li><a href="#trunktestsdataWPHTTPtestcaseredirectionscriptphp">trunk/tests/data/WPHTTP-testcase-redirection-script.php</a></li>
<li><a href="#trunkteststestshttpbasephp">trunk/tests/tests/http/base.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 (25045 => 25046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-http.php 2013-08-17 01:00:25 UTC (rev 25045)
+++ trunk/src/wp-includes/class-http.php 2013-08-17 01:19:04 UTC (rev 25046)
</span><span class="lines">@@ -195,7 +195,19 @@
</span><span class="cx"> $r['headers']['Content-Length'] = strlen( $r['body'] );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return $this->_dispatch_request($url, $r);
</del><ins>+ $response = $this->_dispatch_request($url, $r);
+
+ // Append cookies that were used in this request to the response
+ if ( ! empty( $r['cookies'] ) ) {
+ $cookies_set = wp_list_pluck( $response['cookies'], 'name' );
+ foreach ( $r['cookies'] as $cookie ) {
+ if ( ! in_array( $cookie->name, $cookies_set ) && $cookie->test( $url ) ) {
+ $response['cookies'][] = $cookie;
+ }
+ }
+ }
+
+ return $response;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -639,6 +651,14 @@
</span><span class="cx"> $args['method'] = 'GET';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Include valid cookies in the redirect process
+ if ( ! empty( $response['cookies'] ) ) {
+ foreach ( $response['cookies'] as $cookie ) {
+ if ( $cookie->test( $redirect_location ) )
+ $args['cookies'][] = $cookie;
+ }
+ }
+
</ins><span class="cx"> return wp_remote_request( $redirect_location, $args );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsdataWPHTTPtestcaseredirectionscriptphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/data/WPHTTP-testcase-redirection-script.php (25045 => 25046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/data/WPHTTP-testcase-redirection-script.php 2013-08-17 01:00:25 UTC (rev 25045)
+++ trunk/tests/data/WPHTTP-testcase-redirection-script.php 2013-08-17 01:19:04 UTC (rev 25046)
</span><span class="lines">@@ -96,6 +96,33 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if ( isset( $_GET['cookie-test'] ) ) {
+ if ( 'test-cookie' != $_GET['cookie-test'] ) {
+ setcookie( 'api_test_cookie', 'value', time() + 365*24*60*60, '/core/tests/1.0/', 'api.wordpress.org' );
+ setcookie( 'api_test_cookie_minimal', 'value' );
+ setcookie( 'api_test_cookie_wrong_host', 'value', time() + 365*24*60*60, '/', 'example.com' );
+ setcookie( 'api_test_wildcard_domain', 'value', time() + 365*24*60*60, '/', '.wordpress.org' );
+ setcookie( 'api_test_cookie_expired', 'value', time() - 365*24*60*60, '/', '.wordpress.org' );
+ header( "Location: $url?cookie-test=test-cookie" );
+ exit;
+ }
+
+ if ( empty( $_COOKIE['api_test_cookie'] ) || 'value' != $_COOKIE['api_test_cookie'] )
+ die( 'FAIL_NO_COOKIE' );
+ if ( empty( $_COOKIE['api_test_cookie_minimal'] ) )
+ die( 'FAIL_NO_MINIMAL' );
+ if ( isset( $_COOKIE['api_test_cookie_wrong_host'] ) )
+ die( 'FAIL_WRONG_HOST' );
+ if ( empty( $_COOKIE['api_test_wildcard_domain'] ) )
+ die( 'FAIL_NO_WILDCARD' );
+ if ( isset( $_COOKIE['api_test_cookie_expired'] ) )
+ die( 'FAIL_EXPIRED_COOKIE' );
+
+ echo 'PASS';
+ exit;
+}
+
+
</ins><span class="cx"> $rt = isset($_GET['rt']) ? $_GET['rt'] : 5;
</span><span class="cx"> $r = isset($_GET['r']) ? $_GET['r'] : 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststestshttpbasephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/tests/http/base.php (25045 => 25046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/tests/http/base.php 2013-08-17 01:00:25 UTC (rev 25045)
+++ trunk/tests/tests/http/base.php 2013-08-17 01:19:04 UTC (rev 25046)
</span><span class="lines">@@ -259,4 +259,15 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Test HTTP Cookie handling
+ *
+ * @ticket 21182
+ */
+ function test_cookie_handling() {
+ $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?cookie-test=1';
+
+ $res = wp_remote_get( $url );
+ $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>