diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-20 14:07:13 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-20 14:07:13 +0000 |
| commit | 6c4aa3ad65293af3c7e1d61ecb6f20fb12910f1d (patch) | |
| tree | 01005536978250aa10f5a72b96c919162630c264 /main | |
| parent | 83e824a7e5c6d992b4e4adbfb21d706b63ad16ce (diff) | |
Merged revisions 189278 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r189278 | mmichelson | 2009-04-20 09:05:27 -0500 (Mon, 20 Apr 2009) | 18 lines
Merged revisions 189277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r189277 | mmichelson | 2009-04-20 09:04:41 -0500 (Mon, 20 Apr 2009) | 12 lines
Move the check for chan->fdno == -1 to after the zombie/hangup check.
Many users were finding that their hung up channels were staying up and
causing 100% CPU usage.
(issue #14723)
Reported by: seadweller
Patches:
14723_1-4-tip.patch uploaded by mmichelson (license 60)
Tested by: falves11, bamby
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@189281 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/channel.c b/main/channel.c index 1df51e8ee..8fa01ffb5 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2548,6 +2548,13 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) goto done; } + /* Stop if we're a zombie or need a soft hangup */ + if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) { + if (chan->generator) + ast_deactivate_generator(chan); + goto done; + } + if (chan->fdno == -1) { #ifdef AST_DEVMODE ast_log(LOG_ERROR, "ast_read() called with no recorded file descriptor.\n"); @@ -2557,13 +2564,6 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) f = &ast_null_frame; goto done; } - - /* Stop if we're a zombie or need a soft hangup */ - if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) { - if (chan->generator) - ast_deactivate_generator(chan); - goto done; - } prestate = chan->_state; /* Read and ignore anything on the alertpipe, but read only |