<!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>[54987] branches/4.8/tests/phpunit/tests/http/http.php: Built/Test tools, HTTP API: Refactor test for multiple location headers.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54987">54987</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/54987","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-12-15 04:43:39 +0000 (Thu, 15 Dec 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Built/Test tools, HTTP API: Refactor test for multiple location headers.
Remove wordpress.org as an external dependency testing `WP_HTTP::handle_redirects()`.
This refactors and reenables an existing test to call the `WP_HTTP::handle_redirects()` method directly with a mocked array of HTTP headers containing multiple location headers.
The test is moved from the external-http group to the http test group as it no longer makes an HTTP request.
Follow up to <a href="https://core.trac.wordpress.org/changeset/54955">[54955]</a>.
Props SergeyBiryukov, dd32, peterwilsoncc.
Merges <a href="https://core.trac.wordpress.org/changeset/54968">[54968]</a> to the 4.8 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/57306">#57306</a>.
See <a href="https://core.trac.wordpress.org/ticket/56793">#56793</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches48testsphpunittestshttpbasephp">branches/4.8/tests/phpunit/tests/http/base.php</a></li>
<li><a href="#branches48testsphpunittestshttphttpphp">branches/4.8/tests/phpunit/tests/http/http.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches48">branches/4.8/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.8
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.8 2022-12-15 04:42:04 UTC (rev 54986)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.8 2022-12-15 04:43:39 UTC (rev 54987)
</ins><a id="branches48"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.8</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:42434,49653
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43684-43686,43836,43853,43988,43994,44014,44017,44047,45005,49523
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:40872-40873,40879,40881,40883,40885,40892-40893,40896-40897,40901,40926-40927,40939,40941,40961,40990-40991,40995,41000,41009,41020,41022,41028,41035,41037,41047,41050,41070,41072,41086,41088,41094,41112,41115-41116,41132,41134,41136,41139,41141,41250-41251,41260,41294,41335,41386,41393,41395,41397-41398,41448,41457,41470,41483,41496,41636,41662,41712,41870,41920,42056,42119-42120,42220,42258-42261,42424,42433,42460-42461,42463,42887,42892-42894,43320,43323,43511-43512,43977,44021,44048,44176,44219,44233,44728,44833,44842,44993,45067,45321,45445,45745,45762,45765,45783-45784,45800,45819,45885,45936,45971,45990,45997,46320,46404,46408-46409,46474-46478,46483,46485,46682,46893,46895,46996,46999,47225,47341,47404,47633-47635,47637-47638,47867-47869,47872-47873,47912,47947-47951,48121,48241,48338,48341,48705,49162,49168-49169,49175,49204,49227-49228,49244,49267,49335,49358,49360,49362
,49369,49371,49380,49382-49388,49548,49636,49781-49784,49786,49836,49876,49933,49937-49939,50017,50126,50176,50185,50192,50268,50285,50298,50379,50387,50413,50416,50432,50435-50436,50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50704,50717,50796,50799,50930,51341,51355,51498,51511,51535,51921,51924-51925,51937,52002,52130,52183,52233,52454-52457,52844,53112,53581-53582,53592,53958-53960,54322,54521-54530,54541
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:40872-40873,40879,40881,40883,40885,40892-40893,40896-40897,40901,40926-40927,40939,40941,40961,40990-40991,40995,41000,41009,41020,41022,41028,41035,41037,41047,41050,41070,41072,41086,41088,41094,41112,41115-41116,41132,41134,41136,41139,41141,41250-41251,41260,41294,41335,41386,41393,41395,41397-41398,41448,41457,41470,41483,41496,41636,41662,41712,41870,41920,42056,42119-42120,42220,42258-42261,42424,42433,42460-42461,42463,42887,42892-42894,43320,43323,43511-43512,43977,44021,44048,44176,44219,44233,44728,44833,44842,44993,45067,45321,45445,45745,45762,45765,45783-45784,45800,45819,45885,45936,45971,45990,45997,46320,46404,46408-46409,46474-46478,46483,46485,46682,46893,46895,46996,46999,47225,47341,47404,47633-47635,47637-47638,47867-47869,47872-47873,47912,47947-47951,48121,48241,48338,48341,48705,49162,49168-49169,49175,49204,49227-49228,49244,49267,49335,49358,49360,49362
,49369,49371,49380,49382-49388,49548,49636,49781-49784,49786,49836,49876,49933,49937-49939,50017,50126,50176,50185,50192,50268,50285,50298,50379,50387,50413,50416,50432,50435-50436,50444,50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50704,50717,50796,50799,50930,51341,51355,51498,51511,51535,51921,51924-51925,51937,52002,52130,52183,52233,52454-52457,52844,53112,53581-53582,53592,53958-53960,54322,54521-54530,54541,54968
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches48testsphpunittestshttpbasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/tests/phpunit/tests/http/base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/tests/phpunit/tests/http/base.php 2022-12-15 04:42:04 UTC (rev 54986)
+++ branches/4.8/tests/phpunit/tests/http/base.php 2022-12-15 04:43:39 UTC (rev 54987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,26 +356,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Test HTTP Redirects with multiple Location headers specified
- *
- * @ticket 16890
- */
- function test_multiple_location_headers() {
- $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?multiple-location-headers=1';
- $res = wp_remote_head( $url, array( 'timeout' => 30 ) );
-
- $this->skipTestOnTimeout( $res );
- $this->assertInternalType( 'array', wp_remote_retrieve_header( $res, 'location' ) );
- $this->assertCount( 2, wp_remote_retrieve_header( $res, 'location' ) );
-
- $res = wp_remote_get( $url, array( 'timeout' => 30 ) );
-
- $this->skipTestOnTimeout( $res );
- $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
-
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Test HTTP Cookie handling
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21182
</span></span></pre></div>
<a id="branches48testsphpunittestshttphttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/tests/phpunit/tests/http/http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/tests/phpunit/tests/http/http.php 2022-12-15 04:42:04 UTC (rev 54986)
+++ branches/4.8/tests/phpunit/tests/http/http.php 2022-12-15 04:43:39 UTC (rev 54987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,4 +314,81 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Test HTTP Redirects with multiple Location headers specified.
+ *
+ * Ensure the WP_HTTP::handle_redirects() method handles multiple Location headers
+ * and the HTTP request it makes uses the last Location header.
+ *
+ * @ticket 16890
+ * @ticket 57306
+ *
+ * @covers WP_HTTP::handle_redirects
+ */
+ public function test_multiple_location_headers() {
+ $pre_http_request_filter_has_run = false;
+ // Filter the response made by WP_HTTP::handle_redirects().
+ add_filter(
+ 'pre_http_request',
+ array( $this, 'filter_for_multiple_location_headers' ),
+ 10,
+ 3
+ );
+
+ $headers = array(
+ 'server' => 'nginx',
+ 'date' => 'Sun, 11 Dec 2022 23:11:22 GMT',
+ 'content-type' => 'text/html; charset=utf-8',
+ 'location' => array(
+ 'http://example.com/?multiple-location-headers=1&redirected=one',
+ 'http://example.com/?multiple-location-headers=1&redirected=two',
+ ),
+ );
+
+ // Test the tests: ensure multiple locations are passed to WP_HTTP::handle_redirects().
+ $this->assertTrue( is_array( $headers['location'] ), 'Location header is expected to be an array.' );
+ $this->assertCount( 2, $headers['location'], 'Location header is expected to contain two values.' );
+
+ $args = array(
+ 'timeout' => 30,
+ '_redirection' => 3,
+ 'redirection' => 2,
+ 'method' => 'GET',
+ );
+
+ $redirect_response = _wp_http_get_object()->handle_redirects(
+ 'http://example.com/?multiple-location-headers=1',
+ $args,
+ array(
+ 'headers' => $headers,
+ 'body' => '',
+ 'cookies' => array(),
+ 'filename' => null,
+ 'response' => array(
+ 'code' => 302,
+ 'message' => 'Found',
+ ),
+ )
+ );
+ $this->assertSame( 'PASS', wp_remote_retrieve_body( $redirect_response ), 'Redirect response body is expected to be PASS.' );
+ }
+
+ public function filter_for_multiple_location_headers( $response, $args, $url ) {
+ if ( 'http://example.com/?multiple-location-headers=1&redirected=two' === $url ) {
+ $body = 'PASS';
+ } else {
+ $body = 'FAIL';
+ }
+
+ return array(
+ 'headers' => array(),
+ 'body' => $body,
+ 'response' => array(
+ 'code' => 200,
+ 'message' => 'OK',
+ ),
+ 'cookies' => array(),
+ 'filename' => null,
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>