summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-06-23 15:42:18 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-06-23 15:42:18 +0100
commit531ccb0d732f25ad2adae7c3597ca4f4f50c23bc (patch)
tree2121e9f5440f0addf53981da00ee6fdcd01d44b1 /docs
parent257422409566786303f11cf877d53e1e879476b7 (diff)
parent1001a4d7c31d44b63029d38bf937861c21a7e2e5 (diff)
downloadrabbitmq-server-git-531ccb0d732f25ad2adae7c3597ca4f4f50c23bc.tar.gz
Merge bug25848 again.
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmq.config.example9
1 files changed, 9 insertions, 0 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example
index 4fad154255..e8b5666098 100644
--- a/docs/rabbitmq.config.example
+++ b/docs/rabbitmq.config.example
@@ -27,6 +27,11 @@
%%
%% {ssl_listeners, [5671]},
+ %% Maximum time for AMQP 0-8/0-9/0-9-1 handshake (after socket connection
+ %% and SSL handshake), in milliseconds.
+ %%
+ %% {handshake_timeout, 10000},
+
%% Log levels (currently just used for connection logging).
%% One of 'info', 'warning', 'error' or 'none', in decreasing order
%% of verbosity. Defaults to 'info'.
@@ -103,6 +108,10 @@
%%
%% {ssl_cert_login_from, common_name},
+ %% SSL handshake timeout, in milliseconds.
+ %%
+ %% {ssl_handshake_timeout, 5000},
+
%%
%% Default User / VHost
%% ====================