Compare commits

...

2 Commits

Author SHA1 Message Date
Max1Truc
8f3ed370ea
Merge c19b111bc19e9b3e7f74bad446b9b09999820f8d into 13f2b3c663d9fa5c464782a0bfccb30bcc017b0c 2023-11-14 00:52:05 +01:00
Max1Truc
c19b111bc1 fix(http): use the right protocol for proxies
Previously, if doing a request to http://website.example.org
 through https://proxy.example.org, luasocket wouldn't use TLS
 and vice-versa
2023-11-13 23:57:20 +01:00

View File

@ -219,9 +219,11 @@ local function adjustproxy(reqt)
local proxy = reqt.proxy or _M.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 proxy.port = proxy.port or 3128
proxy.create = SCHEMES[proxy.scheme].create(reqt)
return proxy.host, proxy.port, proxy.create
else else
return reqt.host, reqt.port return reqt.host, reqt.port, reqt.create
end end
end end
@ -291,7 +293,7 @@ local function adjustrequest(reqt)
end end
-- ajust host and port if there is a proxy -- ajust host and port if there is a proxy
nreqt.host, nreqt.port = adjustproxy(nreqt) nreqt.host, nreqt.port, nreqt.create = adjustproxy(nreqt)
return nreqt return nreqt
end end