Merge branch 'v2.6.x'

[m6w6/ext-http] / tests / client019.phpt

diff --git a/tests/client019.phpt b/tests/client019.phpt
index 66d99be36088c03192910b163bc1200724987ed2..1e24ae85027f12bc283a5887c7a6735e207675ff 100644 (file)
--- a/tests/client019.phpt
+++ b/tests/client019.phpt
@@ -1,9 +1,13 @@
 --TEST--
-proxy - send proxy headers for a proxy request
+client proxy - send proxy headers for a proxy request
 --SKIPIF--
 <?php 
 include "skipif.inc";
+skip_online_test();
 skip_client_test();
+$client = new http\Client("curl");
+array_key_exists("proxyheader", $client->getAvailableOptions())
+       or die("skip need libcurl with CURLOPT_PROXYHEADER support\n");
 ?>
 --FILE--
 <?php
@@ -18,7 +22,7 @@ server("proxy.inc", function($port, $stdin, $stdout, $stderr) {
        $c = new http\Client;
        $r = new http\Client\Request("GET", "http://www.example.com/");
        $r->setOptions(array(
-                       "timeout" => 3,
+                       "timeout" => 10,
                        "proxytunnel" => true,
                        "proxyheader" => array("Hello" => "there!"),
                        "proxyhost" => "localhost",
@@ -30,7 +34,6 @@ server("proxy.inc", function($port, $stdin, $stdout, $stderr) {
                echo $e;
        }
        echo $c->getResponse()->getBody();
-       unset($r, $client);
 });
 
 ?>
@@ -39,9 +42,9 @@ server("proxy.inc", function($port, $stdin, $stdout, $stderr) {
 Test
 Server on port %d
 CONNECT www.example.com:80 HTTP/1.1
-Host: www.example.com:80
-User-Agent: PECL_HTTP/%s PHP/%s libcurl/%s
-Proxy-Connection: Keep-Alive
 Hello: there!
-Content-Length: 0
+Host: www.example.com:80
+%r(Proxy-Connection: Keep-Alive
+)?%rUser-Agent: PECL_HTTP/%s PHP/%s libcurl/%s
+
 ===DONE===