[asterisk-commits] file: trunk r50603 - in /trunk: ./ main/manager.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Jan 12 10:47:20 2007
New Revision: 50603

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50603
Log:
Merged revisions 50602 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r50602 | file | 2007-01-12 11:42:33 -0500 (Fri, 12 Jan 2007) | 2 lines

We need to check for res being 0 in do_message itself, otherwise our headers will get lost.

........

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=50603&r1=50602&r2=50603
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Fri Jan 12 10:47:20 2007
@@ -2136,7 +2136,9 @@
 
 	for (;;) {
 		res = get_input(s, header_buf);
-		if (res > 0) {
+		if (res == 0) {
+			continue;
+		} else if (res > 0) {
 			/* Strip trailing \r\n */
 			if (strlen(header_buf) < 2)
 				continue;
@@ -2198,10 +2200,8 @@
 	ast_mutex_unlock(&s->__lock);
 	for (;;) {
 		res = do_message(s);
-		
-		if (res == 0) {
-			continue;
-		} else if (process_events(s))
+
+		if (process_events(s))
 			break;
 	}
 	/* session is over, explain why and terminate */