dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2025-10-31 18:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69 from catwell/pull-globals

Browse Source 
fixes related to constants in the HTTP module
This commit is contained in:
Diego Nehab
2013-07-05 12:40:49 -07:00
parent 22cd5833fc 1f9ccb2b58
commit 6bdb00e24c
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