|
|
@@ -449,7 +449,6 @@ static void ngx_http_uploadprogress_event_handler(ngx_http_request_t *r)
|
|
449
|
449
|
{
|
|
450
|
450
|
ngx_str_t *id, *oldid;
|
|
451
|
451
|
ngx_slab_pool_t *shpool;
|
|
452
|
|
- ngx_connection_t *c;
|
|
453
|
452
|
ngx_shm_zone_t *shm_zone;
|
|
454
|
453
|
ngx_http_uploadprogress_ctx_t *ctx;
|
|
455
|
454
|
ngx_http_uploadprogress_node_t *up;
|
|
|
@@ -458,8 +457,6 @@ static void ngx_http_uploadprogress_event_handler(ngx_http_request_t *r)
|
|
458
|
457
|
|
|
459
|
458
|
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "upload-progress: ngx_http_uploadprogress_event_handler");
|
|
460
|
459
|
|
|
461
|
|
- c = r->connection;
|
|
462
|
|
-
|
|
463
|
460
|
/* find node, update rest */
|
|
464
|
461
|
oldid = id = get_tracking_id(r);
|
|
465
|
462
|
|
|
|
@@ -1007,14 +1004,12 @@ ngx_http_uploadprogress_cleanup(void *data)
|
|
1007
|
1004
|
ngx_http_uploadprogress_cleanup_t *upcln = data;
|
|
1008
|
1005
|
ngx_slab_pool_t *shpool;
|
|
1009
|
1006
|
ngx_rbtree_node_t *node;
|
|
1010
|
|
- ngx_http_uploadprogress_ctx_t *ctx;
|
|
1011
|
1007
|
ngx_http_uploadprogress_node_t *up;
|
|
1012
|
1008
|
ngx_http_request_t *r;
|
|
1013
|
1009
|
|
|
1014
|
1010
|
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, upcln->shm_zone->shm.log, 0,
|
|
1015
|
1011
|
"uploadprogress cleanup called");
|
|
1016
|
1012
|
|
|
1017
|
|
- ctx = upcln->shm_zone->data;
|
|
1018
|
1013
|
shpool = (ngx_slab_pool_t *) upcln->shm_zone->shm.addr;
|
|
1019
|
1014
|
node = upcln->node;
|
|
1020
|
1015
|
r = upcln->r;
|
|
|
@@ -1240,7 +1235,6 @@ static void*
|
|
1240
|
1235
|
ngx_http_uploadprogress_create_loc_conf(ngx_conf_t * cf)
|
|
1241
|
1236
|
{
|
|
1242
|
1237
|
ngx_http_uploadprogress_conf_t *conf;
|
|
1243
|
|
- ngx_http_uploadprogress_template_t *t;
|
|
1244
|
1238
|
ngx_uint_t i;
|
|
1245
|
1239
|
|
|
1246
|
1240
|
conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_uploadprogress_conf_t));
|
|
|
@@ -1252,7 +1246,6 @@ ngx_http_uploadprogress_create_loc_conf(ngx_conf_t * cf)
|
|
1252
|
1246
|
return NGX_CONF_ERROR;
|
|
1253
|
1247
|
}
|
|
1254
|
1248
|
|
|
1255
|
|
- t = conf->templates.elts;
|
|
1256
|
1249
|
for(i = 0;i < conf->templates.nalloc; i++) {
|
|
1257
|
1250
|
ngx_http_uploadprogress_template_t *elt = ngx_array_push(&conf->templates);
|
|
1258
|
1251
|
if (elt == NULL) {
|
|
|
@@ -1312,9 +1305,7 @@ static ngx_int_t
|
|
1312
|
1305
|
ngx_http_uploadprogress_init_variables_and_templates(ngx_conf_t *cf)
|
|
1313
|
1306
|
{
|
|
1314
|
1307
|
ngx_http_variable_t *var, *v;
|
|
1315
|
|
- ngx_http_uploadprogress_template_t *t;
|
|
1316
|
1308
|
ngx_http_uploadprogress_state_map_t *m;
|
|
1317
|
|
- ssize_t n;
|
|
1318
|
1309
|
ngx_uint_t i;
|
|
1319
|
1310
|
|
|
1320
|
1311
|
/* Add variables */
|
|
|
@@ -1335,12 +1326,11 @@ ngx_http_uploadprogress_init_variables_and_templates(ngx_conf_t *cf)
|
|
1335
|
1326
|
}
|
|
1336
|
1327
|
|
|
1337
|
1328
|
m = ngx_http_uploadprogress_state_map;
|
|
1338
|
|
- t = ngx_http_uploadprogress_global_templates.elts;
|
|
1339
|
1329
|
i = 0;
|
|
1340
|
1330
|
|
|
1341
|
1331
|
while(m->name.data != NULL) {
|
|
1342
|
1332
|
ngx_http_uploadprogress_template_t *elt = ngx_array_push(&ngx_http_uploadprogress_global_templates);
|
|
1343
|
|
- n = ngx_http_script_variables_count(ngx_http_uploadprogress_java_defaults + i);
|
|
|
1333
|
+ ngx_http_script_variables_count(ngx_http_uploadprogress_java_defaults + i);
|
|
1344
|
1334
|
|
|
1345
|
1335
|
if (ngx_http_upload_progress_set_template(cf, elt, ngx_http_uploadprogress_java_defaults + i) != NGX_CONF_OK) {
|
|
1346
|
1336
|
return NGX_ERROR;
|