Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Keep file name and query for fragment-only redirect Location

NetterSilverc3a5d9b7f1f8
diff --git a/crates/fetch/src/http.rs b/crates/fetch/src/http.rs
index 0b1b0ae98..4566b3d99 100644
--- a/crates/fetch/src/http.rs
+++ b/crates/fetch/src/http.rs
@@ -135,6 +135,10 @@ impl Url {
if l.starts_with('/') {
return Url::parse(&format!("{base}{l}"));
}
+ // empty or fragment-only: the same document
+ if l.is_empty() || l.starts_with('#') {
+ return Ok(self.clone());
+ }
// relative to the current directory
let dir = self.path.split('?').next().unwrap_or("/");
let dir = dir.rsplit_once('/').map_or("", |(d, _)| d);
@@ -612,6 +616,15 @@ mod tests_connect {
mod tests {
use super::*;
+ #[test]
+ fn fragment_only_or_empty_location_keeps_file_name_and_query() {
+ let base = Url::parse("https://a.example/x/y/file?q").unwrap();
+ for l in ["#top", "", " "] {
+ let u = base.join(l).unwrap();
+ assert_eq!((u.tls, u.host.as_str(), u.port, u.path.as_str()), (true, "a.example", 443, "/x/y/file?q"), "{l:?}");
+ }
+ }
+
#[test]
fn rejects_oversized_and_control_character_urls() {
assert!(Url::parse(&format!("https://example.com/{}", "x".repeat(16 * 1024))).is_err());