Author: mdounin
Date: 2012-11-21 00:55:50 +0000 (Wed, 21 Nov 2012)
New Revision: 4923
URL: http://trac.nginx.org/nginx/changeset/4923/nginx

Log:
Request body: code duplication reduced, no functional changes.

The r->request_body_in_file_only with empty body case is now handled in
ngx_http_write_request_body().


Modified:
trunk/src/http/ngx_http_request_body.c

Modified: trunk/src/http/ngx_http_request_body.c
===================================================================
--- trunk/src/http/ngx_http_request_body.c 2012-11-21 00:55:06 UTC (rev 4922)
+++ trunk/src/http/ngx_http_request_body.c 2012-11-21 00:55:50 UTC (rev 4923)
@@ -33,7 +33,6 @@
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;

@@ -65,32 +64,9 @@
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) {
+ if (ngx_http_write_request_body(r, NULL) != NGX_OK) {
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;
- tf->clean = r->request_body_in_clean_file;
-
- if (r->request_body_file_group_access) {
- tf->access = 0660;
- }
-
- rb->temp_file = tf;
-
- if (ngx_create_temp_file(&tf->file, tf->path, tf->pool,
- tf->persistent, tf->clean, tf->access)
- != NGX_OK)
- {
- return NGX_HTTP_INTERNAL_SERVER_ERROR;
- }
}

post_handler(r);
@@ -419,6 +395,19 @@
}

rb->temp_file = tf;
+
+ if (body == NULL) {
+ /* empty body with r->request_body_in_file_only */
+
+ if (ngx_create_temp_file(&tf->file, tf->path, tf->pool,
+ tf->persistent, tf->clean, tf->access)
+ != NGX_OK)
+ {
+ return NGX_ERROR;
+ }
+
+ return NGX_OK;
+ }
}

n = ngx_write_chain_to_temp_file(rb->temp_file, body);

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel