prefix error messages with "[OCaml HTTP]"

[helm.git] / helm / DEVEL / ocaml-http / http_common.ml

diff --git a/helm/DEVEL/ocaml-http/http_common.ml b/helm/DEVEL/ocaml-http/http_common.ml
index 28b7201b9f2329e56bdf798900b77562c46501bf..ed595590d2caf7dfa1b14af7f6c310942dadf3ba 100644 (file)
--- a/helm/DEVEL/ocaml-http/http_common.ml
+++ b/helm/DEVEL/ocaml-http/http_common.ml
@@ -19,13 +19,16 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *)
 
-exception Invalid_HTTP_version of string
-exception Invalid_code of int
-exception Invalid_status of Http_types.status
+open Http_types;;
+open Printf;;
 
-let http_version = `HTTP_1_1
-let server_string = "OCaml HTTP Daemon"
-let crlf = "\r\n"
+let debug = ref false
+let debug_print s =
+  if !debug then
+    prerr_endline (sprintf "[OCaml HTTP] DEBUG: %s" s)
+
+let http_version = Http_constants.version
+let server_string = Http_constants.server_string
 
 let string_of_version = function
   | `HTTP_1_0 -> "HTTP/1.0"
@@ -121,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