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
logger("serve: Using port %d", $port);
do {
$R = array($server); $W = array(); $E = array();
- $select = stream_select($R, $E, $E, 0, 10000);
+ $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")) {
stream_socket_enable_crypto($client, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER);
}
try {
- while (!feof($client)) {
+ $R = array($client);
+ while (!feof($client) && stream_select($R, $W, $E, 1, 0)) {
logger("serve: Handle client %d", (int) $client);
$cb($client);
}
- logger("serve: EOF on client %d", (int) $client);
+ logger("serve: EOF/timeout on client %d", (int) $client);
} catch (Exception $ex) {
logger("serve: Exception on client %d: %s", (int) $client, $ex->getMessage());
/* ignore disconnect */
break;
}
}
- } while ($select !== false);
+ } while ($select);
return;
}
}