diff options
author | Hans Bolinder <[email protected]> | 2017-02-22 15:28:26 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2017-02-22 15:28:26 +0100 |
commit | 38a10d18d104869ebba9af568b5566d0162c6faf (patch) | |
tree | b2f5e37b1fdd573d4165e44002dae977fb3ba120 /lib/xmerl/src/xmerl_sax_parser.hrl | |
parent | 056f1996759a29bfb97c4394bcb23c436905e4be (diff) | |
parent | 5073a7b88aa3a8e2c84dcf6bf48adafe4e874422 (diff) | |
download | otp-38a10d18d104869ebba9af568b5566d0162c6faf.tar.gz otp-38a10d18d104869ebba9af568b5566d0162c6faf.tar.bz2 otp-38a10d18d104869ebba9af568b5566d0162c6faf.zip |
Merge branch 'maint'
* maint:
[xmerl] Remove faulty throws
[xmerl] Fix XML "well-formedness" bug i SAX parser
[xmerl] Correct bug handling multiple documents on a stream
stdlib: Improve pretty-printing of terms with maps
Conflicts:
lib/stdlib/test/io_SUITE.erl
Diffstat (limited to 'lib/xmerl/src/xmerl_sax_parser.hrl')
-rw-r--r-- | lib/xmerl/src/xmerl_sax_parser.hrl | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/xmerl/src/xmerl_sax_parser.hrl b/lib/xmerl/src/xmerl_sax_parser.hrl index 932ab0cec5..7f9bf6c4d3 100644 --- a/lib/xmerl/src/xmerl_sax_parser.hrl +++ b/lib/xmerl/src/xmerl_sax_parser.hrl @@ -88,14 +88,7 @@ current_location, % Location of the currently parsed XML entity entity, % Parsed XML entity skip_external_dtd = false,% If true the external DTD is skipped during parsing - input_type % Source type: file | stream. - % This field is a preparation for an fix in R17 of a bug in - % the conformance against the standard. - % Today a file which contains two XML documents will be considered - % well-formed and the second is placed in the rest part of the - % return tuple, according to the conformance tests this should fail. - % In the future this will fail if xmerl_sax_aprser:file/2 is used but - % left to the user in the xmerl_sax_aprser:stream/2 case. + input_type % Source type: file | stream }). |