diff --git a/cohttp/src/header.ml b/cohttp/src/header.ml index bb4339b7a..03a46252e 100644 --- a/cohttp/src/header.ml +++ b/cohttp/src/header.ml @@ -50,28 +50,6 @@ let get_acceptable_languages headers = Accept.languages (get_multi_concat ~list_value_only:true headers "accept-language") -(* Parse the transfer-encoding and content-length headers to - * determine how to decode a body *) -let get_transfer_encoding headers = - (* It should actually be [get] as the interresting value is actually the last.*) - match get_multi_concat ~list_value_only:true headers "transfer-encoding" with - | Some "chunked" -> Transfer.Chunked - | Some _ | None -> ( - match get_content_range headers with - | Some len -> Transfer.Fixed len - | None -> Transfer.Unknown) - -let add_transfer_encoding headers enc = - let open Transfer in - (* Only add a header if one doesnt already exist, e.g. from the app *) - match (get_transfer_encoding headers, enc) with - | Fixed _, _ (* App has supplied a content length, so use that *) | Chunked, _ - -> - headers (* TODO: this is a protocol violation *) - | Unknown, Chunked -> add headers "transfer-encoding" "chunked" - | Unknown, Fixed len -> add headers "content-length" (Int64.to_string len) - | Unknown, Unknown -> headers - let add_authorization_req headers challenge = add headers "www-authenticate" (Auth.string_of_challenge challenge) @@ -108,13 +86,6 @@ let prepend_user_agent headers user_agent = | Some ua -> replace headers k (user_agent ^ " " ^ ua) | None -> add headers k user_agent -let connection h = - match get h "connection" with - | Some v when v = "keep-alive" -> Some `Keep_alive - | Some v when v = "close" -> Some `Close - | Some x -> Some (`Unknown x) - | _ -> None - open Sexplib0.Sexp_conv let sexp_of_t t = diff --git a/http/src/http.ml b/http/src/http.ml index 743dbd693..85158de65 100644 --- a/http/src/http.ml +++ b/http/src/http.ml @@ -322,8 +322,7 @@ module Header = struct | Some len -> Transfer.Fixed len | None -> Transfer.Unknown) - let add_transfer_encoding headers enc = - let open Transfer in + let add_transfer_encoding headers (enc : Transfer.encoding) = (* Only add a header if one doesnt already exist, e.g. from the app *) match (get_transfer_encoding headers, enc) with | Fixed _, _ (* App has supplied a content length, so use that *)