kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 52688 via svnmerge from

Browse Source 
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.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52692 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-01-29 22:57:16 +00:00
parent a3ce6f5f8c
commit 9e1370e6c6
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/manager.c
View File

@@ -2235,10 +2235,8 @@ static void *session_do(void *data)
AST_LIST_UNLOCK(&sessions); AST_LIST_UNLOCK(&sessions);
/* Hook to the tail of the event queue */ /* Hook to the tail of the event queue */
s->last_ev = grab_last(); s->last_ev = grab_last();
ast_mutex_lock(&s->__lock);
s->f = ser->f; s->f = ser->f;
astman_append(s, "Asterisk Call Manager/1.0\r\n"); /* welcome prompt */ astman_append(s, "Asterisk Call Manager/1.0\r\n"); /* welcome prompt */
ast_mutex_unlock(&s->__lock);
for (;;) { for (;;) {
if ((res = do_message(s)) < 0) if ((res = do_message(s)) < 0)
break; break;