From 4e8baff3b76ee5ff24da13a8e7cf2d220c2aa35d Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 28 May 2012 00:52:24 +0000 Subject: [package] uhttpd: - rewrite large parts of the server, use uloop event driven structure - support concurrent requests and make the upper limit configurable - implement initial version of HTTP-to-ubus JSON proxy and session.* namespace - add compile time support for debug information - code style changes - bump package revision git-svn-id: svn://svn.openwrt.org/openwrt/trunk/package/uhttpd/src@31931 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- uhttpd-file.c | 143 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 74 insertions(+), 69 deletions(-) (limited to 'uhttpd-file.c') diff --git a/uhttpd-file.c b/uhttpd-file.c index 0d9a207..2e5914a 100644 --- a/uhttpd-file.c +++ b/uhttpd-file.c @@ -1,7 +1,7 @@ /* * uhttpd - Tiny single-threaded httpd - Static file handler * - * Copyright (C) 2010-2011 Jo-Philipp Wich + * Copyright (C) 2010-2012 Jo-Philipp Wich * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -83,22 +83,21 @@ static char * uh_file_unix2date(time_t ts) return str; } -static char * uh_file_header_lookup(struct http_request *req, const char *name) +static char * uh_file_header_lookup(struct client *cl, const char *name) { int i; - foreach_header(i, req->headers) + foreach_header(i, cl->request.headers) { - if (!strcasecmp(req->headers[i], name)) - return req->headers[i+1]; + if (!strcasecmp(cl->request.headers[i], name)) + return cl->request.headers[i+1]; } return NULL; } -static int uh_file_response_ok_hdrs(struct client *cl, struct http_request *req, - struct stat *s) +static int uh_file_response_ok_hdrs(struct client *cl, struct stat *s) { ensure_ret(uh_http_sendf(cl, NULL, "Connection: close\r\n")); @@ -112,32 +111,33 @@ static int uh_file_response_ok_hdrs(struct client *cl, struct http_request *req, return uh_http_sendf(cl, NULL, "Date: %s\r\n", uh_file_unix2date(time(NULL))); } -static int uh_file_response_200(struct client *cl, struct http_request *req, - struct stat *s) +static int uh_file_response_200(struct client *cl, struct stat *s) { - ensure_ret(uh_http_sendf(cl, NULL, "HTTP/%.1f 200 OK\r\n", req->version)); - return uh_file_response_ok_hdrs(cl, req, s); + ensure_ret(uh_http_sendf(cl, NULL, "HTTP/%.1f 200 OK\r\n", + cl->request.version)); + + return uh_file_response_ok_hdrs(cl, s); } -static int uh_file_response_304(struct client *cl, struct http_request *req, - struct stat *s) +static int uh_file_response_304(struct client *cl, struct stat *s) { - ensure_ret(uh_http_sendf(cl, NULL, "HTTP/%.1f 304 Not Modified\r\n", req->version)); - return uh_file_response_ok_hdrs(cl, req, s); + ensure_ret(uh_http_sendf(cl, NULL, "HTTP/%.1f 304 Not Modified\r\n", + cl->request.version)); + + return uh_file_response_ok_hdrs(cl, s); } -static int uh_file_response_412(struct client *cl, struct http_request *req) +static int uh_file_response_412(struct client *cl) { return uh_http_sendf(cl, NULL, - "HTTP/%.1f 412 Precondition Failed\r\n" - "Connection: close\r\n", req->version); + "HTTP/%.1f 412 Precondition Failed\r\n" + "Connection: close\r\n", cl->request.version); } -static int uh_file_if_match(struct client *cl, struct http_request *req, - struct stat *s, int *ok) +static int uh_file_if_match(struct client *cl, struct stat *s, int *ok) { const char *tag = uh_file_mktag(s); - char *hdr = uh_file_header_lookup(req, "If-Match"); + char *hdr = uh_file_header_lookup(cl, "If-Match"); char *p; int i; @@ -160,7 +160,7 @@ static int uh_file_if_match(struct client *cl, struct http_request *req, } *ok = 0; - ensure_ret(uh_file_response_412(cl, req)); + ensure_ret(uh_file_response_412(cl)); return *ok; } @@ -168,11 +168,9 @@ static int uh_file_if_match(struct client *cl, struct http_request *req, return *ok; } -static int uh_file_if_modified_since(struct client *cl, - struct http_request *req, struct stat *s, - int *ok) +static int uh_file_if_modified_since(struct client *cl, struct stat *s, int *ok) { - char *hdr = uh_file_header_lookup(req, "If-Modified-Since"); + char *hdr = uh_file_header_lookup(cl, "If-Modified-Since"); *ok = 1; if (hdr) @@ -180,18 +178,17 @@ static int uh_file_if_modified_since(struct client *cl, if (uh_file_date2unix(hdr) >= s->st_mtime) { *ok = 0; - ensure_ret(uh_file_response_304(cl, req, s)); + ensure_ret(uh_file_response_304(cl, s)); } } return *ok; } -static int uh_file_if_none_match(struct client *cl, struct http_request *req, - struct stat *s, int *ok) +static int uh_file_if_none_match(struct client *cl, struct stat *s, int *ok) { const char *tag = uh_file_mktag(s); - char *hdr = uh_file_header_lookup(req, "If-None-Match"); + char *hdr = uh_file_header_lookup(cl, "If-None-Match"); char *p; int i; *ok = 1; @@ -211,14 +208,14 @@ static int uh_file_if_none_match(struct client *cl, struct http_request *req, { *ok = 0; - if ((req->method == UH_HTTP_MSG_GET) || - (req->method == UH_HTTP_MSG_HEAD)) + if ((cl->request.method == UH_HTTP_MSG_GET) || + (cl->request.method == UH_HTTP_MSG_HEAD)) { - ensure_ret(uh_file_response_304(cl, req, s)); + ensure_ret(uh_file_response_304(cl, s)); } else { - ensure_ret(uh_file_response_412(cl, req)); + ensure_ret(uh_file_response_412(cl)); } break; @@ -229,26 +226,24 @@ static int uh_file_if_none_match(struct client *cl, struct http_request *req, return *ok; } -static int uh_file_if_range(struct client *cl, struct http_request *req, - struct stat *s, int *ok) +static int uh_file_if_range(struct client *cl, struct stat *s, int *ok) { - char *hdr = uh_file_header_lookup(req, "If-Range"); + char *hdr = uh_file_header_lookup(cl, "If-Range"); *ok = 1; if (hdr) { *ok = 0; - ensure_ret(uh_file_response_412(cl, req)); + ensure_ret(uh_file_response_412(cl)); } return *ok; } -static int uh_file_if_unmodified_since(struct client *cl, - struct http_request *req, struct stat *s, +static int uh_file_if_unmodified_since(struct client *cl, struct stat *s, int *ok) { - char *hdr = uh_file_header_lookup(req, "If-Unmodified-Since"); + char *hdr = uh_file_header_lookup(cl, "If-Unmodified-Since"); *ok = 1; if (hdr) @@ -256,7 +251,7 @@ static int uh_file_if_unmodified_since(struct client *cl, if (uh_file_date2unix(hdr) <= s->st_mtime) { *ok = 0; - ensure_ret(uh_file_response_412(cl, req)); + ensure_ret(uh_file_response_412(cl)); } } @@ -269,8 +264,7 @@ static int uh_file_scandir_filter_dir(const struct dirent *e) return strcmp(e->d_name, ".") ? 1 : 0; } -static void uh_file_dirlist(struct client *cl, struct http_request *req, - struct path_info *pi) +static void uh_file_dirlist(struct client *cl, struct path_info *pi) { int i; int count = 0; @@ -279,7 +273,7 @@ static void uh_file_dirlist(struct client *cl, struct http_request *req, struct dirent **files = NULL; struct stat s; - ensure_out(uh_http_sendf(cl, req, + ensure_out(uh_http_sendf(cl, &cl->request, "Index of %s" "

Index of %s

    ", pi->name, pi->name)); @@ -300,7 +294,7 @@ static void uh_file_dirlist(struct client *cl, struct http_request *req, if (!stat(filename, &s) && (s.st_mode & S_IFDIR) && (s.st_mode & S_IXOTH)) { - ensure_out(uh_http_sendf(cl, req, + ensure_out(uh_http_sendf(cl, &cl->request, "
  1. %s/" "
    modified: %s" "
    directory - %.02f kbyte
    " @@ -323,7 +317,7 @@ static void uh_file_dirlist(struct client *cl, struct http_request *req, if (!stat(filename, &s) && !(s.st_mode & S_IFDIR) && (s.st_mode & S_IROTH)) { - ensure_out(uh_http_sendf(cl, req, + ensure_out(uh_http_sendf(cl, &cl->request, "
  2. %s" "
    modified: %s" "
    %s - %.02f kbyte
    " @@ -339,8 +333,8 @@ static void uh_file_dirlist(struct client *cl, struct http_request *req, } } - ensure_out(uh_http_sendf(cl, req, "
")); - ensure_out(uh_http_sendf(cl, req, "")); + ensure_out(uh_http_sendf(cl, &cl->request, "
")); + ensure_out(uh_http_sendf(cl, &cl->request, "")); out: if (files) @@ -353,7 +347,7 @@ out: } -void uh_file_request(struct client *cl, struct http_request *req, struct path_info *pi) +bool uh_file_request(struct client *cl, struct path_info *pi) { int rlen; int ok = 1; @@ -364,36 +358,43 @@ void uh_file_request(struct client *cl, struct http_request *req, struct path_in if ((pi->stat.st_mode & S_IFREG) && ((fd = open(pi->phys, O_RDONLY)) > 0)) { /* test preconditions */ - if (ok) ensure_out(uh_file_if_modified_since(cl, req, &pi->stat, &ok)); - if (ok) ensure_out(uh_file_if_match(cl, req, &pi->stat, &ok)); - if (ok) ensure_out(uh_file_if_range(cl, req, &pi->stat, &ok)); - if (ok) ensure_out(uh_file_if_unmodified_since(cl, req, &pi->stat, &ok)); - if (ok) ensure_out(uh_file_if_none_match(cl, req, &pi->stat, &ok)); + if (ok) ensure_out(uh_file_if_modified_since(cl, &pi->stat, &ok)); + if (ok) ensure_out(uh_file_if_match(cl, &pi->stat, &ok)); + if (ok) ensure_out(uh_file_if_range(cl, &pi->stat, &ok)); + if (ok) ensure_out(uh_file_if_unmodified_since(cl, &pi->stat, &ok)); + if (ok) ensure_out(uh_file_if_none_match(cl, &pi->stat, &ok)); if (ok > 0) { /* write status */ - ensure_out(uh_file_response_200(cl, req, &pi->stat)); + ensure_out(uh_file_response_200(cl, &pi->stat)); + + ensure_out(uh_http_sendf(cl, NULL, "Content-Type: %s\r\n", + uh_file_mime_lookup(pi->name))); - ensure_out(uh_http_sendf(cl, NULL, "Content-Type: %s\r\n", uh_file_mime_lookup(pi->name))); - ensure_out(uh_http_sendf(cl, NULL, "Content-Length: %i\r\n", pi->stat.st_size)); + ensure_out(uh_http_sendf(cl, NULL, "Content-Length: %i\r\n", + pi->stat.st_size)); /* if request was HTTP 1.1 we'll respond chunked */ - if ((req->version > 1.0) && (req->method != UH_HTTP_MSG_HEAD)) - ensure_out(uh_http_send(cl, NULL, "Transfer-Encoding: chunked\r\n", -1)); + if ((cl->request.version > 1.0) && + (cl->request.method != UH_HTTP_MSG_HEAD)) + { + ensure_out(uh_http_send(cl, NULL, + "Transfer-Encoding: chunked\r\n", -1)); + } /* close header */ ensure_out(uh_http_send(cl, NULL, "\r\n", -1)); /* send body */ - if (req->method != UH_HTTP_MSG_HEAD) + if (cl->request.method != UH_HTTP_MSG_HEAD) { /* pump file data */ while ((rlen = read(fd, buf, sizeof(buf))) > 0) - ensure_out(uh_http_send(cl, req, buf, rlen)); + ensure_out(uh_http_send(cl, &cl->request, buf, rlen)); /* send trailer in chunked mode */ - ensure_out(uh_http_send(cl, req, "", 0)); + ensure_out(uh_http_send(cl, &cl->request, "", 0)); } } @@ -408,25 +409,29 @@ void uh_file_request(struct client *cl, struct http_request *req, struct path_in else if ((pi->stat.st_mode & S_IFDIR) && !cl->server->conf->no_dirlists) { /* write status */ - ensure_out(uh_file_response_200(cl, req, NULL)); + ensure_out(uh_file_response_200(cl, NULL)); - if (req->version > 1.0) - ensure_out(uh_http_send(cl, NULL, "Transfer-Encoding: chunked\r\n", -1)); + if (cl->request.version > 1.0) + ensure_out(uh_http_send(cl, NULL, + "Transfer-Encoding: chunked\r\n", -1)); - ensure_out(uh_http_send(cl, NULL, "Content-Type: text/html\r\n\r\n", -1)); + ensure_out(uh_http_send(cl, NULL, + "Content-Type: text/html\r\n\r\n", -1)); /* content */ - uh_file_dirlist(cl, req, pi); + uh_file_dirlist(cl, pi); } /* 403 */ else { ensure_out(uh_http_sendhf(cl, 403, "Forbidden", - "Access to this resource is forbidden")); + "Access to this resource is forbidden")); } out: if (fd > -1) close(fd); + + return false; } -- cgit v1.2.1