diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-19 18:10:20 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-19 18:10:20 +0100 |
commit | 2ee2cff538edd5e2b70a03fcef76e25b2072e432 (patch) | |
tree | 43724318361efc2ebb6cbe037295e09d4796a815 /doc | |
parent | 1d0dec9b0cf1203dec0cacc0c6eb38d2ac9271ea (diff) | |
parent | 4fb7ba113c4d4afd485feb2729c5ff67bc8ddd4a (diff) | |
download | rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.tar.gz rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.tar.xz rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.zip |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
plugins/imtcp/imtcp.c
tcpsrv.h
Diffstat (limited to 'doc')
-rw-r--r-- | doc/imtcp.html | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/imtcp.html b/doc/imtcp.html index 7653f601..649b08f8 100644 --- a/doc/imtcp.html +++ b/doc/imtcp.html @@ -86,6 +86,12 @@ listener. <id-string> semantics depend on the currently selected AuthMode and <a href="netstream.html">network stream driver</a>. PermittedPeers may not be set in anonymous modes.</li> <li><b>$InputTCPServerBindRuleset</b> <ruleset><br> Binds the listener to a specific <a href="multi_ruleset.html">ruleset</a>.</li> +<li><b>$InputTCPSupportOctetCountedFraming</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> </ul> <b>Caveats/Known Bugs:</b> <ul> |