dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2024-07-03 19:59:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

HTTP.request was not returning response for body-less requests.

Browse Source
This commit is contained in:
Diego Nehab 2001-09-18 20:22:59 +00:00
parent b73a66e635
commit 29ab78a74a
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/http.lua
View File

@ -156,8 +156,8 @@ function Private.receivebody_bychunks(sock, headers, receive_cb)
go, uerr = receive_cb(nil, err) go, uerr = receive_cb(nil, err)
return uerr or err return uerr or err
end end
-- was it the last chunk? -- was it the last chunk?
if size <= 0 then break end if size <= 0 then break end
-- get chunk -- get chunk
chunk, err = %Private.try_receive(sock, size) chunk, err = %Private.try_receive(sock, size)
if err then if err then
@ -177,14 +177,14 @@ function Private.receivebody_bychunks(sock, headers, receive_cb)
return uerr or err return uerr or err
end end
end end
-- the server should not send trailer headers because we didn't send a -- the server should not send trailer headers because we didn't send a
-- header informing it we know how to deal with them. we do not risk -- header informing it we know how to deal with them. we do not risk
-- being caught unprepaired. -- being caught unprepaired.
headers, err = %Private.receive_headers(sock, headers) headers, err = %Private.receive_headers(sock, headers)
if err then if err then
go, uerr = receive_cb(nil, err) go, uerr = receive_cb(nil, err)
return uerr or err return uerr or err
end end
-- let callback know we are done -- let callback know we are done
go, uerr = receive_cb("") go, uerr = receive_cb("")
return uerr return uerr
@ -257,7 +257,7 @@ end
-- nil if successfull or an error message in case of error -- nil if successfull or an error message in case of error
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
function Private.receive_body(sock, headers, receive_cb) function Private.receive_body(sock, headers, receive_cb)
local te = headers["transfer-encoding"] local te = headers["transfer-encoding"]
if te and te ~= "identity" then if te and te ~= "identity" then
-- get by chunked transfer-coding of message body -- get by chunked transfer-coding of message body
return %Private.receivebody_bychunks(sock, headers, receive_cb) return %Private.receivebody_bychunks(sock, headers, receive_cb)
@ -436,7 +436,7 @@ function Private.authorize(request, parsed, response)
request.headers["authorization"] = "Basic " .. request.headers["authorization"] = "Basic " ..
Code.base64(parsed.user .. ":" .. parsed.password) Code.base64(parsed.user .. ":" .. parsed.password)
local authorize = { local authorize = {
redirects = request.redirects, redirects = request.redirects,
method = request.method, method = request.method,
url = request.url, url = request.url,
body_cb = request.body_cb, body_cb = request.body_cb,
@ -540,10 +540,10 @@ end
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
function Public.request_cb(request, response) function Public.request_cb(request, response)
local parsed = URL.parse_url(request.url, { local parsed = URL.parse_url(request.url, {
host = "", host = "",
port = %Public.PORT, port = %Public.PORT,
path ="/" path ="/"
}) })
-- explicit authentication info overrides that given by the URL -- explicit authentication info overrides that given by the URL
parsed.user = request.user or parsed.user parsed.user = request.user or parsed.user
parsed.password = request.password or parsed.password parsed.password = request.password or parsed.password
@ -585,6 +585,7 @@ function Public.request_cb(request, response)
return response return response
end end
sock:close() sock:close()
return response
end end
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
@ -637,8 +638,8 @@ end
-- error: error message if any -- error: error message if any
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
function Public.get(url_or_request) function Public.get(url_or_request)
local request = %Private.build_request(url_or_request) local request = %Private.build_request(url_or_request)
request.method = "GET" request.method = "GET"
local response = %Public.request(request) local response = %Public.request(request)
return response.body, response.headers, return response.body, response.headers,
response.code, response.error response.code, response.error
@ -660,9 +661,9 @@ end
-- error: error message, or nil if successfull -- error: error message, or nil if successfull
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
function Public.post(url_or_request, body) function Public.post(url_or_request, body)
local request = %Private.build_request(url_or_request) local request = %Private.build_request(url_or_request)
request.method = "POST" request.method = "POST"
request.body = request.body or body request.body = request.body or body
local response = %Public.request(request) local response = %Public.request(request)
return response.body, response.headers, return response.body, response.headers,
response.code, response.error response.code, response.error