From 7a6811b705d6cca54b1367459fa19bb6d1234c45 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 16 May 2013 13:17:10 +0200 Subject: [PATCH] uhttpd: allow the config to override the default index file Signed-off-by: Felix Fietkau --- main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index ce51db9..8dc352e 100644 --- a/main.c +++ b/main.c @@ -165,7 +165,7 @@ static int usage(const char *name) return 1; } -static void init_defaults(void) +static void init_defaults_pre(void) { conf.script_timeout = 60; conf.network_timeout = 30; @@ -175,7 +175,10 @@ static void init_defaults(void) conf.realm = "Protected Area"; conf.cgi_prefix = "/cgi-bin"; conf.cgi_path = "/sbin:/usr/sbin:/bin:/usr/bin"; +} +static void init_defaults_post(void) +{ uh_index_add("index.html"); uh_index_add("index.htm"); uh_index_add("default.html"); @@ -213,7 +216,7 @@ int main(int argc, char **argv) BUILD_BUG_ON(sizeof(uh_buf) < PATH_MAX); uh_dispatch_add(&cgi_dispatch); - init_defaults(); + init_defaults_pre(); signal(SIGPIPE, SIG_IGN); while ((ch = getopt(argc, argv, "afSDRC:K:E:I:p:s:h:c:l:L:d:r:m:n:N:x:i:t:k:T:A:u:U:")) != -1) { @@ -402,6 +405,7 @@ int main(int argc, char **argv) } uh_config_parse(); + init_defaults_post(); if (!bound) { fprintf(stderr, "Error: No sockets bound, unable to continue\n"); -- 2.11.0