mirror of
https://github.com/nginx/nginx.git
synced 2025-06-12 13:42:55 +08:00
proxy_ignore_client_abort, fastcgi_ignore_client_abort, and so on were
broken by r1111
This commit is contained in:
parent
13cf4b82c5
commit
f53d0f3177
@ -34,6 +34,7 @@ static ngx_int_t ngx_http_set_write_handler(ngx_http_request_t *r);
|
|||||||
static void ngx_http_writer(ngx_http_request_t *r);
|
static void ngx_http_writer(ngx_http_request_t *r);
|
||||||
|
|
||||||
static void ngx_http_block_read(ngx_http_request_t *r);
|
static void ngx_http_block_read(ngx_http_request_t *r);
|
||||||
|
static void ngx_http_test_read(ngx_http_request_t *r);
|
||||||
static void ngx_http_set_keepalive(ngx_http_request_t *r);
|
static void ngx_http_set_keepalive(ngx_http_request_t *r);
|
||||||
static void ngx_http_keepalive_handler(ngx_event_t *ev);
|
static void ngx_http_keepalive_handler(ngx_event_t *ev);
|
||||||
static void ngx_http_set_lingering_close(ngx_http_request_t *r);
|
static void ngx_http_set_lingering_close(ngx_http_request_t *r);
|
||||||
@ -1701,7 +1702,7 @@ ngx_http_set_write_handler(ngx_http_request_t *r)
|
|||||||
|
|
||||||
r->http_state = NGX_HTTP_WRITING_REQUEST_STATE;
|
r->http_state = NGX_HTTP_WRITING_REQUEST_STATE;
|
||||||
|
|
||||||
r->read_event_handler = ngx_http_block_read;
|
r->read_event_handler = ngx_http_test_read;
|
||||||
r->write_event_handler = ngx_http_writer;
|
r->write_event_handler = ngx_http_writer;
|
||||||
|
|
||||||
wev = r->connection->write;
|
wev = r->connection->write;
|
||||||
@ -1813,6 +1814,26 @@ ngx_http_writer(ngx_http_request_t *r)
|
|||||||
|
|
||||||
static void
|
static void
|
||||||
ngx_http_block_read(ngx_http_request_t *r)
|
ngx_http_block_read(ngx_http_request_t *r)
|
||||||
|
{
|
||||||
|
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
||||||
|
"http read blocked");
|
||||||
|
|
||||||
|
/* aio does not call this handler */
|
||||||
|
|
||||||
|
if ((ngx_event_flags & NGX_USE_LEVEL_EVENT)
|
||||||
|
&& r->connection->read->active)
|
||||||
|
{
|
||||||
|
if (ngx_del_event(r->connection->read, NGX_READ_EVENT, 0)
|
||||||
|
== NGX_ERROR)
|
||||||
|
{
|
||||||
|
ngx_http_close_request(r, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
ngx_http_test_read(ngx_http_request_t *r)
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
char buf[1];
|
char buf[1];
|
||||||
@ -1823,7 +1844,7 @@ ngx_http_block_read(ngx_http_request_t *r)
|
|||||||
c = r->connection;
|
c = r->connection;
|
||||||
rev = c->read;
|
rev = c->read;
|
||||||
|
|
||||||
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http read blocked");
|
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http test read");
|
||||||
|
|
||||||
#if (NGX_HAVE_KQUEUE)
|
#if (NGX_HAVE_KQUEUE)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user