bugfix: the main request response was not discarded by srcache_store when there was an error in the last minute (like a read-timeout error happens when ngx_http_upstream reads the upstream response body).

agentzh · agentzh · commit 748866779c1d · 2012-09-09T12:48:52.000-07:00
diff --git a/src/ngx_http_srcache_filter_module.h b/src/ngx_http_srcache_filter_module.h
@@ -109,6 +109,9 @@ struct ngx_http_srcache_ctx_s {
 
     ngx_http_srcache_postponed_request_t  *postponed_requests;
 
+    ngx_uint_t      http_status; /* the HTTP status code that has been
+                                    actually sent */
+
     unsigned        waiting_subrequest:1;
     unsigned        request_done:1;
     unsigned        from_cache:1;
diff --git a/src/ngx_http_srcache_store.c b/src/ngx_http_srcache_store.c
@@ -235,6 +235,7 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
 
     r->filter_need_in_memory = 1;
 
+    ctx->http_status = r->headers_out.status;
     ctx->store_response = 1;
 
     return NGX_OK;
@@ -427,6 +428,20 @@ ngx_http_srcache_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
                 ctx->store_response = 0;
                 goto done;
             }
+
+            if (r->headers_out.status >= NGX_HTTP_SPECIAL_RESPONSE
+                && r->headers_out.status != ctx->http_status)
+            {
+                /* data truncation or body receive timeout */
+
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "srcache_store: skipped due to new error status "
+                              "code %ui (old: %ui)",
+                              r->headers_out.status, ctx->http_status);
+
+                ctx->store_response = 0;
+                goto done;
+            }
 #endif
 
             rc = ngx_http_srcache_store_subrequest(r, ctx);
diff --git a/t/timeout.t b/t/timeout.t
@@ -54,3 +54,63 @@ Content-Type: text/css
 --- response_body
 hello
 
+
+
+=== TEST 2: main req upstream truncation (with content-length)
+--- config
+    location = /t {
+        srcache_store PUT /err;
+
+        proxy_read_timeout 100ms;
+        proxy_pass http://127.0.0.1:11945/echo;
+    }
+
+    location = /err {
+        content_by_lua '
+            ngx.log(ngx.ERR, "location /err is called")
+        ';
+    }
+
+--- tcp_listen: 11945
+--- tcp_no_close
+--- tcp_reply eval
+"HTTP/1.0 200 OK\r\nContent-Length: 120\r\n\r\nhello world"
+
+--- request
+GET /t
+--- response_body
+--- no_error_log
+location /err is called
+--- error_log
+srcache_store: skipped because response body truncated: 120 > 0
+
+
+
+=== TEST 3: main req upstream truncation (without content-length)
+--- config
+    location = /t {
+        srcache_store PUT /err;
+
+        proxy_read_timeout 100ms;
+        proxy_pass http://127.0.0.1:11945/echo;
+    }
+
+    location = /err {
+        content_by_lua '
+            ngx.log(ngx.ERR, "location /err is called")
+        ';
+    }
+
+--- tcp_listen: 11945
+--- tcp_no_close
+--- tcp_reply eval
+"HTTP/1.0 200 OK\r\n\r\nhello world"
+
+--- request
+GET /t
+--- response_body
+--- no_error_log
+location /err is called
+--- error_log
+srcache_store: skipped due to new error status code 502 (old: 200)
+
