You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/12/17 12:50:42 UTC
svn commit: r1422880 - in /httpd/httpd/branches/2.4.x: ./ Makefile.in STATUS
Author: jim
Date: Mon Dec 17 11:50:41 2012
New Revision: 1422880
URL: http://svn.apache.org/viewvc?rev=1422880&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/Makefile.in
httpd/httpd/branches/2.4.x/STATUS
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1422855
Modified: httpd/httpd/branches/2.4.x/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.in?rev=1422880&r1=1422879&r2=1422880&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.in (original)
+++ httpd/httpd/branches/2.4.x/Makefile.in Mon Dec 17 11:50:41 2012
@@ -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 \
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1422880&r1=1422879&r2=1422880&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Dec 17 11:50:41 2012
@@ -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 ]