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;
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 =
(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 *)
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 = [])
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
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
~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
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
(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:(
"<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:(
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.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
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 clisockaddr = Http_misc.peername_of_out_channel outchan in
- let req = new Http_request.request ~path ~params ~clisockaddr 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
projects / helm.git / blobdiff