generalized no-cache management

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index af2a9012c57b6309e879eb4bca324ae9b2eaad5c..396b11689f7a66208342ca21b33c8549ba341559 100644 (file)
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -2178,6 +2178,8 @@ class Room {
   {
       printf("NEW_SOCKET (root): %d\n", intval($new_socket));
 
+      force_no_cache($header_out);
+
       switch ($path) {
       case "":
       case "index.php":
@@ -2186,8 +2188,6 @@ class Room {
       $content = ob_get_contents();
       ob_end_clean();
 
-      force_no_cache($header_out);
-
       $s_a_p->pgflush_try_add($new_socket, 20, $header_out, $content);
       return TRUE;
 
@@ -2198,8 +2198,6 @@ class Room {
           $content = ob_get_contents();
           ob_end_clean();
 
-          force_no_cache($header_out);
-
           $s_a_p->pgflush_try_add($new_socket, 20, $header_out, $content);
           return TRUE;
 

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index a9813e509cce76df457af8286a434d44c85ebae4..30f33bbf84683f505e6f20b7903ed915585888ef 100644 (file)
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -1459,6 +1459,8 @@ class Bin5 {
         if (($table_token = gpcs_var('table_token', $get, $post, $cookie)) === FALSE) 
             unset($table_token);
 
+        force_no_cache($header_out);
+
         switch ($path) {
         case "":
         case "index.php":
@@ -1467,8 +1469,6 @@ class Bin5 {
             $content = ob_get_contents();
             ob_end_clean();
         
-            force_no_cache($header_out);
-
             $s_a_p->pgflush_try_add($new_socket, 20, $header_out, $content);
             return TRUE;
         
@@ -1480,8 +1480,6 @@ class Bin5 {
             $content = ob_get_contents();
             ob_end_clean();
             
-            force_no_cache($header_out);
-
             $s_a_p->pgflush_try_add($new_socket, 20, $header_out, $content);
             return TRUE;