mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-04 04:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use HttpHeaders in httpclient module.

Browse Source
This commit is contained in:
Dominik Picheta
2016-09-18 18:56:04 +02:00
parent 3ad368f8ca
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")
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.
result = substr(httpMethod, len("http")).toUpper()
# TODO: Proxies
@@ -636,7 +636,7 @@ type
socket: SocketType
connected: bool
currentURL: Uri ## Where we are currently connected.
headers*: StringTableRef
headers*: HttpHeaders
maxRedirects: int
userAgent: string
when defined(ssl):
@@ -657,7 +657,7 @@ proc newHttpClient*(userAgent = defUserAgent,
##
## ``sslContext`` specifies the SSL context to use for HTTPS requests.
new result
result.headers = newStringTable(modeCaseInsensitive)
result.headers = newHttpHeaders()
result.userAgent = userAgent
result.maxRedirects = maxRedirects
when defined(ssl):
@@ -680,7 +680,7 @@ proc newAsyncHttpClient*(userAgent = defUserAgent,
##
## ``sslContext`` specifies the SSL context to use for HTTPS requests.
new result
result.headers = newStringTable(modeCaseInsensitive)
result.headers = newHttpHeaders()
result.userAgent = userAgent
result.maxRedirects = maxRedirects
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.
##
## This procedure will follow redirects up to a maximum number of redirects
## specified in ``newAsyncHttpClient``.
result = await client.request(url, httpGET)
## specified in ``client.maxRedirects``.
result = await client.request(url, HttpGET)
var lastURL = url
for i in 1..client.maxRedirects:
if result.status.redirection():
let redirectTo = getNewLocation(lastURL, result.headers)
result = await client.request(redirectTo, httpGET)
result = await client.request(redirectTo, HttpGET)
lastURL = redirectTo
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.
##
## This procedure will follow redirects up to a maximum number of redirects
## specified in ``newAsyncHttpClient``.
## specified in ``client.maxRedirects``.
let (mpHeader, mpBody) = format(multipart)
template withNewLine(x): expr =