alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 18:14:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Switched date operations to utc

Browse Source
This commit is contained in:
LukePulverenti Luke Pulverenti luke pulverenti
2012-09-04 15:23:15 -04:00
parent f931a375cf
commit 4752d12aaa
13 changed files with 81 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MediaBrowser.Common/Net/Handlers/BaseHandler.cs
View File

@@ -167,7 +167,8 @@ namespace MediaBrowser.Common.Net.Handlers
{
HttpListenerContext = ctx;
Logger.LogInfo("Http Server received request at: " + ctx.Request.Url.ToString());
string url = ctx.Request.Url.ToString();
Logger.LogInfo("Http Server received request at: " + url);
Logger.LogInfo("Http Headers: " + string.Join(",", ctx.Request.Headers.AllKeys.Select(k => k + "=" + ctx.Request.Headers[k])));
ctx.Response.AddHeader("Access-Control-Allow-Origin", "*");
@@ -195,10 +196,10 @@ namespace MediaBrowser.Common.Net.Handlers
{
DateTime ifModifiedSince;
if (DateTime.TryParse(ctx.Request.Headers["If-Modified-Since"].Replace(" GMT", string.Empty), out ifModifiedSince))
if (DateTime.TryParse(ctx.Request.Headers["If-Modified-Since"], out ifModifiedSince))
{
// If the cache hasn't expired yet just return a 304
if (IsCacheValid(ifModifiedSince, cacheDuration, lastDateModified))
if (IsCacheValid(ifModifiedSince.ToUniversalTime(), cacheDuration, lastDateModified))
{
StatusCode = 304;
}
@@ -207,6 +208,8 @@ namespace MediaBrowser.Common.Net.Handlers
await PrepareResponse().ConfigureAwait(false);
Logger.LogInfo("Responding with status code {0} for url {1}", StatusCode, url);
if (IsResponseValid)
{
bool compressResponse = ShouldCompressResponse(ctx.Response.ContentType) && ClientSupportsCompression;
@@ -295,10 +298,12 @@ namespace MediaBrowser.Common.Net.Handlers
private void CacheResponse(HttpListenerResponse response, TimeSpan duration, DateTime? dateModified)
{
DateTime lastModified = dateModified ?? DateTime.Now;
DateTime now = DateTime.UtcNow;
DateTime lastModified = dateModified ?? now;
response.Headers[HttpResponseHeader.CacheControl] = "public, max-age=" + Convert.ToInt32(duration.TotalSeconds);
response.Headers[HttpResponseHeader.Expires] = DateTime.Now.Add(duration).ToString("r");
response.Headers[HttpResponseHeader.Expires] = now.Add(duration).ToString("r");
response.Headers[HttpResponseHeader.LastModified] = lastModified.ToString("r");
}
@@ -334,7 +339,7 @@ namespace MediaBrowser.Common.Net.Handlers
DateTime cacheExpirationDate = ifModifiedSince.Add(cacheDuration);
if (DateTime.Now < cacheExpirationDate)
if (DateTime.UtcNow < cacheExpirationDate)
{
return true;
}
@@ -347,7 +352,7 @@ namespace MediaBrowser.Common.Net.Handlers
/// </summary>
private DateTime NormalizeDateForComparison(DateTime date)
{
return new DateTime(date.Year, date.Month, date.Day, date.Hour, date.Minute, date.Second);
return new DateTime(date.Year, date.Month, date.Day, date.Hour, date.Minute, date.Second, date.Kind);
}
protected virtual long? GetTotalContentLength()

2
MediaBrowser.Common/Net/Handlers/StaticFileHandler.cs
View File

@@ -108,7 +108,7 @@ namespace MediaBrowser.Common.Net.Handlers
if (SourceStream != null)
{
value = File.GetLastWriteTime(Path);
value = File.GetLastWriteTimeUtc(Path);
}
return Task.FromResult<DateTime?>(value);