[svn-commits] rizzo: trunk r48078 - /trunk/main/manager.c

[svn-commits at lists.digium.com]

Author: rizzo
Date: Tue Nov 28 03:39:16 2006
New Revision: 48078

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48078
Log:
another normalization of AMI vs HTTP identification.
Should really define a macro IS_AMI(s) so it is clear what
we want to do.


Modified:
    trunk/main/manager.c

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=48078&r1=48077&r2=48078
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Tue Nov 28 03:39:16 2006
@@ -1149,7 +1149,7 @@
 		ast_mutex_unlock(&s->__lock);
 		if (needexit)
 			break;
-		if (!s->inuse && s->fd > 0) {	/* AMI session */
+		if (s->managerid == 0) {	/* AMI session */
 			if (ast_wait_for_input(s->fd, 1000))
 				break;
 		} else {	/* HTTP session */