From: Rich Bowen Date: Fri, 1 May 2026 17:33:21 +0000 (+0000) Subject: Rebuilds this morning's work X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ec3ecc822f879a8e3001d3e1363c23e0d351fde;p=thirdparty%2Fapache%2Fhttpd.git Rebuilds this morning's work git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933675 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/glossary.html.en.utf8 b/docs/manual/glossary.html.en.utf8 index 0c014ed439..3f6b668141 100644 --- a/docs/manual/glossary.html.en.utf8 +++ b/docs/manual/glossary.html.en.utf8 @@ -323,6 +323,15 @@ See: SSL/TLS Encryption +
Per-directory Context
+
A directive is in + per-directory context when it appears in a <Directory>, <DirectoryMatch>, <Files>, or <FilesMatch> section in the main + configuration files, or in a .htaccess file. + In per-directory context, directives apply only to the + directory (or set of files) they are associated with.
+ See: Configuration Sections +
+
Plaintext
The unencrypted text.
diff --git a/docs/manual/glossary.xml.de b/docs/manual/glossary.xml.de index ca25d8d547..658422af18 100644 --- a/docs/manual/glossary.xml.de +++ b/docs/manual/glossary.xml.de @@ -1,7 +1,7 @@ - + - + + + + + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 27701a3bed..51bf4e037b 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_authz_core.xml.meta b/docs/manual/mod/mod_authz_core.xml.meta index 5023ce74e3..248771933a 100644 --- a/docs/manual/mod/mod_authz_core.xml.meta +++ b/docs/manual/mod/mod_authz_core.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_proxy.html.en.utf8 b/docs/manual/mod/mod_proxy.html.en.utf8 index 2dc3a995a9..39db81becd 100644 --- a/docs/manual/mod/mod_proxy.html.en.utf8 +++ b/docs/manual/mod/mod_proxy.html.en.utf8 @@ -1112,7 +1112,8 @@ through from being escaped.

When used inside a <Location> section, the first argument is omitted and the local - directory is obtained from the <Location>. The same will occur inside a + directory is obtained from the <Location>. When used outside a <Location> or <LocationMatch> section, the + path argument is required. The same will occur inside a <LocationMatch> section; however, ProxyPass does not interpret the regexp as such, so it is necessary to use ProxyPassMatch in this situation instead.

@@ -1822,7 +1823,8 @@ ProxyPassMatch "^/(.*\.gif)$" "http://backend.example.com/$1" to reverse-proxy a subdirectory.

When used inside a <LocationMatch> section, the first argument is omitted and the - regexp is obtained from the <LocationMatch>.

+ regexp is obtained from the <LocationMatch>. When used outside a <Location> or <LocationMatch> section, the + regex argument is required.

If you require a more flexible reverse-proxy configuration, see the RewriteRule directive with the @@ -1937,7 +1939,8 @@ ProxyPassReverseCookiePath "/" "/mirror/foo/" URL.

When used inside a <Location> section, the first argument is omitted and the local - directory is obtained from the <Location>. The same occurs inside a <LocationMatch> section, but will probably not work as + directory is obtained from the <Location>. When used outside a <Location> or <LocationMatch> section, the + path argument is required. The same occurs inside a <LocationMatch> section, but will probably not work as intended, as ProxyPassReverse will interpret the regexp literally as a path; if needed in this situation, specify the ProxyPassReverse outside the section or in a separate <Location> section.

diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index 557ea001fd..7997aba701 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 4322f53a72..eba79bc416 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - + + diff --git a/docs/manual/mod/mod_ssl.html.en.utf8 b/docs/manual/mod/mod_ssl.html.en.utf8 index c2e8265e69..54cfd68654 100644 --- a/docs/manual/mod/mod_ssl.html.en.utf8 +++ b/docs/manual/mod/mod_ssl.html.en.utf8 @@ -350,15 +350,18 @@ directive.

Authorization providers for use with Require

-

mod_ssl provides a few authentication providers for use - with mod_authz_core's +

mod_ssl provides the following authorization providers + for use with mod_authz_core's Require directive.

Require ssl

The ssl provider denies access if a connection is not - encrypted with SSL. This is similar to the - SSLRequireSSL directive.

+ encrypted with SSL. Unlike the + SSLRequireSSL directive, this can be + combined with other Require directives in + RequireAny or + RequireAll blocks.

Require ssl
@@ -367,8 +370,8 @@ directive.

Require ssl-verify-client

-

The ssl provider allows access if the user is - authenticated with a valid client certificate. This is only +

The ssl-verify-client provider allows access if the + user is authenticated with a valid client certificate. This is only useful if SSLVerifyClient optional is in effect.

The following example grants access if the user is authenticated diff --git a/docs/manual/mod/mod_ssl.xml.es b/docs/manual/mod/mod_ssl.xml.es index a5e772a579..82e32b3ea0 100644 --- a/docs/manual/mod/mod_ssl.xml.es +++ b/docs/manual/mod/mod_ssl.xml.es @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_ssl.xml.fr b/docs/manual/mod/mod_ssl.xml.fr index 21e1526265..d02426a102 100644 --- a/docs/manual/mod/mod_ssl.xml.fr +++ b/docs/manual/mod/mod_ssl.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mpm_common.html.en.utf8 b/docs/manual/mod/mpm_common.html.en.utf8 index f2839af7d9..fe7030ab4d 100644 --- a/docs/manual/mod/mpm_common.html.en.utf8 +++ b/docs/manual/mod/mpm_common.html.en.utf8 @@ -503,6 +503,26 @@ simultaneously 25 (ThreadsPerChild). Therefore, to increase MaxRequestWorkers to a value that requires more than 16 processes, you must also raise ServerLimit.

+

For threaded and hybrid MPMs, MaxRequestWorkers + must be at least as large as + ThreadsPerChild, and + should be an integer multiple of + ThreadsPerChild. If it + is not a multiple, the server will round it down to the nearest + multiple at startup and log a warning.

+ +

Warning: MaxRequestWorkers too small

+ WARNING: MaxRequestWorkers of 10 is less than ThreadsPerChild + of 25, increasing to 25. MaxRequestWorkers must be at least as + large as the number of threads in a single server. +

+ +

Warning: MaxRequestWorkers not a multiple of ThreadsPerChild

+ WARNING: MaxRequestWorkers of 90 is not an integer multiple of + ThreadsPerChild of 25, decreasing to nearest multiple 75, for a + maximum of 3 servers. +

+

MaxRequestWorkers was called MaxClients before version 2.3.13. The old name is still supported.

@@ -916,6 +936,11 @@ per child process least 1. Values less than 1 will be automatically increased to 1 and a warning will be logged.

+

The value of MaxRequestWorkers + must be an integer multiple of ThreadsPerChild. + See MaxRequestWorkers for + details.

+
top

ThreadStackSize Directive

diff --git a/docs/manual/mod/mpm_common.xml.de b/docs/manual/mod/mpm_common.xml.de index 7409d42db0..01b6b03fb6 100644 --- a/docs/manual/mod/mpm_common.xml.de +++ b/docs/manual/mod/mpm_common.xml.de @@ -1,7 +1,7 @@ - + + diff --git a/docs/manual/mod/mpm_common.xml.ja b/docs/manual/mod/mpm_common.xml.ja index 5191606831..1743eef0e0 100644 --- a/docs/manual/mod/mpm_common.xml.ja +++ b/docs/manual/mod/mpm_common.xml.ja @@ -1,7 +1,7 @@ - + + + + + diff --git a/docs/manual/rewrite/htaccess.xml.ja b/docs/manual/rewrite/htaccess.xml.ja index 446389f932..4a8110fc7d 100644 --- a/docs/manual/rewrite/htaccess.xml.ja +++ b/docs/manual/rewrite/htaccess.xml.ja @@ -1,7 +1,7 @@ - + + + + + diff --git a/docs/manual/vhosts/details.xml.ko b/docs/manual/vhosts/details.xml.ko index fbcfe75186..b0c3c4593c 100644 --- a/docs/manual/vhosts/details.xml.ko +++ b/docs/manual/vhosts/details.xml.ko @@ -1,7 +1,7 @@ - + +