adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5513 from cakephp/issue-4916

Browse source 
Don't set content-length when serving assets.
This commit is contained in:
José Lorenzo Rodríguez 2014-12-30 10:12:19 +01:00
commit fcb6520ef1
2 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Routing/Filter/AssetDispatcher.php
View file

@ -149,12 +149,11 @@ class AssetDispatcher extends DispatcherFilter {
}
$response->type($contentType);
}
if (!$compressionEnabled) {
$response->header('Content-Length', filesize($assetFile));
}
$response->length(false);
$response->cache(filemtime($assetFile));
$response->send();
ob_clean();
if ($ext === 'css' || $ext === 'js') {
include $assetFile;
} else {

35
lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
View file

@ -228,4 +228,39 @@ class AssetDispatcherTest extends CakeTestCase {
$this->assertFalse($event->isStopped());
}
/**
* Test asset content length is unset
*
* If content length is unset, then the webserver can figure it out.
*
* @outputBuffering enabled
* @return void
*/
public function testAssetContentLength() {
Router::reload();
Configure::write('Dispatcher.filters', array('AssetDispatcher'));
App::build(array(
'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
));
$url = 'theme/test_theme/css/test_asset.css';
$file = 'View/Themed/TestTheme/webroot/css/test_asset.css';
$request = new CakeRequest($url);
$response = $this->getMock('CakeResponse', array('_sendHeader', 'send'));
$event = new CakeEvent('Dispatcher.beforeRequest', $this, compact('request', 'response'));
$filter = new AssetDispatcher();
$filter->beforeDispatch($event);
$result = ob_get_clean();
$path = CAKE . 'Test' . DS . 'test_app' . DS . str_replace('/', DS, $file);
$file = file_get_contents($path);
$this->assertEquals($file, $result);
$expected = filesize($path);
$headers = $response->header();
$this->assertFalse($headers['Content-Length']);
}
}