+
SSLProtocol for name-based virtual hosts
+
+Before OpenSSL 1.1.1, even though the Server Name Indication (SNI) allowed to
+determine the targeted virtual host early in the TLS handshake, it was not
+possible to switch the TLS protocol version of the connection at this point,
+and thus the SSLProtocol negotiated was always based off
+the one of the base virtual host (first virtual host declared on the
+listening IP:port of the connection).
+
+
+Beginning with Apache HTTP server version 2.4.42, when built/linked against
+OpenSSL 1.1.1 or later, and when the SNI is provided by the client in the TLS
+handshake, the SSLProtocol of each (name-based) virtual
+host can and will be honored.
+
+
+For compatibility with previous versions, if no
+SSLProtocol is configured in a name-based virtual host,
+the one from the base virtual host still applies, unless
+SSLProtocol is configured globally in which case the
+global value applies (this latter exception is more sensible than compatible,
+though).
+
+
The character which is used to separate (or "delimit") the
- various parts of the substituion string is referred to as the
+ various parts of the substitution string is referred to as the
"delimiter", and it is most common to use a slash for this
purpose.
diff --git a/docs/manual/mod/mod_systemd.html.en b/docs/manual/mod/mod_systemd.html.en
index d547975188b..51b1c874210 100644
--- a/docs/manual/mod/mod_systemd.html.en
+++ b/docs/manual/mod/mod_systemd.html.en
@@ -41,6 +41,35 @@
This module does not provide support for Systemd socket activation.
+
Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.
| Description: |
Journalisation Clickstream des liens parcourus par un
utilisateur sur un site
diff --git a/docs/manual/mod/mod_usertrack.xml.fr b/docs/manual/mod/mod_usertrack.xml.fr
index 5e09b58c59b..880a6770898 100644
--- a/docs/manual/mod/mod_usertrack.xml.fr
+++ b/docs/manual/mod/mod_usertrack.xml.fr
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/mod/mod_usertrack.xml.meta b/docs/manual/mod/mod_usertrack.xml.meta
index 8a7ae2254a2..9b19825b7b7 100644
--- a/docs/manual/mod/mod_usertrack.xml.meta
+++ b/docs/manual/mod/mod_usertrack.xml.meta
@@ -8,6 +8,6 @@
en
- fr
+ fr
diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 6b6316e66cf..aa2bc67db62 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -327,7 +327,7 @@ in *BSDs. |
This also means that multiple instances of Apache httpd configured on a
same IP:port and with a positive ListenCoresBucketsRatio
would start without an error too, and then run with incoming connections
- evenly distributed accross both instances (this is NOT a recommendation or
+ evenly distributed across both instances (this is NOT a recommendation or
a sensible usage in any case, but just a notice that it would prevent such
possible issues to be detected).
Within the same instance, Apache httpd will check and fail to start if
diff --git a/docs/manual/mod/mpmt_os2.html.en b/docs/manual/mod/mpmt_os2.html.en
index 690be40ecc0..f9931d729fd 100644
--- a/docs/manual/mod/mpmt_os2.html.en
+++ b/docs/manual/mod/mpmt_os2.html.en
@@ -38,7 +38,7 @@
The Server consists of a main, parent process and a small, static
number of child processes.
- The parent process' job is to manage the child processes. This
+
The parent process's job is to manage the child processes. This
involves spawning children as required to ensure there are always
StartServers processes
accepting connections.
diff --git a/docs/manual/mod/overrides.html.en b/docs/manual/mod/overrides.html.en
index f3f3f448865..39e56a48c77 100644
--- a/docs/manual/mod/overrides.html.en
+++ b/docs/manual/mod/overrides.html.en
@@ -435,141 +435,147 @@ scripts
| The domain to which the tracking cookie applies |
| CookieExpires | mod_usertrack |
| Expiry time for the tracking cookie |
-| CookieName | mod_usertrack |
-| Name of the tracking cookie |
-| CookieStyle | mod_usertrack |
-| Format of the cookie header field |
-| CookieTracking | mod_usertrack |
-| Enables tracking cookie |
-| DefaultLanguage | mod_mime |
-| Defines a default language-tag to be sent in the Content-Language
+ |
| CookieHTTPOnly | mod_usertrack |
+| Adds the 'HTTPOnly' attribute to the cookie |
+| CookieName | mod_usertrack |
+| Name of the tracking cookie |
+| CookieSameSite | mod_usertrack |
+| Adds the 'SameSite' attribute to the cookie |
+| CookieSecure | mod_usertrack |
+| Adds the 'Secure' attribute to the cookie |
+| CookieStyle | mod_usertrack |
+| Format of the cookie header field |
+| CookieTracking | mod_usertrack |
+| Enables tracking cookie |
+| DefaultLanguage | mod_mime |
+| Defines a default language-tag to be sent in the Content-Language
header field for all resources in the current context that have not been
assigned a language-tag by some other means. |
-| DefaultType | core |
-| This directive has no effect other than to emit warnings
+ |
| DefaultType | core |
+This directive has no effect other than to emit warnings
if the value is not none. In prior versions, DefaultType
would specify a default media type to assign to response content for
which no other media type configuration could be found.
|
-| EnableMMAP | core |
-| Use memory-mapping to read files during delivery |
-| EnableSendfile | core |
-| Use the kernel sendfile support to deliver files to the client |
-| ErrorDocument | core |
-| What the server will return to the client
+ |
| EnableMMAP | core |
+| Use memory-mapping to read files during delivery |
+| EnableSendfile | core |
+| Use the kernel sendfile support to deliver files to the client |
+| ErrorDocument | core |
+| What the server will return to the client
in case of an error |
-| FileETag | core |
-| File attributes used to create the ETag
+ |
| FileETag | core |
+| File attributes used to create the ETag
HTTP response header for static files |
-| ForceLanguagePriority | mod_negotiation |
-| Action to take if a single acceptable document is not
+ |
| ForceLanguagePriority | mod_negotiation |
+| Action to take if a single acceptable document is not
found |
-| ForceType | core |
-| Forces all matching files to be served with the specified
+ |
| ForceType | core |
+| Forces all matching files to be served with the specified
media type in the HTTP Content-Type header field |
-| Header | mod_headers |
-| Configure HTTP response headers |
-| ISAPIAppendLogToErrors | mod_isapi |
-Record HSE_APPEND_LOG_PARAMETER requests from
-ISAPI extensions to the error log |
-| ISAPIAppendLogToQuery | mod_isapi |
+| Header | mod_headers |
+| Configure HTTP response headers |
+| ISAPIAppendLogToErrors | mod_isapi |
Record HSE_APPEND_LOG_PARAMETER requests from
+ISAPI extensions to the error log |
+| ISAPIAppendLogToQuery | mod_isapi |
+Record HSE_APPEND_LOG_PARAMETER requests from
ISAPI extensions to the query field |
-| ISAPIFakeAsync | mod_isapi |
-| Fake asynchronous support for ISAPI callbacks |
-| ISAPILogNotSupported | mod_isapi |
-| Log unsupported feature requests from ISAPI
+ |
| ISAPIFakeAsync | mod_isapi |
+| Fake asynchronous support for ISAPI callbacks |
+| ISAPILogNotSupported | mod_isapi |
+| Log unsupported feature requests from ISAPI
extensions |
-| ISAPIReadAheadBuffer | mod_isapi |
-| Size of the Read Ahead Buffer sent to ISAPI
+ |
| ISAPIReadAheadBuffer | mod_isapi |
+| Size of the Read Ahead Buffer sent to ISAPI
extensions |
-| LanguagePriority | mod_negotiation |
-| The precedence of language variants for cases where
+ |
| LanguagePriority | mod_negotiation |
+| The precedence of language variants for cases where
the client does not express a preference |
-| MultiviewsMatch | mod_mime |
-| The types of files that will be included when searching for
+ |
| MultiviewsMatch | mod_mime |
+| The types of files that will be included when searching for
a matching file with MultiViews |
-| PassEnv | mod_env |
-| Passes environment variables from the shell |
-| QualifyRedirectURL | core |
-| Controls whether the REDIRECT_URL environment variable is
+ |
| PassEnv | mod_env |
+| Passes environment variables from the shell |
+| QualifyRedirectURL | core |
+| Controls whether the REDIRECT_URL environment variable is
fully qualified |
-| Redirect | mod_alias |
-| Sends an external redirect asking the client to fetch
+ |
| Redirect | mod_alias |
+| Sends an external redirect asking the client to fetch
a different URL |
-| RedirectMatch | mod_alias |
-| Sends an external redirect based on a regular expression match
+ |
| RedirectMatch | mod_alias |
+| Sends an external redirect based on a regular expression match
of the current URL |
-| RedirectPermanent | mod_alias |
-| Sends an external permanent redirect asking the client to fetch
+ |
| RedirectPermanent | mod_alias |
+| Sends an external permanent redirect asking the client to fetch
a different URL |
-| RedirectTemp | mod_alias |
-| Sends an external temporary redirect asking the client to fetch
+ |
| RedirectTemp | mod_alias |
+| Sends an external temporary redirect asking the client to fetch
a different URL |
-| RemoveCharset | mod_mime |
-| Removes any character set associations for a set of file
+ |
| RemoveCharset | mod_mime |
+| Removes any character set associations for a set of file
extensions |
-| RemoveEncoding | mod_mime |
-| Removes any content encoding associations for a set of file
+ |
| RemoveEncoding | mod_mime |
+| Removes any content encoding associations for a set of file
extensions |
-| RemoveHandler | mod_mime |
-| Removes any handler associations for a set of file
+ |
| RemoveHandler | mod_mime |
+| Removes any handler associations for a set of file
extensions |
-| RemoveInputFilter | mod_mime |
-| Removes any input filter associations for a set of file
+ |
| RemoveInputFilter | mod_mime |
+| Removes any input filter associations for a set of file
extensions |
-| RemoveLanguage | mod_mime |
-| Removes any language associations for a set of file
+ |
| RemoveLanguage | mod_mime |
+| Removes any language associations for a set of file
extensions |
-| RemoveOutputFilter | mod_mime |
-| Removes any output filter associations for a set of file
+ |
| RemoveOutputFilter | mod_mime |
+| Removes any output filter associations for a set of file
extensions |
-| RemoveType | mod_mime |
-| Removes any content type associations for a set of file
+ |
| RemoveType | mod_mime |
+| Removes any content type associations for a set of file
extensions |
-| RequestHeader | mod_headers |
-| Configure HTTP request headers |
-| RewriteBase | mod_rewrite |
-| Sets the base URL for per-directory rewrites |
-| RewriteCond | mod_rewrite |
-| Defines a condition under which rewriting will take place
+ |
| RequestHeader | mod_headers |
+| Configure HTTP request headers |
+| RewriteBase | mod_rewrite |
+| Sets the base URL for per-directory rewrites |
+| RewriteCond | mod_rewrite |
+| Defines a condition under which rewriting will take place
|
-| RewriteEngine | mod_rewrite |
-| Enables or disables runtime rewriting engine |
-| RewriteOptions | mod_rewrite |
-| Sets some special options for the rewrite engine |
-| RewriteRule | mod_rewrite |
-| Defines rules for the rewriting engine |
-| ScriptInterpreterSource | core |
-| Technique for locating the interpreter for CGI
+ |
| RewriteEngine | mod_rewrite |
+| Enables or disables runtime rewriting engine |
+| RewriteOptions | mod_rewrite |
+| Sets some special options for the rewrite engine |
+| RewriteRule | mod_rewrite |
+| Defines rules for the rewriting engine |
+| ScriptInterpreterSource | core |
+| Technique for locating the interpreter for CGI
scripts |
-| SetEnv | mod_env |
-| Sets environment variables |
-| SetEnvIf | mod_setenvif |
-| Sets environment variables based on attributes of the request
+ |
| SetEnv | mod_env |
+| Sets environment variables |
+| SetEnvIf | mod_setenvif |
+| Sets environment variables based on attributes of the request
|
-| SetEnvIfExpr | mod_setenvif |
-| Sets environment variables based on an ap_expr expression |
-| SetEnvIfNoCase | mod_setenvif |
-| Sets environment variables based on attributes of the request
+ |
| SetEnvIfExpr | mod_setenvif |
+| Sets environment variables based on an ap_expr expression |
+| SetEnvIfNoCase | mod_setenvif |
+| Sets environment variables based on attributes of the request
without respect to case |
-| SetHandler | core |
-| Forces all matching files to be processed by a
+ |
| SetHandler | core |
+| Forces all matching files to be processed by a
handler |
-| SetInputFilter | core |
-| Sets the filters that will process client requests and POST
+ |
| SetInputFilter | core |
+| Sets the filters that will process client requests and POST
input |
-| SetOutputFilter | core |
-| Sets the filters that will process responses from the
+ |
| SetOutputFilter | core |
+| Sets the filters that will process responses from the
server |
-| Substitute | mod_substitute |
-| Pattern to filter the response content |
-| SubstituteInheritBefore | mod_substitute |
-| Change the merge order of inherited patterns |
-| SubstituteMaxLineLength | mod_substitute |
-| Set the maximum line size |
-| UnsetEnv | mod_env |
-| Removes variables from the environment |
+| Substitute | mod_substitute |
+| Pattern to filter the response content |
+| SubstituteInheritBefore | mod_substitute |
+| Change the merge order of inherited patterns |
+| SubstituteMaxLineLength | mod_substitute |
+| Set the maximum line size |
+| UnsetEnv | mod_env |
+| Removes variables from the environment |