Mercurial > hg > nginx

annotate src/http/modules/ngx_http_charset_filter.c @ 339:8c5b69141dfd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.3-2004-05-21-20:12:13 import
author Igor Sysoev <igor@sysoev.ru>
date Fri, 21 May 2004 16:12:13 +0000
parents 0376cffa29e6
children 0bf903191ceb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
1
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
2 #include <ngx_config.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
3 #include <ngx_core.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
4 #include <ngx_http.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
5
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
6
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
7 typedef struct {
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
8 char **tables;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
9 ngx_str_t name;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
10 unsigned server;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
11 } ngx_http_charset_t;
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
12
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
13
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
14 typedef struct {
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
15 ngx_int_t src;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
16 ngx_int_t dst;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
17 char *src2dst;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
18 char *dst2src;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
19 } ngx_http_charset_tables_t;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
20
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
21
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
22 typedef struct {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
23 ngx_array_t charsets; /* ngx_http_charset_t */
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
24 ngx_array_t tables; /* ngx_http_charset_tables_t */
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
25 } ngx_http_charset_main_conf_t;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
26
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
27
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
28 typedef struct {
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
29 ngx_flag_t enable;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
30 ngx_flag_t autodetect;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
31
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
32 ngx_int_t default_charset;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
33 ngx_int_t source_charset;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
34 } ngx_http_charset_loc_conf_t;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
35
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
36
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
37 typedef struct {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
38 ngx_int_t server;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
39 ngx_int_t client;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
40 } ngx_http_charset_ctx_t;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
41
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
42
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
43 static void ngx_charset_recode(ngx_hunk_t *h, char *table);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
44
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
45 static char *ngx_charset_map_block(ngx_conf_t *cf, ngx_command_t *cmd,
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
46 void *conf);
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
47 static char *ngx_charset_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf);
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
48
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
49 static char *ngx_http_set_charset_slot(ngx_conf_t *cf, ngx_command_t *cmd,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
50 void *conf);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
51 static ngx_int_t ngx_http_add_charset(ngx_array_t *charsets, ngx_str_t *name);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
52
113
d7f606e25b99 nginx-0.0.1-2003-07-04-19:10:33 import
Igor Sysoev <igor@sysoev.ru>
parents: 110
diff changeset
53 static int ngx_http_charset_filter_init(ngx_cycle_t *cycle);
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
54
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
55 static void *ngx_http_charset_create_main_conf(ngx_conf_t *cf);
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
56 static char *ngx_http_charset_init_main_conf(ngx_conf_t *cf, void *conf);
119
cd54bcbaf3b5 nginx-0.0.1-2003-07-21-01:15:59 import
Igor Sysoev <igor@sysoev.ru>
parents: 113
diff changeset
57 static void *ngx_http_charset_create_loc_conf(ngx_conf_t *cf);
cd54bcbaf3b5 nginx-0.0.1-2003-07-21-01:15:59 import
Igor Sysoev <igor@sysoev.ru>
parents: 113
diff changeset
58 static char *ngx_http_charset_merge_loc_conf(ngx_conf_t *cf,
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
59 void *parent, void *child);
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
60
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
61
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
62 static ngx_command_t ngx_http_charset_filter_commands[] = {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
63
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
64 { ngx_string("charset_map"),
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
65 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE2,
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
66 ngx_charset_map_block,
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
67 NGX_HTTP_MAIN_CONF_OFFSET,
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
68 0,
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
69 NULL },
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
70
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
71 { ngx_string("default_charset"),
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
72 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
73 ngx_http_set_charset_slot,
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
74 NGX_HTTP_LOC_CONF_OFFSET,
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
75 offsetof(ngx_http_charset_loc_conf_t, default_charset),
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
76 NULL },
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
77
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
78 { ngx_string("source_charset"),
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
79 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
80 ngx_http_set_charset_slot,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
81 NGX_HTTP_LOC_CONF_OFFSET,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
82 offsetof(ngx_http_charset_loc_conf_t, source_charset),
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
83 NULL },
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
84
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
85 { ngx_string("charset"),
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
86 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
87 ngx_conf_set_flag_slot,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
88 NGX_HTTP_LOC_CONF_OFFSET,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
89 offsetof(ngx_http_charset_loc_conf_t, enable),
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
90 NULL },
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
91
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
92 { ngx_string("autodetect_charset"),
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
93 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
94 ngx_conf_set_flag_slot,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
95 NGX_HTTP_LOC_CONF_OFFSET,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
96 offsetof(ngx_http_charset_loc_conf_t, autodetect),
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
97 NULL },
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
98
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
99 ngx_null_command
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
100 };
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
101
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
102
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
103 static ngx_http_module_t ngx_http_charset_filter_module_ctx = {
177
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
104 NULL, /* pre conf */
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
105
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
106 ngx_http_charset_create_main_conf, /* create main configuration */
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
107 ngx_http_charset_init_main_conf, /* init main configuration */
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
108
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
109 NULL, /* create server configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
110 NULL, /* merge server configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
111
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
112 ngx_http_charset_create_loc_conf, /* create location configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
113 ngx_http_charset_merge_loc_conf /* merge location configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
114 };
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
115
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
116
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
117 ngx_module_t ngx_http_charset_filter_module = {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
118 NGX_MODULE,
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
119 &ngx_http_charset_filter_module_ctx, /* module context */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
120 ngx_http_charset_filter_commands, /* module directives */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
121 NGX_HTTP_MODULE, /* module type */
110
152567c11325 nginx-0.0.1-2003-07-02-22:51:41 import
Igor Sysoev <igor@sysoev.ru>
parents: 99
diff changeset
122 ngx_http_charset_filter_init, /* init module */
113
d7f606e25b99 nginx-0.0.1-2003-07-04-19:10:33 import
Igor Sysoev <igor@sysoev.ru>
parents: 110
diff changeset
123 NULL /* init child */
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
124 };
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
125
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
126
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
127 static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
128 static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
129
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
130
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
131 static int ngx_http_charset_header_filter(ngx_http_request_t *r)
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
132 {
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
133 ngx_http_charset_t *charsets;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
134 ngx_http_charset_ctx_t *ctx;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
135 ngx_http_charset_loc_conf_t *lcf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
136 ngx_http_charset_main_conf_t *mcf;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
137
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
138 mcf = ngx_http_get_module_main_conf(r, ngx_http_charset_filter_module);
307
ce375c313e96 nginx-0.0.3-2004-04-08-19:58:25 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
139 lcf = ngx_http_get_module_loc_conf(r, ngx_http_charset_filter_module);
ce375c313e96 nginx-0.0.3-2004-04-08-19:58:25 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
140
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
141 if (lcf->enable == 0) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
142 return ngx_http_next_header_filter(r);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
143 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
144
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
145 #if 0
307
ce375c313e96 nginx-0.0.3-2004-04-08-19:58:25 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
146 if (lcf->default_charset.len == 0) {
ce375c313e96 nginx-0.0.3-2004-04-08-19:58:25 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
147 return ngx_http_next_header_filter(r);
ce375c313e96 nginx-0.0.3-2004-04-08-19:58:25 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
148 }
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
149 #endif
307
ce375c313e96 nginx-0.0.3-2004-04-08-19:58:25 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
150
139
54307053f185 nginx-0.0.1-2003-10-07-19:30:05 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
151 if (r->headers_out.content_type == NULL
54307053f185 nginx-0.0.1-2003-10-07-19:30:05 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
152 || ngx_strncasecmp(r->headers_out.content_type->value.data,
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
153 "text/", 5) != 0
139
54307053f185 nginx-0.0.1-2003-10-07-19:30:05 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
154 || ngx_strstr(r->headers_out.content_type->value.data, "charset")
54307053f185 nginx-0.0.1-2003-10-07-19:30:05 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
155 != NULL
54307053f185 nginx-0.0.1-2003-10-07-19:30:05 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
156 )
54307053f185 nginx-0.0.1-2003-10-07-19:30:05 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
157 {
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
158 return ngx_http_next_header_filter(r);
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents: 119
diff changeset
159 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents: 119
diff changeset
160
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
161 if (r->headers_out.status == NGX_HTTP_MOVED_PERMANENTLY
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
162 && r->headers_out.status == NGX_HTTP_MOVED_TEMPORARILY)
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
163 {
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
164 /*
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
165 * do not set charset for the redirect because NN 4.x uses this
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
166 * charset instead of the next page charset
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
167 */
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
168
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
169 r->headers_out.charset.len = 0;
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
170 return ngx_http_next_header_filter(r);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
171 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
172
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
173 if (r->headers_out.charset.len) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
174 return ngx_http_next_header_filter(r);
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
175 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
176
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
177 charsets = mcf->charsets.elts;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
178 r->headers_out.charset = charsets[lcf->default_charset].name;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
179
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
180 if (lcf->default_charset == lcf->source_charset) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
181 return ngx_http_next_header_filter(r);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
182 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
183
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
184 ngx_http_create_ctx(r, ctx, ngx_http_charset_filter_module,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
185 sizeof(ngx_http_charset_ctx_t), NGX_ERROR);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
186
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
187 r->filter |= NGX_HTTP_FILTER_NEED_IN_MEMORY;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
188
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
189 return ngx_http_next_header_filter(r);
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
190 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
191
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
192
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
193 static int ngx_http_charset_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
194 {
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
195 char *table;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
196 ngx_chain_t *cl;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
197 ngx_http_charset_t *charsets;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
198 ngx_http_charset_ctx_t *ctx;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
199 ngx_http_charset_loc_conf_t *lcf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
200 ngx_http_charset_main_conf_t *mcf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
201
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
202 ctx = ngx_http_get_module_ctx(r, ngx_http_charset_filter_module);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
203
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
204 if (ctx == NULL) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
205 return ngx_http_next_body_filter(r, in);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
206 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
207
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
208 mcf = ngx_http_get_module_main_conf(r, ngx_http_charset_filter_module);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
209 lcf = ngx_http_get_module_loc_conf(r, ngx_http_charset_filter_module);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
210
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
211 charsets = mcf->charsets.elts;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
212 table = charsets[lcf->source_charset].tables[lcf->default_charset];
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
213
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
214 for (cl = in; cl; cl = cl->next) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
215 ngx_charset_recode(cl->hunk, table);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
216 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
217
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
218 return ngx_http_next_body_filter(r, in);
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
219 }
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
220
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
221
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
222 static void ngx_charset_recode(ngx_hunk_t *h, char *table)
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
223 {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
224 u_char *p, c;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
225
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
226 for (p = h->pos; p < h->last; p++) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
227 c = *p;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
228 *p = table[c];
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
229 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
230 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
231
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
232
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
233 static char *ngx_charset_map_block(ngx_conf_t *cf, ngx_command_t *cmd,
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
234 void *conf)
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
235 {
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
236 ngx_http_charset_main_conf_t *mcf = conf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
237
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
238 char *rv;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
239 ngx_int_t src, dst;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
240 ngx_uint_t i;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
241 ngx_str_t *value;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
242 ngx_conf_t pvcf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
243 ngx_http_charset_tables_t *table;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
244
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
245 value = cf->args->elts;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
246
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
247 src = ngx_http_add_charset(&mcf->charsets, &value[1]);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
248 if (src == NGX_ERROR) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
249 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
250 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
251
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
252 dst = ngx_http_add_charset(&mcf->charsets, &value[2]);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
253 if (dst == NGX_ERROR) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
254 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
255 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
256
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
257 if (src == dst) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
258 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
259 "\"charset_map\" between the same charsets "
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
260 "\"%s\" and \"%s\"",
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
261 value[1].data, value[2].data);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
262 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
263 }
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
264
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
265 table = mcf->tables.elts;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
266 for (i = 0; i < mcf->tables.nelts; i++) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
267 if ((src == table->src && dst == table->dst)
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
268 || (src == table->dst && dst == table->src))
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
269 {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
270 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
271 "duplicate \"charset_map\" between "
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
272 "\"%s\" and \"%s\"",
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
273 value[1].data, value[2].data);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
274 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
275 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
276 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
277
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
278 if (!(table = ngx_push_array(&mcf->tables))) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
279 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
280 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
281
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
282 table->src = src;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
283 table->dst = dst;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
284
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
285 if (!(table->src2dst = ngx_palloc(cf->pool, 256))) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
286 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
287 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
288
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
289 if (!(table->dst2src = ngx_palloc(cf->pool, 256))) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
290 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
291 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
292
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
293 for (i = 0; i < 128; i++) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
294 table->src2dst[i] = i;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
295 table->dst2src[i] = i;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
296 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
297
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
298 for (/* void */; i < 256; i++) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
299 table->src2dst[i] = '?';
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
300 table->dst2src[i] = '?';
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
301 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
302
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
303 pvcf = *cf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
304 cf->ctx = table;
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
305 cf->handler = ngx_charset_map;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
306 cf->handler_conf = conf;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
307 rv = ngx_conf_parse(cf, NULL);
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
308 *cf = pvcf;
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
309
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
310 return rv;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
311 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
312
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
313
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
314 static char *ngx_charset_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
315 {
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
316 ngx_http_charset_main_conf_t *mcf = conf;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
317
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
318 ngx_int_t src, dst;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
319 ngx_str_t *value;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
320 ngx_http_charset_tables_t *table;
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
321
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
322 if (cf->args->nelts != 2) {
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
323 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameters number");
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
324 return NGX_CONF_ERROR;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
325 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
326
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
327 value = cf->args->elts;
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
328
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
329 src = ngx_hextoi(value[0].data, value[0].len);
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
330 if (src == NGX_ERROR || src > 255) {
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
331 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
332 "invalid value \"%s\"", value[0].data);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
333 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
334 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
335
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
336 dst = ngx_hextoi(value[1].data, value[1].len);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
337 if (dst == NGX_ERROR || dst > 255) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
338 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
339 "invalid value \"%s\"", value[1].data);
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
340 return NGX_CONF_ERROR;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
341 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
342
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
343 table = cf->ctx;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
344
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
345 table->src2dst[src] = dst;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
346 table->dst2src[dst] = src;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
347
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
348 return NGX_CONF_OK;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
349 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
350
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
351
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
352 static char *ngx_http_set_charset_slot(ngx_conf_t *cf, ngx_command_t *cmd,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
353 void *conf)
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
354 {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
355 char *p = conf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
356
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
357 ngx_int_t *cp;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
358 ngx_str_t *value;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
359 ngx_http_charset_t *charset;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
360 ngx_http_conf_ctx_t *ctx;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
361 ngx_http_charset_main_conf_t *mcf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
362
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
363 cp = (ngx_int_t *) (p + cmd->offset);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
364
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
365 if (*cp != NGX_CONF_UNSET) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
366 return "is duplicate";
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
367 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
368
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
369 ctx = cf->ctx;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
370 mcf = ctx->main_conf[ngx_http_charset_filter_module.ctx_index];
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
371 value = cf->args->elts;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
372
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
373 *cp = ngx_http_add_charset(&mcf->charsets, &value[1]);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
374 if (*cp == NGX_ERROR) {
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
375 return NGX_CONF_ERROR;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
376 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
377
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
378 if (cmd->offset == offsetof(ngx_http_charset_loc_conf_t, source_charset)) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
379 charset = mcf->charsets.elts;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
380 charset[*cp].server = 1;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
381 }
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
382
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
383 return NGX_CONF_OK;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
384 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
385
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
386
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
387 static ngx_int_t ngx_http_add_charset(ngx_array_t *charsets, ngx_str_t *name)
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
388 {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
389 ngx_uint_t i;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
390 ngx_http_charset_t *c;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
391
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
392 c = charsets->elts;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
393 for (i = 0; i < charsets->nelts; i++) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
394 if (name->len != c[i].name.len) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
395 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
396 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
397
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
398 if (ngx_strcasecmp(name->data, c[i].name.data) == 0) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
399 break;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
400 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
401 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
402
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
403 if (i < charsets->nelts) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
404 return i;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
405 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
406
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
407 if (!(c = ngx_push_array(charsets))) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
408 return NGX_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
409 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
410
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
411 c->name = *name;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
412
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
413 return i;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
414 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
415
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
416
113
d7f606e25b99 nginx-0.0.1-2003-07-04-19:10:33 import
Igor Sysoev <igor@sysoev.ru>
parents: 110
diff changeset
417 static int ngx_http_charset_filter_init(ngx_cycle_t *cycle)
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
418 {
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
419 ngx_http_next_header_filter = ngx_http_top_header_filter;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
420 ngx_http_top_header_filter = ngx_http_charset_header_filter;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
421
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 139
diff changeset
422 ngx_http_next_body_filter = ngx_http_top_body_filter;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
423 ngx_http_top_body_filter = ngx_http_charset_body_filter;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
424
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
425 return NGX_OK;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
426 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
427
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
428
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
429 static void *ngx_http_charset_create_main_conf(ngx_conf_t *cf)
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
430 {
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
431 ngx_http_charset_main_conf_t *mcf;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
432
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
433 if (!(mcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_charset_main_conf_t)))) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
434 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
435 }
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
436
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
437 ngx_init_array(mcf->charsets, cf->pool, 5, sizeof(ngx_http_charset_t),
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
438 NGX_CONF_ERROR);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
439
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
440 ngx_init_array(mcf->tables, cf->pool, 10, sizeof(ngx_http_charset_tables_t),
338
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
441 NGX_CONF_ERROR);
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
442
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
443 return mcf;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
444 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
445
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 307
diff changeset
446
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
447 static char *ngx_http_charset_init_main_conf(ngx_conf_t *cf, void *conf)
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
448 {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
449 ngx_http_charset_main_conf_t *mcf = conf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
450
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
451 ngx_uint_t i, n;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
452 ngx_http_charset_t *charset, *c;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
453 ngx_http_charset_tables_t *tables;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
454
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
455 tables = mcf->tables.elts;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
456 charset = mcf->charsets.elts;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
457
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
458 for (i = 0; i < mcf->charsets.nelts; i++) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
459 if (!charset[i].server) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
460 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
461 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
462
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
463 charset[i].tables = ngx_pcalloc(cf->pool,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
464 sizeof(char *) * mcf->charsets.nelts);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
465
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
466 if (charset[i].tables == NULL) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
467 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
468 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
469
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
470 for (n = 0; n < mcf->tables.nelts; n++) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
471 if ((ngx_int_t) i == tables[n].src) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
472 charset[i].tables[tables[n].dst] = tables[n].src2dst;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
473 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
474 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
475
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
476 if ((ngx_int_t) i == tables[n].dst) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
477 charset[i].tables[tables[n].src] = tables[n].dst2src;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
478 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
479 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
480 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
481
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
482 for (i = 0; i < mcf->charsets.nelts; i++) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
483 if (!charset[i].server) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
484 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
485 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
486
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
487 for (n = 0; n < mcf->charsets.nelts; n++) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
488 if (i == n) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
489 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
490 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
491
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
492 if (charset[i].tables[n]) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
493 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
494 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
495
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
496 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
497 " no \"charset_map\" between the charsets "
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
498 "\"%s\" and \"%s\"",
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
499 charset[i].name.data, charset[n].name.data);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
500 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
501 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
502 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
503
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
504 return NGX_CONF_OK;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
505 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
506
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
507
119
cd54bcbaf3b5 nginx-0.0.1-2003-07-21-01:15:59 import
Igor Sysoev <igor@sysoev.ru>
parents: 113
diff changeset
508 static void *ngx_http_charset_create_loc_conf(ngx_conf_t *cf)
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
509 {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
510 ngx_http_charset_loc_conf_t *lcf;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
511
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
512 if (!(lcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_charset_loc_conf_t)))) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
513 return NGX_CONF_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
514 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
515
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
516 lcf->enable = NGX_CONF_UNSET;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
517 lcf->autodetect = NGX_CONF_UNSET;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
518 lcf->default_charset = NGX_CONF_UNSET;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
519 lcf->source_charset = NGX_CONF_UNSET;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
520
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
521 return lcf;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
522 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
523
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
524
119
cd54bcbaf3b5 nginx-0.0.1-2003-07-21-01:15:59 import
Igor Sysoev <igor@sysoev.ru>
parents: 113
diff changeset
525 static char *ngx_http_charset_merge_loc_conf(ngx_conf_t *cf,
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
526 void *parent, void *child)
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
527 {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
528 ngx_http_charset_loc_conf_t *prev = parent;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
529 ngx_http_charset_loc_conf_t *conf = child;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
530
339
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
531 ngx_conf_merge_value(conf->enable, prev->enable, 0);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
532 ngx_conf_merge_value(conf->autodetect, prev->autodetect, 0);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
533
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
534 if (conf->default_charset == NGX_CONF_UNSET) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
535 conf->default_charset = prev->default_charset;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
536 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
537
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
538 if (conf->source_charset == NGX_CONF_UNSET) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
539 conf->source_charset = prev->source_charset;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import
Igor Sysoev <igor@sysoev.ru>
parents: 338
diff changeset
540 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
541
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
542 return NGX_CONF_OK;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
543 }