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

strengthen against errors

Browse source
This commit is contained in:
Simon Cruanes 2024-02-03 00:14:16 -05:00
parent 9ba1a5a328
commit 03a2b38bad
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Tiny_httpd_server.ml
View file

@ -946,18 +946,25 @@ module Unix_tcp_server_ = struct
(* limit concurrency *) (* limit concurrency *)
Sem_.acquire 1 self.sem_max_connections; Sem_.acquire 1 self.sem_max_connections;
Unix.setsockopt client_sock Unix.TCP_NODELAY true;
(* Block INT/HUP while cloning to avoid children handling them. (* Block INT/HUP while cloning to avoid children handling them.
When thread gets them, our Unix.accept raises neatly. *) When thread gets them, our Unix.accept raises neatly. *)
ignore Unix.(sigprocmask SIG_BLOCK Sys.[ sigint; sighup ]); ignore Unix.(sigprocmask SIG_BLOCK Sys.[ sigint; sighup ]);
self.new_thread (fun () -> self.new_thread (fun () ->
try try
Unix.setsockopt client_sock Unix.TCP_NODELAY true;
handle_client_unix_ client_sock client_addr; handle_client_unix_ client_sock client_addr;
Sem_.release 1 self.sem_max_connections Sem_.release 1 self.sem_max_connections
with e -> with e ->
let bt = Printexc.get_raw_backtrace () in
(try Unix.close client_sock with _ -> ()); (try Unix.close client_sock with _ -> ());
Sem_.release 1 self.sem_max_connections; Sem_.release 1 self.sem_max_connections;
raise e); Log.error (fun k ->
k
"@[<v>Handler: uncaught exception for client %s:@ \
%s@ %s@]"
(str_of_sockaddr client_addr)
(Printexc.to_string e)
(Printexc.raw_backtrace_to_string bt)));
ignore Unix.(sigprocmask SIG_UNBLOCK Sys.[ sigint; sighup ]) ignore Unix.(sigprocmask SIG_UNBLOCK Sys.[ sigint; sighup ])
| exception Unix.Unix_error ((Unix.EAGAIN | Unix.EWOULDBLOCK), _, _) | exception Unix.Unix_error ((Unix.EAGAIN | Unix.EWOULDBLOCK), _, _)
-> ->