X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=listen.c;h=adf8b16243dde1d0568e8a5bd7ef6dc1383763c3;hp=d51e600ee51d6c2d25a257c1e0ffe5c7078dd3af;hb=fd8e5e379c23c5fbcec3e76894b839233df09067;hpb=1f4c517bb889413e55ccee466d9dfe79156092e8 diff --git a/listen.c b/listen.c index d51e600..adf8b16 100644 --- a/listen.c +++ b/listen.c @@ -52,12 +52,12 @@ static void uh_block_listener(struct listener *l) l->blocked = true; } -void uh_unblock_listeners(void) +static void uh_poll_listeners(struct uloop_timeout *timeout) { struct listener *l; - if ((!n_blocked && conf.max_requests) || - n_clients >= conf.max_requests) + if ((!n_blocked && conf.max_connections) || + n_clients >= conf.max_connections) return; list_for_each_entry(l, &listeners, list) { @@ -65,7 +65,7 @@ void uh_unblock_listeners(void) continue; l->fd.cb(&l->fd, ULOOP_READ); - if (n_clients >= conf.max_requests) + if (n_clients >= conf.max_connections) break; n_blocked--; @@ -74,6 +74,15 @@ void uh_unblock_listeners(void) } } +void uh_unblock_listeners(void) +{ + static struct uloop_timeout poll_timer = { + .cb = uh_poll_listeners + }; + + uloop_timeout_set(&poll_timer, 1); +} + static void listener_cb(struct uloop_fd *fd, unsigned int events) { struct listener *l = container_of(fd, struct listener, fd); @@ -83,7 +92,7 @@ static void listener_cb(struct uloop_fd *fd, unsigned int events) break; } - if (conf.max_requests && n_clients >= conf.max_requests) + if (conf.max_connections && n_clients >= conf.max_connections) uh_block_listener(l); }