nginx: src/http/modules/ngx_http_charset

annotate src/http/modules/ngx_http_charset_filter.c @ 477:ad1e9ebf93bb release-0.1.13

nginx-0.1.13-RELEASE import *) Feature: the server_names_hash and server_names_hash_threshold directives. *) Bugfix: the *.domain.tld names in the "server_name" directive did not work. *) Bugfix: the %request_length log parameter logged the incorrect length.

author	Igor Sysoev <igor@sysoev.ru>
date	Tue, 21 Dec 2004 12:30:30 +0000
parents	a88a3e4e158f
children	64d9afb209da

rev	line source
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 396 diff changeset	1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 396 diff changeset	2 /*
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 441 diff changeset	3 * Copyright (C) Igor Sysoev
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 396 diff changeset	4 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 396 diff changeset	5
99 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 #include <ngx_config.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_core.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_http.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12 typedef struct {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	13 char **tables;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	14 ngx_str_t name;
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	15 ngx_uint_t server; /* unsigned server:1; */
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	16 } 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	17
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	18
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	19 typedef struct {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	20 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	21 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	22 char *src2dst;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	23 char *dst2src;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	24 } 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	25
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	26
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	27 typedef struct {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	28 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	29 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	30 } 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	31
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	32
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	33 typedef struct {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	34 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	35 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	36
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	37 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	38 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	39 } 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	40
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	41
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	42 typedef struct {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	43 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	44 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	45 } 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	46
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	47
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	48 static ngx_uint_t ngx_charset_recode(ngx_buf_t b, char table);
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	49
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	50 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	51 void *conf);
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	52 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	53
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	54 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	55 void *conf);
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	56 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	57
343 6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t Igor Sysoev <igor@sysoev.ru> parents: 340 diff changeset	58 static ngx_int_t 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	59
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	60 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	61 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	62 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	63 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	64 void parent, void child);
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	65
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	66
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	67 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	68
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	69 { 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	70 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	71 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	72 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	73 0,
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	74 NULL },
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	75
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	76 { 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	77 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	78 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	79 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	80 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	81 NULL },
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	82
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	83 { 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	84 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	85 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	86 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	87 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	88 NULL },
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	89
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	90 { ngx_string("charset"),
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	91 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	92 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	93 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	94 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	95 NULL },
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	96
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	97 { 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	98 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	99 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	100 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	101 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	102 NULL },
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	103
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	104 ngx_null_command
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	105 };
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	106
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	107
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	108 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	109 NULL, /* pre conf */
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	110
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	111 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	112 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	113
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	114 NULL, /* create server configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	115 NULL, /* merge server configuration */
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_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	118 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	119 };
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	120
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	121
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	122 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	123 NGX_MODULE,
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	124 &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	125 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	126 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	127 ngx_http_charset_filter_init, /* init module */
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	128 NULL /* init process */
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
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	132 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	133 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	134
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	135
356 2e3cbc1bbe3c nginx-0.0.7-2004-06-16-19:32:11 import Igor Sysoev <igor@sysoev.ru> parents: 346 diff changeset	136 static ngx_int_t ngx_http_charset_header_filter(ngx_http_request_t *r)
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 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	139 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	140 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	141 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	142
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	143 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	144 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	145
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	146 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	147 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	148 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	149
389 537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	150 if (r->headers_out.content_type == NULL) {
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	151 return ngx_http_next_header_filter(r);
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	152 }
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	153
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	154 if (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	155 "text/", 5) != 0
389 537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	156 && ngx_strncasecmp(r->headers_out.content_type->value.data,
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	157 "application/x-javascript", 24) != 0)
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	158 {
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	159 return ngx_http_next_header_filter(r);
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	160 }
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	161
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	162 if (ngx_strstr(r->headers_out.content_type->value.data, "charset") != NULL)
139 54307053f185 nginx-0.0.1-2003-10-07-19:30:05 import Igor Sysoev <igor@sysoev.ru> parents: 133 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 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	165 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: 119 diff changeset	166
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	167 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	168 && 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	169 {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	170 /*
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	171 * 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	172 * 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	173 */
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	174
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	175 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	176 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	177 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	178
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	179 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	180 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	181 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	182
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	183 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	184 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	185
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	186 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	187 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	188 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	189
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	190 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	191 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	192
346 55e496a8ece3 nginx-0.0.3-2004-06-06-23:49:18 import Igor Sysoev <igor@sysoev.ru> parents: 343 diff changeset	193 r->filter_need_in_memory = 1;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	194
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	195 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	196 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	197
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	198
356 2e3cbc1bbe3c nginx-0.0.7-2004-06-16-19:32:11 import Igor Sysoev <igor@sysoev.ru> parents: 346 diff changeset	199 static ngx_int_t ngx_http_charset_body_filter(ngx_http_request_t *r,
2e3cbc1bbe3c nginx-0.0.7-2004-06-16-19:32:11 import Igor Sysoev <igor@sysoev.ru> parents: 346 diff changeset	200 ngx_chain_t *in)
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	201 {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	202 char *table;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	203 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	204 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	205 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	206 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	207 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	208
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	209 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	210
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	211 if (ctx == NULL) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	212 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	213 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	214
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	215 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	216 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	217
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	218 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	219 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	220
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	221 for (cl = in; cl; cl = cl->next) {
343 6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t Igor Sysoev <igor@sysoev.ru> parents: 340 diff changeset	222 ngx_charset_recode(cl->buf, table);
339 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
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	225 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	226 }
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	227
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	228
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	229 static ngx_uint_t ngx_charset_recode(ngx_buf_t b, char table)
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	230 {
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	231 u_char *p;
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	232 ngx_uint_t change;
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	233
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	234 change = 0;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	235
343 6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t Igor Sysoev <igor@sysoev.ru> parents: 340 diff changeset	236 for (p = b->pos; p < b->last; p++) {
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	237 if (p != table[p]) {
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	238 change = 1;
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	239 break;
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	240 }
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	241 }
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	242
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	243 if (change) {
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	244
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	245 while (p < b->last) {
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	246 p = table[p];
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	247 p++;
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	248 }
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	249
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	250 b->in_file = 0;
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	251 }
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	252
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	253 return change;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	254 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	255
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	256
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	257 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	258 void *conf)
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	259 {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	260 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	261
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	262 char *rv;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	263 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	264 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	265 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	266 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	267 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	268
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	269 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	270
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	271 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	272 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	273 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	274 }
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 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	277 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	278 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	279 }
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 if (src == dst) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	282 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	283 "\"charset_map\" between the same charsets "
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	284 "\"%V\" and \"%V\"", &value[1], &value[2]);
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	285 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	286 }
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	287
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	288 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	289 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	290 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	291 \|\| (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	292 {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	293 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	294 "duplicate \"charset_map\" between "
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	295 "\"%V\" and \"%V\"", &value[1], &value[2]);
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	296 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	297 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	298 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	299
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	300 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	301 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	302 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	303
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	304 table->src = src;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	305 table->dst = dst;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	306
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	307 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	308 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	309 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	310
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	311 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	312 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	313 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	314
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	315 for (i = 0; i < 128; i++) {
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 339 diff changeset	316 table->src2dst[i] = (char) i;
0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 339 diff changeset	317 table->dst2src[i] = (char) i;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	318 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	319
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	320 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	321 table->src2dst[i] = '?';
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	322 table->dst2src[i] = '?';
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	323 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	324
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	325 pvcf = *cf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	326 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	327 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	328 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	329 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	330 *cf = pvcf;
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	331
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	332 return rv;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	333 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	334
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	335
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	336 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	337 {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	338 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	339 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	340 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	341
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	342 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	343 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	344 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	345 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	346
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	347 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	348
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	349 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	350 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	351 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	352 "invalid value \"%V\"", &value[0]);
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	353 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	354 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	355
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	356 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	357 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	358 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	359 "invalid value \"%V\"", &value[1]);
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	360 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	361 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	362
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	363 table = cf->ctx;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	364
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 339 diff changeset	365 table->src2dst[src] = (char) dst;
0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 339 diff changeset	366 table->dst2src[dst] = (char) src;
339 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 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	369 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	370
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	371
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	372 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	373 void *conf)
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	374 {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	375 char *p = conf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	376
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	377 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	378 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	379 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	380 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	381
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	382 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	383
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	384 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	385 return "is duplicate";
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	386 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	387
396 6f3b20c1ac50 nginx-0.0.7-2004-07-18-23:11:20 import Igor Sysoev <igor@sysoev.ru> parents: 389 diff changeset	388 mcf = ngx_http_conf_get_module_main_conf(cf,
6f3b20c1ac50 nginx-0.0.7-2004-07-18-23:11:20 import Igor Sysoev <igor@sysoev.ru> parents: 389 diff changeset	389 ngx_http_charset_filter_module);
6f3b20c1ac50 nginx-0.0.7-2004-07-18-23:11:20 import Igor Sysoev <igor@sysoev.ru> parents: 389 diff changeset	390
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	391 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	392
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	393 *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	394 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	395 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	396 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	397
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	398 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	399 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	400 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	401 }
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	402
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	403 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	404 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	405
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	406
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	407 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	408 {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	409 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	410 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	411
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	412 c = charsets->elts;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	413 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	414 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	415 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	416 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	417
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	418 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	419 break;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	420 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	421 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	422
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	423 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	424 return i;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	425 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	426
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	427 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	428 return NGX_ERROR;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	429 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	430
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	431 c->tables = NULL;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	432 c->name = *name;
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	433 c->server = 0;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	434
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	435 return i;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	436 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	437
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	438
343 6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t Igor Sysoev <igor@sysoev.ru> parents: 340 diff changeset	439 static ngx_int_t 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	440 {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	441 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	442 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	443
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	444 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	445 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	446
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	447 return NGX_OK;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	448 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	449
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	450
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	451 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	452 {
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	453 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	454
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	455 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	456 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	457 }
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	458
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	459 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	460 NGX_CONF_ERROR);
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 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	463 NGX_CONF_ERROR);
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	464
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	465 return mcf;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	466 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	467
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	468
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	469 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	470 {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	471 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	472
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	473 ngx_uint_t i, n;
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 339 diff changeset	474 ngx_http_charset_t *charset;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	475 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	476
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	477 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	478 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	479
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	480 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	481 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	482 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	483 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	484
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	485 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	486 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	487
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	488 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	489 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	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 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	493 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	494 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	495 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	496 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	497
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	498 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	499 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	500 }
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 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	505 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	506 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	507 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	508
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	509 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	510 if (i == n) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	511 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	512 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	513
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	514 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	515 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	516 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	517
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	518 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	519 " no \"charset_map\" between the charsets "
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	520 "\"%V\" and \"%V\"",
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	521 &charset[i].name, &charset[n].name);
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	522 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	523 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	524 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	525
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	526 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	527 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	528
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	529
119 cd54bcbaf3b5 nginx-0.0.1-2003-07-21-01:15:59 import Igor Sysoev <igor@sysoev.ru> parents: 113 diff changeset	530 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	531 {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	532 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	533
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	534 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	535 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	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 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	539 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	540 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	541 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	542
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	543 return lcf;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	544 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	545
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	546
119 cd54bcbaf3b5 nginx-0.0.1-2003-07-21-01:15:59 import Igor Sysoev <igor@sysoev.ru> parents: 113 diff changeset	547 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	548 void parent, void child)
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	549 {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	550 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	551 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	552
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	553 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	554 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	555
477 ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	556
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	557 if (conf->default_charset == NGX_CONF_UNSET) {
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	558 conf->default_charset = prev->default_charset;
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	559 }
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	560
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	561 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	562 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	563 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	564
477 ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	565 if (conf->default_charset == NGX_CONF_UNSET
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	566 && conf->source_charset != NGX_CONF_UNSET)
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	567 {
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	568 conf->default_charset = conf->source_charset;
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	569 }
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	570
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	571 if (conf->source_charset == NGX_CONF_UNSET
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	572 && conf->default_charset != NGX_CONF_UNSET)
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	573 {
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	574 conf->source_charset = conf->default_charset;
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	575 }
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	576
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	577 if (conf->enable
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	578 && (conf->default_charset == NGX_CONF_UNSET
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	579 \|\| conf->source_charset == NGX_CONF_UNSET))
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	580 {
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	581 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	582 "the \"source_charset\" or \"default_charset\" "
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	583 "must be specified when \"charset\" is on");
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	584 return NGX_CONF_ERROR;
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	585 }
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 339 diff changeset	586
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	587 return NGX_CONF_OK;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	588 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_charset_filter.c @ 477:ad1e9ebf93bb release-0.1.13