Merge 39a8b34e4afbb42c37fa89fc2dcc8537d682c5ef into 453a5207eda52939181233bffffa67171ef838bd

src/http.lua

@@ -62,7 +62,7 @@ local function receiveheaders(sock, headers)
         -- unfold any folded values
         while string.find(line, "^%s") do
             value = value .. line
-            line, err = sock:receive()
+            line = sock:receive()
             if err then return nil, err end
         end
         -- save pair in table
@@ -219,11 +219,9 @@ local function adjustproxy(reqt)
     local proxy = reqt.proxy or _M.PROXY
     if proxy then
         proxy = url.parse(proxy)
-        proxy.port = proxy.port or 3128
+        return proxy.host, proxy.port or 3128
-        proxy.create = SCHEMES[proxy.scheme].create(reqt)
-        return proxy.host, proxy.port, proxy.create
     else
-        return reqt.host, reqt.port, reqt.create
+        return reqt.host, reqt.port
     end
 end
 
@@ -293,10 +291,7 @@ local function adjustrequest(reqt)
     end
 
     -- ajust host and port if there is a proxy
-    local proxy_create
+    nreqt.host, nreqt.port = adjustproxy(nreqt)
-    nreqt.host, nreqt.port, proxy_create = adjustproxy(nreqt)
-    if not reqt.create then nreqt.create = proxy_create end
-
     return nreqt
 end