diff --git a/src/encoding/xml/marshal.go b/src/encoding/xml/marshal.go index d8a04a95a2..0554b0d204 100644 --- a/src/encoding/xml/marshal.go +++ b/src/encoding/xml/marshal.go @@ -345,11 +345,8 @@ func (p *printer) createAttrPrefix(url string) string { if prefix == "" || !isName([]byte(prefix)) || strings.Contains(prefix, ":") { prefix = "_" } - // xmlanything is reserved and any variant of it regardless of - // case should be matched, so: - // (('X'|'x') ('M'|'m') ('L'|'l')) - // See Section 2.3 of https://www.w3.org/TR/REC-xml/ - if len(prefix) >= 3 && strings.EqualFold(prefix[:3], "xml") { + if strings.HasPrefix(prefix, "xml") { + // xmlanything is reserved. prefix = "_" + prefix } if p.attrNS[prefix] != "" { diff --git a/src/encoding/xml/marshal_test.go b/src/encoding/xml/marshal_test.go index d2e5137afd..31309ef2ca 100644 --- a/src/encoding/xml/marshal_test.go +++ b/src/encoding/xml/marshal_test.go @@ -2283,30 +2283,6 @@ var encodeTokenTests = []struct { }}, }, want: ``, -}, { - desc: "reserved namespace prefix -- all lower case", - toks: []Token{ - StartElement{Name{"", "foo"}, []Attr{ - {Name{"http://www.w3.org/2001/xmlSchema-instance", "nil"}, "true"}, - }}, - }, - want: ``, -}, { - desc: "reserved namespace prefix -- all upper case", - toks: []Token{ - StartElement{Name{"", "foo"}, []Attr{ - {Name{"http://www.w3.org/2001/XMLSchema-instance", "nil"}, "true"}, - }}, - }, - want: ``, -}, { - desc: "reserved namespace prefix -- all mixed case", - toks: []Token{ - StartElement{Name{"", "foo"}, []Attr{ - {Name{"http://www.w3.org/2001/XmLSchema-instance", "nil"}, "true"}, - }}, - }, - want: ``, }} func TestEncodeToken(t *testing.T) {