diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-20 16:52:58 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-20 16:52:58 +0100 |
| commit | cacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1 (patch) | |
| tree | 1d242f4ad783a0b809ba442f0fc32a316818621d /doc | |
| parent | 2ee2cff538edd5e2b70a03fcef76e25b2072e432 (diff) | |
| parent | c6714bc496a2aaf356d8625784f10168d33859a3 (diff) | |
| download | rsyslog-cacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1.tar.gz rsyslog-cacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1.tar.xz rsyslog-cacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
plugins/imptcp/imptcp.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/imptcp.html | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/imptcp.html b/doc/imptcp.html index 386e691a..065efae6 100644 --- a/doc/imptcp.html +++ b/doc/imptcp.html @@ -43,6 +43,12 @@ very limited interest in fixing this issue. This directive <b>can not</b> fix th That would require much more code changes, which I was unable to do so far. Full details can be found at the <a href="http://www.rsyslog.com/Article321.phtml">Cisco tcp syslog anomaly</a> page. +<li><b>$InputPTCPSupportOctetCountedFraming</b> <<b>on</b>|off><br> +If set to "on", the legacy octed-counted framing (similar to RFC5425 framing) is +activated. This is the default and should be left unchanged until you know +very well what you do. It may be useful to turn it off, if you know this framing +is not used and some senders emit multi-line messages into the message stream. +</li> <li>$InputPTCPServerNotifyOnConnectionClose [on/<b>off</b>]<br> instructs imptcp to emit a message if the remote peer closes a connection.<br> <li><b>$InputPTCPServerKeepAlive</b> <on/<b>off</b>><br> |