From aa35e324e6b6ec14a3ea2af0a0449925ee19118e Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Tue, 3 Dec 2019 17:38:56 -0600 Subject: [PATCH] refactor --- src/Tiny_httpd.ml | 2 +- src/examples/echo.ml | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Tiny_httpd.ml b/src/Tiny_httpd.ml index ff3246bb..285b62f9 100644 --- a/src/Tiny_httpd.ml +++ b/src/Tiny_httpd.ml @@ -577,7 +577,7 @@ module Response = struct let output_ (oc:out_channel) (self:t) : unit = Printf.fprintf oc "HTTP/1.1 %d %s\r\n" self.code (Response_code.descr self.code); List.iter (fun (k,v) -> Printf.fprintf oc "%s: %s\r\n" k v) self.headers; - Printf.fprintf oc "\r\n"; + output_string oc "\r\n"; begin match self.body with | `String "" -> () | `String s -> output_string oc s; diff --git a/src/examples/echo.ml b/src/examples/echo.ml index a0f8d271..a9365b92 100644 --- a/src/examples/echo.ml +++ b/src/examples/echo.ml @@ -1,11 +1,6 @@ module S = Tiny_httpd -let debug_ k = - if None<>Sys.getenv_opt "HTTP_DBG" then ( - k (fun fmt -> Printf.kfprintf (fun oc -> k (Printf.fprintf oc)) stdout fmt) - ) - let () = let port_ = ref 8080 in let j = ref 32 in @@ -24,7 +19,7 @@ let () = "/echo" (fun req -> S.Response.make_string (Ok (Format.asprintf "echo:@ %a@." S.Request.pp req))); S.add_path_handler ~meth:`PUT server "/upload/%s" (fun path req -> - debug_ (fun k->k "start upload %S\n%!" path); + S._debug (fun k->k "start upload %S\n%!" path); try let oc = open_out @@ "/tmp/" ^ path in output_string oc req.S.Request.body;