Merge branch 'v5-stable' into v6-stable

Conflicts:
	ChangeLog

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2b057c30..1a7b147e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -665,6 +665,10 @@ expected that interfaces, even new ones, break during the initial
   syslog plain tcp input plugin (NOT supporting TLS!)
   [ported from v4]
 ---------------------------------------------------------------------------
+Version 5.10.2  [V5-STABLE], 201?-??-??
+- bugfix: spurios error messages from imuxsock about (non-error) EAGAIN
+  Thanks to Marius Tomaschwesky for the patch.
+---------------------------------------------------------------------------
 Version 5.10.1  [V5-STABLE], 2012-10-17
 - bugfix: imuxsock and imklog truncated head of received message
   This happened only under some circumstances. Thanks to Marius
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 1cb367b0..79c6b734 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -1084,7 +1084,7 @@ static rsRetVal readSocket(lstn_t *pLstn)
 			}
 		}
 		CHKiRet(SubmitMsg(pRcv, iRcvd, pLstn, cred, ts));
-	} else if(iRcvd < 0 && errno != EINTR) {
+	} else if(iRcvd < 0 && errno != EINTR && errno != EAGAIN) {
 		char errStr[1024];
 		rs_strerror_r(errno, errStr, sizeof(errStr));
 		DBGPRINTF("UNIX socket error: %d = %s.\n", errno, errStr);