garden

2 files changed, 14 insertions, 9 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index ab02749d2..a4f3a4a43 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,20 @@ Internal
 - Fixed test suite; on some systems tests would fail due to indeterminate
   test run ordering and a double-push-single-pop of a shared test variable.
 
+- Replaced use of ``paste.urlparser.StaticURLParser`` with a derivative of Chris Rossi's "happy" static file serving code.
+
+Behavior Differences
+--------------------
+
+- An ETag header is no longer set when serving a static file.  A
+  Last-Modified header is set instead.
+
+- Static file serving no longer supports the ``wsgi.file_wrapper`` extension.
+
+- Instead of returning a ``403 Forbidden`` error when a static file is served
+  that cannot be accessed by the Pyramid process' user due to file
+  permissions, an IOError (or similar) will be raised.
+
 1.2a5 (2011-09-04)
 ==================
 
diff --git a/TODO.txt b/TODO.txt
index 0a4da963d..4da189bce 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -81,15 +81,6 @@ Future
 - 1.3: Add a default-view-config-params decorator that can be applied to a
   class which names defaults for method-based view_config decorator options.
 
-- 1.3: - Eliminate non-deployment-non-scaffold-related Paste dependency:
-  ``paste.urlparser.StaticURLParser`` (cutnpaste or reimplement, possibly
-  using chrisrossi's happy stuff as a base).
-
-  Features we no longer support: ETAG and if-none-match support
-  (DataApp.get); replace with if-modified-since handling,
-  ``wsgi.file_wrapper`` support (FileApp.get), returning 403 when handling
-  file permission exceptions (FileApp.get).
-
 - 1.3: use zope.registry rather than zope.component.
 
 - 1.4: Remove ``chameleon_text`` / ``chameleon_zpt`` deprecated functions