Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "merged branch povilas/issue_6101 (PR #6708)"

This reverts commit b2bcbbbd19efdb6e4f2133dfbdf162c9bb30a214, reversing
changes made to c5fcf0d0cc6a3353ec13e2141411e082693db2d5.
  • Loading branch information...
commit dc389858ce6ae40307f03be2ab482cf35661b76f 1 parent 795e8eb
@fabpot fabpot authored
Showing with 1 addition and 14 deletions.
  1. +1 −14 BinaryFileResponse.php
View
15 BinaryFileResponse.php
@@ -22,7 +22,6 @@
* @author Igor Wiedler <igor@wiedler.ch>
* @author Jordan Alliot <jordan.alliot@gmail.com>
* @author Sergey Linnik <linniksa@gmail.com>
- * @author Povilas Skruibis <puovils@gmail.com>
*/
class BinaryFileResponse extends Response
{
@@ -124,24 +123,12 @@ public function setAutoLastModified()
*/
public function setAutoEtag()
{
- $this->setEtag($this->calculateFileHash($this->file->getPathname()));
+ $this->setEtag(sha1_file($this->file->getPathname()));
return $this;
}
/**
- * Calculate file hash
- *
- * @param string $filename The path to the file
- *
- * @return string
- */
- protected function calculateFileHash($filename)
- {
- return sha1_file($filename);
- }
-
- /**
* Sets the Content-Disposition header with the given filename.
*
* @param string $disposition ResponseHeaderBag::DISPOSITION_INLINE or ResponseHeaderBag::DISPOSITION_ATTACHMENT
Please sign in to comment.
Something went wrong with that request. Please try again.