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

Buffer size in of_descr = to socket buffer + EAGAIN=EWOULDBLOCK

Browse source
This commit is contained in:
craff 2021-12-11 18:40:54 -10:00
parent c4cd66c088
commit bb74d7d82e
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Tiny_httpd.ml
View file

@ -71,7 +71,8 @@ module Byte_stream = struct
let of_descr_ ?(timeout=(-1.0)) ~close fd : t = let of_descr_ ?(timeout=(-1.0)) ~close fd : t =
let i = ref 0 in let i = ref 0 in
let len = ref 0 in let len = ref 0 in
let buf = Bytes.make 4096 ' ' in let size = Unix.(getsockopt_int fd SO_RCVBUF) in
let buf = Bytes.make size ' ' in
Unix.set_nonblock fd; Unix.set_nonblock fd;
{ bs_fill_buf=(fun () -> { bs_fill_buf=(fun () ->
@ -81,14 +82,12 @@ module Byte_stream = struct
let rec wait() = let rec wait() =
let to_read,_,_ = Unix.select [fd] [] [] timeout in let to_read,_,_ = Unix.select [fd] [] [] timeout in
if to_read = [] then raise Timeout; if to_read = [] then raise Timeout;
read() try len := Unix.read fd buf 0 (Bytes.length buf);
and read() =
try len := Unix.read fd buf 0 (Bytes.length buf)
with with
| Unix.Unix_error (EAGAIN, _, _) -> read()
| Sys_blocked_io | Sys_blocked_io
| Unix.Unix_error (EWOULDBLOCK, _, _) -> | Unix.Unix_error ((EAGAIN|EWOULDBLOCK), _, _) ->
(* FIXME: we should decrease the timeout by however long was spent in [select] *) (* FIXME: we should decrease the timeout by however long was spent in [select] *)
Printf.eprintf "EXCEPTION\n%!";
wait() wait()
in in
wait() wait()
@ -998,10 +997,12 @@ let find_map 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) (client_sock:Unix.file_descr) : unit =
let ic = Unix.in_channel_of_descr client_sock in let write_sock = Unix.dup client_sock in
let oc = Unix.out_channel_of_descr client_sock in let _ = Unix.set_nonblock client_sock in
let _ = Unix.clear_nonblock write_sock in
let oc = Unix.out_channel_of_descr write_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_descr client_sock in
let continue = ref true in let continue = ref true in
while !continue && self.running do while !continue && self.running do
_debug (fun k->k "read next request"); _debug (fun k->k "read next request");

1
src/Tiny_httpd.mli
View file

@ -643,4 +643,3 @@ val _debug : ((('a, out_channel, unit, unit, unit, unit) format6 -> 'a) -> unit)
val _enable_debug: bool -> unit val _enable_debug: bool -> unit
(**/**) (**/**)