comparison src/http/modules/ngx_http_charset_filter_module.c @ 1724:461d00e8a2a9 stable-0.5

r1591 merge: fix segfault
author Igor Sysoev <igor@sysoev.ru>
date Wed, 12 Dec 2007 20:50:46 +0000
parents 9b047c9e96c1
children
comparison
equal deleted inserted replaced
1723:9b047c9e96c1 1724:461d00e8a2a9
1460 || conf->charset == conf->source_charset) 1460 || conf->charset == conf->source_charset)
1461 { 1461 {
1462 return NGX_CONF_OK; 1462 return NGX_CONF_OK;
1463 } 1463 }
1464 1464
1465 if (conf->source_charset >= NGX_HTTP_CHARSET_VAR
1466 || conf->charset >= NGX_HTTP_CHARSET_VAR)
1467 {
1468 return NGX_CONF_OK;
1469 }
1470
1465 mcf = ngx_http_conf_get_module_main_conf(cf, 1471 mcf = ngx_http_conf_get_module_main_conf(cf,
1466 ngx_http_charset_filter_module); 1472 ngx_http_charset_filter_module);
1467 recode = mcf->recodes.elts; 1473 recode = mcf->recodes.elts;
1468 for (i = 0; i < mcf->recodes.nelts; i++) { 1474 for (i = 0; i < mcf->recodes.nelts; i++) {
1469 if (conf->source_charset == recode[i].src 1475 if (conf->source_charset == recode[i].src