Fixed bug: premature signalling of end of body

barbaraMartin11 · Aug 2, 2010 · 332498d · 332498d
1 parent 7de7261
commit 332498d
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/ngx_http_upload_module.c b/ngx_http_upload_module.c
@@ -2797,17 +2797,17 @@ ngx_http_process_request_body(ngx_http_request_t *r, ngx_chain_t *body)
         if(rc != NGX_OK)
             return rc;
 
-        if(u->raw_input) {
-            // Signal end of body
-            if(r->request_body->rest == 0) {
-                rc = u->data_handler(u, body->buf->pos, body->buf->pos);
+        body = body->next;
+    }
 
-                if(rc != NGX_OK)
-                    return rc;
-            }
-        }
+    if(u->raw_input) {
+        // Signal end of body
+        if(r->request_body->rest == 0) {
+            rc = u->data_handler(u, NULL, NULL);
 
-        body = body->next;
+            if(rc != NGX_OK)
+                return rc;
+        }
     }
 
     return NGX_OK;