Two-phase queue run perf: parallel processes for phase one

[users/jgh/exim.git] / test / confs / 5821

diff --git a/test/confs/5821 b/test/confs/5821
index db2dc19d2f7c780eee808cc621792077782cc625..84d29bdfe7f1a40b04df19dcb091430b41dbc120 100644 (file)
--- a/test/confs/5821
+++ b/test/confs/5821
@@ -1,5 +1,5 @@
 # Exim test configuration 5821
-# DANE/OpenSSL - ciphers option
+# DANE/GnuTLS - ciphers option
 
 SERVER=
 OPT=
@@ -23,7 +23,7 @@ tls_certificate = ${if eq {SERVER}{server} {CDIR2/fullchain.pem}fail}
 tls_privatekey =  ${if eq {SERVER}{server} {CDIR2/server1.example.com.unlocked.key}fail}
 
 # Permit two specific ciphers
-tls_require_ciphers = NONE:+VERS-TLS-ALL:+MAC-ALL:+RSA:+AES-128-CBC:+CAMELLIA-256-GCM:+SIGN-ALL:+COMP-NULL
+tls_require_ciphers = NORMAL:-VERS-ALL:+VERS-TLS1.2:-KX-ALL:+RSA:-CIPHER-ALL:+AES-128-CBC:+CAMELLIA-256-GCM
 
 # ----- Routers -----
 begin routers
@@ -31,6 +31,7 @@ begin routers
 client:
   driver =             dnslookup
   condition =          ${if eq {SERVER}{}}
+  ignore_target_hosts = <; 0::0/0
   dnssec_request_domains = *
   self =               send
   transport =          send_to_server
@@ -47,11 +48,12 @@ send_to_server:
   driver =                     smtp
   allow_localhost
   port =                       PORT_D
+  hosts_try_fastopen =         :
   hosts_try_dane =             *
   tls_verify_certificates =    CDIR2/ca_chain.pem
 
   # Some commonly-available cipher, we hope
-  tls_require_ciphers =                NONE:+VERS-TLS-ALL:+MAC-ALL:+RSA:+AES-128-CBC:+SIGN-ALL:+COMP-NULL
+  tls_require_ciphers =                NORMAL:-CIPHER-ALL:+AES-128-CBC
   dane_require_tls_ciphers =   OPT
 
 # ----- Retry -----