From 55a776427b97bec48a70a4b4f403b52935b620ea Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 5 Dec 2013 11:50:21 -0500 Subject: Removed unused properties from BaseItem. --- .../BaseApplicationPaths.cs | 3 +-- .../HttpClientManager/HttpClientManager.cs | 9 ++++++--- .../MediaBrowser.Common.Implementations.csproj | 21 +++++++++------------ 3 files changed, 16 insertions(+), 17 deletions(-) (limited to 'MediaBrowser.Common.Implementations') diff --git a/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs b/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs index ba68d1f5ad..6acaac5c97 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs @@ -280,8 +280,7 @@ namespace MediaBrowser.Common.Implementations // If it's a relative path, e.g. "..\" if (!Path.IsPathRooted(programDataPath)) { - var path = Assembly.GetExecutingAssembly().Location; - path = Path.GetDirectoryName(path); + var path = Path.GetDirectoryName(ApplicationPath); if (string.IsNullOrEmpty(path)) { diff --git a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs index 214ed106d9..19091885d1 100644 --- a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs +++ b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs @@ -103,21 +103,24 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager private WebRequest GetMonoRequest(HttpRequestOptions options, string method, bool enableHttpCompression) { - var request = WebRequest.Create(options.Url); + var request = (HttpWebRequest)WebRequest.Create(options.Url); if (!string.IsNullOrEmpty(options.AcceptHeader)) { - request.Headers.Add("Accept", options.AcceptHeader); + request.Accept = options.AcceptHeader; } + request.AutomaticDecompression = enableHttpCompression ? DecompressionMethods.Deflate : DecompressionMethods.None; request.CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate); request.ConnectionGroupName = GetHostFromUrl(options.Url); + request.KeepAlive = true; request.Method = method; + request.Pipelined = true; request.Timeout = 20000; if (!string.IsNullOrEmpty(options.UserAgent)) { - request.Headers.Add("User-Agent", options.UserAgent); + request.UserAgent = options.UserAgent; } return request; diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index 9487855756..f990db556a 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -37,21 +37,9 @@ Always - - False - ..\packages\NLog.2.1.0\lib\net45\NLog.dll - - - False - ..\packages\ServiceStack.Text.3.9.70\lib\net35\ServiceStack.Text.dll - ..\packages\sharpcompress.0.10.1.3\lib\net40\SharpCompress.dll - - False - ..\packages\SimpleInjector.2.3.6\lib\net40-client\SimpleInjector.dll - @@ -59,6 +47,15 @@ + + ..\packages\NLog.2.1.0\lib\net45\NLog.dll + + + ..\packages\ServiceStack.Text.3.9.70\lib\net35\ServiceStack.Text.dll + + + ..\packages\SimpleInjector.2.3.6\lib\net40-client\SimpleInjector.dll + -- cgit v1.2.3