diff options
| author | Lars Thorsen <[email protected]> | 2012-03-21 07:49:29 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2012-03-21 07:49:29 +0100 |
| commit | d71f706dcca0145f9b3d54187c9ee37365b1e559 (patch) | |
| tree | c055c6e0a5ccd9832524f998feedfbc61d150828 | |
| parent | a3fc8eb0ed691f240023bd24bb74541020e243c4 (diff) | |
| parent | 679361671977eaa6600b784a0b4e4b5c9ae4bb2a (diff) | |
| download | otp-d71f706dcca0145f9b3d54187c9ee37365b1e559.tar.gz otp-d71f706dcca0145f9b3d54187c9ee37365b1e559.tar.bz2 otp-d71f706dcca0145f9b3d54187c9ee37365b1e559.zip | |
Merge branch 'lars/xmerl/continuation-error/OTP-9961' into maint
* lars/xmerl/continuation-error/OTP-9961:
Fix continuation error
| -rw-r--r-- | lib/xmerl/src/xmerl_sax_parser.erl | 3 | ||||
| -rw-r--r-- | lib/xmerl/src/xmerl_sax_parser_base.erlsrc | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/xmerl/src/xmerl_sax_parser.erl b/lib/xmerl/src/xmerl_sax_parser.erl index 45e2a928ac..1d795799ce 100644 --- a/lib/xmerl/src/xmerl_sax_parser.erl +++ b/lib/xmerl/src/xmerl_sax_parser.erl @@ -217,7 +217,7 @@ check_encoding_option(E) when E==utf8; E=={utf16,little}; E=={utf16,big}; check_encoding_option(utf16) -> {utf16,big}; check_encoding_option(E) -> - {error, io_lib:format("Charcter set ~p not supported", [E])}. + {error, io_lib:format("Character set ~p not supported", [E])}. %%---------------------------------------------------------------------- %% Function: detect_charset(Xml, State) @@ -279,6 +279,7 @@ convert_encoding(Enc) -> %% Just for 7,8 bit + utf8 case string:to_lower(Enc) of "utf-8" -> utf8; "us-ascii" -> utf8; + "latin1" -> latin1; "iso-8859-1" -> latin1; % Handle all iso-8859 as latin1 "iso-8859-2" -> latin1; "iso-8859-3" -> latin1; diff --git a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc index c25cde0472..e988c49292 100644 --- a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc +++ b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc @@ -39,6 +39,9 @@ %% Internal exports %%---------------------------------------------------------------------- -export([ + cf/3, + cf/4, + cf/5 ]). %%---------------------------------------------------------------------- |