TypeScript: Updated compile target, addressed issues

[bookstack] / app / Http / RangeSupportedStream.php

diff --git a/app/Http/RangeSupportedStream.php b/app/Http/RangeSupportedStream.php
index 300f4488cf44453d4f18f5c27207da8b6f12ed1b..c4b00778939dd00fd20a762520051c4436be5d40 100644 (file)
--- a/app/Http/RangeSupportedStream.php
+++ b/app/Http/RangeSupportedStream.php
@@ -32,12 +32,12 @@ class RangeSupportedStream
     /**
      * Sniff a mime type from the stream.
      */
     /**
      * Sniff a mime type from the stream.
      */

-    public function sniffMime(): string
+    public function sniffMime(string $extension = ''): string

     {
         $offset = min(2000, $this->fileSize);
         $this->sniffContent = fread($this->stream, $offset);
 
     {
         $offset = min(2000, $this->fileSize);
         $this->sniffContent = fread($this->stream, $offset);
 

-        return (new WebSafeMimeSniffer())->sniff($this->sniffContent);
+        return (new WebSafeMimeSniffer())->sniff($this->sniffContent, $extension);

     }
 
     /**
     }
 
     /**


@@ -92,7 +92,7 @@ class RangeSupportedStream
             if ($start < 0 || $start > $end) {
                 $this->responseStatus = 416;
                 $this->responseHeaders['Content-Range'] = sprintf('bytes */%s', $this->fileSize);
             if ($start < 0 || $start > $end) {
                 $this->responseStatus = 416;
                 $this->responseHeaders['Content-Range'] = sprintf('bytes */%s', $this->fileSize);

-            } elseif ($end - $start < $this->fileSize - 1) {
+            } else {

                 $this->responseLength = $end < $this->fileSize ? $end - $start + 1 : -1;
                 $this->responseOffset = $start;
                 $this->responseStatus = 206;
                 $this->responseLength = $end < $this->fileSize ? $end - $start + 1 : -1;
                 $this->responseOffset = $start;
                 $this->responseStatus = 206;