fixed a bug in srcache_fetch_skip: when we skip srcache_fetch, we should not automatically skip srcache_store.

agentzh · agentzh · commit 576ce3bf7e94 · 2011-09-28T15:23:37.000-07:00
diff --git a/src/ngx_http_srcache_filter_module.c b/src/ngx_http_srcache_filter_module.c
@@ -748,7 +748,12 @@ ngx_http_srcache_access_handler(ngx_http_request_t *r)
 
     if (conf->req_cache_control) {
         if (ngx_http_srcache_request_no_cache(r) == NGX_OK) {
+            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                    "srcache_fetch skipped due to request headers "
+                    "\"Cache-Control: no-cache\" or \"Pragma: no-cache\"");
+
             /* register a ctx to give a chance to srcache_store to run */
+
             ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_srcache_filter_module));
 
             if (ctx == NULL) {
@@ -770,6 +775,16 @@ ngx_http_srcache_access_handler(ngx_http_request_t *r)
                 "srcache_fetch skipped due to the true value fed into "
                 "srcache_fetch_skip: \"%V\"", &skip);
 
+        /* register a ctx to give a chance to srcache_store to run */
+
+        ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_srcache_filter_module));
+
+        if (ctx == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+
+        ngx_http_set_ctx(r, ctx, ngx_http_srcache_filter_module);
+
         return NGX_DECLINED;
     }
 
diff --git a/t/fetch-skip.t b/t/fetch-skip.t
@@ -5,7 +5,7 @@ use Test::Nginx::Socket;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * 2 * blocks();
+plan tests => repeat_each() * (2 * blocks() + 10);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
@@ -337,3 +337,129 @@ hello, world
 --- response_body chomp
 hello
 
+
+
+=== TEST 19: flush all
+--- config
+    location /flush {
+        set $memc_cmd 'flush_all';
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+Content-Length: 4
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 20: basic fetch (cache miss)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo hello;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length:
+--- response_body
+hello
+
+
+
+=== TEST 21: basic fetch (cache hit)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+hello
+
+
+
+=== TEST 22: fetch skip true
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_fetch_skip 1;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- more_headers
+cache-control: No-Cache
+--- response_headers
+Content-Type: text/css
+Content-Length: 
+--- response_body
+world
+
+
+
+=== TEST 23: basic fetch (cache hit again)
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+
+        echo world;
+    }
+
+    location /memc {
+        internal;
+
+        set $memc_key $query_string;
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 6
+--- response_body
+world
+
