Merge pull request #22 from craff/master

Unix.accept may raise an exception
c-cube · Nov 30, 2021 · ac05b9e · ac05b9e
2 parents a58372b + a65734e
commit ac05b9e
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/src/Tiny_httpd.ml b/src/Tiny_httpd.ml
@@ -1088,17 +1088,22 @@ let run (self:t) : (unit,_) result =
     while self.running do
       (* limit concurrency *)
       Sem_.acquire 1 self.sem_max_connections;
-      let client_sock, _ = Unix.accept sock in
-      self.new_thread
-        (fun () ->
-           try
-             handle_client_ self client_sock;
-             Sem_.release 1 self.sem_max_connections;
-           with e ->
-             (try Unix.close client_sock with _ -> ());
-             Sem_.release 1 self.sem_max_connections;
-             raise e
-        );
+      try
+        let client_sock, _ = Unix.accept sock in
+        self.new_thread
+          (fun () ->
+            try
+              handle_client_ self client_sock;
+              Sem_.release 1 self.sem_max_connections;
+            with e ->
+              (try Unix.close client_sock with _ -> ());
+              Sem_.release 1 self.sem_max_connections;
+              raise e
+          );
+      with e ->
+        _debug (fun k -> k
+                  "Unix.accept or Thread.create raised an exception: %s"
+                  (Printexc.to_string e))
     done;
     Ok ()
   with e -> Error e