[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 50b0bd804f74a8290c2934179a2a4f6aaca10594
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Wed Mar 24 18:24:12 2010 +0100

    document bytecode timeout

diff --git a/clamscan/clamscan.c b/clamscan/clamscan.c
index dbb7bf4..dfc9a3e 100644
--- a/clamscan/clamscan.c
+++ b/clamscan/clamscan.c
@@ -218,6 +218,7 @@ void help(void)
     mprintf("\n");
     mprintf("    --bytecode[=yes(*)/no]               Load bytecode from the database\n");
     mprintf("    --bytecode-trust-all[=yes/no(*)]     Trust all loaded bytecode\n");
+    mprintf("    --bytecode-timeout=N		      Set bytecode timeout (in milliseconds)\n");
     mprintf("    --detect-pua[=yes/no(*)]             Detect Possibly Unwanted Applications\n");
     mprintf("    --exclude-pua=CAT                    Skip PUA sigs of category CAT\n");
     mprintf("    --include-pua=CAT                    Load PUA sigs of category CAT\n");
diff --git a/docs/man/clamd.conf.5.in b/docs/man/clamd.conf.5.in
index 228225c..6a81be9 100644
--- a/docs/man/clamd.conf.5.in
+++ b/docs/man/clamd.conf.5.in
@@ -138,7 +138,7 @@ ReadTimeout.
 Default: 5
 .TP
 \fBSendBufTimeout NUMBER\fR
-This option specifies how long to wait (in miliseconds) if the send buffer is full.
+This option specifies how long to wait (in milliseconds) if the send buffer is full.
 Keep this value low to prevent clamd hanging.
 .br
 Default: 500
@@ -249,6 +249,11 @@ Set bytecode security level. Possible values: \fBNone\fR: no security at all, me
 .br 
 Default: TrustSigned
 .TP 
+\fBBytecodeTimeout NUMBER\fR
+Set bytecode timeout in milliseconds.
+.br
+Default: 60000
+.TP 
 \fBDetectPUA BOOL\fR
 Detect Possibly Unwanted Applications.
 .br 
diff --git a/docs/man/clamscan.1.in b/docs/man/clamscan.1.in
index 7aaab6d..a232b2d 100644
--- a/docs/man/clamscan.1.in
+++ b/docs/man/clamscan.1.in
@@ -84,6 +84,9 @@ With this option enabled ClamAV will load bytecode from the database. It is high
 \fB\-\-bytecode\-trust\-all[=yes/no(*)]\fR
 This option disables safety checks and makes ClamAV trust all bytecode. It should only be used for debugging.
 .TP 
+\fB\-\-bytecode\-timeout=N\fR
+Set bytecode timeout in milliseconds (default: 60000 = 60s)
+.TP 
 \fB\-\-detect\-pua[=yes/no(*)]\fR
 Detect Possibly Unwanted Applications.
 .TP 

-- 
Debian repository for ClamAV