diff --git a/inc/Maat_rule.h b/inc/Maat_rule.h index 752fb5e..e9444d6 100644 --- a/inc/Maat_rule.h +++ b/inc/Maat_rule.h @@ -30,7 +30,8 @@ enum MAAT_CHARSET CHARSET_UNICODE_NCR_DEC, //SGML Numeric character reference,decimal base, e.g. "ا" CHARSET_UNICODE_NCR_HEX, //SGML Numeric character reference,hexdecimal base, e.g. "ا" CHARSET_URL_ENCODE_GB2312, //URL encode with GB2312, e.g. the chinese word "china" was encoded to %D6%D0%B9%FA - CHARSET_URL_ENCODE_UTF8 //11, URL encode with UTF8,e.g. the chinese word "china" was encoded to %E4%B8%AD%E5%9B%BD + CHARSET_URL_ENCODE_UTF8, //11, URL encode with UTF8,e.g. the chinese word "china" was encoded to %E4%B8%AD%E5%9B%BD + CHARSET_WINDOWS1251 }; enum MAAT_ACTION { diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 9c08b90..90373d3 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -235,6 +235,7 @@ int universal_charset_convert(struct Maat_scanner* scanner,enum MAAT_CHARSET fro case CHARSET_BIG5: case CHARSET_UNICODE: case CHARSET_UTF8: + case CHARSET_WINDOWS1251: ret=iconv_convert(scanner,from,to,src,srclen,dst,dstlen); return ret; break; diff --git a/src/entry/Maat_utils.cpp b/src/entry/Maat_utils.cpp index 892fe09..3d40912 100644 --- a/src/entry/Maat_utils.cpp +++ b/src/entry/Maat_utils.cpp @@ -242,7 +242,7 @@ char* md5_file(const char* filename, char* md5string) return md5string; } const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", - "unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""}; + "unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8", "windows-1251", ""}; const char** charset_get_all_name(void) {