Mercurial > hg > nginx
changeset 1368:202cae9a0c2b
rename ngx_http_block_read() and ngx_http_test_read() to ..._reading()
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 06 Aug 2007 15:22:40 +0000 |
parents | aa700583b57d |
children | 6254b90eea4b |
files | src/http/ngx_http.h src/http/ngx_http_request.c |
diffstat | 2 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http.h Mon Aug 06 15:18:24 2007 +0000 +++ b/src/http/ngx_http.h Mon Aug 06 15:22:40 2007 +0000 @@ -99,6 +99,7 @@ ngx_int_t ngx_http_discard_body(ngx_http_request_t *r); +void ngx_http_block_reading(ngx_http_request_t *r); extern ngx_module_t ngx_http_module;
--- a/src/http/ngx_http_request.c Mon Aug 06 15:18:24 2007 +0000 +++ b/src/http/ngx_http_request.c Mon Aug 06 15:22:40 2007 +0000 @@ -33,8 +33,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_block_read(ngx_http_request_t *r); -static void ngx_http_test_read(ngx_http_request_t *r); +static void ngx_http_test_reading(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_set_lingering_close(ngx_http_request_t *r); @@ -1442,7 +1441,7 @@ c->read->handler = ngx_http_request_handler; c->write->handler = ngx_http_request_handler; - r->read_event_handler = ngx_http_block_read; + r->read_event_handler = ngx_http_block_reading; ngx_http_handler(r); @@ -1702,7 +1701,7 @@ r->http_state = NGX_HTTP_WRITING_REQUEST_STATE; - r->read_event_handler = ngx_http_test_read; + r->read_event_handler = ngx_http_test_reading; r->write_event_handler = ngx_http_writer; wev = r->connection->write; @@ -1812,11 +1811,11 @@ } -static void -ngx_http_block_read(ngx_http_request_t *r) +void +ngx_http_block_reading(ngx_http_request_t *r) { ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http read blocked"); + "http reading blocked"); /* aio does not call this handler */ @@ -1833,7 +1832,7 @@ static void -ngx_http_test_read(ngx_http_request_t *r) +ngx_http_test_reading(ngx_http_request_t *r) { int n; char buf[1]; @@ -1844,7 +1843,7 @@ c = r->connection; rev = c->read; - ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http test read"); + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http test reading"); #if (NGX_HAVE_KQUEUE) @@ -2381,7 +2380,7 @@ r->header_only = 1; r->post_action = 1; - r->read_event_handler = ngx_http_block_read; + r->read_event_handler = ngx_http_block_reading; ngx_http_internal_redirect(r, &clcf->post_action, NULL);