Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: zola serve no longer includes output directory content because of path canonicalization mismatch #2398

Merged
merged 1 commit into from
Jan 7, 2024
Merged

Fix: zola serve no longer includes output directory content because of path canonicalization mismatch #2398

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/cmd/serve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,9 @@ pub fn serve(
let ws_address = format!("{}:{}", interface, ws_port.unwrap());
let output_path = site.output_path.clone();

// output path is going to need to be moved later on, so clone it for the
// http closure to avoid contention.
let static_root = output_path.clone();
// static_root needs to be canonicalized because we do the same for the http server.
let static_root = std::fs::canonicalize(&output_path).unwrap();

let broadcaster = {
thread::spawn(move || {
let addr = address.parse().unwrap();
Expand Down