change: upgrade ngx_var module 0.4 to 0.5. (apache#1005)

SaberMaster · Jun 30, 2020 · 8cf732b · 8cf732b
1 parent 3ad79d4
commit 8cf732b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/lua/apisix/http/router/radixtree_host_uri.lua b/lua/apisix/http/router/radixtree_host_uri.lua
@@ -139,7 +139,7 @@ function _M.match(api_ctx)
     end
 
     core.table.clear(match_opts)
-    match_opts.method = api_ctx.var.method
+    match_opts.method = api_ctx.var.request_method
     match_opts.remote_addr = api_ctx.var.remote_addr
     match_opts.vars = api_ctx.var
     match_opts.host = api_ctx.var.host

diff --git a/lua/apisix/http/router/radixtree_uri.lua b/lua/apisix/http/router/radixtree_uri.lua
@@ -99,7 +99,7 @@ function _M.match(api_ctx)
     end
 
     core.table.clear(match_opts)
-    match_opts.method = api_ctx.var.method
+    match_opts.method = api_ctx.var.request_method
     match_opts.host = api_ctx.var.host
     match_opts.remote_addr = api_ctx.var.remote_addr
     match_opts.vars = api_ctx.var

diff --git a/lua/apisix/plugins/zipkin.lua b/lua/apisix/plugins/zipkin.lua
@@ -89,7 +89,7 @@ function _M.rewrite(conf, ctx)
         tags = {
             component = "apisix",
             ["span.kind"] = "server",
-            ["http.method"] = ctx.var.method,
+            ["http.method"] = ctx.var.request_method,
             ["http.url"] = ctx.var.request_uri,
              -- TODO: support ipv6
             ["peer.ipv4"] = core.request.get_remote_client_ip(ctx),

diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec
@@ -33,7 +33,7 @@ dependencies = {
     "lua-resty-template = 1.9",
     "lua-resty-etcd = 0.8",
     "lua-resty-balancer = 0.02rc5",
-    "lua-resty-ngxvar = 0.4",
+    "lua-resty-ngxvar = 0.5",
     "lua-resty-jit-uuid = 0.0.7",
     "lua-resty-healthcheck-iresty = 2.0",
     "lua-resty-jwt = 0.2.0",