char *host = NULL;
char *port = arg;
char *s;
+ int l;
s = strrchr(arg, ':');
if (s) {
*s = 0;
}
+ if (host && *host == '[') {
+ l = strlen(host);
+ if (l >= 2) {
+ host[l-1] = 0;
+ host++;
+ }
+ }
+
return uh_socket_bind(host, port, tls);
}
" -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"
+ " -X Enable CORS HTTP headers on JSON-RPC 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"
return 1;
}
-static void init_defaults(void)
+static void init_defaults_pre(void)
{
conf.script_timeout = 60;
conf.network_timeout = 30;
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");
uh_index_add("default.htm");
+
+ if (conf.cgi_prefix) {
+ char *str = malloc(strlen(conf.docroot) + strlen(conf.cgi_prefix) + 1);
+ strcpy(str, conf.docroot);
+ strcat(str, conf.cgi_prefix);
+ conf.cgi_docroot_path = str;
+ };
}
static void fixup_prefix(char *str)
len = strlen(str) - 1;
- while (len > 0 && str[len] == '/')
+ while (len >= 0 && str[len] == '/')
len--;
str[len + 1] = 0;
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) {
+ while ((ch = getopt(argc, argv, "afSDRXC: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':
case 'K':
case 's':
fprintf(stderr, "uhttpd: TLS support not compiled, "
- "ignoring -%c\n", opt);
+ "ignoring -%c\n", ch);
break;
#endif
case 'p':
+ optarg = strdup(optarg);
bound += add_listener_arg(optarg, (ch == 's'));
break;
break;
case 'i':
+ optarg = strdup(optarg);
port = strchr(optarg, '=');
if (optarg[0] != '.' || !port) {
fprintf(stderr, "Error: Invalid interpreter: %s\n",
break;
case 'd':
+ optarg = strdup(optarg);
port = alloca(strlen(optarg) + 1);
if (!port)
return -1;
}
printf("%s", port);
+ return 0;
break;
/* basic auth realm */
case 'l':
case 'L':
fprintf(stderr, "uhttpd: Lua support not compiled, "
- "ignoring -%c\n", opt);
+ "ignoring -%c\n", ch);
break;
#endif
#ifdef HAVE_UBUS
case 'U':
conf.ubus_socket = optarg;
break;
+
+ case 'X':
+ conf.ubus_cors = 1;
+ break;
#else
case 'a':
case 'u':
case 'U':
+ case 'X':
fprintf(stderr, "uhttpd: UBUS support not compiled, "
- "ignoring -%c\n", opt);
+ "ignoring -%c\n", ch);
break;
#endif
default:
uh_config_parse();
- 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");
conf.docroot = strdup(uh_buf);
}
+ init_defaults_post();
+
+ if (!bound) {
+ fprintf(stderr, "Error: No sockets bound, unable to continue\n");
+ return 1;
+ }
+
#ifdef HAVE_TLS
if (n_tls) {
if (!tls_crt || !tls_key) {