bugfix: responses with a status code smaller than all the status codes specified in the srcache_store_statuses directive were not skipped as expected. thanks Lanshun Zhou for the patch in github pull #19.

agentzh · agentzh · commit cf9669a76b92 · 2013-05-21T12:36:34.000-07:00
diff --git a/src/ngx_http_srcache_store.c b/src/ngx_http_srcache_store.c
@@ -35,7 +35,7 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
     ngx_http_srcache_loc_conf_t     *slcf;
     ngx_http_post_subrequest_t      *ps;
     ngx_str_t                        skip;
-    ngx_int_t                       *sp; /* status pointer */
+    ngx_uint_t                      *sp; /* status pointer */
 
     dd_enter();
     dd("srcache header filter");
@@ -177,27 +177,23 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
 
     if (slcf->store_statuses != NULL) {
 
-        sp = slcf->store_statuses;
-        for ( ; *sp; sp++) {
+        sp = (ngx_uint_t *) slcf->store_statuses;
 
-            /* store_stauses are in the descent order */
-            if (r->headers_out.status < (ngx_uint_t) *sp) {
-                continue;
-            }
-
-            if (r->headers_out.status > (ngx_uint_t) *sp) {
-                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                               "srcache_store bypassed because of unmatched "
-                               "status code %i with srcache_store_statuses",
-                               r->headers_out.status);
+        while (r->headers_out.status < *sp) {
+            sp++;
+        }
 
-                return ngx_http_srcache_next_header_filter(r);
-            }
+        if (*sp == 0 || r->headers_out.status > *sp) {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "srcache_store bypassed because of unmatched "
+                           "status code %ui with srcache_store_statuses",
+                           r->headers_out.status);
 
-            /* r->headers_out.status == (ngx_uint_t) *sp */
-            break;
+            return ngx_http_srcache_next_header_filter(r);
         }
 
+        /* r->headers_out.status == (ngx_uint_t) *sp */
+
     } else {
 
         if (r->headers_out.status != NGX_HTTP_OK
diff --git a/t/status.t b/t/status.t
@@ -3,7 +3,7 @@
 use lib 'lib';
 use Test::Nginx::Socket;
 
-plan tests => repeat_each() * 81;
+plan tests => repeat_each() * 92;
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
@@ -464,3 +464,67 @@ Content-Type: text/html
 --- response_body_like: 404 Not Found
 --- error_code: 404
 
+
+
+=== TEST 22: 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
+!Foo-Bar
+--- request
+GET /flush
+--- response_body eval: "OK\r\n"
+
+
+
+=== TEST 23: basic fetch (explicitly do not cache 302, and store_statuses are all bigger than 302)
+github pull #19
+--- config
+    location /foo {
+        default_type text/css;
+        srcache_fetch GET /memc $uri;
+        srcache_store PUT /memc $uri;
+        srcache_store_statuses 303 304;
+
+        content_by_lua '
+            ngx.redirect("/bah", 302)
+        ';
+    }
+
+    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 HTTP/1.0
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 302 Found
+--- error_code: 302
+
+
+
+=== TEST 24: inspect the cached item
+--- config
+    location /memc {
+        set $memc_key "/foo";
+        set $memc_exptime 300;
+        memc_pass 127.0.0.1:$TEST_NGINX_MEMCACHED_PORT;
+    }
+--- request
+GET /memc
+--- response_headers
+Content-Type: text/html
+--- response_headers
+Content-Type: text/html
+--- response_body_like: 404 Not Found
+--- error_code: 404
+
