X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/eb2163cbc29a00b2ca214e507e4a57f374c2e8ed..aa3c7e485be428d9d436f917793c8598bfebd3a1:/doc/doc-docbook/spec.xfpt?ds=inline diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index dea7bc761..e11881cb9 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -10957,11 +10957,15 @@ If the string is a single variable of type certificate, returns the SHA-1 hash fingerprint of the certificate. -.vitem &*${sha256:*&<&'string'&>&*}*& +.vitem &*${sha256:*&<&'string'&>&*}*& &&& + &*${sha2:*&<&'string'&>&*}*& &&& + &*${sha2_:*&<&'string'&>&*}*& .cindex "SHA-256 hash" +.cindex "SHA-2 hash" .cindex certificate fingerprint .cindex "expansion" "SHA-256 hashing" .cindex "&%sha256%& expansion item" +.cindex "&%sha2%& expansion item" The &%sha256%& operator computes the SHA-256 hash value of the string and returns it as a 64-digit hexadecimal number, in which any letters are in upper case. @@ -10969,6 +10973,15 @@ it as a 64-digit hexadecimal number, in which any letters are in upper case. If the string is a single variable of type certificate, returns the SHA-256 hash fingerprint of the certificate. +.new +The operator can also be spelled &%sha2%& and does the same as &%sha256%& +(except for certificates, which are not supported). +Finally, if an underbar +and a number is appended it specifies the output length, selecting a +member of the SHA-2 family of hash functions. +Values of 256, 384 and 512 are accepted, with 256 being the default. +.wen + .vitem &*${sha3:*&<&'string'&>&*}*& &&& &*${sha3_:*&<&'string'&>&*}*& @@ -14355,6 +14368,7 @@ See also the &'Policy controls'& section above. .row &%ignore_fromline_hosts%& "allow &""From ""& from these hosts" .row &%ignore_fromline_local%& "allow &""From ""& from local SMTP" .row &%pipelining_advertise_hosts%& "advertise pipelining to these hosts" +.row &%pipelining_connect_advertise_hosts%& "advertise pipelining to these hosts" .row &%prdr_enable%& "advertise PRDR to all hosts" .row &%smtputf8_advertise_hosts%& "advertise SMTPUTF8 to these hosts" .row &%tls_advertise_hosts%& "advertise TLS to these hosts" @@ -16360,6 +16374,19 @@ for each SMTP command and response. When PIPELINING is advertised, Exim assumes that clients will use it; &"out of order"& commands that are &"expected"& do not count as protocol errors (see &%smtp_max_synprot_errors%&). +.new +.option pipelining_connect_advertise_hosts main "host list&!!" * +.cindex "pipelining" "early connection" +.cindex "pipelining" 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 +commands are acceptable. +When used, the pipelining saves on roundtrip times. + +Currently the option name &"X_PIPE_CONNECT"& is used. +.wen + .option prdr_enable main boolean false .cindex "PRDR" "enabling on server" @@ -23669,7 +23696,7 @@ inserted in the argument list at that point &'as a separate argument'&. This avoids any problems with spaces or shell metacharacters, and is of use when a &(pipe)& transport is handling groups of addresses in a batch. -If &%force_command%& is enabled on the transport, Special handling takes place +If &%force_command%& is enabled on the transport, special handling takes place for an argument that consists of precisely the text &`$address_pipe`&. It is handled similarly to &$pipe_addresses$& above. It is expanded and each argument is inserted in the argument list at that point @@ -24540,6 +24567,30 @@ facilities such as AUTH, PIPELINING, SIZE, and STARTTLS. Exim will not use the SMTP PIPELINING extension when delivering to any host that matches this list, even if the server host advertises PIPELINING support. +.new +.option hosts_pipe_connect smtp "host list&!!" unset +.cindex "pipelining" "early connection" +.cindex "pipelining" PIPE_CONNECT +If Exim is built with the SUPPORT_PIPE_CONNECT build option +this option controls which to hosts the facility watched for +and recorded, and used for subsequent connections. + +The retry hints database is used for the record, +and records are subject to the &%retry_data_expire%& option. +When used, the pipelining saves on roundtrip times. +It also turns SMTP into a client-first protocol +so combines well with TCP Fast Open. + +Note: +When the facility is used, the transport &%helo_data%& option +will be expanded before the &$sending_ip_address$& variable +is filled in. +A check is made for the use of that variable, without the +presence of a &"def:"& test on it, but suitably complex coding +can avoid the check and produce unexpected results. +You have been warned. +.wen + .option hosts_avoid_tls smtp "host list&!!" unset .cindex "TLS" "avoiding for certain hosts" @@ -24579,13 +24630,15 @@ been started will not be passed to a new delivery process for sending another message on the same connection. See section &<>& for an explanation of when this might be needed. -.option hosts_noproxy_tls smtp "host list&!!" * +.new +.option hosts_noproxy_tls smtp "host list&!!" unset .cindex "TLS" "passing connection" .cindex "multiple SMTP deliveries" .cindex "TLS" "multiple message deliveries" For any host that matches this list, a TLS session which has been started will not be passed to a new delivery process for sending another message on the same session. +.wen The traditional implementation closes down TLS and re-starts it in the new process, on the same open TCP connection, for each successive message @@ -24681,7 +24734,7 @@ This option provides a list of servers to which, provided they announce CHUNKING support, Exim will attempt to use BDAT commands rather than DATA. BDAT will not be used in conjunction with a transport filter. -.option hosts_try_dane smtp "host list&!!" unset +.option hosts_try_dane smtp "host list&!!" * .cindex DANE "transport options" .cindex DANE "attempting for certain servers" If built with DANE support, Exim will lookup a @@ -24691,7 +24744,7 @@ a DANE-verified TLS connection is made to that host; there will be no fallback to in-clear communication. See section &<>&. -.option hosts_try_fastopen smtp "host list&!!" unset +.option hosts_try_fastopen smtp "host list&!!" * .cindex "fast open, TCP" "enabling, in client" .cindex "TCP Fast Open" "enabling, in client" .cindex "RFC 7413" "TCP Fast Open" @@ -30849,7 +30902,7 @@ client host, and its contents have been verified. If there has been no previous attempt to verify the HELO/EHLO contents, it is carried out when this condition is encountered. See the description of the &%helo_verify_hosts%& and &%helo_try_verify_hosts%& options for details of how to request verification -independently of this condition. +independently of this condition, and for detail of the verification. For SMTP input that does not come over TCP/IP (the &%-bs%& command line option), this condition is always true. @@ -37365,6 +37418,15 @@ The field is a single "L". On accept lines, where PIPELINING was offered but not used by the client, the field has a minus appended. + +.new +.cindex "pipelining" "early connection" +If Exim is built with the SUPPORT_PIPE_CONNECT build option +accept "L" fields have a period appended if the feature was +offered but not used, or an asterisk appended if used. +Delivery "L" fields have an asterisk appended if used. +.wen + .next .cindex "log" "queue run" .cindex "queue runner" "logging" @@ -37720,6 +37782,11 @@ Match only frozen messages. .vitem &*-x*& Match only non-frozen messages. + +.new +.vitem &*-G*&&~<&'queuename'&> +Match only messages in the given queue. Without this, the default queue is searched. +.wen .endlist The following options control the format of the output: