Merge pull request #855 from jajik/directive-backport

[1.3.x] Change the example directive to be consistent with the docs

Author: jajik

docs/userguide/src/main/docbook/modules/faq.xml

@@ -166,18 +166,18 @@ GET /
         <listitem>
           <para>"client denied by server configuration":</para>
           <para>
-            The directory in the VirtualHost is not allowed for the client.
+            The location in the VirtualHost is not allowed for the client.
             If you have something like:
           </para>
           <programlisting>Mon Jun 28 18:08:47 2010] [error] [client 10.33.144.3] client denied by server configuration: /</programlisting>
           <para>
             You need to have something like:
           </para>
-          <programlisting><![CDATA[<Directory />
+          <programlisting><![CDATA[<Location />
   Order deny,allow
   Deny from all
   Allow from 10.33.144.3
-</Directory>]]></programlisting>
+</Location>]]></programlisting>
         </listitem>
       </orderedlist>
     </section>
@@ -191,11 +191,11 @@ GET /
     </para>
     <programlisting><![CDATA[
 <VirtualHost localhost:6666>
-    <Directory />
+    <Location />
      Order deny,allow
      Deny from all
      Allow from 127.0.0.1
-    </Directory>
+    </Location>
     ServerAdvertise on http://localhost:6666
     EnableMCPMReceive
 </VirtualHost>

docs/userguide/src/main/docbook/modules/quick-start.xml

@@ -122,11 +122,11 @@ LoadModule advertise_module /opt/jboss/httpd/lib/httpd/modules/mod_advertise.so
 Listen 10.33.144.3:6666
 <VirtualHost 10.33.144.3:6666>
  
-  <Directory />
+  <Location />
     Order deny,allow
     Deny from all
     Allow from 10.33.144.
-  </Directory>
+  </Location>
  
   KeepAliveTimeout 60
   MaxKeepAliveRequests 0
@@ -149,11 +149,11 @@ LoadModule advertise_module modules/mod_advertise.so
 Listen 10.33.144.3:6666
 <VirtualHost 10.33.144.3:6666>
  
-  <Directory />
+  <Location />
     Order deny,allow
     Deny from all
     Allow from 10.33.144.
-  </Directory>
+  </Location>
  
   KeepAliveTimeout 60
   MaxKeepAliveRequests 0

native/mod_manager/mod_manager.c

@@ -3405,11 +3405,24 @@ static const char*cmd_manager_maxmesssize(cmd_parms *cmd, void *mconfig, const c
 static const char*cmd_manager_enable_mcmp_receive(cmd_parms *cmd, void *dummy)
 {
     mod_manager_config *mconf = ap_get_module_config(cmd->server->module_config, &manager_module);
-    if (!cmd->server->is_virtual)
-        return "EnableMCPMReceive must be in a VirtualHost";
-    mconf->enable_mcmp_receive = -1;
+    ap_directive_t *directive = cmd->directive->parent ? cmd->directive->parent->first_child : cmd->directive;
+    (void)dummy;
+
+    if (!cmd->server->is_virtual) {
+        return "EnableMCMPReceive must be in a VirtualHost";
+    }
+
+    while (directive) {
+        if (strcmp(directive->directive, "<Directory") == 0) {
+            return "Directory cannot be used with EnableMCMPReceive, use Location instead";
+        }
+        directive = directive->next;
+    }
+
+    mconf->enable_mcmp_receive = 1;
     return NULL;
 }
+
 static const char*cmd_manager_enable_mcmp_receive_deprecated(cmd_parms *cmd, void *dummy)
 {
     ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,

test/java/README.txt

@@ -17,11 +17,11 @@ NOTE the httpd should have something like the following in httpd.conf
 <IfModule manager_module>
    Listen jfcpc:6666
    <VirtualHost jfcpc:6666>
-    <Directory />
+    <Location />
       Order deny,allow
       Deny from all
       Allow from 10.33.144
-    </Directory>
+    </Location>
 
    KeepAliveTimeout 300
    MaxKeepAliveRequests 0

test/java/installhttpd.sh

@@ -314,11 +314,11 @@ then
   Listen @IP@:6666
   ManagerBalancerName mycluster
   <VirtualHost @IP@:6666>
-    <Directory />
+    <Location />
      Order deny,allow
      Deny from all
      Allow from @SUBIP@
-    </Directory>
+    </Location>
 
     KeepAliveTimeout 300
     MaxKeepAliveRequests 0
@@ -343,9 +343,9 @@ EOF
   Listen @IP@:6666
   ManagerBalancerName mycluster
   <VirtualHost @IP@:6666>
-    <Directory />
+    <Location />
      Require ip @SUBIP@
-    </Directory>
+    </Location>
 
     KeepAliveTimeout 300
     MaxKeepAliveRequests 0