uniformed default values handling, now they are all in this module and

consistent with optional arguments of start functions

diff --git a/helm/DEVEL/ocaml-http/http_constants.ml b/helm/DEVEL/ocaml-http/http_constants.ml
index 674e2a863a6133f15c8e8356a7c81bbaac900821..3e61e0b61ed736a81e1ae60704b28436bb9c0e9a 100644 (file)
--- a/helm/DEVEL/ocaml-http/http_constants.ml
+++ b/helm/DEVEL/ocaml-http/http_constants.ml
@@ -23,8 +23,12 @@ let version = `HTTP_1_1 ;;
 let server_string = "OCaml HTTP Daemon" ;;
 let crlf = "\r\n" ;;
 
-let default_addr = "0.0.0.0" ;;
-let default_port = 80 ;;
-let default_timeout = 300 ;;
-let default_mode = `Fork ;;
+let default_addr = "0.0.0.0"
+let default_auth = None
+let default_callback = fun _ _ -> ()
+let default_mode = `Fork
+let default_port = 80
+let default_root_dir = None
+let default_exn_handler = Some (fun exn outchan -> ())
+let default_timeout = Some 300
 

diff --git a/helm/DEVEL/ocaml-http/http_constants.mli b/helm/DEVEL/ocaml-http/http_constants.mli
index c00edebb63b1303418d2fbc63a48dab922b44024..bf7072a1a1f62994a9eee0afca86cf7f0c3b7768 100644 (file)
--- a/helm/DEVEL/ocaml-http/http_constants.mli
+++ b/helm/DEVEL/ocaml-http/http_constants.mli
@@ -21,8 +21,6 @@
 
 (** Constants *)
 
-open Http_types
-
   (** default HTTP version *)
 val version: Http_types.version
 
@@ -34,8 +32,12 @@ val crlf: string
 
   (** {2 daemon default values} *)
 
-val default_addr: string        (** default listen address *)
-val default_port: int           (** default listen port *)
-val default_timeout: int        (** default callbacks timeout *)
-val default_mode: daemon_mode   (** default request handling mode *)
+val default_addr: string
+val default_auth: (string * Http_types.auth_info) option
+val default_callback: Http_types.request -> out_channel -> unit
+val default_mode: Http_types.daemon_mode
+val default_port: int
+val default_root_dir: string option
+val default_exn_handler: (exn -> out_channel -> unit) option
+val default_timeout: int option