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

Remove window in which threads still got SIGINT/SIGHUP

Browse source 
At least on OCaml 4.13.1's runtime, signals are spooled until any thread
unblocks them, so we block them just before cloning, letting the thread
inherit the mask, then we unblock.
This commit is contained in:
Stéphane Lavergne 2023-08-07 15:05:55 -04:00 • committed by Simon Cruanes
parent d8234b0189
commit def4414676
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Tiny_httpd_server.ml
View file

@ -935,7 +935,6 @@ module Unix_tcp_server_ = struct
(* how to handle a single client *)
let handle_client_unix_ (client_sock : Unix.file_descr) : unit =
ignore Unix.(sigprocmask SIG_BLOCK Sys.[ sigint; sighup ]);
Unix.(setsockopt_float client_sock SO_RCVTIMEO self.timeout);
Unix.(setsockopt_float client_sock SO_SNDTIMEO self.timeout);
let oc =
@ -957,6 +956,7 @@ module Unix_tcp_server_ = struct
try
let client_sock, _ = Unix.accept sock in
Unix.setsockopt client_sock Unix.TCP_NODELAY true;
ignore Unix.(sigprocmask SIG_BLOCK Sys.[ sigint; sighup ]);
self.new_thread (fun () ->
try
handle_client_unix_ client_sock;
@ -964,7 +964,8 @@ module Unix_tcp_server_ = struct
with e ->
(try Unix.close client_sock with _ -> ());
Sem_.release 1 self.sem_max_connections;
raise e)
raise e);
ignore Unix.(sigprocmask SIG_UNBLOCK Sys.[ sigint; sighup ]);
with e ->
Sem_.release 1 self.sem_max_connections;
_debug (fun k ->