[asterisk-commits] russell: trunk r52692 - in /trunk: ./ main/manager.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Jan 29 16:57:16 2007
New Revision: 52692

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

........
r52688 | russell | 2007-01-29 16:55:41 -0600 (Mon, 29 Jan 2007) | 3 lines

Remove a recursive lock of the manager session.  This was pointed out by 
zandbelt in issue #8711.

........

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=52692&r1=52691&r2=52692
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Mon Jan 29 16:57:16 2007
@@ -2235,10 +2235,8 @@
 	AST_LIST_UNLOCK(&sessions);
 	/* Hook to the tail of the event queue */
 	s->last_ev = grab_last();
-	ast_mutex_lock(&s->__lock);
 	s->f = ser->f;
 	astman_append(s, "Asterisk Call Manager/1.0\r\n");	/* welcome prompt */
-	ast_mutex_unlock(&s->__lock);
 	for (;;) {
 		if ((res = do_message(s)) < 0)
 			break;