httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fab...@apache.org
Subject svn commit: r1435811 [2/3] - in /httpd/httpd/trunk: docs/manual/mod/ modules/core/ modules/core/test/ modules/core/test/conf/ modules/core/test/ref/
Date Sun, 20 Jan 2013 10:07:47 GMT
Propchange: httpd/httpd/trunk/modules/core/test/conf/test19.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test19.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test19.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test19.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test20.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test20.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test20.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test20.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,11 @@
+# directory in directory through a macro
+
+<Macro foo $dir>
+  <Directory $dir>
+    Warning "macro foo $dir"
+  </Directory>
+</Macro>
+
+<Directory /tmp>
+  Use foo /tmp
+</Directory>

Propchange: httpd/httpd/trunk/modules/core/test/conf/test20.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test20.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test20.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test20.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test21.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test21.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test21.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test21.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,11 @@
+# raise an error
+
+<Macro foo>
+  <Directory /tmp>
+    Error "macro foo dir /tmp"
+  </Directory>
+</Macro>
+
+<VirtualHost *>
+  Use foo
+</VirtualHost>

Propchange: httpd/httpd/trunk/modules/core/test/conf/test21.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test21.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test21.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test21.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test22.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test22.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test22.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test22.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,11 @@
+# simple nesting
+
+<Macro foo>
+  <Directory /tmp>
+    Warning "macro foo"
+  </Directory>
+</Macro>
+
+Use foo
+
+Error "done on line 11."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test22.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test22.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test22.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test22.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test23.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test23.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test23.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test23.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,15 @@
+# macro defined in a directory
+
+<Directory /tmp>
+  <Macro foo>
+    Warning "macro foo in /tmp"
+  </Macro>
+</Directory>
+
+Use foo
+
+<Directory /tmp>
+  Use foo
+</Directory>
+
+Error "done!"

Propchange: httpd/httpd/trunk/modules/core/test/conf/test23.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test23.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test23.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test23.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test24.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test24.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test24.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test24.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,23 @@
+# nesting...
+
+<Macro bla>
+  <Location /intra>
+    Warning "macro bla intra"
+  </Location>
+  <Location /private>
+    Warning "macro bla private"
+  </Location>
+</Macro>
+
+# ok location in config
+Use bla
+
+# ok, location in VH
+<VirtualHost foo.com>
+  Use bla
+</VirtualHost>
+
+<Directory /tmp>
+  # fails: Location within an Directory
+  Use bla
+</Directory>

Propchange: httpd/httpd/trunk/modules/core/test/conf/test24.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test24.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test24.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test24.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test25.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test25.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test25.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test25.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,27 @@
+# ok till stop.
+
+<Macro RestrictedAccessPolicy $ips>
+  Warning "restricted access policy $ips"
+</Macro>
+
+<Directory /unexpected/1>
+  Use RestrictedAccessPolicy 10.0.0.0/8
+</Directory>
+
+<Macro LocalAccessOnly>
+  Use RestrictedAccessPolicy 10.0.0.0/8
+</Macro>
+
+<Directory /unexpected/2>
+  Use RestrictedAccessPolicy "192.54.172.0/24 192.54.148.0/24 10.0.0.0/8"
+</Directory>
+
+<Location /intra>
+  Use LocalAccessOnly
+</Location>
+
+<Location /admin>
+  Use LocalAccessOnly
+</Location>
+
+Error "done line 27."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test25.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test25.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test25.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test25.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test26.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test26.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test26.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test26.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,19 @@
+# ok till stop.
+# test quotes...
+
+<Macro funny "first arg" 'second ... arg'>
+  <Directory first arg>
+    Warning "funny directory"
+  </Directory>
+  <Location second ... arg>
+    Warning "funny location"
+  </Location>
+</Macro>
+
+Use funny /unexpected/1 /intra
+
+<VirtualHost www.apache.org>
+  Use funny /unexpected/2 /intranet
+</VirtualHost>
+
+Error "done!"

Propchange: httpd/httpd/trunk/modules/core/test/conf/test26.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test26.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test26.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test26.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test27.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test27.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test27.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test27.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,22 @@
+# define a macro in a macro.
+
+<Macro foo $dir $name>
+  <Macro foo.$name>
+    <Directory $dir>
+      Warning "foo.$name $dir"
+    </Directory>
+  </Macro>
+</Macro>
+
+Use foo /unexpected/1 one
+Use foo /unexpected/2 two
+
+Use foo.one
+Use foo.two
+Use foo.one
+
+UndefMacro foo.one
+UndefMacro foo.two
+UndefMacro foo
+
+Error "done!"

Propchange: httpd/httpd/trunk/modules/core/test/conf/test27.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test27.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test27.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test27.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test28.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test28.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test28.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test28.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,13 @@
+# interaction with IfModule
+
+<IfModule mod_macro.c>
+  <Macro foo>
+    Warning "macro foo"
+  </Macro>
+
+  Use foo
+
+  Error "done!"
+</IfModule>
+
+Error "should not get there"

Propchange: httpd/httpd/trunk/modules/core/test/conf/test28.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test28.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test28.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test28.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test29.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test29.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test29.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test29.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,10 @@
+# trigger line overflow during expansion
+
+<Macro toobigaline a>
+  Warning aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
+          aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+</Macro>
+
+Use toobigaline "cette ligne va etre vraiment trop longue ya pas de doute"
+
+Error "should not get there!"

Propchange: httpd/httpd/trunk/modules/core/test/conf/test29.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test29.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test29.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test29.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test30.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test30.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test30.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test30.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,12 @@
+# name conficts: the longest is chosen
+# also test a parametric section
+
+<Macro foo $dir $directive>
+  <$directive $dir>
+    Warning "section $directive $dir"
+  </$directive>
+</Macro>
+
+Use foo /unexpected/1 Directory
+
+Error "done!"

Propchange: httpd/httpd/trunk/modules/core/test/conf/test30.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test30.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test30.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test30.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test31.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test31.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test31.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test31.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,16 @@
+# parameter name conflicts
+
+<Macro bla $dir $di $dd $d>
+  Warning "argument name conflicts"
+  $d $di $dir $dd
+</Macro>
+
+Use bla '' '' 8080 Listen
+
+<Macro foo $d $di $dir $dd>
+  Warning "conflicts, but arguments are not used"
+</Macro>
+
+Use foo '' '' 8080 Listen
+
+Error "done on line 16."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test31.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test31.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test31.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test31.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test32.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test32.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test32.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test32.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,7 @@
+# error if same argument name.
+
+<Macro foo $arg1 $arg2 $arg3 $arg2>
+# bad
+</Macro>
+
+

Propchange: httpd/httpd/trunk/modules/core/test/conf/test32.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test32.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test32.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test32.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test33.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test33.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test33.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test33.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,3 @@
+# empty name.
+
+Use ''

Propchange: httpd/httpd/trunk/modules/core/test/conf/test33.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test33.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test33.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test33.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test34.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test34.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test34.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test34.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,14 @@
+# macro parameter prefix conflicts in two orders
+
+<Macro foo $d $dd>
+  Warning "macro foo conflict one"
+</Macro>
+
+<Macro bla $dd $d>
+  Warning "macro bla conflict two"
+</Macro>
+
+Use foo 1 2
+Use bla 1 2
+
+Error "done on line 14."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test34.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test34.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test34.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test34.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test35.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test35.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test35.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test35.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,10 @@
+# unused arguments
+
+<Macro warnings u1 u2 n1 n2 u3>
+  Warning "macro cannot be used just within a comment u1 u2 u3"
+  # n1 n2
+</Macro>
+ 
+Use warnings 1 2 3 4 5
+
+Error "done on line 10."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test35.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test35.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test35.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test35.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test36.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test36.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test36.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test36.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,12 @@
+<Macro warnings $u $n $u1 $n1 $u2 $n2>
+  Warning "many warnings! $u $u1 $u2"
+  # $n $n1 $n2
+</Macro>
+
+# warn about unused arguments
+Use warnings 1 2 3 4 5 6
+
+# may warn about empty arguments?
+Use warnings '' '' '' '' '' ''
+
+Error "done!"

Propchange: httpd/httpd/trunk/modules/core/test/conf/test36.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test36.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test36.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test36.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test37.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test37.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test37.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test37.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,7 @@
+# empty argument name
+
+<Macro stupid ''>
+  Warn "macro stupid"
+</Macro>
+
+Use stupid hello

Propchange: httpd/httpd/trunk/modules/core/test/conf/test37.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test37.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test37.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test37.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test38.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test38.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test38.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test38.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,10 @@
+# ifmodule
+
+<IfModule mod_macro.c>
+Warning it is really a good idea to have mod_macro.c installed.
+</IfModule>
+
+<IfModule !mod_perl.c>
+Error it seems you do not have mod perl installed.
+</IfModule>
+

Propchange: httpd/httpd/trunk/modules/core/test/conf/test38.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test38.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test38.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test38.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test39.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test39.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test39.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test39.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,23 @@
+# okay till stop.
+
+<IfModule mod_macro.c>
+  <Macro ModMacro>
+    Warning Thanks for using mod_macro!
+  </Macro>
+</IfModule>
+
+<IfModule !mod_macro.c>
+  <Macro ModMacro>
+    Error Sorry, mod_macro must be installed to run this configuration file.
+  </Macro>
+</IfModule>
+
+Use ModMacro
+
+<Macro foo>
+  Warning "macro foo"
+</Macro>
+
+Use foo
+
+Error "done!"

Propchange: httpd/httpd/trunk/modules/core/test/conf/test39.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test39.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test39.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test39.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test40.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test40.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test40.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test40.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,33 @@
+# configuration example with mod_macro
+#
+
+<VirtualHost www.foo.com>
+  DocumentRoot /foo/document/root/directory
+
+  <Macro SubDirAccessControl $subdir>
+    # access control to subdirs...
+    <Location /$subdir>
+      Warning "location /$subdir"
+    </Location>
+  </Macro>
+
+  # repeat uses
+  Use SubDirAccessControl A
+  Use SubDirAccessControl B
+  Use SubDirAccessControl C
+  Use SubDirAccessControl D
+  Use SubDirAccessControl E
+  Use SubDirAccessControl G
+  Use SubDirAccessControl H
+  Use SubDirAccessControl J
+  Use SubDirAccessControl K
+  Use SubDirAccessControl L
+  Use SubDirAccessControl M
+  Use SubDirAccessControl N
+
+  # cleanup
+  UndefMacro SubDirAccessControl
+
+</VirtualHost>
+
+Error Stop configuration file processing.

Propchange: httpd/httpd/trunk/modules/core/test/conf/test40.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test40.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test40.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test40.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test41.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test41.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test41.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test41.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,20 @@
+# another configuration example without mod_macro
+
+<VirtualHost www.foo.com>
+  DocumentRoot /foo/document/root/directory
+
+  <Location /A>
+    Warning "location /A"
+  </Location>
+
+  <Location /B>
+    Warning "location /B"
+  </Location>
+
+  <Location /C>
+    Warning "location /C"
+  </Location>
+
+</VirtualHost>
+
+Error Stop configuration file processing.

Propchange: httpd/httpd/trunk/modules/core/test/conf/test41.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test41.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test41.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test41.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test42.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test42.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test42.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test42.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,13 @@
+# multiple macro uses
+
+<Macro foo $p>
+ Warning "macro foo $p"
+</Macro>
+
+Use foo ''
+Use foo ''
+Use foo ''
+Use foo ''
+Use foo ''
+
+Error "done on line 13."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test42.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test42.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test42.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test42.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test43.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test43.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test43.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test43.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,29 @@
+# non necessarily nested.
+
+<Macro begindir $dir>
+<Directory $dir>
+# hello
+</Macro>
+
+<Macro enddir>
+</Directory>
+</Macro>
+
+Use begindir /unexpected/1
+Use enddir
+
+
+Use begindir /unexpected/2
+Use enddir
+
+Use begindir /unexpected/3
+<Limit GET>
+</Limit>
+Use enddir
+
+<VirtualHost foo.com>
+Use begindir /unexpected/4
+Use enddir
+</VirtualHost>
+
+Error ok!

Propchange: httpd/httpd/trunk/modules/core/test/conf/test43.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test43.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test43.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test43.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test44.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test44.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test44.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test44.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,19 @@
+# working recursion...
+
+<Macro foo>
+use bla
+</Macro>
+
+<Macro bla>
+<IfDefine NoFoo>
+use foo
+</IfDefine>
+</Macro>
+
+
+<IfDefine !NoFoo>
+# foo gonna call bla, bla wont call foo back...
+use foo
+</IfDefine>
+
+Error okay.

Propchange: httpd/httpd/trunk/modules/core/test/conf/test44.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test44.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test44.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test44.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test45.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test45.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test45.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test45.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,7 @@
+# strange chars
+
+<Macro warnings $1 %2 &3 @4 #5 ~6 *7 .8 ,9 !a -b +c =d :e ;f ?g>
+# hello $1 %2 &3 @4 #5 ~6 *7 .8 ,9 !a -b +c =d :e ;f ?g
+</Macro>
+
+Error "done on line 7."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test45.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test45.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test45.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test45.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test46.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test46.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test46.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test46.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,11 @@
+# various working prefixes
+
+<Macro $i %j @k>
+# hello %j @k
+</Macro>
+
+<Macro warnings $i second>
+# not used.
+</Macro>
+
+Error okay.

Propchange: httpd/httpd/trunk/modules/core/test/conf/test46.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test46.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test46.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test46.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test47.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test47.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test47.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test47.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,15 @@
+# empty macro contents...
+
+<Macro foo>
+</Macro>
+
+Use foo
+
+<Macro bla $i>
+</Macro>
+
+<Macro bof $i>
+# some contents...
+</Macro>
+
+Error okay.

Propchange: httpd/httpd/trunk/modules/core/test/conf/test47.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test47.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test47.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test47.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test48.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test48.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test48.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test48.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,23 @@
+# test substitution...
+
+<Macro M %premier>
+Warning %premier
+</Macro>
+
+Use M 1
+Use M 12
+Use M 123
+Use M 1234
+Use M 12345
+Use M 123456
+Use M 1234567
+Use M 12345678
+Use M 123456789
+Use M 1234567890
+Use M 1234567890a
+Use M 1234567890ab
+Use M 1234567890abc
+Use M 1234567890abcd
+Use M 1234567890abcde
+
+Error "done line 23."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test48.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test48.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test48.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test48.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test49.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test49.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test49.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test49.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,2 @@
+# undef macro before anything
+UndefMacro foo

Propchange: httpd/httpd/trunk/modules/core/test/conf/test49.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test49.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test49.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test50.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test50.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test50.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test50.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,5 @@
+# undef non existing macro
+<Macro foo>
+  Warning "foo macro"
+</Macro>
+UndefMacro bla

Propchange: httpd/httpd/trunk/modules/core/test/conf/test50.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test50.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test50.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test51.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test51.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test51.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test51.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,9 @@
+# undef existing macro, and try to use it
+<Macro foo>
+  Warning "foo macro contents"
+</Macro>
+# expanded, but will not be processed because of error
+Use foo
+UndefMacro foo
+# error, does not exist anymore
+Use foo

Propchange: httpd/httpd/trunk/modules/core/test/conf/test51.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test51.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test51.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test52.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test52.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test52.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test52.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,8 @@
+# undef existing macro, and try to use it
+<Macro foo>
+  Warning "foo macro contents line 1"
+</Macro>
+Use foo
+UndefMacro foo
+
+Error "done line 8."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test52.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test52.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test52.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test53.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test53.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test53.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test53.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,2 @@
+# use undefined macro without prior definition
+Use bla

Propchange: httpd/httpd/trunk/modules/core/test/conf/test53.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test53.conf
------------------------------------------------------------------------------
    svn:executable = *

Propchange: httpd/httpd/trunk/modules/core/test/conf/test53.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test53.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test54.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test54.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test54.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test54.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,6 @@
+# empty macro
+<Macro foo>
+</Macro>
+Use foo
+
+Error "done line 6."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test54.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test54.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test54.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test55.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test55.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test55.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test55.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,11 @@
+# line numbers...
+<Macro foo $where>
+  Warning "macro foo(:2) line 1 ($where)"
+</Macro>
+<Macro bla $where>
+  Warning "macro bla(:5) line 1 ($where)"
+  Use foo "bla line 2"
+</Macro>
+Use foo "file line 9"
+Use bla "file line 10"
+Error "done line 11."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test55.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test55.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test55.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test56.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test56.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test56.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test56.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,18 @@
+# nesting warnings
+<Macro Open $dir>
+  <Directory $dir>
+    Warning "Open:2 $dir"
+</Macro>
+<Macro Close>
+    Warning "Close:1"
+  </Directory>
+</Macro>
+
+# some uses
+Use Open /tmp
+Use Close
+
+Use Open /etc
+Use Close
+
+Error "done line 18."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test56.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test56.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test56.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test57.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test57.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test57.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test57.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,4 @@
+# empty argument name
+<Macro foo $x ''>
+  Warning "macro foo line 1"
+</Macro>

Propchange: httpd/httpd/trunk/modules/core/test/conf/test57.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test57.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test57.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test58.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test58.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test58.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test58.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,4 @@
+# bad directive closing
+<Macro foo
+  Warning "macro foo line 1"
+</Macro>

Propchange: httpd/httpd/trunk/modules/core/test/conf/test58.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test58.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test58.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test59.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test59.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test59.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test59.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,4 @@
+# empty name
+<Macro ''>
+  Warning "empty quoted name macro"
+</Macro>

Propchange: httpd/httpd/trunk/modules/core/test/conf/test59.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test59.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test59.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test60.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test60.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test60.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test60.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,17 @@
+# @ escaping
+<Macro Foo $one $two>
+  Warning "macro Foo arg 1: $one"
+  Warning "macro Foo arg 2: $two"
+</Macro>
+<Macro Bla @first @second>
+  Warning Macro Bla arg 1: @first
+  Warning Macro Bla arg 2: @second
+  Use Foo @first 'second'
+  Use Foo 'first' @second
+  Use Foo @first @second
+</Macro>
+
+Use Foo hello world
+Use Bla "hello world" "thank you"
+
+Error "done on line 17."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test60.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test60.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test60.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test61.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test61.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test61.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test61.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,18 @@
+# deep expansion
+<Macro F1 $x>
+  Warning "F1:1 x=$x"
+</Macro>
+<Macro F2 $x>
+  Warning "F2:1 x=$x"
+  Use F1 $x
+</Macro>
+<Macro F3 $x>
+  Warning "F3:1 x=$x"
+  Use F2 $x
+</Macro>
+<Macro F4 $x>
+  Warning "F4:1 x=$x"
+  Use F3 $x
+</Macro>
+Use F4 "line=17"
+Error "done line 18."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test61.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test61.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test61.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test62.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test62.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test62.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test62.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,25 @@
+# test continuations
+<Macro Line \
+  $start \
+  $stop>
+  Warning \
+    "Line:1-2 start at $start"
+  Warning \
+    "Line:3-4 stop at $stop"
+</Macro>
+
+Use Line 11 11
+Use Line \
+  12 13
+Use Line \
+  14 \
+  16
+Use Line 17 \
+  18
+Use Line \
+  \
+  19 \
+  \
+  23
+
+Error "done line 25."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test62.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test62.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test62.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test63.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test63.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test63.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test63.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,9 @@
+# include
+include ${PWD}/inc63_1.conf
+Use Foo "test63.conf:3"
+<Macro Bla $where>
+  Warning "Bla at $where"
+</Macro>
+include ${PWD}/inc63_2.conf
+Use Bla "test63.conf:8"
+Error "done at line 9."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test63.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test63.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test63.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test64.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test64.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test64.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test64.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,5 @@
+# just continuations
+Warning "on line 2"
+Warning \
+  "from line 3 to line 4"
+Error "done on line 5."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test64.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test64.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test64.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test65.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test65.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test65.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test65.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,11 @@
+# simple use continuation
+<Macro Line $line>
+  # first macro line is a comment
+  Warning "Line: $line"
+</Macro>
+Use Line \
+  "on line 6-7"
+Use \
+  Line \
+    "on line 8-10"
+Error "done on line 11."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test65.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test65.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test65.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test66.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test66.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test66.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test66.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,7 @@
+# no double substitution
+<Macro Foo $x $y>
+  Warning "Foo: x=$x y=$y"
+</Macro>
+Use Foo X Y
+Use Foo "$y" "$x"
+Error "done on line 7."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test66.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test66.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test66.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test67.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test67.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test67.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test67.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1 @@
+Error "done at line 1 without LF."
\ No newline at end of file

Propchange: httpd/httpd/trunk/modules/core/test/conf/test67.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test67.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test67.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test68.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test68.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test68.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test68.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,5 @@
+# two directives with continuations & no eol at eof
+Warning \
+  "line 2-3"
+Error \
+  "done on line 4-5."
\ No newline at end of file

Propchange: httpd/httpd/trunk/modules/core/test/conf/test68.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test68.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test68.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/conf/test69.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/conf/test69.conf?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/conf/test69.conf (added)
+++ httpd/httpd/trunk/modules/core/test/conf/test69.conf Sun Jan 20 10:07:44 2013
@@ -0,0 +1,14 @@
+# warn if ignored non-blank stuff after closing '>'
+<Macro Foo> this stuff is ignored...
+  Warning "Foo"
+</Macro> this stuff is ignored as well...
+Use Foo
+<Macro Bla>				
+  Warning "Bla"
+</Macro>			
+Use Bla
+<Macro Comments> # comments are fine
+  Warning "Comments"
+</Macro> # comments are fine
+Use Comments
+Error "done on line 14."

Propchange: httpd/httpd/trunk/modules/core/test/conf/test69.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/test/conf/test69.conf
------------------------------------------------------------------------------
    svn:keywords = Id URL

Propchange: httpd/httpd/trunk/modules/core/test/conf/test69.conf
------------------------------------------------------------------------------
    svn:mime-type = text/x-httpd

Added: httpd/httpd/trunk/modules/core/test/ref/test01.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test01.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test01.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test01.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,3 @@
+# testing with conf/test01.conf
+httpd: Syntax error on line 2 of ./conf/test01.conf: <Macro macro definition: empty name
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test01.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test02.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test02.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test02.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test02.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,3 @@
+# testing with conf/test02.conf
+httpd: Syntax error on line 2 of ./conf/test02.conf: <Macro macro definition: empty name
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test02.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test03.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test03.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test03.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test03.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,3 @@
+# testing with conf/test03.conf
+httpd: Syntax error on line 5 of ./conf/test03.conf: macro 'bla' undefined
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test03.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test04.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test04.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test04.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test04.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,3 @@
+# testing with conf/test04.conf
+httpd: Syntax error on line 5 of ./conf/test04.conf: macro 'foo' (defined on line 2 of "./conf/test04.conf") used with 1 arguments instead of 0
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test04.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test05.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test05.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test05.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test05.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,3 @@
+# testing with conf/test05.conf
+httpd: Syntax error on line 5 of ./conf/test05.conf: macro 'foo' (defined on line 2 of "./conf/test05.conf") used with 0 arguments instead of 1
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test05.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test06.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test06.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test06.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test06.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,3 @@
+# testing with conf/test06.conf
+httpd: Syntax error on line 5 of ./conf/test06.conf: macro 'foo' (defined on line 2 of "./conf/test06.conf") used with 2 arguments instead of 1
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test06.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test07.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test07.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test07.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test07.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,3 @@
+# testing with conf/test07.conf
+httpd: Syntax error on line 2 of ./conf/test07.conf: macro 'foo' (defined on line 2 of "./conf/test07.conf")\n\tcontents error: expected token not found: </Macro>
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test07.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test08.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test08.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test08.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test08.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,3 @@
+# testing with conf/test08.conf
+httpd: Syntax error on line 3 of ./conf/test08.conf: </Macro> without matching <Macro> section
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test08.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test09.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test09.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test09.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test09.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,3 @@
+# testing with conf/test09.conf
+httpd: Syntax error on line 1 of macro 'foo' (defined on line 2 of "./conf/test09.conf") used on line 6 of "./conf/test09.conf": recursive use of macro 'foo' is invalid
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test09.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test10.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test10.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test10.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test10.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,3 @@
+# testing with conf/test10.conf
+httpd: Syntax error on line 1 of macro 'bla' (defined on line 6 of "./conf/test10.conf") used on line 1 of "macro 'foo' (defined on line 2 of "./conf/test10.conf") used on line 10 of "./conf/test10.conf"": recursive use of macro 'foo' is invalid
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test10.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test11.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test11.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test11.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test11.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,6 @@
+# testing with conf/test11.conf
+[core:warn] macro one.in line 1 on line 1 of macro 'one.in' (defined on line 1 of "macro 'foo' (defined on line 2 of "./conf/test11.conf") used on line 9 of "./conf/test11.conf"") used on line 12 of "./conf/test11.conf"
+[core:error] done line 15. on line 15 of ./conf/test11.conf
+AH00526: Syntax error on line 15 of ./conf/test11.conf:
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test11.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test12.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test12.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test12.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test12.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,7 @@
+# testing with conf/test12.conf
+[macro:warn] macro 'foo' multiply defined: defined on line 2 of "./conf/test12.conf", redefined on line 6 of "./conf/test12.conf"
+[core:warn] macro foo 2, line 1 on line 1 of macro 'foo' (defined on line 6 of "./conf/test12.conf") used on line 10 of "./conf/test12.conf"
+[core:error] done line 12. on line 12 of ./conf/test12.conf
+AH00526: Syntax error on line 12 of ./conf/test12.conf:
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test12.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test13.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test13.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test13.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test13.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,8 @@
+# testing with conf/test13.conf
+[macro:warn] macro 'foo' multiply defined: defined on line 2 of "./conf/test13.conf", redefined on line 12 of "./conf/test13.conf"
+[core:warn] macro FOO line 1 on line 1 of macro 'foo' (defined on line 2 of "./conf/test13.conf") used on line 10 of "./conf/test13.conf"
+[core:warn] redefined macro foo line 1 on line 1 of macro 'foo' (defined on line 12 of "./conf/test13.conf") used on line 16 of "./conf/test13.conf"
+[core:error] done line 18. on line 18 of ./conf/test13.conf
+AH00526: Syntax error on line 18 of ./conf/test13.conf:
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test13.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test14.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test14.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test14.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test14.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,14 @@
+# testing with conf/test14.conf
+AH00112: Warning: DocumentRoot [/projects/apache/web] does not exist
+[core:warn] directory /projects/apache/web on line 5 of macro 'myvirtualhost' (defined on line 3 of "./conf/test14.conf") used on line 17 of "./conf/test14.conf"
+[core:warn] directory /projects/apache/web/intranet on line 8 of macro 'myvirtualhost' (defined on line 3 of "./conf/test14.conf") used on line 17 of "./conf/test14.conf"
+AH00112: Warning: DocumentRoot [/projects/perl/web] does not exist
+[core:warn] directory /projects/perl/web on line 5 of macro 'myvirtualhost' (defined on line 3 of "./conf/test14.conf") used on line 19 of "./conf/test14.conf"
+[core:warn] directory /projects/perl/web/intranet on line 8 of macro 'myvirtualhost' (defined on line 3 of "./conf/test14.conf") used on line 19 of "./conf/test14.conf"
+AH00112: Warning: DocumentRoot [/projects/mines/web] does not exist
+[core:warn] directory /projects/mines/web on line 5 of macro 'myvirtualhost' (defined on line 3 of "./conf/test14.conf") used on line 21 of "./conf/test14.conf"
+[core:warn] directory /projects/mines/web/intranet on line 8 of macro 'myvirtualhost' (defined on line 3 of "./conf/test14.conf") used on line 21 of "./conf/test14.conf"
+[core:error] done line 23. on line 23 of ./conf/test14.conf
+AH00526: Syntax error on line 23 of ./conf/test14.conf:
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test14.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test15.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test15.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test15.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test15.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,6 @@
+# testing with conf/test15.conf
+[macro:warn] bad cumulated nesting (+1) in macro 'test' (defined on line 2 of "./conf/test15.conf")
+[core:error] should not reach this point. on line 9 of ./conf/test15.conf
+AH00526: Syntax error on line 9 of ./conf/test15.conf:
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test15.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test16.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test16.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test16.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test16.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,5 @@
+# testing with conf/test16.conf
+[macro:warn] bad (negative) nesting on line 2 of macro 'foo' (defined on line 3 of "./conf/test16.conf")
+[macro:warn] bad cumulated nesting (-1) in macro 'foo' (defined on line 3 of "./conf/test16.conf")
+httpd: Syntax error on line 9 of ./conf/test16.conf: </Limit> without matching <Limit> section
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test16.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test17.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test17.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test17.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test17.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,7 @@
+# testing with conf/test17.conf
+[macro:warn] bad (negative) nesting on line 2 of macro 'foo' (defined on line 3 of "./conf/test17.conf")
+[macro:warn] bad cumulated nesting (-1) in macro 'foo' (defined on line 3 of "./conf/test17.conf")
+[core:error] done on line 10. on line 10 of ./conf/test17.conf
+AH00526: Syntax error on line 10 of ./conf/test17.conf:
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test17.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test18.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test18.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test18.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test18.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,7 @@
+# testing with conf/test18.conf
+[macro:warn] bad (negative) nesting on line 2 of macro 'foo' (defined on line 3 of "./conf/test18.conf")
+[macro:warn] bad cumulated nesting (-1) in macro 'foo' (defined on line 3 of "./conf/test18.conf")
+[core:error] done on line 10. on line 10 of ./conf/test18.conf
+AH00526: Syntax error on line 10 of ./conf/test18.conf:
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test18.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test19.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test19.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test19.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test19.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,9 @@
+# testing with conf/test19.conf
+[core:warn] macro foo line 2 in Directory on line 1 of macro 'foo' (defined on line 3 of "./conf/test19.conf") used on line 9 of "./conf/test19.conf"
+[core:warn] macro foo line 2 in Location on line 1 of macro 'foo' (defined on line 3 of "./conf/test19.conf") used on line 13 of "./conf/test19.conf"
+[core:warn] macro foo line 2 in VirtualHost on line 1 of macro 'foo' (defined on line 3 of "./conf/test19.conf") used on line 17 of "./conf/test19.conf"
+[core:warn] macro foo line 2 in VirtualHost & Directory on line 1 of macro 'foo' (defined on line 3 of "./conf/test19.conf") used on line 22 of "./conf/test19.conf"
+[core:error] done line 26. on line 26 of ./conf/test19.conf
+AH00526: Syntax error on line 26 of ./conf/test19.conf:
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test19.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test20.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test20.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test20.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test20.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,4 @@
+# testing with conf/test20.conf
+AH00526: Syntax error on line 1 of macro 'foo' (defined on line 3 of "./conf/test20.conf") used on line 10 of "./conf/test20.conf":
+<Directory not allowed here
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test20.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test21.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test21.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test21.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test21.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,5 @@
+# testing with conf/test21.conf
+[core:error] macro foo dir /tmp on line 2 of macro 'foo' (defined on line 3 of "./conf/test21.conf") used on line 10 of "./conf/test21.conf"
+AH00526: Syntax error on line 2 of macro 'foo' (defined on line 3 of "./conf/test21.conf") used on line 10 of "./conf/test21.conf":
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test21.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test22.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test22.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test22.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test22.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,6 @@
+# testing with conf/test22.conf
+[core:warn] macro foo on line 2 of macro 'foo' (defined on line 3 of "./conf/test22.conf") used on line 9 of "./conf/test22.conf"
+[core:error] done on line 11. on line 11 of ./conf/test22.conf
+AH00526: Syntax error on line 11 of ./conf/test22.conf:
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test22.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test23.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test23.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test23.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test23.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,7 @@
+# testing with conf/test23.conf
+[core:warn] macro foo in /tmp on line 1 of macro 'foo' (defined on line 4 of "./conf/test23.conf") used on line 9 of "./conf/test23.conf"
+[core:warn] macro foo in /tmp on line 1 of macro 'foo' (defined on line 4 of "./conf/test23.conf") used on line 12 of "./conf/test23.conf"
+[core:error] done! on line 15 of ./conf/test23.conf
+AH00526: Syntax error on line 15 of ./conf/test23.conf:
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test23.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test24.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test24.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test24.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test24.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,8 @@
+# testing with conf/test24.conf
+[core:warn] macro bla intra on line 2 of macro 'bla' (defined on line 3 of "./conf/test24.conf") used on line 13 of "./conf/test24.conf"
+[core:warn] macro bla private on line 5 of macro 'bla' (defined on line 3 of "./conf/test24.conf") used on line 13 of "./conf/test24.conf"
+[core:warn] macro bla intra on line 2 of macro 'bla' (defined on line 3 of "./conf/test24.conf") used on line 17 of "./conf/test24.conf"
+[core:warn] macro bla private on line 5 of macro 'bla' (defined on line 3 of "./conf/test24.conf") used on line 17 of "./conf/test24.conf"
+AH00526: Syntax error on line 1 of macro 'bla' (defined on line 3 of "./conf/test24.conf") used on line 22 of "./conf/test24.conf":
+<Location not allowed here
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test24.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test25.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test25.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test25.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test25.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,9 @@
+# testing with conf/test25.conf
+[core:warn] restricted access policy 10.0.0.0/8 on line 1 of macro 'restrictedaccesspolicy' (defined on line 3 of "./conf/test25.conf") used on line 8 of "./conf/test25.conf"
+[core:warn] restricted access policy 192.54.172.0/24 192.54.148.0/24 10.0.0.0/8 on line 1 of macro 'restrictedaccesspolicy' (defined on line 3 of "./conf/test25.conf") used on line 16 of "./conf/test25.conf"
+[core:warn] restricted access policy 10.0.0.0/8 on line 1 of macro 'restrictedaccesspolicy' (defined on line 3 of "./conf/test25.conf") used on line 1 of "macro 'localaccessonly' (defined on line 11 of "./conf/test25.conf") used on line 20 of "./conf/test25.conf""
+[core:warn] restricted access policy 10.0.0.0/8 on line 1 of macro 'restrictedaccesspolicy' (defined on line 3 of "./conf/test25.conf") used on line 1 of "macro 'localaccessonly' (defined on line 11 of "./conf/test25.conf") used on line 24 of "./conf/test25.conf""
+[core:error] done line 27. on line 27 of ./conf/test25.conf
+AH00526: Syntax error on line 27 of ./conf/test25.conf:
+Configuration processing stopped by Error directive
+# exit: 1

Propchange: httpd/httpd/trunk/modules/core/test/ref/test25.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/modules/core/test/ref/test26.out
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/test/ref/test26.out?rev=1435811&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/core/test/ref/test26.out (added)
+++ httpd/httpd/trunk/modules/core/test/ref/test26.out Sun Jan 20 10:07:44 2013
@@ -0,0 +1,11 @@
+# testing with conf/test26.conf
+[macro:warn] macro 'funny' (defined on line 4 of "./conf/test26.conf") argument name 'first arg' (#1) without expected prefix, better prefix argument names with one of '$%@'.
+[macro:warn] macro 'funny' (defined on line 4 of "./conf/test26.conf") argument name 'second ... arg' (#2) without expected prefix, better prefix argument names with one of '$%@'.
+[core:warn] funny directory on line 2 of macro 'funny' (defined on line 4 of "./conf/test26.conf") used on line 13 of "./conf/test26.conf"
+[core:warn] funny location on line 5 of macro 'funny' (defined on line 4 of "./conf/test26.conf") used on line 13 of "./conf/test26.conf"
+[core:warn] funny directory on line 2 of macro 'funny' (defined on line 4 of "./conf/test26.conf") used on line 16 of "./conf/test26.conf"
+[core:warn] funny location on line 5 of macro 'funny' (defined on line 4 of "./conf/test26.conf") used on line 16 of "./conf/test26.conf"
+[core:error] done! on line 19 of ./conf/test26.conf
+AH00526: Syntax error on line 19 of ./conf/test26.conf:
+Configuration processing stopped by Error directive
+# exit: 1



Mime
View raw message