Commit a408ba6
build: don't squash signal handlers with --shared
An application using node built as a shared library may legitimately
implement its own signal handling routines. Current behaviour is
to squash all signal handlers on node startup. This change will
stop that behaviour when node is built as a shared library.
PR-URL: #10539
Fixes: #10520
Refs: #615
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>1 parent 4e7a31b commit a408ba6
1 file changed
Lines changed: 3 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2198,7 +2198,7 @@ static void WaitForInspectorDisconnect(Environment* env) { | |||
| 2198 | 2198 | if (env->inspector_agent()->IsConnected()) { | |
| 2199 | 2199 | // Restore signal dispositions, the app is done and is no longer | |
| 2200 | 2200 | // capable of handling signals. | |
| 2201 | - #ifdef __POSIX__ | ||
| 2201 | + #if defined(__POSIX__) && !defined(NODE_SHARED_MODE) | ||
| 2202 | 2202 | struct sigaction act; | |
| 2203 | 2203 | memset(&act, 0, sizeof(act)); | |
| 2204 | 2204 | for (unsigned nr = 1; nr < kMaxSignal; nr += 1) { | |
@@ -4166,6 +4166,7 @@ inline void PlatformInit() { | |||
| 4166 | 4166 | ||
| 4167 | 4167 | CHECK_EQ(err, 0); | |
| 4168 | 4168 | ||
| 4169 | + #ifndef NODE_SHARED_MODE | ||
| 4169 | 4170 | // Restore signal dispositions, the parent process may have changed them. | |
| 4170 | 4171 | struct sigaction act; | |
| 4171 | 4172 | memset(&act, 0, sizeof(act)); | |
@@ -4179,6 +4180,7 @@ inline void PlatformInit() { | |||
| 4179 | 4180 | act.sa_handler = (nr == SIGPIPE) ? SIG_IGN : SIG_DFL; | |
| 4180 | 4181 | CHECK_EQ(0, sigaction(nr, &act, nullptr)); | |
| 4181 | 4182 | } | |
| 4183 | + #endif // !NODE_SHARED_MODE | ||
| 4182 | 4184 | ||
| 4183 | 4185 | RegisterSignalHandler(SIGINT, SignalExit, true); | |
| 4184 | 4186 | RegisterSignalHandler(SIGTERM, SignalExit, true); | |
0 commit comments