comparison src/core/ngx_cycle.c @ 7662:9c038f5e0464

Fixed removing of listening UNIX sockets when "changing binary". When changing binary, sending a SIGTERM to the new binary's master process should not remove inherited UNIX sockets unless the old binary's master process has exited.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 01 Jun 2020 20:19:27 +0300
parents 650574a44505
children 4f30f75dbdf3
comparison
equal deleted inserted replaced
7661:8cadaf7e7231 7662:9c038f5e0464
518 if (ngx_cmp_sockaddr(nls[n].sockaddr, nls[n].socklen, 518 if (ngx_cmp_sockaddr(nls[n].sockaddr, nls[n].socklen,
519 ls[i].sockaddr, ls[i].socklen, 1) 519 ls[i].sockaddr, ls[i].socklen, 1)
520 == NGX_OK) 520 == NGX_OK)
521 { 521 {
522 nls[n].fd = ls[i].fd; 522 nls[n].fd = ls[i].fd;
523 nls[n].inherited = ls[i].inherited;
523 nls[n].previous = &ls[i]; 524 nls[n].previous = &ls[i];
524 ls[i].remain = 1; 525 ls[i].remain = 1;
525 526
526 if (ls[i].backlog != nls[n].backlog) { 527 if (ls[i].backlog != nls[n].backlog) {
527 nls[n].listen = 1; 528 nls[n].listen = 1;