projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2009-01-22 Atsushi Enomoto <atsushi@ximian.com>
[mono.git]
/
mcs
/
class
/
System.XML
/
System.Xml
/
XmlResolver.cs
diff --git
a/mcs/class/System.XML/System.Xml/XmlResolver.cs
b/mcs/class/System.XML/System.Xml/XmlResolver.cs
index b767aa3ea827d7fcdb07c1980424c60d5b671f0c..3c8d04f135e9d6b5c432e0a588f6787a3c8c3653 100644
(file)
--- a/
mcs/class/System.XML/System.Xml/XmlResolver.cs
+++ b/
mcs/class/System.XML/System.Xml/XmlResolver.cs
@@
-59,11
+59,11
@@
namespace System.Xml
relativeUri.StartsWith ("file:"))
return new Uri (relativeUri);
else
relativeUri.StartsWith ("file:"))
return new Uri (relativeUri);
else
- // extraneous "/a" is required because current Uri stuff
- // seems ignorant of difference between "." and "./".
- // I'd be appleciate if it is fixed with better solution.
+#if NET_2_1
+ return new Uri (relativeUri, UriKind.RelativeOrAbsolute);
+#else
return new Uri (Path.GetFullPath (relativeUri));
return new Uri (Path.GetFullPath (relativeUri));
-// return new Uri (new Uri (Path.GetFullPath ("./a")), EscapeRelativeUriBody (relativeUri));
+#endif
}
if (relativeUri == null)
}
if (relativeUri == null)