Mercurial > hg > nginx

comparison src/core/ngx_connection.c @ 8217:a5a1b3fad834 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed sanitizer errors.
author Roman Arutyunyan <arut@nginx.com>
date Fri, 13 Mar 2020 20:44:32 +0300
parents e7b2b907c0f8
children db8fe75c9c7a
comparison
equal deleted inserted replaced
8216:0aec63f50c29 8217:a5a1b3fad834
1176 { 1176 {
1177 ngx_err_t err; 1177 ngx_err_t err;
1178 ngx_uint_t log_error, level; 1178 ngx_uint_t log_error, level;
1179 ngx_socket_t fd; 1179 ngx_socket_t fd;
1180 1180
1181 if (c->fd == (ngx_socket_t) -1) {
1182 ngx_log_error(NGX_LOG_ALERT, c->log, 0, "connection already closed");
1183 return;
1184 }
1185
1186 if (c->read->timer_set) { 1181 if (c->read->timer_set) {
1187 ngx_del_timer(c->read); 1182 ngx_del_timer(c->read);
1188 } 1183 }
1189 1184
1190 if (c->write->timer_set) { 1185 if (c->write->timer_set) {
1191 ngx_del_timer(c->write); 1186 ngx_del_timer(c->write);
1192 } 1187 }
1193 1188
1194 if (!c->shared) { 1189 if (!c->shared && c->fd != (ngx_socket_t) -1) {
1195 if (ngx_del_conn) { 1190 if (ngx_del_conn) {
1196 ngx_del_conn(c, NGX_CLOSE_EVENT); 1191 ngx_del_conn(c, NGX_CLOSE_EVENT);
1197 1192
1198 } else { 1193 } else {
1199 if (c->read->active || c->read->disabled) { 1194 if (c->read->active || c->read->disabled) {
1220 ngx_reusable_connection(c, 0); 1215 ngx_reusable_connection(c, 0);
1221 1216
1222 log_error = c->log_error; 1217 log_error = c->log_error;
1223 1218
1224 ngx_free_connection(c); 1219 ngx_free_connection(c);
1220
1221 if (c->fd == (ngx_socket_t) -1) {
1222 ngx_log_debug0(NGX_LOG_DEBUG_CORE, c->log, 0, "connection has no fd");
1223 return;
1224 }
1225 1225
1226 fd = c->fd; 1226 fd = c->fd;
1227 c->fd = (ngx_socket_t) -1; 1227 c->fd = (ngx_socket_t) -1;
1228 1228
1229 if (c->shared) { 1229 if (c->shared) {