1 files changed, 16 insertions, 31 deletions

diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index eeffd8afd..42edfef52 100644
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -10,9 +10,8 @@
 #include <ngx_http.h>
 
 
-static void ngx_http_read_client_request_body_handler(ngx_event_t *rev);
-static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r,
-    ngx_connection_t *c);
+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);
 
 /*
  * on completion ngx_http_read_client_request_body() adds to
@@ -29,10 +28,14 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
     ssize_t                    size;
     ngx_buf_t                 *b;
     ngx_chain_t               *cl;
-    ngx_connection_t          *c;
     ngx_http_request_body_t   *rb;
     ngx_http_core_loc_conf_t  *clcf;
 
+    if (r->request_body) {
+        post_handler(r);
+        return NGX_OK;
+    }
+
     rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
     if (rb == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
@@ -40,16 +43,6 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
 
     r->request_body = rb;
 
-    /* STUB */
-    if (r->file.fd != NGX_INVALID_FILE) {
-        if (ngx_close_file(r->file.fd) == NGX_FILE_ERROR) {
-            ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
-                          ngx_close_file_n " \"%V\" failed", &r->file.name);
-        }
-        r->file.fd = NGX_INVALID_FILE;
-    }
-    /**/
-
     if (r->headers_in.content_length_n <= 0) {
         post_handler(r);
         return NGX_OK;
@@ -138,30 +131,23 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
         rb->bufs = cl;
     }
 
-    c = r->connection;
-
-    c->read->event_handler = ngx_http_read_client_request_body_handler;
+    r->read_event_handler = ngx_http_read_client_request_body_handler;
 
-    return ngx_http_do_read_client_request_body(r, c);
+    return ngx_http_do_read_client_request_body(r);
 }
 
 
 static void
-ngx_http_read_client_request_body_handler(ngx_event_t *rev)
+ngx_http_read_client_request_body_handler(ngx_http_request_t *r)
 {
-    ngx_int_t            rc;
-    ngx_connection_t    *c;
-    ngx_http_request_t  *r;
-
-    c = rev->data;
-    r = c->data;
+    ngx_int_t  rc;
 
-    if (rev->timedout) {
+    if (r->connection->read->timedout) {
         ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
         return;
     }
 
-    rc = ngx_http_do_read_client_request_body(r, c);
+    rc = ngx_http_do_read_client_request_body(r);
 
     if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
         ngx_http_finalize_request(r, rc);
@@ -170,16 +156,17 @@ ngx_http_read_client_request_body_handler(ngx_event_t *rev)
 
 
 static ngx_int_t
-ngx_http_do_read_client_request_body(ngx_http_request_t *r,
-    ngx_connection_t *c)
+ngx_http_do_read_client_request_body(ngx_http_request_t *r)
 {
     size_t                     size;
     ssize_t                    n;
     ngx_buf_t                 *b;
     ngx_temp_file_t           *tf;
+    ngx_connection_t          *c;
     ngx_http_request_body_t   *rb;
     ngx_http_core_loc_conf_t  *clcf;
 
+    c = r->connection;
     rb = r->request_body;
 
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
@@ -218,8 +205,6 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r,
             }
 
             rb->temp_file->offset += n;
-
-            rb->buf->pos = rb->buf->start;
             rb->buf->last = rb->buf->start;
         }