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

Revert "close fd correctly"

Browse source 
This reverts commit 912c7b1fd7.
This commit is contained in:
craff 2021-12-19 00:53:54 -10:00
parent 912c7b1fd7
commit f08406c1ae
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Tiny_httpd_dir.ml
View file

@ -204,10 +204,9 @@ let add_dir_path ~config ~dir ~prefix server =
S.Response.make_raw ~code:405 "listing dir not allowed" S.Response.make_raw ~code:405 "listing dir not allowed"
) else ( ) else (
try try
let fd = Unix.(openfile full_path [O_RDONLY] 0) in let bs = Bigstring_unix.with_map_file ~flags:[Open_rdonly] full_path
let len = stat.Unix.st_size in (fun s -> s)
let bs = Bigstring_unix.map_file_descr fd len in in
Gc.finalise (fun _ -> Unix.close fd) bs;
let mime_type = let mime_type =
if Filename.extension full_path = ".css" then ( if Filename.extension full_path = ".css" then (
["Content-Type", "text/css"] ["Content-Type", "text/css"]
@ -225,8 +224,10 @@ let add_dir_path ~config ~dir ~prefix server =
~headers:(mime_type@["Etag", mtime_str]) ~headers:(mime_type@["Etag", mtime_str])
~code:200 bs ~code:200 bs
with e -> with e ->
S.Response.fail ~code:500 "error while reading file: %s" (Printexc.to_string e)))) else ( S.Response.fail ~code:500 "error while reading file: %s" (Printexc.to_string e))
)
) else (
S.add_route_handler server ~meth:`GET S.add_route_handler server ~meth:`GET
S.Route.(exact_path prefix (string @/ return)) S.Route.(exact_path prefix (string @/ return))
(fun _ _ -> S.Response.make_raw ~code:405 "download not allowed"); (fun _ _ -> S.Response.make_raw ~code:405 "download not allowed");
); );

5
tests/dl-out.expect
View file

@ -1,5 +1,2 @@
serve directory . on http://127.0.0.1:8084 serve directory . on http://127.0.0.1:8084
0 0 52428800 data21 0 0 52428800 data2
0 0 52428800 data22
0 0 52428800 data23
0 0 157286400 total

8
tests/download_chunked.sh
View file

@ -8,16 +8,16 @@ PID=$!
sleep 0.1 sleep 0.1
echo download1 1>&2 echo download1 1>&2
curl -N "http://localhost:${PORT}/foo_50" -o data21 \ curl -N "http://localhost:${PORT}/foo_50" -o data2 \
-H 'Tranfer-encoding: chunked' -H 'Tranfer-encoding: chunked'
echo download2 1>&2 echo download2 1>&2
curl -N "http://localhost:${PORT}/foo_50" -o data22 \ curl -N "http://localhost:${PORT}/foo_50" -o data2 \
-H 'Tranfer-encoding: chunked' -H 'Tranfer-encoding: chunked'
echo download3 1>&2 echo download3 1>&2
curl -N "http://localhost:${PORT}/foo_50" -o data23 \ curl -N "http://localhost:${PORT}/foo_50" -o data2 \
-H 'Tranfer-encoding: chunked' -H 'Tranfer-encoding: chunked'
kill $PID kill $PID
wc data21 data22 data23 wc data2