Merge branch 'fix/no-test-args-passthru' of https://github.com/DaveRandom/ext-http

[m6w6/ext-http] / tests / helper / server.inc

diff --git a/tests/helper/server.inc b/tests/helper/server.inc
index c522c63f473df6a2cdfe1f9662b7d356cd2f2232..ea83f70679b073f1dc75dbbf30261c14f6567ef7 100644 (file)
--- a/tests/helper/server.inc
+++ b/tests/helper/server.inc
@@ -4,6 +4,9 @@ ini_set("log_errors", true);
 ini_set("error_log", __DIR__."/server.log");
 
 function logger() {
+       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"), 
@@ -21,6 +24,53 @@ if ($php) {
        define("PHP_BIN", PHP_BINDIR.DIRECTORY_SEPARATOR."php");
 }
 
+foreach (array("raphf", "propro", "http") as $ext) {
+       if (!extension_loaded($ext)) {
+               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_server() automatically sets SO_REUSEADDR, 
         * which is, well, bad if the tests are run in parallel
@@ -33,20 +83,21 @@ function serve($cb) {
                        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", (int) $client);
+                                               logger("serve: Exception on client %d: %s", (int) $client, $ex->getMessage());
                                                /* ignore disconnect */
                                                if ($ex->getMessage() !== "Empty message received from stream") {
                                                        fprintf(STDERR, "%s\n", $ex);
@@ -54,18 +105,38 @@ function serve($cb) {
                                                break;
                                        }
                                }
-                       } while ($select !== false);
+                       } while ($select);
                        return;
                }
        }
 }
 
 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' . $args[++$i];
+                       continue;
+               }
+               if (substr($argList[$i], 0, 2) === '-d') {
+                       $args[] = $argList[$i];
+               }
        }
+       foreach (['raphf', 'propro', 'http'] as $ext) {
+               if (null !== $arg = get_extension_load_arg(PHP_BIN, $args, $ext)) {
+                       $args[] = $arg;
+               }
+       }
+       $args[] = __DIR__ . '/' . $handler;
        proc(PHP_BIN, $args, $cb);
 }
 
@@ -79,9 +150,9 @@ function nghttpd($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;
                        }
@@ -105,6 +176,7 @@ function nghttpd($cb) {
 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];