Browse Source

Attempt to fix nginx upload module behavior that sends

a POST after the upload is finished, which fools our
tracker.
upload-fix
Brice Figureau 17 years ago
parent
commit
e863ac7928
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      ngx_http_uploadprogress_module.c

+ 2
- 2
ngx_http_uploadprogress_module.c View File

365
     if (up != NULL && !up->done) {
365
     if (up != NULL && !up->done) {
366
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
366
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
367
                        "upload-progress: read_event_handler found node: %V", id);
367
                        "upload-progress: read_event_handler found node: %V", id);
368
-        up->rest = r->request_body->rest;
369
-        up->length = r->headers_in.content_length_n;
368
+        up->rest = up->rest >= r->request_body->rest ? r->request_body->rest : up->res;
369
+        up->length = up->length == 0 ? r->headers_in.content_length_n : up->length;
370
         ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
370
         ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
371
                        "upload-progress: read_event_handler storing rest %uO/%uO for %V", up->rest, up->length, id);
371
                        "upload-progress: read_event_handler storing rest %uO/%uO for %V", up->rest, up->length, id);
372
     } else {
372
     } else {

Loading…
Cancel
Save