aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2012-03-06 12:39:12 +0100
committerLars Thorsen <[email protected]>2012-03-21 07:46:52 +0100
commit679361671977eaa6600b784a0b4e4b5c9ae4bb2a (patch)
treec055c6e0a5ccd9832524f998feedfbc61d150828 /lib
parenta3fc8eb0ed691f240023bd24bb74541020e243c4 (diff)
downloadotp-679361671977eaa6600b784a0b4e4b5c9ae4bb2a.tar.gz
otp-679361671977eaa6600b784a0b4e4b5c9ae4bb2a.tar.bz2
otp-679361671977eaa6600b784a0b4e4b5c9ae4bb2a.zip
Fix continuation error
Diffstat (limited to 'lib')
-rw-r--r--lib/xmerl/src/xmerl_sax_parser.erl3
-rw-r--r--lib/xmerl/src/xmerl_sax_parser_base.erlsrc3
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
]).
%%----------------------------------------------------------------------