Split HTTPS functions into 2

CHANGES.md

@@ -7,6 +7,11 @@ Unreleased
   connection ([#80](https://github.com/anmonteiro/ocaml-h2/pull/80))
 - h2: Make H2.Status.t a strict superset of Httpaf.Status.t
   ([#83](https://github.com/anmonteiro/ocaml-h2/pull/83))
+- h2-lwt, h2-lwt-unix: split HTTPS functions in 2: one that sets up a default
+  secure connection and performs the TLS handshake / accept, and one that is
+  more "raw", i.e. leaves that responsibility to the caller. Also exposes the
+  `socket` type to make it easier to abstract over HTTP / HTTPS
+  ([#84](https://github.com/anmonteiro/httpaf/pull/84))
 
 0.4.0 2019-11-05
 --------------

esy.json

@@ -34,8 +34,8 @@
   "resolutions": {
     "@opam/conf-libev": "esy-packages/libev:package.json#0b5eb66",
     "@opam/conf-libssl": "esy-packages/esy-openssl#860ad7f",
-    "@opam/httpaf": "anmonteiro/httpaf:httpaf.opam#b8d4eb3",
-    "@opam/httpaf-lwt": "anmonteiro/httpaf:httpaf-lwt.opam#b8d4eb3",
-    "@opam/httpaf-lwt-unix": "anmonteiro/httpaf:httpaf-lwt-unix.opam#b8d4eb3"
+    "@opam/httpaf": "anmonteiro/httpaf:httpaf.opam#f4bfd7c",
+    "@opam/httpaf-lwt": "anmonteiro/httpaf:httpaf-lwt.opam#f4bfd7c",
+    "@opam/httpaf-lwt-unix": "anmonteiro/httpaf:httpaf-lwt-unix.opam#f4bfd7c"
   }
 }

examples/alpn/unix/alpn_server_ssl.ml

@@ -1,20 +1,13 @@
 open Alpn_lib
 
-let http1_handler ssl_server =
+let http1_handler =
   Httpaf_lwt_unix.Server.SSL.create_connection_handler
-    ~server:ssl_server
-    ?certfile:None
-    ?keyfile:None
     ?config:None
     ~request_handler:Http1_handler.request_handler
     ~error_handler:Http1_handler.error_handler
 
-let h2_handler ssl_server =
+let h2_handler =
   H2_lwt_unix.Server.SSL.create_connection_handler
-    ~server:ssl_server
-    ?certfile:None
-    ?keyfile:None
-    ?config:None
     ~request_handler:H2_handler.request_handler
     ~error_handler:H2_handler.error_handler
 
@@ -71,9 +64,9 @@ let start_https_server () =
                   (* Unable to negotiate a protocol *)
                   Lwt.return_unit
                 | Some "http/1.1" ->
-                  http1_handler ssl_server client_addr fd
+                  http1_handler client_addr ssl_server
                 | Some "h2" ->
-                  h2_handler ssl_server client_addr fd
+                  h2_handler client_addr ssl_server
                 | Some _ ->
                   (* Can't really happen - would mean that TLS negotiated a
                    * protocol that we didn't specify. *)

examples/alpn/unix/alpn_server_tls.ml

@@ -1,19 +1,13 @@
 open Alpn_lib
 
-let http1_handler tls_server =
+let http1_handler =
   Httpaf_lwt_unix.Server.TLS.create_connection_handler
-    ~server:tls_server
-    ?certfile:None
-    ?keyfile:None
     ?config:None
     ~request_handler:Http1_handler.request_handler
     ~error_handler:Http1_handler.error_handler
 
-let h2_handler tls_server =
+let h2_handler =
   H2_lwt_unix.Server.TLS.create_connection_handler
-    ~server:tls_server
-    ?certfile:None
-    ?keyfile:None
     ?config:None
     ~request_handler:H2_handler.request_handler
     ~error_handler:H2_handler.error_handler
@@ -66,9 +60,9 @@ let start_https_server () =
                   (* Unable to negotiate a protocol *)
                   Lwt.return_unit
                 | Some "http/1.1" ->
-                  http1_handler tls_server client_addr fd
+                  http1_handler client_addr tls_server
                 | Some "h2" ->
-                  h2_handler tls_server client_addr fd
+                  h2_handler client_addr tls_server
                 | _ ->
                   (* Can't really happen - would mean that TLS negotiated a
                    * protocol that we didn't specify. *)

examples/lwt/lwt_get.ml

@@ -54,7 +54,8 @@ let () =
       in
       let response_received, notify_response_received = Lwt.wait () in
       let response_handler = response_handler notify_response_received in
-      Client.SSL.create_connection ~error_handler socket >>= fun connection ->
+      Client.SSL.create_connection_with_default ~error_handler socket
+      >>= fun connection ->
       let request_body =
         Client.SSL.request connection request ~error_handler ~response_handler
       in

examples/lwt/lwt_https_server.ml

@@ -94,8 +94,7 @@ let connection_handler : Unix.sockaddr -> Lwt_unix.file_descr -> unit Lwt.t =
   in
   let certfile = "./certificates/server.pem" in
   let keyfile = "./certificates/server.key" in
-  H2_lwt_unix.Server.SSL.create_connection_handler
-    ?server:None
+  H2_lwt_unix.Server.SSL.create_connection_handler_with_default
     ~certfile
     ~keyfile
     ?config:None