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
let parse_request_fst_line ic =
let request_line = generic_input_line ~sep:crlf ~ic in
debug_print (sprintf "HTTP request line (not yet parsed): %s" request_line);
- match Pcre.split ~rex:pieces_sep request_line with
- | [ meth_raw; uri_raw; http_version_raw ] ->
- (try
+ try
+ (match Pcre.split ~rex:pieces_sep request_line with
+ | [ meth_raw; uri_raw ] -> (* ancient HTTP request line *)
(method_of_string meth_raw, (* method *)
Http_parser_sanity.url_of_string uri_raw, (* uri *)
- version_of_string http_version_raw) (* version *)
- with Neturl.Malformed_URL -> raise (Malformed_request_URI uri_raw))
- | _ -> raise (Malformed_request request_line)
+ None) (* no version given *)
+ | [ meth_raw; uri_raw; http_version_raw ] -> (* HTTP 1.{0,1} *)
+ (method_of_string meth_raw, (* method *)
+ Http_parser_sanity.url_of_string uri_raw, (* uri *)
+ Some (version_of_string http_version_raw)) (* version *)
+ | _ -> raise (Malformed_request request_line))
+ with Malformed_URL url -> raise (Malformed_request_URI url)
let parse_path uri = patch_empty_path (String.concat "/" (Neturl.url_path uri))
let parse_query_get_params uri =