summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-08-07 10:36:54 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-08-07 10:36:54 +0200
commit0a7f964436af73f2e7fbd403b563f8d5a743f4a5 (patch)
treea05e8e7617a8ccc43bc32fdefa0709e72675e38c
parent97829d034dfaa9d05b8d8c5646b9884de0382bb6 (diff)
parent66300192944fe2c4390e53549ed51b4b25e79524 (diff)
downloadrsyslog-0a7f964436af73f2e7fbd403b563f8d5a743f4a5.tar.gz
rsyslog-0a7f964436af73f2e7fbd403b563f8d5a743f4a5.tar.xz
rsyslog-0a7f964436af73f2e7fbd403b563f8d5a743f4a5.zip
Merge branch 'beta'
Conflicts: doc/rsyslog_conf.html
-rw-r--r--ChangeLog6
-rw-r--r--doc/rsyslog_conf.html2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8aaba62d..d51368c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -199,6 +199,7 @@ Version 3.19.0 (rgerhards), 2008-05-06
- -c option no longer must be the first option - thanks to varmjofekoj
for the patch
Version 3.18.2 (rgerhards), 2008-07-??
+- merged in IPv6 forwarding address bugfix from v2-stable
---------------------------------------------------------------------------
Version 3.18.1 (rgerhards), 2008-07-21
- bugfix: potential segfault in creating message mutex in non-direct queue
@@ -800,6 +801,11 @@ Version 3.10.0 (rgerhards), 2008-01-07
- much cleaner code due to new objects and removal of single-threading
mode
---------------------------------------------------------------------------
+Version 2.0.6 V2-STABLE (rgerhards), 2008-08-07
+- bugfix: IPv6 addresses could not be specified in forwarding actions
+ New syntax @[addr]:port introduced to enable that. Root problem was IPv6
+ addresses contain colons. (backport from 3.21.3)
+---------------------------------------------------------------------------
Version 2.0.5 STABLE (rgerhards), 2008-05-15
- bugfix: regular expressions inside property replacer did not work
properly
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html
index d3858941..d2dfaaaf 100644
--- a/doc/rsyslog_conf.html
+++ b/doc/rsyslog_conf.html
@@ -873,7 +873,7 @@ machine 192.168.0.1, the destination port defaults to 514. Messages
will not be compressed.</p>
<p>Note that IPv6 addresses contain colons. So if an IPv6 address is specified
in the hostname part, rsyslogd could not detect where the IP address ends
-and where the port starts. Since rsyslog 3.21.3 there is a syntax extension to support this:
+and where the port starts. There is a syntax extension to support this:
put squary brackets around the address (e.g. "[2001::1]"). Square
brackets also work with real host names and IPv4 addresses, too.
<p>A valid sample to send messages to the IPv6 host 2001::1 at port 515