Переглянути джерело

fixed corruption of connection->log in log message when cleanup event is teared down way after the connection is dead

tags/v0.4
Brice Figureau 18 роки тому
джерело
коміт
bdcfa7d6a6
1 змінених файлів з 3 додано та 3 видалено
  1. 3
    3
      ngx_http_uploadprogress_module.c

+ 3
- 3
ngx_http_uploadprogress_module.c Переглянути файл

@@ -576,7 +576,7 @@ ngx_http_uploadprogress_handler(ngx_http_request_t * r)
576 576
     if (!upcf->cleanup.timer_set) {
577 577
         upcf->cleanup.data = upcf->shm_zone;
578 578
         upcf->cleanup.handler = ngx_clean_old_connections;
579
-        upcf->cleanup.log = r->connection->log;
579
+        upcf->cleanup.log = upcf->shm_zone->shm.log;
580 580
         ngx_add_timer(&upcf->cleanup, TIMER_FREQUENCY);
581 581
     }
582 582
 
@@ -877,7 +877,7 @@ ngx_http_uploadprogress_errortracker(ngx_http_request_t * r)
877 877
         if (!upcf->cleanup.timer_set) {
878 878
             upcf->cleanup.data = upcf->shm_zone;
879 879
             upcf->cleanup.handler = ngx_clean_old_connections;
880
-            upcf->cleanup.log = r->connection->log;
880
+            upcf->cleanup.log = upcf->shm_zone->shm.log;
881 881
             ngx_add_timer(&upcf->cleanup, TIMER_FREQUENCY);
882 882
         }
883 883
 
@@ -916,7 +916,7 @@ ngx_http_uploadprogress_init(ngx_conf_t * cf)
916 916
     *h = ngx_http_uploadprogress_handler;
917 917
 
918 918
     /* 
919
-       we also need to track HTTP 413 errors 
919
+       we also need to track HTTP errors 
920 920
        unfortunately, the above handler is not called in case of 
921 921
        errors.
922 922
        we have to register a header output filter that will be

Завантаження…
Відмінити
Зберегти