define("PHP_BIN", PHP_BINDIR.DIRECTORY_SEPARATOR."php");
}
-foreach (array("raphf", "propro", "http") as $ext) {
+foreach (array("raphf", "http") as $ext) {
if (!extension_loaded($ext)) {
- switch (PHP_SHLIB_SUFFIX) {
- case "dll":
- dl("php_$ext.dll");
- break;
- default:
- dl($ext .".". PHP_SHLIB_SUFFIX);
+ dl(ext_lib_name($ext));
+ }
+}
+
+function get_extension_load_arg($bin, $args, $ext) {
+ $bin = escapeshellcmd($bin);
+ $args = implode(' ', array_map('escapeshellarg', $args));
+
+ // check if php will load the extension with the existing args
+ exec(sprintf('%s %s -m', $bin, $args), $output);
+
+ foreach ($output as $line ) {
+ if (trim($line) === $ext) {
+ return null;
+ }
+ }
+
+ // try to load the extension with an arg
+ $arg = '-dextension=' . ini_get('extension_dir') . '/' . ext_lib_name($ext);
+ exec(sprintf('%s %s %s -m', $bin, $args, escapeshellarg($arg)), $output);
+
+ foreach ($output as $line ) {
+ if (trim($line) === $ext) {
+ return $arg;
}
}
+
+ // check if the child will be able to dl() the extension
+ $success = shell_exec(sprintf('%s %s -r "echo (int)dl(%s);', $bin, $args, var_export(ext_lib_name($ext), true)));
+ if ($success) {
+ return null;
+ }
+
+ echo "Unable to load extension '{$ext}' in child process";
+ exit(1);
+}
+
+function ext_lib_name($ext) {
+ if (PHP_SHLIB_SUFFIX === 'dll') {
+ return "php_{$ext}.dll";
+ }
+
+ return $ext . "." . PHP_SHLIB_SUFFIX;
}
function serve($cb) {
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 */
}
function server($handler, $cb) {
- $args = explode(' ', getenv('TEST_PHP_ARGS'));
- $args[] = __DIR__."/$handler";
- foreach ($args as $k => $v) {
- if (!$v) unset($args[$k]);
+ $args = [];
+ $argList = preg_split('#\s+#', getenv('TEST_PHP_ARGS'), -1, PREG_SPLIT_NO_EMPTY);
+ for ($i = 0; isset($argList[$i]); $i++) {
+ if ($argList[$i] === '-c') {
+ array_push($args, '-c', $argList[++$i]);
+ continue;
+ }
+ if ($argList[$i] === '-n') {
+ $args[] = '-n';
+ continue;
+ }
+ if ($argList[$i] === '-d') {
+ $args[] = '-d' . $argList[++$i];
+ continue;
+ }
+ if (substr($argList[$i], 0, 2) === '-d') {
+ $args[] = $argList[$i];
+ }
}
+ foreach (['raphf', 'http'] as $ext) {
+ if (null !== $arg = get_extension_load_arg(PHP_BIN, $args, $ext)) {
+ $args[] = $arg;
+ }
+ }
+ $args[] = __DIR__ . '/' . $handler;
proc(PHP_BIN, $args, $cb);
}
$stdout = $pipes[1];
$stderr = $pipes[2];
- usleep(50000);
+ sleep(1);
$status = proc_get_status($proc);
-
+ logger("nghttpd: %s", new http\Params($status));
if (!$status["running"]) {
continue;
}
function proc($bin, $args, $cb) {
$spec = array(array("pipe","r"), array("pipe","w"), array("pipe","w"));
$comm = escapeshellcmd($bin) . " ". implode(" ", array_map("escapeshellarg", $args));
+ logger("proc: %s %s", $bin, implode(" ", $args));
if (($proc = proc_open($comm, $spec, $pipes, __DIR__))) {
$stdin = $pipes[0];
$stdout = $pipes[1];