# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1199811374 0
# Node ID dfae35fa00386136db4bac0b7538fd046babe33c
# Parent  1f802d26204f05e3d4683503b64561f4f811a399
r1632 merge:

omit unnecessary test, because NGX_ERROR == -1,
but r->headers_out.last_modified_time != -1 at this point

diff --git a/src/http/modules/ngx_http_not_modified_filter_module.c b/src/http/modules/ngx_http_not_modified_filter_module.c
--- 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_f
      * 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);