Просмотр исходного кода

Fix how the templates are merged

It was impossible to inherit the templates from an higher config level,
because the templates were overwritten when the config were merged.

Signed-off-by: Brice Figureau <brice@daysofwonder.com>
wip/v0.7
Brice Figureau 16 лет назад
Родитель
Сommit
c6101be551
1 измененных файлов: 5 добавлений и 1 удалений
  1. 5
    1
      ngx_http_uploadprogress_module.c

+ 5
- 1
ngx_http_uploadprogress_module.c Просмотреть файл

@@ -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");

Загрузка…
Отмена
Сохранить