(gcov) tests fixup
authorMichael Wallner <mike@php.net>
Tue, 17 Feb 2015 10:43:07 +0000 (11:43 +0100)
committerMichael Wallner <mike@php.net>
Tue, 17 Feb 2015 10:43:07 +0000 (11:43 +0100)
tests/client018.phpt
tests/client019.phpt
tests/client020.phpt
tests/client026.phpt
tests/helper/proxy.inc

index d3daccb..7acb911 100644 (file)
@@ -1,5 +1,5 @@
 --TEST--
-pipelining
+client pipelining
 --SKIPIF--
 <?php 
 include "skipif.inc";
index 98781e0..e60e5aa 100644 (file)
@@ -1,5 +1,5 @@
 --TEST--
-proxy - send proxy headers for a proxy request
+client proxy - send proxy headers for a proxy request
 --SKIPIF--
 <?php 
 include "skipif.inc";
@@ -18,7 +18,7 @@ server("proxy.inc", function($port, $stdin, $stdout, $stderr) {
        $c = new http\Client;
        $r = new http\Client\Request("GET", "http://www.example.com/");
        $r->setOptions(array(
-                       "timeout" => 3,
+                       "timeout" => 10,
                        "proxytunnel" => true,
                        "proxyheader" => array("Hello" => "there!"),
                        "proxyhost" => "localhost",
@@ -30,7 +30,6 @@ server("proxy.inc", function($port, $stdin, $stdout, $stderr) {
                echo $e;
        }
        echo $c->getResponse()->getBody();
-       unset($r, $client);
 });
 
 ?>
index d8282b4..7ea5d60 100644 (file)
@@ -1,5 +1,5 @@
 --TEST--
-proxy - don't send proxy headers for a standard request
+client proxy - don't send proxy headers for a standard request
 --SKIPIF--
 <?php 
 include "skipif.inc";
index 1e73db2..d89e98e 100644 (file)
@@ -19,7 +19,7 @@ server("proxy.inc", function($port) {
        for ($i = 0, $data = str_repeat("a",1024); $i < 128*1024; ++$i) {
                $request->getBody()->append($data);
        }
-       $request->setOptions(["expect_100_timeout" => 0]);
+       $request->setOptions(["timeout" => 10, "expect_100_timeout" => 0]);
        $client->enqueue($request);
        $client->send();
        var_dump($client->getResponse()->getHeaders());
@@ -39,6 +39,6 @@ array(5) {
   ["X-Original-Transfer-Encoding"]=>
   string(7) "chunked"
   ["Content-Length"]=>
-  int(134217973)
+  int(134217%d%d%d)
 }
 ===DONE===
index 363d76f..80a0073 100644 (file)
@@ -8,6 +8,7 @@ serve(function($client) {
        
        if ($request->getHeader("Proxy-Connection")) {
                $response = new http\Env\Response;
+               $response->setEnvRequest($request);
                $response->send($client);
                
                /* soak up the request following the connect */