genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Slim now handles Content-Length correctly with HTTP streams

Browse source
This commit is contained in:
Pierre Rudloff 2016-04-13 10:44:30 +02:00
parent f7577b9825
commit 63ec60b4ad
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -7,7 +7,7 @@
"require": { "require": {
"smarty/smarty": "~3.1.29", "smarty/smarty": "~3.1.29",
"rg3/youtube-dl": "2016.04.06", "rg3/youtube-dl": "2016.04.06",
"slim/slim": "~3.3.0", "slim/slim": "3.x-dev",
"mathmarques/smarty-view": "~1.1.0", "mathmarques/smarty-view": "~1.1.0",
"symfony/yaml": "~3.0.0", "symfony/yaml": "~3.0.0",
"symfony/process": "~3.0.0", "symfony/process": "~3.0.0",

15
composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "9363b8befa358a89f849785a6399698a", "hash": "411e020d026dab32ecc2bb6c2c059f22",
"content-hash": "6304d9a80a90da1095ba8512bba2f166", "content-hash": "1442dea55dfe2b876dd29d0af142ec28",
"packages": [ "packages": [
{ {
"name": "container-interop/container-interop", "name": "container-interop/container-interop",
@ -650,16 +650,16 @@
}, },
{ {
"name": "slim/slim", "name": "slim/slim",
"version": "3.3.0", "version": "3.x-dev",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/slimphp/Slim.git", "url": "https://github.com/slimphp/Slim.git",
"reference": "939f2e85d57508de9cff241d10091cd972f221c3" "reference": "a810d837adc0e5cf7fba72815a6213fe50e15cc8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/939f2e85d57508de9cff241d10091cd972f221c3", "url": "https://api.github.com/repos/slimphp/Slim/zipball/a810d837adc0e5cf7fba72815a6213fe50e15cc8",
"reference": "939f2e85d57508de9cff241d10091cd972f221c3", "reference": "a810d837adc0e5cf7fba72815a6213fe50e15cc8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -713,7 +713,7 @@
"micro", "micro",
"router" "router"
], ],
"time": "2016-03-10 21:37:40" "time": "2016-04-13 08:33:19"
}, },
{ {
"name": "smarty/smarty", "name": "smarty/smarty",
@ -996,6 +996,7 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"slim/slim": 20,
"ffmpeg/ffmpeg": 20 "ffmpeg/ffmpeg": 20
}, },
"prefer-stable": false, "prefer-stable": false,

2
controllers/FrontController.php
View file

@ -264,7 +264,7 @@ class FrontController
$stream = $client->request('GET', $video->url, array('stream'=>true)); $stream = $client->request('GET', $video->url, array('stream'=>true));
$response = $response->withHeader('Content-Disposition', 'attachment; filename="'.$video->_filename.'"'); $response = $response->withHeader('Content-Disposition', 'attachment; filename="'.$video->_filename.'"');
$response = $response->withHeader('Content-Type', $stream->getHeader('Content-Type')); $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()) { if ($request->isGet()) {
$response = $response->withBody($stream->getBody()); $response = $response->withBody($stream->getBody());
} }