Skip to content

Adapt to ssl package API change #173

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
merged 1 commit into from
Jul 5, 2019
Merged

Adapt to ssl package API change #173

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
4 changes: 2 additions & 2 deletions opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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."
Expand Down Expand Up @@ -51,7 +51,7 @@ depends: [
"base-unix"
"base-threads"
"react"
"ssl"
"ssl" {>= "0.5.8"}
"lwt" {>= "3.0.0"}
"lwt_ssl"
"lwt_react"
Expand Down
4 changes: 2 additions & 2 deletions src/server/ocsigen_server.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ->
Expand Down