same fix as in HEAD

svn path=/branches/mono-1-0/mcs/; revision=32164

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 7927b3f9e10dc14debc531ff64103a1743f88403..dace1da7b579ecc1937977c8f9cd9f7b3683e159 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * Xml.cs: use MapPath in DocumentSource and documentContent. Fixes
+       bug #62726.
+
 2004-07-29 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * BaseValidator.cs: in Validate(), when the control is not visible or
@@ -5,8 +10,8 @@
        #61831.
 
 2004-06-10 Alon Gazit <along@mainsoft.com>
-        * WebControl.cs: fixed LoadViewState(). 
-        Creates new attributes state bag only when the current is null.
+       * WebControl.cs: fixed LoadViewState(). 
+       Creates new attributes state bag only when the current is null.
 
 2004-06-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs
index 7cdb7e4fea8023fea458c7cd72f91f7efcc2bf09..ff9aacac78b26cc2527b1a0df472acadd783785f 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs
@@ -189,21 +189,19 @@ namespace System.Web.UI.WebControls
                                                        GetType().Name));
                }
 
-               [MonoTODO("security")]
                private void LoadXpathDoc ()
                {
                        if (documentContent != null && documentContent.Length > 0) {
-                               xpathDoc = new XPathDocument (new StringReader (documentContent));
+                               xpathDoc = new XPathDocument (new StringReader (MapPathSecure (documentContent)));
                                return;
                        }
 
                        if (documentSource != null && documentSource.Length != 0) {
-                               xpathDoc = new XPathDocument (documentSource);
+                               xpathDoc = new XPathDocument (MapPathSecure (documentSource));
                                return;
                        }
                }
 
-               [MonoTODO("security")]
                private void LoadTransform ()
                {
                        if (transform != null)