bugfix: ensured set_by_lua_file with nginx variables re-computes closures code cache key.

Author: thibaultcha

src/ngx_http_lua_directive.c

@@ -301,7 +301,9 @@ ngx_http_lua_set_by_lua_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_str_t            target;
     ndk_set_var_t        filter;
 
-    ngx_http_lua_set_var_data_t     *filter_data;
+    ngx_http_lua_set_var_data_t           *filter_data;
+    ngx_http_complex_value_t               cv;
+    ngx_http_compile_complex_value_t       ccv;
 
     /*
      * value[0] = "set_by_lua_file"
@@ -324,16 +326,28 @@ ngx_http_lua_set_by_lua_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
     filter_data->size = filter.size;
 
-    p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
-    if (p == NULL) {
+    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+    ccv.cf = cf;
+    ccv.value = &value[2];
+    ccv.complex_value = &cv;
+
+    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
 
-    filter_data->key = p;
+    if (cv.lengths == NULL) {
+        /* no variable found */
+        p = ngx_palloc(cf->pool, NGX_HTTP_LUA_FILE_KEY_LEN + 1);
+        if (p == NULL) {
+            return NGX_CONF_ERROR;
+        }
 
-    p = ngx_copy(p, NGX_HTTP_LUA_FILE_TAG, NGX_HTTP_LUA_FILE_TAG_LEN);
-    p = ngx_http_lua_digest_hex(p, value[2].data, value[2].len);
-    *p = '\0';
+        filter_data->key = p;
+
+        p = ngx_copy(p, NGX_HTTP_LUA_FILE_TAG, NGX_HTTP_LUA_FILE_TAG_LEN);
+        p = ngx_http_lua_digest_hex(p, value[2].data, value[2].len);
+        *p = '\0';
+    }
 
     ngx_str_null(&filter_data->script);
 

t/025-codecache.t

@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 181;
+plan tests => repeat_each() * 184;
 
 #$ENV{LUA_PATH} = $ENV{HOME} . '/work/JSON4Lua-0.9.30/json/?.lua';
 
@@ -1403,7 +1403,39 @@ code cache hit (key='nhlf_042c9b3a136fbacbbd0e4b9ad10896b7', ref=3)
 
 
 
-=== TEST 34: variables in rewrite_by_lua_file's file path
+=== TEST 34: variables in set_by_lua_file's file path
+--- config
+    location ~ ^/lua/(.+)$ {
+        set_by_lua_file $res html/$1.lua;
+        echo $res;
+    }
+
+    location /main {
+        echo_location /lua/a;
+        echo_location /lua/b;
+        echo_location /lua/a;
+        echo_location /lua/a;
+        echo_location /lua/b;
+    }
+--- user_files
+>>> a.lua
+return "a"
+>>> b.lua
+return "b"
+--- request
+GET /main
+--- response_body
+a
+b
+a
+a
+b
+--- no_error_log
+[error]
+
+
+
+=== TEST 35: variables in rewrite_by_lua_file's file path
 --- config
     location ~ ^/lua/(.+)$ {
         rewrite_by_lua_file html/$1.lua;
@@ -1434,7 +1466,7 @@ b
 
 
 
-=== TEST 35: variables in access_by_lua_file's file path
+=== TEST 36: variables in access_by_lua_file's file path
 --- config
     location ~ ^/lua/(.+)$ {
         access_by_lua_file html/$1.lua;
@@ -1483,7 +1515,7 @@ b
 
 
 
-=== TEST 36: variables in content_by_lua_file's file path
+=== TEST 37: variables in content_by_lua_file's file path
 --- config
     location ~ ^/lua/(.+)$ {
         content_by_lua_file html/$1.lua;
@@ -1514,7 +1546,7 @@ b
 
 
 
-=== TEST 37: variables in header_filter_by_lua_file's file path
+=== TEST 38: variables in header_filter_by_lua_file's file path
 --- config
     location ~ ^/lua/(.+)$ {
         return 200;
@@ -1561,7 +1593,7 @@ b
 
 
 
-=== TEST 38: variables in body_filter_by_lua_file's file path
+=== TEST 39: variables in body_filter_by_lua_file's file path
 --- config
     location ~ ^/lua/(.+)$ {
         echo hello;
@@ -1596,7 +1628,7 @@ b
 
 
 
-=== TEST 39: variables in log_by_lua_file's file path
+=== TEST 40: variables in log_by_lua_file's file path
 --- config
     log_subrequest on;