From: Luca Toscano Date: Wed, 16 Aug 2017 13:42:46 +0000 (+0000) Subject: Documentation rebuild X-Git-Tag: 2.5.0-alpha~210 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b15a33253fa96cad170431003738e1b5f5dc4b13;p=apache Documentation rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805196 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en index 835ef5bb0f..76fdf27ae8 100644 --- a/docs/manual/bind.html.en +++ b/docs/manual/bind.html.en @@ -44,7 +44,7 @@

Overview

-
Related ModulesRelated Directives
+
Related ModulesRelated Directives

When httpd starts, it binds to some port and address on @@ -169,18 +169,18 @@ Listen 192.0.2.1:80

The Listen directive does not implement Virtual Hosts - it only tells the main server what addresses and ports to listen on. If no - <VirtualHost> + <VirtualHost> directives are used, the server will behave in the same way for all accepted requests. However, - <VirtualHost> + <VirtualHost> can be used to specify a different behavior for one or more of the addresses or ports. To implement a VirtualHost, the server must first be told to listen to the address and port to be used. Then a - <VirtualHost> section + <VirtualHost> section should be created for the specified address and port to set the behavior of this virtual host. Note that if the - <VirtualHost> + <VirtualHost> is set for an address and port that the server is not listening to, it cannot be accessed.

diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en index 1adab4392d..cb8f444e4a 100644 --- a/docs/manual/configuring.html.en +++ b/docs/manual/configuring.html.en @@ -44,7 +44,7 @@ Server.

Main Configuration Files

-
Related ModulesRelated Directives
+
Related ModulesRelated Directives

Apache HTTP Server is configured by placing directives in plain text configuration files. The main configuration file is usually called @@ -112,8 +112,8 @@ Server.

You can use mod_info's -DDUMP_CONFIG to dump the configuration with all included files and environment variables resolved and all comments and non-matching - <IfDefine> and - <IfModule> sections + <IfDefine> and + <IfModule> sections removed. However, the output does not reflect the merging or overriding that may happen for repeated directives.

top
@@ -121,7 +121,7 @@ Server.

Modules

-
Related ModulesRelated Directives
+
Related ModulesRelated Directives

httpd is a modular server. This implies that only the most basic functionality is included in the core server. Extended @@ -134,7 +134,7 @@ Server.

directive. Otherwise, httpd must be recompiled to add or remove modules. Configuration directives may be included conditional on a - presence of a particular module by enclosing them in an <IfModule> block. However, + presence of a particular module by enclosing them in an <IfModule> block. However, <IfModule> blocks are not required, and in some cases may mask the fact that you're missing an important module.

@@ -148,12 +148,12 @@ Server.

Scope of Directives

-
Related ModulesRelated Directives
+
Related ModulesRelated Directives

Directives placed in the main configuration files apply to the entire server. If you wish to change the configuration for only a part of the server, you can scope your directives by - placing them in <Directory>, <DirectoryMatch>, <Files>, <FilesMatch>, <Location>, and <LocationMatch> + placing them in <Directory>, <DirectoryMatch>, <Files>, <FilesMatch>, <Location>, and <LocationMatch> sections. These sections limit the application of the directives which they enclose to particular filesystem locations or URLs. They can also be nested, allowing for very @@ -162,7 +162,7 @@ Server.

httpd has the capability to serve many different websites simultaneously. This is called Virtual Hosting. Directives can also be scoped by placing them - inside <VirtualHost> + inside <VirtualHost> sections, so that they will only apply to requests for a particular website.

diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en index d99408ea8f..9d0a70ec8d 100644 --- a/docs/manual/content-negotiation.html.en +++ b/docs/manual/content-negotiation.html.en @@ -214,7 +214,7 @@ Negotiation

MultiViews is a per-directory option, meaning it can be set with an Options - directive within a <Directory>, <Location> or <Files> section in + directive within a <Directory>, <Location> or <Files> section in httpd.conf, or (if AllowOverride is properly set) in .htaccess files. Note that Options All does not set MultiViews; you have to ask for it by diff --git a/docs/manual/developer/API.html.en b/docs/manual/developer/API.html.en index 8df5cb78ea..9d15f7a7a5 100644 --- a/docs/manual/developer/API.html.en +++ b/docs/manual/developer/API.html.en @@ -309,7 +309,7 @@ point to per-module configuration structures. Specifically, these hold pointers to the data structures which the module has built to describe the way it has been configured to operate in a given directory (via - .htaccess files or <Directory> sections), for private data it has built in the + .htaccess files or <Directory> sections), for private data it has built in the course of servicing the request (so modules' handlers for one phase can pass `notes' to their handlers for other phases). There is another such configuration vector in the server_rec data structure pointed @@ -911,7 +911,7 @@ void *request_config; /* Notes on *this* request */

filesystem, following the translated pathname, to read any .htaccess files which might be present. The information which is read in then has to be merged with the applicable information - from the server's own config files (either from the <Directory> sections in + from the server's own config files (either from the <Directory> sections in access.conf, or from defaults in srm.conf, which actually behaves for most purposes almost exactly like <Directory />).

@@ -937,7 +937,7 @@ void *request_config; /* Notes on *this* request */

table *encoding_types; /* Added with AddEncoding... */ } mime_dir_config; -

When the server is reading a configuration file, or <Directory> section, which includes +

When the server is reading a configuration file, or <Directory> section, which includes one of the MIME module's commands, it needs to create a mime_dir_config structure, so those commands have something to act on. It does this by invoking the function it finds in the module's diff --git a/docs/manual/developer/request.html.en b/docs/manual/developer/request.html.en index c0de1bd487..5f97d7f163 100644 --- a/docs/manual/developer/request.html.en +++ b/docs/manual/developer/request.html.en @@ -99,7 +99,7 @@

Initial URI Location Walk

Every request is subject to an ap_location_walk() call. This ensures that - <Location> sections + <Location> sections are consistently enforced for all requests. If the request is an internal redirect or a sub-request, it may borrow some or all of the processing from the previous or parent request's ap_location_walk, so this step @@ -122,11 +122,11 @@

After the file or correct URI was determined, the appropriate per-dir configurations are merged together. For example, mod_proxy compares and merges the appropriate - <Proxy> sections. + <Proxy> sections. If the URI is nothing more than a local (non-proxy) TRACE request, the core handles the request and returns DONE. If no module answers this hook with OK or DONE, - the core will run the request filename against the <Directory> and <Files> sections. If the request + the core will run the request filename against the <Directory> and <Files> sections. If the request 'filename' isn't an absolute, legal filename, a note is set for later termination.

@@ -135,7 +135,7 @@

Every request is hardened by a second ap_location_walk() call. This reassures that a translated request is still subjected to the configured - <Location> sections. + <Location> sections. The request again borrows some or all of the processing from its previous location_walk above, so this step is almost always very efficient unless the translated URI mapped to a substantially different diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en index 36921a2f89..3ecc707dc8 100644 --- a/docs/manual/expr.html.en +++ b/docs/manual/expr.html.en @@ -46,7 +46,7 @@

  • Other
  • Comparison with SSLRequire
  • Version History
    • -

    See also

    +

    See also

    top

    Grammar in Backus-Naur Form notation

    diff --git a/docs/manual/getting-started.html.en b/docs/manual/getting-started.html.en index a9761363d3..3db9db2258 100644 --- a/docs/manual/getting-started.html.en +++ b/docs/manual/getting-started.html.en @@ -136,9 +136,9 @@ arguments that set its value.

    The question of "Where should I put that directive?" is generally answered by considering where you want a directive to be effective. If it is a global setting, it should appear -in the configuration file, outside of any <Directory>, <Location>, <VirtualHost>, or other section. If it is to +in the configuration file, outside of any <Directory>, <Location>, <VirtualHost>, or other section. If it is to apply only to a particular directory, then it should go inside a -<Directory> section referring to +<Directory> section referring to that directory, and so on. See the Configuration Sections document for further discussion of these sections.

    diff --git a/docs/manual/howto/access.html.en b/docs/manual/howto/access.html.en index 4efacc52a0..00fa93161b 100644 --- a/docs/manual/howto/access.html.en +++ b/docs/manual/howto/access.html.en @@ -128,7 +128,7 @@ Require not host gov

    Access control by arbitrary variables

    -

    Using the <If>, +

    Using the <If>, you can allow or deny access based on arbitrary environment variables or request header values. For example, to deny access based on user-agent (the browser type) you might do the @@ -178,7 +178,7 @@ RewriteRule "^/fridge" "-" [F] to check. You can also redirect, or otherwise rewrite these requests, if that approach is preferred.

    -

    The <If> directive, +

    The <If> directive, added in 2.4, replaces many things that mod_rewrite has traditionally been used to do, and you should probably look there first before resorting to mod_rewrite.

    diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en index 1deee65c4f..e34bc5bddd 100644 --- a/docs/manual/howto/auth.html.en +++ b/docs/manual/howto/auth.html.en @@ -131,7 +131,7 @@ module from each group.

    The Prerequisites

    The directives discussed in this article will need to go either in your main server configuration file (typically in a - <Directory> section), or + <Directory> section), or in per-directory configuration files (.htaccess files).

    If you plan to use .htaccess files, you will @@ -437,9 +437,9 @@ Require group GroupName

    To take authorization a little further, authorization container directives such as - <RequireAll> + <RequireAll> and - <RequireAny> + <RequireAny> allow logic to be applied so that the order in which authorization is handled can be completely controlled through the configuration. See Authorization @@ -471,9 +471,9 @@ Require group GroupName

    With the introduction of authorization container directives such as - <RequireAll> + <RequireAll> and - <RequireAny>, + <RequireAny>, the configuration also has control over when the authorization methods are called and what criteria determines when access is granted. See @@ -484,7 +484,7 @@ Require group GroupName

    By default all Require directives are handled as though contained within a - <RequireAny> + <RequireAny> container directive. In other words, if any of the specified authorization methods succeed, then authorization is granted.

    @@ -555,8 +555,8 @@ Require group GroupName </RequireAll> -

    Using <RequireAll> - with multiple <Require> directives, each negated with not, +

    Using <RequireAll> + with multiple <Require> directives, each negated with not, will only allow access, if all of negated conditions are true. In other words, access will be blocked, if any of the negated conditions fails.

    @@ -601,7 +601,7 @@ Require group GroupName

    You should also read the documentation for mod_auth_basic and mod_authz_host which contain some more information about how this all works. The - directive <AuthnProviderAlias> can also help + directive <AuthnProviderAlias> can also help in simplifying certain authentication configurations.

    The various ciphers supported by Apache for authentication data are diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en index 3a4434fe71..8d171f0012 100644 --- a/docs/manual/howto/htaccess.html.en +++ b/docs/manual/howto/htaccess.html.en @@ -134,7 +134,7 @@ changes on a per-directory basis.

    However, in general, use of .htaccess files should be avoided when possible. Any configuration that you would consider putting in a .htaccess file, can just as effectively be - made in a <Directory> section in your main server + made in a <Directory> section in your main server configuration file.

    There are two main reasons to avoid the use of @@ -260,7 +260,7 @@ changes on a per-directory basis.

    configuration files

    As discussed in the documentation on Configuration Sections, - .htaccess files can override the <Directory> sections for + .htaccess files can override the <Directory> sections for the corresponding directory, but will be overridden by other types of configuration sections from the main configuration files. This fact can be used to enforce certain configurations, even in the @@ -289,7 +289,7 @@ changes on a per-directory basis.

    common misconception that you are required to use .htaccess files in order to implement password authentication. This is not the case. Putting authentication directives - in a <Directory> + in a <Directory> section, in your main server configuration file, is the preferred way to implement this, and .htaccess files should be used only if you don't have access to the main server configuration file. See above for a discussion of when you should and should diff --git a/docs/manual/howto/public_html.html.en b/docs/manual/howto/public_html.html.en index a65fb3abbf..a223153212 100644 --- a/docs/manual/howto/public_html.html.en +++ b/docs/manual/howto/public_html.html.en @@ -42,7 +42,7 @@

    in the default config file conf/httpd.conf, and adapting the httpd-userdir.conf file as necessary, or by including the appropriate directives in a - <Directory> block + <Directory> block within the main config file.

    • Per-user web directories
      • @@ -153,7 +153,7 @@ UserDir enabled rbowen krietz

      In order to give each user their own cgi-bin directory, you can use - a <Directory> + a <Directory> directive to make a particular subdirectory of a user's home directory cgi-enabled.

      diff --git a/docs/manual/howto/reverse_proxy.html.en b/docs/manual/howto/reverse_proxy.html.en index 692e63f605..ad0fc2a286 100644 --- a/docs/manual/howto/reverse_proxy.html.en +++ b/docs/manual/howto/reverse_proxy.html.en @@ -116,7 +116,7 @@ ProxyPassReverse "/images" "http://www.example.com/" requests and for the reverse proxy to load balance and failover among them. This group is sometimes called a cluster but Apache httpd's term is a balancer. One defines a balancer by leveraging the - <Proxy> and + <Proxy> and BalancerMember directives as shown:

      diff --git a/docs/manual/logs.html.en b/docs/manual/logs.html.en index cf017eb509..dff993b986 100644 --- a/docs/manual/logs.html.en +++ b/docs/manual/logs.html.en @@ -597,7 +597,7 @@ CustomLog "|$/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" commo hosts, there are several options for dealing with log files. First, it is possible to use logs exactly as in a single-host server. Simply by placing the logging directives - outside the <VirtualHost> sections in the + outside the <VirtualHost> sections in the main server context, it is possible to log all requests in the same access log and error log. This technique does not allow for easy collection of statistics on individual virtual @@ -606,7 +606,7 @@ CustomLog "|$/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" commo

      If CustomLog or ErrorLog directives are placed inside a - <VirtualHost> + <VirtualHost> section, all requests or errors for that virtual host will be logged only to the specified file. Any virtual host which does not have logging directives will still have its requests sent diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml index ed1068e2d7..839cccedcc 100644 --- a/docs/manual/mod/allmodules.xml +++ b/docs/manual/mod/allmodules.xml @@ -76,6 +76,7 @@ mod_logio.xml mod_lua.xml mod_macro.xml + mod_md.xml mod_mime.xml mod_mime_magic.xml mod_negotiation.xml diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de index 38a0739c41..1d65309bed 100644 --- a/docs/manual/mod/allmodules.xml.de +++ b/docs/manual/mod/allmodules.xml.de @@ -76,6 +76,7 @@ mod_logio.xml mod_lua.xml mod_macro.xml + mod_md.xml mod_mime.xml mod_mime_magic.xml mod_negotiation.xml diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es index 7339ddf869..ba56a567d1 100644 --- a/docs/manual/mod/allmodules.xml.es +++ b/docs/manual/mod/allmodules.xml.es @@ -76,6 +76,7 @@ mod_logio.xml mod_lua.xml mod_macro.xml + mod_md.xml mod_mime.xml mod_mime_magic.xml mod_negotiation.xml diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr index 4e900ce7ed..2b6630a67d 100644 --- a/docs/manual/mod/allmodules.xml.fr +++ b/docs/manual/mod/allmodules.xml.fr @@ -76,6 +76,7 @@ mod_logio.xml.fr mod_lua.xml.fr mod_macro.xml.fr + mod_md.xml mod_mime.xml.fr mod_mime_magic.xml.fr mod_negotiation.xml.fr diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja index b6abff8809..2de9d80e69 100644 --- a/docs/manual/mod/allmodules.xml.ja +++ b/docs/manual/mod/allmodules.xml.ja @@ -76,6 +76,7 @@ mod_logio.xml.ja mod_lua.xml mod_macro.xml + mod_md.xml mod_mime.xml.ja mod_mime_magic.xml mod_negotiation.xml.ja diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko index 5b243a67d7..59db6462fc 100644 --- a/docs/manual/mod/allmodules.xml.ko +++ b/docs/manual/mod/allmodules.xml.ko @@ -76,6 +76,7 @@ mod_logio.xml.ko mod_lua.xml mod_macro.xml + mod_md.xml mod_mime.xml mod_mime_magic.xml mod_negotiation.xml diff --git a/docs/manual/mod/allmodules.xml.tr b/docs/manual/mod/allmodules.xml.tr index 7272e8d5e8..d6dcde1b5a 100644 --- a/docs/manual/mod/allmodules.xml.tr +++ b/docs/manual/mod/allmodules.xml.tr @@ -76,6 +76,7 @@ mod_logio.xml.tr mod_lua.xml mod_macro.xml + mod_md.xml mod_mime.xml mod_mime_magic.xml mod_negotiation.xml diff --git a/docs/manual/mod/allmodules.xml.zh-cn b/docs/manual/mod/allmodules.xml.zh-cn index ed1068e2d7..839cccedcc 100644 --- a/docs/manual/mod/allmodules.xml.zh-cn +++ b/docs/manual/mod/allmodules.xml.zh-cn @@ -76,6 +76,7 @@ mod_logio.xml mod_lua.xml mod_macro.xml + mod_md.xml mod_mime.xml mod_mime_magic.xml mod_negotiation.xml diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index abd62796b1..f60b805c27 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -54,11 +54,11 @@ available

    • DefaultRuntimeDir
    • DefaultType
    • Define
      • -
    • <Directory>
      • -
    • <DirectoryMatch>
      • +
    • <Directory>
      • +
    • <DirectoryMatch>
    • DocumentRoot
      • -
    • <Else>
      • -
    • <ElseIf>
      • +
    • <Else>
      • +
    • <ElseIf>
    • EnableMMAP
    • EnableSendfile
    • Error
      • @@ -67,32 +67,32 @@ available
    • ErrorLogFormat
    • ExtendedStatus
    • FileETag
      • -
    • <Files>
      • -
    • <FilesMatch>
      • +
    • <Files>
      • +
    • <FilesMatch>
    • ForceType
    • GprofDir
    • HostnameLookups
    • HttpProtocolOptions
      • -
    • <If>
      • -
    • <IfDefine>
      • -
    • <IfDirective>
      • -
    • <IfFile>
      • -
    • <IfModule>
      • -
    • <IfSection>
      • +
    • <If>
      • +
    • <IfDefine>
      • +
    • <IfDirective>
      • +
    • <IfFile>
      • +
    • <IfModule>
      • +
    • <IfSection>
    • Include
    • IncludeOptional
    • KeepAlive
    • KeepAliveTimeout
      • -
    • <Limit>
      • -
    • <LimitExcept>
      • +
    • <Limit>
      • +
    • <LimitExcept>
    • LimitInternalRecursion
    • LimitRequestBody
    • LimitRequestFields
    • LimitRequestFieldSize
    • LimitRequestLine
    • LimitXMLRequestBody
      • -
    • <Location>
      • -
    • <LocationMatch>
      • +
    • <Location>
      • +
    • <LocationMatch>
    • LogLevel
    • LogLevelOverride
    • MaxKeepAliveRequests
      • @@ -128,7 +128,7 @@ available
    • UnDefine
    • UseCanonicalName
    • UseCanonicalPhysicalPort
      • -
    • <VirtualHost>
      • +
    • <VirtualHost>
    • Warning

    Bugfix checklist

    See also

    @@ -436,9 +436,9 @@ NoDecode option available in 2.3.12 and later.

    Only available in <Directory> sections

    AllowOverride is valid only in - <Directory> - sections specified without regular expressions, not in <Location>, <DirectoryMatch> or - <Files> sections. + <Directory> + sections specified without regular expressions, not in <Location>, <DirectoryMatch> or + <Files> sections.

    When this directive is set to None and AllowOverrideList is set to @@ -595,9 +595,9 @@ NoDecode option available in 2.3.12 and later.

    Only available in <Directory> sections

    AllowOverrideList is valid only in - <Directory> - sections specified without regular expressions, not in <Location>, <DirectoryMatch> or - <Files> sections. + <Directory> + sections specified without regular expressions, not in <Location>, <DirectoryMatch> or + <Files> sections.

    When this directive is set to None and AllowOverride is set to None, @@ -867,7 +867,7 @@ which no other media type configuration could be found.

    In its one parameter form, Define is equivalent to passing the -D argument to httpd. It can be used to toggle the use of - <IfDefine> + <IfDefine> sections without needing to alter -D arguments in any startup scripts.

    @@ -898,7 +898,7 @@ DocumentRoot "/var/www/${servername}/htdocs"
    top
    -

    <Directory> Directive

    +

    <Directory> Directive

    @@ -1017,7 +1017,7 @@ named file-system directory, sub-directories, and their contents.

    The directory sections occur in the httpd.conf file. <Directory> directives - cannot nest, and cannot appear in a <Limit> or <LimitExcept> section.

    + cannot nest, and cannot appear in a <Limit> or <LimitExcept> section.

    See also

      @@ -1028,7 +1028,7 @@ named file-system directory, sub-directories, and their contents.
    top
    -

    <DirectoryMatch> Directive

    +

    <DirectoryMatch> Directive

    Description:Enclose a group of directives that apply only to the named file-system directory, sub-directories, and their contents.
    @@ -1041,7 +1041,7 @@ the contents of file-system directories matching a regular expression.

    <DirectoryMatch> and </DirectoryMatch> are used to enclose a group of directives which will apply only to the named directory (and the files within), - the same as <Directory>. + the same as <Directory>. However, it takes as an argument a regular expression. For example:

    @@ -1055,7 +1055,7 @@ the contents of file-system directories matching a regular expression.

    Compatibility

    Prior to 2.3.9, this directive implicitly applied to sub-directories - (like <Directory>) and + (like <Directory>) and could not match the end of line symbol ($). In 2.3.9 and later, only directories that match the expression are affected by the enclosed directives. @@ -1081,7 +1081,7 @@ the contents of file-system directories matching a regular expression.

    See also

    top
    -

    <Else> Directive

    +

    <Else> Directive

    Description:Enclose directives that apply to the contents of file-system directories matching a regular expression.
    @@ -1159,8 +1159,8 @@ satisfied by a request at runtime

    See also

    top
    -

    <ElseIf> Directive

    +

    <ElseIf> Directive

    Description:Contains directives that apply only if the condition of a -previous <If> or -<ElseIf> section is not +previous <If> or +<ElseIf> section is not satisfied by a request at runtime
    Syntax:<Else> ... </Else>
    Context:server config, virtual host, directory, .htaccess
    @@ -1210,8 +1210,8 @@ satisfied
    Description:Contains directives that apply only if a condition is satisfied by a request at runtime while the condition of a previous -<If> or +<If> or <ElseIf> section is not satisfied
    Syntax:<ElseIf expression> ... </ElseIf>
    @@ -1825,17 +1825,17 @@ filenames
    Description:Contains directives that apply to matched filenames

    The <Files> directive limits the scope of the enclosed directives by filename. It is comparable - to the <Directory> - and <Location> + to the <Directory> + and <Location> directives. It should be matched with a </Files> directive. The directives given within this section will be applied to any object with a basename (last component of filename) matching the specified filename. <Files> sections are processed in the order they appear in the - configuration file, after the <Directory> sections and - .htaccess files are read, but before <Location> sections. Note + configuration file, after the <Directory> sections and + .htaccess files are read, but before <Location> sections. Note that <Files> can be nested - inside <Directory> sections to restrict the + inside <Directory> sections to restrict the portion of the filesystem they apply to.

    The filename argument should include a filename, or @@ -1858,10 +1858,10 @@ filenames </Files> -

    would match most common Internet graphics formats. <FilesMatch> is preferred, +

    would match most common Internet graphics formats. <FilesMatch> is preferred, however.

    -

    Note that unlike <Directory> and <Location> sections, <Files> sections can be used inside +

    Note that unlike <Directory> and <Location> sections, <Files> sections can be used inside .htaccess files. This allows users to control access to their own files, at a file-by-file level.

    @@ -1874,7 +1874,7 @@ filenames
    top
    -

    <FilesMatch> Directive

    +

    <FilesMatch> Directive

    @@ -1886,7 +1886,7 @@ filenames
    Description:Contains directives that apply to regular-expression matched filenames

    The <FilesMatch> directive limits the scope of the enclosed directives by filename, just as the - <Files> directive + <Files> directive does. However, it accepts a regular expression. For example:

    @@ -1932,9 +1932,9 @@ media type in the HTTP Content-Type header field Module:core

    When placed into an .htaccess file or a - <Directory>, or - <Location> or - <Files> + <Directory>, or + <Location> or + <Files> section, this directive forces all matching files to be served with the content type identification given by media-type. For example, if you had a directory full of @@ -2177,7 +2177,7 @@ media type in the HTTP Content-Type header field

    top
    -

    <If> Directive

    +

    <If> Directive

    @@ -2226,8 +2226,8 @@ satisfied by a request at runtime
    top
    -

    <IfDefine> Directive

    +

    <IfDefine> Directive

    Description:Contains directives that apply only if a condition is satisfied by a request at runtime
    @@ -2295,7 +2295,7 @@ if a test is true at startup
    top
    -

    <IfDirective> Directive

    +

    <IfDirective> Directive

    Description:Encloses directives that will be processed only if a test is true at startup
    @@ -2335,11 +2335,11 @@ presence or absence of a specific directive

    See also

    top
    -

    <IfFile> Directive

    +

    <IfFile> Directive

    Description:Encloses directives that are processed conditional on the presence or absence of a specific directive
    @@ -2376,7 +2376,7 @@ if file exists at startup
    top
    -

    <IfModule> Directive

    +

    <IfModule> Directive

    Description:Encloses directives that will be processed only if file exists at startup
    @@ -2427,7 +2427,7 @@ presence or absence of a specific module
    top
    -

    <IfSection> Directive

    +

    <IfSection> Directive

    Description:Encloses directives that are processed conditional on the presence or absence of a specific module
    @@ -2482,7 +2482,7 @@ presence or absence of a specific section directive

    See also

    top
    @@ -2642,7 +2642,7 @@ requests on a persistent connection
    top
    -

    <Limit> Directive

    +

    <Limit> Directive

    Description:Encloses directives that are processed conditional on the presence or absence of a specific section directive
    @@ -2682,15 +2682,15 @@ methods restrict HEAD requests. The TRACE method cannot be limited (see TraceEnable).

    -
    A <LimitExcept> section should always be +
    A <LimitExcept> section should always be used in preference to a <Limit> - section when restricting access, since a <LimitExcept> section provides protection + section when restricting access, since a <LimitExcept> section provides protection against arbitrary methods.

    The <Limit> and - <LimitExcept> + <LimitExcept> directives may be nested. In this case, each successive level of - <Limit> or <LimitExcept> directives must + <Limit> or <LimitExcept> directives must further restrict the set of methods to which access controls apply.

    When using @@ -2716,7 +2716,7 @@ methods
    top
    -

    <LimitExcept> Directive

    +

    <LimitExcept> Directive

    Description:Restrict enclosed access controls to only certain HTTP methods
    @@ -2731,9 +2731,9 @@ except the named ones</LimitExcept> are used to enclose a group of access control directives which will then apply to any HTTP access method not listed in the arguments; - i.e., it is the opposite of a <Limit> section and can be used to control + i.e., it is the opposite of a <Limit> section and can be used to control both standard and nonstandard/unrecognized methods. See the - documentation for <Limit> for more details.

    + documentation for <Limit> for more details.

    For example:

    @@ -2980,7 +2980,7 @@ from the client
    top
    -

    <Location> Directive

    +

    <Location> Directive

    Description:Restrict access controls to all HTTP methods except the named ones
    @@ -2992,11 +2992,11 @@ URLs
    Description:Applies the enclosed directives only to matching URLs

    The <Location> directive limits the scope of the enclosed directives by URL. It is similar to the - <Directory> + <Directory> directive, and starts a subsection which is terminated with a </Location> directive. <Location> sections are processed in the - order they appear in the configuration file, after the <Directory> sections and - .htaccess files are read, and after the <Files> sections.

    + order they appear in the configuration file, after the <Directory> sections and + .htaccess files are read, and after the <Files> sections.

    <Location> sections operate completely outside the filesystem. This has several consequences. @@ -3041,7 +3041,7 @@ URLs

    Use <Location> to apply directives to content that lives outside the filesystem. For - content that lives in the filesystem, use <Directory> and <Files>. An exception is + content that lives in the filesystem, use <Directory> and <Files>. An exception is <Location "/">, which is an easy way to apply a configuration to the entire server.

    @@ -3067,7 +3067,7 @@ URLs

    would match URLs that contained the substring /extra/data - or /special/data. The directive <LocationMatch> behaves + or /special/data. The directive <LocationMatch> behaves identical to the regex version of <Location>, and is preferred, for the simple reason that ~ is hard to distinguish from - in many fonts.

    @@ -3090,7 +3090,7 @@ URLs where multiple adjacent slashes are frequently collapsed to a single slash (i.e., /home///foo is the same as /home/foo). In URL-space this is not necessarily true. - The <LocationMatch> + The <LocationMatch> directive and the regex version of <Location> require you to explicitly specify multiple slashes if that is your intention.

    @@ -3112,7 +3112,7 @@ URLs
    top
    -

    <LocationMatch> Directive

    +

    <LocationMatch> Directive

    @@ -3124,7 +3124,7 @@ matching URLs
    Description:Applies the enclosed directives only to regular-expression matching URLs

    The <LocationMatch> directive limits the scope of the enclosed directives by URL, in an identical manner - to <Location>. However, + to <Location>. However, it takes a regular expression as an argument instead of a simple string. For example:

    @@ -3397,7 +3397,7 @@ LogLevel info ssl_module:warn processing. Therefore, LogLevelOverride allows to change the log level for things like the SSL handshake which happen before a LogLevel directive in an - <If> container would + <If> container would be evaluated.

    LogLevelOverride accepts either a single @@ -3858,10 +3858,10 @@ directory the default setting.

    Even though the server follows the symlink it does not - change the pathname used to match against <Directory> sections.

    + change the pathname used to match against <Directory> sections.

    The FollowSymLinks and - SymLinksIfOwnerMatch Options work only in <Directory> sections or + SymLinksIfOwnerMatch Options work only in <Directory> sections or .htaccess files.

    Omitting this option should not be considered a security restriction, @@ -3901,7 +3901,7 @@ directory "MultiViews" are allowed using mod_negotiation.

    Note

    This option gets ignored if set - anywhere other than <Directory>, as mod_negotiation + anywhere other than <Directory>, as mod_negotiation needs real resources to compare against and evaluate from.

    @@ -3913,7 +3913,7 @@ directory

    Note

    The FollowSymLinks and - SymLinksIfOwnerMatch Options work only in <Directory> sections or + SymLinksIfOwnerMatch Options work only in <Directory> sections or .htaccess files.

    This option should not be considered a security restriction, @@ -4388,11 +4388,11 @@ to name-virtual hosts </VirtualHost> -

    Name-based virtual hosts for the best-matching set of <virtualhost>s are processed +

    Name-based virtual hosts for the best-matching set of <virtualhost>s are processed in the order they appear in the configuration. The first matching ServerName or ServerAlias is used, with no different precedence for wildcards (nor for ServerName vs. ServerAlias).

    -

    The complete list of names in the <VirtualHost> +

    The complete list of names in the <VirtualHost> directive are treated just like a (non wildcard) ServerAlias.

    @@ -4453,7 +4453,7 @@ itself

    If you are using name-based virtual hosts, the ServerName inside a - <VirtualHost> + <VirtualHost> section specifies what hostname must appear in the request's Host: header to match this virtual host.

    @@ -4666,8 +4666,8 @@ handler Compatibility:2.5 and later

    When placed into an .htaccess file or a - <Directory> or - <Location> + <Directory> or + <Location> section, this directive forces all matching files to be parsed through the handler given by handler-name. For example, if you had a directory you @@ -4868,7 +4868,7 @@ certain events before failing a request

    Undoes the effect of a Define or of passing a -D argument to httpd.

    -

    This directive can be used to toggle the use of <IfDefine> sections without needing to alter +

    This directive can be used to toggle the use of <IfDefine> sections without needing to alter -D arguments in any startup scripts.

    While this directive is supported in virtual host context, the changes it makes are visible to any later configuration @@ -5000,7 +5000,7 @@ port

    top
    -

    <VirtualHost> Directive

    +

    <VirtualHost> Directive

    diff --git a/docs/manual/mod/directive-dict.html.en b/docs/manual/mod/directive-dict.html.en index c2feba1216..7a91a84bf8 100644 --- a/docs/manual/mod/directive-dict.html.en +++ b/docs/manual/mod/directive-dict.html.en @@ -175,22 +175,22 @@
    This means that the directive may be used in the server configuration files (e.g., httpd.conf), but not within any - <VirtualHost> - or <Directory> + <VirtualHost> + or <Directory> containers. It is not allowed in .htaccess files at all.
    virtual host
    This context means that the directive may appear inside - <VirtualHost> + <VirtualHost> containers in the server configuration files.
    directory
    A directive marked as being valid in this context may be - used inside <Directory>, <Location>, <Files>, <If>, and <Proxy> containers + used inside <Directory>, <Location>, <Files>, <If>, and <Proxy> containers in the server configuration files, subject to the restrictions outlined in Configuration Sections.
    @@ -215,8 +215,8 @@ words, a directive that is marked as being valid in "server config, .htaccess" can be used in the httpd.conf file and in .htaccess - files, but not within any <Directory> or - <VirtualHost> + files, but not within any <Directory> or + <VirtualHost> containers.

    top
    diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index 542a830a2f..a7187ce233 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -436,6 +436,8 @@
  • <Macro>
  • MacroIgnoreBadNesting
  • MacroIgnoreEmptyArgs
    • +
  • ManagedDomain
    • +
  • <ManagedDomain>
  • MaxConnectionsPerChild
  • MaxKeepAliveRequests
  • MaxMemFree
    • @@ -446,6 +448,15 @@
  • MaxSpareServers
  • MaxSpareThreads
  • MaxThreads
    • +
  • MDCAChallenges
    • +
  • MDCertificateAgreement
    • +
  • MDCertificateAuthority
    • +
  • MDCertificateProtocol
    • +
  • MDDriveMode
    • +
  • MDMember
    • +
  • MDPortMap
    • +
  • MDRenewWindow
    • +
  • MDStoreDir
  • MemcacheConnTTL
  • MergeTrailers
  • MetaDir
    • @@ -674,6 +685,8 @@
  • SSLOpenSSLConfCmd
  • SSLOptions
  • SSLPassPhraseDialog
    • +
  • <SSLPolicy>
    • +
  • SSLPolicyUse
  • SSLProtocol
  • SSLProxyCACertificateFile
  • SSLProxyCACertificatePath
    • @@ -688,6 +701,7 @@
  • SSLProxyMachineCertificateChainFile
  • SSLProxyMachineCertificateFile
  • SSLProxyMachineCertificatePath
    • +
  • SSLProxyPolicy
  • SSLProxyProtocol
  • SSLProxyVerify
  • SSLProxyVerifyDepth
    • diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en index 4bb3a72956..5c518a8aca 100644 --- a/docs/manual/mod/index.html.en +++ b/docs/manual/mod/index.html.en @@ -169,6 +169,9 @@ by other LDAP modules
    mod_lua
    Provides Lua hooks into various portions of the httpd request processing
    mod_macro
    Provides macros within apache httpd runtime configuration files
    +
    mod_md
    Managing domains across virtual hosts, certificate provisioning + via the ACME protocol +
    mod_mime
    Associates the requested filename's extensions with the file's behavior (handlers and filters) and content (mime-type, language, character set and diff --git a/docs/manual/mod/mod_access_compat.html.en b/docs/manual/mod/mod_access_compat.html.en index 090e27fc43..1fb6350ec9 100644 --- a/docs/manual/mod/mod_access_compat.html.en +++ b/docs/manual/mod/mod_access_compat.html.en @@ -43,9 +43,9 @@ have been deprecated by the new authz refactoring. Please see

    Summary

    The directives provided by mod_access_compat are - used in <Directory>, - <Files>, and - <Location> sections + used in <Directory>, + <Files>, and + <Location> sections as well as .htaccess files to control access to particular parts of the server. Access can be controlled based on the client hostname, IP address, or @@ -78,7 +78,7 @@ have been deprecated by the new authz refactoring. Please see POST, etc). This is the desired behavior in most cases. However, it is possible to restrict some methods, while leaving other methods unrestricted, by enclosing the directives - in a <Limit> section.

    + in a <Limit> section.

    Merging of configuration sections

    When any directive provided by this module is used in a new @@ -381,9 +381,9 @@ Deny from foo.example.org directive processing only within each phase of the server's configuration processing. This implies, for example, that an Allow or Deny directive occurring in a - <Location> section will + <Location> section will always be evaluated after an Allow or Deny directive occurring in a - <Directory> section or + <Directory> section or .htaccess file, regardless of the setting of the Order directive. For details on the merging of configuration sections, see the documentation on How Directory, Location and Files sections @@ -451,7 +451,7 @@ Satisfy Any for the /var/www/private/public directory.

    Since version 2.0.51 Satisfy directives can - be restricted to particular methods by <Limit> and <LimitExcept> sections.

    + be restricted to particular methods by <Limit> and <LimitExcept> sections.

    Merging of configuration sections

    When any directive provided by this module is used in a new diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en index 3bbf0b28df..27074da7e0 100644 --- a/docs/manual/mod/mod_alias.html.en +++ b/docs/manual/mod/mod_alias.html.en @@ -57,8 +57,8 @@

    When the Alias, ScriptAlias and Redirect directives are used - within a <Location> - or <LocationMatch> + within a <Location> + or <LocationMatch> section, expression syntax can be used to manipulate the destination path or URL.

    @@ -95,7 +95,7 @@

    Aliases and Redirects occurring in different contexts are processed like other directives according to standard merging rules. But when multiple Aliases or Redirects occur in the same context (for example, in the - same <VirtualHost> + same <VirtualHost> section) they are processed in a particular order.

    First, all Redirects are processed before Aliases are processed, @@ -121,8 +121,8 @@ Alias "/foo" "/gaq"

    When the Alias, ScriptAlias and Redirect directives are used - within a <Location> - or <LocationMatch> + within a <Location> + or <LocationMatch> section, these directives will take precedence over any globally defined Alias, ScriptAlias and @@ -169,11 +169,11 @@ Alias "/foo" "/gaq" URL-path then you must also omit it from the file-path.

    -

    Note that you may need to specify additional <Directory> sections which +

    Note that you may need to specify additional <Directory> sections which cover the destination of aliases. Aliasing occurs before - <Directory> sections + <Directory> sections are checked, so only the destination of aliases are affected. - (Note however <Location> + (Note however <Location> sections are run through once before aliases are performed, so they will apply.)

    @@ -191,8 +191,8 @@ Alias "/foo" "/gaq" matches any number of slashes in the requested URL-path.

    If the Alias directive is used within a - <Location> - or <LocationMatch> + <Location> + or <LocationMatch> section the URL-path is omitted, and the file-path is interpreted using expression syntax.
    This syntax is available in Apache 2.4.19 and later.

    @@ -393,8 +393,8 @@ Redirect 303 "/three" "http://example.com/other"

    If the Redirect directive is used within a - <Location> - or <LocationMatch> + <Location> + or <LocationMatch> section with the URL-path omitted, then the URL parameter will be interpreted using expression syntax.
    This syntax is available in Apache 2.4.19 and later.

    @@ -530,7 +530,7 @@ target as a CGI script URL and designating CGI scripts at the same time. If you do choose to place your CGI scripts in a directory already accessible from the web, do not use - ScriptAlias. Instead, use <Directory>, SetHandler, and Options as in: + ScriptAlias. Instead, use <Directory>, SetHandler, and Options as in: 
    <Directory "/usr/local/apache2/htdocs/cgi-bin">
     SetHandler cgi-script
     Options ExecCGI
@@ -543,8 +543,8 @@ target as a CGI script
     Directory section.

    If the ScriptAlias directive is used within - a <Location> - or <LocationMatch> + a <Location> + or <LocationMatch> section with the URL-path omitted, then the URL parameter will be interpreted using expression syntax.
    This syntax is available in Apache 2.4.19 and later.

    diff --git a/docs/manual/mod/mod_authn_core.html.en b/docs/manual/mod/mod_authn_core.html.en index 5e2492822a..d61d40898a 100644 --- a/docs/manual/mod/mod_authn_core.html.en +++ b/docs/manual/mod/mod_authn_core.html.en @@ -47,7 +47,7 @@

    Directives

    Bugfix checklist

    See also

    @@ -168,7 +168,7 @@ authentication
    top
    -

    <AuthnProviderAlias> Directive

    +

    <AuthnProviderAlias> Directive

    Description:Contains directives that apply only to a specific hostname or IP address
    predecessor (according to the overall order of configuration sections) which also contains authorization logic as if the two sections were jointly contained within a - <RequireAll> or - <RequireAny> + <RequireAll> or + <RequireAny> directive, respectively.

    The setting of AuthMerging is not @@ -310,7 +310,7 @@ sections. groups alpha or beta may access /www/docs/ab. However, the default Off setting of AuthMerging applies to the - <Directory> + <Directory> configuration section for /www/docs/ab/gamma, so that section's authorization directives override those of the preceding sections. Thus only users belong to the group @@ -336,7 +336,7 @@ sections.
    top
    -

    <AuthzProviderAlias> Directive

    +

    <AuthzProviderAlias> Directive

    Description:Enclose a group of directives that represent an extension of a base authentication provider and referenced by diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en index 2c02e0f087..d140beb9f1 100644 --- a/docs/manual/mod/mod_authnz_ldap.html.en +++ b/docs/manual/mod/mod_authnz_ldap.html.en @@ -806,7 +806,7 @@ Require group "mygroupfile" the extent of a user's access to the FrontPage web.
  • The directives must be put in the .htaccess - files. Attempting to put them inside <Location> or <Directory> directives won't work. This + files. Attempting to put them inside <Location> or <Directory> directives won't work. This is because mod_authnz_ldap has to be able to grab the AuthGroupFile directive that is found in FrontPage .htaccess diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en index 8c67657348..fa4557bdf0 100644 --- a/docs/manual/mod/mod_authz_core.html.en +++ b/docs/manual/mod/mod_authz_core.html.en @@ -54,12 +54,12 @@

    Directives

    Bugfix checklist

    See also

    • MultiviewsMatch is not allowed in a - <Location> or <LocationMatch> section.

    + <Location> or <LocationMatch> section.

    See also

    diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index 1b8159d72e..c3868f4e2d 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -106,14 +106,14 @@
  • BalancerMember
  • BalancerPersist
  • NoProxy
    • -
  • <Proxy>
    • +
  • <Proxy>
  • ProxyAddHeaders
  • ProxyBadHeader
  • ProxyBlock
  • ProxyDomain
  • ProxyErrorOverride
  • ProxyIOBufferSize
    • -
  • <ProxyMatch>
    • +
  • <ProxyMatch>
  • ProxyMaxForwards
  • ProxyPass
  • ProxyPassInherit
    • @@ -357,7 +357,7 @@ ProxyPass "/examples" "http://backend.example.com/examples" timeout=10
    top

    Controlling Access to Your Proxy

    -

    You can control who can access your proxy via the <Proxy> control block as in +

    You can control who can access your proxy via the <Proxy> control block as in the following example:

    <Proxy *>
@@ -550,8 +550,8 @@ ProxyPass "/examples" "http://backend.example.com/examples" timeout=10
    directive and can take any of the key value pair parameters available to ProxyPass directives.

    One additional parameter is available only to BalancerMember directives: - loadfactor. This is the member load factor - a number between 1 - (default) and 100, which defines the weighted load to be applied to the + loadfactor. This is the member load factor - a floating pount number between 1.0 + (default) and 100.0, which defines the weighted load to be applied to the member in question.

    The balancerurl is only needed when not within a <Proxy balancer://...> @@ -706,7 +706,7 @@ NoProxy .example.com 192.168.112.0/21

    top
    -

    <Proxy> Directive

    +

    <Proxy> Directive

    Description:Enclose a group of directives that represent an extension of a base authorization provider and referenced by the specified @@ -469,7 +469,7 @@ Require group admin desired. If you wish to apply access controls only to specific methods, while leaving other methods unprotected, then place the Require statement into a - <Limit> + <Limit> section.

    The result of the Require directive @@ -496,9 +496,9 @@ Require group admin used in a single configuration section and are not contained in another authorization directive like - <RequireAll>, + <RequireAll>, they are implicitly contained within a - <RequireAny> + <RequireAny> directive. Thus the first one to authorize a user authorizes the entire request, and subsequent Require directives are ignored.

    @@ -524,7 +524,7 @@ Require group admin
    top
    -

    <RequireAll> Directive

    +

    <RequireAll> Directive

    top
    -

    <RequireAny> Directive

    +

    <RequireAny> Directive

    Description:Enclose a group of authorization directives of which none must fail and at least one must succeed for the enclosing directive to @@ -557,7 +557,7 @@ succeed.
    @@ -596,7 +596,7 @@ must succeed for the enclosing directive to succeed.
    top
    -

    <RequireNone> Directive

    +

    <RequireNone> Directive

    Description:Enclose a group of authorization directives of which one must succeed for the enclosing directive to succeed.
    diff --git a/docs/manual/mod/mod_authz_host.html.en b/docs/manual/mod/mod_authz_host.html.en index 9fb3f8428a..5ed7577282 100644 --- a/docs/manual/mod/mod_authz_host.html.en +++ b/docs/manual/mod/mod_authz_host.html.en @@ -40,9 +40,9 @@ address)

    The authorization providers implemented by mod_authz_host are registered using the Require directive. The directive can be referenced within a - <Directory>, - <Files>, - or <Location> section + <Directory>, + <Files>, + or <Location> section as well as .htaccess files to control access to particular parts of the server. Access can be controlled based on the client hostname or IP address.

    @@ -52,7 +52,7 @@ address)POST, etc). This is the desired behavior in most cases. However, it is possible to restrict some methods, while leaving other methods unrestricted, by enclosing the directives - in a <Limit> section.

    + in a <Limit> section.

    Topics

      diff --git a/docs/manual/mod/mod_autoindex.html.en b/docs/manual/mod/mod_autoindex.html.en index 10608671d5..0c405742f9 100644 --- a/docs/manual/mod/mod_autoindex.html.en +++ b/docs/manual/mod/mod_autoindex.html.en @@ -548,7 +548,7 @@ a directory

      Regular Expressions

      This directive does not currently work in configuration sections - that have regular expression arguments, such as <DirectoryMatch> + that have regular expression arguments, such as <DirectoryMatch>

      diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en index 34f450ccd2..12ac013ea8 100644 --- a/docs/manual/mod/mod_cache.html.en +++ b/docs/manual/mod/mod_cache.html.en @@ -389,8 +389,8 @@ CustomLog "invalidated-requests.log" common env=cache-invalidate used by the service and client.

      If the normal handler is used, this directive may appear within a - <Directory> or - <Location> directive. If the quick handler + <Directory> or + <Location> directive. If the quick handler is used, this directive must appear within a server or virtual host context, otherwise the setting will be ignored.

      @@ -534,8 +534,8 @@ CacheEnable disk http://.example.org/

      When the CacheHeader directive is switched on, an X-Cache header will be added to the response with the cache status of this response. If the normal handler is used, this - directive may appear within a <Directory> - or <Location> directive. If the quick + directive may appear within a <Directory> + or <Location> directive. If the quick handler is used, this directive must appear within a server or virtual host context, otherwise the setting will be ignored.

      diff --git a/docs/manual/mod/mod_dav.html.en b/docs/manual/mod/mod_dav.html.en index 789bdeddb2..346f5a5755 100644 --- a/docs/manual/mod/mod_dav.html.en +++ b/docs/manual/mod/mod_dav.html.en @@ -88,7 +88,7 @@ and Group under which Apache is running.

      -

      You may wish to add a <Limit> clause inside the <Location> directive to limit access to +

      You may wish to add a <Limit> clause inside the <Location> directive to limit access to DAV-enabled locations. If you want to set the maximum amount of bytes that a DAV client can send at one request, you have to use the LimitXMLRequestBody diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en index 997edd7a63..ce2c8e4aad 100644 --- a/docs/manual/mod/mod_headers.html.en +++ b/docs/manual/mod/mod_headers.html.en @@ -93,8 +93,8 @@ RequestHeader unset MirrorID configuration is traversed, early headers can only be set in a main server or virtual host context. Early directives cannot depend on a request path, so they will fail in contexts such as - <Directory> or - <Location>.

      + <Directory> or + <Location>.

    top

    Examples

    diff --git a/docs/manual/mod/mod_http2.html.en b/docs/manual/mod/mod_http2.html.en index 7466252663..0e5f6ac1ea 100644 --- a/docs/manual/mod/mod_http2.html.en +++ b/docs/manual/mod/mod_http2.html.en @@ -59,7 +59,7 @@ 
    Protocols h2 http/1.1

    Allows HTTP/2 negotiation (h2) via TLS ALPN in a secure - <VirtualHost>. + <VirtualHost>. HTTP/2 preamble checking (Direct mode, see H2Direct) is disabled by default for h2.

    @@ -67,7 +67,7 @@ 
    Protocols h2 h2c http/1.1

    Allows HTTP/2 negotiation (h2) via TLS ALPN for secure - <VirtualHost>. Allows + <VirtualHost>. Allows HTTP/2 cleartext negotiation (h2c) upgrading from an initial HTTP/1.1 connection or via HTTP/2 preamble checking (Direct mode, see H2Direct).

    @@ -264,7 +264,7 @@

    This directive toggles the usage of the HTTP/2 Direct Mode. This should be used inside a - <VirtualHost> + <VirtualHost> section to enable direct HTTP/2 communication for that virtual host.

    @@ -412,7 +412,7 @@

    This directive toggles the security checks on HTTP/2 connections in TLS mode (https:). This can be used server wide or for specific - <VirtualHost>s. + <VirtualHost>s.

    The security checks require that the TSL protocol is at least @@ -515,7 +515,7 @@

    This directive toggles the maximum number of HTTP/2 server pushes that are remembered per HTTP/2 connection. This can be used inside the - <VirtualHost> + <VirtualHost> section to influence the number for all connections to that virtual host.

    @@ -750,7 +750,7 @@ H2PushPriority text/css interleaved # weight 256 default connection before the TLS write size falls back to small (~1300 bytes) length. This can be used server wide or for specific - <VirtualHost>s. + <VirtualHost>s.

    See H2TLSWarmUpSize for a @@ -789,7 +789,7 @@ H2PushPriority text/css interleaved # weight 256 default TLS records (~1300 bytes) until doing maximum sized writes (16k) on https: HTTP/2 connections. This can be used server wide or for specific - <VirtualHost>s. + <VirtualHost>s.

    Measurements by google performance @@ -836,7 +836,7 @@ H2PushPriority text/css interleaved # weight 256 default This directive toggles the usage of the HTTP/1.1 Upgrade method for switching to HTTP/2. This should be used inside a - <VirtualHost> + <VirtualHost> section to enable Upgrades to HTTP/2 for that virtual host.

    diff --git a/docs/manual/mod/mod_include.html.en b/docs/manual/mod/mod_include.html.en index 5b1488585e..5777e4878a 100644 --- a/docs/manual/mod/mod_include.html.en +++ b/docs/manual/mod/mod_include.html.en @@ -89,7 +89,7 @@ AddOutputFilter INCLUDES .shtml

    The following directive must be given for the directories containing the shtml files (typically in a - <Directory> section, + <Directory> section, but this directive is also valid in .htaccess files if AllowOverride Options is set):

    diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en index d1616be89d..0c8fbf1ad2 100644 --- a/docs/manual/mod/mod_info.html.en +++ b/docs/manual/mod/mod_info.html.en @@ -47,7 +47,7 @@ configuration

    You may wish to use mod_authz_host inside the - <Location> + <Location> directive to limit access to your server configuration information:

    @@ -139,8 +139,8 @@ configuration

    Pre-parsed means that directives like - <IfDefine> and - <IfModule> are + <IfDefine> and + <IfModule> are evaluated and environment variables are replaced. However it does not represent the final state of the configuration. In particular, it does not represent the merging or overriding that may happen @@ -162,18 +162,18 @@ configuration LoadFile.

  • Directives which control the configuration file itself, such as Include, - <IfModule> and - <IfDefine> are not + <IfModule> and + <IfDefine> are not listed, but the included configuration directives are.
  • Comments are not listed. (This may be considered a feature.)
  • Configuration directives from .htaccess files are not listed (since they do not form part of the permanent server configuration).
  • Container directives such as - <Directory> + <Directory> are listed normally, but mod_info cannot figure out the line number for the closing - </Directory>.
    • + </Directory>.
  • Directives generated by third party modules such as mod_perl might not be listed.
    • diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en index 84235b1e86..cf6d7481d2 100644 --- a/docs/manual/mod/mod_lua.html.en +++ b/docs/manual/mod/mod_lua.html.en @@ -1555,7 +1555,7 @@ function silly_mapper(r) end -

    Context

    This directive is not valid in <Directory>, <Files>, or htaccess +

    Context

    This directive is not valid in <Directory>, <Files>, or htaccess context.

    Ordering

    The optional arguments "early" or "late" @@ -1809,10 +1809,10 @@ LuaPackagePath /scripts/lib/?/init.lua This phase is run immediately after the request has been mapped to a virtal host, and can be used to either do some request processing before the other phases kick in, or to serve a request without the need to translate, map to storage et cetera. - As this phase is run before anything else, directives such as <Location> or <Directory> are void in this phase, just as + As this phase is run before anything else, directives such as <Location> or <Directory> are void in this phase, just as URIs have not been properly parsed yet.

    -

    Context

    This directive is not valid in <Directory>, <Files>, or htaccess +

    Context

    This directive is not valid in <Directory>, <Files>, or htaccess context.

    diff --git a/docs/manual/mod/mod_macro.html.en b/docs/manual/mod/mod_macro.html.en index da3b07d5c2..e936c9b49a 100644 --- a/docs/manual/mod/mod_macro.html.en +++ b/docs/manual/mod/mod_macro.html.en @@ -50,7 +50,7 @@
  • Examples

    • Directives

      -
    • <Macro>
      • +
    • <Macro>
    • MacroIgnoreBadNesting
    • MacroIgnoreEmptyArgs
    • UndefMacro
      • @@ -63,11 +63,11 @@

      Usage

      -

      Macros are defined using <Macro> blocks, which contain the portion of +

      Macros are defined using <Macro> blocks, which contain the portion of your configuration that needs to be repeated, complete with variables for those parts that will need to be substituted.

      -

      For example, you might use a macro to define a <VirtualHost> block, in order to define +

      For example, you might use a macro to define a <VirtualHost> block, in order to define multiple similar virtual hosts:

      <Macro VHost $name $domain>
@@ -97,7 +97,7 @@ UndefMacro VHost

      At server startup time, each of these Use invocations would be expanded into a full virtualhost, as -described by the <Macro> +described by the <Macro> definition.

      The UndefMacro directive is @@ -199,7 +199,7 @@ UndefMacro DirGroup

      top
      -

      <Macro> Directive

      +

      <Macro> Directive

    Description:Enclose a group of authorization directives of which none must succeed for the enclosing directive to not fail.
    Description:Define a configuration file macro
    Syntax: diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en index b8d3b920be..1c97c8e7c3 100644 --- a/docs/manual/mod/mod_mime.html.en +++ b/docs/manual/mod/mod_mime.html.en @@ -66,7 +66,7 @@

    While mod_mime associates metadata with filename extensions, the core server provides directives that are used to associate all the files in a - given container (e.g., <Location>, <Directory>, or <Files>) with particular + given container (e.g., <Location>, <Directory>, or <Files>) with particular metadata. These directives include ForceType, SetHandler, SetInputFilter, and SetOutputFilter. The core directives override any filename extension mappings defined in mod_mime.

    @@ -639,7 +639,7 @@ assigned a language-tag by some other means.

    The DefaultLanguage directive tells Apache that all resources in the directive's scope (e.g., all resources - covered by the current <Directory> container) that don't have an explicit language + covered by the current <Directory> container) that don't have an explicit language extension (such as .fr or .de as configured by AddLanguage) should be assigned a Content-Language of language-tag. This allows @@ -748,7 +748,7 @@ a matching file with MultiViews

    @@ -754,7 +754,7 @@ NoProxy .example.com 192.168.112.0/21 <Proxy http://example.com/foo> matches all of http://example.com/foo, http://example.com/foo/bar, and http://example.com/foobar. The matching of the final URL differs - from the behavior of the <Location> section, which for purposes of this note + from the behavior of the <Location> section, which for purposes of this note treats the final path component as if it ended in a slash.

    For more control over the matching, see <ProxyMatch>.

    @@ -762,7 +762,7 @@ NoProxy .example.com 192.168.112.0/21

    See also

    top
    @@ -943,7 +943,7 @@ ProxyDomain ".example.com"
    top
    -

    <ProxyMatch> Directive

    +

    <ProxyMatch> Directive

    Description:Container for directives applied to proxied resources
    Syntax:<Proxy wildcard-url> ...</Proxy>
    @@ -953,7 +953,7 @@ proxied resources
    Description:Container for directives applied to regular-expression-matched proxied resources
    Module:mod_proxy

    The <ProxyMatch> directive is - identical to the <Proxy> directive, except that it matches URLs + identical to the <Proxy> directive, except that it matches URLs using regular expressions.

    From 2.4.8 onwards, named groups and backreferences are captured and @@ -970,7 +970,7 @@ proxied resources

    See also

    top
    @@ -1025,8 +1025,8 @@ through with this section.
    This directive is not supported within - <Directory> and - <Files> containers.
    + <Directory> and + <Files> containers.
    The ProxyRequests directive should usually be set off when using @@ -1046,9 +1046,9 @@ through the [P,NE] option to prevent the '|' character 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 - <LocationMatch> section; +

    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 + <LocationMatch> section; however, ProxyPass does not interpret the regexp as such, so it is necessary to use ProxyPassMatch in this situation instead.

    @@ -1481,7 +1481,7 @@ ProxyPass "/" "balancer://mycluster/" stickysession=JSESSIONID|jsess 
    ProxyPass "/" "balancer://hotcluster/"
 <Proxy balancer://hotcluster>
     BalancerMember ajp://1.2.3.4:8009 loadfactor=1
-    BalancerMember ajp://1.2.3.5:8009 loadfactor=2
+    BalancerMember ajp://1.2.3.5:8009 loadfactor=2.5
     # The server below is on hot standby
     BalancerMember ajp://1.2.3.6:8009 status=+H
     ProxySet lbmethod=bytraffic
@@ -1618,8 +1618,8 @@ ProxyPassReverse  "/mirror/foo/" "https://backend.example.com/"

    The ! directive is useful in situations where you don't want to reverse-proxy a subdirectory.

    -

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

    +

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

    If you require a more flexible reverse-proxy configuration, see the RewriteRule directive with the @@ -1703,13 +1703,13 @@ ProxyPassReverseCookiePath "/" "/mirror/foo/" Note that interpolation is not supported within the scheme portion of a 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 +

    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 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.

    + the section or in a separate <Location> section.

    -

    This directive is not supported in <Directory> or <Files> sections.

    +

    This directive is not supported in <Directory> or <Files> sections.

    top
    diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index 03091edaf5..ee54f3934d 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 abd5c40b7b..74556a0a10 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - + + - + + + +