From 5d657f35c32ee1de707ace38b2b489b53488ebed Mon Sep 17 00:00:00 2001 From: Gonzalo Paniagua Javier Date: Fri, 13 Mar 2009 16:48:35 +0000 Subject: [PATCH] 2009-03-13 Gonzalo Paniagua Javier * main.cs: fix error when --master is passed. Bug #481597 fixed. svn path=/branches/mono-2-4-0/xsp/; revision=129304 --- ChangeLog | 5 +++++ src/Mono.WebServer.Apache/main.cs | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bf01f118..e92df924 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-03-13 Gonzalo Paniagua Javier + + * main.cs: fix error when --master is passed. + Bug #481597 fixed. + 2009-03-03 Marek Habersack * src/Mono.WebServer.Apache/ModMonoRequest.cs: removed a diff --git a/src/Mono.WebServer.Apache/main.cs b/src/Mono.WebServer.Apache/main.cs index 85e55deb..d665886f 100644 --- a/src/Mono.WebServer.Apache/main.cs +++ b/src/Mono.WebServer.Apache/main.cs @@ -361,7 +361,8 @@ public int RealMain (string [] args, bool root, IApplicationHost ext_apphost) webSource.Dispose (); return svr.RealMain (args, false, vh.AppHost); } - server.AppHost = ext_apphost; + if (ext_apphost != null) + server.AppHost = ext_apphost; if (!useTCP) { Console.WriteLine ("Listening on: {0}", filename);