--- a/MoinMoin/web/request.py	Wed Jul 09 02:01:08 2008 +0200
+++ b/MoinMoin/web/request.py	Wed Jul 09 15:55:10 2008 +0200
@@ -39,6 +39,12 @@
 
     data = WerkzeugResponse.data
     stream = WerkzeugResponse.stream
+    cache_control = WerkzeugResponse.cache_control
+
+    def in_cache_control(self):
+        cache_control = self.environ.get('HTTP_CACHE_CONTROL')
+        return parse_cache_control_header(cache_control)
+    in_cache_control = cached_property(in_cache_control)
 
     def in_headers(self):
         return EnvironHeaders(self.environ)
@@ -57,7 +63,7 @@
 class TestRequest(Request):
     def __init__(self, path="/", query_string=None, method='GET',
                  input_stream=None, content_type=None, content_length=0,
-                 form_data=None):
+                 form_data=None, **env):
         self.errors_stream = StringIO()
         self.output_stream = StringIO()
 
@@ -72,6 +78,9 @@
                                  content_length=content_length,
                                  errors_stream=self.errors_stream)
 
+        for k,v in env.items():
+            environ[k] = v
+
         environ['HTTP_USER_AGENT'] = 'MoinMoin/TestRequest'
         super(TestRequest, self).__init__(environ)