Skip to content

Implement Unix domain socket support for Cohttp-async #698

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

Merged
mseri merged 1 commit into from
Jun 27, 2020
Merged

Implement Unix domain socket support for Cohttp-async #698

Show file tree
Hide file tree
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
31 changes: 17 additions & 14 deletions cohttp-async/src/client.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ end
module Net = struct

let lookup uri =
let host = Option.value (Uri.host uri) ~default:"localhost" in
let host = Uri.host_with_default ~default:"localhost" uri in
match Uri_services.tcp_port_of_uri ~default:"http" uri with
| None -> Deferred.Or_error.error_string
"Net.lookup: failed to get TCP port form Uri"
Expand All @@ -29,19 +29,22 @@ module Net = struct
| _ -> Or_error.error "Failed to resolve Uri" uri Uri_sexp.sexp_of_t

let connect_uri ?interrupt ?ssl_config uri =
lookup uri
|> Deferred.Or_error.ok_exn
>>= fun (host, addr, port) ->
let mode =
match (Uri.scheme uri, ssl_config) with
| Some "https", Some config ->
`OpenSSL (addr, port, config)
| Some "https", None ->
let config = Conduit_async.V2.Ssl.Config.create ~hostname:host () in
`OpenSSL (addr, port, config)
| Some "httpunix", _ -> `Unix_domain_socket host
| _ -> `TCP (addr, port)
in
(match Uri.scheme uri with
| Some "httpunix" ->
let host = Uri.host_with_default ~default:"localhost" uri in
return @@ `Unix_domain_socket host
| _ ->
lookup uri
|> Deferred.Or_error.ok_exn
>>= fun (host, addr, port) ->
return @@ match (Uri.scheme uri, ssl_config) with
| Some "https", Some config ->
`OpenSSL (addr, port, config)
| Some "https", None ->
let config = Conduit_async.V2.Ssl.Config.create ~hostname:host () in
`OpenSSL (addr, port, config)
| _ -> `TCP (addr, port))
>>= fun mode ->
Conduit_async.V2.connect ?interrupt mode
end

Expand Down
11 changes: 7 additions & 4 deletions cohttp/src/request.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,13 @@ let make ?(meth=`GET) ?(version=`HTTP_1_1) ?encoding ?headers uri =
| Some h -> h in
let headers =
Header.add_unless_exists headers "host"
(Uri.host_with_default ~default:"localhost" uri ^
match Uri.port uri with
| Some p -> ":" ^ string_of_int p
| None -> "") in
(match Uri.scheme uri with
| Some "httpunix" -> ""
| _ ->
Uri.host_with_default ~default:"localhost" uri ^
match Uri.port uri with
| Some p -> ":" ^ string_of_int p
| None -> "") in
let headers =
Header.add_unless_exists headers "user-agent" Header.user_agent in
let headers =
Expand Down