diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-19 02:32:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 02:32:34 -0400 |
| commit | b9c64d7e8d80feeaabf3e61dc3fbb43f576db8ff (patch) | |
| tree | afb41dd72c62c979a0e575a29c4afc720e8fc0b1 /MediaBrowser.Server.Implementations/Library | |
| parent | 5e8181e34a8359bb153cd90935bd64670b8f5409 (diff) | |
| parent | b7c6ffe0131db74ba50fb397d43279af8f616bce (diff) | |
Merge pull request #2244 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/LibraryManager.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index a45d7ae5f..64abcc044 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -2840,7 +2840,11 @@ namespace MediaBrowser.Server.Implementations.Library { if (Environment.OSVersion.Platform == PlatformID.Win32NT) { - return Directory.Exists(path); + // We can't validate protocol-based paths, so just allow them + if (path.IndexOf("://", StringComparison.OrdinalIgnoreCase) == -1) + { + return Directory.Exists(path); + } } // Without native support for unc, we cannot validate this when running under mono diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs index 716d627a9..e7bfe56f2 100644 --- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs +++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs @@ -360,7 +360,6 @@ namespace MediaBrowser.Server.Implementations.Library public async Task<LiveStreamResponse> OpenLiveStream(LiveStreamRequest request, bool enableAutoClose, CancellationToken cancellationToken) { - enableAutoClose = false; await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false); try |