diff options
| author | Lars Thorsen <[email protected]> | 2011-05-10 09:15:13 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2011-05-10 09:15:13 +0200 |
| commit | 6f7310e3a06af45f2635b0451874445b7f51b7ff (patch) | |
| tree | ce54006a66dd7f729bbb999b49d8fb8d0696bbec /lib/xmerl/src/xmerl_sax_parser.erl | |
| parent | e3af9123e7ef9291535cafbd0ecb9d3309d674f7 (diff) | |
| parent | c241e8780088624f369379ba87215a475276b201 (diff) | |
| download | otp-6f7310e3a06af45f2635b0451874445b7f51b7ff.tar.gz otp-6f7310e3a06af45f2635b0451874445b7f51b7ff.tar.bz2 otp-6f7310e3a06af45f2635b0451874445b7f51b7ff.zip | |
Merge branch 'lars/xmerl/test-suites/OTP-9228' into dev
* lars/xmerl/test-suites/OTP-9228:
Fix separator error in tokenlists.
Added the xmerl test suites.
Using the same testdata for testing xmerl_scan and xmerl_sax_parser.
Add test suite for xmerl
xmerl: Add doc/examples directory
Diffstat (limited to 'lib/xmerl/src/xmerl_sax_parser.erl')
| -rw-r--r-- | lib/xmerl/src/xmerl_sax_parser.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/xmerl/src/xmerl_sax_parser.erl b/lib/xmerl/src/xmerl_sax_parser.erl index eb9f8deec6..c1acf51b8a 100644 --- a/lib/xmerl/src/xmerl_sax_parser.erl +++ b/lib/xmerl/src/xmerl_sax_parser.erl @@ -278,6 +278,7 @@ detect_charset_1(Xml, State) -> convert_encoding(Enc) -> %% Just for 7,8 bit + utf8 case string:to_lower(Enc) of "utf-8" -> utf8; + "us-ascii" -> utf8; "iso-8859-1" -> latin1; % Handle all iso-8859 as latin1 "iso-8859-2" -> latin1; "iso-8859-3" -> latin1; |