Initial revision

[helm.git] / helm / http_getter / http_getter_common.ml

diff --git a/helm/http_getter/http_getter_common.ml b/helm/http_getter/http_getter_common.ml
index fc3867128203363ee110e1c14ff0f67db6bd3ca4..b7cbc936c57a17fa21e1f72366b975960e2ed7de 100644 (file)
--- a/helm/http_getter/http_getter_common.ml
+++ b/helm/http_getter/http_getter_common.ml
@@ -1,5 +1,7 @@
 (*
- *  Copyright (C) 2000, HELM Team.
+ * Copyright (C) 2003:
+ *    Stefano Zacchiroli <zack@cs.unibo.it>
+ *    for the HELM Team http://helm.cs.unibo.it/
  *
  *  This file is part of HELM, an Hypertextual, Electronic
  *  Library of Mathematics, developed at the Computer Science
@@ -21,7 +23,7 @@
  *  MA  02111-1307, USA.
  *
  *  For details, see the HELM World-Wide-Web page,
- *  http://cs.unibo.it/helm/.
+ *  http://helm.cs.unibo.it/
  *)
 
 open Http_getter_types;;
@@ -93,13 +95,14 @@ 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
-    | (Some t, Some e) -> [ "Content-Type", t; "Content-Enconding", e ]
-    | (Some t, None) -> [ "Content-Type" , t ]
-    | (None, Some e) -> [ "Content-Enconding", e ]
+    | (Some t, Some e) -> ["Content-Encoding", e; "Content-Type", t]
+    | (Some t, None) -> ["Content-Type" , t]
+    | (None, Some e) -> ["Content-Encoding", e]
     | (None, None) -> []
   in
   Http_daemon.send_basic_headers ~code:200 outchan;