Merge r1399413 from trunk:

Export mod_xml2enc.h so that others can use the module.

Submitted by: minfrin
Reviewed/backported by: jim

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

diff --git a/Makefile.in b/Makefile.in
index e548e990adc5231e1242d614a90f055dc3af032d..1ff6776da62014bc14aeccc31440f44a07f423df 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -205,6 +205,7 @@ INSTALL_HEADERS = \
        $(srcdir)/modules/database/mod_dbd.h \
        $(srcdir)/modules/dav/main/mod_dav.h \
        $(srcdir)/modules/filters/mod_include.h \
+       $(srcdir)/modules/filters/mod_xml2enc.h \
        $(srcdir)/modules/generators/mod_cgi.h \
        $(srcdir)/modules/generators/mod_status.h \
        $(srcdir)/modules/loggers/mod_log_config.h \

diff --git a/STATUS b/STATUS
index 217c9e15fdfd483b93e176ed48bbcfea399a8577..6ce731ad12e2b89647f4b78e29e93c646ee80d10 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -89,11 +89,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_xml2enc: Export mod_xml2enc.h so that others can use the module.
-     trunk patch: http://svn.apache.org/viewvc?rev=1399413&view=rev
-     2.4.x patch: trunk patch works
-     +1: minfrin, trawick, jim
-
    * mod_ssl: Change default for SSLCompression to off.
      trunk patch: http://svn.apache.org/viewvc?rev=1400700&view=rev
      2.4.x patch: trunk patch works (except CHANGES)