From aa13dc23161864aa272517badddf8d7c3e509ab6 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Tue, 16 Dec 2003 16:49:04 +0000 Subject: [PATCH] - return (or iter on) just http response's body - s/http_get_iter_buf/http_get_iter/ - commented interface files --- helm/DEVEL/ocaml-http/http_client.ml | 33 +++++++++++++++++++++-- helm/DEVEL/ocaml-http/http_client.mli | 38 ++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/helm/DEVEL/ocaml-http/http_client.ml b/helm/DEVEL/ocaml-http/http_client.ml index e0f9d0f11..94f60f688 100644 --- a/helm/DEVEL/ocaml-http/http_client.ml +++ b/helm/DEVEL/ocaml-http/http_client.ml @@ -1,6 +1,30 @@ +(* + OCaml HTTP - do it yourself (fully OCaml) HTTP daemon + + Copyright (C) <2002-2003> Stefano Zacchiroli + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*) + open Printf +open Http_common + +exception Http_error of (int * string) (* code, body *) + let http_scheme_RE = Pcre.regexp ~flags:[`CASELESS] "^http://" let url_RE = Pcre.regexp "^([\\w.-]+)(:(\\d+))?(/.*)?$" @@ -28,12 +52,17 @@ let init_socket addr port = let inchan = Unix.in_channel_of_descr suck in (inchan, outchan) -let http_get_iter_buf ~callback url = +let http_get_iter 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 HTTP/1.0\r\n\r\n" path); flush outchan; + let (_, status) = Http_parser.parse_response_fst_line inchan in + (match code_of_status status with + | 200 -> () + | code -> raise (Http_error (code, ""))); + ignore (Http_parser.parse_headers inchan); (try while true do match input inchan buf 0 tcp_bufsiz with @@ -50,6 +79,6 @@ let http_get_iter_buf ~callback url = let http_get url = let buf = Buffer.create 10240 in - http_get_iter_buf ~callback:(Buffer.add_string buf) url; + http_get_iter (Buffer.add_string buf) url; Buffer.contents buf diff --git a/helm/DEVEL/ocaml-http/http_client.mli b/helm/DEVEL/ocaml-http/http_client.mli index 302993651..1b92ba772 100644 --- a/helm/DEVEL/ocaml-http/http_client.mli +++ b/helm/DEVEL/ocaml-http/http_client.mli @@ -1,2 +1,38 @@ -val http_get_iter_buf: callback:(string -> unit) -> string -> unit + +(* + OCaml HTTP - do it yourself (fully OCaml) HTTP daemon + + Copyright (C) <2002-2003> Stefano Zacchiroli + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*) + +(** Minimal implementation of an HTTP 1.0/1.1 client. Interface is similar to + * Gerd Stoplmann's Http_client module. Implementation is simpler and doesn't + * handle HTTP redirection, proxies, ecc. The only reason for the existence of + * this module is for performances and incremental elaboration of response's + * bodies *) + +exception Http_error of (int * string) (* code, body *) + + (** @param url an HTTP url + * @return HTTP response's body + * @raise Http_error when response code <> 200 *) val http_get: string -> string + + (** as above but iter callback function on HTTP response's body instead of + * returning it as a string *) +val http_get_iter: (string -> unit) -> string -> unit + -- 2.39.2