diff options
Diffstat (limited to 'src/http/modules/proxy')
| -rw-r--r-- | src/http/modules/proxy/ngx_http_proxy_handler.c | 6 | ||||
| -rw-r--r-- | src/http/modules/proxy/ngx_http_proxy_upstream.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/http/modules/proxy/ngx_http_proxy_handler.c b/src/http/modules/proxy/ngx_http_proxy_handler.c index b7177a339..5d646bb1c 100644 --- a/src/http/modules/proxy/ngx_http_proxy_handler.c +++ b/src/http/modules/proxy/ngx_http_proxy_handler.c @@ -385,7 +385,7 @@ void ngx_http_proxy_check_broken_connection(ngx_event_t *ev) if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { - if (!ev->kq_eof) { + if (!ev->pending_eof) { return; } @@ -641,11 +641,11 @@ void ngx_http_proxy_close_connection(ngx_http_proxy_ctx_t *p) ngx_del_conn(c, NGX_CLOSE_EVENT); } else { - if (c->read->active || c->read->posted) { + if (c->read->active || c->read->disabled) { ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT); } - if (c->write->active || c->read->posted) { + if (c->write->active || c->read->disabled) { ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT); } } diff --git a/src/http/modules/proxy/ngx_http_proxy_upstream.c b/src/http/modules/proxy/ngx_http_proxy_upstream.c index 83af1ad9c..9ed4d7f61 100644 --- a/src/http/modules/proxy/ngx_http_proxy_upstream.c +++ b/src/http/modules/proxy/ngx_http_proxy_upstream.c @@ -660,7 +660,7 @@ static void ngx_http_proxy_send_request(ngx_http_proxy_ctx_t *p) if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) && !p->request_sent - && c->write->kq_eof) + && c->write->pending_eof) { ngx_log_error(NGX_LOG_ERR, c->log, c->write->kq_errno, "connect() failed"); |