added check for existance of IF-NONE-MATCH header in request

diff --git a/mod/groups/icon.php b/mod/groups/icon.php
index 607f389393f3f5edc5b18a9e9057a6a9cacf4f2a..104da4b41504a605a8343c2db60ae587e6161cbb 100644 (file)
--- 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 1680d8fce4798d206b8066f5681f2f909e559a53..6c3148f2b9473661104434ce12f0b5b8f52b33e6 100644 (file)
--- 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) {