Mercurial > hg > nginx-vendor-0-8
diff src/http/ngx_http_request_body.c @ 238:a528ae0fe909 NGINX_0_4_4
nginx 0.4.4
*) Feature: the $scheme variable.
*) Feature: the "expires" directive supports the "max" parameter.
*) Feature: the "include" directive supports the "*" mask.
Thanks to Jonathan Dance.
*) Bugfix: the "return" directive always overrode the "error_page"
response code redirected by the "error_page" directive.
*) Bugfix: a segmentation fault occurred if zero-length body was in PUT
method.
*) Bugfix: the redirect was changed incorrectly if the variables were
used in the "proxy_redirect" directive.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 02 Oct 2006 00:00:00 +0400 |
parents | 38e7b94d63ac |
children | 2e9c57a5e50a |
line wrap: on
line diff
--- a/src/http/ngx_http_request_body.c +++ b/src/http/ngx_http_request_body.c @@ -34,6 +34,7 @@ ngx_http_read_client_request_body(ngx_ht ssize_t size; ngx_buf_t *b; ngx_chain_t *cl, **next; + ngx_temp_file_t *tf; ngx_http_request_body_t *rb; ngx_http_core_loc_conf_t *clcf; @@ -49,7 +50,43 @@ ngx_http_read_client_request_body(ngx_ht r->request_body = rb; - if (r->headers_in.content_length_n <= 0) { + if (r->headers_in.content_length_n < 0) { + post_handler(r); + return NGX_OK; + } + + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + + if (r->headers_in.content_length_n == 0) { + + if (r->request_body_in_file_only) { + tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t)); + if (tf == NULL) { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } + + tf->file.fd = NGX_INVALID_FILE; + tf->file.log = r->connection->log; + tf->path = clcf->client_body_temp_path; + tf->pool = r->pool; + tf->warn = "a client request body is buffered to a temporary file"; + tf->log_level = r->request_body_file_log_level; + tf->persistent = r->request_body_in_persistent_file; + + if (r->request_body_file_group_access) { + tf->mode = 0660; + } + + rb->temp_file = tf; + + if (ngx_create_temp_file(&tf->file, tf->path, tf->pool, + tf->persistent, tf->mode) + != NGX_OK) + { + return NGX_HTTP_INTERNAL_SERVER_ERROR; + } + } + post_handler(r); return NGX_OK; } @@ -139,8 +176,6 @@ ngx_http_read_client_request_body(ngx_ht next = &rb->bufs; } - clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - size = clcf->client_body_buffer_size; size += size >> 2;