diff --git a/README.md b/README.md index d6654ab..5fcde66 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,11 @@ Commandline options can be combined: ./darkhttpd ~/public_html --port 8080 --addr 127.0.0.1 ``` +To use custom 404 error page, create file named `e404.html` in the root directory where `darkhttpd` executable run and use the following compination: +``` +./darkhttpd ./ --port 8080 --e404 +``` + To see a full list of commandline options, run darkhttpd without any arguments: diff --git a/darkhttpd.c b/darkhttpd.c index 350a56a..ebe2e3c 100644 --- a/darkhttpd.c +++ b/darkhttpd.c @@ -293,6 +293,9 @@ static int max_connections = -1; /* kern.ipc.somaxconn */ static const char *index_name = "index.html"; static int no_listing = 0; +static char *e_404 = ""; +static char *e_500 = ""; + static int sockin = -1; /* socket to accept connections from */ #ifdef HAVE_INET6 static int inet6 = 0; /* whether the socket uses inet6 */ @@ -736,6 +739,20 @@ static void parse_extension_map_file(const char *filename) { } fclose(fp); } +/** + * Read the custom error HTML file + */ +static char *readFile(char *filename) { + char* buffer = NULL; + FILE *fp = fopen (filename, "rb"); + if (fp == NULL) + err(1, "fopen(\"%s\")", filename); + size_t len; + ssize_t bytes_read = getdelim( &buffer, &len, '\0', fp); + if ( bytes_read != -1) { + return buffer; + } +} /* Uses the mime_map to determine a Content-Type: for a requested URL. This * bsearch()es mime_map, so make sure it's sorted first. @@ -945,6 +962,8 @@ static void usage(const char *argv0) { "\t\tIf the client requested HTTP, forward to HTTPS.\n" "\t\tThis is useful if darkhttpd is behind a reverse proxy\n" "\t\tthat supports SSL.\n\n"); + printf("\t--e404 Custom 404 Error\n" + "\t\tEnable custom 404 page. Make file named e404.html in the same path of the server executable file\n\n"); #ifdef HAVE_INET6 printf("\t--ipv6\n" "\t\tListen on IPv6 address.\n\n"); @@ -1161,10 +1180,13 @@ static void parse_commandline(const int argc, char *argv[]) { else if (strcmp(argv[i], "--forward-https") == 0) { forward_to_https = 1; } + else if (strcmp(argv[i], "--e404") == 0){ + e_404 = readFile("e404.html"); + } #ifdef HAVE_INET6 else if (strcmp(argv[i], "--ipv6") == 0) { inet6 = 1; - } + } #endif else errx(1, "unknown argument `%s'", argv[i]); @@ -1523,15 +1545,20 @@ static void default_reply(struct connection *conn, va_end(va); /* Only really need to calculate the date once. */ - rfc1123_date(date, now); - - conn->reply_length = xasprintf(&(conn->reply), - "%d %s\n" + rfc1123_date(date, now); + + char *defContent = "%d %s\n" "

%s

\n" /* errname */ "%s\n" /* reason */ "
\n" "%s" /* generated on */ - "\n", + "\n"; + if (errcode == 404 && e_404 != ""){ + defContent = e_404; + } + + conn->reply_length = xasprintf(&(conn->reply), + defContent, errcode, errname, errname, reason, generated_on(date)); free(reason); diff --git a/e404.html b/e404.html new file mode 100644 index 0000000..f77950b --- /dev/null +++ b/e404.html @@ -0,0 +1,15 @@ + + + + 404 Not Found + + + +

Error 404

+

The resource you have requested is not found.

+

DarkHttpd Server

+
+ + diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000..d8994a3 Binary files /dev/null and b/favicon.ico differ diff --git a/index.html b/index.html new file mode 100644 index 0000000..6254b90 --- /dev/null +++ b/index.html @@ -0,0 +1,17 @@ + + + + + DarkHttpd Works + + + +

DarkHttpd Server Works!

+

When you need a web server in a hurry.

+

DarkHttpd on GitHub | README

+ + diff --git a/mimetypes b/mimetypes new file mode 100644 index 0000000..cb334be --- /dev/null +++ b/mimetypes @@ -0,0 +1 @@ +text/plain md diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..5d6d6c0 --- /dev/null +++ b/run.sh @@ -0,0 +1 @@ +./darkhttpd ./ --port 9090 --mimetypes mimetypes