prepare v4.2.5

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

diff --git a/tests/helper/server.inc b/tests/helper/server.inc
index af71a0e2a66f2244ed350f0801e46fa5cb1e6aed..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());
        }
-       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())
        ));
 }
@@ -24,24 +24,59 @@ if ($php) {
        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_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);
-       foreach (range(8000+$offset, 9000+$offset) as $port) {
+       foreach (range(40000+$offset, 50000+$offset) as $port) {
                logger("serve: Trying port %d", $port);
                if (($server = @stream_socket_server("tcp://localhost:$port"))) {
                        fprintf(STDERR, "%s\n", $port);
@@ -77,11 +112,31 @@ function serve($cb) {
 }
 
 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);
 }
 
@@ -94,28 +149,28 @@ function nghttpd($cb) {
                        $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;
                        }
-                       
+
                        try {
                                $cb($port, $stdin, $stdout, $stderr);
                        } catch (Exception $e) {
                                echo $e,"\n";
                        }
-               
+
                        proc_terminate($proc);
-               
+
                        fpassthru($stderr);
                        fpassthru($stdout);
                        return;
                }
        }
-                       
+
 }
 
 function proc($bin, $args, $cb) {
@@ -131,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));
-       
+
                if (is_numeric($port)) {
                        try {
                                $cb($port, $stdin, $stdout, $stderr);
@@ -139,9 +194,9 @@ function proc($bin, $args, $cb) {
                                echo $e,"\n";
                        }
                }
-       
+
                proc_terminate($proc);
-       
+
                fpassthru($stderr);
                fpassthru($stdout);
        }