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

fix IO: use a loop for IO.Input.of_unix_fd; handle nonblocking

Browse source
This commit is contained in:
Simon Cruanes 2024-02-21 22:07:12 -05:00
parent e69f1b7c8c
commit 01faca284f
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Tiny_httpd_io.ml
View file

@ -35,10 +35,31 @@ module Input = struct
} }
let of_unix_fd ?(close_noerr = false) (fd : Unix.file_descr) : t = let of_unix_fd ?(close_noerr = false) (fd : Unix.file_descr) : t =
let eof = ref false in
{ {
input = (fun buf i len -> Unix.read fd buf i len); input =
(fun buf i len ->
let n = ref 0 in
if (not !eof) && len > 0 then (
let continue = ref true in
while !continue do
(* Printf.eprintf "read %d B (from fd %d)\n%!" len (Obj.magic fd); *)
match Unix.read fd buf i len with
| n_ ->
n := n_;
continue := false
| exception
Unix.Unix_error
((Unix.EWOULDBLOCK | Unix.EAGAIN | Unix.EINTR), _, _) ->
ignore (Unix.select [ fd ] [] [] 1.)
done;
(* Printf.eprintf "read returned %d B\n%!" !n; *)
if !n = 0 then eof := true
);
!n);
close = close =
(fun () -> (fun () ->
eof := true;
if close_noerr then ( if close_noerr then (
try Unix.close fd with _ -> () try Unix.close fd with _ -> ()
) else ) else
@ -170,7 +191,7 @@ module Output = struct
If [force=true] then write content of [buf] if it's simply non empty. *) If [force=true] then write content of [buf] if it's simply non empty. *)
let write_buf ~force () = let write_buf ~force () =
let n = Buf.size buf in let n = Buf.size buf in
if (force && n > 0) || n > 4_096 then ( if (force && n > 0) || n >= 4_096 then (
output_string self (Printf.sprintf "%x\r\n" n); output_string self (Printf.sprintf "%x\r\n" n);
self.output (Buf.bytes_slice buf) 0 n; self.output (Buf.bytes_slice buf) 0 n;
output_string self "\r\n"; output_string self "\r\n";