Merge branch 'beta'

Conflicts:
	ChangeLog

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7de2ae91..085d462a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 ---------------------------------------------------------------------------
 Version 5.5.2  [DEVEL] (rgerhards), 2009-11-??
 - extended testbench
+- bugfix: hostname accidently set to IP address for some message sources,
+  for example imudp. Thanks to Anton for reporting this bug. [imported v4]
 - bugfix: $CreateDirs variable not properly initialized, default thus
   was random (but most often "on") [imported from v3]
 ---------------------------------------------------------------------------
@@ -339,6 +341,10 @@ 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: hostname accidently set to IP address for some message sources,
+  for example imudp. Thanks to Anton for reporting this bug.
 - bugfix [imported from 4.4.3]: $ActionExecOnlyOnceEveryInterval did
   not work.
 ---------------------------------------------------------------------------
diff --git a/runtime/msg.c b/runtime/msg.c
index 0597ea84..755f78cb 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -1999,7 +1999,7 @@ rsRetVal MsgSetRcvFromIPStr(msg_t *pThis, uchar *psz, int len, prop_t **ppProp)
 	assert(pThis != NULL);
 
 	CHKiRet(prop.CreateOrReuseStringProp(ppProp, psz, len));
-	MsgSetRcvFrom(pThis, *ppProp);
+	MsgSetRcvFromIP(pThis, *ppProp);
 
 finalize_it:
 	RETiRet;