[asterisk-commits] lmadsen: tag 1.4.33-rc2 r269746 - in /tags/1.4.33-rc2: ./ main/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Thu Jun 10 09:23:35 2010
New Revision: 269746

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=269746
Log:
Merge 269635 and update ChangeLog.

Modified:
    tags/1.4.33-rc2/ChangeLog
    tags/1.4.33-rc2/main/asterisk.c
    tags/1.4.33-rc2/main/logger.c

Modified: tags/1.4.33-rc2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.4.33-rc2/ChangeLog?view=diff&rev=269746&r1=269745&r2=269746
==============================================================================
--- tags/1.4.33-rc2/ChangeLog (original)
+++ tags/1.4.33-rc2/ChangeLog Thu Jun 10 09:23:35 2010
@@ -1,6 +1,17 @@
-2010-06-09  Leif Madsen <lmadsen at digium.com>
+2010-06-10  Leif Madsen <lmadsen at digium.com>
 
 	* Asterisk 1.4.33-rc2 Released.
+
+2010-06-10  Tilghman Lesher <tlesher at 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 at polybeacon.com>
 

Modified: tags/1.4.33-rc2/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.4.33-rc2/main/asterisk.c?view=diff&rev=269746&r1=269745&r2=269746
==============================================================================
--- tags/1.4.33-rc2/main/asterisk.c (original)
+++ tags/1.4.33-rc2/main/asterisk.c Thu Jun 10 09:23:35 2010
@@ -767,6 +767,7 @@
 
 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 struct sigaction urg_handler = {
 	.sa_handler = _urg_handler,
+	.sa_flags = SA_RESTART,
 };
 
 static void _hup_handler(int num)
@@ -1185,6 +1187,7 @@
 
 static struct sigaction hup_handler = {
 	.sa_handler = _hup_handler,
+	.sa_flags = SA_RESTART,
 };
 
 static void _child_handler(int sig)
@@ -1203,6 +1206,7 @@
 
 static struct sigaction child_handler = {
 	.sa_handler = _child_handler,
+	.sa_flags = SA_RESTART,
 };
 
 /*! \brief Set an X-term or screen title */

Modified: tags/1.4.33-rc2/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.4.33-rc2/main/logger.c?view=diff&rev=269746&r1=269745&r2=269746
==============================================================================
--- tags/1.4.33-rc2/main/logger.c (original)
+++ tags/1.4.33-rc2/main/logger.c Thu Jun 10 09:23:35 2010
@@ -581,6 +581,7 @@
 
 static struct sigaction handle_SIGXFSZ = {
 	.sa_handler = _handle_SIGXFSZ,
+	.sa_flags = SA_RESTART,
 };
 
 int init_logger(void)