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

httpclient now uses httpcore.HttpHeaders

Browse source
This commit is contained in:
Dominik Picheta 2016-06-02 18:40:13 +01:00
commit b33fbedec0
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/pure/httpclient.nim
View file

@ -80,17 +80,17 @@
## currently only basic authentication is supported. ## currently only basic authentication is supported.
import net, strutils, uri, parseutils, strtabs, base64, os, mimetypes, import net, strutils, uri, parseutils, strtabs, base64, os, mimetypes,
math, random math, random, httpcore
import asyncnet, asyncdispatch import asyncnet, asyncdispatch
import nativesockets import nativesockets
export strtabs export httpcore except parseHeader # TODO: The ``except`` doesn't work
type type
Response* = tuple[ Response* = tuple[
version: string, version: string,
status: string, status: string,
headers: StringTableRef, headers: HttpHeaders,
body: string] body: string]
Proxy* = ref object Proxy* = ref object
@ -167,7 +167,7 @@ proc parseChunks(s: Socket, timeout: int): string =
# Trailer headers will only be sent if the request specifies that we want # Trailer headers will only be sent if the request specifies that we want
# them: http://tools.ietf.org/html/rfc2616#section-3.6.1 # them: http://tools.ietf.org/html/rfc2616#section-3.6.1
proc parseBody(s: Socket, headers: StringTableRef, timeout: int): string = proc parseBody(s: Socket, headers: HttpHeaders, timeout: int): string =
result = "" result = ""
if headers.getOrDefault"Transfer-Encoding" == "chunked": if headers.getOrDefault"Transfer-Encoding" == "chunked":
result = parseChunks(s, timeout) result = parseChunks(s, timeout)
@ -207,7 +207,7 @@ proc parseResponse(s: Socket, getBody: bool, timeout: int): Response =
var linei = 0 var linei = 0
var fullyRead = false var fullyRead = false
var line = "" var line = ""
result.headers = newStringTable(modeCaseInsensitive) result.headers = newHttpHeaders()
while true: while true:
line = "" line = ""
linei = 0 linei = 0
@ -458,7 +458,7 @@ proc redirection(status: string): bool =
if status.startsWith(i): if status.startsWith(i):
return true return true
proc getNewLocation(lastURL: string, headers: StringTableRef): string = proc getNewLocation(lastURL: string, headers: HttpHeaders): string =
result = headers.getOrDefault"Location" result = headers.getOrDefault"Location"
if result == "": httpError("location header expected") if result == "": httpError("location header expected")
# Relative URLs. (Not part of the spec, but soon will be.) # Relative URLs. (Not part of the spec, but soon will be.)
@ -681,7 +681,7 @@ proc parseChunks(client: AsyncHttpClient): Future[string] {.async.} =
# them: http://tools.ietf.org/html/rfc2616#section-3.6.1 # them: http://tools.ietf.org/html/rfc2616#section-3.6.1
proc parseBody(client: AsyncHttpClient, proc parseBody(client: AsyncHttpClient,
headers: StringTableRef): Future[string] {.async.} = headers: HttpHeaders): Future[string] {.async.} =
result = "" result = ""
if headers.getOrDefault"Transfer-Encoding" == "chunked": if headers.getOrDefault"Transfer-Encoding" == "chunked":
result = await parseChunks(client) result = await parseChunks(client)
@ -716,7 +716,7 @@ proc parseResponse(client: AsyncHttpClient,
var linei = 0 var linei = 0
var fullyRead = false var fullyRead = false
var line = "" var line = ""
result.headers = newStringTable(modeCaseInsensitive) result.headers = newHttpHeaders()
while true: while true:
linei = 0 linei = 0
line = await client.socket.recvLine() line = await client.socket.recvLine()