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: break properly on empty read in Stream_.read_line

Browse source
This commit is contained in:
Simon Cruanes 2019-11-18 19:49:06 -06:00
parent fba2af546c
commit 506292c587
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Tiny_httpd.ml
View file

@ -141,6 +141,7 @@ module Stream_ = struct
let continue = ref true in let continue = ref true in
while !continue do while !continue do
let s, i, len = self.is_fill_buf () in let s, i, len = self.is_fill_buf () in
if len=0 then continue := false;
let j = ref i in let j = ref i in
while !j < i+len && Bytes.get s !j <> '\n' do while !j < i+len && Bytes.get s !j <> '\n' do
incr j incr j
@ -550,7 +551,10 @@ let handle_client_ (self:t) (client_sock:Unix.file_descr) : unit =
| Ok None -> continue := false | Ok None -> continue := false
| Error (c,s) -> | Error (c,s) ->
let res = Response.make_raw ~code:c s in let res = Response.make_raw ~code:c s in
Response.output_ oc res begin
try Response.output_ oc res
with Sys_error _ -> continue := false
end
| Ok (Some req) -> | Ok (Some req) ->
let res = let res =
try try
@ -594,7 +598,10 @@ let handle_client_ (self:t) (client_sock:Unix.file_descr) : unit =
| e -> | e ->
Response.fail ~code:500 "server error: %s" (Printexc.to_string e) Response.fail ~code:500 "server error: %s" (Printexc.to_string e)
in in
Response.output_ oc res begin
try Response.output_ oc res
with Sys_error _ -> continue := false
end
| exception Bad_req (code,s) -> | exception Bad_req (code,s) ->
Response.output_ oc (Response.make_raw ~code s); Response.output_ oc (Response.make_raw ~code s);
continue := false continue := false
@ -611,6 +618,7 @@ let run (self:t) : (unit,_) result =
ignore (Unix.sigprocmask Unix.SIG_BLOCK [Sys.sigpipe] : _ list); ignore (Unix.sigprocmask Unix.SIG_BLOCK [Sys.sigpipe] : _ list);
); );
let sock = Unix.socket PF_INET Unix.SOCK_STREAM 0 in let sock = Unix.socket PF_INET Unix.SOCK_STREAM 0 in
Unix.clear_nonblock sock;
Unix.setsockopt sock Unix.SO_REUSEADDR true; Unix.setsockopt sock Unix.SO_REUSEADDR true;
Unix.setsockopt_optint sock Unix.SO_LINGER None; Unix.setsockopt_optint sock Unix.SO_LINGER None;
let inet_addr = Unix.inet_addr_of_string self.addr in let inet_addr = Unix.inet_addr_of_string self.addr in