--- httpd-2.0.55/modules/mappers/mod_rewrite.c.orig	2006-02-02 16:32:43.000000000 +0100
+++ httpd-2.0.55/modules/mappers/mod_rewrite.c	2006-02-02 16:57:56.000000000 +0100
@@ -1687,6 +1687,13 @@
                 }
             }
 
+            /* now prepare the redirect... */
+            if (rulestatus != ACTION_NOESCAPE) {
+                rewritelog(r, 1, "[per-dir %s] escaping %s for redirect",
+                           dconf->directory, r->filename);
+                r->filename = ap_escape_uri(r->pool, r->filename);
+            }
+
             /* now initiate the internal redirect */
             rewritelog(r, 1, "[per-dir %s] internal redirect with %s "
                        "[INTERNAL REDIRECT]", dconf->directory, r->filename);