[Asterisk-cvs] asterisk/res res_agi.c,1.10.2.8,1.10.2.9

russell russell
Mon Aug 22 01:45:28 CDT 2005


Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv4161/res

Modified Files:
      Tag: v1-0
	res_agi.c 
Log Message:
revert SIGHUP patch to restore original behavior for 1.0 (bug #4854)


Index: res_agi.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_agi.c,v
retrieving revision 1.10.2.8
retrieving revision 1.10.2.9
diff -u -d -r1.10.2.8 -r1.10.2.9
--- res_agi.c	4 Aug 2005 22:52:15 -0000	1.10.2.8
+++ res_agi.c	22 Aug 2005 05:47:37 -0000	1.10.2.9
@@ -203,7 +203,6 @@
 	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 @@
 			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 @@
 		}
 	}
 	/* 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;
 }




More information about the svn-commits mailing list