From efe5a3398853c0a90ff49a25ac287d694f24f387 Mon Sep 17 00:00:00 2001
From: Jake Leahy <jake@leahy.dev>
Date: Mon, 13 Jun 2022 16:03:40 +1000
Subject: [PATCH] Pass headers and body correctly to FetchOptions (#19884)
 [backport]

* Pass headers to FetchOptions

Don't pass body if method is HttpGet or HttpHead

* Syntax fixes

* Restart CI

(cherry picked from commit 8fa2c0b532be9fdfd7682e5a8cc846b60bd4ea6c)
---
 lib/std/jsfetch.nim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/std/jsfetch.nim b/lib/std/jsfetch.nim
index a25fe7ca82..177300cf3f 100644
--- a/lib/std/jsfetch.nim
+++ b/lib/std/jsfetch.nim
@@ -90,8 +90,9 @@ func newfetchOptions*(metod: HttpMethod; body: cstring;
     keepalive: bool; redirect = frFollow; referrer = "client".cstring; integrity = "".cstring): FetchOptions =
   ## Constructor for `FetchOptions`.
   result = FetchOptions(
-    body: body, mode: $mode, credentials: $credentials, cache: $cache, referrerPolicy: $referrerPolicy,
-    keepalive: keepalive, redirect: $redirect, referrer: referrer, integrity: integrity,
+    body: if metod notin {HttpHead, HttpGet}: body else: nil,
+    mode: cstring($mode), credentials: cstring($credentials), cache: cstring($cache), referrerPolicy: cstring($referrerPolicy),
+    keepalive: keepalive, redirect: cstring($redirect), referrer: referrer, integrity: integrity,
     metod: (case metod
       of HttpHead:   "HEAD".cstring
       of HttpGet:    "GET".cstring