open Http_constants;;
open Http_parser;;
-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;
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 *)
| _ -> (* 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
let bytes = input file buf 0 buflen in
~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
"<br />\nwhile received request 1st line was:<br />\n" ^ req)
outchan;
raise Again
- | (Unsupported_method meth) as e ->
+ | (Invalid_HTTP_method meth) as e ->
debug_print (pp_parse_exc e);
respond_error
~code:501
debug_print (pp_parse_exc e);
respond_error ~code:400 ~body:("Malformed URL: '" ^ uri ^ "'") outchan;
raise Again
- | (Unsupported_HTTP_version version) as e ->
+ | (Invalid_HTTP_version version) as e ->
debug_print (pp_parse_exc e);
respond_error
~code:505
| `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