projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
21f7beb
)
(gcov) tests fixup
author
Michael Wallner
<mike@php.net>
Tue, 17 Feb 2015 10:43:07 +0000
(11:43 +0100)
committer
Michael Wallner
<mike@php.net>
Tue, 17 Feb 2015 10:43:07 +0000
(11:43 +0100)
tests/client018.phpt
patch
|
blob
|
history
tests/client019.phpt
patch
|
blob
|
history
tests/client020.phpt
patch
|
blob
|
history
tests/client026.phpt
patch
|
blob
|
history
tests/helper/proxy.inc
patch
|
blob
|
history
diff --git
a/tests/client018.phpt
b/tests/client018.phpt
index d3daccbd5e632cff619c8ea55880031861dc9aed..7acb911ad6c94a92ea51dd5a203be964200cceaa 100644
(file)
--- a/
tests/client018.phpt
+++ b/
tests/client018.phpt
@@
-1,5
+1,5
@@
--TEST--
--TEST--
-pipelining
+
client
pipelining
--SKIPIF--
<?php
include "skipif.inc";
--SKIPIF--
<?php
include "skipif.inc";
diff --git
a/tests/client019.phpt
b/tests/client019.phpt
index 98781e050618cb293dd8cf819ae60b2af2b998a4..e60e5aa0a1a4b75c579e880ba695b541ceb6ce68 100644
(file)
--- a/
tests/client019.phpt
+++ b/
tests/client019.phpt
@@
-1,5
+1,5
@@
--TEST--
--TEST--
-proxy - send proxy headers for a proxy request
+
client
proxy - send proxy headers for a proxy request
--SKIPIF--
<?php
include "skipif.inc";
--SKIPIF--
<?php
include "skipif.inc";
@@
-18,7
+18,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(
$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",
"proxytunnel" => true,
"proxyheader" => array("Hello" => "there!"),
"proxyhost" => "localhost",
@@
-30,7
+30,6
@@
server("proxy.inc", function($port, $stdin, $stdout, $stderr) {
echo $e;
}
echo $c->getResponse()->getBody();
echo $e;
}
echo $c->getResponse()->getBody();
- unset($r, $client);
});
?>
});
?>
diff --git
a/tests/client020.phpt
b/tests/client020.phpt
index d8282b443b00a191d33d4f878473da877e023042..7ea5d60d87eceee5eab42c7fd6cc0f32afe84c07 100644
(file)
--- a/
tests/client020.phpt
+++ b/
tests/client020.phpt
@@
-1,5
+1,5
@@
--TEST--
--TEST--
-proxy - don't send proxy headers for a standard request
+
client
proxy - don't send proxy headers for a standard request
--SKIPIF--
<?php
include "skipif.inc";
--SKIPIF--
<?php
include "skipif.inc";
diff --git
a/tests/client026.phpt
b/tests/client026.phpt
index 1e73db24a9488d7e2c9f7f04f093cbfdcf2540f0..d89e98ef592f7dbf5bed6a9a75cbb36b2bb64f3b 100644
(file)
--- a/
tests/client026.phpt
+++ b/
tests/client026.phpt
@@
-19,7
+19,7
@@
server("proxy.inc", function($port) {
for ($i = 0, $data = str_repeat("a",1024); $i < 128*1024; ++$i) {
$request->getBody()->append($data);
}
for ($i = 0, $data = str_repeat("a",1024); $i < 128*1024; ++$i) {
$request->getBody()->append($data);
}
- $request->setOptions(["expect_100_timeout" => 0]);
+ $request->setOptions(["
timeout" => 10, "
expect_100_timeout" => 0]);
$client->enqueue($request);
$client->send();
var_dump($client->getResponse()->getHeaders());
$client->enqueue($request);
$client->send();
var_dump($client->getResponse()->getHeaders());
@@
-39,6
+39,6
@@
array(5) {
["X-Original-Transfer-Encoding"]=>
string(7) "chunked"
["Content-Length"]=>
["X-Original-Transfer-Encoding"]=>
string(7) "chunked"
["Content-Length"]=>
- int(134217
973
)
+ int(134217
%d%d%d
)
}
===DONE===
}
===DONE===
diff --git
a/tests/helper/proxy.inc
b/tests/helper/proxy.inc
index 363d76f4b88be43a61ff0649caafa0c98d5e9a04..80a007353c4f81e32a924ea7fc955e47d8217074 100644
(file)
--- a/
tests/helper/proxy.inc
+++ b/
tests/helper/proxy.inc
@@
-8,6
+8,7
@@
serve(function($client) {
if ($request->getHeader("Proxy-Connection")) {
$response = new http\Env\Response;
if ($request->getHeader("Proxy-Connection")) {
$response = new http\Env\Response;
+ $response->setEnvRequest($request);
$response->send($client);
/* soak up the request following the connect */
$response->send($client);
/* soak up the request following the connect */