add support for deferring script requests, limit maximum number of script calls to...

[project/uhttpd.git] / main.c

diff --git a/main.c b/main.c
index 160f932..31700c7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,20 +1,20 @@
 /*
  * 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.
  */
 
 #define _BSD_SOURCE
@@ -40,6 +40,7 @@ static int run_server(void)
 {
        uloop_init();
        uh_setup_listeners();
+       uh_plugin_post_init();
        uloop_run();
 
        return 0;
@@ -131,7 +132,8 @@ static int usage(const char *name)
                "       -S              Do not follow symbolic links outside of the docroot\n"
                "       -D              Do not allow directory listings, send 403 instead\n"
                "       -R              Enable RFC1918 filter\n"
-               "       -n count        Maximum allowed number of concurrent requests\n"
+               "       -n count        Maximum allowed number of concurrent script requests\n"
+               "       -N count        Maximum allowed number of concurrent connections\n"
 #ifdef HAVE_LUA
                "       -l string       URL prefix for Lua handler, default is '/lua'\n"
                "       -L file         Lua handler script, omit to disable Lua\n"
@@ -144,6 +146,7 @@ static int usage(const char *name)
                "       -i .ext=path    Use interpreter at path for files with the given extension\n"
                "       -t seconds      CGI, Lua and UBUS script timeout in seconds, default is 60\n"
                "       -T seconds      Network timeout in seconds, default is 30\n"
+               "       -k seconds              HTTP keepalive timeout\n"
                "       -d string       URL decode given string\n"
                "       -r string       Specify basic auth realm\n"
                "       -m string       MD5 crypt given string\n"
@@ -157,7 +160,8 @@ static void init_defaults(void)
        conf.script_timeout = 60;
        conf.network_timeout = 30;
        conf.http_keepalive = 20;
-       conf.max_requests = 3;
+       conf.max_script_requests = 3;
+       conf.max_connections = 100;
        conf.realm = "Protected Area";
        conf.cgi_prefix = "/cgi-bin";
        conf.cgi_path = "/sbin:/usr/sbin:/bin:/usr/bin";
@@ -185,7 +189,7 @@ static void fixup_prefix(char *str)
 
 int main(int argc, char **argv)
 {
-       const char *tls_key, *tls_crt;
+       const char *tls_key = NULL, *tls_crt = NULL;
        bool nofork = false;
        char *port;
        int opt, ch;
@@ -199,7 +203,7 @@ int main(int argc, char **argv)
        init_defaults();
        signal(SIGPIPE, SIG_IGN);
 
-       while ((ch = getopt(argc, argv, "fSDRC:K:E:I:p:s:h:c:l:L:d:r:m:n:x:i:t:T:A:u:U:")) != -1) {
+       while ((ch = getopt(argc, argv, "fSDRC:K:E:I:p:s:h:c:l:L:d:r:m:n:N:x:i:t:k:T:A:u:U:")) != -1) {
                bool tls = false;
 
                switch(ch) {
@@ -251,7 +255,11 @@ int main(int argc, char **argv)
                        break;
 
                case 'n':
-                       conf.max_requests = atoi(optarg);
+                       conf.max_script_requests = atoi(optarg);
+                       break;
+
+               case 'N':
+                       conf.max_connections = atoi(optarg);
                        break;
 
                case 'x':
@@ -279,6 +287,10 @@ int main(int argc, char **argv)
                        conf.network_timeout = atoi(optarg);
                        break;
 
+               case 'k':
+                       conf.http_keepalive = atoi(optarg);
+                       break;
+
                case 'A':
                        conf.tcp_keepalive = atoi(optarg);
                        break;
@@ -329,6 +341,24 @@ int main(int argc, char **argv)
                case 'K':
                        tls_key = optarg;
                        break;
+#ifdef HAVE_LUA
+               case 'l':
+                       conf.lua_prefix = optarg;
+                       break;
+
+               case 'L':
+                       conf.lua_handler = optarg;
+                       break;
+#endif
+#ifdef HAVE_UBUS
+               case 'u':
+                       conf.ubus_prefix = optarg;
+                       break;
+
+               case 'U':
+                       conf.ubus_socket = optarg;
+                       break;
+#endif
                default:
                        return usage(argv[0]);
                }
@@ -357,6 +387,21 @@ int main(int argc, char **argv)
 #endif
        }
 
+#ifdef HAVE_LUA
+       if (conf.lua_handler || conf.lua_prefix) {
+               if (!conf.lua_handler || !conf.lua_prefix) {
+                       fprintf(stderr, "Need handler and prefix to enable Lua support\n");
+                       return 1;
+               }
+               if (uh_plugin_init("uhttpd_lua.so"))
+                       return 1;
+       }
+#endif
+#ifdef HAVE_UBUS
+       if (conf.ubus_prefix && uh_plugin_init("uhttpd_ubus.so"))
+               return 1;
+#endif
+
        /* fork (if not disabled) */
        if (!nofork) {
                switch (fork()) {