Mercurial > hg > nginx-vendor-current
diff src/http/modules/ngx_http_ssi_filter_module.c @ 296:2ceaee987f37 NGINX_0_5_18
nginx 0.5.18
*) Feature: the ngx_http_sub_filter_module.
*) Feature: the "$upstream_http_..." variables.
*) Feature: now the $upstream_status and $upstream_response_time
variables keep data about all upstreams before X-Accel-Redirect.
*) Bugfix: a segmentation fault occurred in master process after first
reconfiguration and receiving any signal if nginx was built with
ngx_http_perl_module and perl did not support multiplicity; bug
appeared in 0.5.9.
*) Bugfix: if perl did not support multiplicity, then after
reconfiguration perl code did not work; bug appeared in 0.3.38.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 19 Apr 2007 00:00:00 +0400 |
parents | 5bef04fc3fd5 |
children | cba14c1e2a4b |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_ssi_filter_module.c +++ b/src/http/modules/ngx_http_ssi_filter_module.c @@ -107,8 +107,8 @@ static char *ngx_http_ssi_types(ngx_conf static ngx_int_t ngx_http_ssi_preconfiguration(ngx_conf_t *cf); static void *ngx_http_ssi_create_main_conf(ngx_conf_t *cf); static char *ngx_http_ssi_init_main_conf(ngx_conf_t *cf, void *conf); -static void *ngx_http_ssi_create_conf(ngx_conf_t *cf); -static char *ngx_http_ssi_merge_conf(ngx_conf_t *cf, +static void *ngx_http_ssi_create_loc_conf(ngx_conf_t *cf); +static char *ngx_http_ssi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child); static ngx_int_t ngx_http_ssi_filter_init(ngx_conf_t *cf); @@ -173,8 +173,8 @@ static ngx_http_module_t ngx_http_ssi_f NULL, /* create server configuration */ NULL, /* merge server configuration */ - ngx_http_ssi_create_conf, /* create location configuration */ - ngx_http_ssi_merge_conf /* merge location configuration */ + ngx_http_ssi_create_loc_conf, /* create location configuration */ + ngx_http_ssi_merge_loc_conf /* merge location configuration */ }; @@ -2746,7 +2746,7 @@ ngx_http_ssi_init_main_conf(ngx_conf_t * static void * -ngx_http_ssi_create_conf(ngx_conf_t *cf) +ngx_http_ssi_create_loc_conf(ngx_conf_t *cf) { ngx_http_ssi_loc_conf_t *slcf; @@ -2773,7 +2773,7 @@ ngx_http_ssi_create_conf(ngx_conf_t *cf) static char * -ngx_http_ssi_merge_conf(ngx_conf_t *cf, void *parent, void *child) +ngx_http_ssi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) { ngx_http_ssi_loc_conf_t *prev = parent; ngx_http_ssi_loc_conf_t *conf = child;