Merge branch 'release-1.2.3'

Rudloff · Nov 13, 2018 · c240063 · c240063
2 parents 0cd5a5e + e9cec9d
commit c240063
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 67 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "phpunit/phpunit": "~6.5.2",
     "doctrine/instantiator": "~1.0.0",
     "ffmpeg/ffmpeg": "4.0.2",
-    "rg3/youtube-dl": "2018.09.10",
+    "rg3/youtube-dl": "2018.11.07",
     "heroku/heroku-buildpack-php": "*",
     "anam/phantomjs-linux-x86-binary": "~2.1.1"
   },
@@ -39,10 +39,10 @@
       "type": "package",
       "package": {
         "name": "rg3/youtube-dl",
-        "version": "2018.09.10",
+        "version": "2018.11.07",
         "dist": {
           "type": "zip",
-          "url": "https://github.com/rg3/youtube-dl/archive/2018.09.10.zip"
+          "url": "https://github.com/rg3/youtube-dl/archive/2018.11.07.zip"
         }
       }
     },

diff --git a/composer.lock b/composer.lock
diff --git a/controllers/FrontController.php b/controllers/FrontController.php
@@ -422,9 +422,21 @@ private function getStream($url, $format, Response $response, Request $request,
             $body = new Stream($stream);
         } else {
             $client = new Client();
-            $stream = $client->request('GET', $video->url, ['stream' => true]);
+            $stream = $client->request(
+                'GET',
+                $video->url,
+                [
+                    'stream'  => true,
+                    'headers' => ['Range' => $request->getHeader('Range')],
+                ]
+            );
             $response = $response->withHeader('Content-Type', $stream->getHeader('Content-Type'));
             $response = $response->withHeader('Content-Length', $stream->getHeader('Content-Length'));
+            $response = $response->withHeader('Accept-Ranges', $stream->getHeader('Accept-Ranges'));
+            $response = $response->withHeader('Content-Range', $stream->getHeader('Content-Range'));
+            if ($stream->getStatusCode() == 206) {
+                $response = $response->withStatus(206);
+            }
             $body = $stream->getBody();
         }
         if ($request->isGet()) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "alltube",
   "description": "HTML GUI for youtube-dl",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "author": "Pierre Rudloff",
   "bugs": "https://github.com/Rudloff/alltube/issues",
   "dependencies": {