Fi conditional get caching when server-timezone offset is != 0

diff --git a/docs/NEWS b/docs/NEWS
index ba2b85d8feba45e787defc0433eadbf46fde9554..4d7bc61dd3e5204ad3a821546dea34e48af7ccfa 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.1-beta2 ()
 ------------------------------------------------------------------------
 
+    * Fix a bug in the HTTP 304 Conditional GET RSS-Feed caching when
+      the server timezone offset was not set to zero. Thanks to dand!
+
     * Added ability to use HTTP Authentication to the blog. Can be 
       triggered by submitting HTTP Auth credentials [only supported when 
       the server runs with mod_php, not as CGI]. Authentication can be 

diff --git a/rss.php b/rss.php
index c574e7767aa7d4692af3b18f9ad0198466d07282..cc3321c7897cbef2c05207e09a0ecc00e03fa919 100644 (file)
--- a/rss.php
+++ b/rss.php
@@ -50,7 +50,7 @@ if (!isset($_GET['nocache'])) {
     // See if the client has provided the required headers.
     // Always convert the provided header into GMT timezone to allow comparing to the server-side last-modified header
     $modified_since = !empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])
-                    ? gmdate('D, d M Y H:i:s \G\M\T', serendipity_serverOffsetHour(strtotime(stripslashes($_SERVER['HTTP_IF_MODIFIED_SINCE'])), true))
+                    ? gmdate('D, d M Y H:i:s \G\M\T', strtotime(stripslashes($_SERVER['HTTP_IF_MODIFIED_SINCE'])), true)
                     : false;
     $none_match     = !empty($_SERVER['HTTP_IF_NONE_MATCH'])
                     ? str_replace('"', '', stripslashes($_SERVER['HTTP_IF_NONE_MATCH']))