/*
* uhttpd - Tiny single-threaded httpd
*
- * Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/types.h>
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) {
continue;
l->fd.cb(&l->fd, ULOOP_READ);
- if (n_clients >= conf.max_requests)
+ if (n_clients >= conf.max_connections)
break;
n_blocked--;
}
}
+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);
while (1) {
- if (!uh_accept_client(fd->fd))
+ if (!uh_accept_client(fd->fd, l->tls))
break;
}
- if (conf.max_requests && n_clients >= conf.max_requests)
+ if (conf.max_connections && n_clients >= conf.max_connections)
uh_block_listener(l);
}