X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Focaml-http%2Fhttp_daemon.ml;h=9e0507dd2b1a4135643cef76cdfa73b9864edbe8;hb=3c7ca719c304eb7de7d8d4e9a90ebe0db8d8ecab;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..9e0507dd2 100644
--- a/helm/DEVEL/ocaml-http/http_daemon.ml
+++ b/helm/DEVEL/ocaml-http/http_daemon.ml
@@ -26,18 +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
-let default_mode = `Fork
-
(** send raw data on outchan, flushing it afterwards *)
let send_raw ~data outchan =
output_string outchan data;
@@ -59,9 +47,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 *)
@@ -191,16 +179,27 @@ let respond_forbidden ~url ?(version = http_version) outchan =
send_empty_response
"Daemon.respond_permission_denied" ~body:"" () ~version ~code:403 outchan
-let send_file ?name ?file outchan =
+(* let send_file ?name ?file outchan = *)
+let send_file ~src outchan =
let buflen = 1024 in
let buf = String.make buflen ' ' in
+(*
let (file, cleanup) =
(match (name, file) with
| Some n, None -> (* if we open the file, we close it before returning *)
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
+*)
+ let (file, cleanup) =
+ match src with
+ | FileSrc fname -> (* if we open the file, we close it before returning *)
+ let f = open_in fname in
+ f, (fun () -> close_in f)
+ | InChanSrc inchan -> inchan, ignore
in
try
while true do
@@ -260,7 +259,7 @@ let respond_file ~fname ?(version = http_version) outchan =
~value:(string_of_int (Http_misc.filesize fname))
outchan;
send_CRLF outchan;
- send_file ~file outchan;
+ send_file ~src:(InChanSrc file) outchan;
close_in file
end
with
@@ -275,8 +274,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 +293,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 +306,31 @@ let rec wrap_parse_request_w_safety parse_function inchan outchan =
"
\nwhile received request 1st line was:
\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,9 +358,13 @@ 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 what happens when a Quit exception is raised by a callback? Do other
+ callbacks keep on living until the end or are them all killed immediatly?
+ The right semantics should obviously be the first one *)
+
(* TODO support also chroot to 'root', not only chdir *)
(* curried request *)
let start
@@ -364,7 +380,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 +398,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