Index: trunk/packages/ezjscore_extension/ezextension/ezjscore/CHANGELOG =================================================================== --- trunk/packages/ezjscore_extension/ezextension/ezjscore/CHANGELOG (revision 169) +++ trunk/packages/ezjscore_extension/ezextension/ezjscore/CHANGELOG (working copy) @@ -1,7 +1,7 @@ # v1.2.0alpha1 - Fixed bug #16393: TC-36 - eZFlow + eZFind show-facets and enable-spellchecker always enabled - Upgraded YUI 3.x from 3.0.0 to 3.1.0 - +- Fixed bug #16669: wrong content-type header for packed js/css files using clustering # v1.1.0rc1 - Fixed bug #16456: ezjscore not cluster aware? Index: trunk/packages/ezjscore_extension/ezextension/ezjscore/classes/ezjscpacker.php =================================================================== --- trunk/packages/ezjscore_extension/ezextension/ezjscore/classes/ezjscpacker.php (revision 168) +++ trunk/packages/ezjscore_extension/ezextension/ezjscore/classes/ezjscpacker.php (working copy) @@ -389,6 +389,7 @@ // Merge file content and create new cache file $content = ''; + $isCSS = strpos($fileExtension, '.css') !== false; foreach( $validFiles as $file) { // if this is a js / css generator, call to get content @@ -412,7 +413,7 @@ } // we need to fix relative background image paths if this is a css file - if ( strpos($fileExtension, '.css') !== false ) + if ( $isCSS ) { $fileContent = ezjscPacker::fixImgPaths( $fileContent, $file ); } @@ -425,14 +426,16 @@ // Pack the file to save bandwidth if ( $packLevel > 1 ) { - if ( strpos($fileExtension, '.css') !== false ) + if ( $isCSS ) $content = ezjscPacker::optimizeCSS( $content, $packLevel ); else $content = ezjscPacker::optimizeScript( $content, $packLevel ); } + $contentType = $isCSS ? 'text/css' : 'text/javascript'; + // save file and return path - $clusterFileHandler->fileStoreContents( $cachePath, $content ); + $clusterFileHandler->fileStoreContents( $cachePath, $content, 'ezjscore', $contentType ); $httpFiles[] = $packerInfo['custom_host'] . $packerInfo['www_dir'] . $cachePath; return $httpFiles;