X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fhttp_getter%2Fhttp_getter_misc.ml;h=10d0530c35ea33cb33b8a20ccb463efc1fab13fa;hb=49b54c2de0c8d449638e469d1c95bfae01b0aadc;hp=7b70a14b1112ce975cc5bc01223d59e3eb4d27bc;hpb=cc40c18845dcd9b0bc3264b82940091b26ca53ff;p=helm.git

diff --git a/helm/http_getter/http_getter_misc.ml b/helm/http_getter/http_getter_misc.ml
index 7b70a14b1..10d0530c3 100644
--- a/helm/http_getter/http_getter_misc.ml
+++ b/helm/http_getter/http_getter_misc.ml
@@ -30,7 +30,7 @@ open Http_getter_debugger;;
 open Printf;;
 
 let trailing_dot_gz_RE = Pcre.regexp "\\.gz$"   (* for g{,un}zip *)
-let url_RE = Pcre.regexp "^([\\w.]+)(:(\\d+))?(/.*)?$"
+let url_RE = Pcre.regexp "^([\\w.-]+)(:(\\d+))?(/.*)?$"
 let http_scheme_RE = Pcre.regexp ~flags:[`CASELESS] "^http://"
 let file_scheme_RE = Pcre.regexp ~flags:[`CASELESS] "^file://"
 let dir_sep_RE = Pcre.regexp "/"
@@ -225,10 +225,13 @@ let http_get url =
       close_in ic;
       Some buf
     with Unix.Unix_error (Unix.ENOENT, "stat", _) -> None
-  end else  (* other URL, pass it to netclient *)
+  end else  (* other URL, pass it to Http_client *)
     try
-      Some (Http_client.Convenience.http_get url)
-    with Http_client.Http_error (code, _) -> None
+      Some (Http_client.http_get url)
+    with e ->
+      prerr_endline (sprintf "Warning: Http_client failed with exception: %s"
+        (Printexc.to_string e));
+      None
 
   (** apply a transformation "string list -> string list" to file lines *)
 let mangle_file ~fname f =