Author: mhabersack
Date: 2007-06-20 03:36:19 -0400 (Wed, 20 Jun 2007)
New Revision: 80295
Modified:
trunk/xsp/ChangeLog
trunk/xsp/src/ModMonoApplicationHost.cs
trunk/xsp/src/ModMonoRequest.cs
Log:
2007-06-20 Marek Habersack <[EMAIL PROTECTED]>
* src/ModMonoRequest.cs: added support for virtual hosts
(ServerAlias) Patch from Juraj Skripsky
<[EMAIL PROTECTED]>, thanks! Closes bug #81878.
* src/ModMonoApplicationHost.cs: as above
Modified: trunk/xsp/ChangeLog
===================================================================
--- trunk/xsp/ChangeLog 2007-06-20 07:36:00 UTC (rev 80294)
+++ trunk/xsp/ChangeLog 2007-06-20 07:36:19 UTC (rev 80295)
@@ -1,3 +1,10 @@
+2007-06-20 Marek Habersack <[EMAIL PROTECTED]>
+
+ * src/ModMonoRequest.cs: added support for virtual hosts
+ (ServerAlias) Patch from Juraj Skripsky
+ <[EMAIL PROTECTED]>, thanks! Closes bug #81878.
+ * src/ModMonoApplicationHost.cs: as above
+
2007-06-15 Marek Habersack <[EMAIL PROTECTED]>
* src/Mono.WebServer/ApplicationServer.cs: do not skip checking
Modified: trunk/xsp/src/ModMonoApplicationHost.cs
===================================================================
--- trunk/xsp/src/ModMonoApplicationHost.cs 2007-06-20 07:36:00 UTC (rev
80294)
+++ trunk/xsp/src/ModMonoApplicationHost.cs 2007-06-20 07:36:19 UTC (rev
80295)
@@ -398,13 +398,17 @@
}
}
+ string vServerName = rr.Request.GetVirtualServerName ();
+ if (vServerName == null)
+ vServerName = vhost;
+
VPathToHost vapp = null;
string vpath = rr.GetUriPath ();
string path = rr.GetPhysicalPath ();
if (path == null) {
- vapp = server.GetApplicationForPath (vhost,
port, vpath, false);
+ vapp = server.GetApplicationForPath
(vServerName, port, vpath, false);
} else {
- vapp = GetOrCreateApplication (vhost, port,
path, vpath);
+ vapp = GetOrCreateApplication (vServerName,
port, path, vpath);
}
if (vapp == null) {
Modified: trunk/xsp/src/ModMonoRequest.cs
===================================================================
--- trunk/xsp/src/ModMonoRequest.cs 2007-06-20 07:36:00 UTC (rev 80294)
+++ trunk/xsp/src/ModMonoRequest.cs 2007-06-20 07:36:19 UTC (rev 80295)
@@ -71,6 +71,7 @@
string queryString;
string protocol;
string uri;
+ string vServerName;
string localAddress;
string remoteAddress;
string remoteName;
@@ -103,7 +104,7 @@
if (shutdown)
return;
- if (cmd != 6) {
+ if (cmd != 7) {
string msg = "mod_mono and xsp have different
versions.";
Console.WriteLine (msg);
Console.Error.WriteLine (msg);
@@ -111,6 +112,7 @@
}
verb = ReadString ();
+ vServerName = ReadString ();
uri = ReadString ();
queryString = ReadString ();
protocol = ReadString ();
@@ -274,6 +276,11 @@
return uri;
}
+ public string GetVirtualServerName ()
+ {
+ return vServerName;
+ }
+
public string GetQueryString ()
{
return queryString;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
