Merged revisions 52688 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Mon, 29 Jan 2007 22:57:16 +0000 (22:57 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 29 Jan 2007 22:57:16 +0000 (22:57 +0000)
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

main/manager.c

index 18ba45a..b84cd9b 100644 (file)
@@ -2235,10 +2235,8 @@ static void *session_do(void *data)
        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;