X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fhelper%2Fproxy.inc;h=61a68bd05d909925a00d90e26baeffabb9c873f6;hb=09d1f5721557b92b9bbe49dc9021ae6605bb65e6;hp=363d76f4b88be43a61ff0649caafa0c98d5e9a04;hpb=3f5da039a09164701de8638669fe6e8d4e916970;p=m6w6%2Fext-http

diff --git a/tests/helper/proxy.inc b/tests/helper/proxy.inc
index 363d76f..61a68bd 100644
--- a/tests/helper/proxy.inc
+++ b/tests/helper/proxy.inc
@@ -1,13 +1,17 @@
 <?php 
 
+include "dump.inc";
 include "server.inc";
 
 serve(function($client) {
 	/* this might be a proxy connect or a standard request */
 	$request = new http\Message($client, false);
 	
-	if ($request->getHeader("Proxy-Connection")) {
+	/* libcurl >= 7.48 does not send Proxy-Connection anymore */
+	if ($request->getHeader("Proxy-Connection")
+	||	$request->getRequestMethod() === "CONNECT") {
 		$response = new http\Env\Response;
+		$response->setEnvRequest($request);
 		$response->send($client);
 		
 		/* soak up the request following the connect */
@@ -17,6 +21,6 @@ serve(function($client) {
 	/* return the initial message as response body */
 	$response = new http\Env\Response;
 	/* avoid OOM with $response->getBody()->append($request); */
-	$request->toStream($response->getBody()->getResource());
+	dump_message($response->getBody()->getResource(), $request);
 	$response->send($client);
 });