kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 08:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #191 in FS/freeswitch from bugfix/FS-7250-channels-got-stuck-inside-freeswitch to master

Browse Source 
* commit 'f4a6e6e363b071ed21fc941f90b46900a74b86d0':
  Remove the FreeSWITCH core handler for SIG_CHLD.
This commit is contained in:
Mike Jerris 2015-02-18 12:17:06 -06:00
commit 35848c839e
2 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/switch.c
View File

@ -90,24 +90,6 @@ static void handle_SIGILL(int sig)
return;
}
#ifndef WIN32
static void handle_SIGCHLD(int sig)
{
int status = 0;
int pid = 0;
if (sig) {};
pid = wait(&status);
if (pid > 0) {
system_ready = -1;
}
return;
}
#endif
/* kill a freeswitch process running in background mode */
static int freeswitch_kill_background()
{
@ -1088,8 +1070,6 @@ int main(int argc, char *argv[])
fprintf(stderr, "System Error!\n");
exit(-1);
}
signal(SIGCHLD, handle_SIGCHLD);
}
#endif

17
src/switch_core.c
View File

@ -1813,16 +1813,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
}
#ifndef WIN32
static void handle_SIGCHLD(int sig)
{
int status = 0;
wait(&status);
return;
}
#endif
#ifdef TRAP_BUS
static void handle_SIGBUS(int sig)
{
@ -2311,13 +2301,6 @@ SWITCH_DECLARE(void) switch_core_set_signal_handlers(void)
{
/* set signal handlers */
signal(SIGINT, SIG_IGN);
#ifndef WIN32
if (switch_test_flag((&runtime), SCF_THREADED_SYSTEM_EXEC)) {
signal(SIGCHLD, SIG_DFL);
} else {
signal(SIGCHLD, handle_SIGCHLD);
}
#endif
#ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN);
#endif