From: Jim Jagielski <jim@apache.org>
Date: Mon, 17 Dec 2012 11:50:41 +0000 (+0000)
Subject: Merge r1422855 from trunk:
X-Git-Tag: 2.4.4~259
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e46a4f74d29f6bb320e233dc90ab81aab0288f0;p=apache

Merge r1422855 from trunk:

Install cache_common.h as required by mod_cache.h. Allows external modules
to use mod_cache.
Submitted by Niklas Edmundsson.

Submitted by: minfrin
Reviewed/backported by: jim


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

diff --git a/Makefile.in b/Makefile.in
index 1ff6776da6..09e971455a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -202,6 +202,7 @@ INSTALL_HEADERS = \
 	$(srcdir)/modules/core/mod_so.h \
 	$(srcdir)/modules/core/mod_watchdog.h \
 	$(srcdir)/modules/cache/mod_cache.h \
+	$(srcdir)/modules/cache/cache_common.h \
 	$(srcdir)/modules/database/mod_dbd.h \
 	$(srcdir)/modules/dav/main/mod_dav.h \
 	$(srcdir)/modules/filters/mod_include.h \
diff --git a/STATUS b/STATUS
index 8db7d7b79b..ff29e23b68 100644
--- a/STATUS
+++ b/STATUS
@@ -91,11 +91,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_cache: Install cache_common.h as required by mod_cache.h. Allows
-     external modules to use mod_cache.
-     trunk patch: http://svn.apache.org/viewvc?rev=1422855&view=rev
-     2.4.x patch: trunk patch works.
-     +1: minfrin, humbedooh, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]