Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix cohttp not working with HTTP line folding #1038

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix cohttp not working with HTTP line folding #1038

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions cohttp/src/header_io.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,39 @@ module Make (IO : S.IO) = struct
open IO
module Transfer_IO = Transfer_io.Make (IO)

let add_multiline_header multiline_header headers =
match List.rev multiline_header |> String.concat "" |> split_header with
| [ hd; tl ] -> Some (Header.add headers hd tl)
| _ -> None

let parse ic =
let malformed_header_stop_parsing = return in
(* consume also trailing "^\r\n$" line *)
let rec parse_headers' headers =
let rec parse_headers' headers folding_lines =
read_line ic >>= function
| Some "" | None -> return headers
| Some "" | None -> return (headers, folding_lines)
| Some line -> (
match split_header line with
| [ hd; tl ] -> parse_headers' (Header.add headers hd tl)
| _ -> return headers)
match folding_lines, Char.equal line.[0] ' ' || Char.equal line.[0] '\t' with
| [], true -> malformed_header_stop_parsing (headers, [])
| [], false -> parse_headers' headers [line] (* we just started parsing *)
| _, true ->
let line_collapse_linear_whitespace = " " ^ (String.trim line) in
parse_headers' headers (line_collapse_linear_whitespace :: folding_lines)
| _, false ->
(* Lines after the first are already prefixed with some number of spaces / tabs. *)
match add_multiline_header folding_lines headers with
| Some headers ->
parse_headers' headers [line];
| None -> malformed_header_stop_parsing (headers, []))
in
parse_headers' (Header.init ()) [] >>= fun (headers_except_last, last_header) ->
let headers_list =
match last_header with
| [] -> headers_except_last
| _ -> add_multiline_header last_header headers_except_last
|> Option.value ~default:headers_except_last
in
parse_headers' (Header.init ())
return headers_list

let write headers oc = IO.write oc (Header.to_string headers)
end
Loading