summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--doc/proxsmtpd.conf3
-rw-r--r--doc/proxsmtpd.conf.57
3 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f7573c3..ff151c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
- Added CLIENT and SERVER variables to VirusAction script environment.
- Even better logging for network errors.
- Print out proxsmtp version in debug logs
+ - Allow configuration of server keep alives (NOOPs). Default to none
0.5
- Added sample scripts.
diff --git a/doc/proxsmtpd.conf b/doc/proxsmtpd.conf
index 0138e94..b963c8b 100644
--- a/doc/proxsmtpd.conf
+++ b/doc/proxsmtpd.conf
@@ -28,6 +28,9 @@ OutAddress: 10026
# Amount of time (in seconds) to wait on network IO
#TimeOut: 180
+# Keep Alives (ie: NOOP's to server)
+#KeepAlives: 0
+
# Address to listen on (defaults to all local addresses on port 10025)
#Listen: 0.0.0.0:10025
diff --git a/doc/proxsmtpd.conf.5 b/doc/proxsmtpd.conf.5
index 75495e4..8579a3c 100644
--- a/doc/proxsmtpd.conf.5
+++ b/doc/proxsmtpd.conf.5
@@ -87,6 +87,13 @@ to a file and the file name is passed to the
using the
.Ar EMAIL
environment variable.
+.It Ar KeepAlives
+On slow connections the server will sometimes timeout before
+.Xr proxsmtpd 8
+is finished filtering the file. This option sends NOOP's to the server
+to keep the connection alive. Specify the number of seconds, or 0
+to disable.
+[ Default: 0 ]
.It Ar Listen
The address and port to listen for SMTP connections on. See syntax of
addresses below.