Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

2009-03-13 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* main.cs: fix error when --master is passed.
	Bug #481597 fixed.


svn path=/branches/mono-2-4-0/xsp/; revision=129304
  • Loading branch information...
commit 5d657f35c32ee1de707ace38b2b489b53488ebed 1 parent 54927ac
@gonzalop gonzalop authored
Showing with 7 additions and 1 deletion.
  1. +5 −0 ChangeLog
  2. +2 −1  src/Mono.WebServer.Apache/main.cs
View
5 ChangeLog
@@ -1,3 +1,8 @@
+2009-03-13 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+ * main.cs: fix error when --master is passed.
+ Bug #481597 fixed.
+
2009-03-03 Marek Habersack <mhabersack@novell.com>
* src/Mono.WebServer.Apache/ModMonoRequest.cs: removed a
View
3  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);
Please sign in to comment.
Something went wrong with that request. Please try again.