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

Merge 1f9ccb2b58 into 22cd5833fc

Browse source
This commit is contained in:
Pierre Chapuis 2013-07-05 09:07:34 -07:00
commit 43534963e8
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/http.lua
View file

@ -22,7 +22,7 @@ local _M = socket.http
-- Program constants -- Program constants
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- connection timeout in seconds -- connection timeout in seconds
TIMEOUT = 60 _M.TIMEOUT = 60
-- default port for document retrieval -- default port for document retrieval
_M.PORT = 80 _M.PORT = 80
-- user agent field sent in request -- user agent field sent in request
@ -186,7 +186,7 @@ end
local function adjusturi(reqt) local function adjusturi(reqt)
local u = reqt local u = reqt
-- if there is a proxy, we need the full url. otherwise, just a part. -- if there is a proxy, we need the full url. otherwise, just a part.
if not reqt.proxy and not PROXY then if not reqt.proxy and not _M.PROXY then
u = { u = {
path = socket.try(reqt.path, "invalid path 'nil'"), path = socket.try(reqt.path, "invalid path 'nil'"),
params = reqt.params, params = reqt.params,
@ -198,7 +198,7 @@ local function adjusturi(reqt)
end end
local function adjustproxy(reqt) local function adjustproxy(reqt)
local proxy = reqt.proxy or PROXY local proxy = reqt.proxy or _M.PROXY
if proxy then if proxy then
proxy = url.parse(proxy) proxy = url.parse(proxy)
return proxy.host, proxy.port or 3128 return proxy.host, proxy.port or 3128