summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2010-08-06 21:57:19 +0000
committerStefan Bühler <stbuehler@web.de>2010-08-06 21:57:19 +0000
commit4ae13c32b165289becfbcee013cf9dc3999c9b83 (patch)
treee2df93a8fd169911fe5db9085474fc53494820a6
parent38f2d1ddd7d92e637afd377120003b0dcc404eee (diff)
downloadlighttpd-git-4ae13c32b165289becfbcee013cf9dc3999c9b83.tar.gz
only require FDEVENT_IN bit to be set for listening connections (fixes #2227)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2753 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r--NEWS1
-rw-r--r--src/network.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 318d4f4f..6fed25f7 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ NEWS
* array.c: improve array_get_unused_element to check data type; fix mem leak if unused_element didn't find a matching entry (fixes #2145)
* add check to stop loading plugins twice
* cleanup fdevent code, removed linux-rtsig handler, replaced some fprintf calls
+ * only require FDEVENT_IN bit to be set for listening connections (fixes #2227)
- 1.4.26 - 2010-02-07
* Fix request parser to handle packets with splitted \r\n\r\n (fixes #2105)
diff --git a/src/network.c b/src/network.c
index e4c65546..aa720703 100644
--- a/src/network.c
+++ b/src/network.c
@@ -34,7 +34,7 @@ static handler_t network_server_handle_fdevent(server *srv, void *context, int r
UNUSED(context);
- if (revents != FDEVENT_IN) {
+ if (0 == (revents & FDEVENT_IN)) {
log_error_write(srv, __FILE__, __LINE__, "sdd",
"strange event for server socket",
srv_socket->fd,