projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge branch 'v2.5.x'
[m6w6/ext-http]
/
tests
/
helper
/
server.inc
diff --git
a/tests/helper/server.inc
b/tests/helper/server.inc
index 6838ac11e8bbeb2d33e77fbfe045c59f02672f68..091ff5cd483834d5c88d7e6304b42270bad9fe91 100644
(file)
--- a/
tests/helper/server.inc
+++ b/
tests/helper/server.inc
@@
-24,6
+24,18
@@
if ($php) {
define("PHP_BIN", PHP_BINDIR.DIRECTORY_SEPARATOR."php");
}
define("PHP_BIN", PHP_BINDIR.DIRECTORY_SEPARATOR."php");
}
+foreach (array("raphf", "propro", "http") as $ext) {
+ if (!extension_loaded($ext)) {
+ switch (PHP_SHLIB_SUFFIX) {
+ case "dll":
+ dl("php_$ext.dll");
+ break;
+ default:
+ dl($ext .".". PHP_SHLIB_SUFFIX);
+ }
+ }
+}
+
function serve($cb) {
/* stream_socket_server() automatically sets SO_REUSEADDR,
* which is, well, bad if the tests are run in parallel
function serve($cb) {
/* stream_socket_server() automatically sets SO_REUSEADDR,
* which is, well, bad if the tests are run in parallel
@@
-36,7
+48,7
@@
function serve($cb) {
logger("serve: Using port %d", $port);
do {
$R = array($server); $W = array(); $E = array();
logger("serve: Using port %d", $port);
do {
$R = array($server); $W = array(); $E = array();
- $select = stream_select($R, $E, $E,
0, 1000
0);
+ $select = stream_select($R, $E, $E,
10,
0);
if ($select && ($client = stream_socket_accept($server, 1))) {
logger("serve: Accept client %d", (int) $client);
if (getenv("PHP_HTTP_TEST_SSL")) {
if ($select && ($client = stream_socket_accept($server, 1))) {
logger("serve: Accept client %d", (int) $client);
if (getenv("PHP_HTTP_TEST_SSL")) {
@@
-57,7
+69,7
@@
function serve($cb) {
break;
}
}
break;
}
}
- } while ($select
!== false
);
+ } while ($select);
return;
}
}
return;
}
}