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

acquire after accept, otherwise loose connection ... DON'T KNOW WHY

Browse source
This commit is contained in:
craff 2021-12-11 22:58:57 -10:00
parent 70c5a627d3
commit b1584c2261
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Tiny_httpd.ml
View file

@ -951,7 +951,7 @@ let add_path_handler_
| handler -> | handler ->
(* we have a handler, do we accept the request based on its headers? *) (* we have a handler, do we accept the request based on its headers? *)
begin match accept req with begin match accept req with
| Ok () -> Some (Ok (fun (_oc:Out.t) req ~resp -> resp (handler (tr_req req)))) | Ok () -> Some (Ok (fun _oc req ~resp -> resp (handler (tr_req req))))
| Error _ as e -> Some e | Error _ as e -> Some e
end end
| exception _ -> | exception _ ->
@ -982,7 +982,7 @@ let add_route_handler_
| Some handler -> | Some handler ->
(* we have a handler, do we accept the request based on its headers? *) (* we have a handler, do we accept the request based on its headers? *)
begin match accept req with begin match accept req with
| Ok () -> Some (Ok (fun (oc:Out.t) req ~resp -> tr_req oc req ~resp handler)) | Ok () -> Some (Ok (fun oc req ~resp -> tr_req oc req ~resp handler))
| Error _ as e -> Some e | Error _ as e -> Some e
end end
| None -> | None ->
@ -1004,7 +1004,7 @@ let[@inline] _opt_iter ~f o = match o with
| Some x -> f x | Some x -> f x
let add_route_server_sent_handler ?accept self route f = let add_route_server_sent_handler ?accept self route f =
let tr_req (oc:Out.t) req ~resp f = let tr_req oc req ~resp f =
let req = Request.read_body_full req in let req = Request.read_body_full req in
let headers = ref Headers.(empty |> set "content-type" "text/event-stream") in let headers = ref Headers.(empty |> set "content-type" "text/event-stream") in
@ -1185,9 +1185,9 @@ let run (self:t) : (unit,_) result =
end; end;
while self.running do while self.running do
(* limit concurrency *) (* limit concurrency *)
Sem_.acquire 1 self.sem_max_connections;
try try
let client_sock, _ = Unix.accept sock in let client_sock, _ = Unix.accept sock in
Sem_.acquire 1 self.sem_max_connections;
self.new_thread self.new_thread
(fun () -> (fun () ->
try try