X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Focaml-http%2Fhttp_parser.ml;h=6f556527a825655a1fc48103308bd4d0840f0f4f;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=c8870ab186729fe29c313cf141ca67a9cbfbf69c;hpb=3e666920212c55ad4960ee2b30335acf8eb40560;p=helm.git diff --git a/helm/DEVEL/ocaml-http/http_parser.ml b/helm/DEVEL/ocaml-http/http_parser.ml index c8870ab18..6f556527a 100644 --- a/helm/DEVEL/ocaml-http/http_parser.ml +++ b/helm/DEVEL/ocaml-http/http_parser.ml @@ -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 *)