From 85da77a2992bfa8b57a878aef9008807b89e18ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=2EVouillon?= Date: Fri, 5 Jul 2019 11:14:43 +0200 Subject: [PATCH] Adapt to ssl package API change --- opam | 4 ++-- src/server/ocsigen_server.ml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opam b/opam index 172bd3b67..26f9253d2 100644 --- a/opam +++ b/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "ocsigenserver" -version: "2.11.0" +version: "2.11.1" maintainer: "dev@ocsigen.org" synopsis: "A full-featured and extensible Web server." description: "Ocsigen Server implements most features of the HTTP protocol, and has a very powerful extension mechanism that makes it very easy to plug your own OCaml modules for generating pages. Many extensions are already implemented, like a reverse proxy, content compression, access control, authentication, etc." @@ -51,7 +51,7 @@ depends: [ "base-unix" "base-threads" "react" - "ssl" + "ssl" {>= "0.5.8"} "lwt" {>= "3.0.0"} "lwt_ssl" "lwt_react" diff --git a/src/server/ocsigen_server.ml b/src/server/ocsigen_server.ml index 305bbc08e..c590dcd27 100644 --- a/src/server/ocsigen_server.ml +++ b/src/server/ocsigen_server.ml @@ -1025,8 +1025,8 @@ let errmsg = function | (Unix.Unix_error _) as e -> (("Fatal - "^(Printexc.to_string e)), 9) - | Ssl.Private_key_error -> - (("Fatal - bad password"), + | Ssl.Private_key_error msg -> + (("Fatal - bad password: " ^ msg), 10) | Ocsigen_config.Config_file_error msg | Ocsigen_extensions.Error_in_config_file msg ->