mark for backporting

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@111582 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index b5413d4a2b543591a1b9d70ac5922260667ee9b9..d31af5bd800938857d5ebf24a00966adea4ba0dc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -75,6 +75,16 @@ PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]
 
+    *) Add charset to the painfully old example CGI scripts.
+       [These should really be replaced with proper encoding of the output.]
+       svn rev 111580
+       +1: fielding
+
+    *) conf: Remove AddDefaultCharset from the default configuration because
+       setting a site-wide default does more harm than good. PR 23421.
+       svn rev 111581
+       +1: fielding
+
     *) mpm/winnt/child.c: thread_num is long, aught to use %ld not %d for logs
        svn rev 106653
        +1: wrowe, nd, trawick