Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Dec 12, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
beb29a3
Require the directive from the documentation
jajik Dec 11, 2024
755088d
Use the same directive as the documentation
jajik Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docs/userguide/src/main/docbook/modules/faq.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions docs/userguide/src/main/docbook/modules/quick-start.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
19 changes: 16 additions & 3 deletions native/mod_manager/mod_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions test/java/README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/java/installhttpd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -343,9 +343,9 @@ EOF
Listen @IP@:6666
ManagerBalancerName mycluster
<VirtualHost @IP@:6666>
<Directory />
<Location />
Require ip @SUBIP@
</Directory>
</Location>

KeepAliveTimeout 300
MaxKeepAliveRequests 0
Expand Down
Loading