diff options
author | Araq <rumpf_a@web.de> | 2018-08-13 17:27:44 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2018-08-13 17:27:44 +0200 |
commit | 420ed0596b8114c67275c4702fa3524ebd76e5eb (patch) | |
tree | f381eaedb04743a43faa1ded7e5d77ac5952ab3e /lib/pure | |
parent | d60bb1b289c7914443a20b78bfb6c69f05184937 (diff) | |
download | Nim-420ed0596b8114c67275c4702fa3524ebd76e5eb.tar.gz |
fixes more nil handling regressions
Diffstat (limited to 'lib/pure')
-rw-r--r-- | lib/pure/httpclient.nim | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/pure/httpclient.nim b/lib/pure/httpclient.nim index a98779db3..0192e71e7 100644 --- a/lib/pure/httpclient.nim +++ b/lib/pure/httpclient.nim @@ -378,23 +378,23 @@ proc newMultipartData*: MultipartData = ## Constructs a new ``MultipartData`` object. MultipartData(content: @[]) -proc add*(p: var MultipartData, name, content: string, filename: string = nil, - contentType: string = nil) = +proc add*(p: var MultipartData, name, content: string, filename: string = "", + contentType: string = "") = ## Add a value to the multipart data. Raises a `ValueError` exception if ## `name`, `filename` or `contentType` contain newline characters. if {'\c','\L'} in name: raise newException(ValueError, "name contains a newline character") - if filename != nil and {'\c','\L'} in filename: + if {'\c','\L'} in filename: raise newException(ValueError, "filename contains a newline character") - if contentType != nil and {'\c','\L'} in contentType: + if {'\c','\L'} in contentType: raise newException(ValueError, "contentType contains a newline character") var str = "Content-Disposition: form-data; name=\"" & name & "\"" - if filename != nil: + if filename.len > 0: str.add("; filename=\"" & filename & "\"") str.add("\c\L") - if contentType != nil: + if contentType.len > 0: str.add("Content-Type: " & contentType & "\c\L") str.add("\c\L" & content & "\c\L") @@ -434,7 +434,7 @@ proc addFiles*(p: var MultipartData, xs: openarray[tuple[name, file: string]]): var contentType: string let (_, fName, ext) = splitFile(file) if ext.len > 0: - contentType = m.getMimetype(ext[1..ext.high], nil) + contentType = m.getMimetype(ext[1..ext.high], "") p.add(name, readFile(file), fName & ext, contentType) result = p |