diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9bea433
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+.DS_Store
diff --git a/waf/access.lua b/waf/access.lua
index 54b5acc..34571a2 100644
--- a/waf/access.lua
+++ b/waf/access.lua
@@ -2,14 +2,14 @@ require 'init'
 
 function waf_main()
     if white_ip_check() then
+    elseif white_url_check() then
     elseif black_ip_check() then
     elseif user_agent_attack_check() then
     elseif cc_attack_check() then
     elseif cookie_attack_check() then
-    elseif white_url_check() then
     elseif url_attack_check() then
     elseif url_args_attack_check() then
-    --elseif post_attack_check() then
+    elseif post_attack_check() then
     else
         return
     end
diff --git a/waf/init.lua b/waf/init.lua
index d69c3df..7fb4b1b 100644
--- a/waf/init.lua
+++ b/waf/init.lua
@@ -122,9 +122,13 @@ end
 --deny url args
 function url_args_attack_check()
     if config_url_args_check == "on" then
+        local REQ_ARGS,ERR = ngx.req.get_uri_args()
+            -- limit max args to stop uri parameter overflow , return 403 if args larger than default(100)
+            if err == "truncated" then
+                ngx.exit(403)
+            end
         local ARGS_RULES = get_rule('args.rule')
         for _,rule in pairs(ARGS_RULES) do
-            local REQ_ARGS = ngx.req.get_uri_args()
             for key, val in pairs(REQ_ARGS) do
                 if type(val) == 'table' then
                     ARGS_DATA = table.concat(val, " ")
@@ -166,9 +170,30 @@ end
 --deny post
 function post_attack_check()
     if config_post_check == "on" then
+        ngx.req.read_body()
+        local POST_ARGS,err = ngx.req.get_post_args()
+            -- limit max post args to stop uri parameter overflow , return 403 if post args larger than default(100)
+            if err == "truncated" then
+                ngx.exit(403)
+            end
         local POST_RULES = get_rule('post.rule')
-        for _,rule in pairs(ARGS_RULES) do
-            local POST_ARGS = ngx.req.get_post_args()
+
+    	for key, val in pairs(POST_ARGS) do
+            if type(val) == "table" then
+	            ARGS_DATA = table.concat(key, ", ")
+            else
+                ARGS_DATA = key
+            end 
+	    end
+
+        for _,rule in pairs(POST_RULES) do
+            if ARGS_DATA and type(ARGS_DATA) ~= "boolean" and rule ~="" and rulematch(unescape(ARGS_DATA),rule,"jo") then
+                log_record('Deny_POST_Args',ngx.var.request_uri,"-",rule)
+                if config_waf_enable == "on" then
+                    waf_output()
+                    return true
+                end
+            end
         end
         return true
     end
diff --git a/waf/lib.lua b/waf/lib.lua
index 8052d5b..a7ab7a1 100644
--- a/waf/lib.lua
+++ b/waf/lib.lua
@@ -48,7 +48,7 @@ function log_record(method,url,data,ruletag)
     local LOG_PATH = config_log_dir
     local CLIENT_IP = get_client_ip()
     local USER_AGENT = get_user_agent()
-    local SERVER_NAME = ngx.var.server_name
+    local SERVER_NAME = ngx.var.host
     local LOCAL_TIME = ngx.localtime()
     local log_json_obj = {
                  client_ip = CLIENT_IP,