From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 22 Aug 2005 05:47:37 +0000 (+0000)
Subject: revert SIGHUP patch to restore original behavior for 1.0 (bug #4854)
X-Git-Tag: 1.0.11.1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=312008513e7a1b62e216648b6b49c1f44f3bc589;p=thirdparty%2Fasterisk.git

revert SIGHUP patch to restore original behavior for 1.0 (bug #4854)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@6347 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_agi.c b/res/res_agi.c
index 819470b133..830a11278d 100755
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -203,7 +203,6 @@ static int launch_script(char *script, char *argv[], int *fds, int *efd, int *op
 	int audio[2];
 	int x;
 	int res;
-	sigset_t signal_set;
 	
 	if (!strncasecmp(script, "agi://", 6))
 		return launch_netscript(script, argv, fds, efd, opid);
@@ -260,12 +259,6 @@ static int launch_script(char *script, char *argv[], int *fds, int *efd, int *op
 			close(STDERR_FILENO + 1);
 		}
 		
-		/* unblock important signal handlers */
-		if (sigfillset(&signal_set) || pthread_sigmask(SIG_UNBLOCK, &signal_set, NULL)) {
-			ast_log(LOG_WARNING, "unable to unblock signals for AGI script: %s\n", strerror(errno));
-			exit(1);
-		}
-
 		/* Close everything but stdin/out/error */
 		for (x=STDERR_FILENO + 2;x<1024;x++) 
 			close(x);
@@ -1551,10 +1544,8 @@ static int run_agi(struct ast_channel *chan, char *request, AGI *agi, int pid, i
 		}
 	}
 	/* Notify process */
-	if (pid > -1) {
-		if (kill(pid, SIGHUP))
-			ast_log(LOG_WARNING, "unable to send SIGHUP to AGI process %d: %s\n", pid, strerror(errno));
-	}
+	if (pid > -1)
+		kill(pid, SIGHUP);
 	fclose(readf);
 	return returnstatus;
 }