Squashed commit of PIPE_CONNECT

19 files changed, 505 insertions, 0 deletions

diff --git a/test/confs/0002 b/test/confs/0002
index 6ca2d1bcb..165f0a4b2 100644
--- a/test/confs/0002
+++ b/test/confs/0002
@@ -12,6 +12,9 @@ log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 tls_advertise_hosts =
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif
 
 # ----- Main settings -----
 
diff --git a/test/confs/0564 b/test/confs/0564
index 6a23896ef..e01628550 100644
--- a/test/confs/0564
+++ b/test/confs/0564
@@ -9,6 +9,9 @@ gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts =
 tls_advertise_hosts =
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts =
+.endif
 
 # ----- Main settings -----
 
diff --git a/test/confs/0900 b/test/confs/0900
index dfb58eb43..caf17be81 100644
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -16,6 +16,9 @@ tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
 .ifdef _HAVE_REQTLS
 tls_advertise_requiretls = :
 .endif
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif
 
 
 # ----- Main settings -----
diff --git a/test/confs/0906 b/test/confs/0906
index 8bb0a9e26..ff99d9304 100644
--- a/test/confs/0906
+++ b/test/confs/0906
@@ -10,6 +10,9 @@ gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
 tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts =
+.endif
 
 # ----- Main settings -----
 
diff --git a/test/confs/4050 b/test/confs/4050
new file mode 100644
index 000000000..06a85c089
--- /dev/null
+++ b/test/confs/4050
@@ -0,0 +1,63 @@
+# test config 4050
+# Pipelining the early part of the SMTP conversation
+
+CONNECTCOND=
+CONTROL=
+RETRY=7d
+
+keep_environment = PATH
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+spool_directory = DIR/spool
+
+.ifdef SERVER
+log_file_path = DIR/spool/log/SERVER%slog
+.else
+log_file_path = DIR/spool/log/%slog
+.endif
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+dns_cname_loops = 9
+chunking_advertise_hosts =
+tls_advertise_hosts =
+
+pipelining_connect_advertise_hosts = CONNECTCOND
+retry_data_expire = RETRY
+log_selector = +received_recipients +pipelining
+queue_only
+
+acl_smtp_rcpt = accept
+
+#
+begin routers
+
+server:
+  driver =	redirect
+  condition =	${if eq {SERVER}{server}}
+  data =	:blackhole:
+
+clientbounce:
+  driver =	redirect
+  condition =	${if !def:sender_address}
+  data =	:blackhole:
+
+client:
+  driver =	manualroute
+  route_data =	127.0.0.1::PORT_D
+  self =	send
+  transport =	smtp
+
+#
+begin transports
+
+smtp:
+  driver =		smtp
+  hosts_pipe_connect =	CONTROL
+  max_rcpt =		1
+
+#
+begin retry
+
+* * F,5d,1d
+
diff --git a/test/confs/4051 b/test/confs/4051
new file mode 120000
index 000000000..ca1c19b14
--- /dev/null
+++ b/test/confs/4051
@@ -0,0 +1 @@
+4050
\ No newline at end of file
diff --git a/test/confs/4052 b/test/confs/4052
new file mode 120000
index 000000000..ca1c19b14
--- /dev/null
+++ b/test/confs/4052
@@ -0,0 +1 @@
+4050
\ No newline at end of file
diff --git a/test/confs/4053 b/test/confs/4053
new file mode 100644
index 000000000..3a85deeab
--- /dev/null
+++ b/test/confs/4053
@@ -0,0 +1,47 @@
+# test config 4053
+# Early-pipe, CHUNKING
+
+keep_environment = PATH
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+spool_directory = DIR/spool
+
+.ifdef SERVER
+log_file_path = DIR/spool/log/SERVER%slog
+.else
+log_file_path = DIR/spool/log/%slog
+.endif
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+dns_cname_loops = 9
+chunking_advertise_hosts = *
+tls_advertise_hosts =
+
+pipelining_connect_advertise_hosts = *
+log_selector = +pipelining
+queue_only
+
+acl_smtp_rcpt = accept
+
+#
+begin routers
+
+server:
+  driver =	redirect
+  condition =	${if eq {SERVER}{server}}
+  data =	:blackhole:
+
+client:
+  driver =	manualroute
+  route_data =	127.0.0.1::PORT_D
+  self =	send
+  transport =	smtp
+
+#
+begin transports
+
+smtp:
+  driver =		smtp
+  hosts_pipe_connect =	*
+
diff --git a/test/confs/4056 b/test/confs/4056
new file mode 100644
index 000000000..c77c439e4
--- /dev/null
+++ b/test/confs/4056
@@ -0,0 +1,62 @@
+# test config 4056
+# Early-pipe, AUTH (no TLS!)
+
+keep_environment = PATH
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+spool_directory = DIR/spool
+
+.ifdef SERVER
+log_file_path = DIR/spool/log/SERVER%slog
+.else
+log_file_path = DIR/spool/log/%slog
+.endif
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+dns_cname_loops = 9
+chunking_advertise_hosts =
+tls_advertise_hosts =
+
+pipelining_connect_advertise_hosts = *
+auth_advertise_hosts = *
+log_selector = +pipelining
+queue_only
+
+acl_smtp_rcpt = accept
+
+#
+begin routers
+
+server:
+  driver =	redirect
+  condition =	${if eq {SERVER}{server}}
+  data =	:blackhole:
+
+client:
+  driver =	manualroute
+  route_data =	127.0.0.1::PORT_D
+  self =	send
+  transport =	smtp
+
+#
+begin transports
+
+smtp:
+  driver =		smtp
+  hosts_pipe_connect =	*
+  hosts_require_auth =	*
+
+#
+begin authenticators
+
+plain:
+  driver = plaintext
+  public_name = PLAIN
+
+  server_condition = "\
+    ${if and {{eq{$auth2}{userx}}{eq{$auth3}{secret}}}{yes}{no}}"
+  server_set_id = $auth2
+
+  client_send =	^userx^secret
+
diff --git a/test/confs/4058 b/test/confs/4058
new file mode 100644
index 000000000..887427a57
--- /dev/null
+++ b/test/confs/4058
@@ -0,0 +1,50 @@
+# test config 4058
+# Early-pipelining with TCP Fast Open
+
+OPT=
+
+keep_environment = PATH
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+spool_directory = DIR/spool
+
+.ifdef SERVER
+log_file_path = DIR/spool/log/SERVER%slog
+.else
+log_file_path = DIR/spool/log/%slog
+.endif
+log_selector = +received_recipients +millisec +pipelining
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+dns_cname_loops = 9
+chunking_advertise_hosts = OPT
+tls_advertise_hosts =
+
+pipelining_connect_advertise_hosts = *
+queue_only
+
+acl_smtp_rcpt = accept
+
+#
+begin routers
+
+server:
+  driver =	redirect
+  condition =	${if eq {SERVER}{server}}
+  data =	:blackhole:
+
+client:
+  driver =	manualroute
+  route_data =	127.0.0.1::PORT_D
+  self =	send
+  transport =	smtp
+
+#
+begin transports
+
+smtp:
+  driver =		smtp
+  hosts_try_fastopen =	*
+  hosts_pipe_connect =	*
+
diff --git a/test/confs/4060 b/test/confs/4060
new file mode 100644
index 000000000..935d49fe1
--- /dev/null
+++ b/test/confs/4060
@@ -0,0 +1,58 @@
+# test config 4060
+# Pipelining the early part of the SMTP conversation, starttls
+
+CONTROL=*
+OPT=
+
+keep_environment = PATH
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+spool_directory = DIR/spool
+
+.ifdef SERVER
+log_file_path = DIR/spool/log/SERVER%slog
+.else
+log_file_path = DIR/spool/log/%slog
+.endif
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+dns_cname_loops = 9
+chunking_advertise_hosts = OPT
+tls_advertise_hosts = *
+tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+
+# Avoid ECDHE key-exchange so that we can wireshark-decode
+.ifdef _HAVE_GNUTLS
+tls_require_ciphers = NORMAL:-KX-ALL:+RSA
+.endif
+
+pipelining_connect_advertise_hosts = *
+log_selector = +received_recipients +pipelining
+queue_only
+
+acl_smtp_rcpt = accept
+
+#
+begin routers
+
+server:
+  driver =	redirect
+  condition =	${if eq {SERVER}{server}}
+  data =	:blackhole:
+
+client:
+  driver =	manualroute
+  route_data =	127.0.0.1::PORT_D
+  self =	send
+  transport =	smtp
+
+#
+begin transports
+
+smtp:
+  driver =		smtp
+  hosts_pipe_connect =	CONTROL
+  tls_verify_hosts =
+  tls_try_verify_hosts =
+
diff --git a/test/confs/4061 b/test/confs/4061
new file mode 100644
index 000000000..3ff106f8b
--- /dev/null
+++ b/test/confs/4061
@@ -0,0 +1,59 @@
+# test config 4061
+# Pipelining the early part of the SMTP conversation, tls-on-connect
+
+CONTROL=*
+
+keep_environment = PATH
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+spool_directory = DIR/spool
+
+.ifdef SERVER
+log_file_path = DIR/spool/log/SERVER%slog
+.else
+log_file_path = DIR/spool/log/%slog
+.endif
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+dns_cname_loops = 9
+chunking_advertise_hosts =
+tls_on_connect_ports = PORT_D
+tls_advertise_hosts = *
+tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+
+# Avoid ECDHE key-exchange so that we can wireshark-decode
+.ifdef _HAVE_GNUTLS
+tls_require_ciphers = NORMAL:-KX-ALL:+RSA
+.endif
+
+pipelining_connect_advertise_hosts = *
+log_selector = +received_recipients +pipelining
+queue_only
+
+acl_smtp_rcpt = accept
+
+#
+begin routers
+
+server:
+  driver =	redirect
+  condition =	${if eq {SERVER}{server}}
+  data =	:blackhole:
+
+client:
+  driver =	manualroute
+  route_data =	127.0.0.1::PORT_D
+  self =	send
+  transport =	smtp
+
+#
+begin transports
+
+smtp:
+  driver =		smtp
+  hosts_pipe_connect =	CONTROL
+  protocol =		smtps
+  tls_verify_hosts =
+  tls_try_verify_hosts =
+
diff --git a/test/confs/4062 b/test/confs/4062
new file mode 120000
index 000000000..f9a2604f2
--- /dev/null
+++ b/test/confs/4062
@@ -0,0 +1 @@
+4060
\ No newline at end of file
diff --git a/test/confs/4063 b/test/confs/4063
new file mode 120000
index 000000000..723e8a8a0
--- /dev/null
+++ b/test/confs/4063
@@ -0,0 +1 @@
+4061
\ No newline at end of file
diff --git a/test/confs/4064 b/test/confs/4064
new file mode 100644
index 000000000..8c3c300a5
--- /dev/null
+++ b/test/confs/4064
@@ -0,0 +1,72 @@
+# test config 4064
+# Early-pipe, AUTH, GnuTLS
+
+keep_environment = PATH
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+spool_directory = DIR/spool
+
+.ifdef SERVER
+log_file_path = DIR/spool/log/SERVER%slog
+.else
+log_file_path = DIR/spool/log/%slog
+.endif
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+dns_cname_loops = 9
+chunking_advertise_hosts = OPT
+tls_advertise_hosts = *
+tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+
+# Avoid ECDHE key-exchange so that we can wireshark-decode
+.ifdef _HAVE_GNUTLS
+tls_require_ciphers = NORMAL:-KX-ALL:+RSA
+.endif
+
+pipelining_connect_advertise_hosts = *
+auth_advertise_hosts = *
+
+log_selector = +received_recipients +pipelining
+queue_only
+
+acl_smtp_rcpt = accept
+
+#
+begin routers
+
+server:
+  driver =	redirect
+  condition =	${if eq {SERVER}{server}}
+  data =	:blackhole:
+
+client:
+  driver =	manualroute
+  route_data =	127.0.0.1::PORT_D
+  self =	send
+  transport =	smtp
+
+#
+begin transports
+
+smtp:
+  driver =		smtp
+  hosts_pipe_connect =	*
+  tls_verify_hosts =
+  tls_try_verify_hosts =
+  hosts_require_auth =	*
+
+#
+begin authenticators
+
+plain:
+  driver = plaintext
+  public_name = PLAIN
+
+  server_advertise_condition = ${if eq{$tls_in_cipher}{}{no}{yes}}
+  server_condition = "\
+    ${if and {{eq{$auth2}{userx}}{eq{$auth3}{secret}}}{yes}{no}}"
+  server_set_id = $auth2
+
+  client_send =	^userx^secret
+
diff --git a/test/confs/4065 b/test/confs/4065
new file mode 100644
index 000000000..dcf0d6f5d
--- /dev/null
+++ b/test/confs/4065
@@ -0,0 +1,73 @@
+# test config 4065
+# Early-pipe, AUTH, GnuTLS, tls-on-connect
+
+keep_environment = PATH
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+spool_directory = DIR/spool
+
+.ifdef SERVER
+log_file_path = DIR/spool/log/SERVER%slog
+.else
+log_file_path = DIR/spool/log/%slog
+.endif
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+dns_cname_loops = 9
+chunking_advertise_hosts =
+tls_on_connect_ports = PORT_D
+tls_advertise_hosts = *
+tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+
+# Avoid ECDHE key-exchange so that we can wireshark-decode
+.ifdef _HAVE_GNUTLS
+tls_require_ciphers = NORMAL:-KX-ALL:+RSA
+.endif
+
+pipelining_connect_advertise_hosts = *
+auth_advertise_hosts = *
+
+log_selector = +received_recipients +pipelining
+queue_only
+
+acl_smtp_rcpt = accept
+
+#
+begin routers
+
+server:
+  driver =	redirect
+  condition =	${if eq {SERVER}{server}}
+  data =	:blackhole:
+
+client:
+  driver =	manualroute
+  route_data =	127.0.0.1::PORT_D
+  self =	send
+  transport =	smtp
+
+#
+begin transports
+
+smtp:
+  driver =		smtp
+  hosts_pipe_connect =	*
+  protocol =		smtps
+  tls_verify_hosts =
+  tls_try_verify_hosts =
+  hosts_require_auth =	*
+
+#
+begin authenticators
+
+plain:
+  driver = plaintext
+  public_name = PLAIN
+
+  server_condition = "\
+    ${if and {{eq{$auth2}{userx}}{eq{$auth3}{secret}}}{yes}{no}}"
+  server_set_id = $auth2
+
+  client_send =	^userx^secret
+
diff --git a/test/confs/4066 b/test/confs/4066
new file mode 120000
index 000000000..8d736b10e
--- /dev/null
+++ b/test/confs/4066
@@ -0,0 +1 @@
+4064
\ No newline at end of file
diff --git a/test/confs/4067 b/test/confs/4067
new file mode 120000
index 000000000..ddeca2101
--- /dev/null
+++ b/test/confs/4067
@@ -0,0 +1 @@
+4065
\ No newline at end of file
diff --git a/test/confs/5910 b/test/confs/5910
index 2437758bf..55838b3db 100644
--- a/test/confs/5910
+++ b/test/confs/5910
@@ -21,6 +21,9 @@ log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts =
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts =
+.endif
 
 primary_hostname = myhost.test.ex