mirror of
https://github.com/cloudwu/skynet.git
synced 2026-07-24 20:23:06 +00:00
Merge branch 'master' of github.com:cloudwu/skynet
This commit is contained in:
@@ -11,23 +11,21 @@ local function request(fd, method, host, url, recvheader, header, content)
|
|||||||
local write = socket.writefunc(fd)
|
local write = socket.writefunc(fd)
|
||||||
local header_content = ""
|
local header_content = ""
|
||||||
if header then
|
if header then
|
||||||
|
if not header.host then
|
||||||
|
header.host = host
|
||||||
|
end
|
||||||
for k,v in pairs(header) do
|
for k,v in pairs(header) do
|
||||||
header_content = string.format("%s%s:%s\r\n", header_content, k, v)
|
header_content = string.format("%s%s:%s\r\n", header_content, k, v)
|
||||||
end
|
end
|
||||||
if header.host then
|
|
||||||
host = ""
|
|
||||||
else
|
|
||||||
host = string.format("host:%s\r\n", host)
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
host = string.format("host:%s\r\n",host)
|
header_content = string.format("host:%s\r\n",host)
|
||||||
end
|
end
|
||||||
|
|
||||||
if content then
|
if content then
|
||||||
local data = string.format("%s %s HTTP/1.1\r\n%scontent-length:%d\r\n%s\r\n%s", method, url, host, #content, header_content, content)
|
local data = string.format("%s %s HTTP/1.1\r\n%scontent-length:%d\r\n\r\n%s", method, url, header_content, #content, content)
|
||||||
write(data)
|
write(data)
|
||||||
else
|
else
|
||||||
local request_header = string.format("%s %s HTTP/1.1\r\nhost:%s\r\ncontent-length:0\r\n%s\r\n", method, url, host, header_content)
|
local request_header = string.format("%s %s HTTP/1.1\r\n%scontent-length:0\r\n\r\n", method, url, header_content)
|
||||||
write(request_header)
|
write(request_header)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user