Browse code

unify default max stream sizes

git-svn: trunk@4861

aCaB authored on 2009/02/26 01:44:38
Showing 4 changed files
... ...
@@ -1,3 +1,7 @@
1
+Wed Feb 25 18:17:03 CET 2009 (acab)
2
+-----------------------------------
3
+ * clamd, clamav-milter: unify default max stream sizes
4
+
1 5
 Wed Feb 25 14:08:14 CET 2009 (acab)
2 6
 -----------------------------------
3 7
  * docs/man/clamav-milter.8.in: update documentation
... ...
@@ -206,6 +206,7 @@ Example
206 206
 ##
207 207
 
208 208
 # Messages larger than this value won't be scanned.
209
+# Make sure this value is lower than StreamMaxLength in clamd.conf
209 210
 # Default: 25M
210
-#MaxFileSize 150M
211
+#MaxFileSize 10M
211 212
 
... ...
@@ -96,8 +96,8 @@ LocalSocket /tmp/clamd.socket
96 96
 
97 97
 # Close the connection when the data size limit is exceeded.
98 98
 # The value should match your MTA's limit for a maximum attachment size.
99
-# Default: 10M
100
-#StreamMaxLength 20M
99
+# Default: 25M
100
+#StreamMaxLength 10M
101 101
 
102 102
 # Limit port range.
103 103
 # Default: 1024
... ...
@@ -177,7 +177,7 @@ const struct clam_option clam_options[] = {
177 177
 
178 178
     { "MaxConnectionQueueLength", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 15, NULL, 0, OPT_CLAMD, "Maximum length the queue of pending connections may grow to.", "30" },
179 179
 
180
-    { "StreamMaxLength", NULL, 0, TYPE_SIZE, MATCH_SIZE, 10485760, NULL, 0, OPT_CLAMD, "Close the STREAM session when the data size limit is exceeded.\nThe value should match your MTA's limit for the maximum attachment size.", "25M" },
180
+    { "StreamMaxLength", NULL, 0, TYPE_SIZE, MATCH_SIZE, CLI_DEFAULT_MAXFILESIZE, NULL, 0, OPT_CLAMD, "Close the STREAM session when the data size limit is exceeded.\nThe value should match your MTA's limit for the maximum attachment size.", "25M" },
181 181
 
182 182
     { "StreamMinPort", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 1024, NULL, 0, OPT_CLAMD, "The STREAM command uses an FTP-like protocol.\nThis option sets the lower boundary for the port range.", "1024" },
183 183