return NULL;
}
-static void 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 http_request *req, struct stat *s)
{
- uh_http_sendf(cl, NULL, "Connection: close\r\n");
+ ensure_ret(uh_http_sendf(cl, NULL, "Connection: close\r\n"));
if( s )
{
- uh_http_sendf(cl, NULL, "ETag: %s\r\n", uh_file_mktag(s));
- uh_http_sendf(cl, NULL, "Last-Modified: %s\r\n", uh_file_unix2date(s->st_mtime));
+ ensure_ret(uh_http_sendf(cl, NULL, "ETag: %s\r\n", uh_file_mktag(s)));
+ ensure_ret(uh_http_sendf(cl, NULL, "Last-Modified: %s\r\n", uh_file_unix2date(s->st_mtime)));
}
- uh_http_sendf(cl, NULL, "Date: %s\r\n", uh_file_unix2date(time(NULL)));
+ return uh_http_sendf(cl, NULL, "Date: %s\r\n", uh_file_unix2date(time(NULL)));
}
-static void uh_file_response_200(struct client *cl, struct http_request *req, struct stat *s)
+static int uh_file_response_200(struct client *cl, struct http_request *req, struct stat *s)
{
- uh_http_sendf(cl, NULL, "HTTP/%.1f 200 OK\r\n", req->version);
- uh_file_response_ok_hdrs(cl, req, 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);
}
-static void uh_file_response_304(struct client *cl, struct http_request *req, struct stat *s)
+static int uh_file_response_304(struct client *cl, struct http_request *req, struct stat *s)
{
- uh_http_sendf(cl, NULL, "HTTP/%.1f 304 Not Modified\r\n", req->version);
- uh_file_response_ok_hdrs(cl, req, 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);
}
-static void uh_file_response_412(struct client *cl, struct http_request *req)
+static int uh_file_response_412(struct client *cl, struct http_request *req)
{
- uh_http_sendf(cl, NULL,
+ return uh_http_sendf(cl, NULL,
"HTTP/%.1f 412 Precondition Failed\r\n"
"Connection: close\r\n", req->version);
}
-static int uh_file_if_match(struct client *cl, struct http_request *req, struct stat *s)
+static int uh_file_if_match(struct client *cl, struct http_request *req, struct stat *s, int *ok)
{
const char *tag = uh_file_mktag(s);
char *hdr = uh_file_header_lookup(req, "If-Match");
}
else if( !strcmp(p, "*") || !strcmp(p, tag) )
{
- return 1;
+ *ok = 1;
+ return *ok;
}
}
- uh_file_response_412(cl, req);
- return 0;
+ *ok = 0;
+ ensure_ret(uh_file_response_412(cl, req));
+ return *ok;
}
- return 1;
+ *ok = 1;
+ return *ok;
}
-static int uh_file_if_modified_since(struct client *cl, struct http_request *req, struct stat *s)
+static int uh_file_if_modified_since(struct client *cl, struct http_request *req, struct stat *s, int *ok)
{
char *hdr = uh_file_header_lookup(req, "If-Modified-Since");
+ *ok = 1;
if( hdr )
{
- if( uh_file_date2unix(hdr) < s->st_mtime )
+ if( uh_file_date2unix(hdr) >= s->st_mtime )
{
- return 1;
- }
- else
- {
- uh_file_response_304(cl, req, s);
- return 0;
+ *ok = 0;
+ ensure_ret(uh_file_response_304(cl, req, s));
}
}
- return 1;
+ return *ok;
}
-static int uh_file_if_none_match(struct client *cl, struct http_request *req, struct stat *s)
+static int uh_file_if_none_match(struct client *cl, struct http_request *req, struct stat *s, int *ok)
{
const char *tag = uh_file_mktag(s);
char *hdr = uh_file_header_lookup(req, "If-None-Match");
char *p;
int i;
+ *ok = 1;
if( hdr )
{
}
else if( !strcmp(p, "*") || !strcmp(p, tag) )
{
+ *ok = 0;
+
if( (req->method == UH_HTTP_MSG_GET) ||
(req->method == UH_HTTP_MSG_HEAD) )
- uh_file_response_304(cl, req, s);
+ ensure_ret(uh_file_response_304(cl, req, s));
else
- uh_file_response_412(cl, req);
+ ensure_ret(uh_file_response_412(cl, req));
- return 0;
+ break;
}
}
}
- return 1;
+ return *ok;
}
-static int uh_file_if_range(struct client *cl, struct http_request *req, struct stat *s)
+static int uh_file_if_range(struct client *cl, struct http_request *req, struct stat *s, int *ok)
{
char *hdr = uh_file_header_lookup(req, "If-Range");
+ *ok = 1;
if( hdr )
{
- uh_file_response_412(cl, req);
- return 0;
+ *ok = 0;
+ ensure_ret(uh_file_response_412(cl, req));
}
- return 1;
+ 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 http_request *req, struct stat *s, int *ok)
{
char *hdr = uh_file_header_lookup(req, "If-Unmodified-Since");
+ *ok = 1;
if( hdr )
{
if( uh_file_date2unix(hdr) <= s->st_mtime )
{
- uh_file_response_412(cl, req);
- return 0;
+ *ok = 0;
+ ensure_ret(uh_file_response_412(cl, req));
}
}
- return 1;
+ return *ok;
}
static void uh_file_dirlist(struct client *cl, struct http_request *req, struct path_info *pi)
{
- int i, count;
+ int i;
+ int count = 0;
char filename[PATH_MAX];
char *pathptr;
struct dirent **files = NULL;
struct stat s;
- uh_http_sendf(cl, req,
+ ensure_out(uh_http_sendf(cl, req,
"<html><head><title>Index of %s</title></head>"
"<body><h1>Index of %s</h1><hr /><ol>",
pi->name, pi->name
- );
+ ));
if( (count = scandir(pi->phys, &files, uh_file_scandir_filter_dir, alphasort)) > 0 )
{
if( !stat(filename, &s) &&
(s.st_mode & S_IFDIR) && (s.st_mode & S_IXOTH)
)
- uh_http_sendf(cl, req,
+ ensure_out(uh_http_sendf(cl, req,
"<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), s.st_size / 1024.0
- );
+ ));
*pathptr = 0;
}
if( !stat(filename, &s) &&
!(s.st_mode & S_IFDIR) && (s.st_mode & S_IROTH)
)
- uh_http_sendf(cl, req,
+ ensure_out(uh_http_sendf(cl, req,
"<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),
uh_file_mime_lookup(filename), s.st_size / 1024.0
- );
+ ));
*pathptr = 0;
- free(files[i]);
}
}
- free(files);
+ ensure_out(uh_http_sendf(cl, req, "</ol><hr /></body></html>"));
+ ensure_out(uh_http_sendf(cl, req, ""));
- uh_http_sendf(cl, req, "</ol><hr /></body></html>");
- uh_http_sendf(cl, req, "");
+out:
+ if( files )
+ {
+ for( i = 0; i < count; i++ )
+ free(files[i]);
+
+ free(files);
+ }
}
void uh_file_request(struct client *cl, struct http_request *req, struct path_info *pi)
{
- int fd, rlen;
+ int rlen;
+ int ok = 1;
+ int fd = -1;
char buf[UH_LIMIT_MSGHEAD];
/* we have a file */
if( (pi->stat.st_mode & S_IFREG) && ((fd = open(pi->phys, O_RDONLY)) > 0) )
{
/* test preconditions */
- if(
- uh_file_if_modified_since(cl, req, &pi->stat) &&
- uh_file_if_match(cl, req, &pi->stat) &&
- uh_file_if_range(cl, req, &pi->stat) &&
- uh_file_if_unmodified_since(cl, req, &pi->stat) &&
- uh_file_if_none_match(cl, req, &pi->stat)
- ) {
+ 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 > 0 )
+ {
/* write status */
- uh_file_response_200(cl, req, &pi->stat);
+ ensure_out(uh_file_response_200(cl, req, &pi->stat));
- uh_http_sendf(cl, NULL, "Content-Type: %s\r\n", uh_file_mime_lookup(pi->name));
- uh_http_sendf(cl, NULL, "Content-Length: %i\r\n", pi->stat.st_size);
+ 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));
/* if request was HTTP 1.1 we'll respond chunked */
if( (req->version > 1.0) && (req->method != UH_HTTP_MSG_HEAD) )
- uh_http_send(cl, NULL, "Transfer-Encoding: chunked\r\n", -1);
+ ensure_out(uh_http_send(cl, NULL, "Transfer-Encoding: chunked\r\n", -1));
/* close header */
- uh_http_send(cl, NULL, "\r\n", -1);
+ ensure_out(uh_http_send(cl, NULL, "\r\n", -1));
/* send body */
if( req->method != UH_HTTP_MSG_HEAD )
{
/* pump file data */
while( (rlen = read(fd, buf, sizeof(buf))) > 0 )
- {
- if( uh_http_send(cl, req, buf, rlen) < 0 )
- break;
- }
+ ensure_out(uh_http_send(cl, req, buf, rlen));
/* send trailer in chunked mode */
- uh_http_send(cl, req, "", 0);
+ ensure_out(uh_http_send(cl, req, "", 0));
}
}
/* one of the preconditions failed, terminate opened header and exit */
else
{
- uh_http_send(cl, NULL, "\r\n", -1);
+ ensure_out(uh_http_send(cl, NULL, "\r\n", -1));
}
-
- close(fd);
}
/* directory */
else if( (pi->stat.st_mode & S_IFDIR) && !cl->server->conf->no_dirlists )
{
/* write status */
- uh_file_response_200(cl, req, NULL);
+ ensure_out(uh_file_response_200(cl, req, NULL));
if( req->version > 1.0 )
- uh_http_send(cl, NULL, "Transfer-Encoding: chunked\r\n", -1);
+ ensure_out(uh_http_send(cl, NULL, "Transfer-Encoding: chunked\r\n", -1));
- 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);
/* 403 */
else
{
- uh_http_sendhf(cl, 403, "Forbidden",
- "Access to this resource is forbidden");
+ ensure_out(uh_http_sendhf(cl, 403, "Forbidden",
+ "Access to this resource is forbidden"));
}
+
+out:
+ if( fd > -1 )
+ close(fd);
}
projects / openwrt.git / blobdiff