X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fhelper%2Fserver.inc;h=6cf6acf996c49698c0a9d35ed83fb553b6fb71f4;hb=2b63830bc0d382339ce5f56e2ccfc18903eee8db;hp=aa8559f8c41fbb3480f1e6dbcf6a02de0a3659b6;hpb=5016399a1e84ca8d23fa74934300e703155e586b;p=m6w6%2Fext-http

diff --git a/tests/helper/server.inc b/tests/helper/server.inc
index aa8559f..6cf6acf 100644
--- a/tests/helper/server.inc
+++ b/tests/helper/server.inc
@@ -1,26 +1,49 @@
-<?php 
+<?php
 
-// PHP-5.3
-if (!defined("PHP_BINARY")) {
-	define("PHP_BINARY", PHP_BINDIR.DIRECTORY_SEPARATOR."php");
+ini_set("log_errors", true);
+ini_set("error_log", __DIR__."/server.log");
+
+function log() {
+	error_log(sprintf("%s: %s\n", date("[Y-m-d H:i:s]"),
+		call_user_func_array("sprintf", func_get_args())));
+}
+
+$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) {
-	foreach (range(8000, 9000) as $port) {
+	/* 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) {
+		log("serve: Trying port %d", $port);
 		if (($server = @stream_socket_server("tcp://localhost:$port"))) {
 			fprintf(STDERR, "%s\n", $port);
+			log("serve: Using port %d", $port);
 			do {
 				$R = array($server); $W = array(); $E = array();
 				$select = stream_select($R, $E, $E, 0, 10000);
 				if ($select && ($client = stream_socket_accept($server, 1))) {
+					log("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)) {
+							log("serve: Handle client %d", (int) $client);
 							$cb($client);
 						}
+						log("serve: EOF on client %d", (int) $client);
 					} catch (Exception $ex) {
+						log("serve: Exception on client %d", (int) $client);
 						/* ignore disconnect */
 						if ($ex->getMessage() !== "Empty message received from stream") {
 							fprintf(STDERR, "%s\n", $ex);
@@ -35,12 +58,18 @@ function serve($cb) {
 }
 
 function server($handler, $cb) {
-	proc(PHP_BINARY, array(__DIR__."/$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($cb) {
 	$spec = array(array("pipe","r"), array("pipe","w"), array("pipe","w"));
-	foreach (range(8000, 9000) as $port) {
+	$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];
@@ -77,7 +106,7 @@ function proc($bin, $args, $cb) {
 		$stdin = $pipes[0];
 		$stdout = $pipes[1];
 		$stderr = $pipes[2];
-		
+
 		do {
 			$port = trim(fgets($stderr));
 			$R = array($stderr); $W = array(); $E = array();