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

Use HttpHeaders in httpclient module.

Browse source
This commit is contained in:
Dominik Picheta 2016-09-18 18:56:04 +02:00
commit c4ee18015e
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

@ -607,7 +607,7 @@ proc downloadFile*(url: string, outputFilename: string,
fileError("Unable to open file") fileError("Unable to open file")
proc generateHeaders(r: Uri, httpMethod: string, proc generateHeaders(r: Uri, httpMethod: string,
headers: StringTableRef, body: string): string = headers: HttpHeaders, body: string): string =
# TODO: Use this in the blocking HttpClient once it supports proxies. # TODO: Use this in the blocking HttpClient once it supports proxies.
result = substr(httpMethod, len("http")).toUpper() result = substr(httpMethod, len("http")).toUpper()
# TODO: Proxies # TODO: Proxies
@ -636,7 +636,7 @@ type
socket: SocketType socket: SocketType
connected: bool connected: bool
currentURL: Uri ## Where we are currently connected. currentURL: Uri ## Where we are currently connected.
headers*: StringTableRef headers*: HttpHeaders
maxRedirects: int maxRedirects: int
userAgent: string userAgent: string
when defined(ssl): when defined(ssl):
@ -657,7 +657,7 @@ proc newHttpClient*(userAgent = defUserAgent,
## ##
## ``sslContext`` specifies the SSL context to use for HTTPS requests. ## ``sslContext`` specifies the SSL context to use for HTTPS requests.
new result new result
result.headers = newStringTable(modeCaseInsensitive) result.headers = newHttpHeaders()
result.userAgent = userAgent result.userAgent = userAgent
result.maxRedirects = maxRedirects result.maxRedirects = maxRedirects
when defined(ssl): when defined(ssl):
@ -680,7 +680,7 @@ proc newAsyncHttpClient*(userAgent = defUserAgent,
## ##
## ``sslContext`` specifies the SSL context to use for HTTPS requests. ## ``sslContext`` specifies the SSL context to use for HTTPS requests.
new result new result
result.headers = newStringTable(modeCaseInsensitive) result.headers = newHttpHeaders()
result.userAgent = userAgent result.userAgent = userAgent
result.maxRedirects = maxRedirects result.maxRedirects = maxRedirects
when defined(ssl): when defined(ssl):
@ -891,13 +891,13 @@ proc get*(client: HttpClient | AsyncHttpClient,
## Connects to the hostname specified by the URL and performs a GET request. ## Connects to the hostname specified by the URL and performs a GET request.
## ##
## This procedure will follow redirects up to a maximum number of redirects ## This procedure will follow redirects up to a maximum number of redirects
## specified in ``newAsyncHttpClient``. ## specified in ``client.maxRedirects``.
result = await client.request(url, httpGET) result = await client.request(url, HttpGET)
var lastURL = url var lastURL = url
for i in 1..client.maxRedirects: for i in 1..client.maxRedirects:
if result.status.redirection(): if result.status.redirection():
let redirectTo = getNewLocation(lastURL, result.headers) let redirectTo = getNewLocation(lastURL, result.headers)
result = await client.request(redirectTo, httpGET) result = await client.request(redirectTo, HttpGET)
lastURL = redirectTo lastURL = redirectTo
proc post*(client: HttpClient | AsyncHttpClient, url: string, body = "", proc post*(client: HttpClient | AsyncHttpClient, url: string, body = "",
@ -905,7 +905,7 @@ proc post*(client: HttpClient | AsyncHttpClient, url: string, body = "",
## Connects to the hostname specified by the URL and performs a POST request. ## Connects to the hostname specified by the URL and performs a POST request.
## ##
## This procedure will follow redirects up to a maximum number of redirects ## This procedure will follow redirects up to a maximum number of redirects
## specified in ``newAsyncHttpClient``. ## specified in ``client.maxRedirects``.
let (mpHeader, mpBody) = format(multipart) let (mpHeader, mpBody) = format(multipart)
template withNewLine(x): expr = template withNewLine(x): expr =