Passthrough cached image content instead of performing 302 redirect

agilepixel · Oct 3, 2018 · 51e3a05 · 51e3a05
1 parent c2665e9
commit 51e3a05
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/ConfigurationLoader.php b/src/ConfigurationLoader.php
@@ -5,7 +5,7 @@
  * @author Richard Brown <richard@agilepixel.io>
  * @copyright 2018 Agile Pixel
  *
- * @version v0.0.3
+ * @version v0.1.1
  *
  */
 

diff --git a/src/ImagesRespond.php b/src/ImagesRespond.php
@@ -5,7 +5,7 @@
  * @author Richard Brown <richard@agilepixel.io>
  * @copyright 2018 Agile Pixel
  *
- * @version v1.0.0
+ * @version v0.1.1
  *
  */
 
@@ -68,7 +68,7 @@ public function respond($request, $echo = true)
             if ($this->using_webp === false || ($this->using_webp === true && \Imagick::queryFormats('WEBP'))) {
                 Image::configure(['driver' => 'imagick']);
             }
-        } else if ($this->using_webp === true && !function_exists('imagewebp')) {
+        } elseif ($this->using_webp === true && !function_exists('imagewebp')) {
             $this->using_webp = false;
         }
 
@@ -87,12 +87,17 @@ public function respond($request, $echo = true)
         }
 
         $encode = $matches[4];
+        $imageType = $encode;
         if ($this->using_webp) {
             $encode = 'webp';
+            $imageType = $encode;
         }
         if ($encode == 'jpeg') {
             $encode = 'jpg';
         }
+        if ($encode == 'jpg') {
+            $imageType = 'jpeg';
+        }
 
         $size = $matches[2];
         $file = __DIR__ . '/' . $this->options['root_dir'].$matches[1].$matches[3].$matches[4];
@@ -116,7 +121,10 @@ public function respond($request, $echo = true)
             $outputfilename = __DIR__ . '/' . $this->options['root_dir'].$outputurl;
             if (file_exists($outputfilename)) {
                 if ($echo) {
-                    header('Location: '.$outputurl, true, 302);
+                    $fp = fopen($outputfilename, 'rb');
+                    header('Content-Type: image/'.$imageType);
+                    header('Content-Length: ' . filesize($outputfilename));
+                    fpassthru($fp);
                     exit;
                 } else {
                     return Image::make($outputfilename);

diff --git a/src/rewrite.php b/src/rewrite.php
@@ -5,7 +5,7 @@
  * @author Richard Brown <richard@agilepixel.io>
  * @copyright 2018 Agile Pixel
  *
- * @version v0.0.3
+ * @version v0.1.1
  *
  */