git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
183389f
)
Remove the X_ prefix from the PIPE_CONNECT SMTP service extension keyword.
author
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 17 Dec 2020 09:39:59 +0000
(09:39 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 17 Dec 2020 10:16:34 +0000
(10:16 +0000)
doc/doc-docbook/spec.xfpt
patch
|
blob
|
history
doc/doc-txt/ChangeLog
patch
|
blob
|
history
src/src/macros.h
patch
|
blob
|
history
test/scripts/4050-pipe-conn/4050
patch
|
blob
|
history
test/scripts/4050-pipe-conn/4052
patch
|
blob
|
history
test/stderr/4052
patch
|
blob
|
history
test/stdout/4050
patch
|
blob
|
history
test/stdout/4052
patch
|
blob
|
history
diff --git
a/doc/doc-docbook/spec.xfpt
b/doc/doc-docbook/spec.xfpt
index b23f33d42d208dd8f5f5d80a4dbca3757f1c52b6..302a62312ecc2f10d03d17ddb41109bf51f7229a 100644
(file)
--- a/
doc/doc-docbook/spec.xfpt
+++ b/
doc/doc-docbook/spec.xfpt
@@
-16981,7
+16981,7
@@
not count as protocol errors (see &%smtp_max_synprot_errors%&).
.option pipelining_connect_advertise_hosts main "host list&!!" *
.cindex "pipelining" "early connection"
.cindex "pipelining" PIPE_CONNECT
.option pipelining_connect_advertise_hosts main "host list&!!" *
.cindex "pipelining" "early connection"
.cindex "pipelining" PIPE_CONNECT
-.cindex "ESMTP extensions"
X_
PIPE_CONNECT
+.cindex "ESMTP extensions" PIPE_CONNECT
If Exim is built with the SUPPORT_PIPE_CONNECT build option
this option controls which hosts the facility is advertised to
and from which pipeline early-connection (before MAIL) SMTP
If Exim is built with the SUPPORT_PIPE_CONNECT build option
this option controls which hosts the facility is advertised to
and from which pipeline early-connection (before MAIL) SMTP
@@
-16990,7
+16990,9
@@
When used, the pipelining saves on roundtrip times.
See also the &%hosts_pipe_connect%& smtp transport option.
See also the &%hosts_pipe_connect%& smtp transport option.
-Currently the option name &"X_PIPE_CONNECT"& is used.
+.new
+The SMTP service extension keyword advertised is &"PIPE_CONNECT"&.
+.wen
.option prdr_enable main boolean false
.option prdr_enable main boolean false
diff --git
a/doc/doc-txt/ChangeLog
b/doc/doc-txt/ChangeLog
index 39136ea7e98964b5c34b1433bb263deafb97c6d0..f2d34e84dfd77b4e048ddedb5bcc5a21d092203f 100644
(file)
--- a/
doc/doc-txt/ChangeLog
+++ b/
doc/doc-txt/ChangeLog
@@
-150,6
+150,12
@@
JH/30 Bug 2677: fix matching of long addresses. Since 4.93 a limit of 256 was
a header. Fix by increaing the arbitrary limit to larger than a single
(dewrapped) 5322 header line maximum size.
a header. Fix by increaing the arbitrary limit to larger than a single
(dewrapped) 5322 header line maximum size.
+JH/31 The ESMTP option name advertised for the SUPPORT_EARLY_PIPE build option
+ is changed from X_PIPE_CONNECT to PIPE_CONNECT. This is in line with
+ RFC 6648 which deprecates X- options in protocols as a general practice.
+ Changeover between the implementations is handled by the mechanisms
+ alrready coded.
+
Exim version 4.94
-----------------
Exim version 4.94
-----------------
diff --git
a/src/src/macros.h
b/src/src/macros.h
index 62b6290eb7b06cc5d93d8433b696c7d91fca69c3..a584551d3a45e7941411091826d962ea969b049e 100644
(file)
--- a/
src/src/macros.h
+++ b/
src/src/macros.h
@@
-1072,8
+1072,8
@@
should not be one active. */
#define AUTHS_REGEX US"\\n250[\\s\\-]AUTH\\s+([\\-\\w \\t]+)(?:\\n|$)"
#define AUTHS_REGEX US"\\n250[\\s\\-]AUTH\\s+([\\-\\w \\t]+)(?:\\n|$)"
-#define EARLY_PIPE_FEATURE_NAME "
X_
PIPE_CONNECT"
-#define EARLY_PIPE_FEATURE_LEN 1
4
+#define EARLY_PIPE_FEATURE_NAME "PIPE_CONNECT"
+#define EARLY_PIPE_FEATURE_LEN 1
2
/* Flags for auth_client_item() */
/* Flags for auth_client_item() */
diff --git
a/test/scripts/4050-pipe-conn/4050
b/test/scripts/4050-pipe-conn/4050
index 9dc04576faf3ce68b8d5f0c3145d50c14e408e3d..9b06defbb2d7cf58ee54cb25df37922c311f32d6 100644
(file)
--- a/
test/scripts/4050-pipe-conn/4050
+++ b/
test/scripts/4050-pipe-conn/4050
@@
-28,7
+28,7
@@
EHLO testclient
??? 250-SIZE
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-SIZE
??? 250-8BITMIME
??? 250-PIPELINING
-??? 250-
X_
PIPE_CONNECT
+??? 250-PIPE_CONNECT
??? 250 HELP
QUIT
??? 221
??? 250 HELP
QUIT
??? 221
@@
-46,7
+46,7
@@
EHLO testclient
??? 250-SIZE
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-SIZE
??? 250-8BITMIME
??? 250-PIPELINING
-??? 250-
X_
PIPE_CONNECT
+??? 250-PIPE_CONNECT
??? 250 HELP
QUIT
??? 221
??? 250 HELP
QUIT
??? 221
@@
-59,7
+59,7
@@
EHLO testclient\r\nMAIL FROM:<a@test.ex>
??? 250-SIZE
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-SIZE
??? 250-8BITMIME
??? 250-PIPELINING
-??? 250-
X_
PIPE_CONNECT
+??? 250-PIPE_CONNECT
??? 250 HELP
??? 250
QUIT
??? 250 HELP
??? 250
QUIT
@@
-73,7
+73,7
@@
EHLO testclient\r\nMAIL FROM:<a@test.ex>\r\nRCPT TO:<a@test.ex>
??? 250-SIZE
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-SIZE
??? 250-8BITMIME
??? 250-PIPELINING
-??? 250-
X_
PIPE_CONNECT
+??? 250-PIPE_CONNECT
??? 250 HELP
??? 250
??? 250
??? 250 HELP
??? 250
??? 250
@@
-88,7
+88,7
@@
EHLO testclient\r\nMAIL FROM:<a@test.ex>\r\nRCPT TO:<a@test.ex>\r\nDATA
??? 250-SIZE
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-SIZE
??? 250-8BITMIME
??? 250-PIPELINING
-??? 250-
X_
PIPE_CONNECT
+??? 250-PIPE_CONNECT
??? 250 HELP
??? 250
??? 250
??? 250 HELP
??? 250
??? 250
diff --git
a/test/scripts/4050-pipe-conn/4052
b/test/scripts/4050-pipe-conn/4052
index e9916800e0d2630f6862939de2b88ebd68b4deec..8ee4947444f71adac7f5b42db119036365e97100 100644
(file)
--- a/
test/scripts/4050-pipe-conn/4052
+++ b/
test/scripts/4050-pipe-conn/4052
@@
-53,7
+53,7
@@
server PORT_D
<EHLO
>250-esmtp-resp
>250-PIPELINING
<EHLO
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
<MAIL
>250 mail-from accepted
>250 ok
<MAIL
>250 mail-from accepted
@@
-75,7
+75,7
@@
server PORT_D
<EHLO
>250-esmtp-resp
>250-PIPELINING
<EHLO
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
<MAIL
>250 mail-from accepted
>250 ok
<MAIL
>250 mail-from accepted
@@
-118,7
+118,7
@@
server PORT_D
<EHLO
>250-esmtp-resp
>250-PIPELINING
<EHLO
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
<MAIL
>250 mail-from accepted
>250 ok
<MAIL
>250 mail-from accepted
@@
-140,7
+140,7
@@
server PORT_D
<EHLO
>250-esmtp-resp
>250-PIPELINING
<EHLO
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
<MAIL
>250 mail-from accepted
>250 ok
<MAIL
>250 mail-from accepted
@@
-166,7
+166,7
@@
server PORT_D
>220 banner
>250-esmtp-resp
>250-PIPELINING
>220 banner
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
>250 mail good
>250 rcpt good
>250 ok
>250 mail good
>250 rcpt good
@@
-187,7
+187,7
@@
server PORT_D
>220 banner
>250-esmtp-resp
>250-PIPELINING
>220 banner
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
>250 mail good
>550 rcpt refused
>250 ok
>250 mail good
>550 rcpt refused
@@
-208,7
+208,7
@@
server PORT_D
>220 banner
>250-esmtp-resp
>250-PIPELINING
>220 banner
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
>550 mail cmd refused
>550 rcpt cmd rejected - no valid mail
>250 ok
>550 mail cmd refused
>550 rcpt cmd rejected - no valid mail
@@
-226,7
+226,7
@@
server PORT_D
<EHLO
>250-esmtp-resp
>250-PIPELINING
<EHLO
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
<MAIL
>250 mail-from accepted
>250 ok
<MAIL
>250 mail-from accepted
@@
-258,7
+258,7
@@
server PORT_D 1
<EHLO
>250-esmtp-resp
>250-PIPELINING
<EHLO
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250-SIZE
>250 ok
<MAIL
>250-SIZE
>250 ok
<MAIL
diff --git
a/test/stderr/4052
b/test/stderr/4052
index 53b9e0ae02e5586e722f33a927cdc2dde60737fb..d4866ed885d7ee3ca183e498d8cead6e0a1edc1c 100644
(file)
--- a/
test/stderr/4052
+++ b/
test/stderr/4052
@@
-36,7
+36,7
@@
smtp_reap_early_pipe expect banner
smtp_reap_early_pipe expect ehlo
SMTP<< 250-esmtp-resp
250-PIPELINING
smtp_reap_early_pipe expect ehlo
SMTP<< 250-esmtp-resp
250-PIPELINING
- 250-
X_
PIPE_CONNECT
+ 250-PIPE_CONNECT
250-SIZE
250 ok
EHLO cleartext extensions changed, 0x0120/0x0000 -> 0x0160/0x0000
250-SIZE
250 ok
EHLO cleartext extensions changed, 0x0120/0x0000 -> 0x0160/0x0000
diff --git
a/test/stdout/4050
b/test/stdout/4050
index 783dfd6a29c38527caa094defefe148c4e212a10..9e78c5f74dd3516b97951efa0f51bcd1edffa3ed 100644
(file)
--- a/
test/stdout/4050
+++ b/
test/stdout/4050
@@
-28,8
+28,8
@@
Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-8BITMIME
??? 250-PIPELINING
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-PIPELINING
<<< 250-PIPELINING
-??? 250-
X_
PIPE_CONNECT
-<<< 250-
X_
PIPE_CONNECT
+??? 250-PIPE_CONNECT
+<<< 250-PIPE_CONNECT
??? 250 HELP
<<< 250 HELP
>>> QUIT
??? 250 HELP
<<< 250 HELP
>>> QUIT
@@
-48,8
+48,8
@@
Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-8BITMIME
??? 250-PIPELINING
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-PIPELINING
<<< 250-PIPELINING
-??? 250-
X_
PIPE_CONNECT
-<<< 250-
X_
PIPE_CONNECT
+??? 250-PIPE_CONNECT
+<<< 250-PIPE_CONNECT
??? 250 HELP
<<< 250 HELP
>>> QUIT
??? 250 HELP
<<< 250 HELP
>>> QUIT
@@
-68,8
+68,8
@@
Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-8BITMIME
??? 250-PIPELINING
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-PIPELINING
<<< 250-PIPELINING
-??? 250-
X_
PIPE_CONNECT
-<<< 250-
X_
PIPE_CONNECT
+??? 250-PIPE_CONNECT
+<<< 250-PIPE_CONNECT
??? 250 HELP
<<< 250 HELP
??? 250
??? 250 HELP
<<< 250 HELP
??? 250
@@
-90,8
+90,8
@@
Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-8BITMIME
??? 250-PIPELINING
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-PIPELINING
<<< 250-PIPELINING
-??? 250-
X_
PIPE_CONNECT
-<<< 250-
X_
PIPE_CONNECT
+??? 250-PIPE_CONNECT
+<<< 250-PIPE_CONNECT
??? 250 HELP
<<< 250 HELP
??? 250
??? 250 HELP
<<< 250 HELP
??? 250
@@
-114,8
+114,8
@@
Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-8BITMIME
??? 250-PIPELINING
<<< 250-PIPELINING
<<< 250-8BITMIME
??? 250-PIPELINING
<<< 250-PIPELINING
-??? 250-
X_
PIPE_CONNECT
-<<< 250-
X_
PIPE_CONNECT
+??? 250-PIPE_CONNECT
+<<< 250-PIPE_CONNECT
??? 250 HELP
<<< 250 HELP
??? 250
??? 250 HELP
<<< 250 HELP
??? 250
diff --git
a/test/stdout/4052
b/test/stdout/4052
index aa5d4a63982d4883dde4aafa6c68134125c08037..2f2fdc88c9278aedf5cebda235d04d6a5fce3e97 100644
(file)
--- a/
test/stdout/4052
+++ b/
test/stdout/4052
@@
-8,7
+8,7
@@
Connection request from [127.0.0.1]
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>
>250 mail-from accepted
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>
>250 mail-from accepted
@@
-37,7
+37,7
@@
Connection request from [127.0.0.1]
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>
>250 mail-from accepted
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>
>250 mail-from accepted
@@
-82,7
+82,7
@@
Connection request from [127.0.0.1]
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>
>250 mail-from accepted
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>
>250 mail-from accepted
@@
-111,7
+111,7
@@
Connection request from [127.0.0.1]
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>
>250 mail-from accepted
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>
>250 mail-from accepted
@@
-144,7
+144,7
@@
Connection request from [127.0.0.1]
>220 banner
>250-esmtp-resp
>250-PIPELINING
>220 banner
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
>250 mail good
>250 rcpt good
>250 ok
>250 mail good
>250 rcpt good
@@
-163,7
+163,7
@@
Connection request from [127.0.0.1]
>220 banner
>250-esmtp-resp
>250-PIPELINING
>220 banner
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
>250 mail good
>550 rcpt refused
>250 ok
>250 mail good
>550 rcpt refused
@@
-182,7
+182,7
@@
Connection request from [127.0.0.1]
>220 banner
>250-esmtp-resp
>250-PIPELINING
>220 banner
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
>550 mail cmd refused
>550 rcpt cmd rejected - no valid mail
>250 ok
>550 mail cmd refused
>550 rcpt cmd rejected - no valid mail
@@
-198,7
+198,7
@@
Connection request from [127.0.0.1]
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>
>250 mail-from accepted
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>
>250 mail-from accepted
@@
-227,7
+227,7
@@
Connection request from [127.0.0.1]
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
<EHLO the.local.host.name
>250-esmtp-resp
>250-PIPELINING
->250-
X_
PIPE_CONNECT
+>250-PIPE_CONNECT
>250-SIZE
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>
>250-SIZE
>250 ok
<MAIL FROM:<CALLER@the.local.host.name>