diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations')
4 files changed, 37 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs index d88a04063..95877ec0c 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -166,6 +166,17 @@ namespace MediaBrowser.Server.Implementations.HttpServer private void OnRequestReceived(string localEndPoint) { + var ignore = localEndPoint.IndexOf("::", StringComparison.OrdinalIgnoreCase) != -1 || + + localEndPoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) || + localEndPoint.StartsWith("localhost", StringComparison.OrdinalIgnoreCase) || + localEndPoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase); + + if (ignore) + { + return; + } + if (_localEndpointLock.TryEnterWriteLock(100)) { var list = _localEndpoints.ToList(); diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs index 738222540..02d643477 100644 --- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs +++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs @@ -355,7 +355,22 @@ namespace MediaBrowser.Server.Implementations.Library /// <returns>System.String[][].</returns> private List<string> GetWords(string term) { - return term.Split().Where(i => !string.IsNullOrWhiteSpace(i)).ToList(); + var stoplist = GetStopList().ToList(); + + return term.Split() + .Where(i => !string.IsNullOrWhiteSpace(i) && !stoplist.Contains(i, StringComparer.OrdinalIgnoreCase)) + .ToList(); + } + + private IEnumerable<string> GetStopList() + { + return new[] + { + "the", + "a", + "of", + "an" + }; } } } diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 552aa0a14..2a3e4bc6f 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -571,5 +571,12 @@ "MediaInfoStreamTypeEmbeddedImage": "Embedded Image", "MediaInfoRefFrames": "Ref frames", "TabPlayback": "Playback", - "HeaderSelectCustomIntrosPath": "Select Custom Intros Path" + "HeaderSelectCustomIntrosPath": "Select Custom Intros Path", + "HeaderRateAndReview": "Rate and Review", + "HeaderThankYou": "Thank You", + "MessageThankYouForYourReview": "Thank you for your review.", + "LabelYourRating": "Your rating:", + "LabelFullReview": "Full review:", + "LabelShortRatingDescription": "Short rating summary:", + "OptionIRecommendThisItem": "I recommend this item" } diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index 52a3b8df0..555ca7c16 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -1196,5 +1196,6 @@ "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.", "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.", "LabelCustomIntrosPath": "Custom intros path:", - "LabelCustomIntrosPathHelp": "A folder containing video files. A video will be randomly selected and played after trailers." + "LabelCustomIntrosPathHelp": "A folder containing video files. A video will be randomly selected and played after trailers.", + "ValueSpecialEpisodeName": "Special - {0}" } |