aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-10 14:25:16 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-10 14:25:16 +0000
commita57f91f07b4eeb54e012ce4c6235d116df79607a (patch)
treed01e0f8040237112bfa3e3eb28bd433dfff9a155
parent673329fd18878ab1c8ecb45ff479e22c7862c312 (diff)
Merge changes in 269637 and update ChangeLog.v1.6.2.9-rc3
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.2.9-rc3@269747 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--ChangeLog13
-rw-r--r--main/asterisk.c4
-rw-r--r--main/logger.c1
-rw-r--r--utils/extconf.c1
4 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index da330f68f..35a7b0c38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,18 @@
-2010-06-09 Leif Madsen <lmadsen@digium.com>
+2010-06-10 Leif Madsen <lmadsen@digium.com>
* Asterisk 1.6.2.9-rc3 Released.
+2010-06-10 Tilghman Lesher <tlesher@digium.com>
+
+ * Ensure signals are not blocked inside other signal handlers.
+
+ This eliminates the annoying <beep> on the console.
+
+ (closes issue 0017477)
+ Reported by: jvandal
+ Patches:
+ 20100610__issue17477.diff.txt uploaded by tilghman (license 14
+
2010-06-09 Paul Belanger <paul.belanger@polybeacon.com>
* Fix Debian init script to not use -c.
diff --git a/main/asterisk.c b/main/asterisk.c
index 0d71c2a05..dba1a7224 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -972,6 +972,7 @@ static void _null_sig_handler(int sig)
static struct sigaction null_sig_handler = {
.sa_handler = _null_sig_handler,
+ .sa_flags = SA_RESTART,
};
static struct sigaction ignore_sig_handler = {
@@ -1449,6 +1450,7 @@ static void _urg_handler(int num)
static struct sigaction urg_handler = {
.sa_handler = _urg_handler,
+ .sa_flags = SA_RESTART,
};
static void _hup_handler(int num)
@@ -1468,6 +1470,7 @@ static void _hup_handler(int num)
static struct sigaction hup_handler = {
.sa_handler = _hup_handler,
+ .sa_flags = SA_RESTART,
};
static void _child_handler(int sig)
@@ -1486,6 +1489,7 @@ static void _child_handler(int sig)
static struct sigaction child_handler = {
.sa_handler = _child_handler,
+ .sa_flags = SA_RESTART,
};
/*! \brief Set maximum open files */
diff --git a/main/logger.c b/main/logger.c
index 2d81b1604..c62e68008 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -835,6 +835,7 @@ static void _handle_SIGXFSZ(int sig)
static struct sigaction handle_SIGXFSZ = {
.sa_handler = _handle_SIGXFSZ,
+ .sa_flags = SA_RESTART,
};
static void ast_log_vsyslog(int level, const char *file, int line, const char *function, char *str, long pid)
diff --git a/utils/extconf.c b/utils/extconf.c
index fc6e2388d..e33170430 100644
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -1268,6 +1268,7 @@ static void _null_sig_handler(int sig)
static struct sigaction null_sig_handler = {
.sa_handler = _null_sig_handler,
+ .sa_flags = SA_RESTART,
};
void ast_replace_sigchld(void);