Mercurial > hg > nginx
changeset 1370:cc114c85be0f
rename ngx_http_discard_body() to ngx_http_discard_request_body()
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 06 Aug 2007 15:37:22 +0000 |
parents | 6254b90eea4b |
children | 7dbdf47cdcba |
files | src/http/modules/ngx_http_dav_module.c src/http/modules/ngx_http_empty_gif_module.c src/http/modules/ngx_http_flv_module.c src/http/modules/ngx_http_memcached_module.c src/http/modules/ngx_http_static_module.c src/http/modules/ngx_http_stub_status_module.c src/http/ngx_http.h src/http/ngx_http_request_body.c src/http/ngx_http_special_response.c |
diffstat | 9 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_dav_module.c +++ b/src/http/modules/ngx_http_dav_module.c @@ -353,7 +353,7 @@ ngx_http_dav_delete_handler(ngx_http_req 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) { return rc; @@ -469,7 +469,7 @@ ngx_http_dav_mkcol_handler(ngx_http_requ 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) { return rc; @@ -611,7 +611,7 @@ destination_done: overwrite_done: - rc = ngx_http_discard_body(r); + rc = ngx_http_discard_request_body(r); if (rc != NGX_OK && rc != NGX_AGAIN) { return rc;
--- a/src/http/modules/ngx_http_empty_gif_module.c +++ b/src/http/modules/ngx_http_empty_gif_module.c @@ -116,7 +116,7 @@ ngx_http_empty_gif_handler(ngx_http_requ 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) { return rc;
--- a/src/http/modules/ngx_http_flv_module.c +++ b/src/http/modules/ngx_http_flv_module.c @@ -89,7 +89,7 @@ ngx_http_flv_handler(ngx_http_request_t return NGX_DECLINED; } - rc = ngx_http_discard_body(r); + rc = ngx_http_discard_request_body(r); if (rc != NGX_OK && rc != NGX_AGAIN) { return rc;
--- a/src/http/modules/ngx_http_memcached_module.c +++ b/src/http/modules/ngx_http_memcached_module.c @@ -167,7 +167,7 @@ ngx_http_memcached_handler(ngx_http_requ 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) { return rc;
--- a/src/http/modules/ngx_http_static_module.c +++ b/src/http/modules/ngx_http_static_module.c @@ -100,7 +100,7 @@ ngx_http_static_handler(ngx_http_request return NGX_DECLINED; } - rc = ngx_http_discard_body(r); + rc = ngx_http_discard_request_body(r); if (rc != NGX_OK && rc != NGX_AGAIN) { return rc;
--- a/src/http/modules/ngx_http_stub_status_module.c +++ b/src/http/modules/ngx_http_stub_status_module.c @@ -69,7 +69,7 @@ static ngx_int_t ngx_http_status_handler 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) { return rc;
--- a/src/http/ngx_http.h +++ b/src/http/ngx_http.h @@ -98,7 +98,7 @@ size_t ngx_http_get_time(char *buf, time -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);
--- a/src/http/ngx_http_request_body.c +++ b/src/http/ngx_http_request_body.c @@ -14,8 +14,8 @@ static void ngx_http_read_client_request 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, ngx_chain_t *body); -static void ngx_http_read_discarded_body_handler(ngx_http_request_t *r); -static ngx_int_t ngx_http_read_discarded_body(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_request_body(ngx_http_request_t *r); /* @@ -425,7 +425,7 @@ ngx_http_write_request_body(ngx_http_req 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; ngx_event_t *rev; @@ -461,22 +461,22 @@ ngx_http_discard_body(ngx_http_request_t } } - 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) { return NGX_HTTP_INTERNAL_SERVER_ERROR; } - return ngx_http_read_discarded_body(r); + return ngx_http_read_discarded_request_body(r); } 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; - rc = ngx_http_read_discarded_body(r); + rc = ngx_http_read_discarded_request_body(r); if (rc == NGX_AGAIN) { if (ngx_handle_read_event(r->connection->read, 0) == NGX_ERROR) { @@ -492,7 +492,7 @@ ngx_http_read_discarded_body_handler(ngx 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; ssize_t n;
--- a/src/http/ngx_http_special_response.c +++ b/src/http/ngx_http_special_response.c @@ -327,7 +327,7 @@ ngx_http_special_response_handler(ngx_ht ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "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) { error = NGX_HTTP_INTERNAL_SERVER_ERROR;