diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-14 21:39:47 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-14 21:39:47 +0000 |
commit | 01a8e6db758145b73234ff8ab26cfd6db20551a0 (patch) | |
tree | f5455fc5c7563ac7d54a4bd488790d464bf34128 /res | |
parent | 5a5be6be3cf70e489146e7abb6ed8f0599e63e6e (diff) |
Merged revisions 116467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r116467 | tilghman | 2008-05-14 16:39:06 -0500 (Wed, 14 May 2008) | 15 lines
Merged revisions 116466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116466 | tilghman | 2008-05-14 16:38:09 -0500 (Wed, 14 May 2008) | 7 lines
Avoid zombies when the channel exits before the AGI.
(closes issue #12648)
Reported by: gkloepfer
Patches:
20080514__bug12648.diff.txt uploaded by Corydon76 (license 14)
Tested by: gkloepfer
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@116468 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/res_agi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index cd3bc2a2e..ffc82cea8 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -2699,9 +2699,13 @@ static enum agi_result run_agi(struct ast_channel *chan, char *request, AGI *agi if (pid > -1) { const char *sighup = pbx_builtin_getvar_helper(chan, "AGISIGHUP"); if (ast_strlen_zero(sighup) || !ast_false(sighup)) { - if (kill(pid, SIGHUP)) + if (kill(pid, SIGHUP)) { ast_log(LOG_WARNING, "unable to send SIGHUP to AGI process %d: %s\n", pid, strerror(errno)); + } else { /* Give the process a chance to die */ + usleep(1); + } } + waitpid(pid, status, WNOHANG); } fclose(readf); return returnstatus; |