relay: do forward data if the http request type was HEAD

[project/uhttpd.git] / main.c

diff --git a/main.c b/main.c
index ebc123c..e53a311 100644 (file)
--- a/main.c
+++ b/main.c
@@ -103,6 +103,7 @@ static int add_listener_arg(char *arg, bool tls)
        char *host = NULL;
        char *port = arg;
        char *s;
+       int l;
 
        s = strrchr(arg, ':');
        if (s) {
@@ -111,6 +112,14 @@ static int add_listener_arg(char *arg, bool tls)
                *s = 0;
        }
 
+       if (host && *host == '[') {
+               l = strlen(host);
+               if (l >= 2) {
+                       host[l-1] = 0;
+                       host++;
+               }
+       }
+
        return uh_socket_bind(host, port, tls);
 }
 
@@ -139,14 +148,15 @@ static int usage(const char *name)
                "       -L file         Lua handler script, omit to disable Lua\n"
 #endif
 #ifdef HAVE_UBUS
-               "       -u string       URL prefix for HTTP/JSON handler\n"
+               "       -u string       URL prefix for UBUS via JSON-RPC handler\n"
                "       -U file         Override ubus socket path\n"
+               "       -a              Do not authenticate JSON-RPC requests against UBUS session api\n"
 #endif
                "       -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"
                "       -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"
+               "       -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"
@@ -155,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;
@@ -165,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");
@@ -203,10 +216,10 @@ 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, "fSDRC:K:E:I:p:s:h:c:l:L:d:r:m:n:N:x:i:t:k:T:A:u:U:")) != -1) {
+       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) {
                switch(ch) {
 #ifdef HAVE_TLS
                case 'C':
@@ -333,6 +346,7 @@ int main(int argc, char **argv)
                        }
 
                        printf("%s", port);
+                       return 0;
                        break;
 
                /* basic auth realm */
@@ -367,6 +381,10 @@ int main(int argc, char **argv)
                        break;
 #endif
 #ifdef HAVE_UBUS
+               case 'a':
+                       conf.ubus_noauth = 1;
+                       break;
+
                case 'u':
                        conf.ubus_prefix = optarg;
                        break;
@@ -375,6 +393,7 @@ int main(int argc, char **argv)
                        conf.ubus_socket = optarg;
                        break;
 #else
+               case 'a':
                case 'u':
                case 'U':
                        fprintf(stderr, "uhttpd: UBUS support not compiled, "
@@ -387,12 +406,21 @@ int main(int argc, char **argv)
        }
 
        uh_config_parse();
+       init_defaults_post();
 
        if (!bound) {
                fprintf(stderr, "Error: No sockets bound, unable to continue\n");
                return 1;
        }
 
+       if (!conf.docroot) {
+               if (!realpath(".", uh_buf)) {
+                       fprintf(stderr, "Error: Unable to determine work dir\n");
+                       return 1;
+               }
+               conf.docroot = strdup(uh_buf);
+       }
+
 #ifdef HAVE_TLS
        if (n_tls) {
                if (!tls_crt || !tls_key) {