aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-01-07 12:32:46 -0500
committerCash Costello <cash.costello@gmail.com>2012-01-07 12:32:46 -0500
commit6b8301f6433ec22b065d734e9fc26d09f723b07d (patch)
treeafe9ea37de5a86a52c5a446cee579c674de1a54b /mod
parent946a1229a126b91de9b64d2def672c628a77e6c6 (diff)
downloadelgg-6b8301f6433ec22b065d734e9fc26d09f723b07d.tar.gz
elgg-6b8301f6433ec22b065d734e9fc26d09f723b07d.tar.bz2
added check for existance of IF-NONE-MATCH header in request
Diffstat (limited to 'mod')
-rw-r--r--mod/groups/icon.php10
-rw-r--r--mod/profile/icondirect.php8
2 files changed, 9 insertions, 9 deletions
diff --git a/mod/groups/icon.php b/mod/groups/icon.php
index 607f38939..104da4b41 100644
--- a/mod/groups/icon.php
+++ b/mod/groups/icon.php
@@ -10,15 +10,15 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
$group_guid = get_input('group_guid');
$group = get_entity($group_guid);
-// If is the same eTag, content didn't changed.
-$eTag = $group->icontime . $group_guid;
-if (trim($_SERVER['HTTP_IF_NONE_MATCH']) == $eTag) {
+// If is the same ETag, content didn't changed.
+$etag = $group->icontime . $group_guid;
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag) {
header("HTTP/1.1 304 Not Modified");
exit;
}
$size = strtolower(get_input('size'));
-if (!in_array($size,array('large','medium','small','tiny','master','topbar')))
+if (!in_array($size, array('large', 'medium', 'small', 'tiny', 'master', 'topbar')))
$size = "medium";
$success = false;
@@ -44,5 +44,5 @@ header('Expires: ' . date('r',time() + 864000));
header("Pragma: public");
header("Cache-Control: public");
header("Content-Length: " . strlen($contents));
-header("ETag: $eTag");
+header("ETag: $etag");
echo $contents;
diff --git a/mod/profile/icondirect.php b/mod/profile/icondirect.php
index 1680d8fce..6c3148f2b 100644
--- a/mod/profile/icondirect.php
+++ b/mod/profile/icondirect.php
@@ -15,9 +15,9 @@ $join_date = (int)$_GET['joindate'];
$last_cache = (int)$_GET['lastcache']; // icontime
$guid = (int)$_GET['guid'];
-// If is the same eTag, content didn't changed.
-$eTag = $last_cache . $guid;
-if (trim($_SERVER['HTTP_IF_NONE_MATCH']) == $eTag) {
+// If is the same ETag, content didn't changed.
+$etag = $last_cache . $guid;
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag) {
header("HTTP/1.1 304 Not Modified");
exit;
}
@@ -56,7 +56,7 @@ if ($mysql_dblink) {
header("Pragma: public");
header("Cache-Control: public");
header("Content-Length: " . strlen($contents));
- header("ETag: $eTag");
+ header("ETag: $etag");
// this chunking is done for supposedly better performance
$split_string = str_split($contents, 1024);
foreach ($split_string as $chunk) {