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 2013/03/11 17:28:43 UTC
svn commit: r1455215 - in /httpd/httpd/branches/2.4.x: ./ STATUS
docs/manual/ docs/manual/mod/ docs/manual/mod/mod_macro.xml
docs/manual/mod/mod_macro.xml.fr modules/core/config.m4
modules/core/mod_macro.c modules/core/test/
Author: jim
Date: Mon Mar 11 16:28:43 2013
New Revision: 1455215
URL: http://svn.apache.org/r1455215
Log:
Merge r1435811 from trunk:
Add "mod_macro" as a standard module, compiled in with "most".
This module was created in 1998 and has been distributed independently
ever since. It is hereby donated to the Apache Software Foundation.
There are quite a few comments in the source code to explain how it works,
as well as extensive non regression tests.
Some utilities about array processing could be moved to "core.c".
However, I finally decided against for now so that it stays as an external
and independent module, and thus may be backported with minimal impact
on the source tree.
Details of the addition:
* modules/core/mod_macro.c: module source code
* modules/core/test: non regression tests
modules/core/test/conf/: configuration files
modules/core/test/ref/: expected results
* docs/manual/mod/mod_macro.xml: English documentation
* docs/manual/mod/mod_macro.xml.fr: French documentation
Submitted by: fabien
Reviewed/backported by: jim
Added:
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.xml
- copied unchanged from r1435811, httpd/httpd/trunk/docs/manual/mod/mod_macro.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_macro.xml.fr
- copied unchanged from r1435811, httpd/httpd/trunk/docs/manual/mod/mod_macro.xml.fr
httpd/httpd/branches/2.4.x/modules/core/mod_macro.c
- copied unchanged from r1435811, httpd/httpd/trunk/modules/core/mod_macro.c
httpd/httpd/branches/2.4.x/modules/core/test/ (props changed)
- copied from r1435811, httpd/httpd/trunk/modules/core/test/
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/docs/manual/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/mod/ (props changed)
httpd/httpd/branches/2.4.x/modules/core/config.m4
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1435811
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1455215&r1=1455214&r2=1455215&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Mar 11 16:28:43 2013
@@ -90,10 +90,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_macro: backport/copy mod_macro to 2.4.x.
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1435811
- 2.4.x patch: trunk patch works
- +1: jim, fuankg, humbedooh, igalic
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Propchange: httpd/httpd/branches/2.4.x/docs/manual/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual:r1435811
Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual/mod:r1435811
Modified: httpd/httpd/branches/2.4.x/modules/core/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/core/config.m4?rev=1455215&r1=1455214&r2=1455215&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/core/config.m4 (original)
+++ httpd/httpd/branches/2.4.x/modules/core/config.m4 Mon Mar 11 16:28:43 2013
@@ -53,6 +53,8 @@ APACHE_MODULE(watchdog, Watchdog module,
fi
])
+APACHE_MODULE(macro, Define and use macros in configuration files, , , most)
+
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
APACHE_MODPATH_FINISH
Propchange: httpd/httpd/branches/2.4.x/modules/core/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 11 16:28:43 2013
@@ -0,0 +1 @@
+out