bugfix: use of C global variables at the configuration phase would cause troubles when HUP reload failed.

agentzh · agentzh · commit 159d2767b3dd · 2013-04-25T22:24:16.000-07:00
diff --git a/src/ngx_http_srcache_filter_module.c b/src/ngx_http_srcache_filter_module.c
@@ -21,7 +21,6 @@
 unsigned  ngx_http_srcache_used;
 
 
-static ngx_int_t ngx_http_srcache_pre_config(ngx_conf_t *cf);
 static void *ngx_http_srcache_create_loc_conf(ngx_conf_t *cf);
 static char *ngx_http_srcache_merge_loc_conf(ngx_conf_t *cf, void *parent,
     void *child);
@@ -211,7 +210,7 @@ static ngx_command_t  ngx_http_srcache_commands[] = {
 
 
 static ngx_http_module_t  ngx_http_srcache_filter_module_ctx = {
-    ngx_http_srcache_pre_config,           /* preconfiguration */
+    NULL,                                  /* preconfiguration */
     ngx_http_srcache_post_config,          /* postconfiguration */
 
     ngx_http_srcache_create_main_conf,     /* create main configuration */
@@ -241,17 +240,6 @@ ngx_module_t  ngx_http_srcache_filter_module = {
 };
 
 
-static ngx_int_t
-ngx_http_srcache_pre_config(ngx_conf_t *cf)
-{
-#if 1
-    ngx_http_srcache_used = 0;
-#endif
-
-    return NGX_OK;
-}
-
-
 static void *
 ngx_http_srcache_create_loc_conf(ngx_conf_t *cf)
 {
@@ -374,14 +362,18 @@ ngx_http_srcache_conf_set_request(ngx_conf_t *cf, ngx_command_t *cmd,
     ngx_str_t                        *value;
     ngx_str_t                        *method_name;
     ngx_http_compile_complex_value_t  ccv;
+    ngx_http_srcache_main_conf_t     *smcf;
 
     rpp = (ngx_http_srcache_request_t **) (p + cmd->offset);
 
     if (*rpp != NGX_CONF_UNSET_PTR) {
         return "is duplicate";
     }
 
-    ngx_http_srcache_used = 1;
+    smcf = ngx_http_conf_get_module_main_conf(cf,
+                                              ngx_http_srcache_filter_module);
+
+    smcf->module_used = 1;
 
     value = cf->args->elts;
 
@@ -460,6 +452,7 @@ ngx_http_srcache_create_main_conf(ngx_conf_t *cf)
 
     /* set by ngx_pcalloc:
      *      smcf->postponed_to_access_phase_end = 0;
+     *      smcf->module_used = 0;
      *      smcf->headers_in_hash = { NULL, 0 };
      */
 
@@ -518,13 +511,17 @@ ngx_http_srcache_post_config(ngx_conf_t *cf)
     ngx_int_t                        rc;
     ngx_http_handler_pt             *h;
     ngx_http_core_main_conf_t       *cmcf;
+    ngx_http_srcache_main_conf_t    *smcf;
 
     rc = ngx_http_srcache_add_variables(cf);
     if (rc != NGX_OK) {
         return rc;
     }
 
-    if (ngx_http_srcache_used) {
+    smcf = ngx_http_conf_get_module_main_conf(cf,
+                                              ngx_http_srcache_filter_module);
+
+    if (smcf->module_used) {
 
         dd("using ngx-srcache");
 
diff --git a/src/ngx_http_srcache_filter_module.h b/src/ngx_http_srcache_filter_module.h
@@ -87,6 +87,7 @@ typedef struct {
 
 typedef struct {
     unsigned            postponed_to_access_phase_end;
+    unsigned            module_used;
     ngx_hash_t          headers_in_hash;
 
 } ngx_http_srcache_main_conf_t;
diff --git a/t/main-req.t b/t/main-req.t
@@ -5,7 +5,7 @@ use Test::Nginx::Socket;
 
 #repeat_each(2);
 
-plan tests => repeat_each() * (5 * blocks() + 4);
+plan tests => repeat_each() * (5 * blocks() + 5);
 
 $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211;
 
@@ -16,7 +16,7 @@ run_tests();
 
 __DATA__
 
-=== TEST 1: flush all
+=== TEST 1: flush all (not using ngx_srcache)
 --- config
     location /flush {
         set $memc_cmd 'flush_all';
@@ -29,6 +29,21 @@ Content-Type: text/plain
 Content-Length: 4
 X-Fetch-Status: BYPASS
 X-Store-Status: BYPASS
+
+--- stap
+F(ngx_http_srcache_access_handler) {
+    println("srcache access handler")
+}
+
+F(ngx_http_srcache_header_filter) {
+    println("srcache header filter")
+}
+
+F(ngx_http_srcache_body_filter) {
+    println("srcache body filter")
+}
+
+--- stap_out
 --- request
 GET /flush
 --- response_body eval: "OK\r\n"
