aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Thorsen <lars@erlang.org>2011-05-17 07:35:13 +0200
committerLars Thorsen <lars@erlang.org>2011-05-17 07:35:13 +0200
commitc666fa93b12399a0160b6bfedf002eacbc2f01e2 (patch)
treeee4fcab544daaf8c9f4003bd9382ca054c236c0a
parent7e2d83439f64a74091b371fae82ab0163c415f05 (diff)
parent797126e753f922bfee56c9e1c34de5297c33f1e4 (diff)
downloadotp-c666fa93b12399a0160b6bfedf002eacbc2f01e2.tar.gz
otp-c666fa93b12399a0160b6bfedf002eacbc2f01e2.tar.bz2
otp-c666fa93b12399a0160b6bfedf002eacbc2f01e2.zip
Merge branch 'lars/xmerl/default-encoding/OTP-9288' into dev
* lars/xmerl/default-encoding/OTP-9288: Fix default encoding in SAX parser.
-rw-r--r--lib/xmerl/src/xmerl_sax_parser.erl4
-rw-r--r--lib/xmerl/vsn.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/xmerl/src/xmerl_sax_parser.erl b/lib/xmerl/src/xmerl_sax_parser.erl
index c1acf51b8a..571feabee0 100644
--- a/lib/xmerl/src/xmerl_sax_parser.erl
+++ b/lib/xmerl/src/xmerl_sax_parser.erl
@@ -263,11 +263,11 @@ detect_charset_1(<<16#3C, 16#3F, 16#78, 16#6D, 16#6C, Xml2/binary>> = Xml, State
{Xml, State#xmerl_sax_parser_state{encoding=Enc}}
end;
_ ->
- {Xml, State#xmerl_sax_parser_state{encoding=utf8}}
+ {Xml, State}
end
end;
detect_charset_1(Xml, State) ->
- {Xml, State#xmerl_sax_parser_state{encoding=utf8}}.
+ {Xml, State}.
%%----------------------------------------------------------------------
%% Function: convert_encoding(Enc)
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 280ff10efa..965a0ae7b4 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.2.8
+XMERL_VSN = 1.2.9