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:
6d755d3
)
tests: use more unlikely used ports
author
Michael Wallner
<mike@php.net>
Thu, 25 May 2023 10:38:32 +0000
(12:38 +0200)
committer
Michael Wallner
<mike@php.net>
Thu, 25 May 2023 11:04:10 +0000
(13:04 +0200)
tests/helper/server.inc
patch
|
blob
|
history
diff --git
a/tests/helper/server.inc
b/tests/helper/server.inc
index f203ed6c50f1696253e1a06d6e3439e0db95cc7c..b5bc3b7f4564d014b8636870c2de1bd51bf92bba 100644
(file)
--- a/
tests/helper/server.inc
+++ b/
tests/helper/server.inc
@@
-7,9
+7,9
@@
function logger() {
if (!ini_get("date.timezone")) {
date_default_timezone_set(@date_default_timezone_get());
}
if (!ini_get("date.timezone")) {
date_default_timezone_set(@date_default_timezone_get());
}
- error_log(sprintf("%s(%s): %s",
- basename(getenv("SCRIPT_FILENAME"), ".php"),
- basename(current(get_included_files()), ".inc"),
+ error_log(sprintf("%s(%s): %s",
+ basename(getenv("SCRIPT_FILENAME"), ".php"),
+ basename(current(get_included_files()), ".inc"),
call_user_func_array("sprintf", func_get_args())
));
}
call_user_func_array("sprintf", func_get_args())
));
}
@@
-72,11
+72,11
@@
function ext_lib_name($ext) {
}
function serve($cb) {
}
function serve($cb) {
- /* stream_socket_server() automatically sets SO_REUSEADDR,
+ /* stream_socket_server() automatically sets SO_REUSEADDR,
* which is, well, bad if the tests are run in parallel
*/
$offset = rand(0,2000);
* which is, well, bad if the tests are run in parallel
*/
$offset = rand(0,2000);
- foreach (range(
8000+$offset, 9
000+$offset) as $port) {
+ foreach (range(
40000+$offset, 50
000+$offset) as $port) {
logger("serve: Trying port %d", $port);
if (($server = @stream_socket_server("tcp://localhost:$port"))) {
fprintf(STDERR, "%s\n", $port);
logger("serve: Trying port %d", $port);
if (($server = @stream_socket_server("tcp://localhost:$port"))) {
fprintf(STDERR, "%s\n", $port);
@@
-149,28
+149,28
@@
function nghttpd($cb) {
$stdin = $pipes[0];
$stdout = $pipes[1];
$stderr = $pipes[2];
$stdin = $pipes[0];
$stdout = $pipes[1];
$stderr = $pipes[2];
-
+
sleep(1);
$status = proc_get_status($proc);
logger("nghttpd: %s", new http\Params($status));
if (!$status["running"]) {
continue;
}
sleep(1);
$status = proc_get_status($proc);
logger("nghttpd: %s", new http\Params($status));
if (!$status["running"]) {
continue;
}
-
+
try {
$cb($port, $stdin, $stdout, $stderr);
} catch (Exception $e) {
echo $e,"\n";
}
try {
$cb($port, $stdin, $stdout, $stderr);
} catch (Exception $e) {
echo $e,"\n";
}
-
+
proc_terminate($proc);
proc_terminate($proc);
-
+
fpassthru($stderr);
fpassthru($stdout);
return;
}
}
fpassthru($stderr);
fpassthru($stdout);
return;
}
}
-
+
}
function proc($bin, $args, $cb) {
}
function proc($bin, $args, $cb) {
@@
-186,7
+186,7
@@
function proc($bin, $args, $cb) {
$port = trim(fgets($stderr));
$R = array($stderr); $W = array(); $E = array();
} while (is_numeric($port) && stream_select($R, $W, $E, 0, 10000));
$port = trim(fgets($stderr));
$R = array($stderr); $W = array(); $E = array();
} while (is_numeric($port) && stream_select($R, $W, $E, 0, 10000));
-
+
if (is_numeric($port)) {
try {
$cb($port, $stdin, $stdout, $stderr);
if (is_numeric($port)) {
try {
$cb($port, $stdin, $stdout, $stderr);
@@
-194,9
+194,9
@@
function proc($bin, $args, $cb) {
echo $e,"\n";
}
}
echo $e,"\n";
}
}
-
+
proc_terminate($proc);
proc_terminate($proc);
-
+
fpassthru($stderr);
fpassthru($stdout);
}
fpassthru($stderr);
fpassthru($stdout);
}