separators_RE_raw
quoted_string_RE_raw
text_RE_raw
+(*
+ (* following RFC 2616 specifications *)
let field_value_RE_raw = "((" ^ field_content_RE_raw ^ ")|(" ^ lws_RE_raw^ "))*"
+*)
+ (* smarter implementation: TEXT production is included in the regexp below *)
+let field_value_RE_raw =
+ sprintf
+ "^((%s)|(%s)|(%s)|(%s))*$"
+ token_RE_raw
+ separators_RE_raw
+ quoted_string_RE_raw
+ lws_RE_raw
let token_RE = Pcre.regexp ("^" ^ token_RE_raw ^ "$")
let field_value_RE = Pcre.regexp ("^" ^ field_value_RE_raw ^ "$")
let is_field_name = is_token
let is_field_value s = Pcre.pmatch ~rex:field_value_RE s
+let heal_header_name s =
+ if not (is_field_name s) then raise (Invalid_header_name s) else ()
+
+let heal_header_value s =
+ if not (is_field_value s) then raise (Invalid_header_value s) else ()
+
let heal_header (name, value) =
- if not (is_field_name name && is_field_value value) then
- raise (Invalid_header (name ^ ": " ^ value))
- else
- ()
+ heal_header_name name;
+ heal_header_value name
(** given an HTTP like query string (e.g. "name1=value1&name2=value2&...")
@return a list of pairs [("name1", "value1"); ("name2", "value2")]
else
!line
- (** given an input channel, reads from it a GET HTTP request and
- @return a pair <path, query_params> where path is a string representing the
- requested path and query_params is a list of pairs <name, value> (the GET
- parameters)
- *)
let parse_request =
let patch_empty_path s = (if s = "" then "/" else s) in
let pieces_sep = Pcre.regexp " " in
(path, query_params)
| _ -> raise (Malformed_request request_line)
+let parse_request' ic =
+ let (path, params) = parse_request ic in
+ let clisockaddr = Http_misc.peername_of_in_channel ic in
+ new Http_request.request ~path ~params ~clisockaddr
+