[svn-commits] tilghman: branch 1.6.2 r269637 - in /branches/1.6.2: ./ main/ utils/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jun 10 03:16:44 2010
New Revision: 269637

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

................
  r269636 | tilghman | 2010-06-10 03:15:45 -0500 (Thu, 10 Jun 2010) | 16 lines
  
  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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/asterisk.c
    branches/1.6.2/main/logger.c
    branches/1.6.2/utils/extconf.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/asterisk.c?view=diff&rev=269637&r1=269636&r2=269637
==============================================================================
--- branches/1.6.2/main/asterisk.c (original)
+++ branches/1.6.2/main/asterisk.c Thu Jun 10 03:16:44 2010
@@ -972,6 +972,7 @@
 
 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 struct sigaction urg_handler = {
 	.sa_handler = _urg_handler,
+	.sa_flags = SA_RESTART,
 };
 
 static void _hup_handler(int num)
@@ -1468,6 +1470,7 @@
 
 static struct sigaction hup_handler = {
 	.sa_handler = _hup_handler,
+	.sa_flags = SA_RESTART,
 };
 
 static void _child_handler(int sig)
@@ -1486,6 +1489,7 @@
 
 static struct sigaction child_handler = {
 	.sa_handler = _child_handler,
+	.sa_flags = SA_RESTART,
 };
 
 /*! \brief Set maximum open files */

Modified: branches/1.6.2/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/logger.c?view=diff&rev=269637&r1=269636&r2=269637
==============================================================================
--- branches/1.6.2/main/logger.c (original)
+++ branches/1.6.2/main/logger.c Thu Jun 10 03:16:44 2010
@@ -838,6 +838,7 @@
 
 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)

Modified: branches/1.6.2/utils/extconf.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/utils/extconf.c?view=diff&rev=269637&r1=269636&r2=269637
==============================================================================
--- branches/1.6.2/utils/extconf.c (original)
+++ branches/1.6.2/utils/extconf.c Thu Jun 10 03:16:44 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);