merged from head

svn path=/branches/robertj/xsp/; revision=88340
mono · Oct 28, 2007 · a602585 · a602585
1 parent 12acc6f
commit a602585
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -12,6 +12,25 @@
 	Compute PATH_INFO, PATH_TRANSLATED, SCRIPT_NAME,
 	SCRIPT_FILENAME when running under Apache.
 
+2007-10-26  Wade Berrier  <wberrier@novell.com>
+
+	* configure.in:
+	* src/AssemblyInfoModMono.cs.in:
+	* src/AssemblyInfo.cs.in:
+	* tools/asp_state/AssemblyInfo.cs.in:
+	* tools/dbsessmgr/AssemblyInfo.cs.in:
+	Split VERSION to VERSION and XSP_VERSION in order to allow svn revision 
+	in VERSION and still satisfy mcs's numbering scheme (recently changed
+	to match csc)
+	Didn't replace VERSION, because we need the tarball version to not have
+	periods in the revision name.
+
+2007-10-24  Marek Habersack  <mhabersack@novell.com>
+
+	* src/Mono.WebServer/XSPWorkerRequest.cs: gracefully handle
+	exceptions in the constructor, by closing the connection when
+	Exception happens.
+
 2007-10-22  Robert Jordan  <robertj@gmx.net>
 
 	* man/*: Generate fastcgi-mono-server(1).

diff --git a/configure.in b/configure.in
@@ -75,6 +75,17 @@ test x$GMCS = xno || echo "$CS 2.0 compiler: $GMCS"
 
 GACUTIL_FLAGS='-root $(DESTDIR)$(prefix)/lib'
 
+# Put the version in the new required format (for svn revisions)
+export VERSION
+[XSP_VERSION=$($AWK 'BEGIN {
+  split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".")
+  if(length(vsplit [1]) > 4) {
+    split (substr(ENVIRON["VERSION"], 0, 4) "." substr(ENVIRON["VERSION"], 5) ".0.0", vsplit, ".")
+  }
+  print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4]
+}')]
+
+
 AC_SUBST(WEBTRACING)
 AC_SUBST(MCS)
 AC_SUBST(GMCS)
@@ -83,6 +94,7 @@ AC_SUBST(GACUTIL)
 AC_SUBST(GACUTIL_FLAGS)
 AC_SUBST(SN)
 AC_SUBST(VERSION)
+AC_SUBST(XSP_VERSION)
 AC_OUTPUT([
 	Makefile
 	man/xsp.1

diff --git a/src/Mono.WebServer.Apache/AssemblyInfo.cs.in b/src/Mono.WebServer.Apache/AssemblyInfo.cs.in
@@ -28,7 +28,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("@VERSION@")]
+[assembly: AssemblyVersion("@XSP_VERSION@")]
 [assembly: AssemblyTitle ("Mono.WebServer.Apache")]
 [assembly: AssemblyDescription ("Mod_mono backend for XSP")]
 [assembly: AssemblyCopyright ("(c) 2002-2007 Novell, Inc.")]

diff --git a/src/Mono.WebServer.FastCgi/AssemblyInfo.cs.in b/src/Mono.WebServer.FastCgi/AssemblyInfo.cs.in
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("@VERSION@")]
+[assembly: AssemblyVersion("@XSP_VERSION@")]
 [assembly: AssemblyTitle("Mono.WebServer.FastCGI")]
 [assembly: AssemblyDescription("FastCGI Backend for XSP")]
 [assembly: AssemblyCopyright("2007 Brian Nickel")]

diff --git a/src/Mono.WebServer.XSP/AssemblyInfo.cs.in b/src/Mono.WebServer.XSP/AssemblyInfo.cs.in
@@ -28,7 +28,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("@VERSION@")]
+[assembly: AssemblyVersion("@XSP_VERSION@")]
 [assembly: AssemblyTitle ("Mono.WebServer.XSP")]
 [assembly: AssemblyDescription ("Minimalistic web server for testing System.Web")]
 [assembly: AssemblyCopyright ("(c) 2002-2007 Novell, Inc.")]

diff --git a/src/Mono.WebServer/XSPWorkerRequest.cs b/src/Mono.WebServer/XSPWorkerRequest.cs
@@ -175,7 +175,13 @@ static void SetDefaultIndexFiles (string list)
 			this.requestBroker = requestBroker;
 			this.remoteEP = remoteEP;
 			this.verb = verb;
-			Paths.GetPathsFromUri (path, out this.path, out pathInfo);
+			try {
+				Paths.GetPathsFromUri (path, out this.path, out pathInfo);
+			} catch {
+				CloseConnection ();
+				throw;
+			}
+
 			this.protocol = protocol;
 			if (protocol == "HTTP/1.1") {
 				if (!running_tests)

diff --git a/tools/asp_state/AssemblyInfo.cs.in b/tools/asp_state/AssemblyInfo.cs.in
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("@VERSION@")]
+[assembly: AssemblyVersion("@XSP_VERSION@")]
 [assembly: AssemblyTitle ("Mono ASP.NET State Server")]
 [assembly: AssemblyDescription ("Out of process ASP.NET State Server ")]
 [assembly: AssemblyCopyright ("2003 Novell, Inc.")]

diff --git a/tools/dbsessmgr/AssemblyInfo.cs.in b/tools/dbsessmgr/AssemblyInfo.cs.in
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("@VERSION@")]
+[assembly: AssemblyVersion("@XSP_VERSION@")]
 [assembly: AssemblyTitle ("Mono DB Session Tool")]
 [assembly: AssemblyDescription ("Tool for removing expired sessions from the session DB")]
 [assembly: AssemblyCopyright ("2003, 2004 Novell, Inc.")]