removed no longer used METAs

[helm.git] / helm / ocaml / getter / http_getter_common.ml

diff --git a/helm/ocaml/getter/http_getter_common.ml b/helm/ocaml/getter/http_getter_common.ml
index c85f680c28fa49fe7eb87aeb78eeacc90a5576bd..ddce33f5dbcc9e126f9e3b5f131f75e6e66b98ce 100644 (file)
--- a/helm/ocaml/getter/http_getter_common.ml
+++ b/helm/ocaml/getter/http_getter_common.ml
@@ -26,6 +26,8 @@
  *  http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 open Http_getter_types;;
 open Printf;;
 
@@ -82,8 +84,7 @@ let patch_system kind ?(via_http = true) () =
       sprintf "%s $1 SYSTEM \"%s/getdtd?uri=" kind
         (Lazy.force Http_getter_env.my_own_url)
     else
-      sprintf "%s $1 SYSTEM \"file://%s/" kind
-        (Lazy.force Http_getter_env.dtd_dir)
+      sprintf "%s $1 SYSTEM \"file://%s/" kind (Http_getter_env.get_dtd_dir ())
   in
   fun line -> Pcre.replace ~rex ~templ line
 
@@ -115,14 +116,14 @@ let return_file
   ~fname ?contype ?contenc ?patch_fun ?(gunzip = false) ?(via_http = true)
   ~enc outchan
 =
-  let headers =
-    match (contype, contenc) with
-    | (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
   if via_http then begin
+    let headers =
+      match (contype, contenc) with
+      | (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:(`Code 200) outchan;
     Http_daemon.send_headers headers outchan;
     Http_daemon.send_CRLF outchan