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
index dc626362d3d63e05e4ca78360779ba72fe61a19e..ce4b55cf54163c07ae671b12397c5c19a03ccda0 100644 (file)
--- 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);