[z3-checkins] r53599 - in z3/deliverance/trunk: . deliverance

[ianb at codespeak.net]

Author: ianb
Date: Tue Apr  8 23:47:05 2008
New Revision: 53599

Modified:
   z3/deliverance/trunk/CHANGES.txt
   z3/deliverance/trunk/deliverance/wsgimiddleware.py
Log:
Remove Range header in addition to other conditional headers

Modified: z3/deliverance/trunk/CHANGES.txt
==============================================================================
--- z3/deliverance/trunk/CHANGES.txt	(original)
+++ z3/deliverance/trunk/CHANGES.txt	Tue Apr  8 23:47:05 2008
@@ -11,6 +11,9 @@
 - (wsgimiddleware) Check for environmental overrides of theme URI, rule
   URI, serializer, and apply.
 
+- (wsgimiddleware) Strip out range-related headers in addition to
+  the other conditional headers.
+
 - (utils) Added APIs for parsing non-string config values 
   ('resolve_callable', 'resolve_dotted_or_egg', 'bool_from_string').
 

Modified: z3/deliverance/trunk/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/trunk/deliverance/wsgimiddleware.py	Tue Apr  8 23:47:05 2008
@@ -203,13 +203,11 @@
                 environ['QUERY_STRING'] = qs[:-len('&notheme')]
             return self.app(environ, start_response)
         
-        # unsupported 
-        if 'HTTP_ACCEPT_ENCODING' in environ:
-            environ['HTTP_ACCEPT_ENCODING'] = '' 
-        if 'HTTP_IF_MATCH' in environ: 
-            del environ['HTTP_IF_MATCH'] 
-        if 'HTTP_IF_UNMODIFIED_SINCE' in environ: 
-            del environ['HTTP_IF_UNMODIFIED_SINCE'] 
+        # unsupported
+        for key in ['HTTP_ACCEPT_ENCODING', 'HTTP_IF_MATCH', 'HTTP_IF_UNMODIFIED_SINCE',
+                    'HTTP_RANGE', 'HTTP_IF_RANGE']:
+            if key in environ:
+                del environ[key]
 
         orig_environ = environ.copy()