Explorar el Código

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>
tags/v0.7
Brice Figureau hace 17 años
padre
commit
a687a36382
Se han modificado 1 ficheros con 5 adiciones y 1 borrados
  1. 5
    1
      ngx_http_uploadprogress_module.c

+ 5
- 1
ngx_http_uploadprogress_module.c Ver fichero

1240
     ngx_uint_t                            i;
1240
     ngx_uint_t                            i;
1241
 
1241
 
1242
     if (conf->shm_zone == NULL) {
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
     ngx_conf_merge_str_value(conf->content_type, prev->content_type, "text/javascript");
1250
     ngx_conf_merge_str_value(conf->content_type, prev->content_type, "text/javascript");

Loading…
Cancelar
Guardar