aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.Server.Mono/MonoAppHost.cs2
-rw-r--r--SocketHttpListener/Net/EndPointListener.cs9
2 files changed, 10 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Mono/MonoAppHost.cs b/MediaBrowser.Server.Mono/MonoAppHost.cs
index c94334e89..609497eed 100644
--- a/MediaBrowser.Server.Mono/MonoAppHost.cs
+++ b/MediaBrowser.Server.Mono/MonoAppHost.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Server.Mono
get
{
// A restart script must be provided
- return StartupOptions.ContainsOption("-restartpath") && StartupOptions.ContainsOption("-ffmpeg");
+ return StartupOptions.ContainsOption("-restartpath");
}
}
diff --git a/SocketHttpListener/Net/EndPointListener.cs b/SocketHttpListener/Net/EndPointListener.cs
index 2b1479e42..48c0ae7cb 100644
--- a/SocketHttpListener/Net/EndPointListener.cs
+++ b/SocketHttpListener/Net/EndPointListener.cs
@@ -93,6 +93,15 @@ namespace SocketHttpListener.Net
}
}
+ try
+ {
+ sock.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+ }
+ catch (SocketException)
+ {
+ // This is not supported on all operating systems (qnap)
+ }
+
sock.Bind(endpoint);
// This is the number TcpListener uses.