Mercurial > hg > nginx
comparison src/core/ngx_connection.c @ 8468:001ec7fce567 quic
Merged with the default branch.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Mon, 13 Jul 2020 15:34:22 +0300 |
parents | db8fe75c9c7a 9c038f5e0464 |
children | 0d2b2664b41c |
comparison
equal
deleted
inserted
replaced
8467:e02250b55b17 | 8468:001ec7fce567 |
---|---|
1072 | 1072 |
1073 #if (NGX_HAVE_UNIX_DOMAIN) | 1073 #if (NGX_HAVE_UNIX_DOMAIN) |
1074 | 1074 |
1075 if (ls[i].sockaddr->sa_family == AF_UNIX | 1075 if (ls[i].sockaddr->sa_family == AF_UNIX |
1076 && ngx_process <= NGX_PROCESS_MASTER | 1076 && ngx_process <= NGX_PROCESS_MASTER |
1077 && ngx_new_binary == 0) | 1077 && ngx_new_binary == 0 |
1078 && (!ls[i].inherited || ngx_getppid() != ngx_parent)) | |
1078 { | 1079 { |
1079 u_char *name = ls[i].addr_text.data + sizeof("unix:") - 1; | 1080 u_char *name = ls[i].addr_text.data + sizeof("unix:") - 1; |
1080 | 1081 |
1081 if (ngx_delete_file(name) == NGX_FILE_ERROR) { | 1082 if (ngx_delete_file(name) == NGX_FILE_ERROR) { |
1082 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno, | 1083 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno, |