aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-10 14:23:35 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-10 14:23:35 +0000
commitc8ee043b498a1f0d99f97a25934697c154ddb295 (patch)
tree6abeb99120b9bcb9ef2a9ee82b129e388463dce5
parentbebfb7c8bb1626acbcff40f71a49ec847da8e59b (diff)
Merge 269635 and update ChangeLog.v1.4.33-rc2
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.4.33-rc2@269746 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--ChangeLog13
-rw-r--r--main/asterisk.c4
-rw-r--r--main/logger.c1
3 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 017c98cdb..b0b3d3411 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.4.33-rc2 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 0e1306fd8..db8271735 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -767,6 +767,7 @@ static void _null_sig_handler(int signal)
static struct sigaction null_sig_handler = {
.sa_handler = _null_sig_handler,
+ .sa_flags = SA_RESTART,
};
AST_MUTEX_DEFINE_STATIC(safe_system_lock);
@@ -1166,6 +1167,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)
@@ -1185,6 +1187,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)
@@ -1203,6 +1206,7 @@ static void _child_handler(int sig)
static struct sigaction child_handler = {
.sa_handler = _child_handler,
+ .sa_flags = SA_RESTART,
};
/*! \brief Set an X-term or screen title */
diff --git a/main/logger.c b/main/logger.c
index a0beca1cd..fefc03858 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -581,6 +581,7 @@ static void _handle_SIGXFSZ(int sig)
static struct sigaction handle_SIGXFSZ = {
.sa_handler = _handle_SIGXFSZ,
+ .sa_flags = SA_RESTART,
};
int init_logger(void)