X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fhelper%2Fserver.inc;h=506e08313b2c70f71a97f494bb5097171bc7a1f0;hb=b62c3811cac715f7a0e668ee864d57fd730b47b3;hp=ed8516b3a6a6b07d0809a6328d30a504b0dda63e;hpb=3f5da039a09164701de8638669fe6e8d4e916970;p=m6w6%2Fext-http

diff --git a/tests/helper/server.inc b/tests/helper/server.inc
index ed8516b..506e083 100644
--- a/tests/helper/server.inc
+++ b/tests/helper/server.inc
@@ -1,11 +1,25 @@
-<?php 
+<?php
 
-function serve(callable $cb) {
-	foreach (range(8000, 9000) as $port) {
+$php = getenv('TEST_PHP_EXECUTABLE');
+if ($php) {
+	define('PHP_BIN', $php);
+} else if (defined('PHP_BINARY')) {
+	define('PHP_BIN', PHP_BINARY);
+} else {
+	// PHP-5.3
+	define("PHP_BIN", PHP_BINDIR.DIRECTORY_SEPARATOR."php");
+}
+
+function serve($cb) {
+	/* 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) {
 		if (($server = @stream_socket_server("tcp://localhost:$port"))) {
 			fprintf(STDERR, "%s\n", $port);
 			do {
-				$R = [$server]; $W = []; $E = [];
+				$R = array($server); $W = array(); $E = array();
 				$select = stream_select($R, $E, $E, 0, 10000);
 				if ($select && ($client = stream_socket_accept($server, 1))) {
 					if (getenv("PHP_HTTP_TEST_SSL")) {
@@ -16,7 +30,10 @@ function serve(callable $cb) {
 							$cb($client);
 						}
 					} catch (Exception $ex) {
-						fprintf(STDERR, "%s\n", $ex);
+						/* ignore disconnect */
+						if ($ex->getMessage() !== "Empty message received from stream") {
+							fprintf(STDERR, "%s\n", $ex);
+						}
 						break;
 					}
 				}
@@ -26,13 +43,19 @@ function serve(callable $cb) {
 	}
 }
 
-function server($handler, callable $cb) {
-	proc(PHP_BINARY, [__DIR__."/$handler"], $cb);
+function server($handler, $cb) {
+	$args = explode(' ', getenv('TEST_PHP_ARGS'));
+	$args[] = __DIR__."/$handler";
+	foreach ($args as $k => $v) {
+		if (!$v) unset($args[$k]);
+	}
+	proc(PHP_BIN, $args, $cb);
 }
 
-function nghttpd(callable $cb) {
-	$spec = [["pipe","r"], ["pipe","w"], ["pipe","w"]];
-	foreach (range(8000, 9000) as $port) {
+function nghttpd($cb) {
+	$spec = array(array("pipe","r"), array("pipe","w"), array("pipe","w"));
+	$offset = rand(0,2000);
+	foreach (range(8000+$offset, 9000+$offset) as $port) {
 		$comm = "exec nghttpd -d html $port http2.key http2.crt";
 		if (($proc = proc_open($comm, $spec, $pipes, __DIR__))) {
 			$stdin = $pipes[0];
@@ -62,17 +85,17 @@ function nghttpd(callable $cb) {
 			
 }
 
-function proc($bin, $args, callable $cb) {
-	$spec = [["pipe","r"], ["pipe","w"], ["pipe","w"]];
+function proc($bin, $args, $cb) {
+	$spec = array(array("pipe","r"), array("pipe","w"), array("pipe","w"));
 	$comm = escapeshellcmd($bin) . " ". implode(" ", array_map("escapeshellarg", $args));
 	if (($proc = proc_open($comm, $spec, $pipes, __DIR__))) {
 		$stdin = $pipes[0];
 		$stdout = $pipes[1];
 		$stderr = $pipes[2];
-		
+
 		do {
 			$port = trim(fgets($stderr));
-			$R = [$stderr]; $W = []; $E = [];
+			$R = array($stderr); $W = array(); $E = array();
 		} while (is_numeric($port) && stream_select($R, $W, $E, 0, 10000));
 	
 		if (is_numeric($port)) {