- removed http_get/http_get_iter implementations, use the analogous

  functions from ocaml-http

diff --git a/helm/ocaml/getter/http_getter_misc.ml b/helm/ocaml/getter/http_getter_misc.ml
index c983c298813e0a83f5fc8e8be3cc2aa40a38af87..6f612cc30aead385867a3965bf9e45991e271701 100644 (file)
--- a/helm/ocaml/getter/http_getter_misc.ml
+++ b/helm/ocaml/getter/http_getter_misc.ml
@@ -77,46 +77,6 @@ let cp src dst =
   with End_of_file -> ());
   close_in ic; close_out oc
 
-let parse_url url =
-  try
-    let subs =
-      Pcre.extract ~rex:url_RE (Pcre.replace ~rex:http_scheme_RE url)
-    in
-    (subs.(1),
-    (if subs.(2) = "" then 80 else int_of_string subs.(3)),
-    (if subs.(4) = "" then "/" else subs.(4)))
-  with exc ->
-    failwith
-      (sprintf "Can't parse url: %s (exception: %s)"
-        url (Printexc.to_string exc))
-let init_socket addr port =
-  let inet_addr = (Unix.gethostbyname addr).Unix.h_addr_list.(0) in
-  let sockaddr = Unix.ADDR_INET (inet_addr, port) in
-  let suck = Unix.socket Unix.PF_INET Unix.SOCK_STREAM 0 in
-  Unix.connect suck sockaddr;
-  let outchan = Unix.out_channel_of_descr suck in
-  let inchan = Unix.in_channel_of_descr suck in
-  (inchan, outchan)
-let http_get_iter_buf ~callback url =
-  let (address, port, path) = parse_url url in
-  let buf = String.create tcp_bufsiz in
-  let (inchan, outchan) = init_socket address port in
-  output_string outchan (sprintf "GET %s\r\n" path);
-  flush outchan;
-  (try
-    while true do
-      match input inchan buf 0 tcp_bufsiz with
-      | 0 -> raise End_of_file
-      | bytes when bytes = tcp_bufsiz ->  (* buffer full, no need to slice it *)
-          callback buf
-      | bytes when bytes < tcp_bufsiz ->  (* buffer not full, slice it *)
-          callback (String.sub buf 0 bytes)
-      | _ -> (* ( bytes < 0 ) || ( bytes > tcp_bufsiz ) *)
-          assert false
-    done
-  with End_of_file -> ());
-  close_in inchan (* close also outchan, same fd *)
-
 let wget ?output url =
   debug_print
     (sprintf "wgetting %s (output: %s)" url
@@ -136,7 +96,7 @@ let wget ?output url =
       (let oc = 
         open_out (match output with Some f -> f | None -> Filename.basename url)
       in
-      http_get_iter_buf ~callback:(fun data -> output_string oc data) url;
+      Http_client.http_get_iter (fun data -> output_string oc data) url;
       close_out oc)
   | scheme -> (* unsupported scheme *)
       failwith ("Http_getter_misc.wget: unsupported scheme: " ^ scheme)

diff --git a/helm/ocaml/getter/http_getter_misc.mli b/helm/ocaml/getter/http_getter_misc.mli
index b328742be76370b1ca804a3c06510999406327d6..11bba25c5ff7b5847341aa37210f7e7a0f30a3b9 100644 (file)
--- a/helm/ocaml/getter/http_getter_misc.mli
+++ b/helm/ocaml/getter/http_getter_misc.mli
@@ -67,13 +67,10 @@ val mkdir: ?parents: bool -> string -> unit
   (** pretty printer for Unix.process_status values *)
 val string_of_proc_status : Unix.process_status -> string
 
-  (** raw HTTP downloader, return Some the contents of downloaded resource or
+  (** raw URL downloader, return Some the contents of downloaded resource or
   None if an error occured while downloading. This function support also
   "file://" scheme for filesystem resources *)
 val http_get: string -> string option
-  (** 'iter' like method that iter over string slices (unspecified length) of a
-  remote resources fetched via HTTP GET requests *)
-val http_get_iter_buf: callback:(string -> unit) -> string -> unit
 
   (** true on blanks-only and #-commented lines, false otherwise *)
 val is_blank_line: string -> bool