From 870b340a778845fb575918ff6ca883c74872bb9c Mon Sep 17 00:00:00 2001 From: Ryan Oldenburg Date: Fri, 2 Feb 2024 18:53:32 -0600 Subject: [PATCH 1/4] 2.1.2 updated deps --- puppy.nimble | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/puppy.nimble b/puppy.nimble index 8dfcae7..f9e7254 100644 --- a/puppy.nimble +++ b/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" From e96af0e2948933f2f89ad32f883dd7f088802ffb Mon Sep 17 00:00:00 2001 From: Ryan Oldenburg Date: Fri, 2 Feb 2024 19:09:24 -0600 Subject: [PATCH 2/4] whatever --- src/puppy/platforms/linux/platform.nim | 8 ++++++-- src/puppy/platforms/win32/platform.nim | 9 +++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/puppy/platforms/linux/platform.nim b/src/puppy/platforms/linux/platform.nim index 8c98cc5..57d80fa 100644 --- a/src/puppy/platforms/linux/platform.nim +++ b/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.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": diff --git a/src/puppy/platforms/win32/platform.nim b/src/puppy/platforms/win32/platform.nim index a7cdf4d..2128615 100644 --- a/src/puppy/platforms/win32/platform.nim +++ b/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.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) From 6bbca3ad9b72fad31894e99949fa6033def9add9 Mon Sep 17 00:00:00 2001 From: Ryan Oldenburg Date: Fri, 2 Feb 2024 19:37:33 -0600 Subject: [PATCH 3/4] f --- src/puppy/platforms/linux/platform.nim | 2 +- src/puppy/platforms/win32/platform.nim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/puppy/platforms/linux/platform.nim b/src/puppy/platforms/linux/platform.nim index 57d80fa..1eea030 100644 --- a/src/puppy/platforms/linux/platform.nim +++ b/src/puppy/platforms/linux/platform.nim @@ -107,7 +107,7 @@ proc internalFetch*(req: Request): Response {.raises: [PuppyError].} = let arr = headerLine.split(":", 1) if arr.len == 2: when (NimMajor, NimMinor, NimPatch) >= (1, 4, 8): - result.add((arr[0].strip(), arr[1].strip())) + 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())) diff --git a/src/puppy/platforms/win32/platform.nim b/src/puppy/platforms/win32/platform.nim index 2128615..1c90dcf 100644 --- a/src/puppy/platforms/win32/platform.nim +++ b/src/puppy/platforms/win32/platform.nim @@ -256,7 +256,7 @@ proc internalFetch*(req: Request): Response {.raises: [PuppyError].} = let parts = line.split(":", 1) if parts.len == 2: when (NimMajor, NimMinor, NimPatch) >= (1, 4, 8): - result.add((parts[0].strip(), parts[1].strip())) + 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())) From cc292a9827a7d41301795eab93eeb20ef16bf6f4 Mon Sep 17 00:00:00 2001 From: Ryan Oldenburg Date: Fri, 2 Feb 2024 20:19:28 -0600 Subject: [PATCH 4/4] f --- src/puppy/platforms/macos/platform.nim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/puppy/platforms/macos/platform.nim b/src/puppy/platforms/macos/platform.nim index 52344d3..c9d107c 100644 --- a/src/puppy/platforms/macos/platform.nim +++ b/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)