From 42bcfb0a11dd7e76124d89ffc7b5b7c7e401018e Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 17 Feb 2015 11:43:07 +0100
Subject: [PATCH] (gcov) tests fixup

---
 tests/client018.phpt   | 2 +-
 tests/client019.phpt   | 5 ++---
 tests/client020.phpt   | 2 +-
 tests/client026.phpt   | 4 ++--
 tests/helper/proxy.inc | 1 +
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/client018.phpt b/tests/client018.phpt
index d3daccb..7acb911 100644
--- a/tests/client018.phpt
+++ b/tests/client018.phpt
@@ -1,5 +1,5 @@
 --TEST--
-pipelining
+client pipelining
 --SKIPIF--
 <?php 
 include "skipif.inc";
diff --git a/tests/client019.phpt b/tests/client019.phpt
index 98781e0..e60e5aa 100644
--- a/tests/client019.phpt
+++ b/tests/client019.phpt
@@ -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);
 });
 
 ?>
diff --git a/tests/client020.phpt b/tests/client020.phpt
index d8282b4..7ea5d60 100644
--- a/tests/client020.phpt
+++ b/tests/client020.phpt
@@ -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";
diff --git a/tests/client026.phpt b/tests/client026.phpt
index 1e73db2..d89e98e 100644
--- a/tests/client026.phpt
+++ b/tests/client026.phpt
@@ -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===
diff --git a/tests/helper/proxy.inc b/tests/helper/proxy.inc
index 363d76f..80a0073 100644
--- a/tests/helper/proxy.inc
+++ b/tests/helper/proxy.inc
@@ -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 */
-- 
2.30.2