From 417afb105e3d5d8a57ef013d1cd708b371755855 Mon Sep 17 00:00:00 2001
From: ianb <devnull@localhost>
Date: Thu, 29 Jan 2009 18:32:16 +0000
Subject: Apply patch to fix some problems with wdg_validate middleware

---
 docs/news.txt               |  2 ++
 paste/debug/wdg_validate.py | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/news.txt b/docs/news.txt
index 7151814..6e2b332 100644
--- a/docs/news.txt
+++ b/docs/news.txt
@@ -16,6 +16,8 @@ svn trunk
 * :mod:`paste.util.mimeparse` parses a single ``*`` in Accept headers
   (sent by IE 6).
 
+* Fix some problems with the ``wdg_validate`` middleware.
+
 1.7.2
 -----
 
diff --git a/paste/debug/wdg_validate.py b/paste/debug/wdg_validate.py
index 119c2d7..7f0862c 100644
--- a/paste/debug/wdg_validate.py
+++ b/paste/debug/wdg_validate.py
@@ -72,9 +72,13 @@ class WDGValidateMiddleware(object):
         # @@: Should capture encoding too
         html_errors = self.call_wdg_validate(
             self.wdg_path, ops, page)
-        if not html_errors:
-            return [page]
-        return self.add_error(page, html_errors)
+        if html_errors:
+            page = self.add_error(page, html_errors)[0]
+            headers.remove(
+                     ('Content-Length', 
+                      str(wsgilib.header_value(headers, 'content-length'))))
+            headers.append(('Content-Length', str(len(page))))
+        return [page]
     
     def call_wdg_validate(self, wdg_path, ops, page):
         if subprocess is None:
@@ -99,7 +103,7 @@ class WDGValidateMiddleware(object):
         if match:
             return [html_page[:match.start()]
                     + add_text
-                    + html_page[match.end():]]
+                    + html_page[match.start():]]
         else:
             return [html_page + add_text]
 
-- 
cgit v1.2.1