Merge pull request #115 from treeform/guzba

2.1.2 updated deps

puppy.nimble

@@ -1,4 +1,4 @@
-version     = "2.1.1"
+version     = "2.1.2"
 author      = "Andre von Houck"
 description = "Puppy fetches resources via HTTP and HTTPS."
 license     = "MIT"
@@ -8,4 +8,4 @@ srcDir = "src"
 requires "nim >= 1.2.2"
 requires "libcurl >= 1.0.0"
 requires "zippy >= 0.10.0"
-requires "webby >= 0.1.6"
+requires "webby >= 0.2.0"

src/puppy/platforms/linux/platform.nim

@@ -1,4 +1,4 @@
-import libcurl, puppy/common, std/strutils, zippy
+import libcurl, puppy/common, std/strutils, zippy, webby/httpheaders
 
 block:
   ## If you did not already call curl_global_init then
@@ -106,7 +106,11 @@ proc internalFetch*(req: Request): Response {.raises: [PuppyError].} =
       for headerLine in headerData.split(CRLF):
         let arr = headerLine.split(":", 1)
         if arr.len == 2:
-          result.headers.add((arr[0].strip(), arr[1].strip()))
+          when (NimMajor, NimMinor, NimPatch) >= (1, 4, 8):
+            result.headers.add((arr[0].strip(), arr[1].strip()))
+          else:
+            let tmp = cast[ptr HttpHeaders](result.headers.addr)
+            tmp[].toBase.add((arr[0].strip(), arr[1].strip()))
 
       result.body = bodyWrap.str
       if result.headers["Content-Encoding"] == "gzip":

src/puppy/platforms/macos/platform.nim

@@ -39,8 +39,10 @@ proc internalFetch*(req: Request): Response {.raises: [PuppyError].} =
         let key = keyEnumerator.nextObject
         if key.int == 0:
           break
-        let value = dictionary.objectForKey(key)
-        result.headers.add(($(key.NSString), $(value.NSString)))
+        let
+          value = dictionary.objectForKey(key)
+          tmp = cast[ptr HttpHeaders](result.headers.addr)
+        tmp[].toBase.add(($(key.NSString), $(value.NSString)))
 
       if data.length > 0:
         result.body.setLen(data.length)

src/puppy/platforms/win32/platform.nim

@@ -255,10 +255,11 @@ proc internalFetch*(req: Request): Response {.raises: [PuppyError].} =
       if line != "":
         let parts = line.split(":", 1)
         if parts.len == 2:
-          result.headers.add((
-            parts[0].strip(),
-            parts[1].strip()
-          ))
+          when (NimMajor, NimMinor, NimPatch) >= (1, 4, 8):
+            result.headers.add((parts[0].strip(), parts[1].strip()))
+          else:
+            let tmp = cast[ptr HttpHeaders](result.headers.addr)
+            tmp[].toBase.add((parts[0].strip(), parts[1].strip()))
 
     var i: int
     result.body.setLen(8192)