|
|
@@ -1240,7 +1240,11 @@ ngx_http_uploadprogress_merge_loc_conf(ngx_conf_t * cf, void *parent, void *chil
|
|
1240
|
1240
|
ngx_uint_t i;
|
|
1241
|
1241
|
|
|
1242
|
1242
|
if (conf->shm_zone == NULL) {
|
|
1243
|
|
- *conf = *prev;
|
|
|
1243
|
+ conf->shm_zone = prev->shm_zone;
|
|
|
1244
|
+ conf->timeout = prev->timeout;
|
|
|
1245
|
+ conf->cleanup = prev->cleanup;
|
|
|
1246
|
+ conf->handler = prev->handler;
|
|
|
1247
|
+ conf->track = prev->track;
|
|
1244
|
1248
|
}
|
|
1245
|
1249
|
|
|
1246
|
1250
|
ngx_conf_merge_str_value(conf->content_type, prev->content_type, "text/javascript");
|