lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-22 02:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

use sockethelper connect

Browse Source
This commit is contained in:
zixun
2019-07-21 16:57:50 +08:00
committed by 云风
parent 4341106364
commit 7240de08a9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lualib/http/websocket.lua
View File

@@ -368,7 +368,7 @@ function M.accept(socket_id, handle, protocol)
end
function M.connect(url, header)
function M.connect(url, header, timeout)
local protocol, host, uri = string.match(url, "^(wss?)://([^/]+)(.*)$")
if protocol ~= "wss" and protocol ~= "ws" then
error(string.format("invalid protocol: %s", protocol))
@@ -382,8 +382,7 @@ function M.connect(url, header)
end
uri = uri == "" and "/" or uri
local socket_id = socket.open(host_name, host_port)
assert(socket_id)
local socket_id = sockethelper.connect(host_name, host_port, timeout)
local ws_obj = _new_client_ws(socket_id, protocol)
write_handshake(ws_obj, host_name, uri, header)
return socket_id