mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
deprecate localized guids config switch
This commit is contained in:
parent
88caeaa783
commit
ca2e7a4195
@ -124,18 +124,6 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AddIpv4Option(HttpWebRequest request, HttpRequestOptions options)
|
|
||||||
{
|
|
||||||
request.ServicePoint.BindIPEndPointDelegate = (servicePount, remoteEndPoint, retryCount) =>
|
|
||||||
{
|
|
||||||
if (remoteEndPoint.AddressFamily == AddressFamily.InterNetwork)
|
|
||||||
{
|
|
||||||
return new IPEndPoint(IPAddress.Any, 0);
|
|
||||||
}
|
|
||||||
throw new InvalidOperationException("no IPv4 address");
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private WebRequest GetRequest(HttpRequestOptions options, string method)
|
private WebRequest GetRequest(HttpRequestOptions options, string method)
|
||||||
{
|
{
|
||||||
var url = options.Url;
|
var url = options.Url;
|
||||||
@ -153,11 +141,6 @@ namespace Emby.Server.Implementations.HttpClientManager
|
|||||||
|
|
||||||
if (httpWebRequest != null)
|
if (httpWebRequest != null)
|
||||||
{
|
{
|
||||||
if (options.PreferIpv4)
|
|
||||||
{
|
|
||||||
AddIpv4Option(httpWebRequest, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
AddRequestHeaders(httpWebRequest, options);
|
AddRequestHeaders(httpWebRequest, options);
|
||||||
|
|
||||||
if (options.EnableHttpCompression)
|
if (options.EnableHttpCompression)
|
||||||
|
@ -506,7 +506,7 @@ namespace Emby.Server.Implementations.Library
|
|||||||
throw new ArgumentNullException("type");
|
throw new ArgumentNullException("type");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ConfigurationManager.Configuration.EnableLocalizedGuids && key.StartsWith(ConfigurationManager.ApplicationPaths.ProgramDataPath))
|
if (key.StartsWith(ConfigurationManager.ApplicationPaths.ProgramDataPath))
|
||||||
{
|
{
|
||||||
// Try to normalize paths located underneath program-data in an attempt to make them more portable
|
// Try to normalize paths located underneath program-data in an attempt to make them more portable
|
||||||
key = key.Substring(ConfigurationManager.ApplicationPaths.ProgramDataPath.Length)
|
key = key.Substring(ConfigurationManager.ApplicationPaths.ProgramDataPath.Length)
|
||||||
|
@ -91,7 +91,6 @@ namespace MediaBrowser.Api
|
|||||||
{
|
{
|
||||||
config.EnableCaseSensitiveItemIds = true;
|
config.EnableCaseSensitiveItemIds = true;
|
||||||
config.SkipDeserializationForBasicTypes = true;
|
config.SkipDeserializationForBasicTypes = true;
|
||||||
config.EnableLocalizedGuids = true;
|
|
||||||
config.EnableSimpleArtistDetection = true;
|
config.EnableSimpleArtistDetection = true;
|
||||||
config.EnableNormalizedItemByNameIds = true;
|
config.EnableNormalizedItemByNameIds = true;
|
||||||
config.DisableLiveTvChannelUserDataName = true;
|
config.DisableLiveTvChannelUserDataName = true;
|
||||||
|
@ -101,7 +101,6 @@ namespace MediaBrowser.Common.Net
|
|||||||
public TimeSpan CacheLength { get; set; }
|
public TimeSpan CacheLength { get; set; }
|
||||||
|
|
||||||
public int TimeoutMs { get; set; }
|
public int TimeoutMs { get; set; }
|
||||||
public bool PreferIpv4 { get; set; }
|
|
||||||
public bool EnableDefaultUserAgent { get; set; }
|
public bool EnableDefaultUserAgent { get; set; }
|
||||||
|
|
||||||
public bool AppendCharsetToMimeType { get; set; }
|
public bool AppendCharsetToMimeType { get; set; }
|
||||||
|
@ -46,7 +46,6 @@ namespace MediaBrowser.Model.Configuration
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value><c>true</c> if [use HTTPS]; otherwise, <c>false</c>.</value>
|
/// <value><c>true</c> if [use HTTPS]; otherwise, <c>false</c>.</value>
|
||||||
public bool EnableHttps { get; set; }
|
public bool EnableHttps { get; set; }
|
||||||
public bool EnableLocalizedGuids { get; set; }
|
|
||||||
public bool EnableNormalizedItemByNameIds { get; set; }
|
public bool EnableNormalizedItemByNameIds { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -198,7 +197,6 @@ namespace MediaBrowser.Model.Configuration
|
|||||||
LocalNetworkAddresses = new string[] { };
|
LocalNetworkAddresses = new string[] { };
|
||||||
CodecsUsed = new string[] { };
|
CodecsUsed = new string[] { };
|
||||||
ImageExtractionTimeoutMs = 0;
|
ImageExtractionTimeoutMs = 0;
|
||||||
EnableLocalizedGuids = true;
|
|
||||||
PathSubstitutions = new PathSubstitution[] { };
|
PathSubstitutions = new PathSubstitution[] { };
|
||||||
EnableSimpleArtistDetection = true;
|
EnableSimpleArtistDetection = true;
|
||||||
|
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.33.20")]
|
[assembly: AssemblyVersion("3.2.34.1")]
|
||||||
|
Loading…
Reference in New Issue
Block a user