- added return_html_raw to Http_getter_common

- renamed for coherence return_xml_msg to return_xml_raw

diff --git a/helm/http_getter/http_getter.ml b/helm/http_getter/http_getter.ml
index 09a49a308ad50d7dcf80342ad9d29ff63f9987fe..7c5fafa114a5cc5831dc83782f174d04cfa346d6 100644 (file)
--- a/helm/http_getter/http_getter.ml
+++ b/helm/http_getter/http_getter.ml
@@ -314,7 +314,7 @@ let callback (req: Http_types.request) outchan =
     debug_print ("Connection from " ^ req#clientAddr);
     debug_print ("Received request: " ^ req#path);
     (match req#path with
-    | "/help" -> return_html_msg Http_getter_const.usage_string outchan
+    | "/help" -> return_html_raw Http_getter_const.usage_string outchan
     | "/getxml" | "/getxslt" | "/getdtd" | "/resolve" | "/register" ->
         (let uri = req#param "uri" in  (* common parameter *)
         match req#path with
@@ -338,11 +338,11 @@ let callback (req: Http_types.request) outchan =
               ~patch ~url:(Http_getter_env.dtd_dir ^ "/" ^ uri) outchan
         | "/resolve" ->
             (try
-              return_xml_msg
+              return_xml_raw
                 (sprintf "<url value=\"%s\" />\n" (resolve uri))
                 outchan
             with Http_getter_unresolvable_URI uri ->
-              return_xml_msg "<unresolved />\n" outchan)
+              return_xml_raw "<unresolved />\n" outchan)
         | "/register" ->
             let url = req#param "url" in
             register uri url;

diff --git a/helm/http_getter/http_getter_common.ml b/helm/http_getter/http_getter_common.ml
index 0e66b2035d2fcd0120307cdb5d88c2a71b3b741c..b7cbc936c57a17fa21e1f72366b975960e2ed7de 100644 (file)
--- a/helm/http_getter/http_getter_common.ml
+++ b/helm/http_getter/http_getter_common.ml
@@ -95,7 +95,8 @@ let mk_return_fun pp_fun contype msg outchan =
 let return_html_error = mk_return_fun pp_error "text/html"
 let return_html_internal_error = mk_return_fun pp_internal_error "text/html"
 let return_html_msg = mk_return_fun pp_msg "text/html"
-let return_xml_msg = mk_return_fun null_pp "text/xml"
+let return_html_raw = mk_return_fun null_pp "text/html"
+let return_xml_raw = mk_return_fun null_pp "text/xml"
 let return_file ~fname ?contype ?contenc ?(patch_fun = fun x -> x) outchan =
   let headers =
     match (contype, contenc) with

diff --git a/helm/http_getter/http_getter_common.mli b/helm/http_getter/http_getter_common.mli
index 0c21ba6ff383187e68ef56d4086b5df80bd46ab1..9ac5aad6fde50b9cd801f140af6f247cf53a1a07 100644 (file)
--- a/helm/http_getter/http_getter_common.mli
+++ b/helm/http_getter/http_getter_common.mli
@@ -43,8 +43,15 @@ val patch_dtd : string -> string
 
 val return_html_error: string -> out_channel -> unit
 val return_html_internal_error: string -> out_channel -> unit
+  (** return an HTML HTTP response from the given string, embedding it in an
+  "H1" element of an HTML page; content-type is set to text/html *)
 val return_html_msg: string -> out_channel -> unit
-val return_xml_msg: string -> out_channel -> unit
+  (** return an HTTP response using given string as content; content-type is set
+  to text/html *)
+val return_html_raw: string -> out_channel -> unit
+  (** return an HTTP response using given string as content; content-type is set
+  to text/xml *)
+val return_xml_raw: string -> out_channel -> unit
  (** return a bad request http response *)
 val return_400: string -> out_channel -> unit
   (**