feature: now srcache_store discards responses that are obviously truncated when the actual output data is shorter than what is declared in its Content-Length response header. thanks Greg Grensteiner.

agentzh · agentzh · commit f20e81f41f83 · 2012-03-14T23:41:09.000+08:00
diff --git a/src/ngx_http_srcache_filter_module.h b/src/ngx_http_srcache_filter_module.h
@@ -15,6 +15,7 @@ typedef struct {
     ngx_str_t                   method_name;
     ngx_http_complex_value_t    location;
     ngx_http_complex_value_t    args;
+
 } ngx_http_srcache_request_t;
 
 
@@ -25,6 +26,7 @@ typedef struct {
     ngx_str_t                   args;
     ngx_http_request_body_t    *request_body;
     ssize_t                     content_length_n;
+
 } ngx_http_srcache_parsed_request_t;
 
 
@@ -67,6 +69,7 @@ typedef struct {
 typedef struct {
     unsigned            postponed_to_access_phase_end;
     ngx_hash_t          headers_in_hash;
+
 } ngx_http_srcache_main_conf_t;
 
 
@@ -80,6 +83,7 @@ struct ngx_http_srcache_ctx_s {
     ngx_chain_t                     *body_from_cache;
     ngx_chain_t                     *body_to_cache;
     size_t                           response_length;
+    size_t                           response_body_length;
     void                            *store_wev_handler_ctx;
     ngx_http_request_t              *fetch_sr;
 
diff --git a/src/ngx_http_srcache_store.c b/src/ngx_http_srcache_store.c
@@ -117,6 +117,8 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
         return ngx_http_srcache_next_header_filter(r);
     }
 
+    /* slcf->store != NULL */
+
 #if 1
     if (!(r->method & slcf->cache_methods)) {
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -245,6 +247,7 @@ ngx_http_srcache_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
     ngx_chain_t                 *cl;
     ngx_flag_t                   last;
     ngx_http_srcache_loc_conf_t *slcf;
+    size_t                       len;
 
     dd_enter();
 
@@ -374,7 +377,9 @@ ngx_http_srcache_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
         for (cl = in; cl; cl = cl->next) {
             if (ngx_buf_in_memory(cl->buf)) {
-                ctx->response_length += ngx_buf_size(cl->buf);
+                len = ngx_buf_size(cl->buf);
+                ctx->response_length += len;
+                ctx->response_body_length += len;
             }
 
             if (cl->buf->last_buf) {
@@ -406,13 +411,30 @@ ngx_http_srcache_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         }
 
         if (last && r == r->main) {
+
+#if 1
+            if (r->headers_out.content_length_n >
+                (off_t) ctx->response_body_length)
+            {
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "srcache_store: skipped because response body "
+                              "truncated: %O < %uz",
+                              r->headers_out.content_length_n,
+                              ctx->response_body_length);
+
+                ctx->store_response = 0;
+                goto done;
+            }
+#endif
+
             rc = ngx_http_srcache_store_subrequest(r, ctx);
 
             if (rc != NGX_OK) {
                 ctx->store_response = 0;
                 goto done;
             }
         }
+
     } else {
         dd("NO store response");
     }
