diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-25 16:36:33 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-25 16:36:33 +0100 |
| commit | 9ec956b4b46d06d0bb08cbb0b14e15c133fe54ff (patch) | |
| tree | aabc16c975d27c8ff452eb3940415fec25b0bec3 | |
| parent | 5b55ab75e27861241981ae447ed3d1b8ad968deb (diff) | |
| parent | 3056c15ef4d1d7b73a9591347cf0cef76c020792 (diff) | |
| download | rsyslog-9ec956b4b46d06d0bb08cbb0b14e15c133fe54ff.tar.gz rsyslog-9ec956b4b46d06d0bb08cbb0b14e15c133fe54ff.tar.xz rsyslog-9ec956b4b46d06d0bb08cbb0b14e15c133fe54ff.zip | |
Merge branch 'v4-beta' into v4-devel
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | runtime/nsd_gtls.c | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -23,6 +23,8 @@ Version 4.5.7 [v4-beta] (rgerhards), 2009-11-18 be generated only after the process has started, but not right from the beginning. This is assumed to be useful for hard-to-find bugs. Also improved the doc on the debug system. +- bugfix (kind of): check if TCP connection is still alive if using TLS + Thanks to Jonathan Bond-Caron for the patch. - bugfix [imported from 4.4.3]: $ActionExecOnlyOnceEveryInterval did not work. --------------------------------------------------------------------------- diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index 79ceffb3..fb2e219d 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -1325,7 +1325,10 @@ finalize_it: static void CheckConnection(nsd_t __attribute__((unused)) *pNsd) { - /* dummy, do nothing */ + nsd_gtls_t *pThis = (nsd_gtls_t*) pNsd; + ISOBJ_TYPE_assert(pThis, nsd_gtls); + + nsd_ptcp.CheckConnection(pThis->pTcp); } |