Merge branch 'stable'

scripts/rabbitmq-env

@@ -51,8 +51,7 @@ RABBITMQ_HOME="${RABBITMQ_SCRIPTS_DIR}/.."
 . ${RABBITMQ_SCRIPTS_DIR}/rabbitmq-defaults
 
 ## Common defaults
-SERVER_ERL_ARGS="+K true +P 1048576 \
-  -kernel inet_default_connect_options [{nodelay,true}]"
+SERVER_ERL_ARGS="+P 1048576"
 
 # warn about old rabbitmq.conf file, if no new one
 if [ -f /etc/rabbitmq/rabbitmq.conf ] && \

scripts/rabbitmq-env.bat

@@ -39,8 +39,7 @@ call "%SCRIPT_DIR%\rabbitmq-defaults.bat"
 
 REM These common defaults aren't referenced in the batch scripts
 REM ## Common defaults
-REM SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
-REM   -kernel inet_default_connect_options [{nodelay,true}]"
+REM SERVER_ERL_ARGS="+P 1048576"
 REM 
 REM # warn about old rabbitmq.conf file, if no new one
 REM if [ -f /etc/rabbitmq/rabbitmq.conf ] && \
@@ -51,9 +50,7 @@ REM fi
 
 REM ERL_ARGS aren't referenced in the batch scripts
 REM Common defaults
-REM set SERVER_ERL_ARGS=+A30 ^
-REM +P 1048576 ^
-REM -kernel inet_default_connect_options "[{nodelay, true}]" ^
+REM set SERVER_ERL_ARGS=+P 1048576
 
 REM ## Get configuration variables from the configure environment file
 REM [ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true

scripts/rabbitmq-server

@@ -109,6 +109,8 @@ exec ${ERL_DIR}erl \
     +W w \
     +A ${RABBITMQ_IO_THREAD_POOL_SIZE} \
     ${RABBITMQ_SERVER_ERL_ARGS} \
+    +K true \
+    -kernel inet_default_connect_options "[{nodelay,true}]" \
     ${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS} \
     ${RABBITMQ_LISTEN_ARG} \
     -sasl errlog_type error \

scripts/rabbitmq-server.bat

@@ -90,9 +90,9 @@ if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" {
 +W w ^
 +A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^
 +P 1048576 ^
--kernel inet_default_connect_options "[{nodelay, true}]" ^
 !RABBITMQ_LISTEN_ARG! ^
 !RABBITMQ_SERVER_ERL_ARGS! ^
+-kernel inet_default_connect_options "[{nodelay, true}]" ^
 !RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^
 -sasl errlog_type error ^
 -sasl sasl_error_logger false ^