Skip to content
This repository was archived by the owner on Nov 22, 2018. It is now read-only.

Commit 35ec5be

Browse files
committed
Reacting to FileSystem changes
1 parent 46e60b1 commit 35ec5be

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/Microsoft.AspNet.StaticFiles/Helpers.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ internal static bool TryMatchPath(HttpContext context, PathString matchUrl, bool
4646
return false;
4747
}
4848

49-
internal static bool TryParseHttpDate(string dateString, out DateTime parsedDate)
49+
internal static bool TryParseHttpDate(string dateString, out DateTimeOffset parsedDate)
5050
{
51-
return DateTime.TryParseExact(dateString, Constants.HttpDateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out parsedDate);
51+
return DateTimeOffset.TryParseExact(dateString, Constants.HttpDateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out parsedDate);
5252
}
5353

5454
internal static string ResolveRootPath(string webRoot, PathString path)

src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal struct StaticFileContext
3030
private string _contentType;
3131
private IFileInfo _fileInfo;
3232
private long _length;
33-
private DateTime _lastModified;
33+
private DateTimeOffset _lastModified;
3434
private string _lastModifiedString;
3535
private string _etag;
3636
private string _etagQuoted;
@@ -134,7 +134,7 @@ public bool LookupFileInfo()
134134
_lastModified = new DateTime(last.Year, last.Month, last.Day, last.Hour, last.Minute, last.Second, last.Kind);
135135
_lastModifiedString = _lastModified.ToString(Constants.HttpDateFormat, CultureInfo.InvariantCulture);
136136

137-
long etagHash = _lastModified.ToFileTimeUtc() ^ _length;
137+
long etagHash = _lastModified.ToFileTime() ^ _length;
138138
_etag = Convert.ToString(etagHash, 16);
139139
_etagQuoted = '\"' + _etag + '\"';
140140
}
@@ -189,7 +189,7 @@ private void ComputeIfModifiedSince()
189189
{
190190
// 14.25 If-Modified-Since
191191
string ifModifiedSinceString = _request.Headers.Get(Constants.IfModifiedSince);
192-
DateTime ifModifiedSince;
192+
DateTimeOffset ifModifiedSince;
193193
if (Helpers.TryParseHttpDate(ifModifiedSinceString, out ifModifiedSince))
194194
{
195195
bool modified = ifModifiedSince < _lastModified;
@@ -198,7 +198,7 @@ private void ComputeIfModifiedSince()
198198

199199
// 14.28 If-Unmodified-Since
200200
string ifUnmodifiedSinceString = _request.Headers.Get(Constants.IfUnmodifiedSince);
201-
DateTime ifUnmodifiedSince;
201+
DateTimeOffset ifUnmodifiedSince;
202202
if (Helpers.TryParseHttpDate(ifUnmodifiedSinceString, out ifUnmodifiedSince))
203203
{
204204
bool unmodified = ifUnmodifiedSince >= _lastModified;
@@ -241,7 +241,7 @@ private void ComputeRange()
241241
// resource, then the server SHOULD process the Range header field as
242242
// requested. If the validator does not match, the server MUST ignore
243243
// the Range header field.
244-
DateTime ifRangeLastModified;
244+
DateTimeOffset ifRangeLastModified;
245245
bool ignoreRangeHeader = false;
246246
if (Helpers.TryParseHttpDate(ifRangeHeader, out ifRangeLastModified))
247247
{

0 commit comments

Comments
 (0)