diff options
| author | Rickard Green <[email protected]> | 2017-06-08 14:41:24 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-06-08 14:41:24 +0200 |
| commit | 94379b22116ec5d1efd56a0ace837054b3da6fa2 (patch) | |
| tree | 505a13ccadad53d80ac8fba058be6f79916dcc71 /erts/emulator/sys | |
| parent | b85e77fb68add53eefa8aaa89a1e6f923fda9565 (diff) | |
| parent | b1f76e2f15c9d8c741ecb4bddc0b38740f3e7143 (diff) | |
| download | otp-94379b22116ec5d1efd56a0ace837054b3da6fa2.tar.gz otp-94379b22116ec5d1efd56a0ace837054b3da6fa2.tar.bz2 otp-94379b22116ec5d1efd56a0ace837054b3da6fa2.zip | |
Merge branch 'maint-19' into maint
* maint-19:
Updated OTP version
Update release notes
Update version numbers
erts: Fix so that 81b628 (sigterm=kill) works
Updated OTP version
Prepare release
Update testcase to check that purge handle hibernated process correct
Do not GC hibernated process from other processes
Fix check_process_code() on hibernated process
Unconditionally clear IO buffers on send/shutdown errors
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index de8481b206..7f738751ff 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -838,11 +838,13 @@ void sys_init_suspend_handler(void) void erts_sys_unix_later_init(void) { - char env[4]; + char env[5]; size_t envsz = sizeof(env); + if (erts_sys_getenv_raw("ERL_ZZ_SIGTERM_KILL", env, &envsz) == 0) - if (envsz == 4 && sys_strncmp("true",env,4) == 0) + if (envsz == 4 && sys_strncmp("true", env, 4) == 0) return; + sys_signal(SIGTERM, request_stop); } |