mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-10 03:22:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename ngx_http_block_read() and ngx_http_test_read() to ..._reading()

Browse Source
This commit is contained in:
Igor Sysoev 2007-08-06 15:22:40 +00:00
parent e5d4020612
commit 7ab4d9cb55
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/http/ngx_http.h
View File

@ -99,6 +99,7 @@ size_t ngx_http_get_time(char *buf, time_t t);
ngx_int_t ngx_http_discard_body(ngx_http_request_t *r); 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; extern ngx_module_t ngx_http_module;

19
src/http/ngx_http_request.c
View File

@ -33,8 +33,7 @@ static void ngx_http_request_handler(ngx_event_t *ev);
static ngx_int_t ngx_http_set_write_handler(ngx_http_request_t *r); 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_test_reading(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);
@ -1442,7 +1441,7 @@ ngx_http_process_request(ngx_http_request_t *r)
c->read->handler = ngx_http_request_handler; c->read->handler = ngx_http_request_handler;
c->write->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); ngx_http_handler(r);
@ -1702,7 +1701,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_test_read; r->read_event_handler = ngx_http_test_reading;
r->write_event_handler = ngx_http_writer; r->write_event_handler = ngx_http_writer;
wev = r->connection->write; wev = r->connection->write;
@ -1812,11 +1811,11 @@ ngx_http_writer(ngx_http_request_t *r)
} }
static void void
ngx_http_block_read(ngx_http_request_t *r) ngx_http_block_reading(ngx_http_request_t *r)
{ {
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http read blocked"); "http reading blocked");
/* aio does not call this handler */ /* aio does not call this handler */
@ -1833,7 +1832,7 @@ ngx_http_block_read(ngx_http_request_t *r)
static void static void
ngx_http_test_read(ngx_http_request_t *r) ngx_http_test_reading(ngx_http_request_t *r)
{ {
int n; int n;
char buf[1]; char buf[1];
@ -1844,7 +1843,7 @@ ngx_http_test_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 test read"); ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http test reading");
#if (NGX_HAVE_KQUEUE) #if (NGX_HAVE_KQUEUE)
@ -2381,7 +2380,7 @@ ngx_http_post_action(ngx_http_request_t *r)
r->header_only = 1; r->header_only = 1;
r->post_action = 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); ngx_http_internal_redirect(r, &clcf->post_action, NULL);