From 694e73573b37d294a42f97838090c1d25b0af009 Mon Sep 17 00:00:00 2001 From: JoyChou Date: Fri, 1 Dec 2017 12:09:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + verynginx/lua_script/module/request_tester.lua | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 003ad33c..4aa7ea54 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ *.swo *.swn *.swm +.idea/ __pycache__ diff --git a/verynginx/lua_script/module/request_tester.lua b/verynginx/lua_script/module/request_tester.lua index 2137d223..e2d7810f 100644 --- a/verynginx/lua_script/module/request_tester.lua +++ b/verynginx/lua_script/module/request_tester.lua @@ -19,7 +19,9 @@ function _M.test( matcher ) if tester[name] ~= nil then if tester[name]( v ) ~= true then return false - end + end + elseif tester[name] == nil then + return fase end end @@ -55,10 +57,6 @@ function _M.test_var( match_operator, match_value, target_var ) if target_var == nil then return true end - elseif match_operator == '!' then - if target_var == nil then - return true - end end return false From 490b86e28682edd7c6db459903e43c9254ef4447 Mon Sep 17 00:00:00 2001 From: JoyChou Date: Fri, 1 Dec 2017 12:14:12 +0800 Subject: [PATCH 2/6] BUG FIX --- verynginx/lua_script/module/request_tester.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/verynginx/lua_script/module/request_tester.lua b/verynginx/lua_script/module/request_tester.lua index e2d7810f..e47106a2 100644 --- a/verynginx/lua_script/module/request_tester.lua +++ b/verynginx/lua_script/module/request_tester.lua @@ -21,7 +21,7 @@ function _M.test( matcher ) return false end elseif tester[name] == nil then - return fase + return false end end From f8097a0ec109c25090858e513433eb34b5d22b09 Mon Sep 17 00:00:00 2001 From: JoyChou93 Date: Fri, 1 Dec 2017 12:23:29 +0800 Subject: [PATCH 3/6] Update request_tester.lua --- verynginx/lua_script/module/request_tester.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/verynginx/lua_script/module/request_tester.lua b/verynginx/lua_script/module/request_tester.lua index e47106a2..70da5630 100644 --- a/verynginx/lua_script/module/request_tester.lua +++ b/verynginx/lua_script/module/request_tester.lua @@ -22,7 +22,7 @@ function _M.test( matcher ) end elseif tester[name] == nil then return false - end + end end return true From 3fbe51be88b84f8e4e619cf8674bc889ad6763f2 Mon Sep 17 00:00:00 2001 From: JoyChou Date: Fri, 1 Dec 2017 14:08:57 +0800 Subject: [PATCH 4/6] bug fix --- verynginx/lua_script/module/request_tester.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/verynginx/lua_script/module/request_tester.lua b/verynginx/lua_script/module/request_tester.lua index 70da5630..8cab3605 100644 --- a/verynginx/lua_script/module/request_tester.lua +++ b/verynginx/lua_script/module/request_tester.lua @@ -22,7 +22,7 @@ function _M.test( matcher ) end elseif tester[name] == nil then return false - end + end end return true From 9b7d66889913588806cd23b32b061d9d077a1338 Mon Sep 17 00:00:00 2001 From: JoyChou Date: Fri, 1 Dec 2017 14:14:02 +0800 Subject: [PATCH 5/6] BUG FIX --- .gitignore | 1 - .idea/workspace.xml | 240 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 240 insertions(+), 1 deletion(-) create mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore index 4aa7ea54..003ad33c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,4 @@ *.swo *.swn *.swm -.idea/ __pycache__ diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..31afe309 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1512101084671 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 93b75a2100ec9f750c85ec7b6073bab045f642e1 Mon Sep 17 00:00:00 2001 From: JoyChou Date: Fri, 1 Dec 2017 14:15:04 +0800 Subject: [PATCH 6/6] BUG FIX --- .idea/workspace.xml | 240 -------------------------------------------- 1 file changed, 240 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 31afe309..00000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1512101084671 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file