diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-12-04 17:02:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-04 17:02:21 -0500 |
| commit | 06a8b8af88bad549f3722c6dd13b38df24a57583 (patch) | |
| tree | 4a99e9bd84d093af9b87c5277346136396a670c9 /Emby.Server.Implementations | |
| parent | f04b7339964ccc574a756207a7af33e21505b3c6 (diff) | |
| parent | 8c8f2aaba5e4bf573efe2730b5450a8c07abe1b3 (diff) | |
Merge pull request #2329 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations')
3 files changed, 6 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs index 8a5ae2c3a..0e1f5a551 100644 --- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -518,7 +518,7 @@ namespace Emby.Server.Implementations.HttpServer return; } - var handler = HttpHandlerFactory.GetHandler(httpReq); + var handler = HttpHandlerFactory.GetHandler(httpReq, _logger); if (handler != null) { diff --git a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs index b337e1b9e..f140f799f 100644 --- a/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs @@ -299,7 +299,8 @@ namespace Emby.Server.Implementations.Library.Resolvers return false; } - return directoryService.GetFiles(fullPath).Any(i => string.Equals(i.Extension, ".m2ts", StringComparison.OrdinalIgnoreCase)); + return directoryService.GetFiles(fullPath).Any(i => string.Equals(i.Extension, ".m2ts", StringComparison.OrdinalIgnoreCase) || + string.Equals(i.Extension, ".mts", StringComparison.OrdinalIgnoreCase)); } } } diff --git a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs index 557fa1f5f..57307aa73 100644 --- a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs +++ b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs @@ -77,7 +77,9 @@ namespace Emby.Server.Implementations.LiveTv.Listings // It's going to come back gzipped regardless of this value // So we need to make sure the decompression method is set to gzip - EnableHttpCompression = true + EnableHttpCompression = true, + + UserAgent = "Emby/3.0" }).ConfigureAwait(false); |