Skip to content

Commit

Permalink
Disable openssl for now
Browse files Browse the repository at this point in the history
It segfaults under multicore: see savonet/ocaml-ssl#76
  • Loading branch information
talex5 committed Jan 19, 2022
1 parent d418a79 commit a298237
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 0 additions & 2 deletions src/http/dune
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
dream-httpaf.httpaf-lwt-unix
lwt
lwt.unix
lwt_ssl
ssl
dream-httpaf.websocketaf
)
(preprocess (pps lwt_ppx))
Expand Down
7 changes: 5 additions & 2 deletions src/http/http.ml
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,8 @@ let no_tls = {
}

let openssl = {
create_handler = fun ~certificate_file:_ -> failwith "https://github.com/savonet/ocaml-ssl/issues/76"
(*
create_handler = begin fun
~certificate_file ~key_file
~handler
Expand Down Expand Up @@ -590,6 +592,7 @@ let openssl = {
| Some _ ->
assert false
end;
*)
}

(* TODO LATER Add ALPN + HTTP/2.0 with ocaml-tls, too. *)
Expand Down Expand Up @@ -868,7 +871,7 @@ let serve
~port
~stop
~error_handler
~https:(if https then `OpenSSL else `No)
~https:(if https then `OCaml_TLS else `No)
?certificate_file
?key_file
?certificate_string:None
Expand Down Expand Up @@ -960,7 +963,7 @@ let run
~port
~stop
~error_handler
~https:(if https then `OpenSSL else `No)
~https:(if https then `OCaml_TLS else `No)
?certificate_file ?key_file
?certificate_string:None ?key_string:None
~builtins
Expand Down
2 changes: 1 addition & 1 deletion src/vendor/dune
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
(select
ssl_io.ml
from
(lwt_ssl -> ssl_io.real.ml)
(lwt_ssl_disabled -> ssl_io.real.ml)
(-> ssl_io.dummy.ml))
(select
tls_io.ml
Expand Down

0 comments on commit a298237

Please sign in to comment.