Remove the X_ prefix from the PIPE_CONNECT SMTP service extension keyword.

(cherry picked from commit 958af3bdb77dc5c190b7f5117c68d2b0acd7b5bc)

8 files changed, 46 insertions, 38 deletions

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 4f411a503..6772852b5 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -16858,7 +16858,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
-.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
@@ -16867,7 +16867,9 @@ When used, the pipelining saves on roundtrip times.
 
 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
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 6eb2b508c..7b62caaa9 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -117,6 +117,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.
 
+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
 -----------------
diff --git a/src/src/macros.h b/src/src/macros.h
index 6fd5db94c..2fe364ed4 100644
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -1070,8 +1070,8 @@ should not be one active. */
 
 #define AUTHS_REGEX US"\\n250[\\s\\-]AUTH\\s+([\\-\\w \\t]+)(?:\\n|$)"
 
-#define EARLY_PIPE_FEATURE_NAME "X_PIPE_CONNECT"
-#define EARLY_PIPE_FEATURE_LEN  14
+#define EARLY_PIPE_FEATURE_NAME "PIPE_CONNECT"
+#define EARLY_PIPE_FEATURE_LEN  12
 
 
 /* Flags for auth_client_item() */
diff --git a/test/scripts/4050-pipe-conn/4050 b/test/scripts/4050-pipe-conn/4050
index 9dc04576f..9b06defbb 100644
--- 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-X_PIPE_CONNECT
+??? 250-PIPE_CONNECT
 ??? 250 HELP
 QUIT
 ??? 221
@@ -46,7 +46,7 @@ EHLO testclient
 ??? 250-SIZE
 ??? 250-8BITMIME
 ??? 250-PIPELINING
-??? 250-X_PIPE_CONNECT
+??? 250-PIPE_CONNECT
 ??? 250 HELP
 QUIT
 ??? 221
@@ -59,7 +59,7 @@ EHLO testclient\r\nMAIL FROM:<a@test.ex>
 ??? 250-SIZE
 ??? 250-8BITMIME
 ??? 250-PIPELINING
-??? 250-X_PIPE_CONNECT
+??? 250-PIPE_CONNECT
 ??? 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-X_PIPE_CONNECT
+??? 250-PIPE_CONNECT
 ??? 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-X_PIPE_CONNECT
+??? 250-PIPE_CONNECT
 ??? 250 HELP
 ??? 250
 ??? 250
diff --git a/test/scripts/4050-pipe-conn/4052 b/test/scripts/4050-pipe-conn/4052
index e9916800e..8ee494744 100644
--- 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
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -75,7 +75,7 @@ server PORT_D
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -118,7 +118,7 @@ server PORT_D
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -140,7 +140,7 @@ server PORT_D
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -166,7 +166,7 @@ server PORT_D
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 >250 mail good
 >250 rcpt good
@@ -187,7 +187,7 @@ server PORT_D
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 >250 mail good
 >550 rcpt refused
@@ -208,7 +208,7 @@ server PORT_D
 >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
@@ -226,7 +226,7 @@ server PORT_D
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -258,7 +258,7 @@ server PORT_D 1
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250-SIZE
 >250 ok
 <MAIL
diff --git a/test/stderr/4052 b/test/stderr/4052
index 53b9e0ae0..d4866ed88 100644
--- 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
-         250-X_PIPE_CONNECT
+         250-PIPE_CONNECT
          250-SIZE
          250 ok
 EHLO cleartext extensions changed, 0x0120/0x0000 -> 0x0160/0x0000
diff --git a/test/stdout/4050 b/test/stdout/4050
index 783dfd6a2..9e78c5f74 100644
--- 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-X_PIPE_CONNECT
-<<< 250-X_PIPE_CONNECT
+??? 250-PIPE_CONNECT
+<<< 250-PIPE_CONNECT
 ??? 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-X_PIPE_CONNECT
-<<< 250-X_PIPE_CONNECT
+??? 250-PIPE_CONNECT
+<<< 250-PIPE_CONNECT
 ??? 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-X_PIPE_CONNECT
-<<< 250-X_PIPE_CONNECT
+??? 250-PIPE_CONNECT
+<<< 250-PIPE_CONNECT
 ??? 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-X_PIPE_CONNECT
-<<< 250-X_PIPE_CONNECT
+??? 250-PIPE_CONNECT
+<<< 250-PIPE_CONNECT
 ??? 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-X_PIPE_CONNECT
-<<< 250-X_PIPE_CONNECT
+??? 250-PIPE_CONNECT
+<<< 250-PIPE_CONNECT
 ??? 250 HELP
 <<< 250 HELP
 ??? 250
diff --git a/test/stdout/4052 b/test/stdout/4052
index aa5d4a639..2f2fdc88c 100644
--- 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
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >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
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >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
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >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
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >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
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >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
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >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
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >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
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >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
->250-X_PIPE_CONNECT
+>250-PIPE_CONNECT
 >250-SIZE
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>