fix tests for libcurl >= 7.48

diff --git a/tests/client019.phpt b/tests/client019.phpt
index c386a680caa2c4c0ba11ffc7d5dbeaa3e24782f5..1e24ae85027f12bc283a5887c7a6735e207675ff 100644 (file)
--- a/tests/client019.phpt
+++ b/tests/client019.phpt
@@ -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===

diff --git a/tests/helper/proxy.inc b/tests/helper/proxy.inc
index f99dd97cf735575c0cbd7857d0ab77bae9ead7b6..61a68bd05d909925a00d90e26baeffabb9c873f6 100644 (file)
--- a/tests/helper/proxy.inc
+++ b/tests/helper/proxy.inc
@@ -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);