Merge branch 'master' into sverker/enif_select

Conflicts:
	erts/emulator/beam/erl_binary.h
	erts/emulator/beam/erl_monitors.c
	erts/emulator/beam/erl_nif.c
	erts/emulator/beam/global.h
	erts/emulator/test/nif_SUITE_data/nif_SUITE.c

3 files changed, 37 insertions, 7 deletions

diff --git a/lib/xmerl/src/xmerl_regexp.erl b/lib/xmerl/src/xmerl_regexp.erl
index fc89b80ff1..566b77725f 100644
--- a/lib/xmerl/src/xmerl_regexp.erl
+++ b/lib/xmerl/src/xmerl_regexp.erl
@@ -1154,7 +1154,7 @@ comp_crs([], Last) -> [{Last,maxchar}].
 %% build_dfa(NFA, NfaStartState) -> {DFA,DfaStartState}.
 %%  Build a DFA from an NFA using "subset construction". The major
 %%  difference from the book is that we keep the marked and unmarked
-%%  DFA states in seperate lists. New DFA states are added to the
+%%  DFA states in separate lists. New DFA states are added to the
 %%  unmarked list and states are marked by moving them to the marked
 %%  list. We assume that the NFA accepting state numbers are in
 %%  ascending order for the rules and use ordsets to keep this order.
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 9f6b27113e..95dc82e5c9 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -2309,7 +2309,9 @@ expanded_name(Name, [], #xmlNamespace{default = URI}, S) ->
 expanded_name(Name, N = {"xmlns", Local}, #xmlNamespace{nodes = Ns}, S) ->
     {_, Value} = lists:keyfind(Local, 1, Ns),
     case Name of
-	'xmlns:xml' when Value =/= 'http://www.w3.org/XML/1998/namespace' ->
+	'xmlns:xml' when Value =:= 'http://www.w3.org/XML/1998/namespace' ->
+	    N;
+        'xmlns:xml' when Value =/= 'http://www.w3.org/XML/1998/namespace' ->
 	    ?fatal({xml_prefix_cannot_be_redeclared, Value}, S);
 	'xmlns:xmlns' ->
 	    ?fatal({xmlns_prefix_cannot_be_declared, Value}, S);
@@ -2323,6 +2325,8 @@ expanded_name(Name, N = {"xmlns", Local}, #xmlNamespace{nodes = Ns}, S) ->
 		    N
 	    end
     end;
+expanded_name(_Name, {"xml", Local}, _NS, _S) ->
+    {'http://www.w3.org/XML/1998/namespace', list_to_atom(Local)};
 expanded_name(_Name, {Prefix, Local}, #xmlNamespace{nodes = Ns}, S) ->
     case lists:keysearch(Prefix, 1, Ns) of
 	{value, {_, URI}} ->
@@ -2333,9 +2337,6 @@ expanded_name(_Name, {Prefix, Local}, #xmlNamespace{nodes = Ns}, S) ->
 	    ?fatal({namespace_prefix_not_declared, Prefix}, S)
     end.
 
-
-
-
 keyreplaceadd(K, Pos, [H|T], Obj) when K == element(Pos, H) ->
     [Obj|T];
 keyreplaceadd(K, Pos, [H|T], Obj) ->
diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index cf7c0b7548..58c462483c 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -55,7 +55,7 @@ groups() ->
      {misc, [],
       [latin1_alias, syntax_bug1, syntax_bug2, syntax_bug3,
        pe_ref1, copyright, testXSEIF, export_simple1, export,
-       default_attrs_bug]},
+       default_attrs_bug, xml_ns]},
      {eventp_tests, [], [sax_parse_and_export]},
      {ticket_tests, [],
       [ticket_5998, ticket_7211, ticket_7214, ticket_7430,
@@ -237,7 +237,36 @@ default_attrs_bug(Config) ->
     {#xmlElement{attributes = [#xmlAttribute{name = b, value = "also explicit"},
                                #xmlAttribute{name = a, value = "explicit"}]},
      []
-    } = xmerl_scan:string(Doc2, [{default_attrs, true}]).
+    } = xmerl_scan:string(Doc2, [{default_attrs, true}]),
+    ok.
+
+
+xml_ns(Config) ->
+    Doc = "<?xml version='1.0'?>\n"
+        "<doc xml:attr1=\"implicit xml ns\"/>",
+    {#xmlElement{namespace=#xmlNamespace{default = [], nodes = []},
+                 attributes = [#xmlAttribute{name = 'xml:attr1',
+                                             expanded_name = {'http://www.w3.org/XML/1998/namespace',attr1},
+                                             nsinfo = {"xml","attr1"},
+                                             namespace = #xmlNamespace{default = [], nodes = []}}]},
+     []
+    } = xmerl_scan:string(Doc, [{namespace_conformant, true}]),
+    Doc2 = "<?xml version='1.0'?>\n"
+        "<doc xmlns:xml=\"http://www.w3.org/XML/1998/namespace\" xml:attr1=\"explicit xml ns\"/>",
+    {#xmlElement{namespace=#xmlNamespace{default = [], nodes = [{"xml",'http://www.w3.org/XML/1998/namespace'}]},
+                 attributes = [#xmlAttribute{name = 'xmlns:xml',
+                                             expanded_name = {"xmlns","xml"},
+                                             nsinfo = {"xmlns","xml"},
+                                             namespace = #xmlNamespace{default = [], 
+                                                                       nodes = [{"xml",'http://www.w3.org/XML/1998/namespace'}]}},
+                               #xmlAttribute{name = 'xml:attr1',
+                                             expanded_name = {'http://www.w3.org/XML/1998/namespace',attr1},
+                                             nsinfo = {"xml","attr1"},
+                                             namespace = #xmlNamespace{default = [], 
+                                                                       nodes = [{"xml",'http://www.w3.org/XML/1998/namespace'}]}}]},
+     []
+    } = xmerl_scan:string(Doc2, [{namespace_conformant, true}]),
+    ok.
 
 pe_ref1(Config) ->
     file:set_cwd(datadir(Config)),