From: Colm MacCarthaigh <colm@apache.org>
Date: Mon, 23 Jan 2006 19:05:36 +0000 (+0000)
Subject: Update to reflect a backported patch
X-Git-Tag: 2.0.56~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22591093d999e09584a51f4546bb73f3d606f4f6;p=thirdparty%2Fapache%2Fhttpd.git

Update to reflect a backported patch


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

diff --git a/CHANGES b/CHANGES
index d63e387b459..ea56f44a0e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.56
 
+  *) Add httxt2dbm to support/ for creating RewriteMap DBM Files.
+     [Paul Querna]
+
   *) support/check_forensic: Fix temp file usage
      [Javier Fernandez-Sanguino Pen~a <jfs computer.org>]
 
diff --git a/STATUS b/STATUS
index e80a92e4b9f..08173e7e83d 100644
--- a/STATUS
+++ b/STATUS
@@ -133,11 +133,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          http://svn.apache.org/viewcvs?view=rev&rev=154319
        +1: stoddard, striker, wrowe (as corrected in subsequent patches)
 
-    *) Add httxt2dbm for creating RewriteMap DBM Files.
-       http://svn.apache.org/viewcvs.cgi?rev=209539&view=rev
-       http://people.apache.org/~rbowen/httxt2dbm_proposed_patch
-       +1: pquerna, jorton, trawick, rbowen, jerenkrantz
-
     *) Remove the base href tag from mod_proxy_ftp, as it breaks relative
        links for clients not using an Authorization header.
          modules/proxy/mod_proxy_ftp.c: r231044