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/10/22 19:14:38 UTC
svn commit: r1400961 - in /httpd/httpd/branches/2.4.x: ./ Makefile.in STATUS
Author: jim
Date: Mon Oct 22 17:14:38 2012
New Revision: 1400961
URL: http://svn.apache.org/viewvc?rev=1400961&view=rev
Log:
Merge r1399413 from trunk:
Export mod_xml2enc.h so that others can use the module.
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:r1399413
Modified: httpd/httpd/branches/2.4.x/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.in?rev=1400961&r1=1400960&r2=1400961&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.in (original)
+++ httpd/httpd/branches/2.4.x/Makefile.in Mon Oct 22 17:14:38 2012
@@ -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 \
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1400961&r1=1400960&r2=1400961&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Oct 22 17:14:38 2012
@@ -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)