Mercurial > hg > nginx-ranges

comparison src/http/modules/ngx_http_ssi_filter_module.c @ 296:2ceaee987f37 NGINX_0_5_18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
295:65b7ac8795e3 296:2ceaee987f37
105 static char *ngx_http_ssi_types(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 105 static char *ngx_http_ssi_types(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
106 106
107 static ngx_int_t ngx_http_ssi_preconfiguration(ngx_conf_t *cf); 107 static ngx_int_t ngx_http_ssi_preconfiguration(ngx_conf_t *cf);
108 static void *ngx_http_ssi_create_main_conf(ngx_conf_t *cf); 108 static void *ngx_http_ssi_create_main_conf(ngx_conf_t *cf);
109 static char *ngx_http_ssi_init_main_conf(ngx_conf_t *cf, void *conf); 109 static char *ngx_http_ssi_init_main_conf(ngx_conf_t *cf, void *conf);
110 static void *ngx_http_ssi_create_conf(ngx_conf_t *cf); 110 static void *ngx_http_ssi_create_loc_conf(ngx_conf_t *cf);
111 static char *ngx_http_ssi_merge_conf(ngx_conf_t *cf, 111 static char *ngx_http_ssi_merge_loc_conf(ngx_conf_t *cf,
112 void *parent, void *child); 112 void *parent, void *child);
113 static ngx_int_t ngx_http_ssi_filter_init(ngx_conf_t *cf); 113 static ngx_int_t ngx_http_ssi_filter_init(ngx_conf_t *cf);
114 114
115 115
116 static ngx_command_t ngx_http_ssi_filter_commands[] = { 116 static ngx_command_t ngx_http_ssi_filter_commands[] = {
171 ngx_http_ssi_init_main_conf, /* init main configuration */ 171 ngx_http_ssi_init_main_conf, /* init main configuration */
172 172
173 NULL, /* create server configuration */ 173 NULL, /* create server configuration */
174 NULL, /* merge server configuration */ 174 NULL, /* merge server configuration */
175 175
176 ngx_http_ssi_create_conf, /* create location configuration */ 176 ngx_http_ssi_create_loc_conf, /* create location configuration */
177 ngx_http_ssi_merge_conf /* merge location configuration */ 177 ngx_http_ssi_merge_loc_conf /* merge location configuration */
178 }; 178 };
179 179
180 180
181 ngx_module_t ngx_http_ssi_filter_module = { 181 ngx_module_t ngx_http_ssi_filter_module = {
182 NGX_MODULE_V1, 182 NGX_MODULE_V1,
2744 return NGX_CONF_OK; 2744 return NGX_CONF_OK;
2745 } 2745 }
2746 2746
2747 2747
2748 static void * 2748 static void *
2749 ngx_http_ssi_create_conf(ngx_conf_t *cf) 2749 ngx_http_ssi_create_loc_conf(ngx_conf_t *cf)
2750 { 2750 {
2751 ngx_http_ssi_loc_conf_t *slcf; 2751 ngx_http_ssi_loc_conf_t *slcf;
2752 2752
2753 slcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssi_loc_conf_t)); 2753 slcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssi_loc_conf_t));
2754 if (slcf == NULL) { 2754 if (slcf == NULL) {
2771 return slcf; 2771 return slcf;
2772 } 2772 }
2773 2773
2774 2774
2775 static char * 2775 static char *
2776 ngx_http_ssi_merge_conf(ngx_conf_t *cf, void *parent, void *child) 2776 ngx_http_ssi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
2777 { 2777 {
2778 ngx_http_ssi_loc_conf_t *prev = parent; 2778 ngx_http_ssi_loc_conf_t *prev = parent;
2779 ngx_http_ssi_loc_conf_t *conf = child; 2779 ngx_http_ssi_loc_conf_t *conf = child;
2780 2780
2781 ngx_str_t *type; 2781 ngx_str_t *type;