123

bin/jl_tg_config_back.pid

@@ -1 +1,9 @@
+<<<<<<< HEAD
 16657
+=======
+<<<<<<< HEAD
+21288
+=======
+16380
+>>>>>>> 2b0ac85fbaac2f6e6921f321581e36814a080de3
+>>>>>>> d15a0e1697267a88c393d258d570b11f10bc39f2

lualib/tools.lua

@@ -23,7 +23,7 @@ M.read_request = function(id)
 end
 
 M.response = function(id, code,msg,...)
-    local ok, err = httpd.write_response(sockethelper.writefunc(id),code, msg,headers,...)
+    local ok, err = httpd.write_response(sockethelper.writefunc(id),code, msg,...)
     if not ok then
         -- if err == sockethelper.socket_error , that means socket closed.
         skynet.error(string.format("fd = %d, %s", id, err))

service/http_work/init.lua

@@ -30,13 +30,12 @@ local dispatch = function(session, address,id, addr,...)
         tools.dump({address=address,id=id,addr=addr,other=...})
         return  tools.response(id, req.code, "error!")
     end
-
       -- 处理 OPTIONS 请求
-    if req.method == "OPTIONS" then
-        handle_options(id,req.header)
-        socket.close(id)
-        return tools.response(id, req.code, "error!")
-    end
+    -- if req.method == "OPTIONS" then
+    --     handle_options(id,req.header)
+    --     socket.close(id)
+    --     return tools.response(id, req.code, "error!")
+    -- end
 
     if string.find(req.url, "tg/back/") then
         local func_list = string.split(req.url ,"/")