implemented the srcache_store_no_cache directive; now by default, we do not store responses with the header "Cache-Control: no-cache" into the cache.

agentzh · agentzh · commit 00b30f773de0 · 2011-09-29T15:05:46.000-07:00
diff --git a/src/ngx_http_srcache_filter_module.c b/src/ngx_http_srcache_filter_module.c
@@ -136,6 +136,13 @@ static ngx_command_t  ngx_http_srcache_commands[] = {
       offsetof(ngx_http_srcache_loc_conf_t, store_no_store),
       NULL },
 
+    { ngx_string("srcache_store_no_cache"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_srcache_loc_conf_t, store_no_cache),
+      NULL },
+
       ngx_null_command
 };
 
@@ -613,6 +620,7 @@ ngx_http_srcache_create_loc_conf(ngx_conf_t *cf)
     conf->req_cache_control = NGX_CONF_UNSET;
     conf->store_private = NGX_CONF_UNSET;
     conf->store_no_store = NGX_CONF_UNSET;
+    conf->store_no_cache = NGX_CONF_UNSET;
 
     return conf;
 }
@@ -649,6 +657,7 @@ ngx_http_srcache_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->req_cache_control, prev->req_cache_control, 0);
     ngx_conf_merge_value(conf->store_private, prev->store_private, 0);
     ngx_conf_merge_value(conf->store_no_store, prev->store_no_store, 0);
+    ngx_conf_merge_value(conf->store_no_cache, prev->store_no_cache, 0);
 
     return NGX_CONF_OK;
 }
diff --git a/src/ngx_http_srcache_filter_module.h b/src/ngx_http_srcache_filter_module.h
@@ -36,6 +36,7 @@ typedef struct {
     ngx_flag_t                       req_cache_control;
     ngx_flag_t                       store_private;
     ngx_flag_t                       store_no_store;
+    ngx_flag_t                       store_no_cache;
 
     unsigned              postponed_to_access_phase_end;
 } ngx_http_srcache_loc_conf_t;
diff --git a/src/ngx_http_srcache_util.c b/src/ngx_http_srcache_util.c
@@ -473,6 +473,11 @@ ngx_http_srcache_response_no_cache(ngx_http_request_t *r,
             return NGX_OK;
         }
 
+        if (!conf->store_no_cache
+            && ngx_strlcasestrn(p, last, (u_char *) "no-cache", 8 - 1) != NULL)
+        {
+            return NGX_OK;
+        }
     }
 
     return NGX_DECLINED;

Original file line number	Diff line number	Diff line change
`@@ -473,6 +473,11 @@ ngx_http_srcache_response_no_cache(ngx_http_request_t *r,`
`473`	`473`	`return NGX_OK;`
`474`	`474`	`}`
`475`	`475`
	`476`	`+ if (!conf->store_no_cache`
	`477`	`+ && ngx_strlcasestrn(p, last, (u_char *) "no-cache", 8 - 1) != NULL)`
	`478`	`+ {`
	`479`	`+ return NGX_OK;`
	`480`	`+ }`
`476`	`481`	`}`
`477`	`482`
`478`	`483`	`return NGX_DECLINED;`