bugfix: this module might not work properly with multiple http {} blocks in nginx.conf.

agentzh · agentzh · commit a162b7f05f01 · 2013-10-15T00:15:19.000-07:00
diff --git a/src/ngx_http_srcache_filter_module.c b/src/ngx_http_srcache_filter_module.c
@@ -33,6 +33,9 @@ ngx_http_srcache_store_statuses(ngx_conf_t *cf, ngx_command_t *cmd,
         void *conf);
 
 
+static volatile ngx_cycle_t  *ngx_http_srcache_prev_cycle = NULL;
+
+
 static ngx_str_t  ngx_http_srcache_hide_headers[] = {
     ngx_string("Connection"),
     ngx_string("Keep-Alive"),
@@ -505,6 +508,7 @@ ngx_http_srcache_init_main_conf(ngx_conf_t *cf, void *conf)
 static ngx_int_t
 ngx_http_srcache_post_config(ngx_conf_t *cf)
 {
+    int                              multi_http_blocks;
     ngx_int_t                        rc;
     ngx_http_handler_pt             *h;
     ngx_http_core_main_conf_t       *cmcf;
@@ -518,7 +522,15 @@ ngx_http_srcache_post_config(ngx_conf_t *cf)
     smcf = ngx_http_conf_get_module_main_conf(cf,
                                               ngx_http_srcache_filter_module);
 
-    if (smcf->module_used) {
+    if (ngx_http_srcache_prev_cycle != ngx_cycle) {
+        ngx_http_srcache_prev_cycle = ngx_cycle;
+        multi_http_blocks = 0;
+
+    } else {
+        multi_http_blocks = 1;
+    }
+
+    if (multi_http_blocks || smcf->module_used) {
 
         dd("using ngx-srcache");
 
diff --git a/t/unused.t b/t/unused.t
@@ -0,0 +1,111 @@
+# vi:filetype=
+
+use lib 'lib';
+use Test::Nginx::Socket;
+
+#repeat_each(2);
+
+plan tests => repeat_each() * (3 * blocks());
+
+$ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
+
+#master_on();
+no_long_string();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: module used
+--- config
+    location /foo {
+        srcache_store PUT /store;
+        echo hello;
+    }
+
+    location /store {
+        echo stored;
+    }
+--- request
+GET /foo
+--- stap
+F(ngx_http_srcache_header_filter) {
+    println("srcache header filter called")
+}
+
+F(ngx_http_srcache_access_handler) {
+    println("srcache access handler called")
+}
+
+--- stap_out
+srcache access handler called
+srcache access handler called
+srcache header filter called
+srcache header filter called
+--- response_body
+hello
+
+
+
+=== TEST 2: module unused
+--- config
+    location /foo {
+        #srcache_store PUT /store;
+        echo hello;
+    }
+
+    location /store {
+        echo stored;
+    }
+--- request
+GET /foo
+--- stap
+F(ngx_http_srcache_header_filter) {
+    println("srcache header filter called")
+}
+
+F(ngx_http_srcache_access_handler) {
+    println("srcache access handler called")
+}
+
+--- stap_out
+--- response_body
+hello
+
+
+
+=== TEST 3: module used (multiple http {} blocks)
+--- config
+    location /foo {
+        srcache_store PUT /store;
+        echo hello;
+    }
+
+    location /store {
+        echo stored;
+    }
+
+--- post_main_config
+    http {
+    }
+
+--- request
+GET /foo
+--- stap
+F(ngx_http_srcache_header_filter) {
+    println("srcache header filter called")
+}
+
+F(ngx_http_srcache_access_handler) {
+    println("srcache access handler called")
+}
+
+--- stap_out
+srcache access handler called
+srcache access handler called
+srcache header filter called
+srcache header filter called
+--- response_body
+hello
+
