Merge branch 'good_redirection' of https://github.com/doubleface/miniflux

This commit is contained in:
Frederic Guillot 2013-07-12 20:31:38 -04:00
commit bb7c2f0e31

View File

@ -73,9 +73,6 @@ class RemoteResource
{ {
$response = $this->doRequest(); $response = $this->doRequest();
$this->etag = isset($response['headers']['ETag']) ? $response['headers']['ETag'] : '';
$this->last_modified = isset($response['headers']['Last-Modified']) ? $response['headers']['Last-Modified'] : '';
if ($response['status'] == 304) { if ($response['status'] == 304) {
$this->is_modified = false; $this->is_modified = false;
@ -94,7 +91,8 @@ class RemoteResource
$this->execute(); $this->execute();
} }
else { else {
$this->etag = isset($response['headers']['ETag']) ? $response['headers']['ETag'] : '';
$this->last_modified = isset($response['headers']['Last-Modified']) ? $response['headers']['Last-Modified'] : '';
$this->content = $response['body']; $this->content = $response['body'];
} }
} }