From: Stefano Zacchiroli Date: Tue, 3 Dec 2002 21:29:57 +0000 (+0000) Subject: - moved exceptions in http_types X-Git-Tag: V_0_0_6~10 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=58ba2d4922238d2917fddc097aa44d28de93807a;p=helm.git - moved exceptions in http_types - moved reason_phrase_of_code in in http_misc because it should not be used by users - removed useless reason_phrase_of_status - moved constants to http_constants --- diff --git a/helm/DEVEL/ocaml-http/http_common.ml b/helm/DEVEL/ocaml-http/http_common.ml index 1db14b7fc..839d2aff3 100644 --- a/helm/DEVEL/ocaml-http/http_common.ml +++ b/helm/DEVEL/ocaml-http/http_common.ml @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *) +open Http_types;; open Printf;; let debug = ref false @@ -26,13 +27,8 @@ let debug_print s = if !debug then prerr_endline (sprintf "DEBUG: %s" s) -exception Invalid_HTTP_version of string -exception Invalid_code of int -exception Invalid_status of Http_types.status - -let http_version = `HTTP_1_1 -let server_string = "OCaml HTTP Daemon" -let crlf = "\r\n" +let http_version = Http_constants.version +let server_string = Http_constants.server_string let string_of_version = function | `HTTP_1_0 -> "HTTP/1.0" @@ -128,51 +124,6 @@ let code_of_status = function | `Server_error `Gateway_time_out -> 504 | `Server_error `HTTP_version_not_supported -> 505 -let reason_phrase_of_code = function - | 100 -> "Continue" - | 101 -> "Switching protocols" - | 200 -> "OK" - | 201 -> "Created" - | 202 -> "Accepted" - | 203 -> "Non authoritative information" - | 204 -> "No content" - | 205 -> "Reset content" - | 206 -> "Partial content" - | 300 -> "Multiple choices" - | 301 -> "Moved permanently" - | 302 -> "Found" - | 303 -> "See other" - | 304 -> "Not modified" - | 305 -> "Use proxy" - | 307 -> "Temporary redirect" - | 400 -> "Bad request" - | 401 -> "Unauthorized" - | 402 -> "Payment required" - | 403 -> "Forbidden" - | 404 -> "Not found" - | 405 -> "Method not allowed" - | 406 -> "Not acceptable" - | 407 -> "Proxy authentication required" - | 408 -> "Request time out" - | 409 -> "Conflict" - | 410 -> "Gone" - | 411 -> "Length required" - | 412 -> "Precondition failed" - | 413 -> "Request entity too large" - | 414 -> "Request URI too large" - | 415 -> "Unsupported media type" - | 416 -> "Requested range not satisfiable" - | 417 -> "Expectation failed" - | 500 -> "Internal server error" - | 501 -> "Not implemented" - | 502 -> "Bad gateway" - | 503 -> "Service unavailable" - | 504 -> "Gateway time out" - | 505 -> "HTTP version not supported" - | invalid_code -> raise (Invalid_code invalid_code) - -let reason_phrase_of_status s = reason_phrase_of_code (code_of_status s) - let is_informational code = match status_of_code code with | `Informational _ -> true diff --git a/helm/DEVEL/ocaml-http/http_common.mli b/helm/DEVEL/ocaml-http/http_common.mli index bd7ff3079..af76440cf 100644 --- a/helm/DEVEL/ocaml-http/http_common.mli +++ b/helm/DEVEL/ocaml-http/http_common.mli @@ -19,19 +19,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *) +(** Common functionalities *) + (** whether debugging messages are enabled or not, can be changed at runtime *) val debug: bool ref (** print a string on stderr only if debugging is enabled *) val debug_print: string -> unit -exception Invalid_HTTP_version of string -exception Invalid_code of int -exception Invalid_status of Http_types.status - val http_version: Http_types.version val server_string: string -val crlf: string val string_of_version: Http_types.version -> string val version_of_string: string -> Http_types.version @@ -39,9 +36,6 @@ val version_of_string: string -> Http_types.version val status_of_code: int -> Http_types.status val code_of_status: [< Http_types.status] -> int -val reason_phrase_of_code: int -> string -val reason_phrase_of_status: [< Http_types.status] -> string - val is_informational: int -> bool val is_success: int -> bool val is_redirection: int -> bool