simon/tiny_httpd
1
0
Fork 0
mirror of https://github.com/c-cube/tiny_httpd.git synced 2025-12-06 11:15:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(http_of_dir): redirect to index.html if present

Browse source
This commit is contained in:
Simon Cruanes 2020-11-17 09:37:05 -05:00
parent c6d5c9a40f
commit 39671d62e4
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/bin/http_of_dir.ml
View file

@ -7,6 +7,7 @@ type config = {
mutable port: int; mutable port: int;
mutable upload: bool; mutable upload: bool;
mutable max_upload_size: int; mutable max_upload_size: int;
mutable auto_index_html: bool;
mutable delete: bool; mutable delete: bool;
mutable j: int; mutable j: int;
} }
@ -17,6 +18,7 @@ let default_config () : config = {
delete=false; delete=false;
upload=false; upload=false;
max_upload_size = 10 * 1024 * 1024; max_upload_size = 10 * 1024 * 1024;
auto_index_html=true;
j=32; j=32;
} }
@ -179,10 +181,17 @@ let serve ~config (dir:string) : _ result =
S._debug (fun k->k "list dir %S (topdir %S)" full_path dir); S._debug (fun k->k "list dir %S (topdir %S)" full_path dir);
let parent = Filename.(dirname path) in let parent = Filename.(dirname path) in
let parent = if parent <> path then Some parent else None in let parent = if parent <> path then Some parent else None in
if Sys.file_exists (full_path // "index.html") && config.auto_index_html then (
let new_path = "/" // full_path // "index.html" in
S._debug (fun k->k "redirect to `%s`" new_path);
S.Response.make_raw ~code:301 ""
~headers:S.Headers.(empty |> set "location" new_path)
) else (
let body = html_list_dir ~top:dir path ~parent in let body = html_list_dir ~top:dir path ~parent in
S.Response.make_string S.Response.make_string
~headers:[header_html; "ETag", Lazy.force mtime] ~headers:[header_html; "ETag", Lazy.force mtime]
(Ok body) (Ok body)
)
) else ( ) else (
try try
let ic = open_in full_path in let ic = open_in full_path in
@ -225,6 +234,8 @@ let main () =
"--no-upload", Unit (fun () -> config.upload <- false), " disable file uploading"; "--no-upload", Unit (fun () -> config.upload <- false), " disable file uploading";
"--max-upload", String (fun i -> config.max_upload_size <- parse_size i), "--max-upload", String (fun i -> config.max_upload_size <- parse_size i),
" maximum size of files that can be uploaded"; " maximum size of files that can be uploaded";
"--auto-index", Bool (fun b -> config.auto_index_html <- b),
" <bool> automatically redirect to index.html if present";
"--delete", Unit (fun () -> config.delete <- true), " enable `delete` on files"; "--delete", Unit (fun () -> config.delete <- true), " enable `delete` on files";
"--no-delete", Unit (fun () -> config.delete <- false), " disable `delete` on files"; "--no-delete", Unit (fun () -> config.delete <- false), " disable `delete` on files";
"-j", Int (fun j->config.j <- j), " maximum number of simultaneous connections"; "-j", Int (fun j->config.j <- j), " maximum number of simultaneous connections";