summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2021-03-19 20:42:25 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2021-04-03 21:27:25 +0100
commit1cf47989a0376c3f7156c214c1d509d372e4262b (patch)
tree059e0eb2f099822c38fd0f3eec0b36c3dc59c43c /doc
parentbf3e317e5a01916a351278597c6c0664ed198ddc (diff)
Make smtp_accept_max_per_connection expanded
Diffstat (limited to 'doc')
-rw-r--r--doc/doc-docbook/spec.xfpt7
-rw-r--r--doc/doc-txt/NewStuff2
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index d971bbf60..e6135eb52 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -17575,7 +17575,7 @@ live with.
. searchable. NM changed this occurrence for bug 1197 to no longer allow
. the option name to split.
-.option "smtp_accept_max_per_connection" main integer 1000 &&&
+.option "smtp_accept_max_per_connection" main integer&!! 1000 &&&
smtp_accept_max_per_connection
.cindex "SMTP" "limiting incoming message count"
.cindex "limit" "messages per SMTP connection"
@@ -17585,6 +17585,11 @@ results in the transfer of a message. After the limit is reached, a 421
response is given to subsequent MAIL commands. This limit is a safety
precaution against a client that goes mad (incidents of this type have been
seen).
+.new
+The option is expanded after the HELO or EHLO is received
+and may depend on values available at that time.
+An empty or zero value after expansion removes the limit.
+.wen
.option smtp_accept_max_per_host main string&!! unset
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index cd1699dc6..50f7b4357 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -46,6 +46,8 @@ Version 4.95
12. Proxy Protocol Timeout is configurable via "proxy_protocol_timeout"
main config option.
+13. Option "smtp_accept_msx_per_connection" is now expanded.
+
Version 4.94
------------