jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make httpclient close opened Socket on error

Browse source
This commit is contained in:
Hendrik Richter 2016-07-28 11:30:05 +02:00
commit b0f1d9f467
1 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pure/httpclient.nim
View file

@ -422,7 +422,9 @@ proc request*(url: string, httpMethod: string, extraHeaders = "",
add(headers, "Proxy-Authorization: basic " & auth & "\c\L") add(headers, "Proxy-Authorization: basic " & auth & "\c\L")
add(headers, extraHeaders) add(headers, extraHeaders)
add(headers, "\c\L") add(headers, "\c\L")
var s = newSocket() var s: Socket
try:
s = newSocket()
if s == nil: raiseOSError(osLastError()) if s == nil: raiseOSError(osLastError())
var port = net.Port(80) var port = net.Port(80)
if r.scheme == "https": if r.scheme == "https":
@ -444,6 +446,9 @@ proc request*(url: string, httpMethod: string, extraHeaders = "",
s.send(body) s.send(body)
result = parseResponse(s, httpMethod != "httpHEAD", timeout) result = parseResponse(s, httpMethod != "httpHEAD", timeout)
except:
raise
finally:
s.close() s.close()
proc request*(url: string, httpMethod = httpGET, extraHeaders = "", proc request*(url: string, httpMethod = httpGET, extraHeaders = "",