Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

update web socket sharp

Browse Source
This commit is contained in:
Luke Pulverenti 2014-09-14 20:39:24 -04:00
parent 5f87d57381
commit 5abbc84122
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
View File

@ -78,6 +78,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
// Handle the processing of a request in here. // Handle the processing of a request in here.
private void ListenerCallback(IAsyncResult asyncResult) private void ListenerCallback(IAsyncResult asyncResult)
{ {
_listenForNextRequest.Set();
var listener = asyncResult.AsyncState as HttpListener; var listener = asyncResult.AsyncState as HttpListener;
HttpListenerContext context; HttpListenerContext context;
@ -88,8 +90,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
{ {
if (!isListening) if (!isListening)
{ {
_logger.Debug("Ignoring ListenerCallback() as HttpListener is no longer listening"); _logger.Debug("Ignoring ListenerCallback() as HttpListener is no longer listening"); return;
return;
} }
// The EndGetContext() method, as with all Begin/End asynchronous methods in the .NET Framework, // The EndGetContext() method, as with all Begin/End asynchronous methods in the .NET Framework,
// blocks until there is a request to be processed or some type of data is available. // blocks until there is a request to be processed or some type of data is available.
@ -105,10 +106,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
_logger.Warn(errMsg); _logger.Warn(errMsg);
return; return;
} }
finally
{
_listenForNextRequest.Set();
}
Task.Factory.StartNew(() => InitTask(context)); Task.Factory.StartNew(() => InitTask(context));
} }

7
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@ -457,5 +457,10 @@
"MessagePendingMediaBrowserAccountAdded": "The Media Browser account has been added to this user. An email will be sent to the owner of the account. The invitation will need to be confirmed by clicking a link within the email.", "MessagePendingMediaBrowserAccountAdded": "The Media Browser account has been added to this user. An email will be sent to the owner of the account. The invitation will need to be confirmed by clicking a link within the email.",
"HeaderMediaBrowserAccountRemoved": "Media Browser Account Removed", "HeaderMediaBrowserAccountRemoved": "Media Browser Account Removed",
"MessageMediaBrowserAccontRemoved": "The Media Browser account has been removed from this user.", "MessageMediaBrowserAccontRemoved": "The Media Browser account has been removed from this user.",
"TooltipLinkedToMediaBrowserConnect": "Linked to Media Browser Connect" "TooltipLinkedToMediaBrowserConnect": "Linked to Media Browser Connect",
"HeaderUnrated": "Unrated",
"ValueDiscNumber": "Disc {0}",
"HeaderUnknownDate": "Unknown Date",
"HeaderUnknownYear": "Unknown Year",
"ValueMinutes": "{0} min"
} }