berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid using `Path` to calculate URIs, because it doesn't do the right thing on Windows.

This commit is contained in:
Christopher Armstrong 2018-02-06 18:11:19 -06:00
parent 884ea02f5c
commit 5bba3b8c96
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fs.rs
View File

@ -283,12 +283,12 @@ impl<S> Handler<S> for StaticFiles {
if path.is_dir() {
if let Some(ref redir_index) = self.index {
let mut base = Path::new(req.path()).join(relpath);
base.push(redir_index);
let new_path = format!("{}{}/{}",
req.path(), relpath.to_string_lossy(), redir_index);
Ok(FilesystemElement::Redirect(
HTTPFound
.build()
.header("LOCATION", base.to_string_lossy().as_ref())
.header::<_, &str>("LOCATION", &new_path)
.finish().unwrap()))
} else if self.show_index {
Ok(FilesystemElement::Directory(Directory::new(self.directory.clone(), path)))
@ -340,7 +340,7 @@ mod tests {
}
#[test]
fn test_redirec_to_index() {
fn test_redirect_to_index() {
let mut st = StaticFiles::new(".", false).index_file("index.html");
let mut req = HttpRequest::default();
req.match_info_mut().add("tail", "guide");