X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=tests%2Fhelper%2Fserver.inc;h=78a63eee3098f71de890ad2dce7e88956b4ecda5;hp=029cd46e55359262f4288f6c2336e877db13706f;hb=74e7358add4c74d212b91d23e8600ef3c10d081e;hpb=7741e113eaa782b365b7d6e2b87036e29cd59a41

diff --git a/tests/helper/server.inc b/tests/helper/server.inc
index 029cd46..78a63ee 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
@@ -43,11 +55,12 @@ function serve($cb) {
 						stream_socket_enable_crypto($client, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER);
 					}
 					try {
-						while (!feof($client)) {
+						$R = array($client);
+						while (!feof($client) && stream_select($R, $W, $E, 1, 0)) {
 							logger("serve: Handle client %d", (int) $client);
 							$cb($client);
 						}
-						logger("serve: EOF on client %d", (int) $client);
+						logger("serve: EOF/timeout on client %d", (int) $client);
 					} catch (Exception $ex) {
 						logger("serve: Exception on client %d: %s", (int) $client, $ex->getMessage());
 						/* ignore disconnect */