projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Squashed commit of the following:
[m6w6/ext-http]
/
tests
/
helper
/
server.inc
diff --git
a/tests/helper/server.inc
b/tests/helper/server.inc
index 029cd46e55359262f4288f6c2336e877db13706f..78a63eee3098f71de890ad2dce7e88956b4ecda5 100644
(file)
--- a/
tests/helper/server.inc
+++ b/
tests/helper/server.inc
@@
-24,6
+24,18
@@
if ($php) {
define("PHP_BIN", PHP_BINDIR.DIRECTORY_SEPARATOR."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
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 {
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 */