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

httpclient.nim Fixes #14794 and an issue where content-header is not set on postContent (#18208)

Browse source 
* Fixed missing newline after bound marker in mulipart post (#14794) and a problem where calling postContent with multipart data does not set content-length header.

* Update lib/pure/httpclient.nim

* Added comment outlining the reason for changes to httpclient.nim and added tests to ensure that multipart post has a newline at the end of the body, and that the content-length header is present.

* Fixed typo in comments.

* Removed redundant blank lines in thttpclient_standalone.nim.

Co-authored-by: Mark Pointing <mark@futurepoint.com.au>
Co-authored-by: Andreas Rumpf <rumpf_a@web.de>
This commit is contained in:
Mark Pointing 2021-06-15 03:29:23 +10:00 • committed by GitHub
commit e80d7ff0f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pure/httpclient.nim
View file

@ -975,7 +975,7 @@ proc format(client: HttpClient | AsyncHttpClient,
if entry.isFile:
length += entry.fileSize + httpNewLine.len
result.add "--" & bound & "--"
result.add "--" & bound & "--" & httpNewLine
for s in result: length += s.len
client.headers["Content-Length"] = $length
@ -1010,12 +1010,16 @@ proc requestAux(client: HttpClient | AsyncHttpClient, url: Uri,
await newConnection(client, url)
let newHeaders = client.headers.override(headers)
var newHeaders: HttpHeaders
var data: seq[string]
if multipart != nil and multipart.content.len > 0:
# `format` modifies `client.headers`, see
# https://github.com/nim-lang/Nim/pull/18208#discussion_r647036979
data = await client.format(multipart)
newHeaders = client.headers.override(headers)
else:
newHeaders = client.headers.override(headers)
# Only change headers if they have not been specified already
if not newHeaders.hasKey("Content-Length"):
if body.len != 0: