Mercurial > hg > nginx

comparison src/http/modules/ngx_http_charset_filter.c @ 119:cd54bcbaf3b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.1-2003-07-21-01:15:59 import
author Igor Sysoev <igor@sysoev.ru>
date Sun, 20 Jul 2003 21:15:59 +0000
parents d7f606e25b99
children b27548f540ad
comparison
equal deleted inserted replaced
118:5bf52498665c 119:cd54bcbaf3b5
8 ngx_str_t default_charset; 8 ngx_str_t default_charset;
9 } ngx_http_charset_loc_conf_t; 9 } ngx_http_charset_loc_conf_t;
10 10
11 11
12 static int ngx_http_charset_filter_init(ngx_cycle_t *cycle); 12 static int ngx_http_charset_filter_init(ngx_cycle_t *cycle);
13 static void *ngx_http_charset_create_loc_conf(ngx_pool_t *pool); 13 static void *ngx_http_charset_create_loc_conf(ngx_conf_t *cf);
14 static char *ngx_http_charset_merge_loc_conf(ngx_pool_t *pool, 14 static char *ngx_http_charset_merge_loc_conf(ngx_conf_t *cf,
15 void *parent, void *child); 15 void *parent, void *child);
16 16
17 17
18 static ngx_command_t ngx_http_charset_filter_commands[] = { 18 static ngx_command_t ngx_http_charset_filter_commands[] = {
19 19
98 98
99 return NGX_OK; 99 return NGX_OK;
100 } 100 }
101 101
102 102
103 static void *ngx_http_charset_create_loc_conf(ngx_pool_t *pool) 103 static void *ngx_http_charset_create_loc_conf(ngx_conf_t *cf)
104 { 104 {
105 ngx_http_charset_loc_conf_t *lcf; 105 ngx_http_charset_loc_conf_t *lcf;
106 106
107 ngx_test_null(lcf, 107 ngx_test_null(lcf,
108 ngx_pcalloc(pool, sizeof(ngx_http_charset_loc_conf_t)), 108 ngx_pcalloc(cf->pool, sizeof(ngx_http_charset_loc_conf_t)),
109 NGX_CONF_ERROR); 109 NGX_CONF_ERROR);
110 110
111 return lcf; 111 return lcf;
112 } 112 }
113 113
114 114
115 static char *ngx_http_charset_merge_loc_conf(ngx_pool_t *pool, 115 static char *ngx_http_charset_merge_loc_conf(ngx_conf_t *cf,
116 void *parent, void *child) 116 void *parent, void *child)
117 { 117 {
118 ngx_http_charset_loc_conf_t *prev = parent; 118 ngx_http_charset_loc_conf_t *prev = parent;
119 ngx_http_charset_loc_conf_t *conf = child; 119 ngx_http_charset_loc_conf_t *conf = child;
120 120