From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 5 Jun 2022 14:38:24 +0000 (+0100)
Subject: Update option defaults
X-Git-Tag: exim-4.97-RC0~282^2~11
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/e3e959c9f04cda38741f78725411f0a4f0bc970e

Update option defaults
---

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 253ee42f9..ba70f6438 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -17289,7 +17289,7 @@ domains that do not match are processed. All other deliveries wait until the
 next queue run. See also &%hold_domains%& and &%queue_smtp_domains%&.
 
 
-.option queue_fast_ramp main boolean false
+.option queue_fast_ramp main boolean true
 .cindex "queue runner" "two phase"
 .cindex "queue" "double scanning"
 If set to true, two-phase queue runs, initiated using &%-qq%& on the
@@ -17533,7 +17533,7 @@ initial set of recipients. The remote server should then re-send the message
 for the remaining recipients at a later time.
 
 
-.option remote_max_parallel main integer 2
+.option remote_max_parallel main integer 4
 .cindex "delivery" "parallelism for remote"
 This option controls parallel delivery of one message to a number of remote
 hosts. If the value is less than 2, parallel delivery is disabled, and Exim
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 2ab1af9d4..a67488798 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -8,6 +8,10 @@ SINCE Exim version 4.96
 JH/01 The hosts_connection_nolog main option now also controls "no MAIL in
       SMTP connection" log lines.
 
+JH/02 Option default value updates:
+	- queue_fast_ramp (main)	true (was false)
+	- remote_max_parallel (main)	4 (was 2)
+
 Exim version 4.96
 -----------------
 
diff --git a/src/src/globals.c b/src/src/globals.c
index 70e3f568b..18988e9da 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -391,7 +391,7 @@ BOOL    proxy_session          = FALSE;
 #endif
 
 #ifndef DISABLE_QUEUE_RAMP
-BOOL    queue_fast_ramp		= FALSE;
+BOOL    queue_fast_ramp		= TRUE;
 #endif
 BOOL    queue_list_requires_admin = TRUE;
 BOOL    queue_only             = FALSE;
@@ -1324,7 +1324,7 @@ const pcre2_code *regex_whitelisted_macro = NULL;
 uschar *regex_match_string     = NULL;
 #endif
 int     remote_delivery_count  = 0;
-int     remote_max_parallel    = 2;
+int     remote_max_parallel    = 4;
 uschar *remote_sort_domains    = NULL;
 int     retry_data_expire      = 7*24*60*60;
 int     retry_interval_max     = 24*60*60;