[Zope-Checkins] SVN: Zope/branches/2.11/ - Fixed improper handling of IF_MODIFIED_SINCE header

[Andreas Jung]

Log message for revision 107356:
  - Fixed improper handling of IF_MODIFIED_SINCE header
    inside Five/browser/resource.py
  

Changed:
  U   Zope/branches/2.11/doc/CHANGES.txt
  U   Zope/branches/2.11/lib/python/Products/Five/browser/resource.py

-=-
Modified: Zope/branches/2.11/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.11/doc/CHANGES.txt	2009-12-30 08:08:08 UTC (rev 107355)
+++ Zope/branches/2.11/doc/CHANGES.txt	2009-12-30 13:16:54 UTC (rev 107356)
@@ -4,6 +4,13 @@
   Change information for previous versions of Zope can be found in the
   file HISTORY.txt.
 
+  Zope 2.11.6 (2009/12/30)
+
+    Bugs Fixed
+
+      - Fixed improper handling of IF_MODIFIED_SINCE header
+        inside Five/browser/resource.py
+
   Zope 2.11.5 (2009/12/22)
 
     Bugs Fixed

Modified: Zope/branches/2.11/lib/python/Products/Five/browser/resource.py
===================================================================
--- Zope/branches/2.11/lib/python/Products/Five/browser/resource.py	2009-12-30 08:08:08 UTC (rev 107355)
+++ Zope/branches/2.11/lib/python/Products/Five/browser/resource.py	2009-12-30 13:16:54 UTC (rev 107356)
@@ -83,7 +83,7 @@
         # HTTP If-Modified-Since header handling. This is duplicated
         # from OFS.Image.Image - it really should be consolidated
         # somewhere...
-        header = request.environ.get('If-Modified-Since', None)
+        header = request.environ.get('HTTP_IF_MODIFIED_SINCE', None)
         if header is not None:
             header = header.split(';')[0]
             # Some proxies seem to send invalid date strings for this