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

Fixes regression introduced by #11904. (#11948)

Browse source
This commit is contained in:
Dominik Picheta 2019-08-15 05:05:38 +01:00 • committed by Andreas Rumpf
commit b095203f28
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pure/httpclient.nim
View file

@ -342,7 +342,8 @@ proc parseBody(s: Socket, headers: HttpHeaders, httpVersion: string, timeout: in
# (http://tools.ietf.org/html/rfc2616#section-4.4) NR.5 # (http://tools.ietf.org/html/rfc2616#section-4.4) NR.5
let implicitConnectionClose = let implicitConnectionClose =
httpVersion == "1.0" or httpVersion == "1.0" or
httpVersion == "1.1" # This doesn't match the HTTP spec, but it fixes issues for non-conforming servers. # This doesn't match the HTTP spec, but it fixes issues for non-conforming servers.
(httpVersion == "1.1" and headers.getOrDefault"Connection" == "")
if headers.getOrDefault"Connection" == "close" or implicitConnectionClose: if headers.getOrDefault"Connection" == "close" or implicitConnectionClose:
var buf = "" var buf = ""
while true: while true:
@ -816,7 +817,8 @@ proc parseBody(client: HttpClient | AsyncHttpClient,
# (http://tools.ietf.org/html/rfc2616#section-4.4) NR.5 # (http://tools.ietf.org/html/rfc2616#section-4.4) NR.5
let implicitConnectionClose = let implicitConnectionClose =
httpVersion == "1.0" or httpVersion == "1.0" or
httpVersion == "1.1" # This doesn't match the HTTP spec, but it fixes issues for non-conforming servers. # This doesn't match the HTTP spec, but it fixes issues for non-conforming servers.
(httpVersion == "1.1" and headers.getOrDefault"Connection" == "")
if headers.getOrDefault"Connection" == "close" or implicitConnectionClose: if headers.getOrDefault"Connection" == "close" or implicitConnectionClose:
while true: while true:
let recvLen = await client.recvFull(4000, client.timeout, true) let recvLen = await client.recvFull(4000, client.timeout, true)