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

12 files changed, 763 insertions, 159 deletions

diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl
index 94376408d1..6ddba8121a 100644
--- a/lib/stdlib/src/io_lib_pretty.erl
+++ b/lib/stdlib/src/io_lib_pretty.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -139,6 +139,10 @@ max_cs(M, _Len) ->
     M.
 
 -define(ATM(T), is_list(element(1, T))).
+-define(ATM_PAIR(Pair),
+        ?ATM(element(2, element(1, Pair))) % Key
+        andalso
+        ?ATM(element(3, element(1, Pair)))). % Value
 -define(ATM_FLD(Field), ?ATM(element(4, element(1, Field)))).
 
 pp({_S, Len} = If, Col, Ll, M, _TInd, _Ind, LD, W) 
@@ -151,9 +155,8 @@ pp({{tuple,true,L}, _Len}, Col, Ll, M, TInd, Ind, LD, W) ->
 pp({{tuple,false,L}, _Len}, Col, Ll, M, TInd, Ind, LD, W) ->
     [${, pp_list(L, Col + 1, Ll, M, TInd, indent(1, Ind), LD, $,, W + 1), $}];
 pp({{map,Pairs},_Len}, Col, Ll, M, TInd, Ind, LD, W) ->
-    [$#,${, pp_list(Pairs, Col + 2, Ll, M, TInd, indent(2, Ind), LD, $,, W + 1), $}];
-pp({{map_pair,K,V},_Len}, Col, Ll, M, TInd, Ind, LD, W) ->
-    [pp(K, Col, Ll, M, TInd, Ind, LD, W), " => ", pp(V, Col, Ll, M, TInd, Ind, LD, W)];
+    [$#, ${, pp_map(Pairs, Col + 2, Ll, M, TInd, indent(2, Ind), LD, W + 1),
+     $}];
 pp({{record,[{Name,NLen} | L]}, _Len}, Col, Ll, M, TInd, Ind, LD, W) ->
     [Name, ${, pp_record(L, NLen, Col, Ll, M, TInd, Ind, LD, W + NLen+1), $}];
 pp({{bin,S}, _Len}, Col, Ll, M, _TInd, Ind, LD, W) ->
@@ -178,6 +181,46 @@ pp_tag_tuple([{Tag,Tlen} | L], Col, Ll, M, TInd, Ind, LD, W) ->
             [Tag, S | pp_list(L, Tcol, Ll, M, TInd, Indent, LD, S, W+Tlen+1)]
     end.
 
+pp_map([], _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
+    "";
+pp_map({dots, _}, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
+    "...";
+pp_map([P | Ps], Col, Ll, M, TInd, Ind, LD, W) ->
+    {PS, PW} = pp_pair(P, Col, Ll, M, TInd, Ind, last_depth(Ps, LD), W),
+    [PS | pp_pairs_tail(Ps, Col, Col + PW, Ll, M, TInd, Ind, LD, PW)].
+
+pp_pairs_tail([], _Col0, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
+    "";
+pp_pairs_tail({dots, _}, _Col0, _Col, _M, _Ll, _TInd, _Ind, _LD, _W) ->
+    ",...";
+pp_pairs_tail([{_, Len}=P | Ps], Col0, Col, Ll, M, TInd, Ind, LD, W) ->
+    LD1 = last_depth(Ps, LD),
+    ELen = 1 + Len,
+    if
+        LD1 =:= 0, ELen + 1 < Ll - Col, W + ELen + 1 =< M, ?ATM_PAIR(P);
+        LD1 > 0, ELen < Ll - Col - LD1, W + ELen + LD1 =< M, ?ATM_PAIR(P) ->
+            [$,, write_pair(P) |
+             pp_pairs_tail(Ps, Col0, Col+ELen, Ll, M, TInd, Ind, LD, W+ELen)];
+        true ->
+            {PS, PW} = pp_pair(P, Col0, Ll, M, TInd, Ind, LD1, 0),
+            [$,, $\n, Ind, PS |
+             pp_pairs_tail(Ps, Col0, Col0 + PW, Ll, M, TInd, Ind, LD, PW)]
+    end.
+
+pp_pair({_, Len}=Pair, Col, Ll, M, _TInd, _Ind, LD, W)
+         when Len < Ll - Col - LD, Len + W + LD =< M ->
+    {write_pair(Pair), if
+                          ?ATM_PAIR(Pair) ->
+                              Len;
+                          true ->
+                              Ll % force nl
+                      end};
+pp_pair({{map_pair, K, V}, _Len}, Col0, Ll, M, TInd, Ind0, LD, W) ->
+    I = map_value_indent(TInd),
+    Ind = indent(I, Ind0),
+    {[pp(K, Col0, Ll, M, TInd, Ind0, LD, W), " =>\n",
+      Ind | pp(V, Col0 + I, Ll, M, TInd, Ind, LD, 0)], Ll}. % force nl
+
 pp_record([], _Nlen, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
     "";
 pp_record({dots, _}, _Nlen, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
@@ -216,7 +259,11 @@ pp_field({_, Len}=Fl, Col, Ll, M, _TInd, _Ind, LD, W)
                       end};
 pp_field({{field, Name, NameL, F}, _Len}, Col0, Ll, M, TInd, Ind0, LD, W0) ->
     {Col, Ind, S, W} = rec_indent(NameL, TInd, Col0, Ind0, W0 + NameL),
-    {[Name, " = ", S | pp(F, Col, Ll, M, TInd, Ind, LD, W)], Ll}. % force nl
+    Sep = case S of
+              [$\n | _] -> " =";
+              _ -> " = "
+          end,
+    {[Name, Sep, S | pp(F, Col, Ll, M, TInd, Ind, LD, W)], Ll}. % force nl
 
 rec_indent(RInd, TInd, Col0, Ind0, W0) ->
     %% this uses TInd
@@ -305,8 +352,8 @@ write({{list, L}, _}) ->
     [$[, write_list(L, $|), $]];
 write({{map, Pairs}, _}) ->
     [$#,${, write_list(Pairs, $,), $}];
-write({{map_pair, K, V}, _}) ->
-    [write(K)," => ",write(V)];
+write({{map_pair, _K, _V}, _}=Pair) ->
+    write_pair(Pair);
 write({{record, [{Name,_} | L]}, _}) ->
     [Name, ${, write_fields(L), $}];
 write({{bin, S}, _}) ->
@@ -314,6 +361,9 @@ write({{bin, S}, _}) ->
 write({S, _}) ->
     S.
 
+write_pair({{map_pair, K, V}, _}) ->
+    [write(K), " => ", write(V)].
+
 write_fields([]) ->
     "";
 write_fields({dots, _}) ->
@@ -347,7 +397,7 @@ write_tail(E, S) ->
 
 %% The depth (D) is used for extracting and counting the characters to
 %% print. The structure is kept so that the returned intermediate
-%% format can be formatted. The separators (list, tuple, record) are
+%% format can be formatted. The separators (list, tuple, record, map) are
 %% counted but need to be added later.
 
 %% D =/= 0
@@ -423,21 +473,32 @@ print_length(Term, _D, _RF, _Enc, _Str) ->
 print_length_map(_Map, 1, _RF, _Enc, _Str) ->
     {"#{...}", 6};
 print_length_map(Map, D, RF, Enc, Str) when is_map(Map) ->
-    Pairs = print_length_map_pairs(maps:to_list(Map), D, RF, Enc, Str),
+    Pairs = print_length_map_pairs(maps_to_list(Map, D), D, RF, Enc, Str),
     {{map, Pairs}, list_length(Pairs, 3)}.
 
+maps_to_list(Map, D) when D < 0; map_size(Map) =< D ->
+    maps:to_list(Map);
+maps_to_list(Map, D) ->
+    F = fun(_K, _V, {N, L}) when N =:= D ->
+                throw(L);
+           (K, V, {N, L}) ->
+                {N+1, [{K, V} | L]}
+        end,
+    lists:reverse(catch maps:fold(F, {0, []}, Map)).
+
 print_length_map_pairs([], _D, _RF, _Enc, _Str) ->
     [];
 print_length_map_pairs(_Pairs, 1, _RF, _Enc, _Str) ->
     {dots, 3};
-print_length_map_pairs([{K,V}|Pairs], D, RF, Enc, Str) ->
-    [print_length_map_pair(K,V,D-1,RF,Enc,Str) |
-     print_length_map_pairs(Pairs,D-1,RF,Enc,Str)].
+print_length_map_pairs([{K, V} | Pairs], D, RF, Enc, Str) ->
+    [print_length_map_pair(K, V, D - 1, RF, Enc, Str) |
+     print_length_map_pairs(Pairs, D - 1, RF, Enc, Str)].
 
 print_length_map_pair(K, V, D, RF, Enc, Str) ->
     {KS, KL} = print_length(K, D, RF, Enc, Str),
     {VS, VL} = print_length(V, D, RF, Enc, Str),
-    {{map_pair, {KS,KL}, {VS,VL}}, KL + VL}.
+    KL1 = KL + 4,
+    {{map_pair, {KS, KL1}, {VS, VL}}, KL1 + VL}.
 
 print_length_tuple(_Tuple, 1, _RF, _Enc, _Str) ->
     {"{...}", 5};
@@ -630,6 +691,8 @@ cind({{tuple,true,L}, _Len}, Col, Ll, M, Ind, LD, W) ->
     cind_tag_tuple(L, Col, Ll, M, Ind, LD, W + 1);
 cind({{tuple,false,L}, _Len}, Col, Ll, M, Ind, LD, W) ->
     cind_list(L, Col + 1, Ll, M, Ind, LD, W + 1);
+cind({{map,Pairs},_Len}, Col, Ll, M, Ind, LD, W) ->
+    cind_map(Pairs, Col + 2, Ll, M, Ind, LD, W + 2);
 cind({{record,[{_Name,NLen} | L]}, _Len}, Col, Ll, M, Ind, LD, W) ->
     cind_record(L, NLen, Col, Ll, M, Ind, LD, W + NLen + 1);
 cind({{bin,_S}, _Len}, _Col, _Ll, _M, Ind, _LD, _W) ->
@@ -655,6 +718,48 @@ cind_tag_tuple([{_Tag,Tlen} | L], Col, Ll, M, Ind, LD, W) ->
             throw(no_good)
     end.
 
+cind_map([P | Ps], Col, Ll, M, Ind, LD, W) ->
+    PW = cind_pair(P, Col, Ll, M, Ind, last_depth(Ps, LD), W),
+    cind_pairs_tail(Ps, Col, Col + PW, Ll, M, Ind, LD, W + PW);
+cind_map(_, _Col, _Ll, _M, Ind, _LD, _W) ->
+    Ind.
+
+cind_pairs_tail([{_, Len}=P | Ps], Col0, Col, Ll, M, Ind, LD, W) ->
+    LD1 = last_depth(Ps, LD),
+    ELen = 1 + Len,
+    if
+        LD1 =:= 0, ELen + 1 < Ll - Col, W + ELen + 1 =< M, ?ATM_PAIR(P);
+        LD1 > 0, ELen < Ll - Col - LD1, W + ELen + LD1 =< M, ?ATM_PAIR(P) ->
+            cind_pairs_tail(Ps, Col0, Col + ELen, Ll, M, Ind, LD, W + ELen);
+        true ->
+            PW = cind_pair(P, Col0, Ll, M, Ind, LD1, 0),
+            cind_pairs_tail(Ps, Col0, Col0 + PW, Ll, M, Ind, LD, PW)
+    end;
+cind_pairs_tail(_, _Col0, _Col, _Ll, _M, Ind, _LD, _W) ->
+    Ind.
+
+cind_pair({{map_pair, _Key, _Value}, Len}=Pair, Col, Ll, M, _Ind, LD, W)
+         when Len < Ll - Col - LD, Len + W + LD =< M ->
+    if
+        ?ATM_PAIR(Pair) ->
+            Len;
+        true ->
+            Ll
+    end;
+cind_pair({{map_pair, K, V}, _Len}, Col0, Ll, M, Ind, LD, W0) ->
+    cind(K, Col0, Ll, M, Ind, LD, W0),
+    I = map_value_indent(Ind),
+    cind(V, Col0 + I, Ll, M, Ind, LD, 0),
+    Ll.
+
+map_value_indent(TInd) ->
+    case TInd > 0 of
+        true ->
+            TInd;
+        false ->
+            4
+    end.
+
 cind_record([F | Fs], Nlen, Col0, Ll, M, Ind, LD, W0) ->
     Nind = Nlen + 1,
     {Col, W} = cind_rec(Nind, Col0, Ll, M, Ind, W0),
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index b0a1e461e3..d546e8fad2 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 	 io_lib_print_binary_depth_one/1, otp_10302/1, otp_10755/1,
          otp_10836/1, io_lib_width_too_small/1,
          io_with_huge_message_queue/1, format_string/1,
-	 maps/1, coverage/1, otp_14178_unicode_atoms/1]).
+	 maps/1, coverage/1, otp_14178_unicode_atoms/1, otp_14175/1]).
 
 -export([pretty/2]).
 
@@ -61,7 +61,7 @@ all() ->
      printable_range, bad_printable_range,
      io_lib_print_binary_depth_one, otp_10302, otp_10755, otp_10836,
      io_lib_width_too_small, io_with_huge_message_queue,
-     format_string, maps, coverage, otp_14178_unicode_atoms].
+     format_string, maps, coverage, otp_14178_unicode_atoms, otp_14175].
 
 %% Error cases for output.
 error_1(Config) when is_list(Config) ->
@@ -415,13 +415,13 @@ otp_6354(Config) when is_list(Config) ->
     bt(<<"#rrrrr{\n"
 	 "    f1 = 1,\n"
 	 "    f2 = #rrrrr{f1 = a,f2 = b,f3 = c},\n"
-	 "    f3 = \n"
+	 "    f3 =\n"
 	 "        #rrrrr{\n"
 	 "            f1 = h,f2 = i,\n"
-	 "            f3 = \n"
+	 "            f3 =\n"
 	 "                #rrrrr{\n"
 	 "                    f1 = aa,\n"
-	 "                    f2 = \n"
+	 "                    f2 =\n"
 	 "                        #rrrrr{\n"
 	 "                            f1 = #rrrrr{f1 = a,f2 = b,f3 = c},\n"
 	 "                            f2 = 2,f3 = 3},\n"
@@ -431,17 +431,17 @@ otp_6354(Config) when is_list(Config) ->
 					    2,3},bb}}},
 	 -1)),
     bt(<<"#d{aaaaaaaaaaaaaaaaaaaa = 1,\n"
-	 "   bbbbbbbbbbbbbbbbbbbb = \n"
+	 "   bbbbbbbbbbbbbbbbbbbb =\n"
 	 "       #d{aaaaaaaaaaaaaaaaaaaa = a,bbbbbbbbbbbbbbbbbbbb = b,\n"
 	 "          cccccccccccccccccccc = c,dddddddddddddddddddd = d,\n"
 	 "          eeeeeeeeeeeeeeeeeeee = e},\n"
 	 "   cccccccccccccccccccc = 3,\n"
-	 "   dddddddddddddddddddd = \n"
+	 "   dddddddddddddddddddd =\n"
 	 "       #d{aaaaaaaaaaaaaaaaaaaa = h,bbbbbbbbbbbbbbbbbbbb = i,\n"
-	 "          cccccccccccccccccccc = \n"
+	 "          cccccccccccccccccccc =\n"
 	 "              #d{aaaaaaaaaaaaaaaaaaaa = aa,"
 	 "bbbbbbbbbbbbbbbbbbbb = bb,\n"
-	 "                 cccccccccccccccccccc = \n"
+	 "                 cccccccccccccccccccc =\n"
 	 "                     #d{aaaaaaaaaaaaaaaaaaaa = 1,"
 	 "bbbbbbbbbbbbbbbbbbbb = 2,\n"
 	 "                        cccccccccccccccccccc = 3,"
@@ -534,21 +534,21 @@ otp_6354(Config) when is_list(Config) ->
        p({A,{A,{A,{A,{A,{A,{A,
 			    {g,{h,{i,{j,{k,{l,{m,{n,{o,{a}}}}}}}}}}}}}}}}}, 100)),
     bt(<<"#c{\n"
-	 " f1 = \n"
+	 " f1 =\n"
 	 "  #c{\n"
-	 "   f1 = \n"
+	 "   f1 =\n"
 	 "    #c{\n"
-	 "     f1 = \n"
+	 "     f1 =\n"
 	 "      #c{\n"
-	 "       f1 = \n"
+	 "       f1 =\n"
 	 "        #c{\n"
-	 "         f1 = \n"
+	 "         f1 =\n"
 	 "          #c{\n"
-	 "           f1 = \n"
+	 "           f1 =\n"
 	 "            #c{\n"
-	 "             f1 = \n"
+	 "             f1 =\n"
 	 "              #c{\n"
-	 "               f1 = \n"
+	 "               f1 =\n"
 	 "                #c{\n"
 	 "                 f1 = #c{f1 = #c{f1 = #c{f1 = a,"
 	 "f2 = b},f2 = b},f2 = b},\n"
@@ -564,13 +564,13 @@ otp_6354(Config) when is_list(Config) ->
        p({c,{c,{c,{c,{c,{c,{c,{c,{c,{c,{c,{c,a,b},b},b},b},b},b},
 			 b},b},b},b},b},b}, -1)),
     bt(<<"#rrrrr{\n"
-	 " f1 = \n"
+	 " f1 =\n"
 	 "  #rrrrr{\n"
-	 "   f1 = \n"
+	 "   f1 =\n"
 	 "    #rrrrr{\n"
-	 "     f1 = \n"
+	 "     f1 =\n"
 	 "      #rrrrr{\n"
-	 "       f1 = \n"
+	 "       f1 =\n"
 	 "        {rrrrr,{rrrrr,a,#rrrrr{f1 = {rrrrr,1,2},f2 = a,"
 	 "f3 = b}},b},\n"
 	 "       f2 = {rrrrr,c,d},\n"
@@ -2127,3 +2127,200 @@ bad_io_lib_format(F, S) ->
         error:badarg ->
             ok
     end.
+
+otp_14175(_Config) ->
+    "..." = p(#{}, 0),
+    "#{}" = p(#{}, 1),
+    "#{...}" = p(#{a => 1}, 1),
+    "#{#{} => a}" = p(#{#{} => a}, 2),
+    "#{a => 1,...}" = p(#{a => 1, b => 2}, 2),
+    "#{a => 1,b => 2}" = p(#{a => 1, b => 2}, -1),
+
+    M = #{kaaaaaaaaaaaaaaaaaaa => v1,kbbbbbbbbbbbbbbbbbbb => v2,
+          kccccccccccccccccccc => v3,kddddddddddddddddddd => v4,
+          keeeeeeeeeeeeeeeeeee => v5},
+    "#{...}" = p(M, 1),
+    mt("#{kaaaaaaaaaaaaaaaaaaaa => v1,...}", p(M, 2)),
+    mt("#{kaaaaaaaaaaaaaaaaaaaa => 1,kbbbbbbbbbbbbbbbbbbbb => 2,...}",
+       p(M, 3)),
+
+    mt("#{kaaaaaaaaaaaaaaaaaaa => v1,kbbbbbbbbbbbbbbbbbbb => v2,\n"
+       "  kccccccccccccccccccc => v3,...}", p(M, 4)),
+
+    mt("#{kaaaaaaaaaaaaaaaaaaa => v1,kbbbbbbbbbbbbbbbbbbb => v2,\n"
+       "  kccccccccccccccccccc => v3,kddddddddddddddddddd => v4,...}",
+       p(M, 5)),
+
+    mt("#{kaaaaaaaaaaaaaaaaaaa => v1,kbbbbbbbbbbbbbbbbbbb => v2,\n"
+       "  kccccccccccccccccccc => v3,kddddddddddddddddddd => v4,\n"
+       "  keeeeeeeeeeeeeeeeeee => v5}", p(M, 6)),
+
+    weak("#{aaaaaaaaaaaaaaaaaaa => 1,bbbbbbbbbbbbbbbbbbbb => 2,\n"
+         "  cccccccccccccccccccc => {3},\n"
+         "  dddddddddddddddddddd => 4,eeeeeeeeeeeeeeeeeeee => 5}",
+       p(#{aaaaaaaaaaaaaaaaaaa => 1,bbbbbbbbbbbbbbbbbbbb => 2,
+           cccccccccccccccccccc => {3},
+           dddddddddddddddddddd => 4,eeeeeeeeeeeeeeeeeeee => 5}, -1)),
+
+    M2 = #{dddddddddddddddddddd => {1}, {aaaaaaaaaaaaaaaaaaaa} => 2,
+           {bbbbbbbbbbbbbbbbbbbb} => 3,{cccccccccccccccccccc} => 4,
+           {eeeeeeeeeeeeeeeeeeee} => 5},
+    "#{...}" = p(M2, 1),
+    weak("#{dddddddddddddddddddd => {...},...}", p(M2, 2)),
+    weak("#{dddddddddddddddddddd => {1},{...} => 2,...}", p(M2, 3)),
+
+    weak("#{dddddddddddddddddddd => {1},\n"
+         "  {aaaaaaaaaaaaaaaaaaaa} => 2,\n"
+         "  {...} => 3,...}", p(M2, 4)),
+
+    weak("#{dddddddddddddddddddd => {1},\n"
+         "  {aaaaaaaaaaaaaaaaaaaa} => 2,\n"
+         "  {bbbbbbbbbbbbbbbbbbbb} => 3,\n"
+         "  {...} => 4,...}", p(M2, 5)),
+
+    weak("#{dddddddddddddddddddd => {1},\n"
+         "  {aaaaaaaaaaaaaaaaaaaa} => 2,\n"
+         "  {bbbbbbbbbbbbbbbbbbbb} => 3,\n"
+         "  {cccccccccccccccccccc} => 4,\n"
+         "  {...} => 5}", p(M2, 6)),
+
+    weak("#{dddddddddddddddddddd => {1},\n"
+         "  {aaaaaaaaaaaaaaaaaaaa} => 2,\n"
+         "  {bbbbbbbbbbbbbbbbbbbb} => 3,\n"
+         "  {cccccccccccccccccccc} => 4,\n"
+         "  {eeeeeeeeeeeeeeeeeeee} => 5}", p(M2, 7)),
+
+    M3 = #{kaaaaaaaaaaaaaaaaaaa => vuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu,
+           kbbbbbbbbbbbbbbbbbbb => vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv,
+           kccccccccccccccccccc => vxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,
+           kddddddddddddddddddd => vyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy,
+           keeeeeeeeeeeeeeeeeee => vzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz},
+
+    mt("#{aaaaaaaaaaaaaaaaaaaa =>\n"
+       "      uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu,\n"
+       "  bbbbbbbbbbbbbbbbbbbb =>\n"
+       "      vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv,\n"
+       "  cccccccccccccccccccc =>\n"
+       "      xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,\n"
+       "  dddddddddddddddddddd =>\n"
+       "      yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy,\n"
+       "  eeeeeeeeeeeeeeeeeeee =>\n"
+       "      zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz}", p(M3, -1)),
+
+    R4 = {c,{c,{c,{c,{c,{c,{c,{c,{c,{c,{c,{c,a,b},b},b},b},b},b},
+			 b},b},b},b},b},b},
+    M4 = #{aaaaaaaaaaaaaaaaaaaa => R4,
+           bbbbbbbbbbbbbbbbbbbb => R4,
+           cccccccccccccccccccc => R4,
+           dddddddddddddddddddd => R4,
+           eeeeeeeeeeeeeeeeeeee => R4},
+
+    weak("#{aaaaaaaaaaaaaaaaaaaa =>\n"
+         "      #c{f1 = #c{f1 = #c{...},f2 = b},f2 = b},\n"
+         "  bbbbbbbbbbbbbbbbbbbb => #c{f1 = #c{f1 = {...},...},f2 = b},\n"
+         "  cccccccccccccccccccc => #c{f1 = #c{...},f2 = b},\n"
+         "  dddddddddddddddddddd => #c{f1 = {...},...},\n"
+         "  eeeeeeeeeeeeeeeeeeee => #c{...}}", p(M4, 7)),
+
+    M5 = #{aaaaaaaaaaaaaaaaaaaa => R4},
+    mt("#{aaaaaaaaaaaaaaaaaaaa =>\n"
+       "   #c{\n"
+       "    f1 =\n"
+       "     #c{\n"
+       "      f1 =\n"
+       "       #c{\n"
+       "        f1 =\n"
+       "         #c{\n"
+       "          f1 =\n"
+       "           #c{\n"
+       "            f1 =\n"
+       "             #c{\n"
+       "              f1 =\n"
+       "               #c{\n"
+       "                f1 =\n"
+       "                 #c{\n"
+       "                  f1 =\n"
+       "                   #c{\n"
+       "                    f1 = #c{f1 = #c{f1 = #c{f1 = a,f2 = b},f2 = b},"
+                                        "f2 = b},\n"
+       "                    f2 = b},\n"
+       "                  f2 = b},\n"
+       "                f2 = b},\n"
+       "              f2 = b},\n"
+       "            f2 = b},\n"
+       "          f2 = b},\n"
+       "        f2 = b},\n"
+       "      f2 = b},\n"
+       "    f2 = b}}", p(M5, -1)),
+    ok.
+
+%% Just check number of newlines and dots ('...').
+-define(WEAK, true).
+
+-ifdef(WEAK).
+
+weak(S, R) ->
+    (nl(S) =:= nl(R) andalso
+     dots(S) =:= dots(S)).
+
+nl(S) ->
+    [C || C <- S, C =:= $\n].
+
+dots(S) ->
+    [C || C <- S, C =:= $\.].
+
+-else. % WEAK
+
+weak(S, R) ->
+    mt(S, R).
+
+-endif. % WEAK
+
+%% If EXACT is defined: mt() matches strings exactly.
+%%
+%% if EXACT is not defined: do not match the strings exactly, but
+%% compare them assuming that all map keys and all map values are
+%% equal (by assuming all map keys and all map values have the same
+%% length and begin with $k and $v respectively).
+
+%-define(EXACT, true).
+
+-ifdef(EXACT).
+
+mt(S, R) ->
+    S =:= R.
+
+-else. % EXACT
+
+mt(S, R) ->
+    anon(S) =:= anon(R).
+
+anon(S) ->
+    {ok, Ts0, _} = erl_scan:string(S, 1, [text]),
+    Ts = anon1(Ts0),
+    text(Ts).
+
+anon1([]) -> [];
+anon1([{atom,Anno,Atom}=T|Ts]) ->
+    case erl_anno:text(Anno) of
+        "k" ++ _ ->
+            NewAnno = erl_anno:set_text("key", Anno),
+            [{atom,NewAnno,Atom}|anon1(Ts)];
+        "v" ++ _ ->
+            NewAnno = erl_anno:set_text("val", Anno),
+            [{atom,NewAnno,Atom}|anon1(Ts)];
+        _ ->
+            [T|anon1(Ts)]
+    end;
+anon1([T|Ts]) ->
+    [T|anon1(Ts)].
+
+text(Ts) ->
+    lists:append(text1(Ts)).
+
+text1([]) -> [];
+text1([T|Ts]) ->
+    Anno = element(2, T),
+    [erl_anno:text(Anno) | text1(Ts)].
+
+-endif. % EXACT
diff --git a/lib/xmerl/src/xmerl_sax_parser.erl b/lib/xmerl/src/xmerl_sax_parser.erl
index 318a0cf7f4..1aef6c58c4 100644
--- a/lib/xmerl/src/xmerl_sax_parser.erl
+++ b/lib/xmerl/src/xmerl_sax_parser.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([file/2,
+	 stream/3,
 	 stream/2]).
 
 %%----------------------------------------------------------------------
@@ -72,11 +73,12 @@ file(Name,Options) ->
             File = filename:basename(Name),
 	    ContinuationFun = fun default_continuation_cb/1,
             Res = stream(<<>>, 
-			[{continuation_fun, ContinuationFun},
-			 {continuation_state, FD}, 
-			 {current_location, CL},
-			 {entity, File}
-			 |Options]),
+                         [{continuation_fun, ContinuationFun},
+                          {continuation_state, FD}, 
+                          {current_location, CL},
+                          {entity, File}
+                          |Options],
+                         file),
 	    ok = file:close(FD),
 	    Res
     end.
@@ -92,19 +94,22 @@ file(Name,Options) ->
 %%           EventState = term()
 %% Description: Parse a stream containing an XML document.
 %%----------------------------------------------------------------------
-stream(Xml, Options) when is_list(Xml), is_list(Options) ->
+stream(Xml, Options) ->
+    stream(Xml, Options, stream).
+
+stream(Xml, Options, InputType) when is_list(Xml), is_list(Options) ->
     State = parse_options(Options, initial_state()),
-    case  State#xmerl_sax_parser_state.file_type of
+    case State#xmerl_sax_parser_state.file_type of
 	dtd ->
 	    xmerl_sax_parser_list:parse_dtd(Xml, 
 					    State#xmerl_sax_parser_state{encoding = list,
-									 input_type = stream});
+									 input_type = InputType});
 	normal ->
 	    xmerl_sax_parser_list:parse(Xml, 
 					State#xmerl_sax_parser_state{encoding = list,
-								     input_type = stream})
+								     input_type = InputType})
     end;
-stream(Xml, Options) when is_binary(Xml), is_list(Options) ->
+stream(Xml, Options, InputType) when is_binary(Xml), is_list(Options) ->
     case parse_options(Options, initial_state()) of 
 	{error, Reason} -> {error, Reason};
 	State ->
@@ -127,7 +132,7 @@ stream(Xml, Options) when is_binary(Xml), is_list(Options) ->
 				    State#xmerl_sax_parser_state.event_state};
 		{Xml1, State1} ->
 		    parse_binary(Xml1, 
-				 State1#xmerl_sax_parser_state{input_type = stream},
+				 State1#xmerl_sax_parser_state{input_type = InputType},
 				 ParseFunction)
 	    end
     end.
@@ -226,12 +231,12 @@ check_encoding_option(E) ->
 %% Description: Detects which character set is used in a binary stream.
 %%----------------------------------------------------------------------
 detect_charset(<<>>, #xmerl_sax_parser_state{continuation_fun = undefined} = _) ->
-    throw({error, "Can't detect character encoding due to no indata"});
+    {error, "Can't detect character encoding due to no indata"};
 detect_charset(<<>>, #xmerl_sax_parser_state{continuation_fun = CFun, 
 				      continuation_state = CState} = State) ->
     case CFun(CState) of
 	{<<>>,  _} ->
-	    throw({error, "Can't detect character encoding due to lack of indata"});
+	    {error, "Can't detect character encoding due to lack of indata"};
 	{NewBytes, NewContState} ->
 	    detect_charset(NewBytes, State#xmerl_sax_parser_state{continuation_state = NewContState})
     end;
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
 	 }).
 
 
diff --git a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
index 4d75805b9b..2b9b37b5f3 100644
--- a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
+++ b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
@@ -1,7 +1,7 @@
 %%-*-erlang-*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -72,7 +72,12 @@ parse(Xml, State) ->
 	{ok, Rest, State2} ->
 	    State3 =  event_callback(endDocument, State2),
 	    ets:delete(RefTable),
-	    {ok, State3#xmerl_sax_parser_state.event_state, Rest}; 
+            case check_if_rest_ok(State3#xmerl_sax_parser_state.input_type, Rest) of
+                true ->
+                    {ok, State3#xmerl_sax_parser_state.event_state, Rest}; 
+                false ->
+                    format_error(fatal_error, State3, "Input found after legal document")
+            end;
 	{fatal_error, {State2, Reason}} ->
 	    State3 =  event_callback(endDocument, State2),
 	    ets:delete(RefTable),
@@ -81,10 +86,14 @@ parse(Xml, State) ->
 	    State3 =  event_callback(endDocument, State2),
 	    ets:delete(RefTable),
 	    format_error(Tag, State3, Reason);
+	{endDocument, Rest, State2} ->
+	    State3 =  event_callback(endDocument, State2),
+	    ets:delete(RefTable),
+	    {ok, State3#xmerl_sax_parser_state.event_state, Rest}; 
 	Other ->
 	    _State2 = event_callback(endDocument, State1),
 	    ets:delete(RefTable),
-	    throw(Other)
+	    {fatal_error, Other}
     end.
 
 %%----------------------------------------------------------------------
@@ -111,7 +120,7 @@ parse_dtd(Xml, State) ->
 	{Rest, State2} when is_record(State2, xmerl_sax_parser_state) ->
 	    State3 =  event_callback(endDocument, State2),
 	    ets:delete(RefTable),
-	    {ok, State3#xmerl_sax_parser_state.event_state, Rest}; 
+            {ok, State3#xmerl_sax_parser_state.event_state, Rest}; 
 	{endDocument, Rest, State2} when is_record(State2, xmerl_sax_parser_state) ->
 	    State3 =  event_callback(endDocument, State2),
 	    ets:delete(RefTable),
@@ -119,7 +128,7 @@ parse_dtd(Xml, State) ->
 	Other ->
 	    _State2 = event_callback(endDocument, State1),
 	    ets:delete(RefTable),
-	    throw(Other)
+	    {fatal_error, Other}
     end.
 
 
@@ -442,6 +451,15 @@ check_if_new_doc_allowed(stream, []) ->
 check_if_new_doc_allowed(_, _) ->
     false.
 
+check_if_rest_ok(file, []) ->
+    true;
+check_if_rest_ok(file, <<>>) ->
+    true;
+check_if_rest_ok(stream, _) ->
+    true;
+check_if_rest_ok(_, _) ->
+    false.
+
 %%----------------------------------------------------------------------
 %% Function: parse_pi_1(Rest, State) -> Result
 %% Input:    Rest = string() | binary()
@@ -1024,16 +1042,21 @@ parse_etag(Bytes, State) ->
     unicode_incomplete_check([Bytes, State, fun parse_etag/2], 
 			     undefined).
 
-
 parse_etag_1(?STRING_REST(">", Rest), 
 	     #xmerl_sax_parser_state{end_tags=[{_ETag, Uri, LocalName, QName, OldNsList, NewNsList}
-					|RestOfETags]} = State, _Tag) ->
+					|RestOfETags],
+                                    input_type=InputType} = State, _Tag) ->
     State1 =  event_callback({endElement, Uri, LocalName, QName}, State),
     State2 =  send_end_prefix_mapping_event(NewNsList, State1),
-    parse_content(Rest, 
-		  State2#xmerl_sax_parser_state{end_tags=RestOfETags,
-					 ns = OldNsList},
-		  [], true);
+    case check_if_new_doc_allowed(InputType, RestOfETags) of
+        true ->
+            throw({endDocument, Rest, State2#xmerl_sax_parser_state{ns = OldNsList}});
+        false ->
+            parse_content(Rest, 
+                          State2#xmerl_sax_parser_state{end_tags=RestOfETags,
+                                                        ns = OldNsList},
+                          [], true)
+    end;
 parse_etag_1(?STRING_UNBOUND_REST(_C, _), State, Tag) ->
     {P,TN} = Tag,
     ?fatal_error(State, "Bad EndTag: " ++ P ++ ":" ++ TN);
@@ -1051,21 +1074,26 @@ parse_etag_1(Bytes, State, Tag) ->
 %% Description: Parsing the content part of tags
 %%              [43] content ::= (element | CharData | Reference | CDSect | PI | Comment)*
 %%----------------------------------------------------------------------
-
 parse_content(?STRING_EMPTY, State, Acc, IgnorableWS) ->
-    case catch cf(?STRING_EMPTY, State, Acc, IgnorableWS, fun parse_content/4) of
-	{Rest, State1} when is_record(State1, xmerl_sax_parser_state) ->
-	    {Rest, State1};
-	{fatal_error, {State1, Msg}} ->
-	    case check_if_document_complete(State1, Msg) of
-		true ->
-		    State2 = send_character_event(length(Acc), IgnorableWS, lists:reverse(Acc), State1),
-		    {?STRING_EMPTY, State2};
-		false ->
-		    ?fatal_error(State1, Msg)
-	    end;
-	Other ->
-	    throw(Other)
+    case check_if_document_complete(State, "No more bytes") of
+	true ->
+	    State1 = send_character_event(length(Acc), IgnorableWS, lists:reverse(Acc), State),
+	    {?STRING_EMPTY, State1};
+	false ->
+	    case catch cf(?STRING_EMPTY, State, Acc, IgnorableWS, fun parse_content/4) of
+		{Rest, State1} when is_record(State1, xmerl_sax_parser_state) ->
+		    {Rest, State1};
+		{fatal_error, {State1, Msg}} ->
+		    case check_if_document_complete(State1, Msg) of
+			true ->
+			    State2 = send_character_event(length(Acc), IgnorableWS, lists:reverse(Acc), State1),
+			    {?STRING_EMPTY, State2};
+			false ->
+			    ?fatal_error(State1, Msg)
+		    end;
+		Other ->
+		    throw(Other)
+	    end
     end;
 parse_content(?STRING("\r") = Bytes, State, Acc, IgnorableWS) ->
     cf(Bytes, State, Acc, IgnorableWS, fun parse_content/4);
@@ -1094,7 +1122,7 @@ parse_content(?STRING_REST("<?", Rest), State, Acc, IgnorableWS) ->
 parse_content(?STRING_REST("<!", Rest1) = Rest, #xmerl_sax_parser_state{end_tags = ET} = State, Acc, IgnorableWS) ->
     case ET of 
 	[] ->
-	    {Rest, State}; %%LATH : Skicka ignorable WS ???
+	    {Rest, State}; %% Skicka ignorable WS ???
 	_ ->
 	    State1 = send_character_event(length(Acc), IgnorableWS, lists:reverse(Acc), State),
 	    parse_cdata(Rest1, State1)
@@ -1102,7 +1130,7 @@ parse_content(?STRING_REST("<!", Rest1) = Rest, #xmerl_sax_parser_state{end_tags
 parse_content(?STRING_REST("<", Rest1) = Rest, #xmerl_sax_parser_state{end_tags = ET} = State, Acc, IgnorableWS) ->
     case ET of 
 	[] ->
-	    {Rest, State}; %%LATH :  Skicka ignorable WS ???
+	    {Rest, State}; %% Skicka ignorable WS ???
 	_ ->
 	    State1 = send_character_event(length(Acc), IgnorableWS, lists:reverse(Acc), State),
 	    parse_stag(Rest1, State1)
@@ -3290,7 +3318,7 @@ cf(Rest, #xmerl_sax_parser_state{continuation_fun = CFun, continuation_state = C
 	catch
 	    throw:ErrorTerm ->
 		?fatal_error(State, ErrorTerm);
-	      exit:Reason ->
+            exit:Reason ->
 		?fatal_error(State, {'EXIT', Reason})
 	end,
     case Result of
diff --git a/lib/xmerl/test/Makefile b/lib/xmerl/test/Makefile
index 7a326e334f..b13fee05b3 100644
--- a/lib/xmerl/test/Makefile
+++ b/lib/xmerl/test/Makefile
@@ -55,7 +55,8 @@ SUITE_FILES= \
 	xmerl_xsd_SUITE.erl \
 	xmerl_xsd_MS2002-01-16_SUITE.erl \
 	xmerl_xsd_NIST2002-01-16_SUITE.erl \
-	xmerl_xsd_Sun2002-01-16_SUITE.erl
+	xmerl_xsd_Sun2002-01-16_SUITE.erl \
+        xmerl_sax_stream_SUITE.erl
 
 XML_FILES= \
 	testcases.dtd \
@@ -125,4 +126,5 @@ release_tests_spec: opt
 	@tar cfh - xmerl_xsd_MS2002-01-16_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 	@tar cfh - xmerl_xsd_NIST2002-01-16_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 	@tar cfh - xmerl_xsd_Sun2002-01-16_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	@tar cfh - xmerl_sax_stream_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 	chmod -R u+w "$(RELSYSDIR)"
diff --git a/lib/xmerl/test/xmerl_sax_SUITE.erl b/lib/xmerl/test/xmerl_sax_SUITE.erl
index f5c0a783c4..7d1a70905c 100644
--- a/lib/xmerl/test/xmerl_sax_SUITE.erl
+++ b/lib/xmerl/test/xmerl_sax_SUITE.erl
@@ -85,17 +85,17 @@ ticket_11551(_Config) ->
 <a>hej</a>
 <?xml version=\"1.0\" encoding=\"utf-8\" ?>
 <a>hej</a>">>,
-    {ok, undefined, <<"<?xml",  _/binary>>} = xmerl_sax_parser:stream(Stream1, []),
+    {ok, undefined, <<"\n<?xml",  _/binary>>} = xmerl_sax_parser:stream(Stream1, []),
     Stream2= <<"<?xml version=\"1.0\" encoding=\"utf-8\" ?>
 <a>hej</a>
 
 
 <?xml version=\"1.0\" encoding=\"utf-8\" ?>
 <a>hej</a>">>,
-    {ok, undefined, <<"<?xml",  _/binary>>} = xmerl_sax_parser:stream(Stream2, []),
+    {ok, undefined, <<"\n\n\n<?xml",  _/binary>>} = xmerl_sax_parser:stream(Stream2, []),
     Stream3= <<"<a>hej</a>
 
 <?xml version=\"1.0\" encoding=\"utf-8\" ?>
 <a>hej</a>">>,
-    {ok, undefined, <<"<?xml",  _/binary>>} = xmerl_sax_parser:stream(Stream3, []),
+    {ok, undefined, <<"\n\n<?xml",  _/binary>>} = xmerl_sax_parser:stream(Stream3, []),
     ok.
diff --git a/lib/xmerl/test/xmerl_sax_std_SUITE.erl b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
index 525a3b175a..b8412206cc 100644
--- a/lib/xmerl/test/xmerl_sax_std_SUITE.erl
+++ b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
@@ -2,7 +2,7 @@
 %%----------------------------------------------------------------------
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -507,11 +507,8 @@ end_per_testcase(_Func,_Config) ->
 'not-wf-sa-036'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/036.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_,<<"Illegal data\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -522,11 +519,8 @@ end_per_testcase(_Func,_Config) ->
 'not-wf-sa-037'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/037.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_,<<"&#32;\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -561,11 +555,8 @@ end_per_testcase(_Func,_Config) ->
 'not-wf-sa-040'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/040.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_,<<"<doc></doc>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -576,11 +567,8 @@ end_per_testcase(_Func,_Config) ->
 'not-wf-sa-041'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/041.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_,<<"<doc></doc>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -603,11 +591,8 @@ end_per_testcase(_Func,_Config) ->
 'not-wf-sa-043'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/043.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_,<<"Illegal data\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -618,11 +603,8 @@ end_per_testcase(_Func,_Config) ->
 'not-wf-sa-044'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/044.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_,<<"<doc/>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -669,11 +651,8 @@ end_per_testcase(_Func,_Config) ->
 'not-wf-sa-048'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/048.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_,<<"<![CDATA[]]>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -1416,11 +1395,8 @@ end_per_testcase(_Func,_Config) ->
 'not-wf-sa-110'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"xmltest","not-wf/sa/110.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_,<<"&e;\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -1914,9 +1890,9 @@ end_per_testcase(_Func,_Config) ->
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
-   {ok,_,<<"<?xml version=\"1.0\"?>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   % R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
-   % check_result(R, "not-wf").
+   %{ok,_,<<"<?xml version=\"1.0\"?>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -7784,11 +7760,8 @@ end_per_testcase(_Func,_Config) ->
 'o-p01fail3'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"oasis","p01fail3.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_, <<"<bad/>", _/binary>>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -11417,12 +11390,8 @@ end_per_testcase(_Func,_Config) ->
 'ibm-not-wf-P01-ibm01n02'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P01/ibm01n02.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_, <<"<?xml version=\"1.0\"?>", _/binary>>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   % R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
-   % check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -11433,11 +11402,8 @@ end_per_testcase(_Func,_Config) ->
 'ibm-not-wf-P01-ibm01n03'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P01/ibm01n03.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_, <<"<title>Wrong combination!</title>", _/binary>>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Cases 
@@ -13027,11 +12993,8 @@ end_per_testcase(_Func,_Config) ->
 'ibm-not-wf-P27-ibm27n01'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P27/ibm27n01.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_, <<"<!ELEMENT cat EMPTY>">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Cases 
@@ -13461,11 +13424,8 @@ end_per_testcase(_Func,_Config) ->
 'ibm-not-wf-P39-ibm39n06'(Config) -> 
    file:set_cwd(xmerl_test_lib:get_data_dir(Config)),
    Path = filename:join([xmerl_test_lib:get_data_dir(Config),"ibm","not-wf/P39/ibm39n06.xml"]),
-   %% Special case becase we returns everything after a legal document 
-   %% as an rest instead of giving and error to let the user handle 
-   %% multipple docs on a stream.
-   {ok,_,<<"content after end tag\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%check_result(R, "not-wf").
+   R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Cases 
diff --git a/lib/xmerl/test/xmerl_sax_stream_SUITE.erl b/lib/xmerl/test/xmerl_sax_stream_SUITE.erl
new file mode 100644
index 0000000000..a306eb66a2
--- /dev/null
+++ b/lib/xmerl/test/xmerl_sax_stream_SUITE.erl
@@ -0,0 +1,245 @@
+%%-*-erlang-*-
+%%----------------------------------------------------------------------
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%----------------------------------------------------------------------
+%% File    : xmerl_sax_stream_SUITE.erl
+%%----------------------------------------------------------------------
+-module(xmerl_sax_stream_SUITE).
+-compile(export_all).
+
+%%----------------------------------------------------------------------
+%% Include files
+%%----------------------------------------------------------------------
+-include_lib("common_test/include/ct.hrl").
+-include_lib("kernel/include/file.hrl").
+
+%%======================================================================
+%% External functions
+%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Initializations
+%%----------------------------------------------------------------------
+all() ->
+    [
+     one_document,
+     two_documents,
+     one_document_and_junk
+    ].
+
+%%----------------------------------------------------------------------
+%% Initializations
+%%----------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_Func, _Config) ->
+    ok.
+
+%%----------------------------------------------------------------------
+%% Tests
+%%----------------------------------------------------------------------
+one_document(Config) ->
+    Port = 11111,
+
+    {ok, ListenSocket} = listen(Port),
+    Self = self(),
+    
+    spawn(
+      fun() ->
+              case catch gen_tcp:accept(ListenSocket) of
+                  {ok, S} ->
+                      Result = xmerl_sax_parser:stream(<<>>, 
+                                                      [{continuation_state, S},
+                                                       {continuation_fun, 
+                                                        fun(Sd) ->
+                                                                io:format("Continuation called!!", []),
+                                                                case gen_tcp:recv(Sd, 0) of
+                                                                    {ok, Packet} ->
+                                                                        io:format("Packet: ~p\n", [Packet]),
+                                                                        {Packet, Sd};
+                                                                    {error, Reason} ->
+                                                                        throw({error, Reason})
+                                                                end
+                                                        end}]),
+                      Self ! {xmerl_sax, Result},
+                      close(S);
+                   Error ->
+                      Self ! {xmerl_sax, {error, {accept, Error}}}
+              end
+      end),
+
+    {ok, SendSocket} = connect(localhost, Port),
+   
+    {ok, Binary} = file:read_file(filename:join([datadir(Config), "xmerl_sax_stream_one.xml"])),
+    
+    send_chunks(SendSocket, Binary),
+
+    receive
+        {xmerl_sax, {ok, undefined, Rest}} ->
+            <<"\n">> = Rest,
+            io:format("Ok Rest: ~p\n", [Rest])        
+       after 5000 ->
+               ct:fail("Timeout")
+    end,
+    ok.
+    
+two_documents(Config) ->
+    Port = 11111,
+
+    {ok, ListenSocket} = listen(Port),
+    Self = self(),
+    
+    spawn(
+      fun() ->
+              case catch gen_tcp:accept(ListenSocket) of
+                  {ok, S} ->
+                      Result = xmerl_sax_parser:stream(<<>>, 
+                                                      [{continuation_state, S},
+                                                       {continuation_fun, 
+                                                        fun(Sd) ->
+                                                                io:format("Continuation called!!", []),
+                                                                case gen_tcp:recv(Sd, 0) of
+                                                                    {ok, Packet} ->
+                                                                        io:format("Packet: ~p\n", [Packet]),
+                                                                        {Packet, Sd};
+                                                                    {error, Reason} ->
+                                                                        throw({error, Reason})
+                                                                end
+                                                        end}]),
+                      Self ! {xmerl_sax, Result},
+                      close(S);
+                   Error ->
+                      Self ! {xmerl_sax, {error, {accept, Error}}}
+              end
+      end),
+
+    {ok, SendSocket} = connect(localhost, Port),
+   
+    {ok, Binary} = file:read_file(filename:join([datadir(Config), "xmerl_sax_stream_two.xml"])),
+    
+    send_chunks(SendSocket, Binary),
+
+    receive
+        {xmerl_sax, {ok, undefined, Rest}} ->
+            <<"\n<?x", _R/binary>> = Rest,
+            io:format("Ok Rest: ~p\n", [Rest])        
+       after 5000 ->
+               ct:fail("Timeout")
+    end,
+    ok.
+    
+one_document_and_junk(Config) ->
+    Port = 11111,
+
+    {ok, ListenSocket} = listen(Port),
+    Self = self(),
+    
+    spawn(
+      fun() ->
+              case catch gen_tcp:accept(ListenSocket) of
+                  {ok, S} ->
+                      Result = xmerl_sax_parser:stream(<<>>, 
+                                                      [{continuation_state, S},
+                                                       {continuation_fun, 
+                                                        fun(Sd) ->
+                                                                io:format("Continuation called!!", []),
+                                                                case gen_tcp:recv(Sd, 0) of
+                                                                    {ok, Packet} ->
+                                                                        io:format("Packet: ~p\n", [Packet]),
+                                                                        {Packet, Sd};
+                                                                    {error, Reason} ->
+                                                                        throw({error, Reason})
+                                                                end
+                                                        end}]),
+                      Self ! {xmerl_sax, Result},
+                      close(S);
+                   Error ->
+                      Self ! {xmerl_sax, {error, {accept, Error}}}
+              end
+      end),
+
+    {ok, SendSocket} = connect(localhost, Port),
+   
+    {ok, Binary} = file:read_file(filename:join([datadir(Config), "xmerl_sax_stream_one_junk.xml"])),
+    
+    send_chunks(SendSocket, Binary),
+
+    receive
+        {xmerl_sax, {ok, undefined, Rest}} ->
+            <<"\nth", _R/binary>> = Rest,
+            io:format("Ok Rest: ~p\n", [Rest])        
+       after 10000 ->
+               ct:fail("Timeout")
+    end,
+    ok.
+    
+%%----------------------------------------------------------------------
+%% Utility functions
+%%----------------------------------------------------------------------
+listen(Port) ->
+    case catch gen_tcp:listen(Port, [{active, false}, 
+				     binary, 
+				     {keepalive, true},
+				     {reuseaddr,true}]) of
+	{ok, ListenSocket} ->
+            {ok, ListenSocket};
+	{error, Reason} ->
+	    {error, {listen, Reason}}
+    end.
+
+close(Socket) ->
+    (catch gen_tcp:close(Socket)).
+
+connect(Host, Port) ->
+     Timeout = 5000,
+     % Options1 = check_options(Options),
+     Options = [binary],
+     case catch gen_tcp:connect(Host, Port, Options, Timeout) of
+ 	{ok, Socket} ->
+ 	    {ok, Socket};
+ 	{error, Reason} ->
+	    {error, Reason}
+     end.
+
+send_chunks(Socket, Binary) ->
+    BSize = erlang:size(Binary),
+    if 
+        BSize > 25 ->
+            <<Head:25/binary, Tail/binary>> = Binary,
+            case gen_tcp:send(Socket, Head) of
+                ok ->
+                    timer:sleep(1000),
+                    send_chunks(Socket, Tail);
+                {error,closed} ->
+                    ok
+            end;
+        true ->
+            gen_tcp:send(Socket, Binary)
+    end.
+
+datadir(Config) ->
+    proplists:get_value(data_dir, Config).
diff --git a/lib/xmerl/test/xmerl_sax_stream_SUITE_data/xmerl_sax_stream_one.xml b/lib/xmerl/test/xmerl_sax_stream_SUITE_data/xmerl_sax_stream_one.xml
new file mode 100644
index 0000000000..30328bb188
--- /dev/null
+++ b/lib/xmerl/test/xmerl_sax_stream_SUITE_data/xmerl_sax_stream_one.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<person>
+<name>
+Arne Andersson
+</name>
+<address>
+<street>
+ Old Road 456
+</street>
+<zip>
+12323
+</zip>
+<city>
+Small City
+</city>
+</address>
+</person>
diff --git a/lib/xmerl/test/xmerl_sax_stream_SUITE_data/xmerl_sax_stream_one_junk.xml b/lib/xmerl/test/xmerl_sax_stream_SUITE_data/xmerl_sax_stream_one_junk.xml
new file mode 100644
index 0000000000..f730a95865
--- /dev/null
+++ b/lib/xmerl/test/xmerl_sax_stream_SUITE_data/xmerl_sax_stream_one_junk.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<person>
+<name>
+Arne Andersson
+</name>
+<address>
+<street>
+ Old Road 456
+</street>
+<zip>
+12323
+</zip>
+<city>
+Small City
+</city>
+</address>
+</person>
+this is junk ......
diff --git a/lib/xmerl/test/xmerl_sax_stream_SUITE_data/xmerl_sax_stream_two.xml b/lib/xmerl/test/xmerl_sax_stream_SUITE_data/xmerl_sax_stream_two.xml
new file mode 100644
index 0000000000..e241a02190
--- /dev/null
+++ b/lib/xmerl/test/xmerl_sax_stream_SUITE_data/xmerl_sax_stream_two.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<person>
+<name>
+Arne Andersson
+</name>
+<address>
+<street>
+ Old Road 456
+</street>
+<zip>
+12323
+</zip>
+<city>
+Small City
+</city>
+</address>
+</person>
+<?xml version="1.0"?>
+<person>
+<name>
+Bertil Bengtson
+</name>
+<address>
+<street>
+ New Road 4
+</street>
+<zip>
+12328
+</zip>
+<city>
+Small City
+</city>
+</address>
+</person>