From 81d2407e6cc6a251a81751ef60fcecca0ef58119 Mon Sep 17 00:00:00 2001 From: Chris Noxz Date: Tue, 28 Apr 2020 18:25:34 +0200 Subject: fix 'If-Modified-Since' causing BAD REQUEST (#684) fix 'If-Modified-Since' causing BAD REQUEST Signed-off-by: Chris Noxz Co-authored-by: kesselb --- lib/Fetcher/Client/FeedIoClient.php | 3 ++- lib/Fetcher/Client/LegacyGuzzleClient.php | 3 ++- lib/Fetcher/Client/LegacyGuzzleResponse.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Fetcher/Client/FeedIoClient.php b/lib/Fetcher/Client/FeedIoClient.php index 268828e2b..33a3db2ad 100644 --- a/lib/Fetcher/Client/FeedIoClient.php +++ b/lib/Fetcher/Client/FeedIoClient.php @@ -44,10 +44,11 @@ class FeedIoClient implements ClientInterface */ public function getResponse(string $url, \DateTime $modifiedSince) : ResponseInterface { + $modifiedSince->setTimezone(new \DateTimeZone('GMT')); try { $options = [ 'headers' => [ - 'If-Modified-Since' => $modifiedSince->format(\DateTime::RFC2822) + 'If-Modified-Since' => $modifiedSince->format('D, d M Y H:i:s e') ] ]; diff --git a/lib/Fetcher/Client/LegacyGuzzleClient.php b/lib/Fetcher/Client/LegacyGuzzleClient.php index 4d56df0b3..59bbc9dc4 100644 --- a/lib/Fetcher/Client/LegacyGuzzleClient.php +++ b/lib/Fetcher/Client/LegacyGuzzleClient.php @@ -45,10 +45,11 @@ class LegacyGuzzleClient implements FeedIoClientInterface */ public function getResponse(string $url, \DateTime $modifiedSince) : ResponseInterface { + $modifiedSince->setTimezone(new \DateTimeZone('GMT')); try { $options = [ 'headers' => [ - 'If-Modified-Since' => $modifiedSince->format(\DateTime::RFC2822) + 'If-Modified-Since' => $modifiedSince->format('D, d M Y H:i:s e') ] ]; diff --git a/lib/Fetcher/Client/LegacyGuzzleResponse.php b/lib/Fetcher/Client/LegacyGuzzleResponse.php index 385ebe7e8..f8d6d7601 100644 --- a/lib/Fetcher/Client/LegacyGuzzleResponse.php +++ b/lib/Fetcher/Client/LegacyGuzzleResponse.php @@ -57,7 +57,7 @@ class LegacyGuzzleResponse implements ResponseInterface { if ($this->response->hasHeader(static::HTTP_LAST_MODIFIED)) { $lastModified = \DateTime::createFromFormat( - \DateTime::RFC2822, + 'D, d M Y H:i:s e', $this->getHeader(static::HTTP_LAST_MODIFIED) ); -- cgit v1.2.3