diff options
author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-04-09 16:07:47 +0200 |
---|---|---|
committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-04-09 16:07:47 +0200 |
commit | 44577e4345066952622feca9ef69c24fc23d08ab (patch) | |
tree | 362160e9a6cf5c55eb1a2cca5aa32fb3bac336ad /lib/private/AppFramework/Http.php | |
parent | 42625a46be495ea1c60ac8fe8e13946fd9ed9732 (diff) | |
download | nextcloud-server-44577e4345066952622feca9ef69c24fc23d08ab.tar.gz nextcloud-server-44577e4345066952622feca9ef69c24fc23d08ab.zip |
Remove trailing and in between spaces
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'lib/private/AppFramework/Http.php')
-rw-r--r-- | lib/private/AppFramework/Http.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/AppFramework/Http.php b/lib/private/AppFramework/Http.php index 91d13b9e231..4b08812b6cf 100644 --- a/lib/private/AppFramework/Http.php +++ b/lib/private/AppFramework/Http.php @@ -117,7 +117,7 @@ class Http extends BaseHttp { * @param string $ETag the etag * @return string */ - public function getStatusHeader($status, \DateTime $lastModified=null, + public function getStatusHeader($status, \DateTime $lastModified=null, $ETag=null) { if(!is_null($lastModified)) { @@ -131,7 +131,7 @@ class Http extends BaseHttp { || (isset($this->server['HTTP_IF_MODIFIED_SINCE']) - && trim($this->server['HTTP_IF_MODIFIED_SINCE']) === + && trim($this->server['HTTP_IF_MODIFIED_SINCE']) === $lastModified)) { $status = self::STATUS_NOT_MODIFIED; @@ -140,13 +140,13 @@ class Http extends BaseHttp { // we have one change currently for the http 1.0 header that differs // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND // if this differs any more, we want to create childclasses for this - if($status === self::STATUS_TEMPORARY_REDIRECT + if($status === self::STATUS_TEMPORARY_REDIRECT && $this->protocolVersion === 'HTTP/1.0') { $status = self::STATUS_FOUND; } - return $this->protocolVersion . ' ' . $status . ' ' . + return $this->protocolVersion . ' ' . $status . ' ' . $this->headers[$status]; } |