zyppe/luasocket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HTTP now has only one function.

Browse source
This commit is contained in:
Diego Nehab 2004-06-16 22:51:04 +00:00
parent 574708380f
commit 9fc682a106
4 changed files with 24 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/http.lua
View file

@ -122,7 +122,7 @@ local function uri(reqt)
local u = reqt
if not reqt.proxy and not PROXY then
u = {
path = reqt.path,
path = socket.try(reqt.path, "invalid path 'nil'"),
params = reqt.params,
query = reqt.query,
fragment = reqt.fragment
@ -152,18 +152,15 @@ local default = {
local function adjustrequest(reqt)
-- parse url if provided
if reqt.url then
local parsed = url.parse(reqt.url, default)
-- explicit components override url
for i,v in parsed do reqt[i] = reqt[i] or v end
end
socket.try(reqt.host, "invalid host '" .. tostring(reqt.host) .. "'")
socket.try(reqt.path, "invalid path '" .. tostring(reqt.path) .. "'")
local nreqt = reqt.url and url.parse(reqt.url, default) or {}
-- explicit components override url
for i,v in reqt do nreqt[i] = reqt[i] end
socket.try(nreqt.host, "invalid host '" .. tostring(nreqt.host) .. "'")
-- compute uri if user hasn't overriden
reqt.uri = reqt.uri or uri(reqt)
nreqt.uri = nreqt.uri or uri(nreqt)
-- adjust headers in request
reqt.headers = adjustheaders(reqt.headers, reqt.host)
return reqt
nreqt.headers = adjustheaders(nreqt.headers, nreqt.host)
return nreqt
end
local function shouldredirect(reqt, code)