Merge branch 'v5-stable' into v6-stable

Conflicts:
	ChangeLog
	action.c
	configure.ac
	doc/manual.html
	runtime/ruleset.c
	template.h
	threads.c
	tools/syslogd.c

1 files changed, 1 insertions, 1 deletions

diff --git a/threads.c b/threads.c
index 16de5631..aea5de9f 100644
--- a/threads.c
+++ b/threads.c
@@ -102,7 +102,7 @@ thrdTerminateNonCancel(thrdInfo_t *pThis)
 
 	DBGPRINTF("request term via SIGTTIN for input thread '%s' 0x%x\n",
 		  pThis->name, (unsigned) pThis->thrdID);
-	pThis->bShallStop = TRUE;
+	pThis->bShallStop = RSTRUE;
 	do {
 		d_pthread_mutex_lock(&pThis->mutThrd);
 		pthread_kill(pThis->thrdID, SIGTTIN);