From 270ee5468ff3c6220a6c9ed690f172083aa52856 Mon Sep 17 00:00:00 2001
From: Ben Kircher <bkircher@0xadd.de>
Date: Mon, 9 Feb 2026 09:54:09 +0100
Subject: [PATCH] url: fix $VAR mid-word partial matches

Add `(?<!\w)` to prefixes so that $VAR cannot match mid-word.
---
 src/config/url.zig | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/config/url.zig b/src/config/url.zig
index dd9ae94ad..9c39d9bc5 100644
--- a/src/config/url.zig
+++ b/src/config/url.zig
@@ -75,7 +75,7 @@ const scheme_url_branch =
     no_trailing_punctuation;
 
 const rooted_or_relative_path_prefix =
-    \\(?:\.\.\/|\.\/|~\/|(?:[\w][\w\-.]*\/)*\$[A-Za-z_]\w*\/|\.[\w][\w\-.]*\/|(?<!\w)\/)
+    \\(?:\.\.\/|\.\/|~\/|(?:[\w][\w\-.]*\/)*(?<!\w)\$[A-Za-z_]\w*\/|\.[\w][\w\-.]*\/|(?<!\w)\/)
 ;
 
 // Branch 2: Absolute paths and dot-relative paths (/, ./, ../).
@@ -97,7 +97,7 @@ const rooted_or_relative_path_branch =
 
 // Branch 3: Bare relative paths such as src/config/url.zig.
 const bare_relative_path_prefix =
-    \\(?<!\$\d*)[\w][\w\-.]*\/
+    \\(?<!\$\d*)(?<!\w)[\w][\w\-.]*\/
 ;
 
 const bare_relative_path_branch =
@@ -459,6 +459,8 @@ test "url regex" {
         "$10/bar.txt",
         // comma should not let dot detection look past it
         "foo/bar,baz.txt",
+        // $VAR should not match mid-word
+        "foo$BAR/baz.txt",
     };
     for (no_match_cases) |input| {
         var result = re.search(input, .{});