diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-25 14:40:05 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-25 14:40:05 +0000 |
| commit | 20cece4da62126932c8f1639b32c02969449cd19 (patch) | |
| tree | 83f5a6d0eefd62f51cfa915829d833071da6f0af /include | |
| parent | fa10a3a24c66e71792810fc808f839f9ff168ea1 (diff) | |
| download | zabbix-20cece4da62126932c8f1639b32c02969449cd19.tar.gz zabbix-20cece4da62126932c8f1639b32c02969449cd19.tar.xz zabbix-20cece4da62126932c8f1639b32c02969449cd19.zip | |
- [ZBX-343] fixed possible hang of server trapper process (Alexei)
[svn merge -r5517:5519 svn://svn.zabbix.com/branches/1.4]
git-svn-id: svn://svn.zabbix.com/trunk@5520 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index d08fb5f6..5238b370 100644 --- a/include/common.h +++ b/include/common.h @@ -490,7 +490,7 @@ typedef enum #define AGENT_TIMEOUT 3 #define SENDER_TIMEOUT 60 -#define TRAPPER_TIMEOUT 5 +#define ZABBIX_TRAPPER_TIMEOUT 300 #define SNMPTRAPPER_TIMEOUT 5 #ifndef MAX |