X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=100e285b84bc720fb7112c3f19173d9134a500d5;hb=a5138de52dc022aaec26948055da676851613086;hp=11726409bc8906e68f3b822a42ede5f845072948;hpb=57fc4cd7ff5918af11eb4b5f6ad765c89432b210;p=project%2Fuhttpd.git

diff --git a/main.c b/main.c
index 1172640..100e285 100644
--- a/main.c
+++ b/main.c
@@ -30,6 +30,7 @@
 
 #include "uhttpd.h"
 
+char uh_buf[4096];
 
 static int run_server(void)
 {
@@ -98,7 +99,7 @@ static void uh_config_parse(void)
 	fclose(c);
 }
 
-static void add_listener_arg(char *arg, bool tls)
+static int add_listener_arg(char *arg, bool tls)
 {
 	char *host = NULL;
 	char *port = arg;
@@ -110,7 +111,8 @@ static void add_listener_arg(char *arg, bool tls)
 		port = s + 1;
 		*s = 0;
 	}
-	uh_socket_bind(host, port, tls);
+
+	return uh_socket_bind(host, port, tls);
 }
 
 static int usage(const char *name)
@@ -140,13 +142,9 @@ static int usage(const char *name)
 		"	-u string       URL prefix for HTTP/JSON handler\n"
 		"	-U file         Override ubus socket path\n"
 #endif
-#ifdef HAVE_CGI
 		"	-x string       URL prefix for CGI handler, default is '/cgi-bin'\n"
 		"	-i .ext=path    Use interpreter at path for files with the given extension\n"
-#endif
-#if defined(HAVE_CGI) || defined(HAVE_LUA) || defined(HAVE_UBUS)
 		"	-t seconds      CGI, Lua and UBUS script timeout in seconds, default is 60\n"
-#endif
 		"	-T seconds      Network timeout in seconds, default is 30\n"
 		"	-d string       URL decode given string\n"
 		"	-r string       Specify basic auth realm\n"
@@ -158,9 +156,13 @@ static int usage(const char *name)
 
 static void init_defaults(void)
 {
+	conf.script_timeout = 60;
 	conf.network_timeout = 30;
-	conf.http_keepalive = 0; /* fixme */
+	conf.http_keepalive = 20;
 	conf.max_requests = 3;
+	conf.realm = "Protected Area";
+	conf.cgi_prefix = "/cgi-bin";
+	conf.cgi_path = "/sbin:/usr/sbin:/bin:/usr/bin";
 
 	uh_index_add("index.html");
 	uh_index_add("index.htm");
@@ -168,13 +170,32 @@ static void init_defaults(void)
 	uh_index_add("default.htm");
 }
 
+static void fixup_prefix(char *str)
+{
+	int len;
+
+	if (!str || !str[0])
+		return;
+
+	len = strlen(str) - 1;
+
+	while (len > 0 && str[len] == '/')
+		len--;
+
+	str[len + 1] = 0;
+}
+
 int main(int argc, char **argv)
 {
 	bool nofork = false;
 	char *port;
 	int opt, ch;
 	int cur_fd;
+	int bound = 0;
 
+	BUILD_BUG_ON(sizeof(uh_buf) < PATH_MAX);
+
+	uh_dispatch_add(&cgi_dispatch);
 	init_defaults();
 	signal(SIGPIPE, SIG_IGN);
 
@@ -186,15 +207,16 @@ int main(int argc, char **argv)
 			tls = true;
 			/* fall through */
 		case 'p':
-			add_listener_arg(optarg, tls);
+			bound += add_listener_arg(optarg, tls);
 			break;
 
 		case 'h':
-			if (!realpath(optarg, conf.docroot)) {
+			if (!realpath(optarg, uh_buf)) {
 				fprintf(stderr, "Error: Invalid directory %s: %s\n",
 						optarg, strerror(errno));
 				exit(1);
 			}
+			conf.docroot = strdup(uh_buf);
 			break;
 
 		case 'E':
@@ -231,6 +253,23 @@ int main(int argc, char **argv)
 			conf.max_requests = atoi(optarg);
 			break;
 
+		case 'x':
+			fixup_prefix(optarg);
+			conf.cgi_prefix = optarg;
+			break;
+
+		case 'i':
+			port = strchr(optarg, '=');
+			if (optarg[0] != '.' || !port) {
+				fprintf(stderr, "Error: Invalid interpreter: %s\n",
+						optarg);
+				exit(1);
+			}
+
+			*port++ = 0;
+			uh_interpreter_add(optarg, port);
+			break;
+
 		case 't':
 			conf.script_timeout = atoi(optarg);
 			break;
@@ -289,6 +328,11 @@ int main(int argc, char **argv)
 
 	uh_config_parse();
 
+	if (!bound) {
+		fprintf(stderr, "Error: No sockets bound, unable to continue\n");
+		return 1;
+	}
+
 	/* fork (if not disabled) */
 	if (!nofork) {
 		switch (fork()) {