[asterisk-commits] tilghman: branch 1.6.0 r116468 - in /branches/1.6.0: ./ res/res_agi.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed May 14 16:39:47 2008
New Revision: 116468

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116468
Log:
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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_agi.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_agi.c?view=diff&rev=116468&r1=116467&r2=116468
==============================================================================
--- branches/1.6.0/res/res_agi.c (original)
+++ branches/1.6.0/res/res_agi.c Wed May 14 16:39:47 2008
@@ -2699,9 +2699,13 @@
 	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;