Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Pass ssl options to mysql driver

This commit is contained in:
Paweł Chmielowski 2022-11-14 11:19:51 +01:00
parent 992d998695
commit 6fcfe80a65
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebar.config
View File

@ -56,7 +56,7 @@
{mqtree, ".*", {git, "https://github.com/processone/mqtree", {tag, "1.0.15"}}}, {mqtree, ".*", {git, "https://github.com/processone/mqtree", {tag, "1.0.15"}}},
{p1_acme, ".*", {git, "https://github.com/processone/p1_acme", {tag, "1.0.20"}}}, {p1_acme, ".*", {git, "https://github.com/processone/p1_acme", {tag, "1.0.20"}}},
{if_var_true, mysql, {if_var_true, mysql,
{p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", {tag, "1.0.20"}}}}, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", "b6ad4035f25e625567f8c6a1e4b13a63590e54f6"}}},
{p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.11"}}}, {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.11"}}},
{if_var_true, pgsql, {if_var_true, pgsql,
{p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", {tag, "1.1.19"}}}}, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", {tag, "1.1.19"}}}},

4
src/ejabberd_sql.erl
View File

@ -1061,10 +1061,10 @@ pgsql_execute_to_odbc(_) -> {updated, undefined}.
%% part of init/1 %% part of init/1
%% Open a database connection to MySQL %% Open a database connection to MySQL
mysql_connect(Server, Port, DB, Username, Password, ConnectTimeout, Transport, _) -> mysql_connect(Server, Port, DB, Username, Password, ConnectTimeout, Transport, SSLOpts0) ->
SSLOpts = case Transport of SSLOpts = case Transport of
ssl -> ssl ->
[ssl_required]; [ssl_required|SSLOpts0];
_ -> _ ->
[] []
end, end,