[svn-commits] tilghman: trunk r269636 - in /trunk: ./ main/ utils/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jun 10 03:15:45 2010
New Revision: 269636

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=269636
Log:
Merged revisions 269635 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r269635 | tilghman | 2010-06-10 02:52:34 -0500 (Thu, 10 Jun 2010) | 9 lines
  
  Ensure signals are not blocked inside other signal handlers.
  
  This eliminates the annoying <beep> on the console.
  
  (closes issue #17477)
   Reported by: jvandal
   Patches: 
         20100610__issue17477.diff.txt uploaded by tilghman (license 14)
........

Modified:
    trunk/   (props changed)
    trunk/main/asterisk.c
    trunk/main/logger.c
    trunk/utils/extconf.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/asterisk.c?view=diff&rev=269636&r1=269635&r2=269636
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Thu Jun 10 03:15:45 2010
@@ -981,6 +981,7 @@
 
 static struct sigaction null_sig_handler = {
 	.sa_handler = _null_sig_handler,
+	.sa_flags = SA_RESTART,
 };
 
 static struct sigaction ignore_sig_handler = {
@@ -1458,6 +1459,7 @@
 
 static struct sigaction urg_handler = {
 	.sa_handler = _urg_handler,
+	.sa_flags = SA_RESTART,
 };
 
 static void _hup_handler(int num)
@@ -1477,6 +1479,7 @@
 
 static struct sigaction hup_handler = {
 	.sa_handler = _hup_handler,
+	.sa_flags = SA_RESTART,
 };
 
 static void _child_handler(int sig)
@@ -1495,6 +1498,7 @@
 
 static struct sigaction child_handler = {
 	.sa_handler = _child_handler,
+	.sa_flags = SA_RESTART,
 };
 
 /*! \brief Set maximum open files */

Modified: trunk/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/logger.c?view=diff&rev=269636&r1=269635&r2=269636
==============================================================================
--- trunk/main/logger.c (original)
+++ trunk/main/logger.c Thu Jun 10 03:15:45 2010
@@ -764,6 +764,7 @@
 
 static struct sigaction handle_SIGXFSZ = {
 	.sa_handler = _handle_SIGXFSZ,
+	.sa_flags = SA_RESTART,
 };
 
 static void ast_log_vsyslog(struct logmsg *msg)

Modified: trunk/utils/extconf.c
URL: http://svnview.digium.com/svn/asterisk/trunk/utils/extconf.c?view=diff&rev=269636&r1=269635&r2=269636
==============================================================================
--- trunk/utils/extconf.c (original)
+++ trunk/utils/extconf.c Thu Jun 10 03:15:45 2010
@@ -1269,6 +1269,7 @@
 
 static struct sigaction null_sig_handler = {
 	.sa_handler = _null_sig_handler,
+	.sa_flags = SA_RESTART,
 };
 
 void ast_replace_sigchld(void);