diff options
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 22 | ||||
| -rw-r--r-- | doc/doc-txt/ChangeLog | 2 | ||||
| -rw-r--r-- | src/src/tls-gnu.c | 3 |
3 files changed, 12 insertions, 15 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 8c229ce73..7ff3a5fcd 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -12808,13 +12808,11 @@ option in the &(appendfile)& transport. The variable contains the inode number of the temporary file which is about to be renamed. It can be used to construct a unique name for the file. -.vitem &$interface_address$& +.vitem &$interface_address$& &&& + &$interface_port$& .vindex "&$interface_address$&" -This is an obsolete name for &$received_ip_address$&. - -.vitem &$interface_port$& .vindex "&$interface_port$&" -This is an obsolete name for &$received_port$&. +These are ebsolete names for &$received_ip_address$& and &$received_port$&. .vitem &$item$& .vindex "&$item$&" @@ -13321,11 +13319,13 @@ variable contains that address when the &'Received:'& header line is being built. The value is copied after recipient rewriting has happened, but before the &[local_scan()]& function is run. -.vitem &$received_ip_address$& +.vitem &$received_ip_address$& &&& + &$received_port$& .vindex "&$received_ip_address$&" -As soon as an Exim server starts processing an incoming TCP/IP connection, this -variable is set to the address of the local IP interface, and &$received_port$& -is set to the local port number. (The remote IP address and port are in +.vindex "&$received_port$&" +As soon as an Exim server starts processing an incoming TCP/IP connection, these +variables are set to the address and port on the local IP interface. +(The remote IP address and port are in &$sender_host_address$& and &$sender_host_port$&.) When testing with &%-bh%&, the port value is -1 unless it has been set using the &%-oMi%& command line option. @@ -13338,10 +13338,6 @@ messages that are received, thus making these variables available at delivery time. For outbound connections see &$sending_ip_address$&. -.vitem &$received_port$& -.vindex "&$received_port$&" -See &$received_ip_address$&. - .vitem &$received_protocol$& .vindex "&$received_protocol$&" When a message is being processed, this variable contains the name of the diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 463bf6ff6..b5cc1a889 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -329,7 +329,7 @@ JH/58 GnuTLS: Fix certextract expansion. If a second modifier after a tag JH/59 DKIM: Fix small-message verification under TLS with chunking. If a pipelined SMTP command followed the BDAT LAST then it would be - incorrrectly treated as part of the message body, causing a verification + incorrectly treated as part of the message body, causing a verification fail. JH/60 Bug 2805: Fix logging of domain-literals in Message_ID: headers. They diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c index 796581b0e..9aabcbfd0 100644 --- a/src/src/tls-gnu.c +++ b/src/src/tls-gnu.c @@ -1079,7 +1079,8 @@ static int tls_server_clienthello_ext(void * ctx, unsigned tls_id, const uschar * data, unsigned size) { -/* https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml */ +/* The values for tls_id are documented here: +https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml */ switch (tls_id) { case 5: /* Status Request */ |