]> granicus.if.org Git - apache/commit
Merge r1435811 from trunk:
authorJim Jagielski <jim@apache.org>
Mon, 11 Mar 2013 16:28:43 +0000 (16:28 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 11 Mar 2013 16:28:43 +0000 (16:28 +0000)
commit20f7f5a40b9886495dce6732223f7715eca487c8
tree596c9dbee38543627887fd6e408563c06ffa74ed
parentc11be8a70cf2f41a2bc1f496b06017b4143eeade
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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1455215 13f79535-47bb-0310-9956-ffa450edef68
146 files changed:
STATUS
docs/manual/mod/mod_macro.xml [new file with mode: 0644]
docs/manual/mod/mod_macro.xml.fr [new file with mode: 0644]
modules/core/config.m4
modules/core/mod_macro.c [new file with mode: 0644]
modules/core/test/Makefile [new file with mode: 0755]
modules/core/test/conf/inc63_1.conf [new file with mode: 0644]
modules/core/test/conf/inc63_2.conf [new file with mode: 0644]
modules/core/test/conf/test01.conf [new file with mode: 0755]
modules/core/test/conf/test02.conf [new file with mode: 0755]
modules/core/test/conf/test03.conf [new file with mode: 0755]
modules/core/test/conf/test04.conf [new file with mode: 0755]
modules/core/test/conf/test05.conf [new file with mode: 0755]
modules/core/test/conf/test06.conf [new file with mode: 0755]
modules/core/test/conf/test07.conf [new file with mode: 0755]
modules/core/test/conf/test08.conf [new file with mode: 0755]
modules/core/test/conf/test09.conf [new file with mode: 0755]
modules/core/test/conf/test10.conf [new file with mode: 0755]
modules/core/test/conf/test11.conf [new file with mode: 0755]
modules/core/test/conf/test12.conf [new file with mode: 0755]
modules/core/test/conf/test13.conf [new file with mode: 0755]
modules/core/test/conf/test14.conf [new file with mode: 0755]
modules/core/test/conf/test15.conf [new file with mode: 0755]
modules/core/test/conf/test16.conf [new file with mode: 0755]
modules/core/test/conf/test17.conf [new file with mode: 0755]
modules/core/test/conf/test18.conf [new file with mode: 0755]
modules/core/test/conf/test19.conf [new file with mode: 0755]
modules/core/test/conf/test20.conf [new file with mode: 0755]
modules/core/test/conf/test21.conf [new file with mode: 0755]
modules/core/test/conf/test22.conf [new file with mode: 0755]
modules/core/test/conf/test23.conf [new file with mode: 0755]
modules/core/test/conf/test24.conf [new file with mode: 0755]
modules/core/test/conf/test25.conf [new file with mode: 0755]
modules/core/test/conf/test26.conf [new file with mode: 0755]
modules/core/test/conf/test27.conf [new file with mode: 0755]
modules/core/test/conf/test28.conf [new file with mode: 0755]
modules/core/test/conf/test29.conf [new file with mode: 0755]
modules/core/test/conf/test30.conf [new file with mode: 0755]
modules/core/test/conf/test31.conf [new file with mode: 0755]
modules/core/test/conf/test32.conf [new file with mode: 0755]
modules/core/test/conf/test33.conf [new file with mode: 0755]
modules/core/test/conf/test34.conf [new file with mode: 0755]
modules/core/test/conf/test35.conf [new file with mode: 0755]
modules/core/test/conf/test36.conf [new file with mode: 0755]
modules/core/test/conf/test37.conf [new file with mode: 0755]
modules/core/test/conf/test38.conf [new file with mode: 0755]
modules/core/test/conf/test39.conf [new file with mode: 0755]
modules/core/test/conf/test40.conf [new file with mode: 0755]
modules/core/test/conf/test41.conf [new file with mode: 0755]
modules/core/test/conf/test42.conf [new file with mode: 0755]
modules/core/test/conf/test43.conf [new file with mode: 0755]
modules/core/test/conf/test44.conf [new file with mode: 0755]
modules/core/test/conf/test45.conf [new file with mode: 0755]
modules/core/test/conf/test46.conf [new file with mode: 0755]
modules/core/test/conf/test47.conf [new file with mode: 0755]
modules/core/test/conf/test48.conf [new file with mode: 0755]
modules/core/test/conf/test49.conf [new file with mode: 0644]
modules/core/test/conf/test50.conf [new file with mode: 0644]
modules/core/test/conf/test51.conf [new file with mode: 0644]
modules/core/test/conf/test52.conf [new file with mode: 0644]
modules/core/test/conf/test53.conf [new file with mode: 0755]
modules/core/test/conf/test54.conf [new file with mode: 0644]
modules/core/test/conf/test55.conf [new file with mode: 0644]
modules/core/test/conf/test56.conf [new file with mode: 0644]
modules/core/test/conf/test57.conf [new file with mode: 0644]
modules/core/test/conf/test58.conf [new file with mode: 0644]
modules/core/test/conf/test59.conf [new file with mode: 0644]
modules/core/test/conf/test60.conf [new file with mode: 0644]
modules/core/test/conf/test61.conf [new file with mode: 0644]
modules/core/test/conf/test62.conf [new file with mode: 0644]
modules/core/test/conf/test63.conf [new file with mode: 0644]
modules/core/test/conf/test64.conf [new file with mode: 0644]
modules/core/test/conf/test65.conf [new file with mode: 0644]
modules/core/test/conf/test66.conf [new file with mode: 0644]
modules/core/test/conf/test67.conf [new file with mode: 0644]
modules/core/test/conf/test68.conf [new file with mode: 0644]
modules/core/test/conf/test69.conf [new file with mode: 0644]
modules/core/test/ref/test01.out [new file with mode: 0644]
modules/core/test/ref/test02.out [new file with mode: 0644]
modules/core/test/ref/test03.out [new file with mode: 0644]
modules/core/test/ref/test04.out [new file with mode: 0644]
modules/core/test/ref/test05.out [new file with mode: 0644]
modules/core/test/ref/test06.out [new file with mode: 0644]
modules/core/test/ref/test07.out [new file with mode: 0644]
modules/core/test/ref/test08.out [new file with mode: 0644]
modules/core/test/ref/test09.out [new file with mode: 0644]
modules/core/test/ref/test10.out [new file with mode: 0644]
modules/core/test/ref/test11.out [new file with mode: 0644]
modules/core/test/ref/test12.out [new file with mode: 0644]
modules/core/test/ref/test13.out [new file with mode: 0644]
modules/core/test/ref/test14.out [new file with mode: 0644]
modules/core/test/ref/test15.out [new file with mode: 0644]
modules/core/test/ref/test16.out [new file with mode: 0644]
modules/core/test/ref/test17.out [new file with mode: 0644]
modules/core/test/ref/test18.out [new file with mode: 0644]
modules/core/test/ref/test19.out [new file with mode: 0644]
modules/core/test/ref/test20.out [new file with mode: 0644]
modules/core/test/ref/test21.out [new file with mode: 0644]
modules/core/test/ref/test22.out [new file with mode: 0644]
modules/core/test/ref/test23.out [new file with mode: 0644]
modules/core/test/ref/test24.out [new file with mode: 0644]
modules/core/test/ref/test25.out [new file with mode: 0644]
modules/core/test/ref/test26.out [new file with mode: 0644]
modules/core/test/ref/test27.out [new file with mode: 0644]
modules/core/test/ref/test28.out [new file with mode: 0644]
modules/core/test/ref/test29.out [new file with mode: 0644]
modules/core/test/ref/test30.out [new file with mode: 0644]
modules/core/test/ref/test31.out [new file with mode: 0644]
modules/core/test/ref/test32.out [new file with mode: 0644]
modules/core/test/ref/test33.out [new file with mode: 0644]
modules/core/test/ref/test34.out [new file with mode: 0644]
modules/core/test/ref/test35.out [new file with mode: 0644]
modules/core/test/ref/test36.out [new file with mode: 0644]
modules/core/test/ref/test37.out [new file with mode: 0644]
modules/core/test/ref/test38.out [new file with mode: 0644]
modules/core/test/ref/test39.out [new file with mode: 0644]
modules/core/test/ref/test40.out [new file with mode: 0644]
modules/core/test/ref/test41.out [new file with mode: 0644]
modules/core/test/ref/test42.out [new file with mode: 0644]
modules/core/test/ref/test43.out [new file with mode: 0644]
modules/core/test/ref/test44.out [new file with mode: 0644]
modules/core/test/ref/test45.out [new file with mode: 0644]
modules/core/test/ref/test46.out [new file with mode: 0644]
modules/core/test/ref/test47.out [new file with mode: 0644]
modules/core/test/ref/test48.out [new file with mode: 0644]
modules/core/test/ref/test49.out [new file with mode: 0644]
modules/core/test/ref/test50.out [new file with mode: 0644]
modules/core/test/ref/test51.out [new file with mode: 0644]
modules/core/test/ref/test52.out [new file with mode: 0644]
modules/core/test/ref/test53.out [new file with mode: 0644]
modules/core/test/ref/test54.out [new file with mode: 0644]
modules/core/test/ref/test55.out [new file with mode: 0644]
modules/core/test/ref/test56.out [new file with mode: 0644]
modules/core/test/ref/test57.out [new file with mode: 0644]
modules/core/test/ref/test58.out [new file with mode: 0644]
modules/core/test/ref/test59.out [new file with mode: 0644]
modules/core/test/ref/test60.out [new file with mode: 0644]
modules/core/test/ref/test61.out [new file with mode: 0644]
modules/core/test/ref/test62.out [new file with mode: 0644]
modules/core/test/ref/test63.out [new file with mode: 0644]
modules/core/test/ref/test64.out [new file with mode: 0644]
modules/core/test/ref/test65.out [new file with mode: 0644]
modules/core/test/ref/test66.out [new file with mode: 0644]
modules/core/test/ref/test67.out [new file with mode: 0644]
modules/core/test/ref/test68.out [new file with mode: 0644]
modules/core/test/ref/test69.out [new file with mode: 0644]