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

diff --git a/tests/helper/proxy.inc b/tests/helper/proxy.inc
index 363d76f..d60b564 100644
--- a/tests/helper/proxy.inc
+++ b/tests/helper/proxy.inc
@@ -1,22 +1,27 @@
-<?php 
+<?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 */
 		new http\Message($client, false);
 	}
-	
+
 	/* return the initial message as response body */
 	$response = new http\Env\Response;
+	$response->setHeader("X-Request-Content-Length", $request->getBody()->stat("size"));
 	/* avoid OOM with $response->getBody()->append($request); */
-	$request->toStream($response->getBody()->getResource());
+	dump_message($response->getBody()->getResource(), $request);
 	$response->send($client);
 });