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

fix: when reading from unix FD, use a loop to handle signals

Browse source
This commit is contained in:
Simon Cruanes 2021-12-11 09:13:16 -05:00
parent f316e66c15
commit 6536bfeeb3
No known key found for this signature in database
GPG key ID: 4AC01D0849AA62B6
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Tiny_httpd.ml
View file

@ -92,10 +92,20 @@ module Byte_stream = struct
{ bs_fill_buf=(fun () -> { bs_fill_buf=(fun () ->
if !i >= !len then ( if !i >= !len then (
i := 0; i := 0;
let (to_read,_,_) = Unix.select [ic] [] [] timeout in
if to_read = [] then raise Timeout; let rec wait() =
try len := Unix.read ic buf 0 (Bytes.length buf) let to_read,_,_ = Unix.select [ic] [] [] timeout in
with Unix.Unix_error ((EAGAIN | EWOULDBLOCK), _, _) -> (); if to_read = [] then raise Timeout;
read()
and read() =
try len := Unix.read ic buf 0 (Bytes.length buf)
with
| Unix.Unix_error (EAGAIN, _, _) -> read()
| Unix.Unix_error (EWOULDBLOCK, _, _) ->
(* FIXME: we should decrease the timeout by however long was spent in [select] *)
wait()
in
wait()
); );
buf, !i,!len - !i); buf, !i,!len - !i);
bs_consume=(fun n -> i := !i + n); bs_consume=(fun n -> i := !i + n);