mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-29 10:40:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Not modified filter: tests separated from actions.

Browse Source 
This makes code more extendable.  The only functional change is when
If-Modified-Since and If-Unmodified-Since are specified together, the
case which is explicitly left undefined by RFC 2616.  The new behaviour
is to respect them both, which seems better.
This commit is contained in:
Maxim Dounin 2012-07-07 21:18:30 +00:00
parent 4199620461
commit a9456d55ab
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/http/modules/ngx_http_not_modified_filter_module.c
View File

@ -10,8 +10,8 @@
#include <ngx_http.h> #include <ngx_http.h>
static ngx_int_t ngx_http_test_precondition(ngx_http_request_t *r); static ngx_uint_t ngx_http_test_if_unmodified(ngx_http_request_t *r);
static ngx_int_t ngx_http_test_not_modified(ngx_http_request_t *r); static ngx_uint_t ngx_http_test_if_modified(ngx_http_request_t *r);
static ngx_int_t ngx_http_not_modified_filter_init(ngx_conf_t *cf); static ngx_int_t ngx_http_not_modified_filter_init(ngx_conf_t *cf);
@ -59,20 +59,38 @@ ngx_http_not_modified_header_filter(ngx_http_request_t *r)
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);
} }
if (r->headers_in.if_unmodified_since) { if (r->headers_in.if_unmodified_since
return ngx_http_test_precondition(r); && !ngx_http_test_if_unmodified(r))
{
return ngx_http_filter_finalize_request(r, NULL,
NGX_HTTP_PRECONDITION_FAILED);
} }
if (r->headers_in.if_modified_since) { if (r->headers_in.if_modified_since
return ngx_http_test_not_modified(r); && !ngx_http_test_if_modified(r))
{
/* not modified */
r->headers_out.status = NGX_HTTP_NOT_MODIFIED;
r->headers_out.status_line.len = 0;
r->headers_out.content_type.len = 0;
ngx_http_clear_content_length(r);
ngx_http_clear_accept_ranges(r);
if (r->headers_out.content_encoding) {
r->headers_out.content_encoding->hash = 0;
r->headers_out.content_encoding = NULL;
}
return ngx_http_next_header_filter(r);
} }
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);
} }
static ngx_int_t static ngx_uint_t
ngx_http_test_precondition(ngx_http_request_t *r) ngx_http_test_if_unmodified(ngx_http_request_t *r)
{ {
time_t iums; time_t iums;
@ -83,16 +101,15 @@ ngx_http_test_precondition(ngx_http_request_t *r)
"http iums:%d lm:%d", iums, r->headers_out.last_modified_time); "http iums:%d lm:%d", iums, r->headers_out.last_modified_time);
if (iums >= r->headers_out.last_modified_time) { if (iums >= r->headers_out.last_modified_time) {
return ngx_http_next_header_filter(r); return 1;
} }
return ngx_http_filter_finalize_request(r, NULL, return 0;
NGX_HTTP_PRECONDITION_FAILED);
} }
static ngx_int_t static ngx_uint_t
ngx_http_test_not_modified(ngx_http_request_t *r) ngx_http_test_if_modified(ngx_http_request_t *r)
{ {
time_t ims; time_t ims;
ngx_http_core_loc_conf_t *clcf; ngx_http_core_loc_conf_t *clcf;
@ -100,7 +117,7 @@ ngx_http_test_not_modified(ngx_http_request_t *r)
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
if (clcf->if_modified_since == NGX_HTTP_IMS_OFF) { if (clcf->if_modified_since == NGX_HTTP_IMS_OFF) {
return ngx_http_next_header_filter(r); return 1;
} }
ims = ngx_http_parse_time(r->headers_in.if_modified_since->value.data, ims = ngx_http_parse_time(r->headers_in.if_modified_since->value.data,
@ -109,27 +126,17 @@ ngx_http_test_not_modified(ngx_http_request_t *r)
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http ims:%d lm:%d", ims, r->headers_out.last_modified_time); "http ims:%d lm:%d", ims, r->headers_out.last_modified_time);
if (ims != r->headers_out.last_modified_time) { if (ims == r->headers_out.last_modified_time) {
return 0;
if (clcf->if_modified_since == NGX_HTTP_IMS_EXACT
|| ims < r->headers_out.last_modified_time)
{
return ngx_http_next_header_filter(r);
}
} }
r->headers_out.status = NGX_HTTP_NOT_MODIFIED; if (clcf->if_modified_since == NGX_HTTP_IMS_EXACT
r->headers_out.status_line.len = 0; || ims < r->headers_out.last_modified_time)
r->headers_out.content_type.len = 0; {
ngx_http_clear_content_length(r); return 1;
ngx_http_clear_accept_ranges(r);
if (r->headers_out.content_encoding) {
r->headers_out.content_encoding->hash = 0;
r->headers_out.content_encoding = NULL;
} }
return ngx_http_next_header_filter(r); return 0;
} }