fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-31 17:19:59 +09:00
Code Issues Projects Releases Packages Wiki Activity

r7434 fixed

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7439 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-05-11 10:28:08 +00:00
parent fe09e55c51
commit aff477dd54
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/context/Context.class.php
View file

@ -153,7 +153,7 @@
else $this->allow_rewrite = false; else $this->allow_rewrite = false;
// add common JS/CSS files // add common JS/CSS files
$this->addJsFile("./common/js/jquery.js",true,'',-1000000); $this->addJsFile("./common/js/jquery.js", true, '', -100000);
$this->addJsFile("./common/js/x.js"); $this->addJsFile("./common/js/x.js");
$this->addJsFile("./common/js/common.js"); $this->addJsFile("./common/js/common.js");
$this->addJsFile("./common/js/js_app.js"); $this->addJsFile("./common/js/js_app.js");

5
classes/optimizer/Optimizer.class.php
View file

@ -46,18 +46,19 @@
if(!count($source_files)) return; if(!count($source_files)) return;
$files = array(); $files = array();
$hash = ''; $hash = "";
foreach($source_files as $key => $file) { foreach($source_files as $key => $file) {
if(!$file || !$file['file'] || !file_exists($file['file'])) continue; if(!$file || !$file['file'] || !file_exists($file['file'])) continue;
$file['file'] = $source_files[$key]['file'] = str_replace("\\","/",$file['file']); $file['file'] = $source_files[$key]['file'] = str_replace("\\","/",$file['file']);
if(empty($file['optimized']) || preg_match('/^https?:\/\//i', $file['file']) ) $files[] = $file; if(empty($file['optimized']) || preg_match('/^https?:\/\//i', $file['file']) ) $files[] = $file;
else{ else{
$targets[] = $file; $targets[] = $file;
$hash .= $file['file']; $hash .= $file['file'];
} }
} }
if(!count($targets)) return $this->_getOptimizedRemoved($files); if(!count($targets)) return $this->_getOptimizedRemoved($files);
$list_file_hash = md5($hash); $list_file_hash = md5($hash);
$list_file = FileHandler::getRealPath($this->cache_path . $list_file_hash); $list_file = FileHandler::getRealPath($this->cache_path . $list_file_hash);

5
common/script.php
View file

@ -51,7 +51,6 @@ if($type == '.css'){
header("Content-Type: ".$content_type."; charset=UTF-8"); header("Content-Type: ".$content_type."; charset=UTF-8");
/*
// return 304 // return 304
if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) { if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
$modifiedSince = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']); $modifiedSince = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']);
@ -61,12 +60,12 @@ if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
exit; exit;
} }
} }
*/
header("Cache-Control: private, max-age=2592000"); header("Cache-Control: private, max-age=2592000");
header("Pragma: cache"); header("Pragma: cache");
header("Connection: close"); header("Connection: close");
header("Last-Modified: " . substr(gmdate('r', $mtime), 0, -5). "GMT"); header("Last-Modified: " . substr(gmdate('r', $mtime), 0, -5). "GMT");
//header("ETag: \"'.dechex($unique).'-".dechex($size)."-'.dechex($mtime).'\""); header("ETag: \"". md5(join(' ', $list)) .'-'. dechex($mtime)."\"");
function printFileList($list){ function printFileList($list){