Author: robertj
Date: 2007-10-21 19:18:48 -0400 (Sun, 21 Oct 2007)
New Revision: 87880
Added:
branches/robertj/xsp/src/TODO
Removed:
branches/robertj/xsp/src/ChangeLog
Modified:
branches/robertj/xsp/ChangeLog
branches/robertj/xsp/scripts/
branches/robertj/xsp/src/Mono.WebServer.FastCgi/ConfigurationManager.cs
branches/robertj/xsp/src/Mono.WebServer.FastCgi/Request.cs
Log:
In src:
In .:
* src/Mono.WebServer.FastCgi/Request.cs:
Reverted temporary hack for mod_fastcgi.
* src/Mono.WebServer.FastCgi/ConfigurationManager.cs:
The XML default settings have less precedence.
2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
* src/Mono.WebServer.Apache/Mono.WebServer.Apache.sources: Create.
* src/Mono.WebServer.Apache/SecurityConfiguration.cs:
Get rid of MODMONO.
2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
* src/Makefile.am: FastCGI -> FastCgi.
* src/Mono.WebServer.FastCgi/Makefile.am:
* src/Mono.WebServer.FastCgi/*.sources:
* src/Mono.WebServer.FastCgi/AssemblyInfo.cs.in:
Create.
* src/Mono.WebServer.FastCgi/ConfigurationManager.xml:
Add some default values to be able to get rid of
the exe.config file. Comment out the automapping settings.
* src/Mono.WebServer.FastCgi/ConfigurationManager.cs:
Implement ImportSettings (). Support for default settings
specified in ConfigurationManaged.xml.
* src/Mono.WebServer.FastCgi/main.cs:
* src/Mono.WebServer.FastCgi/Responder.cs:
Take the ApplicationManager
out of the build until its automapping issues are fixed.
* src/Mono.WebServer.FastCgi/server.cs: Rename to main.cs
2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
* src/Mono.WebServer.FastCgi: Import Brian's files from his google
repository. Flatten hierarchies to adhere to mono's standards.
Disintegrate the Mono.FastCgi assembly.
2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
* configure.in, scripts/Makefile.am: Reflect changes.
* src/Makefile.am: Reflect changes.
* src/Mono.WebServer.Apache/main.cs: Remove XSP-related code.
* src/Mono.WebServer.XSP/main.cs: Remove ModMono-related code.
* src/Mono.WebServer.Apache/Makefile.am: Create from .Makefile.am.
* src/Mono.WebServer.XSP/Makefile.am: Create from Makefile.am.
* src/server.cs: Copy as main.cs to Mono.WebServer.Apache and
Mono.WebServer.XSP
* src/ecurity.cs: Move to Mono.WebServer.XSP/SecurityConfiguration.cs
* src/ModMono*.cs: Move to Mono.WebServer.Apache.
* src/Mono.WebServer.Apache: Create.
* src/Mono.WebServer.FastCgi: Create.
* src/Mono.WebServer.XSP: Create.
Modified: branches/robertj/xsp/ChangeLog
===================================================================
--- branches/robertj/xsp/ChangeLog 2007-10-21 22:48:56 UTC (rev 87879)
+++ branches/robertj/xsp/ChangeLog 2007-10-21 23:18:48 UTC (rev 87880)
@@ -1,8 +1,63 @@
2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
- * configure.in, scripts/Makefile.am:
- Reflect src changes (fastcgi integration).
+ * src/Mono.WebServer.FastCgi/Request.cs:
+ Reverted temporary hack for mod_fastcgi.
+ * src/Mono.WebServer.FastCgi/ConfigurationManager.cs:
+ The XML default settings have less precedence.
+
+2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
+
+ * src/Mono.WebServer.Apache/Mono.WebServer.Apache.sources: Create.
+ * src/Mono.WebServer.Apache/SecurityConfiguration.cs:
+ Get rid of MODMONO.
+
+2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
+
+ * src/Makefile.am: FastCGI -> FastCgi.
+
+ * src/Mono.WebServer.FastCgi/Makefile.am:
+ * src/Mono.WebServer.FastCgi/*.sources:
+ * src/Mono.WebServer.FastCgi/AssemblyInfo.cs.in:
+ Create.
+
+ * src/Mono.WebServer.FastCgi/ConfigurationManager.xml:
+ Add some default values to be able to get rid of
+ the exe.config file. Comment out the automapping settings.
+
+ * src/Mono.WebServer.FastCgi/ConfigurationManager.cs:
+ Implement ImportSettings (). Support for default settings
+ specified in ConfigurationManaged.xml.
+
+ * src/Mono.WebServer.FastCgi/main.cs:
+ * src/Mono.WebServer.FastCgi/Responder.cs:
+ Take the ApplicationManager
+ out of the build until its automapping issues are fixed.
+
+ * src/Mono.WebServer.FastCgi/server.cs: Rename to main.cs
+
+2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
+
+ * src/Mono.WebServer.FastCgi: Import Brian's files from his google
+ repository. Flatten hierarchies to adhere to mono's standards.
+ Disintegrate the Mono.FastCgi assembly.
+
+2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
+
+ * configure.in, scripts/Makefile.am: Reflect changes.
+ * src/Makefile.am: Reflect changes.
+ * src/Mono.WebServer.Apache/main.cs: Remove XSP-related code.
+ * src/Mono.WebServer.XSP/main.cs: Remove ModMono-related code.
+ * src/Mono.WebServer.Apache/Makefile.am: Create from .Makefile.am.
+ * src/Mono.WebServer.XSP/Makefile.am: Create from Makefile.am.
+ * src/server.cs: Copy as main.cs to Mono.WebServer.Apache and
+ Mono.WebServer.XSP
+ * src/ecurity.cs: Move to Mono.WebServer.XSP/SecurityConfiguration.cs
+ * src/ModMono*.cs: Move to Mono.WebServer.Apache.
+ * src/Mono.WebServer.Apache: Create.
+ * src/Mono.WebServer.FastCgi: Create.
+ * src/Mono.WebServer.XSP: Create.
+
2007-10-03 Juraj Skripsky <[EMAIL PROTECTED]>
* src/ModMonoRequest.cs: put the ModMonoConfig struct in charge to
Property changes on: branches/robertj/xsp/scripts
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
xsp
mod-mono-server
asp-state
asp-state2
dbsessmgr
mod-mono-server2
dbsessmgr2
xsp2
+ Makefile
Makefile.in
xsp
xsp2
mod-mono-server
mod-mono-server2
fastcgi-mono-server
fastcgi-mono-server2
asp-state
asp-state2
dbsessmgr
dbsessmgr2
Deleted: branches/robertj/xsp/src/ChangeLog
===================================================================
--- branches/robertj/xsp/src/ChangeLog 2007-10-21 22:48:56 UTC (rev 87879)
+++ branches/robertj/xsp/src/ChangeLog 2007-10-21 23:18:48 UTC (rev 87880)
@@ -1,50 +0,0 @@
-2007-10-22 Robert von Donop <[EMAIL PROTECTED]>
-
- * Mono.WebServer.Apache/Mono.WebServer.Apache.sources: Create.
- * Mono.WebServer.Apache/SecurityConfiguration.cs:
- Get rid of MODMONO.
-
-2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
-
- * Makefile.am: FastCGI -> FastCgi.
-
- * Mono.WebServer.FastCgi/Makefile.am:
- * Mono.WebServer.FastCgi/*.sources:
- * Mono.WebServer.FastCgi/AssemblyInfo.cs.in:
- Create.
-
- * Mono.WebServer.FastCgi/ConfigurationManager.xml:
- Add some default values to be able to get rid of
- the exe.config file. Comment out the automapping settings.
-
- * Mono.WebServer.FastCgi/ConfigurationManager.cs:
- Implement ImportSettings (). Support for default settings
- specified in ConfigurationManaged.xml.
-
- * Mono.WebServer.FastCgi/main.cs:
- * Mono.WebServer.FastCgi/Responder.cs:
- Take the ApplicationManager
- out of the build until its automapping issues are fixed.
-
- * Mono.WebServer.FastCgi/server.cs: Rename to main.cs
-
-2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
-
- * Mono.WebServer.FastCgi: Import Brian's files from his google
- repository. Flatten hierarchies to adhere to mono's standards.
- Disintegrate the Mono.FastCgi assembly.
-
-2007-10-22 Robert Jordan <[EMAIL PROTECTED]>
-
- * Makefile.am: Reflect changes.
- * Mono.WebServer.Apache/main.cs: Remove XSP-related code.
- * Mono.WebServer.XSP/main.cs: Remove ModMono-related code.
- * Mono.WebServer.Apache/Makefile.am: Create from .Makefile.am.
- * Mono.WebServer.XSP/Makefile.am: Create from Makefile.am.
- * server.cs: Copy as main.cs to Mono.WebServer.Apache and
- Mono.WebServer.XSP
- * security.cs: Move to Mono.WebServer.XSP/SecurityConfiguration.cs
- * ModMono*.cs: Move to Mono.WebServer.Apache.
- * Mono.WebServer.Apache: Create.
- * Mono.WebServer.FastCgi: Create.
- * Mono.WebServer.XSP: Create.
Modified:
branches/robertj/xsp/src/Mono.WebServer.FastCgi/ConfigurationManager.cs
===================================================================
--- branches/robertj/xsp/src/Mono.WebServer.FastCgi/ConfigurationManager.cs
2007-10-21 22:48:56 UTC (rev 87879)
+++ branches/robertj/xsp/src/Mono.WebServer.FastCgi/ConfigurationManager.cs
2007-10-21 23:18:48 UTC (rev 87880)
@@ -70,13 +70,15 @@
string value;
if ((value = cmd_args [name]) != null) return value;
if ((value = xml_args [name]) != null) return value;
- if ((value = default_args [name]) != null) return value;
string app_setting = GetXmlValue (setting,
"AppSetting");
-
- return app_setting.Length > 0 ?
- AppSettings [app_setting] : null;
+
+ if (app_setting.Length > 0)
+ if ((value = AppSettings [app_setting]) != null)
+ return value;
+
+ return default_args [name];
}
public bool Contains (string name)
Modified: branches/robertj/xsp/src/Mono.WebServer.FastCgi/Request.cs
===================================================================
--- branches/robertj/xsp/src/Mono.WebServer.FastCgi/Request.cs 2007-10-21
22:48:56 UTC (rev 87879)
+++ branches/robertj/xsp/src/Mono.WebServer.FastCgi/Request.cs 2007-10-21
23:18:48 UTC (rev 87880)
@@ -289,8 +289,8 @@
get {
// It takes different strokes to move the world.
- if (path == null)
- path = GetParameter ("PATH_INFO");
+ // if (path == null)
+ // path = GetParameter ("PATH_INFO");
if (path == null)
path = GetParameter ("SCRIPT_NAME");
@@ -310,8 +310,8 @@
get {
// It takes different strokes to move the world.
- if (rpath == null)
- rpath = GetParameter
("PATH_TRANSLATED");
+ // if (rpath == null)
+ // rpath = GetParameter
("PATH_TRANSLATED");
if (rpath == null)
rpath = GetParameter
("SCRIPT_FILENAME");
Added: branches/robertj/xsp/src/TODO
===================================================================
--- branches/robertj/xsp/src/TODO 2007-10-21 22:48:56 UTC (rev 87879)
+++ branches/robertj/xsp/src/TODO 2007-10-21 23:18:48 UTC (rev 87880)
@@ -0,0 +1,12 @@
+
+* Move Mono.WebServer.FastCgi/CondifgurationManager.cs
+ to Mono.WebServer.
+
+* Fix Mono.WebServer.FastCgi/ApplicationManager.cs' automapping
+ feature and move it to Mono.WebServer.
+
+* Write unit tests for ApplicationManager.cs' automapping.
+
+* Reuse the Configuration- and ApplicatioManager in
+ Mono.WebServer.Apache and .XSP.
+
Property changes on: branches/robertj/xsp/src/TODO
___________________________________________________________________
Name: svn:eol-style
+ native
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
