summaryrefslogtreecommitdiffstats
path: root/doc/imptcp.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-04-07 15:42:46 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-04-07 15:42:46 +0200
commitd6da57ae0370aeb705f63fd04e575b5ed4684618 (patch)
treed451907714559f5df60eb0cdef6ccbc205c812e4 /doc/imptcp.html
parentd8ce489bae3ae072a2ee605cd90fa0530c9f3446 (diff)
parentbd8d972a975ce794dd71c1c8db724991dd4744a0 (diff)
downloadrsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.gz
rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.xz
rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.zip
Merge branch 'v5-stable-newstats'
Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
Diffstat (limited to 'doc/imptcp.html')
-rw-r--r--doc/imptcp.html6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/imptcp.html b/doc/imptcp.html
index a4f43249..4307c603 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> &lt;<b>on</b>|off&gt;<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> &lt;on/<b>off</b>&gt;<br>