fixed parse error for ocaml 3.08

[helm.git] / helm / DEVEL / ocaml-http / http_parser.ml

diff --git a/helm/DEVEL/ocaml-http/http_parser.ml b/helm/DEVEL/ocaml-http/http_parser.ml
index c8870ab186729fe29c313cf141ca67a9cbfbf69c..1660da3fe49e7aa1e90eef34cf515dc1c5ed4f21 100644 (file)
--- a/helm/DEVEL/ocaml-http/http_parser.ml
+++ b/helm/DEVEL/ocaml-http/http_parser.ml
@@ -2,7 +2,7 @@
 (*
   OCaml HTTP - do it yourself (fully OCaml) HTTP daemon
 
-  Copyright (C) <2002> Stefano Zacchiroli <zack@cs.unibo.it>
+  Copyright (C) <2002-2004> Stefano Zacchiroli <zack@cs.unibo.it>
 
   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
@@ -31,11 +31,6 @@ let header_RE = Pcre.regexp "([^:]*):(.*)"
 
 let url_decode url = Netencoding.Url.decode ~plus:true url
 
-  (** given an HTTP like query string (e.g. "name1=value1&name2=value2&...")
-  @return a list of pairs [("name1", "value1"); ("name2", "value2")]
-  @raise Malformed_query if the string isn't a valid query string
-  @raise Malformed_query_part if some piece of the query isn't valid
-  *)
 let split_query_params query =
   let bindings = Pcre.split ~rex:bindings_sep query in
   match bindings with
@@ -111,6 +106,19 @@ let parse_request_fst_line ic =
     | _ -> raise (Malformed_request request_line))
   with Malformed_URL url -> raise (Malformed_request_URI url)
 
+let parse_response_fst_line ic =
+  let response_line = generic_input_line ~sep:crlf ~ic in
+  debug_print (sprintf "HTTP response line (not yet parsed): %s" response_line);
+  try
+    (match Pcre.split ~rex:pieces_sep response_line with
+    | [ version_raw; code_raw; _ ] ->
+        (version_of_string version_raw,             (* method *)
+        status_of_code (int_of_string code_raw))    (* status *)
+    | _ -> raise (Malformed_response response_line))
+  with
+  | Malformed_URL _ | Invalid_code _ | Failure "int_of_string" ->
+      raise (Malformed_response response_line)
+
 let parse_path uri = patch_empty_path (String.concat "/" (Neturl.url_path uri))
 let parse_query_get_params uri =
   try (* act on HTTP encoded URIs *)