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

wip: make sure to destroy channels

Browse source
This commit is contained in:
Simon Cruanes 2019-12-04 11:19:29 -06:00
parent 0865fea043
commit 842a5d6895
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Tiny_httpd.ml
View file

@ -687,9 +687,7 @@ let find_map f l =
| None -> aux f l' | None -> aux f l'
in aux f l in aux f l
let handle_client_ (self:t) (client_sock:Unix.file_descr) : unit = let handle_client_ (self:t) ic oc : unit =
let ic = Unix.in_channel_of_descr client_sock in
let oc = Unix.out_channel_of_descr client_sock in
let buf = Buf_.create() in let buf = Buf_.create() in
let is = Byte_stream.of_chan ic in let is = Byte_stream.of_chan ic in
let continue = ref true in let continue = ref true in
@ -758,8 +756,6 @@ let handle_client_ (self:t) (client_sock:Unix.file_descr) : unit =
continue := false; (* connection broken somehow *) continue := false; (* connection broken somehow *)
done; done;
_debug (fun k->k "done with client, exiting"); _debug (fun k->k "done with client, exiting");
(try Unix.close client_sock
with e -> _debug (fun k->k "error when closing sock: %s" (Printexc.to_string e)));
() ()
let is_ipv6 self = String.contains self.addr ':' let is_ipv6 self = String.contains self.addr ':'
@ -788,17 +784,25 @@ let run (self:t) : (unit,_) result =
while self.running do while self.running do
(* limit concurrency *) (* limit concurrency *)
let client_sock, _ = Unix.accept sock in
Sem_.acquire self.sem_max_connections; Sem_.acquire self.sem_max_connections;
let client_sock, _ = Unix.accept sock in
(try Unix.setsockopt_optint sock Unix.SO_LINGER None; with _ -> ());
self.new_thread self.new_thread
(fun () -> (fun () ->
let ic = Unix.in_channel_of_descr client_sock in
let oc = Unix.out_channel_of_descr client_sock in
let close_ () =
(try close_in_noerr ic; close_out_noerr oc;
with e ->
_debug (fun k->k "error when closing sock: %s" (Printexc.to_string e)));
in
try try
handle_client_ self client_sock; handle_client_ self ic oc;
Sem_.release self.sem_max_connections; Sem_.release self.sem_max_connections;
(try Unix.close client_sock with _ -> ()); close_();
with e -> with e ->
Sem_.release self.sem_max_connections; Sem_.release self.sem_max_connections;
(try Unix.close client_sock with _ -> ()); close_();
raise e raise e
); );
done; done;