From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 10 Jun 2010 08:16:44 +0000 (+0000)
Subject: Merged revisions 269636 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edd521cfe25f72f476cf2fc96961f1d97503b143;p=thirdparty%2Fasterisk.git

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 restartable system calls can restart (BSD signal semantics)

    This eliminates the annoying <beep> on the console.

    (closes issue #17477)
     Reported by: jvandal
     Patches:
           20100610__issue17477.diff.txt uploaded by tilghman (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@269637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/asterisk.c b/main/asterisk.c
index 0d71c2a058..dba1a7224a 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 bf874811cd..6425183b3e 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -838,6 +838,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 2b3a5c65de..572d56113d 100644
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -1269,6 +1269,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);