[pLog-svn] r2323 - plog/branches/plog-1.0.2/class/net/http

[jondaley at devel.plogworld.net]

Author: jondaley
Date: 2005-07-14 14:49:52 +0000 (Thu, 14 Jul 2005)
New Revision: 2323

Modified:
   plog/branches/plog-1.0.2/class/net/http/httpcache.class.php
Log:
ok, back to the author's original version.  Combined with the removal of the session_cache_limiter, caching works great (at least on Firefox and IE, and I think we are meeting RFC specs.

Modified: plog/branches/plog-1.0.2/class/net/http/httpcache.class.php
===================================================================
--- plog/branches/plog-1.0.2/class/net/http/httpcache.class.php	2005-07-14 14:16:41 UTC (rev 2322)
+++ plog/branches/plog-1.0.2/class/net/http/httpcache.class.php	2005-07-14 14:49:52 UTC (rev 2323)
@@ -146,12 +146,6 @@
         {//rfc2616-sec10.html#sec10.3.5
             header('HTTP/1.0 304 Not Modified');
             header('Etag: '.$etagServer);
-            if ($cachePrivacy==0) $cache='private, ';
-            elseif ($cachePrivacy==2) $cache='public, ';
-            else $cache='';
-            $cache.='max-age='.floor($cacheSeconds);
-            header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T',time()+$cacheSeconds)); //HTTP/1.0 //rfc2616-sec14.html#sec14.21a
-            header('Cache-Control: '.$cache); //rfc2616-sec14.html#sec14.9
             if ($feedMode) header('Connection: close'); //Comment this line under IIS
             return true;
         }
@@ -169,7 +163,7 @@
             elseif ($cachePrivacy==2) $cache='public, ';
             else $cache='';
             $cache.='max-age='.floor($cacheSeconds);
-            header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T',time()+$cacheSeconds)); //HTTP/1.0 //rfc2616-sec14.html#sec14.21
+	    // header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T',time()+$cacheSeconds)); //HTTP/1.0 //rfc2616-sec14.html#sec14.21
             header('Cache-Control: '.$cache); //rfc2616-sec14.html#sec14.9
             header('Last-Modified: '.$dateLastModif);
             header('Etag: '.$etagServer);