Skip to content

M
mariadb
Commit 6c4c103a authored by tonu@volk.internalnet's avatar tonu@volk.internalnet
Browse files
Options

SSL timeout bug fixed. Timeout was constant 60 seconds instead of 28800

parent 24805fc7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sql/sql_parse.cc
View file @ 6c4c103a
...@@ -433,7 +433,7 @@ check_connections(THD *thd) ...@@ -433,7 +433,7 @@ check_connections(THD *thd)
DBUG_PRINT("info", ("Agreed to change IO layer to SSL") ); DBUG_PRINT("info", ("Agreed to change IO layer to SSL") );
/* Do the SSL layering. */ /* Do the SSL layering. */
DBUG_PRINT("info", ("IO layer change in progress...")); DBUG_PRINT("info", ("IO layer change in progress..."));
sslaccept(ssl_acceptor_fd, net->vio, (long)60L); sslaccept(ssl_acceptor_fd, net->vio, thd->inactive_timeout);
DBUG_PRINT("info", ("Reading user information over SSL layer")); DBUG_PRINT("info", ("Reading user information over SSL layer"));
if ((pkt_len=my_net_read(net)) == packet_error || if ((pkt_len=my_net_read(net)) == packet_error ||
pkt_len < NORMAL_HANDSHAKE_SIZE) pkt_len < NORMAL_HANDSHAKE_SIZE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7