From eed7c23885e30b04e09ad66aa9c848888b5c99b3 Mon Sep 17 00:00:00 2001
From: Domenic Denicola <d@domenic.me>
Date: Fri, 25 Apr 2025 10:50:41 +0900
Subject: [PATCH] Improve "populate request from client" for null client cases

In particular, set request's window to "no-window". Also assert that origin is always set for such null-client cases.
---
 fetch.bs | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/fetch.bs b/fetch.bs
index adee889ba..6ee43273a 100644
--- a/fetch.bs
+++ b/fetch.bs
@@ -4439,15 +4439,28 @@ the response. [[!HTTP-CACHING]]
 <p>To <dfn>populate request from client</dfn> given a <a for=/>request</a> <var>request</var>:
 
 <ol>
- <li><p>If <var>request</var>'s <a for=request>window</a> is "<code>client</code>", then: set
- <var>request</var>'s <a for=request>window</a> to <var>request</var>'s <a for=request>client</a>
- if <var>request</var>'s <a for=request>client</a>'s
- <a for="environment settings object">global object</a> is a {{Window}} object; otherwise
- "<code>no-window</code>".
-
- <li><p>If <var>request</var>'s <a for=request>origin</a> is "<code>client</code>", then set
- <var>request</var>'s <a for=request>origin</a> to  <var>request</var>'s <a for=request>client</a>'s
- <a for="environment settings object">origin</a>.
+ <li>
+  <p>If <var>request</var>'s <a for=request>window</a> is "<code>client</code>":
+
+  <ol>
+   <li><p>If <var>request</var>'s <a for=request>client</a> is non-null and <var>request</var>'s
+   <a for=request>client</a>'s <a for="environment settings object">global object</a> is a
+   {{Window}} object, then set <var>request</var>'s <a for=request>window</a> to
+   <var>request</var>'s <a for=request>client</a>'s
+   <a for="environment settings object">global object</a>.
+
+   <li><p>Otherwise, set <var>request</var>'s <a for=request>window</a> to "<code>no-window</code>".
+  </ol>
+
+ <li>
+  <p>If <var>request</var>'s <a for=request>origin</a> is "<code>client</code>":
+
+  <ol>
+   <li><p><a>Assert</a>: <var>request</var>'s <a for=request>client</a> is non-null.
+
+   <li><p>Set <var>request</var>'s <a for=request>origin</a> to <var>request</var>'s
+   <a for=request>client</a>'s <a for="environment settings object">origin</a>.
+  </ol>
 
  <li>
   <p>If <var>request</var>'s <a for=request>policy container</a> is "<code>client</code>":