diff options
Diffstat (limited to '')
| -rw-r--r-- | src/event/ngx_event_close.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/event/ngx_event_close.c b/src/event/ngx_event_close.c index c95689182..0e3fe20c7 100644 --- a/src/event/ngx_event_close.c +++ b/src/event/ngx_event_close.c @@ -1,5 +1,6 @@ #include <ngx_config.h> +#include <ngx_core.h> #include <ngx_types.h> #include <ngx_connection.h> #include <ngx_event_close.h> @@ -8,22 +9,24 @@ int ngx_event_close_connection(ngx_event_t *ev) { int rc; - ngx_connection_t *cn = (ngx_connection_t *) ev->data; + ngx_connection_t *c = (ngx_connection_t *) ev->data; - ngx_assert((cn->fd != -1), return -1, ev->log, + ngx_assert((c->fd != -1), return NGX_ERROR, c->log, "ngx_event_close: already closed"); - if ((rc = ngx_close_socket(cn->fd)) == -1) - ngx_log_error(NGX_LOG_ERR, ev->log, ngx_socket_errno, + ngx_destroy_pool(c->pool); + + if ((rc = ngx_close_socket(c->fd)) == -1) + ngx_log_error(NGX_LOG_ERR, c->log, ngx_socket_errno, "ngx_event_close: close failed"); - if (cn->read->next) - ngx_del_event(cn->read, NGX_READ_EVENT); + if (c->read->next) + ngx_del_event(c->read, NGX_READ_EVENT); - if (cn->write->next) - ngx_del_event(cn->write, NGX_WRITE_EVENT); + if (c->write->next) + ngx_del_event(c->write, NGX_WRITE_EVENT); - cn->fd = -1; + c->fd = -1; return rc; } |
