New test.

[mono.git] / mcs / class / System.Security / Mono.Xml / XmlCanonicalizer.cs

diff --git a/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs b/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs
old mode 100755 (executable)
new mode 100644 (file)
index b4ca937..111bd04
--- a/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs
+++ b/mcs/class/System.Security/Mono.Xml/XmlCanonicalizer.cs
@@ -7,6 +7,27 @@
 //
 // (C) 2003 Aleksey Sanin (aleksey@aleksey.com)
 //
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 using System;
 using System.Collections;
 using System.IO;
@@ -62,7 +83,7 @@ namespace Mono.Xml {
                {
                        xnl = nodes;
                        if (nodes == null || nodes.Count < 1)
-                           return null;
+                               return new MemoryStream ();
                        return Canonicalize (nodes[0].OwnerDocument);
                }               
 
@@ -493,13 +514,8 @@ namespace Mono.Xml {
                                        sb.Append ("&#x9;");
                                else if (ch == '\x0A' && type == XmlNodeType.Attribute)
                                        sb.Append ("&#xA;");
-                               else if (ch == '\x0D' && (type == XmlNodeType.Attribute ||
-                                                         IsTextNode (type) && type != XmlNodeType.Whitespace ||
-                                                         type == XmlNodeType.Comment ||
-                                                         type == XmlNodeType.ProcessingInstruction))
-                                       sb.Append ("&#xD;");
                                else if (ch == '\x0D')
-                                       continue;
+                                       sb.Append ("&#xD;");
                                else
                                        sb.Append (ch);
                        }