X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Focaml-http%2Fhttp_daemon.ml;h=9e49551f4c6ac742ceaebd1a3040cc624814b9d7;hb=43ddb7c4879cec9c9d69ca92aefb6677bcc5cfa2;hp=56596a920d730cd620fbfcd8914cb4d96a344c3a;hpb=8c529f71e51025d3e827475f9e224bd0e07190eb;p=helm.git

diff --git a/helm/DEVEL/ocaml-http/http_daemon.ml b/helm/DEVEL/ocaml-http/http_daemon.ml
index 56596a920..9e49551f4 100644
--- a/helm/DEVEL/ocaml-http/http_daemon.ml
+++ b/helm/DEVEL/ocaml-http/http_daemon.ml
@@ -46,7 +46,7 @@ let send_raw ~data outchan =
 let send_CRLF = send_raw ~data:crlf
 
 let send_header ~header ~value =
-  Http_parser.heal_header (header, value);
+  Http_parser_sanity.heal_header (header, value);
   send_raw ~data:(header ^ ": " ^ value ^ crlf)
 
 let send_headers ~headers outchan =
@@ -59,9 +59,9 @@ let get_code_argument func_name =
     (match code, status with
     | Some c, None -> c
     | None, Some s -> code_of_status s
-    | Some _, Some _ ->
+    | Some _, Some _ -> (* TODO use some static type checking *)
         failwith (func_name ^ " you must give 'code' or 'status', not both")
-    | None, None ->
+    | None, None -> (* TODO use some static type checking *)
         failwith (func_name ^ " you must give 'code' or 'status', not none"))
 
   (** internal: low level for send_status_line *)
@@ -108,7 +108,6 @@ let foo_body code body =
   of an HTTP response; body, if given, will be appended to the body *)
 let send_foo_body code body = send_raw ~data:(foo_body code body)
 
-  (* TODO add the computation of Content-Length header *)
 let respond
   (* Warning: keep default values in sync with Http_response.response class *)
   ?(body = "") ?(headers = [])
@@ -121,6 +120,7 @@ let respond
   in
   send_basic_headers ~version ~code outchan;
   send_headers ~headers outchan;
+  send_header "Content-Length" (string_of_int (String.length body)) outchan;
   send_CRLF outchan;
   send_raw ~data:body outchan
 
@@ -200,7 +200,8 @@ let send_file ?name ?file outchan =
         let f = open_in n in
         f, (fun () -> close_in f)
     | None, Some f -> (f, (fun () -> ()))
-    | _ -> failwith "Daemon.send_file: either name or file must be given")
+    | _ ->  (* TODO use some static type checking *)
+        failwith "Daemon.send_file: either name or file must be given")
   in
   try
     while true do
@@ -275,6 +276,9 @@ let respond_with (res: Http_types.response) outchan =
   res#serialize outchan;
   flush outchan
 
+  (** internal: this exception is raised after a malformed request has been read
+  by a serving process to signal main server (or itself if mode = `Single) to
+  skip to next request *)
 exception Again;;
 
   (* given a Http_parser.parse_request like function, wrap it in a function that
@@ -338,7 +342,16 @@ let rec wrap_parse_request_w_safety parse_function inchan outchan =
 let safe_parse_request = wrap_parse_request_w_safety parse_request
 
   (* as above but for OO version (Http_parser.parse_request') *)
-let safe_parse_request' = wrap_parse_request_w_safety parse_request'
+let safe_parse_request' = wrap_parse_request_w_safety (new Http_request.request)
+
+let chdir_to_document_root = function (* chdir to document root *)
+  | Some dir -> Sys.chdir dir
+  | None -> ()
+
+let server_of_mode = function
+  | `Single -> Http_tcp_server.simple
+  | `Fork   -> Http_tcp_server.ocaml_builtin
+  | `Thread -> Http_tcp_server.thread
 
   (* TODO support also chroot to 'root', not only chdir *)
   (* curried request *)
@@ -346,10 +359,8 @@ let start
   ?(addr = default_addr) ?(port = default_port)
   ?(timeout = Some default_timeout) ?(mode = default_mode) ?root callback
   =
-  (match root with  (* chdir to document root *)
-  | Some dir -> Sys.chdir dir
-  | None -> ());
-  let sockaddr = Http_misc.build_sockaddr ~addr ~port in
+  chdir_to_document_root root;
+  let sockaddr = Http_misc.build_sockaddr (addr, port) in
   let daemon_callback inchan outchan =
     try
       let (path, parameters) = safe_parse_request inchan outchan in
@@ -357,23 +368,27 @@ let start
       flush outchan
     with Again -> ()
   in
-  match mode with
-  | `Single -> Http_tcp_server.simple ~sockaddr ~timeout daemon_callback
-  | `Fork   -> Http_tcp_server.ocaml_builtin ~sockaddr ~timeout daemon_callback 
-  | `Thread -> Http_tcp_server.thread ~sockaddr ~timeout daemon_callback
+  try
+    (server_of_mode mode) ~sockaddr ~timeout daemon_callback 
+  with Quit -> ()
 
   (* OO request *)
 let start'
   ?(addr = default_addr) ?(port = default_port)
   ?(timeout = Some default_timeout) ?(mode = default_mode) ?root callback
   =
-  let wrapper path params outchan =
-    let req = new Http_request.request ~path ~params in
-    callback req outchan
+  chdir_to_document_root root;
+  let sockaddr = Http_misc.build_sockaddr (addr, port) in
+  let daemon_callback inchan outchan =
+    try
+      let req = safe_parse_request' inchan outchan in
+      callback req outchan;
+      flush outchan
+    with Again -> ()
   in
-  match root with
-  | None      -> start ~addr ~port ~timeout ~mode wrapper
-  | Some root -> start ~addr ~port ~timeout ~mode ~root wrapper
+  try
+    (server_of_mode mode) ~sockaddr ~timeout daemon_callback 
+  with Quit -> ()
 
 module Trivial =
   struct
@@ -424,7 +439,7 @@ class daemon ?(addr = "0.0.0.0") ?(port = 80) () =
   object (self)
 
     val suck =
-      Http_tcp_server.init_socket (Http_misc.build_sockaddr ~addr ~port)
+      Http_tcp_server.init_socket (Http_misc.build_sockaddr (addr, port))
 
     method accept =
       let (cli_suck, cli_sockaddr) = Unix.accept suck in  (* may block *)