synchronized with lua-nginx-module #b2af4d3.

bugfix: inlined Lua code snippets in nginx.conf failed to use the Lua
source checksum as part of the Lua code cache key. Thanks Oleg A. Mamo
ntov for the report in openresty/lua-nginx-module#1428.

Upstream patch from agentzh.

Author: thibaultcha

src/subsys/ngx_subsys_lua_cache.c.tt2

@@ -156,7 +156,8 @@ ngx_[% subsys %]_lua_cache_loadbuffer(ngx_log_t *log, lua_State *L,
 
     n = lua_gettop(L);
 
-    dd("XXX cache key: [% "[%" %]s]", cache_key);
+    ngx_log_debug1(NGX_LOG_DEBUG_[% SUBSYS %], log, 0,
+                   "looking up Lua code cache with key '%s'", cache_key);
 
     rc = ngx_[% subsys %]_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {
@@ -240,7 +241,8 @@ ngx_[% subsys %]_lua_cache_loadfile(ngx_log_t *log, lua_State *L,
         dd("CACHE file key already pre-calculated");
     }
 
-    dd("XXX cache key for file: [% "[%" %]s]", cache_key);
+    ngx_log_debug1(NGX_LOG_DEBUG_[% SUBSYS %], log, 0,
+                   "looking up Lua code cache with key '%s'", cache_key);
 
     rc = ngx_[% subsys %]_lua_cache_load_code(log, L, (char *) cache_key);
     if (rc == NGX_OK) {

src/subsys/ngx_subsys_lua_directive.c.tt2

@@ -1472,11 +1472,12 @@ ngx_[% subsys %]_lua_gen_chunk_name(ngx_conf_t *cf, const char *tag, size_t tag_
 
 found:
 
-    ngx_snprintf(out, len, "=%*s(%*s:%d)%Z",
-                 tag_len, tag, cf->conf_file->file.name.data
-                 + cf->conf_file->file.name.len - p,
-                 p, cf->conf_file->line);
-    *chunkname_len = len;
+    p = ngx_snprintf(out, len, "=%*s(%*s:%d)%Z",
+                     tag_len, tag, cf->conf_file->file.name.data
+                     + cf->conf_file->file.name.len - p,
+                     p, cf->conf_file->line);
+
+    *chunkname_len = p - out - 1;  /* exclude the trailing '\0' byte */
 
     return out;
 }