From bf951b642c4742d585cb428f6c8ba2fd9b463f14 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 22 Oct 2012 17:14:38 +0000 Subject: [PATCH] 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 --- Makefile.in | 1 + STATUS | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index e548e990ad..1ff6776da6 100644 --- 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 217c9e15fd..6ce731ad12 100644 --- 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) -- 2.50.1