fix tests for libcurl >= 7.48
authorMichael Wallner <mike@php.net>
Mon, 23 May 2016 15:49:04 +0000 (17:49 +0200)
committerMichael Wallner <mike@php.net>
Mon, 23 May 2016 15:49:04 +0000 (17:49 +0200)
tests/client019.phpt
tests/helper/proxy.inc

index c386a68..1e24ae8 100644 (file)
@@ -44,7 +44,7 @@ Server on port %d
 CONNECT www.example.com:80 HTTP/1.1
 Hello: there!
 Host: www.example.com:80
-Proxy-Connection: Keep-Alive
-User-Agent: PECL_HTTP/%s PHP/%s libcurl/%s
+%r(Proxy-Connection: Keep-Alive
+)?%rUser-Agent: PECL_HTTP/%s PHP/%s libcurl/%s
 
 ===DONE===
index f99dd97..61a68bd 100644 (file)
@@ -7,7 +7,9 @@ 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);