From 63ec60b4ad9bc6fdbde5f36a138bf31709e1ff40 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 13 Apr 2016 10:44:30 +0200 Subject: [PATCH] Slim now handles Content-Length correctly with HTTP streams --- composer.json | 2 +- composer.lock | 15 ++++++++------- controllers/FrontController.php | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 67c6ed1..d3dfe46 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "require": { "smarty/smarty": "~3.1.29", "rg3/youtube-dl": "2016.04.06", - "slim/slim": "~3.3.0", + "slim/slim": "3.x-dev", "mathmarques/smarty-view": "~1.1.0", "symfony/yaml": "~3.0.0", "symfony/process": "~3.0.0", diff --git a/composer.lock b/composer.lock index 90c5f9f..b1b7496 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "9363b8befa358a89f849785a6399698a", - "content-hash": "6304d9a80a90da1095ba8512bba2f166", + "hash": "411e020d026dab32ecc2bb6c2c059f22", + "content-hash": "1442dea55dfe2b876dd29d0af142ec28", "packages": [ { "name": "container-interop/container-interop", @@ -650,16 +650,16 @@ }, { "name": "slim/slim", - "version": "3.3.0", + "version": "3.x-dev", "source": { "type": "git", "url": "https://github.com/slimphp/Slim.git", - "reference": "939f2e85d57508de9cff241d10091cd972f221c3" + "reference": "a810d837adc0e5cf7fba72815a6213fe50e15cc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/939f2e85d57508de9cff241d10091cd972f221c3", - "reference": "939f2e85d57508de9cff241d10091cd972f221c3", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/a810d837adc0e5cf7fba72815a6213fe50e15cc8", + "reference": "a810d837adc0e5cf7fba72815a6213fe50e15cc8", "shasum": "" }, "require": { @@ -713,7 +713,7 @@ "micro", "router" ], - "time": "2016-03-10 21:37:40" + "time": "2016-04-13 08:33:19" }, { "name": "smarty/smarty", @@ -996,6 +996,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "slim/slim": 20, "ffmpeg/ffmpeg": 20 }, "prefer-stable": false, diff --git a/controllers/FrontController.php b/controllers/FrontController.php index e61423b..0165657 100644 --- a/controllers/FrontController.php +++ b/controllers/FrontController.php @@ -264,7 +264,7 @@ class FrontController $stream = $client->request('GET', $video->url, array('stream'=>true)); $response = $response->withHeader('Content-Disposition', 'attachment; filename="'.$video->_filename.'"'); $response = $response->withHeader('Content-Type', $stream->getHeader('Content-Type')); - //$response = $response->withHeader('Content-Length', $stream->getHeader('Content-Length')); + $response = $response->withHeader('Content-Length', $stream->getHeader('Content-Length')); if ($request->isGet()) { $response = $response->withBody($stream->getBody()); }