diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-08-22 05:47:37 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-08-22 05:47:37 +0000 |
commit | c4dc10e395960c2f623694cdb8a589b70fdac6c0 (patch) | |
tree | 8ebd8bf71f712e90afa4dec538907ba56641635c | |
parent | dc837d9b4358fa1512181e68f7a9e62491fe5182 (diff) |
revert SIGHUP patch to restore original behavior for 1.0 (bug #4854)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/v1-0@6347 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | res/res_agi.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index 819470b13..830a11278 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; } |