Setting a correct Content-Length for plugin assets

cakephp · Oct 29, 2011 · 60e3f02 · 60e3f02
1 parent 9866882
commit 60e3f02
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php
@@ -315,6 +315,9 @@ protected function _deliverAsset(CakeResponse $response, $assetFile, $ext) {
 			}
 			$response->type($contentType);
 		}
+		if (!$compressionEnabled) {
+		    $response->header('Content-Length', filesize($assetFile));
+		}
 		$response->cache(filemtime($assetFile));
 		$response->send();
 		ob_clean();

diff --git a/lib/Cake/Test/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php
@@ -1291,6 +1291,14 @@ public function testAssets() {
 		$result = ob_get_clean();
 		$this->assertEqual('htc file', $result);
 
+		$response = $this->getMock('CakeResponse', array('_sendHeader'));
+		ob_start();
+		$Dispatcher->asset('test_plugin/css/unknown.extension', $response);
+		ob_end_clean();
+		$expected = filesize(CakePlugin::path('TestPlugin') . 'webroot' . DS . 'css' . DS . 'unknown.extension');
+		$headers = $response->header();
+		$this->assertEqual($expected, $headers['Content-Length']);
+
 		if (php_sapi_name() == 'cli') {
 			while (ob_get_level()) {
 				ob_get_clean();