aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-09-15 16:32:49 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-09-15 16:32:49 -0400
commit9e661daf83a44799844b0fda8c304efb6a0ed311 (patch)
tree76880b30d13b211c70c1544ebaffc2bf2e6ae16a
parent3ad2703c35ef6872eee169d5892bf80b9573a484 (diff)
update multicast loopback handling
-rw-r--r--MediaBrowser.Dlna/Main/DlnaEntryPoint.cs14
-rw-r--r--MediaBrowser.WebDashboard/Api/PackageCreator.cs2
2 files changed, 2 insertions, 14 deletions
diff --git a/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs b/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
index faf293f6b2..b1205710a6 100644
--- a/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
+++ b/MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
@@ -110,18 +110,6 @@ namespace MediaBrowser.Dlna.Main
{
var options = _config.GetDlnaConfiguration();
- if (!options.EnableServer && !options.EnablePlayTo && !_config.Configuration.EnableUPnP)
- {
- if (_ssdpHandlerStarted)
- {
- // Sat/ip live tv depends on device discovery, as well as hd homerun detection
- // In order to allow this to be disabled, we need a modular way of knowing if there are
- // any parts of the system that are dependant on it
- // DisposeSsdpHandler();
- }
- return;
- }
-
if (!_ssdpHandlerStarted)
{
StartSsdpHandler();
@@ -231,7 +219,7 @@ namespace MediaBrowser.Dlna.Main
return;
}
- var cacheLength = _config.GetDlnaConfiguration().BlastAliveMessageIntervalSeconds*2;
+ var cacheLength = _config.GetDlnaConfiguration().BlastAliveMessageIntervalSeconds * 2;
_Publisher.SupportPnpRootDevice = true;
foreach (var address in await _appHost.GetLocalIpAddresses().ConfigureAwait(false))
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index e7247a11f1..02e8ad6f22 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -346,7 +346,7 @@ namespace MediaBrowser.WebDashboard.Api
if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
{
- sb.Append("<meta http-equiv=\"Content-Security-Policy\" content=\"default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap: file: filesystem:; connect-src ws: *\">");
+ sb.Append("<meta http-equiv=\"Content-Security-Policy\" content=\"default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap: file: filesystem:;\">");
}
else
{