Use ALARM() to set deadline on reading the proxy header (Bug 2656)

[users/heiko/exim.git] / test / confs / 2113

diff --git a/test/confs/2113 b/test/confs/2113
index 95b6842a95ad83f15b811ca451f42374a14a510c..b992747e25efa42dad05c3cd895074601d2ce757 100644 (file)
--- a/test/confs/2113
+++ b/test/confs/2113
@@ -1,6 +1,7 @@
 # Exim test configuration 2113
 
 SERVER =
 # Exim test configuration 2113
 
 SERVER =

+PEX = :

 
 .include DIR/aux-var/tls_conf_prefix
 
 
 .include DIR/aux-var/tls_conf_prefix
 


@@ -19,10 +20,7 @@ smtp_accept_max_nonmail = 0
 
 tls_advertise_hosts = *
 
 
 tls_advertise_hosts = *
 

-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----


@@ -56,7 +54,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 


@@ -65,8 +63,10 @@ send_to_server:
   allow_localhost
   hosts_override
   hosts = 127.0.0.1
   allow_localhost
   hosts_override
   hosts = 127.0.0.1

-  hosts_noproxy_tls = :

   port = PORT_D
   port = PORT_D

-  tls_try_verify_hosts = :
+  hosts_try_fastopen = :
+  hosts_noproxy_tls = PEX
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames = :

 
 # End
 
 # End