diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2009-09-12 18:20:23 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2009-09-12 18:20:23 +0000 |
| commit | 2a1462f6fe9d56d513aab252e7998339c551a4d5 (patch) | |
| tree | 7a4a103714e11aa4b2920c07030461d167826a42 /www/nginx | |
| parent | 2b6c6f9c43d5beb725aba184c252f2a2ac186531 (diff) | |
| download | ports-2a1462f6fe9d56d513aab252e7998339c551a4d5.tar.gz ports-2a1462f6fe9d56d513aab252e7998339c551a4d5.zip | |
Merge new fix existing patch for uploadprogress module for
nginx and nginx-devel accordingly.
Do not bump PORTREVISIONs.
Patch from: Brice Figureau aka brice at daysofwonder dot com
Tested by: Vladimir Getmanshchuk aka vladget at openfilm dot com
Notes
Notes:
svn path=/head/; revision=241285
Diffstat (limited to 'www/nginx')
| -rw-r--r-- | www/nginx/files/extra-patch-ngx_http_uploadprogress_module.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/www/nginx/files/extra-patch-ngx_http_uploadprogress_module.c b/www/nginx/files/extra-patch-ngx_http_uploadprogress_module.c index abaffde0d94c..9752602780a6 100644 --- a/www/nginx/files/extra-patch-ngx_http_uploadprogress_module.c +++ b/www/nginx/files/extra-patch-ngx_http_uploadprogress_module.c @@ -12,3 +12,29 @@ } } +@@ -799,7 +799,7 @@ ngx_clean_old_connections(ngx_event_t * ev) + ngx_http_uploadprogress_ctx_t *ctx; + ngx_slab_pool_t *shpool; + ngx_rbtree_node_t *node; +- ngx_http_uploadprogress_node_t *up; ++ ngx_http_uploadprogress_node_t *up, *upprev; + time_t now = ngx_time(); + int count = 0; + +@@ -822,6 +822,7 @@ ngx_clean_old_connections(ngx_event_t * ev) + } + + up = (ngx_http_uploadprogress_node_t *) node; ++ upprev = up->prev; + + ngx_log_debug3(NGX_LOG_DEBUG_HTTP, shm_zone->shm.log, 0, + "uploadprogress clean: scanning %08XD (req done %ui) timeout at %T", +@@ -840,7 +841,7 @@ ngx_clean_old_connections(ngx_event_t * ev) + } + else + count++; +- node = (ngx_rbtree_node_t *) up->prev; ++ node = (ngx_rbtree_node_t *) upprev; + } + + ngx_log_debug3(NGX_LOG_DEBUG_HTTP, shm_zone->shm.log, 0, |