diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-10 08:16:44 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-10 08:16:44 +0000 |
| commit | 309f58262550a3219fac3fd94eb495226bbcdb80 (patch) | |
| tree | f81200baf047976a6cb20f8be981bf31c465b458 | |
| parent | 206ccd08dcd53713cf5fb2484a7edbc9336d3e83 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@269637 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/asterisk.c | 4 | ||||
| -rw-r--r-- | main/logger.c | 1 | ||||
| -rw-r--r-- | utils/extconf.c | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 0d71c2a05..dba1a7224 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 bf874811c..6425183b3 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 2b3a5c65d..572d56113 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); |