[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] mcs/class/System.Web/System.Web.Util ChangeLog,1.18,1.19 UrlUtils.cs,1.11,1.12
From:       gonzalo () mono-cvs ! ximian ! com (Gonzalo Paniagua)
Date:       2003-11-30 23:32:25
[Download RAW message or body]

Update of /cvs/public/mcs/class/System.Web/System.Web.Util
In directory mono-cvs.ximian.com:/tmp/cvs-serv16502

Modified Files:
	ChangeLog UrlUtils.cs 
Log Message:
2003-12-01  Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* UrlUtils.cs: don't forget basePath when relative path is not rooted.
	Fixes bug #51522.



Index: ChangeLog
===================================================================
RCS file: /cvs/public/mcs/class/System.Web/System.Web.Util/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ChangeLog	27 Nov 2003 19:24:34 -0000	1.18
+++ ChangeLog	30 Nov 2003 23:32:23 -0000	1.19
@@ -1,3 +1,8 @@
+2003-12-01  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* UrlUtils.cs: don't forget basePath when relative path is not rooted.
+	Fixes bug #51522.
+
 2003-11-27  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* UrlUtils.cs: fix bug introduced with last change that makes relative

Index: UrlUtils.cs
===================================================================
RCS file: /cvs/public/mcs/class/System.Web/System.Web.Util/UrlUtils.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- UrlUtils.cs	27 Nov 2003 19:24:34 -0000	1.11
+++ UrlUtils.cs	30 Nov 2003 23:32:23 -0000	1.12
@@ -134,14 +134,15 @@
 				return Reduce (basePath + slash + relPath);
 			}
 
-
-			string vPath = HttpRuntime.AppDomainAppVirtualPath;
-			if (vPath.Length <= 1)
-				vPath = String.Empty;
-
-			return Reduce (vPath + "/" + relPath);
-		}
-		
+			if (basePath == null || basePath == "") {
+				basePath = HttpRuntime.AppDomainAppVirtualPath;
+				if (basePath.Length <= 1)
+					basePath = String.Empty;
+			}
+
+			return Reduce (basePath + "/" + relPath);
+		}
+
 		public static bool IsValidProtocol(string protocol)
 		{
 			if(protocol.Length < 1)

_______________________________________________
Mono-patches maillist  -  Mono-patches@ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
[prev in list] [next in list] [prev in thread] [next in thread]