diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2015-09-01 10:40:44 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2015-09-01 11:04:41 +0200 |
| commit | f12caf930eb375ef60b741265fb331da4d615504 (patch) | |
| tree | a09f6bc333d6e7dc9def691ac2a66d281dd045b6 /lib | |
| parent | e367f1bfc109cbb5095894279d1b6b7c15a9f428 (diff) | |
| download | nextcloud-server-f12caf930eb375ef60b741265fb331da4d615504.tar.gz nextcloud-server-f12caf930eb375ef60b741265fb331da4d615504.zip | |
Properly return 304
The ETag set in the IF_NONE_MODIFIED header is wraped in quotes (").
However the ETag that is set in response is not (yet). Also we need to
cast the ETag to a string.
* Added unit test
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/appframework/http.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php index e7b0d1e2cab..dee9818f4bc 100644 --- a/lib/private/appframework/http.php +++ b/lib/private/appframework/http.php @@ -121,7 +121,7 @@ class Http extends BaseHttp { // if etag or lastmodified have not changed, return a not modified if ((isset($this->server['HTTP_IF_NONE_MATCH']) - && trim($this->server['HTTP_IF_NONE_MATCH']) === $ETag) + && trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag) || |