Update option defaults

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 253ee42f9511d4dea11b1c380155c3f15cc345e0..ba70f643829c27cbbcee32f41c4b37d5d4b14b19 100644 (file)
--- 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%&.
 
 
 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
 .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.
 
 
 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
 .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 2ab1af9d4a1b9a1a35110de2f86d7d3ec7a8f54c..a67488798a4c02aa2b846e9dc17a7e802f7af463 100644 (file)
--- 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/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
 -----------------
 
 Exim version 4.96
 -----------------
 

diff --git a/src/src/globals.c b/src/src/globals.c
index 70e3f568bbe6e554f2900880b3b8f49068c3b678..18988e9da2c5afa5a6b1d738b2f53f2922e4ee44 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -391,7 +391,7 @@ BOOL    proxy_session          = FALSE;
 #endif
 
 #ifndef DISABLE_QUEUE_RAMP
 #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;
 #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;
 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;
 uschar *remote_sort_domains    = NULL;
 int     retry_data_expire      = 7*24*60*60;
 int     retry_interval_max     = 24*60*60;