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 091ff5cd483834d5c88d7e6304b42270bad9fe91..78a63eee3098f71de890ad2dce7e88956b4ecda5 100644 (file)
--- a/tests/helper/server.inc
+++ b/tests/helper/server.inc
@@ -55,11 +55,12 @@ function serve($cb) {
                                                stream_socket_enable_crypto($client, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER);
                                        }
                                        try {
                                                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: 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 */
                                        } catch (Exception $ex) {
                                                logger("serve: Exception on client %d: %s", (int) $client, $ex->getMessage());
                                                /* ignore disconnect */