mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

eTag validation fix and If-None-Match support.

Browse Source
This commit is contained in:
CaMer0n
2010-09-05 08:17:27 +00:00
parent c2f3786d90
commit e3d2be8e8f
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
e107_admin/footer.php
View File

@@ -365,8 +365,30 @@ unset($tmp1, $tmp1);
$etag = md5($page); $etag = md5($page);
if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
{
$IF_NONE_MATCH = str_replace('"','',$_SERVER['HTTP_IF_NONE_MATCH']);
$data = "IF_NON_MATCH = ".$IF_NONE_MATCH;
$data .= "\nEtag = ".$etag;
file_put_contents(e_ADMIN."etag_log.txt",$data);
if($IF_NONE_MATCH == $etag || ($IF_NONE_MATCH == ($etag."-gzip")))
{
header('HTTP/1.1 304 Not Modified');
exit();
}
}
if(!defined('e_NOCACHE'))
{
header("Cache-Control: must-revalidate"); header("Cache-Control: must-revalidate");
header("ETag: \"{$etag}\""); }
$pref['compression_level'] = 6; $pref['compression_level'] = 6;
if (strstr(varset($_SERVER["HTTP_ACCEPT_ENCODING"], ""), "gzip")) if (strstr(varset($_SERVER["HTTP_ACCEPT_ENCODING"], ""), "gzip"))
@@ -380,6 +402,7 @@ if (ini_get("zlib.output_compression") == false && function_exists("gzencode"))
if (varset($pref['compress_output'], false) && $server_support == true && $browser_support == true) if (varset($pref['compress_output'], false) && $server_support == true && $browser_support == true)
{ {
$level = intval($pref['compression_level']); $level = intval($pref['compression_level']);
header("ETag: \"{$etag}-gzip\"");
$page = gzencode($page, $level); $page = gzencode($page, $level);
header("Content-Encoding: gzip", true); header("Content-Encoding: gzip", true);
header("Content-Length: ".strlen($page), true); header("Content-Length: ".strlen($page), true);
@@ -387,6 +410,15 @@ if (varset($pref['compress_output'], false) && $server_support == true && $brows
} }
else else
{ {
if($browser_support==TRUE)
{
header("ETag: \"{$etag}-gzip\"");
}
else
{
header("ETag: \"{$etag}\"");
}
header("Content-Length: ".strlen($page), true); header("Content-Length: ".strlen($page), true);
echo $page; echo $page;
} }