2003-10-04 Gonzalo Paniagua Javier <gonzalo@ximian.com>

* Makefile.in: fix dist target.
	* server/XSPApplicationHost.cs: re-added line removed by mistake.
	* server/server.cs: added --nonstop argument to allow xsp be run with
	no controlling tty.

svn path=/trunk/xsp/; revision=18590

ChangeLog

@@ -1,3 +1,10 @@
+2003-10-04  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Makefile.in: fix dist target.
+	* server/XSPApplicationHost.cs: re-added line removed by mistake.
+	* server/server.cs: added --nonstop argument to allow xsp be run with
+	no controlling tty.
+
 2003-10-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* INSTALL: updated.

Makefile.in

@@ -4,7 +4,7 @@ DIST_DIR="@abs_top_builddir@/$(NAME_VERSION)"
 TARFILE=$(NAME_VERSION).tar.gz
 PREFIX=@prefix@
 TEST_DIR=$(DESTDIR)$(PREFIX)/share/doc/xsp/test
-DISTFILES=README NEWS INSTALL configure mkinstalldirs Makefile.in
+DISTFILES=README NEWS INSTALL configure mkinstalldirs Makefile.in install-sh
 
 .PHONY: all install clean uninstall dist
 

server/XSPApplicationHost.cs

@@ -107,6 +107,7 @@ namespace Mono.ASPNET
 			ILease l = (ILease) GetLifetimeService ();
 			l.Register (this);
 			if (!mwr.ReadRequestData ()) {
+				requestFinished = true;
 				return;
 			}
 

server/server.cs

@@ -12,6 +12,7 @@ using System.Configuration;
 using System.Diagnostics;
 using System.IO;
 using System.Net;
+using System.Threading;
 using System.Web.Hosting;
 
 namespace Mono.ASPNET
@@ -62,12 +63,17 @@ namespace Mono.ASPNET
 			Console.WriteLine ("                            /:.;/blog:../myblog");
 			Console.WriteLine ("                           Two applications like the above ones are handled.");
 			Console.WriteLine ("                    Default value: /:.");
+			Console.WriteLine ("                    AppSettings key name: MonoApplications");
+			Console.WriteLine ();
+			Console.WriteLine ("    --nonstop: don't stop the server by pressing enter. Must be used");
+			Console.WriteLine ("               when the server has no controlling terminal.");
 
 			Console.WriteLine ();
 		}
 		
 		public static int Main (string [] args)
 		{
+			bool nonstop = false;
 			Trace.Listeners.Add (new TextWriterTraceListener (Console.Out));
 			string apps = ConfigurationSettings.AppSettings ["MonoApplications"];
 			string rootDir = ConfigurationSettings.AppSettings ["MonoServerRootDir"];
@@ -109,9 +115,16 @@ namespace Mono.ASPNET
 				case "--applications":
 					apps = args [++i];
 					break;
+				case "--nonstop":
+					nonstop = true;
+					break;
 				case "--help":
 					ShowHelp ();
 					return 0;
+				default:
+					Console.WriteLine ("Unknown argument: {0}", a);
+					ShowHelp ();
+					return 1;
 				}
 			}
 
@@ -148,15 +161,26 @@ namespace Mono.ASPNET
 			
 			Console.WriteLine ("Root directory: {0}", rootDir);
 
+			ManualResetEvent evt = null;
 			try {
 				host.Start ();
-				Console.WriteLine ("Hit Return to stop the server.");
-				Console.ReadLine ();
+				if (!nonstop) {
+					Console.WriteLine ("Hit Return to stop the server.");
+					Console.ReadLine ();
+				} else {
+					evt = new ManualResetEvent (false);
+					evt.WaitOne ();
+				}
 			} catch (Exception e) {
 				Console.WriteLine ("Error: {0}", e.Message);
+				if (evt != null)
+					evt.Set ();
 				return 1;
 			}
 			
+			if (evt != null)
+				evt.Set ();
+
 			return 0;
 		}
 	}