Merge branch 'v2.6.x'

[m6w6/ext-http] / tests / helper / proxy.inc

diff --git a/tests/helper/proxy.inc b/tests/helper/proxy.inc
index 2fb3477537a03a204b69323c06797f5978b24c12..d60b564267c8e1fe22e659247ebfb9dfb5af3e0f 100644 (file)
--- a/tests/helper/proxy.inc
+++ b/tests/helper/proxy.inc
@@ -6,8 +6,10 @@ 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);