diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-07-17 23:55:04 +0200 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-07-17 23:55:04 +0200 |
| commit | 5dc740393735eab283589d7414bee9425519f710 (patch) | |
| tree | ab4ea2897f3c3ceae4d45ff9ead9d8f39062c6e3 | |
| parent | 3707d7b5675b545d382a433db2f80635b6a5afd8 (diff) | |
| download | httpd-5dc740393735eab283589d7414bee9425519f710.tar.gz httpd-5dc740393735eab283589d7414bee9425519f710.zip | |
Adjust server_file_modified_since() to our style. Please keep httpd clean.
| -rw-r--r-- | httpd/server_file.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/httpd/server_file.c b/httpd/server_file.c index 16b47d0..87fe865 100644 --- a/httpd/server_file.c +++ b/httpd/server_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server_file.c,v 1.55 2015/07/16 19:05:28 reyk Exp $ */ +/* $OpenBSD: server_file.c,v 1.56 2015/07/17 21:53:57 reyk Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -232,7 +232,7 @@ server_file_request(struct httpd *env, struct client *clt, char *path, } if ((ret = server_file_modified_since(clt->clt_descreq, st)) != -1) - return ret; + return (ret); /* Now open the file, should be readable or we have another problem */ if ((fd = open(path, O_RDONLY)) == -1) @@ -633,20 +633,24 @@ server_file_error(struct bufferevent *bev, short error, void *arg) } int -server_file_modified_since(struct http_descriptor * desc, struct stat * st) +server_file_modified_since(struct http_descriptor *desc, struct stat *st) { - struct kv key, *since; - struct tm tm; - - memset(&tm, 0, sizeof(struct tm)); + struct kv key, *since; + struct tm tm; key.kv_key = "If-Modified-Since"; if ((since = kv_find(&desc->http_headers, &key)) != NULL && - since->kv_value != NULL) { - if (strptime(since->kv_value, "%a, %d %h %Y %T %Z", &tm) != - NULL && timegm(&tm) >= st->st_mtim.tv_sec) { + since->kv_value == NULL) { + memset(&tm, 0, sizeof(struct tm)); + + /* + * Return "Not modified" if the file hasn't changed since + * the requested time. + */ + if (strptime(since->kv_value, + "%a, %d %h %Y %T %Z", &tm) != NULL && + timegm(&tm) >= st->st_mtim.tv_sec) return (304); - } } return (-1); |