Changeset 17888

Timestamp:

10/03/08 12:12:19 (2 months ago)

Author:

rambo

Message:

forward port r17887

Files:

• trunk/midcom/midcom.core/midcom/services/cache/module/content.php (modified) (3 diffs)

trunk/midcom/midcom.core/midcom/services/cache/module/content.php

@@ -947 +947 @@
-
-        $cache_data = ob_get_contents();
+        /**
+         * WARNING: 
+         *   From here on anything added to content is not included in cached
+         *   data, so make sure nothing content-wise is added after this 
+         */
-
-        // Generate E-Tag header.
@@ -967 +972 @@
-        $this->register_sent_header($header);
-        $this->_complete_sent_headers($cache_data);
+
+        // If-Modified-Since / If-None-Match checks, if no match, flush the output.
+        if (! $this->_check_not_modified($this->_last_modified, $etag))
+        {
+            ob_end_flush();
+            $this->_obrunning = false;
+        }
+
+        /**
+         * WARNING: 
+         *   Stuff below here is executed *after* we have flushed output,
+         *   so here we should only write out our caches but do nothing else
+         */
-
-        if ($this->_uncached)
@@ -983 +1001 @@
-            $this->write_meta_cache($content_id, $etag);
-            $this->_data_cache->put($content_id, $cache_data);
-        }
-
-        // Finish caching.
-        // If-Modified-Since / If-None-Match checks, if no match, flush the output.
-        if (! $this->_check_not_modified($this->_last_modified, $etag))
-        {
-            ob_end_flush();
-            $this->_obrunning = false;
-        }
-    }