Skip to content

Commit

Permalink
Revert "Parse LastModified date without requiring global timezone"
Browse files Browse the repository at this point in the history
This reverts commit 176fb10.
  • Loading branch information
mrclay committed Apr 3, 2017
1 parent 21cc3e7 commit fefc85d
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions min/lib/HTTP/ConditionalGet.php
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,7 @@ protected function resourceNotModified()
}
// strip off IE's extra data (semicolon)
list($ifModifiedSince) = explode(';', $_SERVER['HTTP_IF_MODIFIED_SINCE'], 2);

$date = new DateTime($ifModifiedSince, new DateTimeZone('UTC'));

if ($date->getTimestamp() >= $this->_lmTime) {
if (strtotime($ifModifiedSince) >= $this->_lmTime) {
// Apache 2.2's behavior. If there was no ETag match, send the
// non-encoded version of the ETag value.
$this->_headers['ETag'] = $this->normalizeEtag($this->_etag);
Expand Down

0 comments on commit fefc85d

Please sign in to comment.