Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtsushi Eno <atsushieno@gmail.com>2003-07-19 18:33:10 +0400
committerAtsushi Eno <atsushieno@gmail.com>2003-07-19 18:33:10 +0400
commitd670f3a599826fd835429d2af6a12f2d11a1e86e (patch)
tree0693224d20604d39e056a57f2ae3f4d2a076d60a
parent736e2c9186bb8672b1938ca7a8fdd4cb69110477 (diff)
2003-07-19 Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>
* XmlUrlResolver.cs : applied BenM's patch for file uri problem (bug #46610). svn path=/trunk/mcs/; revision=16429
-rw-r--r--mcs/class/System.XML/System.Xml/ChangeLog5
-rwxr-xr-xmcs/class/System.XML/System.Xml/XmlUrlResolver.cs3
2 files changed, 8 insertions, 0 deletions
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index 43bf2a0bd43..245f165b1fd 100644
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-19 Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>
+
+ * XmlUrlResolver.cs : applied BenM's patch for file uri problem
+ (bug #46610).
+
2003-07-15 Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>
* DTDValidatingReader.cs :
diff --git a/mcs/class/System.XML/System.Xml/XmlUrlResolver.cs b/mcs/class/System.XML/System.Xml/XmlUrlResolver.cs
index a00be244901..1bd2dedb340 100755
--- a/mcs/class/System.XML/System.Xml/XmlUrlResolver.cs
+++ b/mcs/class/System.XML/System.Xml/XmlUrlResolver.cs
@@ -42,6 +42,9 @@ namespace System.Xml
[MonoTODO("Use Credentials; Uri must be absolute.")]
public override object GetEntity (Uri absoluteUri, string role, Type ofObjectToReturn)
{
+ if (absoluteUri.Scheme == "file")
+ return new FileStream (absoluteUri.LocalPath, FileMode.Open, FileAccess.Read, FileShare.Read);
+
// (MS documentation says) parameter role isn't used yet.
Stream s = null;
using (s) {