Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename ngx_http_discard_body() to ngx_http_discard_request_body()

Browse source
This commit is contained in:
Igor Sysoev 2007-08-06 15:37:22 +00:00
parent b0e8daec9e
commit 695ba73268
9 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/http/modules/ngx_http_dav_module.c
View file

@ -353,7 +353,7 @@ ngx_http_dav_delete_handler(ngx_http_request_t *r)
return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE; return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE;
} }
rc = ngx_http_discard_body(r); rc = ngx_http_discard_request_body(r);
if (rc != NGX_OK && rc != NGX_AGAIN) { if (rc != NGX_OK && rc != NGX_AGAIN) {
return rc; return rc;
@ -469,7 +469,7 @@ ngx_http_dav_mkcol_handler(ngx_http_request_t *r, ngx_http_dav_loc_conf_t *dlcf)
return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE; return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE;
} }
rc = ngx_http_discard_body(r); rc = ngx_http_discard_request_body(r);
if (rc != NGX_OK && rc != NGX_AGAIN) { if (rc != NGX_OK && rc != NGX_AGAIN) {
return rc; return rc;
@ -611,7 +611,7 @@ destination_done:
overwrite_done: overwrite_done:
rc = ngx_http_discard_body(r); rc = ngx_http_discard_request_body(r);
if (rc != NGX_OK && rc != NGX_AGAIN) { if (rc != NGX_OK && rc != NGX_AGAIN) {
return rc; return rc;

2
src/http/modules/ngx_http_empty_gif_module.c
View file

@ -116,7 +116,7 @@ ngx_http_empty_gif_handler(ngx_http_request_t *r)
return NGX_HTTP_NOT_ALLOWED; return NGX_HTTP_NOT_ALLOWED;
} }
rc = ngx_http_discard_body(r); rc = ngx_http_discard_request_body(r);
if (rc != NGX_OK && rc != NGX_AGAIN) { if (rc != NGX_OK && rc != NGX_AGAIN) {
return rc; return rc;

2
src/http/modules/ngx_http_flv_module.c
View file

@ -89,7 +89,7 @@ ngx_http_flv_handler(ngx_http_request_t *r)
return NGX_DECLINED; return NGX_DECLINED;
} }
rc = ngx_http_discard_body(r); rc = ngx_http_discard_request_body(r);
if (rc != NGX_OK && rc != NGX_AGAIN) { if (rc != NGX_OK && rc != NGX_AGAIN) {
return rc; return rc;

2
src/http/modules/ngx_http_memcached_module.c
View file

@ -167,7 +167,7 @@ ngx_http_memcached_handler(ngx_http_request_t *r)
return NGX_HTTP_NOT_ALLOWED; return NGX_HTTP_NOT_ALLOWED;
} }
rc = ngx_http_discard_body(r); rc = ngx_http_discard_request_body(r);
if (rc != NGX_OK && rc != NGX_AGAIN) { if (rc != NGX_OK && rc != NGX_AGAIN) {
return rc; return rc;

2
src/http/modules/ngx_http_static_module.c
View file

@ -100,7 +100,7 @@ ngx_http_static_handler(ngx_http_request_t *r)
return NGX_DECLINED; return NGX_DECLINED;
} }
rc = ngx_http_discard_body(r); rc = ngx_http_discard_request_body(r);
if (rc != NGX_OK && rc != NGX_AGAIN) { if (rc != NGX_OK && rc != NGX_AGAIN) {
return rc; return rc;

2
src/http/modules/ngx_http_stub_status_module.c
View file

@ -69,7 +69,7 @@ static ngx_int_t ngx_http_status_handler(ngx_http_request_t *r)
return NGX_HTTP_NOT_ALLOWED; return NGX_HTTP_NOT_ALLOWED;
} }
rc = ngx_http_discard_body(r); rc = ngx_http_discard_request_body(r);
if (rc != NGX_OK && rc != NGX_AGAIN) { if (rc != NGX_OK && rc != NGX_AGAIN) {
return rc; return rc;

2
src/http/ngx_http.h
View file

@ -98,7 +98,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_request_body(ngx_http_request_t *r);
void ngx_http_block_reading(ngx_http_request_t *r); void ngx_http_block_reading(ngx_http_request_t *r);

16
src/http/ngx_http_request_body.c
View file

@ -14,8 +14,8 @@ static void ngx_http_read_client_request_body_handler(ngx_http_request_t *r);
static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r); static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r);
static ngx_int_t ngx_http_write_request_body(ngx_http_request_t *r, static ngx_int_t ngx_http_write_request_body(ngx_http_request_t *r,
ngx_chain_t *body); ngx_chain_t *body);
static void ngx_http_read_discarded_body_handler(ngx_http_request_t *r); static void ngx_http_read_discarded_request_body_handler(ngx_http_request_t *r);
static ngx_int_t ngx_http_read_discarded_body(ngx_http_request_t *r); static ngx_int_t ngx_http_read_discarded_request_body(ngx_http_request_t *r);
/* /*
@ -425,7 +425,7 @@ ngx_http_write_request_body(ngx_http_request_t *r, ngx_chain_t *body)
ngx_int_t ngx_int_t
ngx_http_discard_body(ngx_http_request_t *r) ngx_http_discard_request_body(ngx_http_request_t *r)
{ {
ssize_t size; ssize_t size;
ngx_event_t *rev; ngx_event_t *rev;
@ -461,22 +461,22 @@ ngx_http_discard_body(ngx_http_request_t *r)
} }
} }
r->read_event_handler = ngx_http_read_discarded_body_handler; r->read_event_handler = ngx_http_read_discarded_request_body_handler;
if (ngx_handle_read_event(rev, 0) == NGX_ERROR) { if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
return ngx_http_read_discarded_body(r); return ngx_http_read_discarded_request_body(r);
} }
static void static void
ngx_http_read_discarded_body_handler(ngx_http_request_t *r) ngx_http_read_discarded_request_body_handler(ngx_http_request_t *r)
{ {
ngx_int_t rc; ngx_int_t rc;
rc = ngx_http_read_discarded_body(r); rc = ngx_http_read_discarded_request_body(r);
if (rc == NGX_AGAIN) { if (rc == NGX_AGAIN) {
if (ngx_handle_read_event(r->connection->read, 0) == NGX_ERROR) { if (ngx_handle_read_event(r->connection->read, 0) == NGX_ERROR) {
@ -492,7 +492,7 @@ ngx_http_read_discarded_body_handler(ngx_http_request_t *r)
static ngx_int_t static ngx_int_t
ngx_http_read_discarded_body(ngx_http_request_t *r) ngx_http_read_discarded_request_body(ngx_http_request_t *r)
{ {
size_t size; size_t size;
ssize_t n; ssize_t n;

2
src/http/ngx_http_special_response.c
View file

@ -327,7 +327,7 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error)
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http special response: %d, \"%V\"", error, &r->uri); "http special response: %d, \"%V\"", error, &r->uri);
rc = ngx_http_discard_body(r); rc = ngx_http_discard_request_body(r);
if (rc == NGX_HTTP_INTERNAL_SERVER_ERROR) { if (rc == NGX_HTTP_INTERNAL_SERVER_ERROR) {
error = NGX_HTTP_INTERNAL_SERVER_ERROR; error = NGX_HTTP_INTERNAL_SERVER_ERROR;