file: poke ustream after starting deferred program
[project/uhttpd.git] / file.c
diff --git a/file.c b/file.c
index 367ab3ec223e7a8ccb85b409fbc2eca9eb8c6cef..85487f8e14d666cf913e8dae79a7ea3e5e4d35fa 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1,37 +1,56 @@
 /*
  * uhttpd - Tiny single-threaded httpd
  *
- *   Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- *   Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *   Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef _DEFAULT_SOURCE
+# define _DEFAULT_SOURCE
+#endif
+
 #define _BSD_SOURCE
+#define _DARWIN_C_SOURCE
 #define _XOPEN_SOURCE 700
 
 #include <sys/types.h>
 #include <sys/dir.h>
 #include <time.h>
 #include <strings.h>
+#include <dirent.h>
+#include <inttypes.h>
 
 #include <libubox/blobmsg.h>
 
 #include "uhttpd.h"
 #include "mimetypes.h"
 
+#define MAX(a, b)      (((a) > (b)) ? (a) : (b))
+
 static LIST_HEAD(index_files);
 static LIST_HEAD(dispatch_handlers);
+static LIST_HEAD(pending_requests);
+static int n_requests;
+
+struct deferred_request {
+       struct list_head list;
+       struct dispatch_handler *d;
+       struct client *cl;
+       struct path_info pi;
+       bool called, path;
+};
 
 struct index_file {
        struct list_head list;
@@ -112,11 +131,12 @@ next:
 /* Returns NULL on error.
 ** NB: improperly encoded URL should give client 400 [Bad Syntax]; returning
 ** NULL here causes 404 [Not Found], but that's not too unreasonable. */
-static struct path_info *
+struct path_info *
 uh_path_lookup(struct client *cl, const char *url)
 {
        static char path_phys[PATH_MAX];
        static char path_info[PATH_MAX];
+       static char path_query[PATH_MAX];
        static struct path_info p;
 
        const char *docroot = conf.docroot;
@@ -141,7 +161,11 @@ uh_path_lookup(struct client *cl, const char *url)
 
        /* separate query string from url */
        if ((pathptr = strchr(url, '?')) != NULL) {
-               p.query = pathptr[1] ? pathptr + 1 : NULL;
+               if (pathptr[1]) {
+                       p.query = path_query;
+                       snprintf(path_query, sizeof(path_query), "%s",
+                                pathptr + 1);
+               }
 
                /* urldecode component w/o query */
                if (pathptr > url) {
@@ -174,6 +198,13 @@ uh_path_lookup(struct client *cl, const char *url)
                exists = !!canonpath(uh_buf, path_phys);
                uh_buf[i] = ch;
 
+               if (!exists)
+                       continue;
+
+               /* test current path */
+               if (stat(path_phys, &p.stat))
+                       continue;
+
                snprintf(path_info, sizeof(path_info), "%s", uh_buf + i);
                break;
        }
@@ -184,10 +215,6 @@ uh_path_lookup(struct client *cl, const char *url)
             path_phys[docroot_len] != '/'))
                return NULL;
 
-       /* test current path */
-       if (stat(path_phys, &p.stat))
-               return NULL;
-
        /* is a regular file */
        if (p.stat.st_mode & S_IFREG) {
                p.root = docroot;
@@ -217,6 +244,8 @@ uh_path_lookup(struct client *cl, const char *url)
           url with trailing slash appended */
        if (!slash) {
                uh_http_header(cl, 302, "Found");
+               if (!uh_use_chunked(cl))
+                       ustream_printf(cl->us, "Content-Length: 0\r\n");
                ustream_printf(cl->us, "Location: %s%s%s\r\n\r\n",
                                &path_phys[docroot_len],
                                p.query ? "?" : "",
@@ -233,8 +262,10 @@ uh_path_lookup(struct client *cl, const char *url)
                        continue;
 
                strcpy(pathptr, idx->name);
-               if (!stat(path_phys, &s) && (s.st_mode & S_IFREG))
+               if (!stat(path_phys, &s) && (s.st_mode & S_IFREG)) {
+                       memcpy(&p.stat, &s, sizeof(p.stat));
                        break;
+               }
 
                *pathptr = 0;
        }
@@ -246,13 +277,9 @@ uh_path_lookup(struct client *cl, const char *url)
        return p.phys ? &p : NULL;
 }
 
-#ifdef __APPLE__
-time_t timegm (struct tm *tm);
-#endif
-
 static const char * uh_file_mime_lookup(const char *path)
 {
-       struct mimetype *m = &uh_mime_types[0];
+       const struct mimetype *m = &uh_mime_types[0];
        const char *e;
 
        while (m->extn) {
@@ -271,12 +298,10 @@ static const char * uh_file_mime_lookup(const char *path)
        return "application/octet-stream";
 }
 
-static const char * uh_file_mktag(struct stat *s, char *buf)
+static const char * uh_file_mktag(struct stat *s, char *buf, int len)
 {
-       snprintf(buf, sizeof(buf), "\"%x-%x-%x\"",
-                        (unsigned int) s->st_ino,
-                        (unsigned int) s->st_size,
-                        (unsigned int) s->st_mtime);
+       snprintf(buf, len, "\"%" PRIx64 "-%" PRIx64 "-%" PRIx64 "\"",
+                s->st_ino, s->st_size, (uint64_t)s->st_mtime);
 
        return buf;
 }
@@ -315,7 +340,7 @@ static void uh_file_response_ok_hdrs(struct client *cl, struct stat *s)
        char buf[128];
 
        if (s) {
-               ustream_printf(cl->us, "ETag: %s\r\n", uh_file_mktag(s, buf));
+               ustream_printf(cl->us, "ETag: %s\r\n", uh_file_mktag(s, buf, sizeof(buf)));
                ustream_printf(cl->us, "Last-Modified: %s\r\n",
                               uh_file_unix2date(s->st_mtime, buf, sizeof(buf)));
        }
@@ -336,6 +361,11 @@ static void uh_file_response_304(struct client *cl, struct stat *s)
        return uh_file_response_ok_hdrs(cl, s);
 }
 
+static void uh_file_response_405(struct client *cl)
+{
+       uh_http_header(cl, 405, "Method Not Allowed");
+}
+
 static void uh_file_response_412(struct client *cl)
 {
        uh_http_header(cl, 412, "Precondition Failed");
@@ -344,7 +374,7 @@ static void uh_file_response_412(struct client *cl)
 static bool uh_file_if_match(struct client *cl, struct stat *s)
 {
        char buf[128];
-       const char *tag = uh_file_mktag(s, buf);
+       const char *tag = uh_file_mktag(s, buf, sizeof(buf));
        char *hdr = uh_file_header(cl, HDR_IF_MATCH);
        char *p;
        int i;
@@ -385,7 +415,7 @@ static int uh_file_if_modified_since(struct client *cl, struct stat *s)
 static int uh_file_if_none_match(struct client *cl, struct stat *s)
 {
        char buf[128];
-       const char *tag = uh_file_mktag(s, buf);
+       const char *tag = uh_file_mktag(s, buf, sizeof(buf));
        char *hdr = uh_file_header(cl, HDR_IF_NONE_MATCH);
        char *p;
        int i;
@@ -436,21 +466,84 @@ static int uh_file_if_unmodified_since(struct client *cl, struct stat *s)
        return true;
 }
 
+static int dirent_cmp(const struct dirent **a, const struct dirent **b)
+{
+       bool dir_a = !!((*a)->d_type & DT_DIR);
+       bool dir_b = !!((*b)->d_type & DT_DIR);
 
-static int uh_file_scandir_filter_dir(const struct dirent *e)
+       /* directories first */
+       if (dir_a != dir_b)
+               return dir_b - dir_a;
+
+       return alphasort(a, b);
+}
+
+static void list_entries(struct client *cl, struct dirent **files, int count,
+                        const char *path, char *local_path)
 {
-       return strcmp(e->d_name, ".") ? 1 : 0;
+       const char *suffix = "/";
+       const char *type = "directory";
+       unsigned int mode = S_IXOTH;
+       struct stat s;
+       char *escaped;
+       char *file;
+       char buf[128];
+       int i;
+
+       file = local_path + strlen(local_path);
+       for (i = 0; i < count; i++) {
+               const char *name = files[i]->d_name;
+               bool dir = !!(files[i]->d_type & DT_DIR);
+
+               if (name[0] == '.' && name[1] == 0)
+                       goto next;
+
+               sprintf(file, "%s", name);
+               if (stat(local_path, &s))
+                       goto next;
+
+               if (!dir) {
+                       suffix = "";
+                       mode = S_IROTH;
+                       type = uh_file_mime_lookup(local_path);
+               }
+
+               if (!(s.st_mode & mode))
+                       goto next;
+
+               escaped = uh_htmlescape(name);
+
+               if (!escaped)
+                       goto next;
+
+               uh_chunk_printf(cl,
+                               "<li><strong><a href='%s%s%s'>%s</a>%s"
+                               "</strong><br /><small>modified: %s"
+                               "<br />%s - %.02f kbyte<br />"
+                               "<br /></small></li>",
+                               path, escaped, suffix,
+                               escaped, suffix,
+                               uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
+                               type, s.st_size / 1024.0);
+
+               free(escaped);
+               *file = 0;
+next:
+               free(files[i]);
+       }
 }
 
 static void uh_file_dirlist(struct client *cl, struct path_info *pi)
 {
-       int i;
-       int count = 0;
-       char filename[PATH_MAX];
-       char *pathptr;
        struct dirent **files = NULL;
-       struct stat s;
-       char buf[128];
+       char *escaped_path = uh_htmlescape(pi->name);
+       int count = 0;
+
+       if (!escaped_path)
+       {
+               uh_client_error(cl, 500, "Internal Server Error", "Out of memory");
+               return;
+       }
 
        uh_file_response_200(cl, NULL);
        ustream_printf(cl->us, "Content-Type: text/html\r\n\r\n");
@@ -458,68 +551,18 @@ static void uh_file_dirlist(struct client *cl, struct path_info *pi)
        uh_chunk_printf(cl,
                "<html><head><title>Index of %s</title></head>"
                "<body><h1>Index of %s</h1><hr /><ol>",
-               pi->name, pi->name);
+               escaped_path, escaped_path);
 
-       if ((count = scandir(pi->phys, &files, uh_file_scandir_filter_dir,
-                                                alphasort)) > 0)
-       {
-               int len;
-
-               strcpy(filename, pi->phys);
-               len = strlen(filename);
-               pathptr = filename + len;
-               len = PATH_MAX - len;
-
-               /* list subdirs */
-               for (i = 0; i < count; i++) {
-                       snprintf(pathptr, len, "%s", files[i]->d_name);
-
-                       if (!stat(filename, &s) &&
-                               (s.st_mode & S_IFDIR) && (s.st_mode & S_IXOTH))
-                               uh_chunk_printf(cl,
-                                       "<li><strong><a href='%s%s/'>%s</a>/"
-                                       "</strong><br /><small>modified: %s"
-                                       "<br />directory - %.02f kbyte<br />"
-                                       "<br /></small></li>",
-                                       pi->name, files[i]->d_name,
-                                       files[i]->d_name,
-                                       uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
-                                       s.st_size / 1024.0);
-
-                       *pathptr = 0;
-               }
-
-               /* list files */
-               for (i = 0; i < count; i++) {
-                       snprintf(pathptr, len, "%s", files[i]->d_name);
-
-                       if (!stat(filename, &s) &&
-                               !(s.st_mode & S_IFDIR) && (s.st_mode & S_IROTH))
-                               uh_chunk_printf(cl,
-                                       "<li><strong><a href='%s%s'>%s</a>"
-                                       "</strong><br /><small>modified: %s"
-                                       "<br />%s - %.02f kbyte<br />"
-                                       "<br /></small></li>",
-                                       pi->name, files[i]->d_name,
-                                       files[i]->d_name,
-                                       uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
-                                       uh_file_mime_lookup(filename),
-                                       s.st_size / 1024.0);
-
-                       *pathptr = 0;
-               }
+       count = scandir(pi->phys, &files, NULL, dirent_cmp);
+       if (count > 0) {
+               strcpy(uh_buf, pi->phys);
+               list_entries(cl, files, count, escaped_path, uh_buf);
        }
+       free(escaped_path);
+       free(files);
 
        uh_chunk_printf(cl, "</ol><hr /></body></html>");
        uh_request_done(cl);
-
-       if (files)
-       {
-               for (i = 0; i < count; i++)
-                       free(files[i]);
-
-               free(files);
-       }
 }
 
 static void file_write_cb(struct client *cl)
@@ -551,11 +594,13 @@ static void uh_file_free(struct client *cl)
 static void uh_file_data(struct client *cl, struct path_info *pi, int fd)
 {
        /* test preconditions */
-       if (!uh_file_if_modified_since(cl, &pi->stat) ||
-               !uh_file_if_match(cl, &pi->stat) ||
-               !uh_file_if_range(cl, &pi->stat) ||
-               !uh_file_if_unmodified_since(cl, &pi->stat) ||
-               !uh_file_if_none_match(cl, &pi->stat)) {
+       if (!cl->dispatch.no_cache &&
+           (!uh_file_if_modified_since(cl, &pi->stat) ||
+            !uh_file_if_match(cl, &pi->stat) ||
+            !uh_file_if_range(cl, &pi->stat) ||
+            !uh_file_if_unmodified_since(cl, &pi->stat) ||
+            !uh_file_if_none_match(cl, &pi->stat))) {
+               ustream_printf(cl->us, "\r\n");
                uh_request_done(cl);
                close(fd);
                return;
@@ -567,7 +612,7 @@ static void uh_file_data(struct client *cl, struct path_info *pi, int fd)
        ustream_printf(cl->us, "Content-Type: %s\r\n",
                           uh_file_mime_lookup(pi->name));
 
-       ustream_printf(cl->us, "Content-Length: %i\r\n\r\n",
+       ustream_printf(cl->us, "Content-Length: %" PRIu64 "\r\n\r\n",
                           pi->stat.st_size);
 
 
@@ -585,10 +630,28 @@ static void uh_file_data(struct client *cl, struct path_info *pi, int fd)
        file_write_cb(cl);
 }
 
+static bool __handle_file_request(struct client *cl, char *url);
+
 static void uh_file_request(struct client *cl, const char *url,
                            struct path_info *pi, struct blob_attr **tb)
 {
        int fd;
+       struct http_request *req = &cl->request;
+       char *error_handler, *escaped_url;
+
+       switch (cl->request.method) {
+       case UH_HTTP_MSG_GET:
+       case UH_HTTP_MSG_POST:
+       case UH_HTTP_MSG_HEAD:
+       case UH_HTTP_MSG_OPTIONS:
+               break;
+
+       default:
+               uh_file_response_405(cl);
+               ustream_printf(cl->us, "\r\n");
+               uh_request_done(cl);
+               return;
+       }
 
        if (!(pi->stat.st_mode & S_IROTH))
                goto error;
@@ -598,6 +661,7 @@ static void uh_file_request(struct client *cl, const char *url,
                if (fd < 0)
                        goto error;
 
+               req->disable_chunked = true;
                cl->dispatch.file.hdr = tb;
                uh_file_data(cl, pi, fd);
                cl->dispatch.file.hdr = NULL;
@@ -613,9 +677,24 @@ static void uh_file_request(struct client *cl, const char *url,
        }
 
 error:
+       /* check for a previously set 403 redirect status to prevent infinite
+          recursion when the error page itself lacks sufficient permissions */
+       if (conf.error_handler && req->redirect_status != 403) {
+               req->redirect_status = 403;
+               error_handler = alloca(strlen(conf.error_handler) + 1);
+               strcpy(error_handler, conf.error_handler);
+               if (__handle_file_request(cl, error_handler))
+                       return;
+       }
+
+       escaped_url = uh_htmlescape(url);
+
        uh_client_error(cl, 403, "Forbidden",
                        "You don't have permission to access %s on this server.",
-                       url);
+                       escaped_url ? escaped_url : "the url");
+
+       if (escaped_url)
+               free(escaped_url);
 }
 
 void uh_dispatch_add(struct dispatch_handler *d)
@@ -647,7 +726,111 @@ dispatch_find(const char *url, struct path_info *pi)
        return NULL;
 }
 
-static bool __handle_file_request(struct client *cl, const char *url)
+static void
+uh_invoke_script(struct client *cl, struct dispatch_handler *d, struct path_info *pi)
+{
+       char *url = blobmsg_data(blob_data(cl->hdr.head));
+
+       n_requests++;
+       d->handle_request(cl, url, pi);
+}
+
+static void uh_complete_request(struct client *cl)
+{
+       struct deferred_request *dr;
+
+       n_requests--;
+
+       while (!list_empty(&pending_requests)) {
+               if (n_requests >= conf.max_script_requests)
+                       return;
+
+               dr = list_first_entry(&pending_requests, struct deferred_request, list);
+               list_del(&dr->list);
+
+               cl = dr->cl;
+               dr->called = true;
+               cl->dispatch.data_blocked = false;
+               uh_invoke_script(cl, dr->d, dr->path ? &dr->pi : NULL);
+               client_poll_post_data(cl);
+               ustream_poll(cl->us);
+       }
+}
+
+
+static void
+uh_free_pending_request(struct client *cl)
+{
+       struct deferred_request *dr = cl->dispatch.req_data;
+
+       if (dr->called)
+               uh_complete_request(cl);
+       else
+               list_del(&dr->list);
+       free(dr);
+}
+
+static int field_len(const char *ptr)
+{
+       if (!ptr)
+               return 0;
+
+       return strlen(ptr) + 1;
+}
+
+#define path_info_fields \
+       _field(root) \
+       _field(phys) \
+       _field(name) \
+       _field(info) \
+       _field(query)
+
+static void
+uh_defer_script(struct client *cl, struct dispatch_handler *d, struct path_info *pi)
+{
+       struct deferred_request *dr;
+       char *_root, *_phys, *_name, *_info, *_query;
+
+       cl->dispatch.req_free = uh_free_pending_request;
+
+       if (pi) {
+               /* allocate enough memory to duplicate all path_info strings in one block */
+#undef _field
+#define _field(_name) &_##_name, field_len(pi->_name),
+               dr = calloc_a(sizeof(*dr), path_info_fields NULL);
+
+               memcpy(&dr->pi, pi, sizeof(*pi));
+               dr->path = true;
+
+               /* copy all path_info strings */
+#undef _field
+#define _field(_name) if (pi->_name) dr->pi._name = strcpy(_##_name, pi->_name);
+               path_info_fields
+       } else {
+               dr = calloc(1, sizeof(*dr));
+       }
+
+       cl->dispatch.req_data = dr;
+       cl->dispatch.data_blocked = true;
+       dr->cl = cl;
+       dr->d = d;
+       list_add(&dr->list, &pending_requests);
+}
+
+static void
+uh_invoke_handler(struct client *cl, struct dispatch_handler *d, char *url, struct path_info *pi)
+{
+       if (!d->script)
+               return d->handle_request(cl, url, pi);
+
+       if (n_requests >= conf.max_script_requests)
+               return uh_defer_script(cl, d, pi);
+
+       cl->dispatch.req_free = uh_complete_request;
+       uh_invoke_script(cl, d, pi);
+}
+
+static bool __handle_file_request(struct client *cl, char *url)
 {
        static const struct blobmsg_policy hdr_policy[__HDR_MAX] = {
                [HDR_AUTHORIZATION] = { "authorization", BLOBMSG_TYPE_STRING },
@@ -660,6 +843,7 @@ static bool __handle_file_request(struct client *cl, const char *url)
        struct dispatch_handler *d;
        struct blob_attr *tb[__HDR_MAX];
        struct path_info *pi;
+       char *user, *pass, *auth;
 
        pi = uh_path_lookup(cl, url);
        if (!pi)
@@ -669,35 +853,108 @@ static bool __handle_file_request(struct client *cl, const char *url)
                return true;
 
        blobmsg_parse(hdr_policy, __HDR_MAX, tb, blob_data(cl->hdr.head), blob_len(cl->hdr.head));
-       if (tb[HDR_AUTHORIZATION])
-               pi->auth = blobmsg_data(tb[HDR_AUTHORIZATION]);
 
-       if (!uh_auth_check(cl, pi))
+       auth = tb[HDR_AUTHORIZATION] ? blobmsg_data(tb[HDR_AUTHORIZATION]) : NULL;
+
+       if (!uh_auth_check(cl, pi->name, auth, &user, &pass))
                return true;
 
+       if (user && pass) {
+               blobmsg_add_string(&cl->hdr, "http-auth-user", user);
+               blobmsg_add_string(&cl->hdr, "http-auth-pass", pass);
+       }
+
        d = dispatch_find(url, pi);
        if (d)
-               d->handle_request(cl, url, pi);
+               uh_invoke_handler(cl, d, url, pi);
        else
                uh_file_request(cl, url, pi, tb);
 
        return true;
 }
 
+static char *uh_handle_alias(char *old_url)
+{
+       struct alias *alias;
+       static char *new_url;
+       static int url_len;
+
+       if (!list_empty(&conf.cgi_alias)) list_for_each_entry(alias, &conf.cgi_alias, list) {
+               int old_len;
+               int new_len;
+               int path_len = 0;
+
+               if (!uh_path_match(alias->alias, old_url))
+                       continue;
+
+               if (alias->path)
+                       path_len = strlen(alias->path);
+
+               old_len = strlen(old_url) + 1;
+               new_len = old_len + MAX(conf.cgi_prefix_len, path_len);
+
+               if (new_len > url_len) {
+                       new_url = realloc(new_url, new_len);
+                       url_len = new_len;
+               }
+
+               *new_url = '\0';
+
+               if (alias->path)
+                       strcpy(new_url, alias->path);
+               else if (conf.cgi_prefix)
+                       strcpy(new_url, conf.cgi_prefix);
+               strcat(new_url, old_url);
+
+               return new_url;
+       }
+       return old_url;
+}
+
 void uh_handle_request(struct client *cl)
 {
+       struct http_request *req = &cl->request;
        struct dispatch_handler *d;
-       const char *url = cl->request.url;
+       char *url = blobmsg_data(blob_data(cl->hdr.head));
+       char *error_handler, *escaped_url;
 
+       blob_buf_init(&cl->hdr_response, 0);
+       url = uh_handle_alias(url);
+
+       uh_handler_run(cl, &url, false);
+       if (!url)
+               return;
+
+       req->redirect_status = 200;
        d = dispatch_find(url, NULL);
-       if (d) {
-               d->handle_request(cl, url, NULL);
+       if (d)
+               return uh_invoke_handler(cl, d, url, NULL);
+
+       if (__handle_file_request(cl, url))
                return;
+
+       if (uh_handler_run(cl, &url, true)) {
+               if (!url)
+                       return;
+
+               uh_handler_run(cl, &url, false);
+               if (__handle_file_request(cl, url))
+                       return;
        }
 
-       if (__handle_file_request(cl, url) ||
-           __handle_file_request(cl, conf.error_handler))
-               return;
+       req->redirect_status = 404;
+       if (conf.error_handler) {
+               error_handler = alloca(strlen(conf.error_handler) + 1);
+               strcpy(error_handler, conf.error_handler);
+               if (__handle_file_request(cl, error_handler))
+                       return;
+       }
+
+       escaped_url = uh_htmlescape(url);
+
+       uh_client_error(cl, 404, "Not Found", "The requested URL %s was not found on this server.",
+                       escaped_url ? escaped_url : "");
 
-       uh_client_error(cl, 404, "Not Found", "The requested URL %s was not found on this server.", cl->request.url);
+       if (escaped_url)
+               free(escaped_url);
 }