Skip to content

Commit 9534093

Browse files
attempt to resolve https hangs
1 parent e026138 commit 9534093

17 files changed

+768
-742
lines changed

Emby.Server.Implementations/ApplicationHost.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2217,7 +2217,7 @@ public async Task<CheckForUpdateResult> CheckForApplicationUpdate(CancellationTo
22172217
try
22182218
{
22192219
var result = await new GithubUpdater(HttpClient, JsonSerializer).CheckForUpdateResult("MediaBrowser",
2220-
"Emby",
2220+
"Emby.Releases",
22212221
ApplicationVersion,
22222222
updateLevel,
22232223
ReleaseAssetFilename,

RSSDP/SsdpDevicePublisher.cs

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ public void AddDevice(SsdpRootDevice device)
113113
{
114114
//_MinCacheTime = minCacheTime;
115115

116-
ConnectToDeviceEvents(device);
117-
118116
WriteTrace("Device Added", device);
119117

120118
SetRebroadcastAliveNotificationsTimer(minCacheTime);
@@ -152,8 +150,6 @@ public async Task RemoveDevice(SsdpRootDevice device)
152150
{
153151
//_MinCacheTime = minCacheTime;
154152

155-
DisconnectFromDeviceEvents(device);
156-
157153
WriteTrace("Device Removed", device);
158154

159155
await SendByeByeNotifications(device, true, CancellationToken.None).ConfigureAwait(false);
@@ -527,9 +523,8 @@ private Task SendByeByeNotification(SsdpDevice device, string notificationType,
527523
var message = BuildMessage(header, values);
528524

529525
var sendCount = IsDisposed ? 1 : 3;
526+
WriteTrace(String.Format("Sent byebye notification"), device);
530527
return _CommsServer.SendMulticastMessage(message, sendCount, cancellationToken);
531-
532-
//WriteTrace(String.Format("Sent byebye notification"), device);
533528
}
534529

535530
#endregion
@@ -630,50 +625,10 @@ private void WriteTrace(string text, SsdpDevice device)
630625
WriteTrace(text + " " + device.DeviceType + " - " + device.Uuid);
631626
}
632627

633-
private void ConnectToDeviceEvents(SsdpDevice device)
634-
{
635-
device.DeviceAdded += device_DeviceAdded;
636-
device.DeviceRemoved += device_DeviceRemoved;
637-
638-
foreach (var childDevice in device.Devices)
639-
{
640-
ConnectToDeviceEvents(childDevice);
641-
}
642-
}
643-
644-
private void DisconnectFromDeviceEvents(SsdpDevice device)
645-
{
646-
device.DeviceAdded -= device_DeviceAdded;
647-
device.DeviceRemoved -= device_DeviceRemoved;
648-
649-
foreach (var childDevice in device.Devices)
650-
{
651-
DisconnectFromDeviceEvents(childDevice);
652-
}
653-
}
654-
655628
#endregion
656629

657630
#region Event Handlers
658631

659-
private void device_DeviceAdded(object sender, DeviceEventArgs e)
660-
{
661-
if (IsDisposed)
662-
{
663-
return;
664-
}
665-
666-
SendAliveNotifications(e.Device, false, CancellationToken.None);
667-
ConnectToDeviceEvents(e.Device);
668-
}
669-
670-
private void device_DeviceRemoved(object sender, DeviceEventArgs e)
671-
{
672-
var task = SendByeByeNotifications(e.Device, false, CancellationToken.None);
673-
Task.WaitAll(task);
674-
DisconnectFromDeviceEvents(e.Device);
675-
}
676-
677632
private void CommsServer_RequestReceived(object sender, RequestReceivedEventArgs e)
678633
{
679634
if (this.IsDisposed) return;

SharedVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
using System.Reflection;
22

3-
[assembly: AssemblyVersion("3.3.1.7")]
3+
[assembly: AssemblyVersion("3.3.1.8")]

0 commit comments

Comments
 (0)