From 27fb16140f8519d78e14333650961936bbd82d25 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 8 Jan 2008 16:56:14 +0000 Subject: [PATCH] r1632 merge: omit unnecessary test, because NGX_ERROR == -1, but r->headers_out.last_modified_time != -1 at this point --- src/http/modules/ngx_http_not_modified_filter_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/http/modules/ngx_http_not_modified_filter_module.c b/src/http/modules/ngx_http_not_modified_filter_module.c index dc626362d..ce4b55cf5 100644 --- a/src/http/modules/ngx_http_not_modified_filter_module.c +++ b/src/http/modules/ngx_http_not_modified_filter_module.c @@ -70,7 +70,7 @@ ngx_int_t ngx_http_not_modified_header_filter(ngx_http_request_t *r) * I think that the equality of the dates is correcter */ - if (ims != NGX_ERROR && ims == r->headers_out.last_modified_time) { + if (ims == r->headers_out.last_modified_time) { r->headers_out.status = NGX_HTTP_NOT_MODIFIED; r->headers_out.content_type.len = 0; ngx_http_clear_content_length(r);