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

diff --git a/tests/helper/server.inc b/tests/helper/server.inc
index 70fb7cf..ed8516b 100644
--- a/tests/helper/server.inc
+++ b/tests/helper/server.inc
@@ -2,7 +2,7 @@
 
 function serve(callable $cb) {
 	foreach (range(8000, 9000) as $port) {
-		if (($server = stream_socket_server("tcp://localhost:$port"))) {
+		if (($server = @stream_socket_server("tcp://localhost:$port"))) {
 			fprintf(STDERR, "%s\n", $port);
 			do {
 				$R = [$server]; $W = []; $E = [];
@@ -11,8 +11,13 @@ function serve(callable $cb) {
 					if (getenv("PHP_HTTP_TEST_SSL")) {
 						stream_socket_enable_crypto($client, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER);
 					}
-					while (!feof($client)) {
-						$cb($client);
+					try {
+						while (!feof($client)) {
+							$cb($client);
+						}
+					} catch (Exception $ex) {
+						fprintf(STDERR, "%s\n", $ex);
+						break;
 					}
 				}
 			} while ($select !== false);
@@ -22,20 +27,65 @@ function serve(callable $cb) {
 }
 
 function server($handler, callable $cb) {
-	$spec = array(array("pipe","r"), array("pipe","w"), array("pipe","w"));
-	$comm = sprintf("%s %s/%s", PHP_BINARY, __DIR__, $handler);
-	if (($proc = proc_open($comm, $spec, $pipes, __DIR__))) {
-		$port = trim(fgets($pipes[2]));
+	proc(PHP_BINARY, [__DIR__."/$handler"], $cb);
+}
+
+function nghttpd(callable $cb) {
+	$spec = [["pipe","r"], ["pipe","w"], ["pipe","w"]];
+	foreach (range(8000, 9000) as $port) {
+		$comm = "exec nghttpd -d html $port http2.key http2.crt";
+		if (($proc = proc_open($comm, $spec, $pipes, __DIR__))) {
+			$stdin = $pipes[0];
+			$stdout = $pipes[1];
+			$stderr = $pipes[2];
+			
+			usleep(50000);
+			$status = proc_get_status($proc);
+			
+			if (!$status["running"]) {
+				continue;
+			}
+			
+			try {
+				$cb($port, $stdin, $stdout, $stderr);
+			} catch (Exception $e) {
+				echo $e,"\n";
+			}
 		
-		try {
-			$cb($port, $stdin = $pipes[0], $stdout = $pipes[1], $stderr = $pipes[2]);
-		} catch (Exception $e) {
-			echo $e,"\n";
+			proc_terminate($proc);
+		
+			fpassthru($stderr);
+			fpassthru($stdout);
+			return;
 		}
+	}
+			
+}
+
+function proc($bin, $args, callable $cb) {
+	$spec = [["pipe","r"], ["pipe","w"], ["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 = [];
+		} while (is_numeric($port) && stream_select($R, $W, $E, 0, 10000));
+	
+		if (is_numeric($port)) {
+			try {
+				$cb($port, $stdin, $stdout, $stderr);
+			} catch (Exception $e) {
+				echo $e,"\n";
+			}
+		}
+	
 		proc_terminate($proc);
-		
+	
 		fpassthru($stderr);
 		fpassthru($stdout);
 	}
-}
+}
\ No newline at end of file