Merge branch 'v2.6.x' of github.com:m6w6/ext-http

[m6w6/ext-http] / tests / helper / server.inc

diff --git a/tests/helper/server.inc b/tests/helper/server.inc
index c522c63f473df6a2cdfe1f9662b7d356cd2f2232..78a63eee3098f71de890ad2dce7e88956b4ecda5 100644 (file)
--- a/tests/helper/server.inc
+++ b/tests/helper/server.inc
@@ -4,6 +4,9 @@ ini_set("log_errors", true);
 ini_set("error_log", __DIR__."/server.log");
 
 function logger() {
+       if (!ini_get("date.timezone")) {
+               date_default_timezone_set(@date_default_timezone_get());
+       }
        error_log(sprintf("%s(%s): %s", 
                basename(getenv("SCRIPT_FILENAME"), ".php"), 
                basename(current(get_included_files()), ".inc"), 
@@ -21,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
@@ -33,20 +48,21 @@ 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")) {
                                                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", (int) $client);
+                                               logger("serve: Exception on client %d: %s", (int) $client, $ex->getMessage());
                                                /* ignore disconnect */
                                                if ($ex->getMessage() !== "Empty message received from stream") {
                                                        fprintf(STDERR, "%s\n", $ex);
@@ -54,7 +70,7 @@ function serve($cb) {
                                                break;
                                        }
                                }
-                       } while ($select !== false);
+                       } while ($select);
                        return;
                }
        }