X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fhelper%2Fserver.inc;h=091ff5cd483834d5c88d7e6304b42270bad9fe91;hb=3db1f1fe45ab051a57f70f637618e02f7985406e;hp=6838ac11e8bbeb2d33e77fbfe045c59f02672f68;hpb=caac37f4457b7cc565f111bac14b1ce3ac379fab;p=m6w6%2Fext-http

diff --git a/tests/helper/server.inc b/tests/helper/server.inc
index 6838ac1..091ff5c 100644
--- a/tests/helper/server.inc
+++ b/tests/helper/server.inc
@@ -24,6 +24,18 @@ if ($php) {
 	define("PHP_BIN", PHP_BINDIR.DIRECTORY_SEPARATOR."php");
 }
 
+foreach (array("raphf", "propro", "http") as $ext) {
+	if (!extension_loaded($ext)) {
+		switch (PHP_SHLIB_SUFFIX) {
+			case "dll":
+				dl("php_$ext.dll"); 
+				break;
+			default:
+				dl($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
@@ -36,7 +48,7 @@ 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")) {
@@ -57,7 +69,7 @@ function serve($cb) {
 						break;
 					}
 				}
-			} while ($select !== false);
+			} while ($select);
 			return;
 		}
 	}