Backport v4 updates

[m6w6/ext-http] / tests / client031.phpt

diff --git a/tests/client031.phpt b/tests/client031.phpt
index 32117356b62190f080ad817b00cbc613d7bd9309..73ce7e4c6251cb5ae5147d5b422cfeab1c0c7a66 100644 (file)
--- a/tests/client031.phpt
+++ b/tests/client031.phpt
@@ -16,32 +16,29 @@ echo "Test\n";
 server("cookie.inc", function($port) {
        $client = new http\Client(null, "cookies");
        $client->configure(array("share_cookies" => false));
+
        $request = new http\Client\Request("GET", "http://localhost:$port");
        $client->enqueue($request);
        $client->send();
-       while (($r = $client->getResponse())) {
-               dump_headers(null, $r->getHeaders());
-       }
+       dump_responses($client, ["counter" => 1]);
+
        /* requeue the previous request */
        $client->requeue($request);
-       $request = new http\Client\Request("GET", "http://localhost:$port");
-       $client->enqueue($request);
-       $client->send();
-       while (($r = $client->getResponse())) {
-               dump_headers(null, $r->getHeaders());
-       }
-       $request = new http\Client\Request("GET", "http://localhost:$port");
-       $client->enqueue($request);
        $client->send();
-       while (($r = $client->getResponse())) {
-               dump_headers(null, $r->getHeaders());
+       dump_responses($client, ["counter" => 2]);
+
+       for($i = 0; $i < 3; ++$i) {
+               /* new requests */
+               $request = new http\Client\Request("GET", "http://localhost:$port");
+               $client->enqueue($request);
+               $client->send();
+               dump_responses($client, ["counter" => 1]);
        }
-       $request = new http\Client\Request("GET", "http://localhost:$port");
-       $client->enqueue($request);
+
+       /* requeue the previous request */
+       $client->requeue($request);
        $client->send();
-       while (($r = $client->getResponse())) {
-               dump_headers(null, $r->getHeaders());
-       }
+       dump_responses($client, ["counter" => 2]);
 });
 
 ?>
@@ -53,11 +50,11 @@ Set-Cookie: counter=1;
 X-Original-Transfer-Encoding: chunked
 
 Etag: ""
-Set-Cookie: counter=1;
+Set-Cookie: counter=2;
 X-Original-Transfer-Encoding: chunked
 
 Etag: ""
-Set-Cookie: counter=2;
+Set-Cookie: counter=1;
 X-Original-Transfer-Encoding: chunked
 
 Etag: ""
@@ -68,4 +65,8 @@ Etag: ""
 Set-Cookie: counter=1;
 X-Original-Transfer-Encoding: chunked
 
+Etag: ""
+Set-Cookie: counter=2;
+X-Original-Transfer-Encoding: chunked
+
 ===DONE===