X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Focaml-http%2Fhttp_daemon.ml;h=6b2818ec1a6995b6460da5999cb634cf5d86fcab;hb=1957a1f151c547f04625c4379e51ab66bddb69c7;hp=a56780a9fb1252e78921fc80c4c714ec1f16dd15;hpb=ca9cd0aeee0ce78a891f7f6091ca8704231a446d;p=helm.git

diff --git a/helm/DEVEL/ocaml-http/http_daemon.ml b/helm/DEVEL/ocaml-http/http_daemon.ml
index a56780a9f..6b2818ec1 100644
--- a/helm/DEVEL/ocaml-http/http_daemon.ml
+++ b/helm/DEVEL/ocaml-http/http_daemon.ml
@@ -26,13 +26,6 @@ open Http_types;;
 open Http_constants;;
 open Http_parser;;
 
-let debug = true
-let debug_print str =
-  if debug then begin
-    prerr_endline ("DEBUG: " ^ str);
-    flush stderr
-  end
-
 let default_addr = "0.0.0.0"
 let default_port = 80
 let default_timeout = 300
@@ -59,9 +52,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 *)
@@ -200,7 +193,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,8 +269,14 @@ 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;;
 
+let pp_parse_exc e =
+  sprintf "HTTP request parse error: %s" (Printexc.to_string e)
+
   (* given a Http_parser.parse_request like function, wrap it in a function that
   do the same and additionally catch parsing exception sending HTTP error
   messages back to client as needed. Returned function raises Again when it
@@ -288,10 +288,12 @@ let rec wrap_parse_request_w_safety parse_function inchan outchan =
   (try
     parse_function inchan
   with
-  | End_of_file ->
+  | (End_of_file) as e ->
+      debug_print (pp_parse_exc e);
       respond_error ~code:400 ~body:"Unexpected End Of File" outchan;
       raise Again
-  | Malformed_request req ->
+  | (Malformed_request req) as e ->
+      debug_print (pp_parse_exc e);
       respond_error
         ~code:400
         ~body:(
@@ -299,26 +301,31 @@ let rec wrap_parse_request_w_safety parse_function inchan outchan =
           "<br />\nwhile received request 1st line was:<br />\n" ^ req)
         outchan;
       raise Again
-  | Unsupported_method meth ->
+  | (Invalid_HTTP_method meth) as e ->
+      debug_print (pp_parse_exc e);
       respond_error
         ~code:501
         ~body:("Method '" ^ meth ^ "' isn't supported (yet)")
         outchan;
       raise Again
-  | Malformed_request_URI uri ->
+  | (Malformed_request_URI uri) as e ->
+      debug_print (pp_parse_exc e);
       respond_error ~code:400 ~body:("Malformed URL: '" ^ uri ^ "'") outchan;
       raise Again
-  | Unsupported_HTTP_version version ->
+  | (Invalid_HTTP_version version) as e ->
+      debug_print (pp_parse_exc e);
       respond_error
         ~code:505
         ~body:("HTTP version '" ^ version ^ "' isn't supported (yet)")
         outchan;
       raise Again
-  | Malformed_query query ->
+  | (Malformed_query query) as e ->
+      debug_print (pp_parse_exc e);
       respond_error
         ~code:400 ~body:(sprintf "Malformed query string '%s'" query) outchan;
       raise Again
-  | Malformed_query_part (binding, query) ->
+  | (Malformed_query_part (binding, query)) as e ->
+      debug_print (pp_parse_exc e);
       respond_error
         ~code:400
         ~body:(
@@ -346,7 +353,7 @@ let chdir_to_document_root = function (* chdir to document root *)
 
 let server_of_mode = function
   | `Single -> Http_tcp_server.simple
-  | `Fork   -> Http_tcp_server.ocaml_builtin
+  | `Fork   -> Http_tcp_server.fork
   | `Thread -> Http_tcp_server.thread
 
   (* TODO support also chroot to 'root', not only chdir *)
@@ -364,7 +371,9 @@ let start
       flush outchan
     with Again -> ()
   in
-  (server_of_mode mode) ~sockaddr ~timeout daemon_callback 
+  try
+    (server_of_mode mode) ~sockaddr ~timeout daemon_callback 
+  with Quit -> ()
 
   (* OO request *)
 let start'
@@ -380,7 +389,9 @@ let start'
       flush outchan
     with Again -> ()
   in
-  (server_of_mode mode) ~sockaddr ~timeout daemon_callback 
+  try
+    (server_of_mode mode) ~sockaddr ~timeout daemon_callback 
+  with Quit -> ()
 
 module Trivial =
   struct