Want-Digest applies to the entire underlying file, not the HTTP payload

Author: acoburn

src/Model/BasicContainer.php

@@ -34,7 +34,6 @@ public function respond(Application $app, Request $request, array $options = arr
         $res->setEtag($this->getEtag($responseFormat, $request->headers->get('range')));
 
         if (!$res->isNotModified($request)) {
-            $algorithm = $this->getDigestAlgorithm($request->headers->get('want-digest'));
             $subject = $request->getUri();
             $predicate = self::LDP_NS . "contains";
 
@@ -92,17 +91,6 @@ public function respond(Application $app, Request $request, array $options = arr
                 $content = $graph->serialise($responseFormat);
             }
 
-            if ($request->headers->get('range') === null) {
-                switch ($algorithm) {
-                    case "md5":
-                        $res->headers->set('Digest', 'md5=' . $this->md5($content));
-                        break;
-                    case "sha1":
-                        $res->headers->set('Digest', 'sha1=' . $this->sha1($content));
-                        break;
-                }
-            }
-
             $res->setContent($content);
         }
 

src/Model/NonRDFSource.php

@@ -26,8 +26,7 @@ public function respond(Application $app, Request $request, array $options = arr
         $res->setLastModified(\DateTime::createFromFormat('U', filemtime($this->path)));
         $res->setEtag($this->getEtag($request->headers->get('range')));
         if (!$res->isNotModified($request)) {
-            $algorithm = $this->getDigestAlgorithm($request->headers->get('want-digest'));
-            switch ($algorithm) {
+            switch ($this->getDigestAlgorithm($request->headers->get('want-digest'))) {
                 case "md5":
                     $res->headers->set('Digest', "md5=" . $this->md5());
                     break;

src/Model/RDFSource.php

@@ -35,19 +35,15 @@ public function respond(Application $app, Request $request, array $options = arr
                     $res->headers->set("Link", $link, false);
                 }
             }
-
-            $algorithm = $this->getDigestAlgorithm($request->headers->get('want-digest'));
+            switch ($this->getDigestAlgorithm($request->headers->get('want-digest'))) {
+                case "md5":
+                    $res->headers->set('Digest', 'md5=' . $this->md5());
+                    break;
+                case "sha1":
+                    $res->headers->set('Digest', 'sha1=' . $this->sha1());
+                    break;
+            }
             if ($this->canStream($responseFormat)) {
-                if ($request->headers->get('range') === null) {
-                    switch ($algorithm) {
-                        case "md5":
-                            $res->headers->set('Digest', 'md5=' . $this->md5());
-                            break;
-                        case "sha1":
-                            $res->headers->set('Digest', 'sha1=' . $this->sha1());
-                            break;
-                    }
-                }
                 $filename = $this->path;
                 $stream = function () use ($filename) {
                     readfile($filename);
@@ -64,16 +60,6 @@ public function respond(Application $app, Request $request, array $options = arr
                 } else {
                     $content = $graph->serialise($responseFormat);
                 }
-                if ($request->headers->get('range') === null) {
-                    switch ($algorithm) {
-                        case "md5":
-                            $res->headers->set('Digest', 'md5=' . $this->md5($content));
-                            break;
-                        case "sha1":
-                            $res->headers->set('Digest', 'sha1=' . $this->sha1($content));
-                            break;
-                    }
-                }
                 $res->setContent($content);
             }
         }