bugfix: we did not set r->header_sent when we want to discard the header in our header filter.

agentzh · agentzh · commit 20feb737a9d7 · 2013-10-14T23:56:55.000-07:00
diff --git a/src/ngx_http_srcache_store.c b/src/ngx_http_srcache_store.c
@@ -90,6 +90,7 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
 
             pr_ctx->waiting_subrequest = 0;
             /* pr_ctx->fetch_error = 1; */
+            r->header_sent = 1;
 
             return NGX_OK;
         }
@@ -103,6 +104,7 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
 
         ctx->parsing_cached_headers = 1;
 
+        r->header_sent = 1;
         return NGX_OK;
     }
 
@@ -114,6 +116,7 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
                        "srcache_store: subrequest returned status %ui",
                        r->headers_out.status);
 
+        r->header_sent = 1;
         return NGX_OK;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)`
`90`	`90`
`91`	`91`	`pr_ctx->waiting_subrequest = 0;`
`92`	`92`	`/* pr_ctx->fetch_error = 1; */`
	`93`	`+ r->header_sent = 1;`
`93`	`94`
`94`	`95`	`return NGX_OK;`
`95`	`96`	`}`
`@@ -103,6 +104,7 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)`
`103`	`104`
`104`	`105`	`ctx->parsing_cached_headers = 1;`
`105`	`106`
	`107`	`+ r->header_sent = 1;`
`106`	`108`	`return NGX_OK;`
`107`	`109`	`}`
`108`	`110`
`@@ -114,6 +116,7 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)`
`114`	`116`	`"srcache_store: subrequest returned status %ui",`
`115`	`117`	`r->headers_out.status);`
`116`	`118`
	`119`	`+ r->header_sent = 1;`
`117`	`120`	`return NGX_OK;`
`118`	`121`	`}`
`119`	`122`