nginx: src/http/modules/ngx_http_charset_filter

annotate src/http/modules/ngx_http_charset_filter_module.c @ 523:2019117e6b38 release-0.1.36

nginx-0.1.36-RELEASE import *) Change: if the request header has duplicate the "Host", "Connection", "Content-Length", or "Authorization" lines, then nginx now returns the 400 error. *) Change: the "post_accept_timeout" directive was canceled. *) Feature: the "default", "af=", "bl=", "deferred", and "bind" parameters of the "listen" directive. *) Feature: the FreeBSD accept filters support. *) Feature: the Linux TCP_DEFER_ACCEPT support. *) Bugfix: the ngx_http_autoindex_module did not support the file names in UTF-8. *) Bugfix: the new log file can be rotated by the -USR1 signal only if the reconfiguration by the -HUP signal was made twice.

author	Igor Sysoev <igor@sysoev.ru>
date	Wed, 15 Jun 2005 18:33:41 +0000
parents	9b8c906f6e63
children	09b42134ac0c

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;
523 2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	15
2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	16 unsigned server:1;
2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	17 unsigned utf8:1;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	18 } 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	19
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	20
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	21 typedef struct {
523 2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	22 ngx_int_t src;
2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	23 ngx_int_t dst;
2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	24 char *src2dst;
2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	25 char *dst2src;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	26 } 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	27
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	28
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	29 typedef struct {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	30 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	31 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	32 } 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	33
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	34
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	35 typedef struct {
523 2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	36 ngx_flag_t enable;
2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	37 ngx_flag_t autodetect;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	38
523 2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	39 ngx_int_t default_charset;
2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	40 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	41 } 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	42
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	43
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	44 typedef struct {
523 2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	45 ngx_int_t server;
2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	46 ngx_int_t client;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	47 } 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	48
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	49
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	50 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	51
338 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_block(ngx_conf_t cf, ngx_command_t *cmd,
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	53 void *conf);
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	54 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	55
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_set_charset_slot(ngx_conf_t cf, ngx_command_t *cmd,
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	57 void *conf);
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	58 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	59
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	60 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	61
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	62 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	63 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	64 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	65 static char ngx_http_charset_merge_loc_conf(ngx_conf_t cf,
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	66 void parent, void child);
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	67
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	68
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	69 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	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("charset_map"),
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_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	73 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	74 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	75 0,
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	76 NULL },
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	77
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	78 { 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	79 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	80 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	81 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	82 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	83 NULL },
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	84
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	85 { 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	86 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	87 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	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, source_charset),
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("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, enable),
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
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	99 { 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	100 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	101 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	102 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	103 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	104 NULL },
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 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_null_command
99 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
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	109
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	110 static ngx_http_module_t ngx_http_charset_filter_module_ctx = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	111 NULL, /* preconfiguration */
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	112 NULL, /* postconfiguration */
177 4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	113
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	114 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	115 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	116
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	117 NULL, /* create server configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	118 NULL, /* merge server 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 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	121 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	122 };
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	123
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 ngx_module_t ngx_http_charset_filter_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	126 NGX_MODULE_V1,
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	127 &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	128 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	129 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	130 ngx_http_charset_filter_init, /* init module */
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	131 NULL /* init process */
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	132 };
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	133
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	134
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	135 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	136 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	137
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	138
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	139 static ngx_int_t
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	140 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	141 {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	142 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	143 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	144 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	145 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	146
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	147 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	148 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	149
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	150 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	151 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	152 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	153
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	154 if (r->headers_out.content_type.len == 0) {
389 537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	155 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	156 }
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	157
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	158 if (ngx_strncasecmp(r->headers_out.content_type.data, "text/", 5) != 0
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	159 && ngx_strncasecmp(r->headers_out.content_type.data,
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	160 "application/x-javascript", 24) != 0)
389 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 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	163 }
537de4dca8ca nginx-0.0.7-2004-07-13-21:59:12 import Igor Sysoev <igor@sysoev.ru> parents: 356 diff changeset	164
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	165 if (ngx_strstr(r->headers_out.content_type.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	166 {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	167 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	168 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: 119 diff changeset	169
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	170 if (r->headers_out.status == NGX_HTTP_MOVED_PERMANENTLY
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	171 \|\| r->headers_out.status == NGX_HTTP_MOVED_TEMPORARILY)
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	172 {
155 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 * 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	175 * 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	176 */
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 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 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	179 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	180 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	181
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	182 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	183 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	184 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	185
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	186 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	187 r->headers_out.charset = charsets[lcf->default_charset].name;
523 2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	188 r->utf8 = charsets[lcf->default_charset].utf8;
339 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 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	191 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	192 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	193
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	194
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	195 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_charset_ctx_t));
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	196 if (ctx == NULL) {
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	197 return NGX_ERROR;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	198 }
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	199
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	200 ngx_http_set_ctx(r, ctx, ngx_http_charset_filter_module);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 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
346 55e496a8ece3 nginx-0.0.3-2004-06-06-23:49:18 import Igor Sysoev <igor@sysoev.ru> parents: 343 diff changeset	203 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	204
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	205 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	206 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	207
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	208
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	209 static ngx_int_t
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	210 ngx_http_charset_body_filter(ngx_http_request_t r, 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	211 {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	212 char *table;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	213 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	214 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	215 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	216 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	217 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	218
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	219 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	220
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	221 if (ctx == NULL) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	222 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	223 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	224
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	225 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	226 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	227
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	228 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	229 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	230
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	231 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	232 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	233 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	234
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	235 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	236 }
339 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
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	239 static ngx_uint_t
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	240 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	241 {
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	242 u_char *p;
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	243 ngx_uint_t 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 change = 0;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	246
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	247 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	248 if (p != table[p]) {
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	249 change = 1;
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	250 break;
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	251 }
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	252 }
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	253
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	254 if (change) {
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	255
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	256 while (p < b->last) {
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	257 p = table[p];
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	258 p++;
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	259 }
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	260
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	261 b->in_file = 0;
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	262 }
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	263
295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	264 return change;
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	265 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	266
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	267
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	268 static char *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	269 ngx_charset_map_block(ngx_conf_t cf, ngx_command_t cmd, void *conf)
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	270 {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	271 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	272
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	273 char *rv;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	274 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	275 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	276 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	277 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	278 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	279
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	280 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	281
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	282 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	283 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	284 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	285 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	286
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	287 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	288 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	289 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	290 }
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 if (src == dst) {
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 "\"charset_map\" between the same charsets "
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 }
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	298
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	299 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	300 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	301 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	302 \|\| (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	303 {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	304 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	305 "duplicate \"charset_map\" between "
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	306 "\"%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	307 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	308 }
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
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	311 table = ngx_array_push(&mcf->tables);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	312 if (table == NULL) {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	313 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	314 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	315
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	316 table->src = src;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	317 table->dst = dst;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	318
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	319 table->src2dst = ngx_palloc(cf->pool, 256);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	320 if (table->src2dst == NULL) {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	321 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	322 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	323
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	324 table->dst2src = ngx_palloc(cf->pool, 256);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	325 if (table->dst2src == NULL) {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	326 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	327 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	328
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	329 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	330 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	331 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	332 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	333
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	334 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	335 table->src2dst[i] = '?';
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	336 table->dst2src[i] = '?';
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	337 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	338
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	339 pvcf = *cf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	340 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	341 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	342 cf->handler_conf = conf;
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	343
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	344 rv = ngx_conf_parse(cf, NULL);
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	345
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	346 *cf = pvcf;
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	347
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	348 return rv;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	349 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	350
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	351
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	352 static char *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	353 ngx_charset_map(ngx_conf_t cf, ngx_command_t dummy, void *conf)
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	354 {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	355 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	356 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	357 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	358
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	359 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	360 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	361 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	362 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	363
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	364 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	365
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	366 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	367 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	368 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	369 "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	370 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	371 }
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 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	374 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	375 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	376 "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	377 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	378 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	379
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	380 table = cf->ctx;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	381
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 339 diff changeset	382 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	383 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	384
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	385 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	386 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	387
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	388
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	389 static char *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	390 ngx_http_set_charset_slot(ngx_conf_t cf, ngx_command_t cmd, void *conf)
339 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 char *p = conf;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	393
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	394 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	395 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	396 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	397 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	398
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	399 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	400
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	401 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	402 return "is duplicate";
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	403 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	404
396 6f3b20c1ac50 nginx-0.0.7-2004-07-18-23:11:20 import Igor Sysoev <igor@sysoev.ru> parents: 389 diff changeset	405 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	406 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	407
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	408 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	409
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	410 *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	411 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	412 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	413 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	414
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	415 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	416 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	417 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	418 }
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	419
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	420 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	421 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	422
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	423
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	424 static ngx_int_t
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	425 ngx_http_add_charset(ngx_array_t charsets, ngx_str_t name)
339 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 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	428 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	429
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	430 c = charsets->elts;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	431 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	432 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	433 continue;
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
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	436 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	437 break;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	438 }
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
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	441 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	442 return i;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	443 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	444
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	445 c = ngx_array_push(charsets);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	446 if (c == NULL) {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	447 return NGX_ERROR;
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
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	450 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	451 c->name = *name;
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	452 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	453
523 2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	454 if (ngx_strcasecmp(name->data, "utf-8") == 0) {
2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	455 c->utf8 = 1;
2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	456 }
2019117e6b38 nginx-0.1.36-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	457
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	458 return i;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	459 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	460
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	461
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	462 static ngx_int_t
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	463 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	464 {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	465 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	466 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	467
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 139 diff changeset	468 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	469 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	470
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	471 return NGX_OK;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	472 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	473
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	474
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	475 static void *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	476 ngx_http_charset_create_main_conf(ngx_conf_t *cf)
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	477 {
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	478 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	479
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	480 mcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_charset_main_conf_t));
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	481 if (mcf == NULL) {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	482 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	483 }
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	484
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	485 if (ngx_array_init(&mcf->charsets, cf->pool, 2, sizeof(ngx_http_charset_t))
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	486 == NGX_ERROR)
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	487 {
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	488 return NGX_CONF_ERROR;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	489 }
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	490
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	491 if (ngx_array_init(&mcf->tables, cf->pool, 4,
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	492 sizeof(ngx_http_charset_tables_t)) == NGX_ERROR)
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	493 {
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	494 return NGX_CONF_ERROR;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	495 }
338 0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	496
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	497 return mcf;
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	498 }
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	499
0376cffa29e6 nginx-0.0.3-2004-05-20-21:33:52 import Igor Sysoev <igor@sysoev.ru> parents: 307 diff changeset	500
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	501 static char *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	502 ngx_http_charset_init_main_conf(ngx_conf_t cf, void conf)
339 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 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	505
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	506 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	507 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	508 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	509
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	510 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	511 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	512
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	513 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	514 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	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 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	519 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	520 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	521 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	522 }
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 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	525 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	526 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	527 continue;
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
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	530 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	531 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	532 }
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 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	535
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	536 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	537 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	538 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	539 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	540
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	541 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	542 if (i == n) {
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	543 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	544 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	545
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	546 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	547 continue;
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	548 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	549
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	550 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	551 " no \"charset_map\" between the charsets "
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	552 "\"%V\" and \"%V\"",
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	553 &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	554 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	555 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	556 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	557
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	558 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	559 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	560
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	561
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	562 static void *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	563 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	564 {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	565 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	566
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	567 lcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_charset_loc_conf_t));
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	568 if (lcf == NULL) {
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	569 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	570 }
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	571
8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	572 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	573 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	574 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	575 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	576
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	577 return lcf;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	578 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	579
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	580
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	581 static char *
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	582 ngx_http_charset_merge_loc_conf(ngx_conf_t cf, void parent, void *child)
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	583 {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	584 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	585 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	586
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	587 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	588 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	589
477 ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	590
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	591 if (conf->default_charset == NGX_CONF_UNSET) {
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	592 conf->default_charset = prev->default_charset;
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	593 }
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	594
339 8c5b69141dfd nginx-0.0.3-2004-05-21-20:12:13 import Igor Sysoev <igor@sysoev.ru> parents: 338 diff changeset	595 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	596 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	597 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	598
477 ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	599 if (conf->default_charset == NGX_CONF_UNSET
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	600 && conf->source_charset != NGX_CONF_UNSET)
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	601 {
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	602 conf->default_charset = conf->source_charset;
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	603 }
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	604
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	605 if (conf->source_charset == NGX_CONF_UNSET
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	606 && conf->default_charset != NGX_CONF_UNSET)
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	607 {
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	608 conf->source_charset = conf->default_charset;
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	609 }
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	610
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	611 if (conf->enable
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	612 && (conf->default_charset == NGX_CONF_UNSET
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	613 \|\| conf->source_charset == NGX_CONF_UNSET))
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	614 {
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	615 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	616 "the \"source_charset\" or \"default_charset\" "
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	617 "must be specified when \"charset\" is on");
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	618 return NGX_CONF_ERROR;
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	619 }
340 0bf903191ceb nginx-0.0.3-2004-05-25-19:28:46 import Igor Sysoev <igor@sysoev.ru> parents: 339 diff changeset	620
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	621 return NGX_CONF_OK;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	622 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_charset_filter_module.c @ 523:2019117e6b38 release-0.1.36