Skip to content

Lightpanda: the headless browser designed for AI and automation

`URL`: remove `always_dupe` option from all call sites

Halil Durak9732c33c3cb4
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zig
index a97db6bd7..3f6e30c01 100644
--- a/src/browser/Frame.zig
+++ b/src/browser/Frame.zig
@@ -817,7 +817,7 @@ fn scheduleNavigationWithArena(originator: *Frame, arena: Allocator, request_url
arena,
frame_base,
request_url,
- .{ .always_dupe = true, .encoding = originator.charset },
+ .{ .encoding = originator.charset },
);
break :blk .{ u, false };
};
@@ -1769,7 +1769,7 @@ pub fn openPopup(self: *Frame, opts: OpenPopupOpts) !*Frame {
frame = frame.parent orelse break :base_blk "";
}
};
- break :blk try URL.resolve(self.call_arena, frame_base, opts.url, .{ .always_dupe = true, .encoding = self.charset });
+ break :blk try URL.resolve(self.call_arena, frame_base, opts.url, .{ .encoding = self.charset });
};
const popup = try page.frame_arena.create(Frame);
diff --git a/src/browser/HttpClient.zig b/src/browser/HttpClient.zig
index bc3a32a66..be9ba9f09 100644
--- a/src/browser/HttpClient.zig
+++ b/src/browser/HttpClient.zig
@@ -1944,9 +1944,9 @@ pub const Transfer = struct {
}
const base_url = try conn.getEffectiveUrl();
- // base_url and location are owned by curl. The returned value
- // will be stored in transfer.req.url, hence the always_dupe.
- const resolved = try URL.resolve(arena, std.mem.span(base_url), location, .{ .always_dupe = true });
+ // base_url and location are owned by curl; resolve returns a fresh
+ // arena-owned copy that gets stored in transfer.req.url.
+ const resolved = try URL.resolve(arena, std.mem.span(base_url), location, .{});
// RFC 7231 §7.1.2: if the Location value has no fragment, the redirect
// inherits the fragment from the URI used to generate the request.
diff --git a/src/browser/ImportMap.zig b/src/browser/ImportMap.zig
index 3066b95d4..a2c0ee7e7 100644
--- a/src/browser/ImportMap.zig
+++ b/src/browser/ImportMap.zig
@@ -234,7 +234,7 @@ fn parseScopeKey(arena: Allocator, base: [:0]const u8, key: []const u8) ![]const
if (key.len == 0) {
return base;
}
- return URL.resolve(arena, base, key, .{ .always_dupe = true, .encoding = "UTF-8" });
+ return URL.resolve(arena, base, key, .{ .encoding = "UTF-8" });
}
/// Returns the parsed URL if `specifier` looks like a URL. Else returns null;
@@ -248,7 +248,7 @@ fn parseIfLikeURL(arena: Allocator, base: [:0]const u8, specifier: []const u8) ?
std.mem.startsWith(u8, specifier, "../") or
hasScheme(specifier))
{
- return URL.resolve(arena, base, specifier, .{ .always_dupe = true, .encoding = "UTF-8" }) catch return null;
+ return URL.resolve(arena, base, specifier, .{ .encoding = "UTF-8" }) catch return null;
}
return null;
}
@@ -331,7 +331,7 @@ fn resolveImportsMatch(
const base_addr = entry.resolved orelse return error.SpecifierResolutionFailed;
const after = normalized[entry.specifier.len..];
- const url = URL.resolve(arena, base_addr, after, .{ .always_dupe = true, .encoding = "UTF-8" }) catch {
+ const url = URL.resolve(arena, base_addr, after, .{ .encoding = "UTF-8" }) catch {
return error.SpecifierResolutionFailed;
};
diff --git a/src/browser/URL.zig b/src/browser/URL.zig
index fc3ca8c7a..ca5b39c21 100644
--- a/src/browser/URL.zig
+++ b/src/browser/URL.zig
@@ -27,7 +27,6 @@ pub const ResolveOptions = struct {
/// null = don't encode, "UTF-8" = standard percent encoding,
/// other charset = encode query string using that charset with NCR fallback.
encoding: ?[]const u8 = null,
- always_dupe: bool = false,
};
pub fn resolve(
diff --git a/src/browser/webapi/History.zig b/src/browser/webapi/History.zig
index b09df743e..5f255385c 100644
--- a/src/browser/webapi/History.zig
+++ b/src/browser/webapi/History.zig
@@ -52,7 +52,7 @@ pub fn setScrollRestoration(self: *History, str: []const u8) void {
pub fn pushState(_: *History, state: js.Value, _: ?[]const u8, _url: ?[]const u8, frame: *Frame) !void {
const arena = frame._session.arena;
const url = if (_url) |u|
- try @import("../URL.zig").resolve(arena, frame.url, u, .{ .always_dupe = true })
+ try @import("../URL.zig").resolve(arena, frame.url, u, .{})
else
try arena.dupeZ(u8, frame.url);
@@ -67,7 +67,7 @@ pub fn pushState(_: *History, state: js.Value, _: ?[]const u8, _url: ?[]const u8
pub fn replaceState(_: *History, state: js.Value, _: ?[]const u8, _url: ?[]const u8, frame: *Frame) !void {
const arena = frame._session.arena;
const url = if (_url) |u|
- try @import("../URL.zig").resolve(arena, frame.url, u, .{ .always_dupe = true })
+ try @import("../URL.zig").resolve(arena, frame.url, u, .{})
else
try arena.dupeZ(u8, frame.url);
diff --git a/src/browser/webapi/net/Request.zig b/src/browser/webapi/net/Request.zig
index dccb1b15b..dbc1bce3e 100644
--- a/src/browser/webapi/net/Request.zig
+++ b/src/browser/webapi/net/Request.zig
@@ -81,7 +81,7 @@ const Cache = enum {
pub fn init(input: Input, opts_: ?InitOpts, exec: *const Execution) !*Request {
const arena = exec.arena;
const url = switch (input) {
- .url => |u| try URL.resolve(arena, exec.base(), u, .{ .always_dupe = true, .encoding = exec.charset.* }),
+ .url => |u| try URL.resolve(arena, exec.base(), u, .{ .encoding = exec.charset.* }),
.request => |r| try arena.dupeZ(u8, r._url),
};
diff --git a/src/browser/webapi/net/WebSocket.zig b/src/browser/webapi/net/WebSocket.zig
index 9ce1bf1a9..a98efc591 100644
--- a/src/browser/webapi/net/WebSocket.zig
+++ b/src/browser/webapi/net/WebSocket.zig
@@ -115,7 +115,7 @@ pub fn init(url: []const u8, protocols: [][]const u8, exec: *const Execution) !*
const arena = try exec.getArena(.medium, "WebSocket");
errdefer exec.releaseArena(arena);
- const resolved_url = try URL.resolve(arena, exec.base(), url, .{ .always_dupe = true, .encoding = exec.charset.* });
+ const resolved_url = try URL.resolve(arena, exec.base(), url, .{ .encoding = exec.charset.* });
const http_client = &exec.session.browser.http_client;
const conn = http_client.network.newConnection() orelse {
diff --git a/src/browser/webapi/net/XMLHttpRequest.zig b/src/browser/webapi/net/XMLHttpRequest.zig
index 7135c627d..98ec6019a 100644
--- a/src/browser/webapi/net/XMLHttpRequest.zig
+++ b/src/browser/webapi/net/XMLHttpRequest.zig
@@ -200,7 +200,7 @@ pub fn open(self: *XMLHttpRequest, method_: []const u8, url: [:0]const u8) !void
const exec = self._exec;
self._method = try parseMethod(method_);
- self._url = try URL.resolve(self._arena, exec.base(), url, .{ .always_dupe = true, .encoding = exec.charset.* });
+ self._url = try URL.resolve(self._arena, exec.base(), url, .{ .encoding = exec.charset.* });
try self.stateChanged(.opened, exec);
}
diff --git a/src/browser/webapi/storage/CookieStore.zig b/src/browser/webapi/storage/CookieStore.zig
index c7c7117ae..9185e0707 100644
--- a/src/browser/webapi/storage/CookieStore.zig
+++ b/src/browser/webapi/storage/CookieStore.zig
@@ -319,7 +319,7 @@ fn resolveQueryUrl(exec: *const Execution, _override: ?[]const u8) ![:0]const u8
const current = exec.url.*;
const override = _override orelse return current;
- const resolved = try URL.resolve(exec.call_arena, exec.base(), override, .{ .always_dupe = true });
+ const resolved = try URL.resolve(exec.call_arena, exec.base(), override, .{});
if (!exec.isSameOrigin(resolved)) return error.SecurityError;
switch (exec.js.global) {