diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-13 11:02:38 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-13 11:02:38 +0200 |
| commit | 410efcb5a4539437ab451b71300b75dc14c327bb (patch) | |
| tree | 750f6e8cb1a9dcb376fee849575f67ef696d738d | |
| parent | 53e99a6cffd5f0926af0cf38d4b21ced7eca2db8 (diff) | |
| parent | 0ffbe44d44aa25134a8cc462ed0406e87f02b783 (diff) | |
| download | rsyslog-410efcb5a4539437ab451b71300b75dc14c327bb.tar.gz rsyslog-410efcb5a4539437ab451b71300b75dc14c327bb.tar.bz2 rsyslog-410efcb5a4539437ab451b71300b75dc14c327bb.zip | |
Merge branch 'master' into nextmaster
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/omrelp/omrelp.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -5,6 +5,8 @@ Version 7.5.0 [devel] 2013-0?-?? Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- Version 7.3.15 [beta] 2013-05-0? +- bugfix: omrelp legacy config parameters set a timeout of zero + which lead the legacy config to be unusable. - bugfix: segfault on startup if a disk queue was configure without file name Now this triggers an error message and the queue is changed to diff --git a/plugins/omrelp/omrelp.c b/plugins/omrelp/omrelp.c index f2fc87e0..16e2e3ed 100644 --- a/plugins/omrelp/omrelp.c +++ b/plugins/omrelp/omrelp.c @@ -121,6 +121,7 @@ finalize_it: BEGINcreateInstance CODESTARTcreateInstance pData->bInitialConnect = 1; + pData->timeout = 90; ENDcreateInstance BEGINfreeInstance |