diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-07-18 17:24:16 +0200 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-07-18 17:24:16 +0200 |
| commit | c9b8164b7e7a829fc6e80c5879a5ba7e7448a3fb (patch) | |
| tree | 7127ae8ad5bdaf1fa00a814aca7b6d602009cf76 | |
| parent | 0349dc0e6b211145485e58fd19b83b9c9ce9f2e3 (diff) | |
| download | httpd-c9b8164b7e7a829fc6e80c5879a5ba7e7448a3fb.tar.gz httpd-c9b8164b7e7a829fc6e80c5879a5ba7e7448a3fb.zip | |
sync
| -rw-r--r-- | httpd/httpd.conf.5 | 4 | ||||
| -rw-r--r-- | httpd/server_file.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/httpd/httpd.conf.5 b/httpd/httpd.conf.5 index 859f68f..11dc3cd 100644 --- a/httpd/httpd.conf.5 +++ b/httpd/httpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.conf.5,v 1.66 2015/07/18 06:00:43 reyk Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.67 2015/07/18 09:29:47 jmc Exp $ .\" .\" Copyright (c) 2014, 2015 Reyk Floeter <reyk@openbsd.org> .\" @@ -280,7 +280,7 @@ Valid options are: .Bl -tag -width Ds .It Ic max-age Ar seconds Set the maximum time in seconds a receiving user agent should regard -this host as a HSTS host. +this host as an HSTS host. The default is one year. .It Ic subdomains Signal to the receiving user agent that this host and all sub domains diff --git a/httpd/server_file.c b/httpd/server_file.c index ba0554b..9fd9ef2 100644 --- a/httpd/server_file.c +++ b/httpd/server_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server_file.c,v 1.57 2015/07/18 06:00:43 reyk Exp $ */ +/* $OpenBSD: server_file.c,v 1.58 2015/07/18 14:36:24 kili Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -639,7 +639,7 @@ server_file_modified_since(struct http_descriptor *desc, struct stat *st) key.kv_key = "If-Modified-Since"; if ((since = kv_find(&desc->http_headers, &key)) != NULL && - since->kv_value == NULL) { + since->kv_value != NULL) { memset(&tm, 0, sizeof(struct tm)); /* |