projects
/
project
/
uhttpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
f88506c
..
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;
char *host = NULL;
char *port = arg;
char *s;
+ int l;
s = strrchr(arg, ':');
if (s) {
s = strrchr(arg, ':');
if (s) {
@@
-111,6
+112,14
@@
static int add_listener_arg(char *arg, bool tls)
*s = 0;
}
*s = 0;
}
+ if (host && *host == '[') {
+ l = strlen(host);
+ if (l >= 2) {
+ host[l-1] = 0;
+ host++;
+ }
+ }
+
return uh_socket_bind(host, port, tls);
}
return uh_socket_bind(host, port, tls);
}
@@
-156,7
+165,7
@@
static int usage(const char *name)
return 1;
}
return 1;
}
-static void init_defaults(void)
+static void init_defaults
_pre
(void)
{
conf.script_timeout = 60;
conf.network_timeout = 30;
{
conf.script_timeout = 60;
conf.network_timeout = 30;
@@
-166,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";
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("index.html");
uh_index_add("index.htm");
uh_index_add("default.html");
@@
-204,7
+216,7
@@
int main(int argc, char **argv)
BUILD_BUG_ON(sizeof(uh_buf) < PATH_MAX);
uh_dispatch_add(&cgi_dispatch);
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) {
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) {
@@
-334,6
+346,7
@@
int main(int argc, char **argv)
}
printf("%s", port);
}
printf("%s", port);
+ return 0;
break;
/* basic auth realm */
break;
/* basic auth realm */
@@
-393,6
+406,7
@@
int main(int argc, char **argv)
}
uh_config_parse();
}
uh_config_parse();
+ init_defaults_post();
if (!bound) {
fprintf(stderr, "Error: No sockets bound, unable to continue\n");
if (!bound) {
fprintf(stderr, "Error: No sockets bound, unable to continue\n");