From: Ken Coar <coar@apache.org>
Date: Wed, 15 Apr 2015 20:16:24 +0000 (+0000)
Subject: Simply remove trailing whitespace.
X-Git-Tag: 2.5.0-alpha~3275
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0566cf0f319e883e584ec02dc95697bce3e38624;p=apache
Simply remove trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673947 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml
index 888ef9387e..33bfd2d1a9 100644
--- a/docs/manual/bind.xml
+++ b/docs/manual/bind.xml
@@ -105,7 +105,7 @@ Listen 192.0.2.5:8000
(48)Address already in use: make_sock: could not bind to address [::]:80
</example>
- <p>See <a
+ <p>See <a
href="http://wiki.apache.org/httpd/CouldNotBindToAddress">the
discussion in the wiki</a> for further troubleshooting tips.</p>
@@ -205,4 +205,3 @@ Listen 192.0.2.1:80
server is not listening to, it cannot be accessed.</p>
</section>
</manualpage>
-
diff --git a/docs/manual/caching.html.en b/docs/manual/caching.html.en
index aa01809c58..b2b5978040 100644
--- a/docs/manual/caching.html.en
+++ b/docs/manual/caching.html.en
@@ -41,7 +41,7 @@
<div class="section">
<h2><a name="introduction" id="introduction">Introduction</a></h2>
-
+
<p>The Apache HTTP server offers a range of caching features that
are designed to improve the performance of the server in various
ways.</p>
@@ -100,7 +100,7 @@
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code></li><li><code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code></li><li><code class="directive"><a href="./mod/mod_cache.html#cachedisable">CacheDisable</a></code></li><li><code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code></li><li><code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code></li></ul></td></tr></table>
<p>The HTTP protocol contains built in support for an in-line caching
- mechanism
+ mechanism
<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html">
described by section 13 of RFC2616</a>, and the
<code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> module can be used to take advantage of
@@ -175,14 +175,14 @@
<p>In this scenario, the cache behaves as if it has been "bolted
on" to the front of the server.</p>
-
+
<p>This mode offers the best performance, as the majority of
server processing is bypassed. This mode however also bypasses the
authentication and authorization phases of server processing, so
this mode should be chosen with care when this is important.</p>
-
+
<p> Requests with an "Authorization" header (for example, HTTP Basic
- Authentication) are neither cacheable nor served from the cache
+ Authentication) are neither cacheable nor served from the cache
when <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> is running in this phase.</p>
</dd>
<dt>Normal handler phase</dt>
@@ -237,7 +237,7 @@
explicit freshness lifetime with the <code>Cache-Control</code>
header's <code>max-age</code> or <code>s-maxage</code> fields, or
by including an <code>Expires</code> header.</p>
-
+
<p>At the same time, the origin server defined freshness lifetime can
be overridden by a client when the client presents their own
<code>Cache-Control</code> header within the request. In this case,
@@ -302,7 +302,7 @@
see if the file has changed in size or modification time. As such, even
local content may still be served faster from the cache if it has not
changed.</p>
-
+
<p>Origin servers should make every effort to support conditional
requests as is practical, however if conditional requests are not
supported, the origin will respond as if the request was not
@@ -375,7 +375,7 @@
particulars of the request that are not covered by HTTP negotiation,
should not be cached. This content should declare itself uncacheable
using the <code>Cache-Control</code> header.</p>
-
+
<p>If content changes often, expressed by a freshness lifetime of minutes
or seconds, the content can still be cached, however it is highly
desirable that the origin server supports
@@ -395,7 +395,7 @@
based on the value of headers in the request, for example to serve
multiple languages at the same URL, HTTP's caching mechanism makes it
possible to cache multiple variants of the same page at the same URL.</p>
-
+
<p>This is done by the origin server adding a <code>Vary</code> header
to indicate which headers must be taken into account by a cache when
determining whether two variants are different from one another.</p>
@@ -409,7 +409,7 @@ Vary: negotiate,accept-language,accept-charset
<p><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> will only serve the cached content to
requesters with accept-language and accept-charset headers
matching those of the original request.</p>
-
+
<p>Multiple variants of the content can be cached side by side,
<code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> uses the <code>Vary</code> header and the
corresponding values of the request headers listed by <code>Vary</code>
@@ -514,7 +514,7 @@ CacheDirLength 1</pre>
or more to process very large (tens of gigabytes) caches and if you are
running it from cron it is recommended that you determine how long a typical
run takes, to avoid running more than one instance at a time.</p>
-
+
<p>It is also recommended that an appropriate "nice" level is chosen for
htcacheclean so that the tool does not cause excessive disk io while the
server is running.</p>
@@ -537,7 +537,7 @@ CacheDirLength 1</pre>
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_authn_socache.html">mod_authn_socache</a></code></li><li><code class="module"><a href="./mod/mod_socache_dbm.html">mod_socache_dbm</a></code></li><li><code class="module"><a href="./mod/mod_socache_dc.html">mod_socache_dc</a></code></li><li><code class="module"><a href="./mod/mod_socache_memcache.html">mod_socache_memcache</a></code></li><li><code class="module"><a href="./mod/mod_socache_shmcb.html">mod_socache_shmcb</a></code></li><li><code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_authn_socache.html#authncachesocache">AuthnCacheSOCache</a></code></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslsessioncache">SSLSessionCache</a></code></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslstaplingcache">SSLStaplingCache</a></code></li></ul></td></tr></table>
-
+
<p>The Apache HTTP server offers a low level shared object cache for
caching information such as SSL sessions, or authentication credentials,
within the <a href="socache.html">socache</a> interface.</p>
@@ -816,7 +816,7 @@ sys 0m0.000s</pre></div>
on the popularity of the particular web site thousands or millions of
duplicate cache entries could be created for the same URL, crowding
out other entries in the cache.</p>
-
+
<p>In other cases, there may be a need to change the URL of a particular
resource on every request, usually by adding a "cachebuster" string to
the URL. If this content is declared cacheable by a server for a
diff --git a/docs/manual/caching.xml b/docs/manual/caching.xml
index f08ed7a77f..9a7112e5d5 100644
--- a/docs/manual/caching.xml
+++ b/docs/manual/caching.xml
@@ -34,7 +34,7 @@
<section id="introduction">
<title>Introduction</title>
-
+
<p>The Apache HTTP server offers a range of caching features that
are designed to improve the performance of the server in various
ways.</p>
@@ -104,7 +104,7 @@
</related>
<p>The HTTP protocol contains built in support for an in-line caching
- mechanism
+ mechanism
<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html">
described by section 13 of RFC2616</a>, and the
<module>mod_cache</module> module can be used to take advantage of
@@ -180,14 +180,14 @@
<p>In this scenario, the cache behaves as if it has been "bolted
on" to the front of the server.</p>
-
+
<p>This mode offers the best performance, as the majority of
server processing is bypassed. This mode however also bypasses the
authentication and authorization phases of server processing, so
this mode should be chosen with care when this is important.</p>
-
+
<p> Requests with an "Authorization" header (for example, HTTP Basic
- Authentication) are neither cacheable nor served from the cache
+ Authentication) are neither cacheable nor served from the cache
when <module>mod_cache</module> is running in this phase.</p>
</dd>
<dt>Normal handler phase</dt>
@@ -242,7 +242,7 @@
explicit freshness lifetime with the <code>Cache-Control</code>
header's <code>max-age</code> or <code>s-maxage</code> fields, or
by including an <code>Expires</code> header.</p>
-
+
<p>At the same time, the origin server defined freshness lifetime can
be overridden by a client when the client presents their own
<code>Cache-Control</code> header within the request. In this case,
@@ -309,7 +309,7 @@
see if the file has changed in size or modification time. As such, even
local content may still be served faster from the cache if it has not
changed.</p>
-
+
<p>Origin servers should make every effort to support conditional
requests as is practical, however if conditional requests are not
supported, the origin will respond as if the request was not
@@ -384,7 +384,7 @@
particulars of the request that are not covered by HTTP negotiation,
should not be cached. This content should declare itself uncacheable
using the <code>Cache-Control</code> header.</p>
-
+
<p>If content changes often, expressed by a freshness lifetime of minutes
or seconds, the content can still be cached, however it is highly
desirable that the origin server supports
@@ -404,7 +404,7 @@
based on the value of headers in the request, for example to serve
multiple languages at the same URL, HTTP's caching mechanism makes it
possible to cache multiple variants of the same page at the same URL.</p>
-
+
<p>This is done by the origin server adding a <code>Vary</code> header
to indicate which headers must be taken into account by a cache when
determining whether two variants are different from one another.</p>
@@ -418,7 +418,7 @@ Vary: negotiate,accept-language,accept-charset
<p><module>mod_cache</module> will only serve the cached content to
requesters with accept-language and accept-charset headers
matching those of the original request.</p>
-
+
<p>Multiple variants of the content can be cached side by side,
<module>mod_cache</module> uses the <code>Vary</code> header and the
corresponding values of the request headers listed by <code>Vary</code>
@@ -527,7 +527,7 @@ CacheDirLength 1
or more to process very large (tens of gigabytes) caches and if you are
running it from cron it is recommended that you determine how long a typical
run takes, to avoid running more than one instance at a time.</p>
-
+
<p>It is also recommended that an appropriate "nice" level is chosen for
htcacheclean so that the tool does not cause excessive disk io while the
server is running.</p>
@@ -565,7 +565,7 @@ CacheDirLength 1
<directive module="mod_ssl">SSLStaplingCache</directive>
</directivelist>
</related>
-
+
<p>The Apache HTTP server offers a low level shared object cache for
caching information such as SSL sessions, or authentication credentials,
within the <a href="socache.html">socache</a> interface.</p>
@@ -872,7 +872,7 @@ sys 0m0.000s</pre>
on the popularity of the particular web site thousands or millions of
duplicate cache entries could be created for the same URL, crowding
out other entries in the cache.</p>
-
+
<p>In other cases, there may be a need to change the URL of a particular
resource on every request, usually by adding a "cachebuster" string to
the URL. If this content is declared cacheable by a server for a
diff --git a/docs/manual/compliance.html.en b/docs/manual/compliance.html.en
index 63f804b930..b15cc6892a 100644
--- a/docs/manual/compliance.html.en
+++ b/docs/manual/compliance.html.en
@@ -179,12 +179,12 @@
<p>This policy will be rejected if the server response does not contain
an explicit <code>Content-Length</code> header.</p>
-
+
<p>There are a number of ways of determining the length of a response
body, described in full in
<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.4">
RFC2616 section 4.4 Message Length</a>.</p>
-
+
<p>When the <code>Content-Length</code> header is present, the size of
the body is declared at the start of the response. If this information
is missing, an HTTP cache might choose to ignore the response, as it
@@ -231,9 +231,9 @@
header, and the format of the header is described in full in
<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7">
RFC2616 section 3.7 Media Types</a>.</p>
-
+
<p>A syntactically valid content type might look as follows:</p>
-
+
<div class="example"><p><code>
Content-Type: text/html; charset=iso-8859-1
</code></p></div>
@@ -244,7 +244,7 @@
# invalid<br />
Content-Type: foo<br />
# blank<br />
- Content-Type:
+ Content-Type:
</code></p></div>
<p>The server administrator has the option to restrict the policy to one
@@ -263,12 +263,12 @@
<p>This policy will be rejected if the server response does not contain
an explicit <code>Content-Length</code> header, or a
<code>Transfer-Encoding</code> of chunked.</p>
-
+
<p>There are a number of ways of determining the length of a response
body, described in full in
<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.4">
RFC2616 section 4.4 Message Length</a>.</p>
-
+
<p>When the <code>Content-Length</code> header is present, the size of
the body is declared at the start of the response. HTTP/1.1 defines the
<code>Transfer-Encoding</code> header as an alternative to
@@ -281,33 +281,33 @@
</p>
<p>Most specifically, we follow these rules:</p>
-
+
<dl>
<dt>IF</dt>
<dd>we have not marked this connection as errored;</dd>
-
+
<dt>and</dt>
<dd>the client isn't expecting 100-continue</dd>
-
+
<dt>and</dt>
<dd>the response status does not require a close;</dd>
-
+
<dt>and</dt>
<dd>the response body has a defined length due to the status code
being 304 or 204, the request method being HEAD, already having defined
Content-Length or Transfer-Encoding: chunked, or the request version
being HTTP/1.1 and thus capable of being set as chunked</dd>
-
+
<dt>THEN</dt>
<dd>we support keepalive.</dd>
</dl>
-
+
<div class="warning">The server may choose to turn off keepalive for
various reasons, such as an imminent shutdown, or a Connection: close from
the client, or an HTTP/1.0 client request with a response with no
<code>Content-Length</code>, but for our purposes we only care that
keepalive was possible from the application, not that keepalive actually
- took place.</div>
+ took place.</div>
<p>It should also be noted that the Apache httpd server includes a filter
that adds chunked encoding to responses without an explicit content
@@ -316,7 +316,7 @@
<p>This policy is implemented by the <strong>POLICY_KEEPALIVE</strong>
filter.</p>
-
+
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
<h2><a name="policymaxage" id="policymaxage">Freshness Lifetime / Maxage Policy</a></h2>
@@ -418,7 +418,7 @@
<h2><a name="policyvary" id="policyvary">Vary Header Policy</a></h2>
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_policy.html">mod_policy</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_policy.html#policyvary">PolicyVary</a></code></li></ul></td></tr></table>
-
+
<p>This policy will be rejected if the server response contains a
<code>Vary</code> header, and that header in turn contains a header
blacklisted by the administrator.</p>
@@ -426,7 +426,7 @@
<p>The <code>Vary</code> header is described in full in
<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.44">
RFC2616 section 14.44 Vary</a>.</p>
-
+
<p>Some client provided headers, such as <code>User-Agent</code>,
can contain thousands or millions of combinations of values over a period
of time, and if the response is declared cacheable, a cache might attempt
diff --git a/docs/manual/compliance.xml b/docs/manual/compliance.xml
index 1449353520..ddef10098a 100644
--- a/docs/manual/compliance.xml
+++ b/docs/manual/compliance.xml
@@ -199,12 +199,12 @@
<p>This policy will be rejected if the server response does not contain
an explicit <code>Content-Length</code> header.</p>
-
+
<p>There are a number of ways of determining the length of a response
body, described in full in
<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.4">
RFC2616 section 4.4 Message Length</a>.</p>
-
+
<p>When the <code>Content-Length</code> header is present, the size of
the body is declared at the start of the response. If this information
is missing, an HTTP cache might choose to ignore the response, as it
@@ -258,9 +258,9 @@
header, and the format of the header is described in full in
<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7">
RFC2616 section 3.7 Media Types</a>.</p>
-
+
<p>A syntactically valid content type might look as follows:</p>
-
+
<example>
Content-Type: text/html; charset=iso-8859-1
</example>
@@ -271,7 +271,7 @@
# invalid<br />
Content-Type: foo<br />
# blank<br />
- Content-Type:
+ Content-Type:
</example>
<p>The server administrator has the option to restrict the policy to one
@@ -297,12 +297,12 @@
<p>This policy will be rejected if the server response does not contain
an explicit <code>Content-Length</code> header, or a
<code>Transfer-Encoding</code> of chunked.</p>
-
+
<p>There are a number of ways of determining the length of a response
body, described in full in
<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.4">
RFC2616 section 4.4 Message Length</a>.</p>
-
+
<p>When the <code>Content-Length</code> header is present, the size of
the body is declared at the start of the response. HTTP/1.1 defines the
<code>Transfer-Encoding</code> header as an alternative to
@@ -315,33 +315,33 @@
</p>
<p>Most specifically, we follow these rules:</p>
-
+
<dl>
<dt>IF</dt>
<dd>we have not marked this connection as errored;</dd>
-
+
<dt>and</dt>
<dd>the client isn't expecting 100-continue</dd>
-
+
<dt>and</dt>
<dd>the response status does not require a close;</dd>
-
+
<dt>and</dt>
<dd>the response body has a defined length due to the status code
being 304 or 204, the request method being HEAD, already having defined
Content-Length or Transfer-Encoding: chunked, or the request version
being HTTP/1.1 and thus capable of being set as chunked</dd>
-
+
<dt>THEN</dt>
<dd>we support keepalive.</dd>
</dl>
-
+
<note type="warning">The server may choose to turn off keepalive for
various reasons, such as an imminent shutdown, or a Connection: close from
the client, or an HTTP/1.0 client request with a response with no
<code>Content-Length</code>, but for our purposes we only care that
keepalive was possible from the application, not that keepalive actually
- took place.</note>
+ took place.</note>
<p>It should also be noted that the Apache httpd server includes a filter
that adds chunked encoding to responses without an explicit content
@@ -350,7 +350,7 @@
<p>This policy is implemented by the <strong>POLICY_KEEPALIVE</strong>
filter.</p>
-
+
</section>
<section id="policymaxage">
@@ -392,7 +392,7 @@
filter.</p>
</section>
-
+
<section id="policynocache">
<title>No Cache Policy</title>
<related>
@@ -434,7 +434,7 @@
filter.</p>
</section>
-
+
<section id="policyvalidation">
<title>Validation Policy</title>
<related>
@@ -469,7 +469,7 @@
filter.</p>
</section>
-
+
<section id="policyvary">
<title>Vary Header Policy</title>
<related>
@@ -480,7 +480,7 @@
<directive module="mod_policy">PolicyVary</directive>
</directivelist>
</related>
-
+
<p>This policy will be rejected if the server response contains a
<code>Vary</code> header, and that header in turn contains a header
blacklisted by the administrator.</p>
@@ -488,7 +488,7 @@
<p>The <code>Vary</code> header is described in full in
<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.44">
RFC2616 section 14.44 Vary</a>.</p>
-
+
<p>Some client provided headers, such as <code>User-Agent</code>,
can contain thousands or millions of combinations of values over a period
of time, and if the response is declared cacheable, a cache might attempt
@@ -500,7 +500,7 @@
filter.</p>
</section>
-
+
<section id="policyversion">
<title>Protocol Version Policy</title>
<related>
diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en
index af05c9243d..e1cb57fe95 100644
--- a/docs/manual/configuring.html.en
+++ b/docs/manual/configuring.html.en
@@ -69,14 +69,14 @@ Server.</p>
There must be no other characters or white space between the
backslash and the end of the line.</p>
- <p>Arguments to directives are separated by whitespace. If an
+ <p>Arguments to directives are separated by whitespace. If an
argument contains spaces, you must enclose that argument in quotes.</p>
<p>Directives in the configuration files are case-insensitive,
but arguments to directives are often case sensitive. Lines
that begin with the hash character "#" are considered
comments, and are ignored. Comments may <strong>not</strong> be
- included on the same line as a configuration directive.
+ included on the same line as a configuration directive.
White space occurring before a directive is ignored, so
you may indent directives for clarity. Blank lines are also ignored.</p>
diff --git a/docs/manual/configuring.xml b/docs/manual/configuring.xml
index c301a6b00a..672491b2a8 100644
--- a/docs/manual/configuring.xml
+++ b/docs/manual/configuring.xml
@@ -69,14 +69,14 @@ Server.</p>
There must be no other characters or white space between the
backslash and the end of the line.</p>
- <p>Arguments to directives are separated by whitespace. If an
+ <p>Arguments to directives are separated by whitespace. If an
argument contains spaces, you must enclose that argument in quotes.</p>
<p>Directives in the configuration files are case-insensitive,
but arguments to directives are often case sensitive. Lines
that begin with the hash character "#" are considered
comments, and are ignored. Comments may <strong>not</strong> be
- included on the same line as a configuration directive.
+ included on the same line as a configuration directive.
White space occurring before a directive is ignored, so
you may indent directives for clarity. Blank lines are also ignored.</p>
diff --git a/docs/manual/developer/hooks.html.en b/docs/manual/developer/hooks.html.en
index 2381e188e3..808b016254 100644
--- a/docs/manual/developer/hooks.html.en
+++ b/docs/manual/developer/hooks.html.en
@@ -29,9 +29,9 @@
date.</p>
</div>
- <p>In general, a hook function is one that the Apache HTTP Server
- will call at some point during the processing of a request.
- Modules can provide functions that are called, and specify when
+ <p>In general, a hook function is one that the Apache HTTP Server
+ will call at some point during the processing of a request.
+ Modules can provide functions that are called, and specify when
they get called in comparison to other modules.</p>
</div>
<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#create">Creating a hook function</a></li>
@@ -103,7 +103,7 @@
<p>The first hook that does <em>not</em> return <code>DECLINED</code>
stops the loop and its return value is returned from the hook
- caller. Note that <code>DECLINED</code> is the traditional
+ caller. Note that <code>DECLINED</code> is the traditional
hook return value meaning "I didn't do anything", but it can be
whatever suits you.</p>
@@ -181,7 +181,7 @@ mode MODULE_VAR_EXPORT my_module =
order relative to each other, but, of course, all modules using
<code>APR_HOOK_FIRST</code> will be run before <code>APR_HOOK_MIDDLE</code>
which are before <code>APR_HOOK_LAST</code>. Modules that don't care
- when they are run should use <code>APR_HOOK_MIDDLE</code>. <em>These
+ when they are run should use <code>APR_HOOK_MIDDLE</code>. <em>These
values are spaced out, so that positions like <code>APR_HOOK_FIRST-2</code>
are possible to hook slightly earlier than other functions.</em></p>
diff --git a/docs/manual/developer/hooks.xml b/docs/manual/developer/hooks.xml
index e9a5c5f52e..fcd4ce07eb 100644
--- a/docs/manual/developer/hooks.xml
+++ b/docs/manual/developer/hooks.xml
@@ -31,9 +31,9 @@
date.</p>
</note>
- <p>In general, a hook function is one that the Apache HTTP Server
- will call at some point during the processing of a request.
- Modules can provide functions that are called, and specify when
+ <p>In general, a hook function is one that the Apache HTTP Server
+ will call at some point during the processing of a request.
+ Modules can provide functions that are called, and specify when
they get called in comparison to other modules.</p>
</summary>
@@ -106,7 +106,7 @@ void ap_run_do_something(request_rec *r, int n)
<p>The first hook that does <em>not</em> return <code>DECLINED</code>
stops the loop and its return value is returned from the hook
- caller. Note that <code>DECLINED</code> is the traditional
+ caller. Note that <code>DECLINED</code> is the traditional
hook return value meaning "I didn't do anything", but it can be
whatever suits you.</p>
@@ -188,7 +188,7 @@ mode MODULE_VAR_EXPORT my_module =
order relative to each other, but, of course, all modules using
<code>APR_HOOK_FIRST</code> will be run before <code>APR_HOOK_MIDDLE</code>
which are before <code>APR_HOOK_LAST</code>. Modules that don't care
- when they are run should use <code>APR_HOOK_MIDDLE</code>. <em>These
+ when they are run should use <code>APR_HOOK_MIDDLE</code>. <em>These
values are spaced out, so that positions like <code>APR_HOOK_FIRST-2</code>
are possible to hook slightly earlier than other functions.</em></p>
@@ -220,4 +220,3 @@ static void register_hooks()
</section>
</section>
</manualpage>
-
diff --git a/docs/manual/developer/modguide.html.en b/docs/manual/developer/modguide.html.en
index 593e79fef5..d1af3203c9 100644
--- a/docs/manual/developer/modguide.html.en
+++ b/docs/manual/developer/modguide.html.en
@@ -24,7 +24,7 @@
<p><span>Available Languages: </span><a href="../en/developer/modguide.html" title="English"> en </a></p>
</div>
-<p>This document explains how you can develop modules for the Apache HTTP
+<p>This document explains how you can develop modules for the Apache HTTP
Server 2.4</p>
</div>
<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#introduction">Introduction</a></li>
@@ -41,46 +41,46 @@ Server 2.4</p>
<h2><a name="introduction" id="introduction">Introduction</a></h2>
<h3><a name="what" id="what">What we will be discussing in this document</a></h3>
<p>
-This document will discuss how you can create modules for the Apache
-HTTP Server 2.4, by exploring an example module called
-<code>mod_example</code>. In the first part of this document, the purpose
-of this module will be to calculate and print out various digest values for
+This document will discuss how you can create modules for the Apache
+HTTP Server 2.4, by exploring an example module called
+<code>mod_example</code>. In the first part of this document, the purpose
+of this module will be to calculate and print out various digest values for
existing files on your web server, whenever we access the URL <code>
-http://hostname/filename.sum</code>. For instance, if we want to know the
+http://hostname/filename.sum</code>. For instance, if we want to know the
MD5 digest value of the file located at <code>
http://www.example.com/index.html</code>, we would visit <code>
-http://www.example.com/index.html.sum</code>.
+http://www.example.com/index.html.sum</code>.
</p>
<p>
-In the second part of this document, which deals with configuration
-directive and context awareness, we will be looking at a module that simply
+In the second part of this document, which deals with configuration
+directive and context awareness, we will be looking at a module that simply
writes out its own configuration to the client.
</p>
<h3><a name="prerequisites" id="prerequisites">Prerequisites</a></h3>
<p>
-First and foremost, you are expected to have a basic knowledge of how the C
-programming language works. In most cases, we will try to be as pedagogical
-as possible and link to documents describing the functions used in the
-examples, but there are also many cases where it is necessary to either
-just assume that "it works" or do some digging yourself into what the hows
-and whys of various function calls.
+First and foremost, you are expected to have a basic knowledge of how the C
+programming language works. In most cases, we will try to be as pedagogical
+as possible and link to documents describing the functions used in the
+examples, but there are also many cases where it is necessary to either
+just assume that "it works" or do some digging yourself into what the hows
+and whys of various function calls.
</p>
<p>
-Lastly, you will need to have a basic understanding of how modules are
-loaded and configured in the Apache HTTP Server, as well as how to get the headers for
-Apache if you do not have them already, as these are needed for compiling
+Lastly, you will need to have a basic understanding of how modules are
+loaded and configured in the Apache HTTP Server, as well as how to get the headers for
+Apache if you do not have them already, as these are needed for compiling
new modules.
</p>
<h3><a name="compiling" id="compiling">Compiling your module</a></h3>
<p>
-To compile the source code we are building in this document, we will be
-using <a href="../programs/apxs.html">APXS</a>. Assuming your source file
-is called mod_example.c, compiling, installing and activating the module is
-as simple as:
+To compile the source code we are building in this document, we will be
+using <a href="../programs/apxs.html">APXS</a>. Assuming your source file
+is called mod_example.c, compiling, installing and activating the module is
+as simple as:
</p>
<div class="example"><pre>apxs -i -a -c mod_example.c</pre></div>
@@ -90,13 +90,13 @@ as simple as:
<h2><a name="basics" id="basics">Defining a module</a></h2>
<p>
<img src="../images/build_a_mod_3.png" alt="Module name tags" /><br />
-Every module starts with the same declaration, or name tag if you will,
+Every module starts with the same declaration, or name tag if you will,
that defines a module as <em>a separate entity within Apache</em>:</p>
<pre class="prettyprint lang-c">module AP_MODULE_DECLARE_DATA example_module =
-{
+{
STANDARD20_MODULE_STUFF,
create_dir_conf, /* Per-directory configuration handler */
merge_dir_conf, /* Merge handler for per-directory configurations */
@@ -109,8 +109,8 @@ that defines a module as <em>a separate entity within Apache</em>:</p>
<p>
-This bit of code lets the server know that we have now registered a new module
-in the system, and that its name is <code>example_module</code>. The name
+This bit of code lets the server know that we have now registered a new module
+in the system, and that its name is <code>example_module</code>. The name
of the module is used primarily for two things:<br />
</p>
<ul>
@@ -118,20 +118,20 @@ of the module is used primarily for two things:<br />
<li>Setting up a namespace for the module to use in configurations</li>
</ul>
<p>
-For now, we're only concerned with the first purpose of the module name,
+For now, we're only concerned with the first purpose of the module name,
which comes into play when we need to load the module:
</p>
<pre class="prettyprint lang-config">LoadModule example_module "modules/mod_example.so"</pre>
<p>
-In essence, this tells the server to open up <code>mod_example.so</code> and look for a module
+In essence, this tells the server to open up <code>mod_example.so</code> and look for a module
called <code>example_module</code>.
</p>
<p>
-Within this name tag of ours is also a bunch of references to how we would
-like to handle things: Which directives do we respond to in a configuration
-file or .htaccess, how do we operate within specific contexts, and what
-handlers are we interested in registering with the Apache HTTP service. We'll
+Within this name tag of ours is also a bunch of references to how we would
+like to handle things: Which directives do we respond to in a configuration
+file or .htaccess, how do we operate within specific contexts, and what
+handlers are we interested in registering with the Apache HTTP service. We'll
return to all these elements later in this document.
</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -139,50 +139,50 @@ return to all these elements later in this document.
<h2><a name="hooking" id="hooking">Getting started: Hooking into the server</a></h2>
<h3><a name="hook_intro" id="hook_intro">An introduction to hooks</a></h3>
<p>
-When handling requests in Apache HTTP Server 2.4, the first thing you will need to do is
-create a hook into the request handling process. A hook is essentially a
-message telling the server that you are willing to either serve or at least
-take a glance at certain requests given by clients. All handlers, whether
-it's mod_rewrite, mod_authn_*, mod_proxy and so on, are hooked into
-specific parts of the request process. As you are probably aware, modules
-serve different purposes; Some are authentication/authorization handlers,
-others are file or script handlers while some third modules rewrite URIs or
-proxies content. Furthermore, in the end, it is up to the user of the server
-how and when each module will come into place. Thus, the server itself does not
-presume to know which module is responsible for handling a specific
-request, and will ask each module whether they have an interest in a given
-request or not. It is then up to each module to either gently decline
-serving a request, accept serving it or flat out deny the request from
+When handling requests in Apache HTTP Server 2.4, the first thing you will need to do is
+create a hook into the request handling process. A hook is essentially a
+message telling the server that you are willing to either serve or at least
+take a glance at certain requests given by clients. All handlers, whether
+it's mod_rewrite, mod_authn_*, mod_proxy and so on, are hooked into
+specific parts of the request process. As you are probably aware, modules
+serve different purposes; Some are authentication/authorization handlers,
+others are file or script handlers while some third modules rewrite URIs or
+proxies content. Furthermore, in the end, it is up to the user of the server
+how and when each module will come into place. Thus, the server itself does not
+presume to know which module is responsible for handling a specific
+request, and will ask each module whether they have an interest in a given
+request or not. It is then up to each module to either gently decline
+serving a request, accept serving it or flat out deny the request from
being served, as authentication/authorization modules do: <br />
<img src="../images/build_a_mod_2.png" alt="Hook handling in httpd" /><br />
-To make it a bit easier for handlers such as our mod_example to know
-whether the client is requesting content we should handle or not, the server
-has directives for hinting to modules whether their assistance is needed or
-not. Two of these are <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code>
-and <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code>. Let's take a look at
-an example using <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code>. In
-our example case, we want every request ending with .sum to be served by
-<code>mod_example</code>, so we'll add a configuration directive that tells
+To make it a bit easier for handlers such as our mod_example to know
+whether the client is requesting content we should handle or not, the server
+has directives for hinting to modules whether their assistance is needed or
+not. Two of these are <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code>
+and <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code>. Let's take a look at
+an example using <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code>. In
+our example case, we want every request ending with .sum to be served by
+<code>mod_example</code>, so we'll add a configuration directive that tells
the server to do just that:
</p>
<pre class="prettyprint lang-config">AddHandler example-handler ".sum"</pre>
<p>
-What this tells the server is the following: <em>Whenever we receive a request
-for a URI ending in .sum, we are to let all modules know that we are
-looking for whoever goes by the name of "example-handler" </em>.
-Thus, when a request is being served that ends in .sum, the server will let all
+What this tells the server is the following: <em>Whenever we receive a request
+for a URI ending in .sum, we are to let all modules know that we are
+looking for whoever goes by the name of "example-handler" </em>.
+Thus, when a request is being served that ends in .sum, the server will let all
modules know, that this request should be served by "example-handler".
-As you will see later, when we start building mod_example, we will
-check for this handler tag relayed by <code>AddHandler</code> and reply to
+As you will see later, when we start building mod_example, we will
+check for this handler tag relayed by <code>AddHandler</code> and reply to
the server based on the value of this tag.
</p>
<h3><a name="hook_declaration" id="hook_declaration">Hooking into httpd</a></h3>
<p>
-To begin with, we only want to create a simple handler, that replies to the
-client browser when a specific URL is requested, so we won't bother setting
-up configuration handlers and directives just yet. Our initial module
+To begin with, we only want to create a simple handler, that replies to the
+client browser when a specific URL is requested, so we won't bother setting
+up configuration handlers and directives just yet. Our initial module
definition will look like this:</p>
@@ -201,15 +201,15 @@ definition will look like this:</p>
-<p>This lets the server know that we are not interested in anything fancy, we
-just want to hook onto the requests and possibly handle some of them. </p>
+<p>This lets the server know that we are not interested in anything fancy, we
+just want to hook onto the requests and possibly handle some of them. </p>
-<p> The reference in our example declaration, <code>register_hooks</code>
-is the name of a function we will create to manage how we hook onto the
-request process. In this example module, the function has just one purpose;
-To create a simple hook that gets called after all the rewrites, access
-control etc has been handled. Thus, we will let the server know, that we want
-to hook into its process as one of the last modules:
+<p> The reference in our example declaration, <code>register_hooks</code>
+is the name of a function we will create to manage how we hook onto the
+request process. In this example module, the function has just one purpose;
+To create a simple hook that gets called after all the rewrites, access
+control etc has been handled. Thus, we will let the server know, that we want
+to hook into its process as one of the last modules:
</p>
@@ -222,13 +222,13 @@ to hook into its process as one of the last modules:
<p>
-The <code>example_handler</code> reference is the function that will handle
+The <code>example_handler</code> reference is the function that will handle
the request. We will discuss how to create a handler in the next chapter.
</p>
<h3><a name="hook_others" id="hook_others">Other useful hooks</a></h3>
<p>
-Hooking into the request handling phase is but one of many hooks that you
+Hooking into the request handling phase is but one of many hooks that you
can create. Some other ways of hooking are:
</p>
<ul>
@@ -245,15 +245,15 @@ can create. Some other ways of hooking are:
<div class="section">
<h2><a name="handling" id="handling">Building a handler</a></h2>
<p>
-A handler is essentially a function that receives a callback when a request
-to the server is made. It is passed a record of the current request (how it was
-made, which headers and requests were passed along, who's giving the
-request and so on), and is put in charge of either telling the server that it's
+A handler is essentially a function that receives a callback when a request
+to the server is made. It is passed a record of the current request (how it was
+made, which headers and requests were passed along, who's giving the
+request and so on), and is put in charge of either telling the server that it's
not interested in the request or handle the request with the tools provided.
</p>
-<h3><a name="simple_handler" id="simple_handler">A simple "Hello, world!"
-handler</a></h3>
-<p>Let's start off by making a very simple request handler
+<h3><a name="simple_handler" id="simple_handler">A simple "Hello, world!"
+handler</a></h3>
+<p>Let's start off by making a very simple request handler
that does the following:
</p>
<ol>
@@ -274,13 +274,13 @@ In C code, our example handler will now look like this:
* and the server will try somewhere else.
*/
if (!r->handler || strcmp(r->handler, "example-handler")) return (DECLINED);
-
+
/* Now that we are handling this request, we'll write out "Hello, world!" to the client.
* To do so, we must first set the appropriate content type, followed by our output.
*/
ap_set_content_type(r, "text/html");
ap_rprintf(r, "Hello, world!");
-
+
/* Lastly, we must tell the server that we took care of this request and everything went fine.
* We do so by simply returning the value OK to the server.
*/
@@ -290,19 +290,19 @@ In C code, our example handler will now look like this:
<p>
-Now, we put all we have learned together and end up with a program that
-looks like
+Now, we put all we have learned together and end up with a program that
+looks like
<a href="http://people.apache.org/~humbedooh/mods/examples/mod_example_1.c">mod_example_1.c</a>
-. The functions used in this example will be explained later in the section
-<a href="#functions">"Some useful functions you should know"</a>.
+. The functions used in this example will be explained later in the section
+<a href="#functions">"Some useful functions you should know"</a>.
</p>
-
-<h3><a name="request_rec" id="request_rec">The request_rec structure</a></h3>
+
+<h3><a name="request_rec" id="request_rec">The request_rec structure</a></h3>
<p>The most essential part of any request is the <em>request record
</em>. In a call to a handler function, this is represented by the <code>
-request_rec* </code> structure passed along with every call that is made.
-This struct, typically just referred to as <code>r</code> in modules,
-contains all the information you need for your module to fully process any
+request_rec* </code> structure passed along with every call that is made.
+This struct, typically just referred to as <code>r</code> in modules,
+contains all the information you need for your module to fully process any
HTTP request and respond accordingly.</p> <p>Some key elements of the <code>
request_rec </code> structure are:
</p>
@@ -315,12 +315,12 @@ request_rec </code> structure are:
<li><code>r->connection (conn_rec*):</code> A record containing information about the current connection</li>
<li><code>r->user (char*):</code> If the URI requires authentication, this is set to the username provided</li>
<li><code>r->useragent_ip (char*):</code> The IP address of the client connecting to us</li>
-<li><code>r->pool (apr_pool_t*)</code>: The memory pool of this request. We'll discuss this in the
+<li><code>r->pool (apr_pool_t*)</code>: The memory pool of this request. We'll discuss this in the
"<a href="#memory">Memory management</a>" chapter.</li>
</ul>
<p>
-A complete list of all the values contained within the <code>request_rec</code> structure can be found in
-the <a href="http://svn.apache.org/repos/asf/httpd/httpd/trunk/include/httpd.h"><code>httpd.h</code></a> header
+A complete list of all the values contained within the <code>request_rec</code> structure can be found in
+the <a href="http://svn.apache.org/repos/asf/httpd/httpd/trunk/include/httpd.h"><code>httpd.h</code></a> header
file or at <a href="http://ci.apache.org/projects/httpd/trunk/doxygen/structrequest__rec.html">http://ci.apache.org/projects/httpd/trunk/doxygen/structrequest__rec.html</a>.
</p>
@@ -337,7 +337,7 @@ Let's try out some of these variables in another example handler:<br />
/* Print out the IP address of the client connecting to us: */
ap_rprintf(r, "<h2>Hello, %s!</h2>", r->useragent_ip);
-
+
/* If we were reached through a GET or a POST request, be happy, else sad. */
if ( !strcmp(r->method, "POST") || !strcmp(r->method, "GET") ) {
ap_rputs("You used a GET or a POST method, that makes us happy!<br/>", r);
@@ -359,11 +359,11 @@ Let's try out some of these variables in another example handler:<br />
<h3><a name="return_value" id="return_value">Return values</a></h3>
<p>
-Apache relies on return values from handlers to signify whether a request
-was handled or not, and if so, whether the request went well or not. If a
-module is not interested in handling a specific request, it should always
-return the value <code>DECLINED</code>. If it is handling a request, it
-should either return the generic value <code>OK</code>, or a specific HTTP
+Apache relies on return values from handlers to signify whether a request
+was handled or not, and if so, whether the request went well or not. If a
+module is not interested in handling a specific request, it should always
+return the value <code>DECLINED</code>. If it is handling a request, it
+should either return the generic value <code>OK</code>, or a specific HTTP
status code, for example:
</p>
@@ -377,13 +377,13 @@ status code, for example:
<p>
-Returning <code>OK</code> or a HTTP status code does not necessarily mean
-that the request will end. The server may still have other handlers that are
-interested in this request, for instance the logging modules which, upon a
-successful request, will write down a summary of what was requested and how
-it went. To do a full stop and prevent any further processing after your
-module is done, you can return the value <code>DONE</code> to let the server
-know that it should cease all activity on this request and carry on with
+Returning <code>OK</code> or a HTTP status code does not necessarily mean
+that the request will end. The server may still have other handlers that are
+interested in this request, for instance the logging modules which, upon a
+successful request, will write down a summary of what was requested and how
+it went. To do a full stop and prevent any further processing after your
+module is done, you can return the value <code>DONE</code> to let the server
+know that it should cease all activity on this request and carry on with
the next, without informing other handlers.
<br />
<strong>General response codes:</strong>
@@ -413,7 +413,7 @@ the next, without informing other handlers.
<code>ap_rputs(const char *string, request_rec *r)</code>: <br />
Sends a string of text to the client. This is a shorthand version of <a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__PROTO.html#gac827cd0537d2b6213a7c06d7c26cc36e">
ap_rwrite</a>.
-
+
<pre class="prettyprint lang-c">ap_rputs("Hello, world!", r);</pre>
@@ -425,8 +425,8 @@ the next, without informing other handlers.
<li>
<code>
<a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__PROTO.html#ga5e91eb6ca777c9a427b2e82bf1eeb81d">ap_rprintf</a></code>: <br />
- This function works just like <code>printf</code>, except it sends the result to the client.
-
+ This function works just like <code>printf</code>, except it sends the result to the client.
+
<pre class="prettyprint lang-c">ap_rprintf(r, "Hello, %s!", r->useragent_ip);</pre>
@@ -438,7 +438,7 @@ the next, without informing other handlers.
<code>
<a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__PROTO.html#gaa2f8412c400197338ec509f4a45e4579">ap_set_content_type</a>(request_rec *r, const char *type)</code>: <br />
Sets the content type of the output you are sending.
-
+
<pre class="prettyprint lang-c">ap_set_content_type(r, "text/plain"); /* force a raw text output */</pre>
@@ -453,18 +453,18 @@ the next, without informing other handlers.
<h3><a name="memory" id="memory">Memory management</a></h3>
<p>
-Managing your resources in Apache HTTP Server 2.4 is quite easy, thanks to the memory pool
-system. In essence, each server, connection and request have their own
-memory pool that gets cleaned up when its scope ends, e.g. when a request
-is done or when a server process shuts down. All your module needs to do is
-latch onto this memory pool, and you won't have to worry about having to
+Managing your resources in Apache HTTP Server 2.4 is quite easy, thanks to the memory pool
+system. In essence, each server, connection and request have their own
+memory pool that gets cleaned up when its scope ends, e.g. when a request
+is done or when a server process shuts down. All your module needs to do is
+latch onto this memory pool, and you won't have to worry about having to
clean up after yourself - pretty neat, huh?
</p>
<p>
-In our module, we will primarily be allocating memory for each request, so
-it's appropriate to use the <code>r->pool</code>
-reference when creating new objects. A few of the functions for allocating
+In our module, we will primarily be allocating memory for each request, so
+it's appropriate to use the <code>r->pool</code>
+reference when creating new objects. A few of the functions for allocating
memory within a pool are:
</p>
<ul>
@@ -487,10 +487,10 @@ apr_pool_t *p, const char *fmt, ...)</code>: Similar to <code>sprintf</code>, ex
const char *original = "You can't edit this!";
char *copy;
int *integers;
-
+
/* Allocate space for 10 integer values and set them all to zero. */
- integers = apr_pcalloc(r->pool, sizeof(int)*10);
-
+ integers = apr_pcalloc(r->pool, sizeof(int)*10);
+
/* Create a copy of the 'original' variable that we can edit. */
copy = apr_pstrdup(r->pool, original);
return OK;
@@ -499,10 +499,10 @@ apr_pool_t *p, const char *fmt, ...)</code>: Similar to <code>sprintf</code>, ex
<p>
-This is all well and good for our module, which won't need any
-pre-initialized variables or structures. However, if we wanted to
-initialize something early on, before the requests come rolling in, we
-could simply add a call to a function in our <code>register_hooks</code>
+This is all well and good for our module, which won't need any
+pre-initialized variables or structures. However, if we wanted to
+initialize something early on, before the requests come rolling in, we
+could simply add a call to a function in our <code>register_hooks</code>
function to sort it out:
</p>
@@ -518,36 +518,36 @@ function to sort it out:
<p>
-In this pre-request initialization function we would not be using the
-same pool as we did when allocating resources for request-based functions.
-Instead, we would use the pool given to us by the server for allocating memory
+In this pre-request initialization function we would not be using the
+same pool as we did when allocating resources for request-based functions.
+Instead, we would use the pool given to us by the server for allocating memory
on a per-process based level.
</p>
<h3><a name="parsing" id="parsing">Parsing request data</a></h3>
<p>
-In our example module, we would like to add a feature, that checks which
-type of digest, MD5 or SHA1 the client would like to see. This could be
-solved by adding a query string to the request. A query string is typically
-comprised of several keys and values put together in a string, for instance
-<code>valueA=yes&valueB=no&valueC=maybe</code>. It is up to the
-module itself to parse these and get the data it requires. In our example,
+In our example module, we would like to add a feature, that checks which
+type of digest, MD5 or SHA1 the client would like to see. This could be
+solved by adding a query string to the request. A query string is typically
+comprised of several keys and values put together in a string, for instance
+<code>valueA=yes&valueB=no&valueC=maybe</code>. It is up to the
+module itself to parse these and get the data it requires. In our example,
we'll be looking for a key called <code>digest</code>, and if set to <code>
-md5</code>, we'll produce an MD5 digest, otherwise we'll produce a SHA1
+md5</code>, we'll produce an MD5 digest, otherwise we'll produce a SHA1
digest.
</p>
<p>
-Since the introduction of Apache HTTP Server 2.4, parsing request data from GET and
-POST requests have never been easier. All we require to parse both GET and
+Since the introduction of Apache HTTP Server 2.4, parsing request data from GET and
+POST requests have never been easier. All we require to parse both GET and
POST data is four simple lines:
-</p>
+</p>
<pre class="prettyprint lang-c">
<a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__apr__tables.html#gad7ea82d6608a4a633fc3775694ab71e4">apr_table_t</a> *GET; <em>
-</em><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/structapr__array__header__t.html">apr_array_header_t</a>*POST;
+</em><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/structapr__array__header__t.html">apr_array_header_t</a>*POST;
<em>
</em>
<a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__SCRIPT.html#gaed25877b529623a4d8f99f819ba1b7bd">
@@ -558,7 +558,7 @@ ap_parse_form_data</a>(r, NULL, &POST, -1, 8192);</pre>
<p>
-In our specific example module, we're looking for the <code>digest</code>
+In our specific example module, we're looking for the <code>digest</code>
value from the query string, which now resides inside a table called <code>
GET</code>. To extract this value, we need only perform a simple operation:
</p>
@@ -574,16 +574,16 @@ if (!digestType) digestType = "sha1";</pre>
<p>
-The structures used for the POST and GET data are not exactly the same, so
-if we were to fetch a value from POST data instead of the query string, we
+The structures used for the POST and GET data are not exactly the same, so
+if we were to fetch a value from POST data instead of the query string, we
would have to resort to a few more lines, as outlined in <a href="#get_post">this example</a> in the last chapter of this document.
</p>
<h3><a name="advanced_handler" id="advanced_handler">Making an advanced handler</a></h3>
<p>
-Now that we have learned how to parse form data and manage our resources,
-we can move on to creating an advanced version of our module, that spits
+Now that we have learned how to parse form data and manage our resources,
+we can move on to creating an advanced version of our module, that spits
out the MD5 or SHA1 digest of files:
</p>
@@ -601,15 +601,15 @@ out the MD5 or SHA1 digest of files:
apr_table_t *GET;
apr_array_header_t *POST;
const char *digestType;
-
-
+
+
/* Check that the "example-handler" handler is being called. */
if (!r->handler || strcmp(r->handler, "example-handler")) return (DECLINED);
-
+
/* Figure out which file is being requested by removing the .sum from it */
filename = apr_pstrdup(r->pool, r->filename);
filename[strlen(filename)-4] = 0; /* Cut off the last 4 characters. */
-
+
/* Figure out if the file we request a sum on exists and isn't a directory */
rc = apr_stat(&finfo, filename, APR_FINFO_MIN, r->pool);
if (rc == APR_SUCCESS) {
@@ -622,27 +622,27 @@ out the MD5 or SHA1 digest of files:
}
/* If apr_stat failed, we're probably not allowed to check this file. */
else return HTTP_FORBIDDEN;
-
+
/* Parse the GET and, optionally, the POST data sent to us */
-
+
ap_args_to_table(r, &GET);
ap_parse_form_data(r, NULL, &POST, -1, 8192);
-
+
/* Set the appropriate content type */
ap_set_content_type(r, "text/html");
-
+
/* Print a title and some general information */
ap_rprintf(r, "<h2>Information on %s:</h2>", filename);
ap_rprintf(r, "<b>Size:</b> %u bytes<br/>", finfo.size);
-
+
/* Get the digest type the client wants to see */
digestType = apr_table_get(GET, "digest");
if (!digestType) digestType = "MD5";
-
-
+
+
rc = apr_file_open(&file, filename, APR_READ, APR_OS_DEFAULT, r->pool);
if (rc == APR_SUCCESS) {
-
+
/* Are we trying to calculate the MD5 or the SHA1 digest? */
if (!strcasecmp(digestType, "md5")) {
/* Calculate the MD5 sum of the file */
@@ -657,7 +657,7 @@ out the MD5 or SHA1 digest of files:
apr_md5_update(&md5, buffer, readBytes);
}
apr_md5_final(digest.chr, &md5);
-
+
/* Print out the MD5 digest */
ap_rputs("<b>MD5: </b><code>", r);
for (n = 0; n < APR_MD5_DIGESTSIZE/4; n++) {
@@ -680,20 +680,20 @@ out the MD5 or SHA1 digest of files:
apr_sha1_update(&sha1, buffer, readBytes);
}
apr_sha1_final(digest.chr, &sha1);
-
+
/* Print out the SHA1 digest */
ap_rputs("<b>SHA1: </b><code>", r);
for (n = 0; n < APR_SHA1_DIGESTSIZE/4; n++) {
ap_rprintf(r, "%08x", digest.num[n]);
}
ap_rputs("</code>", r);
-
+
/* Print a link to the MD5 version */
ap_rputs("<br/><a href='?digest=md5'>View the MD5 hash instead</a>", r);
}
apr_file_close(file);
-
- }
+
+ }
/* Let the server know that we responded to this request. */
return OK;
}</pre>
@@ -701,7 +701,7 @@ out the MD5 or SHA1 digest of files:
<p>
-This version in its entirety can be found here:
+This version in its entirety can be found here:
<a href="http://people.apache.org/~humbedooh/mods/examples/mod_example_2.c">mod_example_2.c</a>.
</p>
@@ -710,19 +710,19 @@ This version in its entirety can be found here:
<div class="section">
<h2><a name="configuration" id="configuration">Adding configuration options</a></h2>
<p>
-In this next segment of this document, we will turn our eyes away from the
-digest module and create a new example module, whose only function is to
-write out its own configuration. The purpose of this is to examine how
-the server works with configuration, and what happens when you start writing
-advanced configurations
+In this next segment of this document, we will turn our eyes away from the
+digest module and create a new example module, whose only function is to
+write out its own configuration. The purpose of this is to examine how
+the server works with configuration, and what happens when you start writing
+advanced configurations
for your modules.
</p>
-<h3><a name="config_intro" id="config_intro">An introduction to configuration
+<h3><a name="config_intro" id="config_intro">An introduction to configuration
directives</a></h3>
<p>
-If you are reading this, then you probably already know
-what a configuration directive is. Simply put, a directive is a way of
-telling an individual module (or a set of modules) how to behave, such as
+If you are reading this, then you probably already know
+what a configuration directive is. Simply put, a directive is a way of
+telling an individual module (or a set of modules) how to behave, such as
these directives control how <code>mod_rewrite</code> works:
</p>
<pre class="prettyprint lang-config">RewriteEngine On
@@ -730,7 +730,7 @@ RewriteCond "%{REQUEST_URI}" "^/foo/bar"
RewriteRule "^/foo/bar/(.*)$" "/foobar?page=$1"</pre>
<p>
-Each of these configuration directives are handled by a separate function,
+Each of these configuration directives are handled by a separate function,
that parses the parameters given and sets up a configuration accordingly.
</p>
@@ -748,9 +748,9 @@ that parses the parameters given and sets up a configuration accordingly.
<p>
-Now, let's put this into perspective by creating a very small module that
-just prints out a hard-coded configuration. You'll notice that we use the
-<code>register_hooks</code> function for initializing the configuration
+Now, let's put this into perspective by creating a very small module that
+just prints out a hard-coded configuration. You'll notice that we use the
+<code>register_hooks</code> function for initializing the configuration
values to their defaults:
</p>
@@ -773,7 +773,7 @@ static int example_handler(request_rec *r)
return OK;
}
-static void register_hooks(apr_pool_t *pool)
+static void register_hooks(apr_pool_t *pool)
{
config.enabled = 1;
config.path = "/foo/bar";
@@ -797,7 +797,7 @@ module AP_MODULE_DECLARE_DATA example_module =
<p>
-So far so good. To access our new handler, we could add the following to
+So far so good. To access our new handler, we could add the following to
our configuration:
</p>
<pre class="prettyprint lang-config"><Location "/example">
@@ -805,17 +805,17 @@ our configuration:
</Location></pre>
<p>
-When we visit, we'll see our current configuration being spit out by our
-module.
+When we visit, we'll see our current configuration being spit out by our
+module.
</p>
<h3><a name="register_directive" id="register_directive">Registering directives with the server</a></h3>
<p>
-What if we want to change our configuration, not by hard-coding new values
-into the module, but by using either the httpd.conf file or possibly a
-.htaccess file? It's time to let the server know that we want this to be
-possible. To do so, we must first change our <em>name tag</em> to include a
+What if we want to change our configuration, not by hard-coding new values
+into the module, but by using either the httpd.conf file or possibly a
+.htaccess file? It's time to let the server know that we want this to be
+possible. To do so, we must first change our <em>name tag</em> to include a
reference to the configuration directives we want to register with the server:
</p>
@@ -834,10 +834,10 @@ reference to the configuration directives we want to register with the server:
<p>
-This will tell the server that we are now accepting directives from the
+This will tell the server that we are now accepting directives from the
configuration files, and that the structure called <code>example_directives
-</code> holds information on what our directives are and how they work.
-Since we have three different variables in our module configuration, we
+</code> holds information on what our directives are and how they work.
+Since we have three different variables in our module configuration, we
will add a structure with three directives and a NULL at the end:
</p>
@@ -857,34 +857,34 @@ will add a structure with three directives and a NULL at the end:
As you can see, each directive needs at least 5 parameters set:
</p>
<ol>
-<li><code><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__CONFIG.html#ga07c7d22ae17805e61204463326cf9c34">AP_INIT_TAKE1</a></code>: This is a macro that tells the server that this directive takes one and only one argument.
-If we required two arguments, we could use the macro <code><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__CONFIG.html#gafaec43534fcf200f37d9fecbf9247c21">AP_INIT_TAKE2</a></code> and so on (refer to httpd_conf.h
+<li><code><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__CONFIG.html#ga07c7d22ae17805e61204463326cf9c34">AP_INIT_TAKE1</a></code>: This is a macro that tells the server that this directive takes one and only one argument.
+If we required two arguments, we could use the macro <code><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__CONFIG.html#gafaec43534fcf200f37d9fecbf9247c21">AP_INIT_TAKE2</a></code> and so on (refer to httpd_conf.h
for more macros).</li>
-<li><code>exampleEnabled</code>: This is the name of our directive. More precisely, it is what the user must put in his/her
+<li><code>exampleEnabled</code>: This is the name of our directive. More precisely, it is what the user must put in his/her
configuration in order to invoke a configuration change in our module.</li>
-<li><code>example_set_enabled</code>: This is a reference to a C function that parses the directive and sets the configuration
+<li><code>example_set_enabled</code>: This is a reference to a C function that parses the directive and sets the configuration
accordingly. We will discuss how to make this in the following paragraph.</li>
-<li><code>RSRC_CONF</code>: This tells the server where the directive is permitted. We'll go into details on this value in the
+<li><code>RSRC_CONF</code>: This tells the server where the directive is permitted. We'll go into details on this value in the
later chapters, but for now, <code>RSRC_CONF</code> means that the server will only accept these directives in a server context.</li>
<li><code>"Enable or disable...."</code>: This is simply a brief description of what the directive does.</li>
</ol>
<p>
-(<em>The "missing" parameter in our definition, which is usually set to
-<code>NULL</code>, is an optional function that can be run after the
-initial function to parse the arguments have been run. This is usually
-omitted, as the function for verifying arguments might as well be used to
+(<em>The "missing" parameter in our definition, which is usually set to
+<code>NULL</code>, is an optional function that can be run after the
+initial function to parse the arguments have been run. This is usually
+omitted, as the function for verifying arguments might as well be used to
set them.</em>)
</p>
<h3><a name="directive_handler" id="directive_handler">The directive handler function</a></h3>
<p>
-Now that we have told the server to expect some directives for our module, it's
-time to make a few functions for handling these. What the server reads in the
-configuration file(s) is text, and so naturally, what it passes along to
-our directive handler is one or more strings, that we ourselves need to
+Now that we have told the server to expect some directives for our module, it's
+time to make a few functions for handling these. What the server reads in the
+configuration file(s) is text, and so naturally, what it passes along to
+our directive handler is one or more strings, that we ourselves need to
recognize and act upon. You'll notice, that since we set our <code>
-exampleAction</code> directive to accept two arguments, its C function also
-has an additional parameter defined:</p>
+exampleAction</code> directive to accept two arguments, its C function also
+has an additional parameter defined:</p>
<pre class="prettyprint lang-c">/* Handler for the "exampleEnabled" directive */
@@ -909,7 +909,7 @@ const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, cons
{
if(!strcasecmp(arg1, "file")) config.typeOfAction = 0x01;
else config.typeOfAction = 0x02;
-
+
if(!strcasecmp(arg2, "deny")) config.typeOfAction += 0x10;
else config.typeOfAction += 0x20;
return NULL;
@@ -921,7 +921,7 @@ const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, cons
<h3><a name="directive_complete" id="directive_complete">Putting it all together</a></h3>
<p>
-Now that we have our directives set up, and handlers configured for them,
+Now that we have our directives set up, and handlers configured for them,
we can assemble our module into one big file:
</p>
@@ -978,7 +978,7 @@ const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, cons
{
if(!strcasecmp(arg1, "file")) config.typeOfAction = 0x01;
else config.typeOfAction = 0x02;
-
+
if(!strcasecmp(arg2, "deny")) config.typeOfAction += 0x10;
else config.typeOfAction += 0x20;
return NULL;
@@ -1016,7 +1016,7 @@ static int example_handler(request_rec *r)
The hook registration function (also initializes the default config values):
==============================================================================
*/
-static void register_hooks(apr_pool_t *pool)
+static void register_hooks(apr_pool_t *pool)
{
config.enabled = 1;
config.path = "/foo/bar";
@@ -1043,7 +1043,7 @@ module AP_MODULE_DECLARE_DATA example_module =
<p>
-In our httpd.conf file, we can now change the hard-coded configuration by
+In our httpd.conf file, we can now change the hard-coded configuration by
adding a few lines:
</p>
<pre class="prettyprint lang-config">ExampleEnabled On
@@ -1051,8 +1051,8 @@ ExamplePath "/usr/bin/foo"
ExampleAction file allow</pre>
<p>
-And thus we apply the configuration, visit <code>/example</code> on our
-web site, and we see the configuration has adapted to what we wrote in our
+And thus we apply the configuration, visit <code>/example</code> on our
+web site, and we see the configuration has adapted to what we wrote in our
configuration file.
</p>
@@ -1063,9 +1063,9 @@ configuration file.
<h2><a name="context" id="context">Context aware configurations</a></h2>
<h3><a name="context_intro" id="context_intro">Introduction to context aware configurations</a></h3>
<p>
-In Apache HTTP Server 2.4, different URLs, virtual hosts, directories etc can have very
-different meanings to the user of the server, and thus different contexts
-within which modules must operate. For example, let's assume you have this
+In Apache HTTP Server 2.4, different URLs, virtual hosts, directories etc can have very
+different meanings to the user of the server, and thus different contexts
+within which modules must operate. For example, let's assume you have this
configuration set up for mod_rewrite:
</p>
<pre class="prettyprint lang-config"><Directory "/var/www">
@@ -1077,22 +1077,22 @@ configuration set up for mod_rewrite:
</Directory></pre>
<p>
-In this example, you will have set up two different contexts for
+In this example, you will have set up two different contexts for
mod_rewrite:</p>
<ol>
<li>Inside <code>/var/www</code>, all requests for <code>http://example.com</code> must go to <code>http://www.example.com</code></li>
<li>Inside <code>/var/www/sub</code>, all requests for <code>foobar</code> must go to <code>index.php?foobar=true</code></li>
</ol>
<p>
-If mod_rewrite (or the entire server for that matter) wasn't context aware, then
-these rewrite rules would just apply to every and any request made,
-regardless of where and how they were made, but since the module can pull
-the context specific configuration straight from the server, it does not need
-to know itself, which of the directives are valid in this context, since
+If mod_rewrite (or the entire server for that matter) wasn't context aware, then
+these rewrite rules would just apply to every and any request made,
+regardless of where and how they were made, but since the module can pull
+the context specific configuration straight from the server, it does not need
+to know itself, which of the directives are valid in this context, since
the server takes care of this.</p>
<p>
-So how does a module get the specific configuration for the server,
+So how does a module get the specific configuration for the server,
directory or location in question? It does so by making one simple call:
</p>
@@ -1102,17 +1102,17 @@ directory or location in question? It does so by making one simple call:
<p>
-That's it! Of course, a whole lot goes on behind the scenes, which we will
-discuss in this chapter, starting with how the server came to know what our
-configuration looks like, and how it came to be set up as it is in the
+That's it! Of course, a whole lot goes on behind the scenes, which we will
+discuss in this chapter, starting with how the server came to know what our
+configuration looks like, and how it came to be set up as it is in the
specific context.
</p>
<h3><a name="context_base" id="context_base">Our basic configuration setup</a></h3>
-<p>In this chapter, we will be working with a slightly modified version of
-our previous context structure. We will set a <code>context</code>
-variable that we can use to track which context configuration is being
+<p>In this chapter, we will be working with a slightly modified version of
+our previous context structure. We will set a <code>context</code>
+variable that we can use to track which context configuration is being
used by the server in various places:
</p>
@@ -1147,8 +1147,8 @@ used by the server in various places:
<h3><a name="context_which" id="context_which">Choosing a context</a></h3>
<p>
-Before we can start making our module context aware, we must first define,
-which contexts we will accept. As we saw in the previous chapter, defining
+Before we can start making our module context aware, we must first define,
+which contexts we will accept. As we saw in the previous chapter, defining
a directive required five elements be set:</p>
@@ -1158,12 +1158,12 @@ a directive required five elements be set:</p>
-<p>The <code>RSRC_CONF</code> definition told the server that we would only allow
-this directive in a global server context, but since we are now trying out
-a context aware version of our module, we should set this to something
-more lenient, namely the value <code>ACCESS_CONF</code>, which lets us use
-the directive inside <Directory> and <Location> blocks. For more
-control over the placement of your directives, you can combine the following
+<p>The <code>RSRC_CONF</code> definition told the server that we would only allow
+this directive in a global server context, but since we are now trying out
+a context aware version of our module, we should set this to something
+more lenient, namely the value <code>ACCESS_CONF</code>, which lets us use
+the directive inside <Directory> and <Location> blocks. For more
+control over the placement of your directives, you can combine the following
restrictions together to form a specific rule:
</p>
<ul>
@@ -1178,11 +1178,11 @@ restrictions together to form a specific rule:
<h3><a name="context_pool" id="context_pool">Using the server to allocate configuration slots</a></h3>
-<p> A much smarter way to manage your configurations is by letting the server
-help you create them. To do so, we must first start off by changing our
-<em>name tag</em> to let the server know, that it should assist us in creating
-and managing our configurations. Since we have chosen the per-directory
-(or per-location) context for our module configurations, we'll add a
+<p> A much smarter way to manage your configurations is by letting the server
+help you create them. To do so, we must first start off by changing our
+<em>name tag</em> to let the server know, that it should assist us in creating
+and managing our configurations. Since we have chosen the per-directory
+(or per-location) context for our module configurations, we'll add a
per-directory creator and merger function reference in our tag:</p>
@@ -1205,9 +1205,9 @@ per-directory creator and merger function reference in our tag:</p>
<h3><a name="context_new" id="context_new">Creating new context configurations</a></h3>
<p>
-Now that we have told the server to help us create and manage configurations,
-our first step is to make a function for creating new, blank
-configurations. We do so by creating the function we just referenced in
+Now that we have told the server to help us create and manage configurations,
+our first step is to make a function for creating new, blank
+configurations. We do so by creating the function we just referenced in
our name tag as the Per-directory configuration handler:</p>
<pre class="prettyprint lang-c">void *create_dir_conf(apr_pool_t *pool, char *context) {
@@ -1230,9 +1230,9 @@ our name tag as the Per-directory configuration handler:</p>
<h3><a name="context_merge" id="context_merge">Merging configurations</a></h3>
<p>
-Our next step in creating a context aware configuration is merging
-configurations. This part of the process particularly applies to scenarios
-where you have a parent configuration and a child, such as the following:
+Our next step in creating a context aware configuration is merging
+configurations. This part of the process particularly applies to scenarios
+where you have a parent configuration and a child, such as the following:
</p>
<pre class="prettyprint lang-config"><Directory "/var/www">
ExampleEnabled On
@@ -1246,8 +1246,8 @@ where you have a parent configuration and a child, such as the following:
<p>
In this example, it is natural to assume that the directory <code>
/var/www/subdir</code> should inherit the values set for the <code>/var/www
-</code> directory, as we did not specify an <code>ExampleEnabled</code> nor
-an <code>ExamplePath</code> for this directory. The server does not presume to
+</code> directory, as we did not specify an <code>ExampleEnabled</code> nor
+an <code>ExamplePath</code> for this directory. The server does not presume to
know if this is true, but cleverly does the following:
</p>
<ol>
@@ -1258,8 +1258,8 @@ know if this is true, but cleverly does the following:
<li><strong>Proposes a merge</strong> of the two configurations into a new configuration for <code>/var/www/subdir</code></li>
</ol>
<p>
-This proposal is handled by the <code>merge_dir_conf</code> function we
-referenced in our name tag. The purpose of this function is to assess the
+This proposal is handled by the <code>merge_dir_conf</code> function we
+referenced in our name tag. The purpose of this function is to assess the
two configurations and decide how they are to be merged:</p>
@@ -1268,12 +1268,12 @@ two configurations and decide how they are to be merged:</p>
example_config *base = (example_config *) BASE ; /* This is what was set in the parent context */
example_config *add = (example_config *) ADD ; /* This is what is set in the new context */
example_config *conf = (example_config *) create_dir_conf(pool, "Merged configuration"); /* This will be the merged configuration */
-
+
/* Merge configurations */
conf->enabled = ( add->enabled == 0 ) ? base->enabled : add->enabled ;
conf->typeOfAction = add->typeOfAction ? add->typeOfAction : base->typeOfAction;
strcpy(conf->path, strlen(add->path) ? add->path : base->path);
-
+
return conf ;
}</pre>
@@ -1284,8 +1284,8 @@ two configurations and decide how they are to be merged:</p>
<h3><a name="context_example" id="context_example">Trying out our new context aware configurations</a></h3>
<p>
-Now, let's try putting it all together to create a new module that is
-context aware. First off, we'll create a configuration that lets us test
+Now, let's try putting it all together to create a new module that is
+context aware. First off, we'll create a configuration that lets us test
how the module works:
</p>
<pre class="prettyprint lang-config"><Location "/a">
@@ -1307,8 +1307,8 @@ how the module works:
</Location></pre>
<p>
-Then we'll assemble our module code. Note, that since we are now using our
-name tag as reference when fetching configurations in our handler, I have
+Then we'll assemble our module code. Note, that since we are now using our
+name tag as reference when fetching configurations in our handler, I have
added some prototypes to keep the compiler happy:
</p>
@@ -1548,11 +1548,11 @@ void *merge_dir_conf(apr_pool_t *pool, void *BASE, void *ADD)
<div class="section">
<h2><a name="summary" id="summary">Summing up</a></h2>
<p>
-We have now looked at how to create simple modules for Apache HTTP Server 2.4 and
-configuring them. What you do next is entirely up to you, but it is my
-hope that something valuable has come out of reading this documentation.
-If you have questions on how to further develop modules, you are welcome
-to join our <a href="http://httpd.apache.org/lists.html">mailing lists</a>
+We have now looked at how to create simple modules for Apache HTTP Server 2.4 and
+configuring them. What you do next is entirely up to you, but it is my
+hope that something valuable has come out of reading this documentation.
+If you have questions on how to further develop modules, you are welcome
+to join our <a href="http://httpd.apache.org/lists.html">mailing lists</a>
or check out the rest of our documentation for further tips.
</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1687,7 +1687,7 @@ static int example_handler(request_rec *r)
return(rc);
}
-static int example_handler(request_rec *r)
+static int example_handler(request_rec *r)
{
/*~~~~~~~~~~~~~~~~*/
apr_off_t size;
diff --git a/docs/manual/developer/modguide.xml b/docs/manual/developer/modguide.xml
index 3857e00c55..50a6b93a27 100644
--- a/docs/manual/developer/modguide.xml
+++ b/docs/manual/developer/modguide.xml
@@ -27,7 +27,7 @@
<title>Developing modules for the Apache HTTP Server 2.4</title>
<summary>
-<p>This document explains how you can develop modules for the Apache HTTP
+<p>This document explains how you can develop modules for the Apache HTTP
Server 2.4</p>
</summary>
@@ -37,46 +37,46 @@ Server 2.4</p>
<section id="introduction"><title>Introduction</title>
<section id="what"><title>What we will be discussing in this document</title>
<p>
-This document will discuss how you can create modules for the Apache
-HTTP Server 2.4, by exploring an example module called
-<code>mod_example</code>. In the first part of this document, the purpose
-of this module will be to calculate and print out various digest values for
+This document will discuss how you can create modules for the Apache
+HTTP Server 2.4, by exploring an example module called
+<code>mod_example</code>. In the first part of this document, the purpose
+of this module will be to calculate and print out various digest values for
existing files on your web server, whenever we access the URL <code>
-http://hostname/filename.sum</code>. For instance, if we want to know the
+http://hostname/filename.sum</code>. For instance, if we want to know the
MD5 digest value of the file located at <code>
http://www.example.com/index.html</code>, we would visit <code>
-http://www.example.com/index.html.sum</code>.
+http://www.example.com/index.html.sum</code>.
</p>
<p>
-In the second part of this document, which deals with configuration
-directive and context awareness, we will be looking at a module that simply
+In the second part of this document, which deals with configuration
+directive and context awareness, we will be looking at a module that simply
writes out its own configuration to the client.
</p>
</section>
<section id="prerequisites"><title>Prerequisites</title>
<p>
-First and foremost, you are expected to have a basic knowledge of how the C
-programming language works. In most cases, we will try to be as pedagogical
-as possible and link to documents describing the functions used in the
-examples, but there are also many cases where it is necessary to either
-just assume that "it works" or do some digging yourself into what the hows
-and whys of various function calls.
+First and foremost, you are expected to have a basic knowledge of how the C
+programming language works. In most cases, we will try to be as pedagogical
+as possible and link to documents describing the functions used in the
+examples, but there are also many cases where it is necessary to either
+just assume that "it works" or do some digging yourself into what the hows
+and whys of various function calls.
</p>
<p>
-Lastly, you will need to have a basic understanding of how modules are
-loaded and configured in the Apache HTTP Server, as well as how to get the headers for
-Apache if you do not have them already, as these are needed for compiling
+Lastly, you will need to have a basic understanding of how modules are
+loaded and configured in the Apache HTTP Server, as well as how to get the headers for
+Apache if you do not have them already, as these are needed for compiling
new modules.
</p>
</section>
<section id="compiling"><title>Compiling your module</title>
<p>
-To compile the source code we are building in this document, we will be
-using <a href="../programs/apxs.html">APXS</a>. Assuming your source file
-is called mod_example.c, compiling, installing and activating the module is
-as simple as:
+To compile the source code we are building in this document, we will be
+using <a href="../programs/apxs.html">APXS</a>. Assuming your source file
+is called mod_example.c, compiling, installing and activating the module is
+as simple as:
</p>
<example><pre>
apxs -i -a -c mod_example.c
@@ -88,14 +88,14 @@ apxs -i -a -c mod_example.c
<section id="basics"><title>Defining a module</title>
<p>
<img src="../images/build_a_mod_3.png" alt="Module name tags"/><br/>
-Every module starts with the same declaration, or name tag if you will,
+Every module starts with the same declaration, or name tag if you will,
that defines a module as <em>a separate entity within Apache</em>:</p>
<!-- BEGIN EXAMPLE CODE -->
<highlight language="c">
module AP_MODULE_DECLARE_DATA example_module =
-{
+{
STANDARD20_MODULE_STUFF,
create_dir_conf, /* Per-directory configuration handler */
merge_dir_conf, /* Merge handler for per-directory configurations */
@@ -108,8 +108,8 @@ module AP_MODULE_DECLARE_DATA example_module =
<!-- END EXAMPLE CODE -->
<p>
-This bit of code lets the server know that we have now registered a new module
-in the system, and that its name is <code>example_module</code>. The name
+This bit of code lets the server know that we have now registered a new module
+in the system, and that its name is <code>example_module</code>. The name
of the module is used primarily for two things:<br/>
</p>
<ul>
@@ -117,72 +117,72 @@ of the module is used primarily for two things:<br/>
<li>Setting up a namespace for the module to use in configurations</li>
</ul>
<p>
-For now, we're only concerned with the first purpose of the module name,
+For now, we're only concerned with the first purpose of the module name,
which comes into play when we need to load the module:
</p>
<highlight language="config">
LoadModule example_module "modules/mod_example.so"
</highlight>
<p>
-In essence, this tells the server to open up <code>mod_example.so</code> and look for a module
+In essence, this tells the server to open up <code>mod_example.so</code> and look for a module
called <code>example_module</code>.
</p>
<p>
-Within this name tag of ours is also a bunch of references to how we would
-like to handle things: Which directives do we respond to in a configuration
-file or .htaccess, how do we operate within specific contexts, and what
-handlers are we interested in registering with the Apache HTTP service. We'll
+Within this name tag of ours is also a bunch of references to how we would
+like to handle things: Which directives do we respond to in a configuration
+file or .htaccess, how do we operate within specific contexts, and what
+handlers are we interested in registering with the Apache HTTP service. We'll
return to all these elements later in this document.
</p>
</section>
<section id="hooking"><title>Getting started: Hooking into the server</title>
<section id="hook_intro"><title>An introduction to hooks</title>
<p>
-When handling requests in Apache HTTP Server 2.4, the first thing you will need to do is
-create a hook into the request handling process. A hook is essentially a
-message telling the server that you are willing to either serve or at least
-take a glance at certain requests given by clients. All handlers, whether
-it's mod_rewrite, mod_authn_*, mod_proxy and so on, are hooked into
-specific parts of the request process. As you are probably aware, modules
-serve different purposes; Some are authentication/authorization handlers,
-others are file or script handlers while some third modules rewrite URIs or
-proxies content. Furthermore, in the end, it is up to the user of the server
-how and when each module will come into place. Thus, the server itself does not
-presume to know which module is responsible for handling a specific
-request, and will ask each module whether they have an interest in a given
-request or not. It is then up to each module to either gently decline
-serving a request, accept serving it or flat out deny the request from
+When handling requests in Apache HTTP Server 2.4, the first thing you will need to do is
+create a hook into the request handling process. A hook is essentially a
+message telling the server that you are willing to either serve or at least
+take a glance at certain requests given by clients. All handlers, whether
+it's mod_rewrite, mod_authn_*, mod_proxy and so on, are hooked into
+specific parts of the request process. As you are probably aware, modules
+serve different purposes; Some are authentication/authorization handlers,
+others are file or script handlers while some third modules rewrite URIs or
+proxies content. Furthermore, in the end, it is up to the user of the server
+how and when each module will come into place. Thus, the server itself does not
+presume to know which module is responsible for handling a specific
+request, and will ask each module whether they have an interest in a given
+request or not. It is then up to each module to either gently decline
+serving a request, accept serving it or flat out deny the request from
being served, as authentication/authorization modules do: <br/>
<img src="../images/build_a_mod_2.png" alt="Hook handling in httpd"/><br/>
-To make it a bit easier for handlers such as our mod_example to know
-whether the client is requesting content we should handle or not, the server
-has directives for hinting to modules whether their assistance is needed or
-not. Two of these are <directive module="mod_mime">AddHandler</directive>
-and <directive module="core">SetHandler</directive>. Let's take a look at
-an example using <directive module="mod_mime">AddHandler</directive>. In
-our example case, we want every request ending with .sum to be served by
-<code>mod_example</code>, so we'll add a configuration directive that tells
+To make it a bit easier for handlers such as our mod_example to know
+whether the client is requesting content we should handle or not, the server
+has directives for hinting to modules whether their assistance is needed or
+not. Two of these are <directive module="mod_mime">AddHandler</directive>
+and <directive module="core">SetHandler</directive>. Let's take a look at
+an example using <directive module="mod_mime">AddHandler</directive>. In
+our example case, we want every request ending with .sum to be served by
+<code>mod_example</code>, so we'll add a configuration directive that tells
the server to do just that:
</p>
<highlight language="config">
AddHandler example-handler ".sum"
</highlight>
<p>
-What this tells the server is the following: <em>Whenever we receive a request
-for a URI ending in .sum, we are to let all modules know that we are
-looking for whoever goes by the name of "example-handler" </em>.
-Thus, when a request is being served that ends in .sum, the server will let all
+What this tells the server is the following: <em>Whenever we receive a request
+for a URI ending in .sum, we are to let all modules know that we are
+looking for whoever goes by the name of "example-handler" </em>.
+Thus, when a request is being served that ends in .sum, the server will let all
modules know, that this request should be served by "example-handler".
-As you will see later, when we start building mod_example, we will
-check for this handler tag relayed by <code>AddHandler</code> and reply to
+As you will see later, when we start building mod_example, we will
+check for this handler tag relayed by <code>AddHandler</code> and reply to
the server based on the value of this tag.
</p>
</section>
<section id="hook_declaration"><title>Hooking into httpd</title>
<p>
-To begin with, we only want to create a simple handler, that replies to the
-client browser when a specific URL is requested, so we won't bother setting
-up configuration handlers and directives just yet. Our initial module
+To begin with, we only want to create a simple handler, that replies to the
+client browser when a specific URL is requested, so we won't bother setting
+up configuration handlers and directives just yet. Our initial module
definition will look like this:</p>
@@ -202,15 +202,15 @@ module AP_MODULE_DECLARE_DATA example_module =
<!-- END EXAMPLE CODE -->
-<p>This lets the server know that we are not interested in anything fancy, we
-just want to hook onto the requests and possibly handle some of them. </p>
+<p>This lets the server know that we are not interested in anything fancy, we
+just want to hook onto the requests and possibly handle some of them. </p>
-<p> The reference in our example declaration, <code>register_hooks</code>
-is the name of a function we will create to manage how we hook onto the
-request process. In this example module, the function has just one purpose;
-To create a simple hook that gets called after all the rewrites, access
-control etc has been handled. Thus, we will let the server know, that we want
-to hook into its process as one of the last modules:
+<p> The reference in our example declaration, <code>register_hooks</code>
+is the name of a function we will create to manage how we hook onto the
+request process. In this example module, the function has just one purpose;
+To create a simple hook that gets called after all the rewrites, access
+control etc has been handled. Thus, we will let the server know, that we want
+to hook into its process as one of the last modules:
</p>
<!-- BEGIN EXAMPLE CODE -->
@@ -224,13 +224,13 @@ static void register_hooks(apr_pool_t *pool)
<!-- END EXAMPLE CODE -->
<p>
-The <code>example_handler</code> reference is the function that will handle
+The <code>example_handler</code> reference is the function that will handle
the request. We will discuss how to create a handler in the next chapter.
</p>
</section>
<section id="hook_others"><title>Other useful hooks</title>
<p>
-Hooking into the request handling phase is but one of many hooks that you
+Hooking into the request handling phase is but one of many hooks that you
can create. Some other ways of hooking are:
</p>
<ul>
@@ -247,15 +247,15 @@ can create. Some other ways of hooking are:
<section id="handling"><title>Building a handler</title>
<p>
-A handler is essentially a function that receives a callback when a request
-to the server is made. It is passed a record of the current request (how it was
-made, which headers and requests were passed along, who's giving the
-request and so on), and is put in charge of either telling the server that it's
+A handler is essentially a function that receives a callback when a request
+to the server is made. It is passed a record of the current request (how it was
+made, which headers and requests were passed along, who's giving the
+request and so on), and is put in charge of either telling the server that it's
not interested in the request or handle the request with the tools provided.
</p>
-<section id="simple_handler"><title>A simple "Hello, world!"
-handler</title>
-<p>Let's start off by making a very simple request handler
+<section id="simple_handler"><title>A simple "Hello, world!"
+handler</title>
+<p>Let's start off by making a very simple request handler
that does the following:
</p>
<ol>
@@ -277,13 +277,13 @@ static int example_handler(request_rec *r)
* and the server will try somewhere else.
*/
if (!r->handler || strcmp(r->handler, "example-handler")) return (DECLINED);
-
+
/* Now that we are handling this request, we'll write out "Hello, world!" to the client.
* To do so, we must first set the appropriate content type, followed by our output.
*/
ap_set_content_type(r, "text/html");
ap_rprintf(r, "Hello, world!");
-
+
/* Lastly, we must tell the server that we took care of this request and everything went fine.
* We do so by simply returning the value OK to the server.
*/
@@ -293,19 +293,19 @@ static int example_handler(request_rec *r)
<!-- END EXAMPLE CODE -->
<p>
-Now, we put all we have learned together and end up with a program that
-looks like
+Now, we put all we have learned together and end up with a program that
+looks like
<a href="http://people.apache.org/~humbedooh/mods/examples/mod_example_1.c">mod_example_1.c</a>
-. The functions used in this example will be explained later in the section
-<a href= "#functions">"Some useful functions you should know"</a>.
+. The functions used in this example will be explained later in the section
+<a href= "#functions">"Some useful functions you should know"</a>.
</p>
-</section>
-<section id="request_rec"><title>The request_rec structure</title>
+</section>
+<section id="request_rec"><title>The request_rec structure</title>
<p>The most essential part of any request is the <em>request record
</em>. In a call to a handler function, this is represented by the <code>
-request_rec* </code> structure passed along with every call that is made.
-This struct, typically just referred to as <code>r</code> in modules,
-contains all the information you need for your module to fully process any
+request_rec* </code> structure passed along with every call that is made.
+This struct, typically just referred to as <code>r</code> in modules,
+contains all the information you need for your module to fully process any
HTTP request and respond accordingly.</p> <p>Some key elements of the <code>
request_rec </code> structure are:
</p>
@@ -318,12 +318,12 @@ request_rec </code> structure are:
<li><code>r->connection (conn_rec*):</code> A record containing information about the current connection</li>
<li><code>r->user (char*):</code> If the URI requires authentication, this is set to the username provided</li>
<li><code>r->useragent_ip (char*):</code> The IP address of the client connecting to us</li>
-<li><code>r->pool (apr_pool_t*)</code>: The memory pool of this request. We'll discuss this in the
+<li><code>r->pool (apr_pool_t*)</code>: The memory pool of this request. We'll discuss this in the
"<a href="#memory">Memory management</a>" chapter.</li>
</ul>
<p>
-A complete list of all the values contained within the <code>request_rec</code> structure can be found in
-the <a href="http://svn.apache.org/repos/asf/httpd/httpd/trunk/include/httpd.h"><code>httpd.h</code></a> header
+A complete list of all the values contained within the <code>request_rec</code> structure can be found in
+the <a href="http://svn.apache.org/repos/asf/httpd/httpd/trunk/include/httpd.h"><code>httpd.h</code></a> header
file or at <a href="http://ci.apache.org/projects/httpd/trunk/doxygen/structrequest__rec.html">http://ci.apache.org/projects/httpd/trunk/doxygen/structrequest__rec.html</a>.
</p>
@@ -341,7 +341,7 @@ static int example_handler(request_rec *r)
/* Print out the IP address of the client connecting to us: */
ap_rprintf(r, "<h2>Hello, %s!</h2>", r->useragent_ip);
-
+
/* If we were reached through a GET or a POST request, be happy, else sad. */
if ( !strcmp(r->method, "POST") || !strcmp(r->method, "GET") ) {
ap_rputs("You used a GET or a POST method, that makes us happy!<br/>", r);
@@ -363,11 +363,11 @@ static int example_handler(request_rec *r)
<section id="return_value"><title>Return values</title>
<p>
-Apache relies on return values from handlers to signify whether a request
-was handled or not, and if so, whether the request went well or not. If a
-module is not interested in handling a specific request, it should always
-return the value <code>DECLINED</code>. If it is handling a request, it
-should either return the generic value <code>OK</code>, or a specific HTTP
+Apache relies on return values from handlers to signify whether a request
+was handled or not, and if so, whether the request went well or not. If a
+module is not interested in handling a specific request, it should always
+return the value <code>DECLINED</code>. If it is handling a request, it
+should either return the generic value <code>OK</code>, or a specific HTTP
status code, for example:
</p>
@@ -382,13 +382,13 @@ static int example_handler(request_rec *r)
<!-- END EXAMPLE CODE -->
<p>
-Returning <code>OK</code> or a HTTP status code does not necessarily mean
-that the request will end. The server may still have other handlers that are
-interested in this request, for instance the logging modules which, upon a
-successful request, will write down a summary of what was requested and how
-it went. To do a full stop and prevent any further processing after your
-module is done, you can return the value <code>DONE</code> to let the server
-know that it should cease all activity on this request and carry on with
+Returning <code>OK</code> or a HTTP status code does not necessarily mean
+that the request will end. The server may still have other handlers that are
+interested in this request, for instance the logging modules which, upon a
+successful request, will write down a summary of what was requested and how
+it went. To do a full stop and prevent any further processing after your
+module is done, you can return the value <code>DONE</code> to let the server
+know that it should cease all activity on this request and carry on with
the next, without informing other handlers.
<br/>
<strong>General response codes:</strong>
@@ -416,10 +416,10 @@ the next, without informing other handlers.
<ul>
<li>
<code>ap_rputs(const char *string, request_rec *r)</code>: <br/>
- Sends a string of text to the client. This is a shorthand version of <a
+ Sends a string of text to the client. This is a shorthand version of <a
href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__PROTO.html#gac827cd0537d2b6213a7c06d7c26cc36e">
ap_rwrite</a>.
-
+
<!-- BEGIN EXAMPLE CODE -->
<highlight language="c">ap_rputs("Hello, world!", r);</highlight>
@@ -430,8 +430,8 @@ the next, without informing other handlers.
<li>
<code>
<a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__PROTO.html#ga5e91eb6ca777c9a427b2e82bf1eeb81d">ap_rprintf</a></code>: <br/>
- This function works just like <code>printf</code>, except it sends the result to the client.
-
+ This function works just like <code>printf</code>, except it sends the result to the client.
+
<!-- BEGIN EXAMPLE CODE -->
<highlight language="c">ap_rprintf(r, "Hello, %s!", r->useragent_ip);</highlight>
@@ -442,7 +442,7 @@ the next, without informing other handlers.
<code>
<a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__PROTO.html#gaa2f8412c400197338ec509f4a45e4579">ap_set_content_type</a>(request_rec *r, const char *type)</code>: <br/>
Sets the content type of the output you are sending.
-
+
<!-- BEGIN EXAMPLE CODE -->
<highlight language="c">ap_set_content_type(r, "text/plain"); /* force a raw text output */</highlight>
@@ -456,18 +456,18 @@ the next, without informing other handlers.
<section id="memory"><title>Memory management</title>
<p>
-Managing your resources in Apache HTTP Server 2.4 is quite easy, thanks to the memory pool
-system. In essence, each server, connection and request have their own
-memory pool that gets cleaned up when its scope ends, e.g. when a request
-is done or when a server process shuts down. All your module needs to do is
-latch onto this memory pool, and you won't have to worry about having to
+Managing your resources in Apache HTTP Server 2.4 is quite easy, thanks to the memory pool
+system. In essence, each server, connection and request have their own
+memory pool that gets cleaned up when its scope ends, e.g. when a request
+is done or when a server process shuts down. All your module needs to do is
+latch onto this memory pool, and you won't have to worry about having to
clean up after yourself - pretty neat, huh?
</p>
<p>
-In our module, we will primarily be allocating memory for each request, so
-it's appropriate to use the <code>r->pool</code>
-reference when creating new objects. A few of the functions for allocating
+In our module, we will primarily be allocating memory for each request, so
+it's appropriate to use the <code>r->pool</code>
+reference when creating new objects. A few of the functions for allocating
memory within a pool are:
</p>
<ul>
@@ -491,10 +491,10 @@ static int example_handler(request_rec *r)
const char *original = "You can't edit this!";
char *copy;
int *integers;
-
+
/* Allocate space for 10 integer values and set them all to zero. */
- integers = apr_pcalloc(r->pool, sizeof(int)*10);
-
+ integers = apr_pcalloc(r->pool, sizeof(int)*10);
+
/* Create a copy of the 'original' variable that we can edit. */
copy = apr_pstrdup(r->pool, original);
return OK;
@@ -503,10 +503,10 @@ static int example_handler(request_rec *r)
<!-- END EXAMPLE CODE -->
<p>
-This is all well and good for our module, which won't need any
-pre-initialized variables or structures. However, if we wanted to
-initialize something early on, before the requests come rolling in, we
-could simply add a call to a function in our <code>register_hooks</code>
+This is all well and good for our module, which won't need any
+pre-initialized variables or structures. However, if we wanted to
+initialize something early on, before the requests come rolling in, we
+could simply add a call to a function in our <code>register_hooks</code>
function to sort it out:
</p>
@@ -523,47 +523,47 @@ static void register_hooks(apr_pool_t *pool)
<!-- END EXAMPLE CODE -->
<p>
-In this pre-request initialization function we would not be using the
-same pool as we did when allocating resources for request-based functions.
-Instead, we would use the pool given to us by the server for allocating memory
+In this pre-request initialization function we would not be using the
+same pool as we did when allocating resources for request-based functions.
+Instead, we would use the pool given to us by the server for allocating memory
on a per-process based level.
</p>
</section>
<section id="parsing"><title>Parsing request data</title>
<p>
-In our example module, we would like to add a feature, that checks which
-type of digest, MD5 or SHA1 the client would like to see. This could be
-solved by adding a query string to the request. A query string is typically
-comprised of several keys and values put together in a string, for instance
-<code>valueA=yes&valueB=no&valueC=maybe</code>. It is up to the
-module itself to parse these and get the data it requires. In our example,
+In our example module, we would like to add a feature, that checks which
+type of digest, MD5 or SHA1 the client would like to see. This could be
+solved by adding a query string to the request. A query string is typically
+comprised of several keys and values put together in a string, for instance
+<code>valueA=yes&valueB=no&valueC=maybe</code>. It is up to the
+module itself to parse these and get the data it requires. In our example,
we'll be looking for a key called <code>digest</code>, and if set to <code>
-md5</code>, we'll produce an MD5 digest, otherwise we'll produce a SHA1
+md5</code>, we'll produce an MD5 digest, otherwise we'll produce a SHA1
digest.
</p>
<p>
-Since the introduction of Apache HTTP Server 2.4, parsing request data from GET and
-POST requests have never been easier. All we require to parse both GET and
+Since the introduction of Apache HTTP Server 2.4, parsing request data from GET and
+POST requests have never been easier. All we require to parse both GET and
POST data is four simple lines:
-</p>
+</p>
<!-- BEGIN EXAMPLE CODE -->
<highlight language="c">
<a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__apr__tables.html#gad7ea82d6608a4a633fc3775694ab71e4">apr_table_t</a> *GET; <em>
-</em><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/structapr__array__header__t.html">apr_array_header_t</a>*POST;
+</em><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/structapr__array__header__t.html">apr_array_header_t</a>*POST;
<em>
</em>
<a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__SCRIPT.html#gaed25877b529623a4d8f99f819ba1b7bd">
ap_args_to_table</a>(r, &GET); <em>
</em><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__DAEMON.html#ga9d426b6382b49754d4f87c55f65af202">
-ap_parse_form_data</a>(r, NULL, &POST, -1, 8192);
+ap_parse_form_data</a>(r, NULL, &POST, -1, 8192);
</highlight>
<!-- END EXAMPLE CODE -->
<p>
-In our specific example module, we're looking for the <code>digest</code>
+In our specific example module, we're looking for the <code>digest</code>
value from the query string, which now resides inside a table called <code>
GET</code>. To extract this value, we need only perform a simple operation:
</p>
@@ -580,8 +580,8 @@ if (!digestType) digestType = "sha1";
<!-- END EXAMPLE CODE -->
<p>
-The structures used for the POST and GET data are not exactly the same, so
-if we were to fetch a value from POST data instead of the query string, we
+The structures used for the POST and GET data are not exactly the same, so
+if we were to fetch a value from POST data instead of the query string, we
would have to resort to a few more lines, as outlined in <a href="#get_post"
>this example</a> in the last chapter of this document.
</p>
@@ -589,8 +589,8 @@ would have to resort to a few more lines, as outlined in <a href="#get_post"
<section id="advanced_handler"><title>Making an advanced handler</title>
<p>
-Now that we have learned how to parse form data and manage our resources,
-we can move on to creating an advanced version of our module, that spits
+Now that we have learned how to parse form data and manage our resources,
+we can move on to creating an advanced version of our module, that spits
out the MD5 or SHA1 digest of files:
</p>
@@ -609,15 +609,15 @@ static int example_handler(request_rec *r)
apr_table_t *GET;
apr_array_header_t *POST;
const char *digestType;
-
-
+
+
/* Check that the "example-handler" handler is being called. */
if (!r->handler || strcmp(r->handler, "example-handler")) return (DECLINED);
-
+
/* Figure out which file is being requested by removing the .sum from it */
filename = apr_pstrdup(r->pool, r->filename);
filename[strlen(filename)-4] = 0; /* Cut off the last 4 characters. */
-
+
/* Figure out if the file we request a sum on exists and isn't a directory */
rc = apr_stat(&finfo, filename, APR_FINFO_MIN, r->pool);
if (rc == APR_SUCCESS) {
@@ -630,27 +630,27 @@ static int example_handler(request_rec *r)
}
/* If apr_stat failed, we're probably not allowed to check this file. */
else return HTTP_FORBIDDEN;
-
+
/* Parse the GET and, optionally, the POST data sent to us */
-
+
ap_args_to_table(r, &GET);
ap_parse_form_data(r, NULL, &POST, -1, 8192);
-
+
/* Set the appropriate content type */
ap_set_content_type(r, "text/html");
-
+
/* Print a title and some general information */
ap_rprintf(r, "<h2>Information on %s:</h2>", filename);
ap_rprintf(r, "<b>Size:</b> %u bytes<br/>", finfo.size);
-
+
/* Get the digest type the client wants to see */
digestType = apr_table_get(GET, "digest");
if (!digestType) digestType = "MD5";
-
-
+
+
rc = apr_file_open(&file, filename, APR_READ, APR_OS_DEFAULT, r->pool);
if (rc == APR_SUCCESS) {
-
+
/* Are we trying to calculate the MD5 or the SHA1 digest? */
if (!strcasecmp(digestType, "md5")) {
/* Calculate the MD5 sum of the file */
@@ -665,7 +665,7 @@ static int example_handler(request_rec *r)
apr_md5_update(&md5, buffer, readBytes);
}
apr_md5_final(digest.chr, &md5);
-
+
/* Print out the MD5 digest */
ap_rputs("<b>MD5: </b><code>", r);
for (n = 0; n < APR_MD5_DIGESTSIZE/4; n++) {
@@ -688,20 +688,20 @@ static int example_handler(request_rec *r)
apr_sha1_update(&sha1, buffer, readBytes);
}
apr_sha1_final(digest.chr, &sha1);
-
+
/* Print out the SHA1 digest */
ap_rputs("<b>SHA1: </b><code>", r);
for (n = 0; n < APR_SHA1_DIGESTSIZE/4; n++) {
ap_rprintf(r, "%08x", digest.num[n]);
}
ap_rputs("</code>", r);
-
+
/* Print a link to the MD5 version */
ap_rputs("<br/><a href='?digest=md5'>View the MD5 hash instead</a>", r);
}
apr_file_close(file);
-
- }
+
+ }
/* Let the server know that we responded to this request. */
return OK;
}
@@ -709,7 +709,7 @@ static int example_handler(request_rec *r)
<!-- END EXAMPLE CODE -->
<p>
-This version in its entirety can be found here:
+This version in its entirety can be found here:
<a href="http://people.apache.org/~humbedooh/mods/examples/mod_example_2.c">mod_example_2.c</a>.
</p>
</section>
@@ -718,19 +718,19 @@ This version in its entirety can be found here:
<section id="configuration"><title>Adding configuration options</title>
<p>
-In this next segment of this document, we will turn our eyes away from the
-digest module and create a new example module, whose only function is to
-write out its own configuration. The purpose of this is to examine how
-the server works with configuration, and what happens when you start writing
-advanced configurations
+In this next segment of this document, we will turn our eyes away from the
+digest module and create a new example module, whose only function is to
+write out its own configuration. The purpose of this is to examine how
+the server works with configuration, and what happens when you start writing
+advanced configurations
for your modules.
</p>
-<section id="config_intro"><title>An introduction to configuration
+<section id="config_intro"><title>An introduction to configuration
directives</title>
<p>
-If you are reading this, then you probably already know
-what a configuration directive is. Simply put, a directive is a way of
-telling an individual module (or a set of modules) how to behave, such as
+If you are reading this, then you probably already know
+what a configuration directive is. Simply put, a directive is a way of
+telling an individual module (or a set of modules) how to behave, such as
these directives control how <code>mod_rewrite</code> works:
</p>
<highlight language="config">
@@ -739,7 +739,7 @@ RewriteCond "%{REQUEST_URI}" "^/foo/bar"
RewriteRule "^/foo/bar/(.*)$" "/foobar?page=$1"
</highlight>
<p>
-Each of these configuration directives are handled by a separate function,
+Each of these configuration directives are handled by a separate function,
that parses the parameters given and sets up a configuration accordingly.
</p>
</section>
@@ -758,9 +758,9 @@ typedef struct {
<!-- END EXAMPLE CODE -->
<p>
-Now, let's put this into perspective by creating a very small module that
-just prints out a hard-coded configuration. You'll notice that we use the
-<code>register_hooks</code> function for initializing the configuration
+Now, let's put this into perspective by creating a very small module that
+just prints out a hard-coded configuration. You'll notice that we use the
+<code>register_hooks</code> function for initializing the configuration
values to their defaults:
</p>
@@ -784,7 +784,7 @@ static int example_handler(request_rec *r)
return OK;
}
-static void register_hooks(apr_pool_t *pool)
+static void register_hooks(apr_pool_t *pool)
{
config.enabled = 1;
config.path = "/foo/bar";
@@ -808,7 +808,7 @@ module AP_MODULE_DECLARE_DATA example_module =
<!-- END EXAMPLE CODE -->
<p>
-So far so good. To access our new handler, we could add the following to
+So far so good. To access our new handler, we could add the following to
our configuration:
</p>
<highlight language="config">
@@ -817,17 +817,17 @@ our configuration:
</Location>
</highlight>
<p>
-When we visit, we'll see our current configuration being spit out by our
-module.
+When we visit, we'll see our current configuration being spit out by our
+module.
</p>
</section>
<section id="register_directive"><title>Registering directives with the server</title>
<p>
-What if we want to change our configuration, not by hard-coding new values
-into the module, but by using either the httpd.conf file or possibly a
-.htaccess file? It's time to let the server know that we want this to be
-possible. To do so, we must first change our <em>name tag</em> to include a
+What if we want to change our configuration, not by hard-coding new values
+into the module, but by using either the httpd.conf file or possibly a
+.htaccess file? It's time to let the server know that we want this to be
+possible. To do so, we must first change our <em>name tag</em> to include a
reference to the configuration directives we want to register with the server:
</p>
@@ -847,10 +847,10 @@ module AP_MODULE_DECLARE_DATA example_module =
<!-- END EXAMPLE CODE -->
<p>
-This will tell the server that we are now accepting directives from the
+This will tell the server that we are now accepting directives from the
configuration files, and that the structure called <code>example_directives
-</code> holds information on what our directives are and how they work.
-Since we have three different variables in our module configuration, we
+</code> holds information on what our directives are and how they work.
+Since we have three different variables in our module configuration, we
will add a structure with three directives and a NULL at the end:
</p>
@@ -871,34 +871,34 @@ static const command_rec example_directives[] =
As you can see, each directive needs at least 5 parameters set:
</p>
<ol>
-<li><code><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__CONFIG.html#ga07c7d22ae17805e61204463326cf9c34">AP_INIT_TAKE1</a></code>: This is a macro that tells the server that this directive takes one and only one argument.
-If we required two arguments, we could use the macro <code><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__CONFIG.html#gafaec43534fcf200f37d9fecbf9247c21">AP_INIT_TAKE2</a></code> and so on (refer to httpd_conf.h
+<li><code><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__CONFIG.html#ga07c7d22ae17805e61204463326cf9c34">AP_INIT_TAKE1</a></code>: This is a macro that tells the server that this directive takes one and only one argument.
+If we required two arguments, we could use the macro <code><a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__CONFIG.html#gafaec43534fcf200f37d9fecbf9247c21">AP_INIT_TAKE2</a></code> and so on (refer to httpd_conf.h
for more macros).</li>
-<li><code>exampleEnabled</code>: This is the name of our directive. More precisely, it is what the user must put in his/her
+<li><code>exampleEnabled</code>: This is the name of our directive. More precisely, it is what the user must put in his/her
configuration in order to invoke a configuration change in our module.</li>
-<li><code>example_set_enabled</code>: This is a reference to a C function that parses the directive and sets the configuration
+<li><code>example_set_enabled</code>: This is a reference to a C function that parses the directive and sets the configuration
accordingly. We will discuss how to make this in the following paragraph.</li>
-<li><code>RSRC_CONF</code>: This tells the server where the directive is permitted. We'll go into details on this value in the
+<li><code>RSRC_CONF</code>: This tells the server where the directive is permitted. We'll go into details on this value in the
later chapters, but for now, <code>RSRC_CONF</code> means that the server will only accept these directives in a server context.</li>
<li><code>"Enable or disable...."</code>: This is simply a brief description of what the directive does.</li>
</ol>
<p>
-(<em>The "missing" parameter in our definition, which is usually set to
-<code>NULL</code>, is an optional function that can be run after the
-initial function to parse the arguments have been run. This is usually
-omitted, as the function for verifying arguments might as well be used to
+(<em>The "missing" parameter in our definition, which is usually set to
+<code>NULL</code>, is an optional function that can be run after the
+initial function to parse the arguments have been run. This is usually
+omitted, as the function for verifying arguments might as well be used to
set them.</em>)
</p>
</section>
<section id="directive_handler"><title>The directive handler function</title>
<p>
-Now that we have told the server to expect some directives for our module, it's
-time to make a few functions for handling these. What the server reads in the
-configuration file(s) is text, and so naturally, what it passes along to
-our directive handler is one or more strings, that we ourselves need to
+Now that we have told the server to expect some directives for our module, it's
+time to make a few functions for handling these. What the server reads in the
+configuration file(s) is text, and so naturally, what it passes along to
+our directive handler is one or more strings, that we ourselves need to
recognize and act upon. You'll notice, that since we set our <code>
-exampleAction</code> directive to accept two arguments, its C function also
-has an additional parameter defined:</p>
+exampleAction</code> directive to accept two arguments, its C function also
+has an additional parameter defined:</p>
<!-- BEGIN EXAMPLE CODE -->
<highlight language="c">
@@ -924,7 +924,7 @@ const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, cons
{
if(!strcasecmp(arg1, "file")) config.typeOfAction = 0x01;
else config.typeOfAction = 0x02;
-
+
if(!strcasecmp(arg2, "deny")) config.typeOfAction += 0x10;
else config.typeOfAction += 0x20;
return NULL;
@@ -936,7 +936,7 @@ const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, cons
</section>
<section id="directive_complete"><title>Putting it all together</title>
<p>
-Now that we have our directives set up, and handlers configured for them,
+Now that we have our directives set up, and handlers configured for them,
we can assemble our module into one big file:
</p>
@@ -994,7 +994,7 @@ const char *example_set_action(cmd_parms *cmd, void *cfg, const char *arg1, cons
{
if(!strcasecmp(arg1, "file")) config.typeOfAction = 0x01;
else config.typeOfAction = 0x02;
-
+
if(!strcasecmp(arg2, "deny")) config.typeOfAction += 0x10;
else config.typeOfAction += 0x20;
return NULL;
@@ -1032,7 +1032,7 @@ static int example_handler(request_rec *r)
The hook registration function (also initializes the default config values):
==============================================================================
*/
-static void register_hooks(apr_pool_t *pool)
+static void register_hooks(apr_pool_t *pool)
{
config.enabled = 1;
config.path = "/foo/bar";
@@ -1059,7 +1059,7 @@ module AP_MODULE_DECLARE_DATA example_module =
<p>
-In our httpd.conf file, we can now change the hard-coded configuration by
+In our httpd.conf file, we can now change the hard-coded configuration by
adding a few lines:
</p>
<highlight language="config">
@@ -1068,8 +1068,8 @@ ExamplePath "/usr/bin/foo"
ExampleAction file allow
</highlight>
<p>
-And thus we apply the configuration, visit <code>/example</code> on our
-web site, and we see the configuration has adapted to what we wrote in our
+And thus we apply the configuration, visit <code>/example</code> on our
+web site, and we see the configuration has adapted to what we wrote in our
configuration file.
</p>
</section>
@@ -1080,9 +1080,9 @@ configuration file.
<section id="context"><title>Context aware configurations</title>
<section id="context_intro"><title>Introduction to context aware configurations</title>
<p>
-In Apache HTTP Server 2.4, different URLs, virtual hosts, directories etc can have very
-different meanings to the user of the server, and thus different contexts
-within which modules must operate. For example, let's assume you have this
+In Apache HTTP Server 2.4, different URLs, virtual hosts, directories etc can have very
+different meanings to the user of the server, and thus different contexts
+within which modules must operate. For example, let's assume you have this
configuration set up for mod_rewrite:
</p>
<highlight language="config">
@@ -1095,22 +1095,22 @@ configuration set up for mod_rewrite:
</Directory>
</highlight>
<p>
-In this example, you will have set up two different contexts for
+In this example, you will have set up two different contexts for
mod_rewrite:</p>
<ol>
<li>Inside <code>/var/www</code>, all requests for <code>http://example.com</code> must go to <code>http://www.example.com</code></li>
<li>Inside <code>/var/www/sub</code>, all requests for <code>foobar</code> must go to <code>index.php?foobar=true</code></li>
</ol>
<p>
-If mod_rewrite (or the entire server for that matter) wasn't context aware, then
-these rewrite rules would just apply to every and any request made,
-regardless of where and how they were made, but since the module can pull
-the context specific configuration straight from the server, it does not need
-to know itself, which of the directives are valid in this context, since
+If mod_rewrite (or the entire server for that matter) wasn't context aware, then
+these rewrite rules would just apply to every and any request made,
+regardless of where and how they were made, but since the module can pull
+the context specific configuration straight from the server, it does not need
+to know itself, which of the directives are valid in this context, since
the server takes care of this.</p>
<p>
-So how does a module get the specific configuration for the server,
+So how does a module get the specific configuration for the server,
directory or location in question? It does so by making one simple call:
</p>
@@ -1121,17 +1121,17 @@ example_config *config = (example_config*) <a href="http://ci.apache.org/project
<!-- END EXAMPLE CODE -->
<p>
-That's it! Of course, a whole lot goes on behind the scenes, which we will
-discuss in this chapter, starting with how the server came to know what our
-configuration looks like, and how it came to be set up as it is in the
+That's it! Of course, a whole lot goes on behind the scenes, which we will
+discuss in this chapter, starting with how the server came to know what our
+configuration looks like, and how it came to be set up as it is in the
specific context.
</p>
</section>
<section id="context_base"><title>Our basic configuration setup</title>
-<p>In this chapter, we will be working with a slightly modified version of
-our previous context structure. We will set a <code>context</code>
-variable that we can use to track which context configuration is being
+<p>In this chapter, we will be working with a slightly modified version of
+our previous context structure. We will set a <code>context</code>
+variable that we can use to track which context configuration is being
used by the server in various places:
</p>
<!-- BEGIN EXAMPLE CODE -->
@@ -1168,8 +1168,8 @@ static int example_handler(request_rec *r)
<section id="context_which"><title>Choosing a context</title>
<p>
-Before we can start making our module context aware, we must first define,
-which contexts we will accept. As we saw in the previous chapter, defining
+Before we can start making our module context aware, we must first define,
+which contexts we will accept. As we saw in the previous chapter, defining
a directive required five elements be set:</p>
@@ -1180,12 +1180,12 @@ AP_INIT_TAKE1("exampleEnabled", example_set_enabled, NULL, RSRC_CONF, "Enable or
<!-- END EXAMPLE CODE -->
-<p>The <code>RSRC_CONF</code> definition told the server that we would only allow
-this directive in a global server context, but since we are now trying out
-a context aware version of our module, we should set this to something
-more lenient, namely the value <code>ACCESS_CONF</code>, which lets us use
-the directive inside <Directory> and <Location> blocks. For more
-control over the placement of your directives, you can combine the following
+<p>The <code>RSRC_CONF</code> definition told the server that we would only allow
+this directive in a global server context, but since we are now trying out
+a context aware version of our module, we should set this to something
+more lenient, namely the value <code>ACCESS_CONF</code>, which lets us use
+the directive inside <Directory> and <Location> blocks. For more
+control over the placement of your directives, you can combine the following
restrictions together to form a specific rule:
</p>
<ul>
@@ -1200,11 +1200,11 @@ restrictions together to form a specific rule:
</section>
<section id="context_pool"><title>Using the server to allocate configuration slots</title>
-<p> A much smarter way to manage your configurations is by letting the server
-help you create them. To do so, we must first start off by changing our
-<em>name tag</em> to let the server know, that it should assist us in creating
-and managing our configurations. Since we have chosen the per-directory
-(or per-location) context for our module configurations, we'll add a
+<p> A much smarter way to manage your configurations is by letting the server
+help you create them. To do so, we must first start off by changing our
+<em>name tag</em> to let the server know, that it should assist us in creating
+and managing our configurations. Since we have chosen the per-directory
+(or per-location) context for our module configurations, we'll add a
per-directory creator and merger function reference in our tag:</p>
<!-- BEGIN EXAMPLE CODE -->
@@ -1228,9 +1228,9 @@ module AP_MODULE_DECLARE_DATA example_module =
<section id="context_new"><title>Creating new context configurations</title>
<p>
-Now that we have told the server to help us create and manage configurations,
-our first step is to make a function for creating new, blank
-configurations. We do so by creating the function we just referenced in
+Now that we have told the server to help us create and manage configurations,
+our first step is to make a function for creating new, blank
+configurations. We do so by creating the function we just referenced in
our name tag as the Per-directory configuration handler:</p>
<!-- BEGIN EXAMPLE CODE -->
<highlight language="c">
@@ -1254,9 +1254,9 @@ void *create_dir_conf(apr_pool_t *pool, char *context) {
<section id="context_merge"><title>Merging configurations</title>
<p>
-Our next step in creating a context aware configuration is merging
-configurations. This part of the process particularly applies to scenarios
-where you have a parent configuration and a child, such as the following:
+Our next step in creating a context aware configuration is merging
+configurations. This part of the process particularly applies to scenarios
+where you have a parent configuration and a child, such as the following:
</p>
<highlight language="config">
<Directory "/var/www">
@@ -1271,8 +1271,8 @@ where you have a parent configuration and a child, such as the following:
<p>
In this example, it is natural to assume that the directory <code>
/var/www/subdir</code> should inherit the values set for the <code>/var/www
-</code> directory, as we did not specify an <code>ExampleEnabled</code> nor
-an <code>ExamplePath</code> for this directory. The server does not presume to
+</code> directory, as we did not specify an <code>ExampleEnabled</code> nor
+an <code>ExamplePath</code> for this directory. The server does not presume to
know if this is true, but cleverly does the following:
</p>
<ol>
@@ -1283,8 +1283,8 @@ know if this is true, but cleverly does the following:
<li><strong>Proposes a merge</strong> of the two configurations into a new configuration for <code>/var/www/subdir</code></li>
</ol>
<p>
-This proposal is handled by the <code>merge_dir_conf</code> function we
-referenced in our name tag. The purpose of this function is to assess the
+This proposal is handled by the <code>merge_dir_conf</code> function we
+referenced in our name tag. The purpose of this function is to assess the
two configurations and decide how they are to be merged:</p>
@@ -1294,12 +1294,12 @@ void *merge_dir_conf(apr_pool_t *pool, void *BASE, void *ADD) {
example_config *base = (example_config *) BASE ; /* This is what was set in the parent context */
example_config *add = (example_config *) ADD ; /* This is what is set in the new context */
example_config *conf = (example_config *) create_dir_conf(pool, "Merged configuration"); /* This will be the merged configuration */
-
+
/* Merge configurations */
conf->enabled = ( add->enabled == 0 ) ? base->enabled : add->enabled ;
conf->typeOfAction = add->typeOfAction ? add->typeOfAction : base->typeOfAction;
strcpy(conf->path, strlen(add->path) ? add->path : base->path);
-
+
return conf ;
}
</highlight>
@@ -1310,8 +1310,8 @@ void *merge_dir_conf(apr_pool_t *pool, void *BASE, void *ADD) {
<section id="context_example"><title>Trying out our new context aware configurations</title>
<p>
-Now, let's try putting it all together to create a new module that is
-context aware. First off, we'll create a configuration that lets us test
+Now, let's try putting it all together to create a new module that is
+context aware. First off, we'll create a configuration that lets us test
how the module works:
</p>
<highlight language="config">
@@ -1334,8 +1334,8 @@ how the module works:
</Location>
</highlight>
<p>
-Then we'll assemble our module code. Note, that since we are now using our
-name tag as reference when fetching configurations in our handler, I have
+Then we'll assemble our module code. Note, that since we are now using our
+name tag as reference when fetching configurations in our handler, I have
added some prototypes to keep the compiler happy:
</p>
@@ -1576,11 +1576,11 @@ void *merge_dir_conf(apr_pool_t *pool, void *BASE, void *ADD)
<section id="summary"><title>Summing up</title>
<p>
-We have now looked at how to create simple modules for Apache HTTP Server 2.4 and
-configuring them. What you do next is entirely up to you, but it is my
-hope that something valuable has come out of reading this documentation.
-If you have questions on how to further develop modules, you are welcome
-to join our <a href="http://httpd.apache.org/lists.html">mailing lists</a>
+We have now looked at how to create simple modules for Apache HTTP Server 2.4 and
+configuring them. What you do next is entirely up to you, but it is my
+hope that something valuable has come out of reading this documentation.
+If you have questions on how to further develop modules, you are welcome
+to join our <a href="http://httpd.apache.org/lists.html">mailing lists</a>
or check out the rest of our documentation for further tips.
</p>
</section>
@@ -1718,7 +1718,7 @@ static int util_read(request_rec *r, const char **rbuf, apr_off_t *size)
return(rc);
}
-static int example_handler(request_rec *r)
+static int example_handler(request_rec *r)
{
/*~~~~~~~~~~~~~~~~*/
apr_off_t size;
diff --git a/docs/manual/developer/new_api_2_4.html.en b/docs/manual/developer/new_api_2_4.html.en
index b3089fa1c7..415663b1dd 100644
--- a/docs/manual/developer/new_api_2_4.html.en
+++ b/docs/manual/developer/new_api_2_4.html.en
@@ -28,7 +28,7 @@
version 2.2 to 2.4, that may be of interest to module/application
developers and core hacks. As of the first GA release of the
2.4 branch API compatibility is preserved for the life of the
- 2.4 branch. (The
+ 2.4 branch. (The
<a href="http://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x/VERSIONING">VERSIONING</a>
description for the 2.4 release provides more information about API
compatibility.)</p>
@@ -117,9 +117,9 @@
<li>New API to retain data across module unload/load</li>
<li>New <code>check_config</code> hook</li>
<li>New <code>ap_process_fnmatch_configs()</code> function to process wildcards</li>
- <li>Change <code>ap_configfile_t</code>, <code>ap_cfg_getline()</code>,
- <code>ap_cfg_getc()</code> to return error codes, and add
- <code>ap_pcfg_strerror()</code> for retrieving an error description.</li>
+ <li>Change <code>ap_configfile_t</code>, <code>ap_cfg_getline()</code>,
+ <code>ap_cfg_getc()</code> to return error codes, and add
+ <code>ap_pcfg_strerror()</code> for retrieving an error description.</li>
<li>Any config directive permitted in ACCESS_CONF context must now
correctly handle being called from an .htaccess file via the new
<code class="directive"><a href="../mod/core.html#allowoverridelist">AllowOverrideList</a></code> directive.
@@ -131,7 +131,7 @@
<h3><a name="http_core" id="http_core">http_core (changed)</a></h3>
<ul>
- <li>REMOVED <code>ap_default_type</code>, <code>ap_requires</code>, all
+ <li>REMOVED <code>ap_default_type</code>, <code>ap_requires</code>, all
2.2 authnz API</li>
<li>Introduces Optional Functions for logio and authnz</li>
<li>New function <code>ap_get_server_name_for_url</code> to support IPv6
@@ -159,11 +159,11 @@
<li>Support for mod_request kept_body</li>
<li>Support buffering filter data for async requests</li>
<li>New <code>CONN_STATE</code> values</li>
- <li>Function changes: <code>ap_escape_html</code> updated;
+ <li>Function changes: <code>ap_escape_html</code> updated;
<code>ap_unescape_all</code>, <code>ap_escape_path_segment_buffer</code></li>
<li>Modules that load other modules later than the <code>EXEC_ON_READ</code> config
reading stage need to call <code>ap_reserve_module_slots()</code> or
- <code>ap_reserve_module_slots_directive()</code> in their
+ <code>ap_reserve_module_slots_directive()</code> in their
<code>pre_config hook</code>.</li>
<li>The useragent IP address per request can now be tracked
independently of the client IP address of the connection, for
@@ -191,16 +191,16 @@
<li>New auth_internal API and auth_provider API</li>
<li>New <code>EOR</code> bucket type</li>
<li>New function <code>ap_process_async_request</code></li>
- <li>New flags <code>AP_AUTH_INTERNAL_PER_CONF</code> and
+ <li>New flags <code>AP_AUTH_INTERNAL_PER_CONF</code> and
<code>AP_AUTH_INTERNAL_PER_URI</code></li>
- <li>New <code>access_checker_ex</code> hook to apply additional access control
+ <li>New <code>access_checker_ex</code> hook to apply additional access control
and/or bypass authentication.</li>
- <li>New functions <code>ap_hook_check_access_ex</code>,
- <code>ap_hook_check_access</code>, <code>ap_hook_check_authn</code>,
- <code>ap_hook_check_authz</code> which accept
+ <li>New functions <code>ap_hook_check_access_ex</code>,
+ <code>ap_hook_check_access</code>, <code>ap_hook_check_authn</code>,
+ <code>ap_hook_check_authz</code> which accept
<code>AP_AUTH_INTERNAL_PER_*</code> flags</li>
- <li>DEPRECATED direct use of <code>ap_hook_access_checker</code>,
- <code>access_checker_ex</code>, <code>ap_hook_check_user_id</code>,
+ <li>DEPRECATED direct use of <code>ap_hook_access_checker</code>,
+ <code>access_checker_ex</code>, <code>ap_hook_check_user_id</code>,
<code>ap_hook_auth_checker</code></li>
</ul>
<p>When possible, registering all access control hooks (including
@@ -213,7 +213,7 @@
<p>If your module requires the old behavior and must perform access
control checks on every sub-request with a different URI from the
initial request, even if that URI matches the same set of access
- control configuration directives, then use
+ control configuration directives, then use
<code>AP_AUTH_INTERNAL_PER_URI</code>.</p>
@@ -224,7 +224,7 @@
<h3><a name="mod_cache" id="mod_cache">mod_cache (changed)</a></h3>
- <p>Introduces a <code>commit_entity()</code> function to the cache provider
+ <p>Introduces a <code>commit_entity()</code> function to the cache provider
interface, allowing atomic writes to cache. Add a <code>cache_status()</code>
hook to report the cache decision. All private structures and functions were
removed.</p>
@@ -265,10 +265,10 @@
<code>set_scoreboard</code> (locking uses the new ap_mutex API)</li>
<li>NEW API to drop privileges (delegates this platform-dependent
function to modules)</li>
- <li>NEW Hooks: <code>mpm_query</code>, <code>timed_callback</code>, and
+ <li>NEW Hooks: <code>mpm_query</code>, <code>timed_callback</code>, and
<code>get_name</code></li>
<li>CHANGED interfaces: <code>monitor</code> hook,
- <code>ap_reclaim_child_processes</code>,
+ <code>ap_reclaim_child_processes</code>,
<code>ap_relieve_child_processes</code></li>
</ul>
@@ -493,9 +493,9 @@
<dt><code>unixd_config</code></dt>
<dd>This has been renamed to ap_unixd_config.</dd>
- <dt><code>conn_rec->remote_ip</code> and
+ <dt><code>conn_rec->remote_ip</code> and
<code>conn_rec->remote_addr</code></dt>
- <dd>These fields have been renamed in order to distinguish between
+ <dd>These fields have been renamed in order to distinguish between
the client IP address of the connection and the useragent IP address
of the request (potentially overridden by a load balancer or proxy).
References to either of these fields must be updated with one of the
@@ -509,7 +509,7 @@
<li>When you require the IP address of the client that is
connected directly to the server, which might be the useragent or
might be the load balancer or proxy itself, use
- <code>conn_rec->client_ip</code> and
+ <code>conn_rec->client_ip</code> and
<code>conn_rec->client_addr</code>.</li>
</ul>
</dd>
diff --git a/docs/manual/developer/new_api_2_4.xml b/docs/manual/developer/new_api_2_4.xml
index 179e8fdaf3..b494549757 100644
--- a/docs/manual/developer/new_api_2_4.xml
+++ b/docs/manual/developer/new_api_2_4.xml
@@ -29,7 +29,7 @@
version 2.2 to 2.4, that may be of interest to module/application
developers and core hacks. As of the first GA release of the
2.4 branch API compatibility is preserved for the life of the
- 2.4 branch. (The
+ 2.4 branch. (The
<a href="http://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x/VERSIONING">VERSIONING</a>
description for the 2.4 release provides more information about API
compatibility.)</p>
@@ -114,9 +114,9 @@
<li>New API to retain data across module unload/load</li>
<li>New <code>check_config</code> hook</li>
<li>New <code>ap_process_fnmatch_configs()</code> function to process wildcards</li>
- <li>Change <code>ap_configfile_t</code>, <code>ap_cfg_getline()</code>,
- <code>ap_cfg_getc()</code> to return error codes, and add
- <code>ap_pcfg_strerror()</code> for retrieving an error description.</li>
+ <li>Change <code>ap_configfile_t</code>, <code>ap_cfg_getline()</code>,
+ <code>ap_cfg_getc()</code> to return error codes, and add
+ <code>ap_pcfg_strerror()</code> for retrieving an error description.</li>
<li>Any config directive permitted in ACCESS_CONF context must now
correctly handle being called from an .htaccess file via the new
<directive module="core">AllowOverrideList</directive> directive.
@@ -128,7 +128,7 @@
<section id="http_core">
<title>http_core (changed)</title>
<ul>
- <li>REMOVED <code>ap_default_type</code>, <code>ap_requires</code>, all
+ <li>REMOVED <code>ap_default_type</code>, <code>ap_requires</code>, all
2.2 authnz API</li>
<li>Introduces Optional Functions for logio and authnz</li>
<li>New function <code>ap_get_server_name_for_url</code> to support IPv6
@@ -156,11 +156,11 @@
<li>Support for mod_request kept_body</li>
<li>Support buffering filter data for async requests</li>
<li>New <code>CONN_STATE</code> values</li>
- <li>Function changes: <code>ap_escape_html</code> updated;
+ <li>Function changes: <code>ap_escape_html</code> updated;
<code>ap_unescape_all</code>, <code>ap_escape_path_segment_buffer</code></li>
<li>Modules that load other modules later than the <code>EXEC_ON_READ</code> config
reading stage need to call <code>ap_reserve_module_slots()</code> or
- <code>ap_reserve_module_slots_directive()</code> in their
+ <code>ap_reserve_module_slots_directive()</code> in their
<code>pre_config hook</code>.</li>
<li>The useragent IP address per request can now be tracked
independently of the client IP address of the connection, for
@@ -188,16 +188,16 @@
<li>New auth_internal API and auth_provider API</li>
<li>New <code>EOR</code> bucket type</li>
<li>New function <code>ap_process_async_request</code></li>
- <li>New flags <code>AP_AUTH_INTERNAL_PER_CONF</code> and
+ <li>New flags <code>AP_AUTH_INTERNAL_PER_CONF</code> and
<code>AP_AUTH_INTERNAL_PER_URI</code></li>
- <li>New <code>access_checker_ex</code> hook to apply additional access control
+ <li>New <code>access_checker_ex</code> hook to apply additional access control
and/or bypass authentication.</li>
- <li>New functions <code>ap_hook_check_access_ex</code>,
- <code>ap_hook_check_access</code>, <code>ap_hook_check_authn</code>,
- <code>ap_hook_check_authz</code> which accept
+ <li>New functions <code>ap_hook_check_access_ex</code>,
+ <code>ap_hook_check_access</code>, <code>ap_hook_check_authn</code>,
+ <code>ap_hook_check_authz</code> which accept
<code>AP_AUTH_INTERNAL_PER_*</code> flags</li>
- <li>DEPRECATED direct use of <code>ap_hook_access_checker</code>,
- <code>access_checker_ex</code>, <code>ap_hook_check_user_id</code>,
+ <li>DEPRECATED direct use of <code>ap_hook_access_checker</code>,
+ <code>access_checker_ex</code>, <code>ap_hook_check_user_id</code>,
<code>ap_hook_auth_checker</code></li>
</ul>
<p>When possible, registering all access control hooks (including
@@ -210,7 +210,7 @@
<p>If your module requires the old behavior and must perform access
control checks on every sub-request with a different URI from the
initial request, even if that URI matches the same set of access
- control configuration directives, then use
+ control configuration directives, then use
<code>AP_AUTH_INTERNAL_PER_URI</code>.</p>
</section>
@@ -221,7 +221,7 @@
<section id="mod_cache">
<title>mod_cache (changed)</title>
- <p>Introduces a <code>commit_entity()</code> function to the cache provider
+ <p>Introduces a <code>commit_entity()</code> function to the cache provider
interface, allowing atomic writes to cache. Add a <code>cache_status()</code>
hook to report the cache decision. All private structures and functions were
removed.</p>
@@ -262,10 +262,10 @@
<code>set_scoreboard</code> (locking uses the new ap_mutex API)</li>
<li>NEW API to drop privileges (delegates this platform-dependent
function to modules)</li>
- <li>NEW Hooks: <code>mpm_query</code>, <code>timed_callback</code>, and
+ <li>NEW Hooks: <code>mpm_query</code>, <code>timed_callback</code>, and
<code>get_name</code></li>
<li>CHANGED interfaces: <code>monitor</code> hook,
- <code>ap_reclaim_child_processes</code>,
+ <code>ap_reclaim_child_processes</code>,
<code>ap_relieve_child_processes</code></li>
</ul>
</section>
@@ -490,9 +490,9 @@
<dt><code>unixd_config</code></dt>
<dd>This has been renamed to ap_unixd_config.</dd>
- <dt><code>conn_rec->remote_ip</code> and
+ <dt><code>conn_rec->remote_ip</code> and
<code>conn_rec->remote_addr</code></dt>
- <dd>These fields have been renamed in order to distinguish between
+ <dd>These fields have been renamed in order to distinguish between
the client IP address of the connection and the useragent IP address
of the request (potentially overridden by a load balancer or proxy).
References to either of these fields must be updated with one of the
@@ -506,7 +506,7 @@
<li>When you require the IP address of the client that is
connected directly to the server, which might be the useragent or
might be the load balancer or proxy itself, use
- <code>conn_rec->client_ip</code> and
+ <code>conn_rec->client_ip</code> and
<code>conn_rec->client_addr</code>.</li>
</ul>
</dd>
diff --git a/docs/manual/developer/output-filters.html.en b/docs/manual/developer/output-filters.html.en
index 8261d9669d..9056b19a20 100644
--- a/docs/manual/developer/output-filters.html.en
+++ b/docs/manual/developer/output-filters.html.en
@@ -314,10 +314,10 @@ apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb)
{
struct dummy_state *state;
-
+
state = f->ctx;
if (state == NULL) {
-
+
/* First invocation for this response: initialise state structure.
*/
f->ctx = state = apr_palloc(f->r->pool, sizeof *state);
diff --git a/docs/manual/developer/output-filters.xml b/docs/manual/developer/output-filters.xml
index 25658e7d69..5ae281f60d 100644
--- a/docs/manual/developer/output-filters.xml
+++ b/docs/manual/developer/output-filters.xml
@@ -320,10 +320,10 @@ apr_status_t dummy_filter(ap_filter_t *f, apr_bucket_brigade *bb)
{
struct dummy_state *state;
-
+
state = f->ctx;
if (state == NULL) {
-
+
/* First invocation for this response: initialise state structure.
*/
f->ctx = state = apr_palloc(f->r->pool, sizeof *state);
diff --git a/docs/manual/developer/request.html.en b/docs/manual/developer/request.html.en
index 9337a8bc6e..d3a44eedfb 100644
--- a/docs/manual/developer/request.html.en
+++ b/docs/manual/developer/request.html.en
@@ -36,7 +36,7 @@
<p>The first major change is to the subrequest and redirect
mechanisms. There were a number of different code paths in
- the Apache HTTP Server 1.3 to attempt to optimize subrequest
+ the Apache HTTP Server 1.3 to attempt to optimize subrequest
or redirect behavior. As patches were introduced to 2.0, these
optimizations (and the server behavior) were quickly broken due
to this duplication of code. All duplicate code has been folded
diff --git a/docs/manual/developer/request.xml b/docs/manual/developer/request.xml
index b54e41e3d0..3bc48c27b7 100644
--- a/docs/manual/developer/request.xml
+++ b/docs/manual/developer/request.xml
@@ -38,7 +38,7 @@
<p>The first major change is to the subrequest and redirect
mechanisms. There were a number of different code paths in
- the Apache HTTP Server 1.3 to attempt to optimize subrequest
+ the Apache HTTP Server 1.3 to attempt to optimize subrequest
or redirect behavior. As patches were introduced to 2.0, these
optimizations (and the server behavior) were quickly broken due
to this duplication of code. All duplicate code has been folded
@@ -216,4 +216,3 @@ if ((access_status = ap_run_auth_checker(r)) != 0) {
</section>
</section>
</manualpage>
-
diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja
index 44474e688e..8379c7feeb 100644
--- a/docs/manual/env.xml.ja
+++ b/docs/manual/env.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 659902:1673892 (outdated) -->
+<!-- English Revision: 659902:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/env.xml.ko b/docs/manual/env.xml.ko
index 2c05cdb682..d2beda435c 100644
--- a/docs/manual/env.xml.ko
+++ b/docs/manual/env.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1673892 (outdated) -->
+<!-- English Revision: 105989:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/env.xml.tr b/docs/manual/env.xml.tr
index 69237040da..e194fa712c 100644
--- a/docs/manual/env.xml.tr
+++ b/docs/manual/env.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1300910:1673892 (outdated) -->
+<!-- English Revision: 1300910:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr
index ad43fdb4d3..c9687b4cf7 100644
--- a/docs/manual/expr.xml.fr
+++ b/docs/manual/expr.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
-<!-- English Revision: 1663123:1673908 (outdated) -->
+<!-- English Revision: 1663123:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/glossary.html.en b/docs/manual/glossary.html.en
index f55951dfe1..2825b9c8c2 100644
--- a/docs/manual/glossary.html.en
+++ b/docs/manual/glossary.html.en
@@ -422,8 +422,8 @@
<dt><a name="subrequest" id="subrequest">Subrequest</a></dt>
<dd>Apache provides a subrequest API to modules that allows other
filesystem or URL paths to be partially or fully evaluated by
- the server. Example consumers of this API are
- <code class="directive"><a href="./mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>,
+ the server. Example consumers of this API are
+ <code class="directive"><a href="./mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>,
<code class="module"><a href="./mod/mod_autoindex.html">mod_autoindex</a></code>, and <code class="module"><a href="./mod/mod_include.html">mod_include</a></code>.
</dd>
diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml
index f8900d5c7e..e8a858faba 100644
--- a/docs/manual/glossary.xml
+++ b/docs/manual/glossary.xml
@@ -436,8 +436,8 @@
<dt><a name="subrequest" id="subrequest">Subrequest</a></dt>
<dd>Apache provides a subrequest API to modules that allows other
filesystem or URL paths to be partially or fully evaluated by
- the server. Example consumers of this API are
- <directive module="mod_dir">DirectoryIndex</directive>,
+ the server. Example consumers of this API are
+ <directive module="mod_dir">DirectoryIndex</directive>,
<module>mod_autoindex</module>, and <module>mod_include</module>.
</dd>
diff --git a/docs/manual/handler.xml.es b/docs/manual/handler.xml.es
index e7b704cb45..64f322c8fb 100644
--- a/docs/manual/handler.xml.es
+++ b/docs/manual/handler.xml.es
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 151408:1673892 (outdated) -->
+<!-- English Revision: 151408:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/handler.xml.fr b/docs/manual/handler.xml.fr
index 749b4aeac8..60cd6eecca 100644
--- a/docs/manual/handler.xml.fr
+++ b/docs/manual/handler.xml.fr
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1330883:1673892 (outdated) -->
+<!-- English Revision: 1330883:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/handler.xml.ja b/docs/manual/handler.xml.ja
index 1d28bfeeb8..662e16ddb1 100644
--- a/docs/manual/handler.xml.ja
+++ b/docs/manual/handler.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 1330883:1673892 (outdated) -->
+<!-- English Revision: 1330883:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/handler.xml.ko b/docs/manual/handler.xml.ko
index 3e5ad54d40..a092057f89 100644
--- a/docs/manual/handler.xml.ko
+++ b/docs/manual/handler.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1673892 (outdated) -->
+<!-- English Revision: 151408:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/handler.xml.tr b/docs/manual/handler.xml.tr
index 611272c74a..3b0a1558fe 100644
--- a/docs/manual/handler.xml.tr
+++ b/docs/manual/handler.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1174747:1673892 (outdated) -->
+<!-- English Revision: 1174747:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/handler.xml.zh-cn b/docs/manual/handler.xml.zh-cn
index fae1d059d5..0169377967 100644
--- a/docs/manual/handler.xml.zh-cn
+++ b/docs/manual/handler.xml.zh-cn
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.zh-cn.xsl"?>
-<!-- English Revision: 420990:1673892 (outdated) -->
+<!-- English Revision: 420990:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/access.xml.fr b/docs/manual/howto/access.xml.fr
index 28088c4cc0..4555dd59f6 100644
--- a/docs/manual/howto/access.xml.fr
+++ b/docs/manual/howto/access.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- English Revision: 1666025:1673932 (outdated) -->
+<!-- English Revision: 1666025:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/howto/cgi.xml.fr b/docs/manual/howto/cgi.xml.fr
index 1e3425fe11..df463d295b 100644
--- a/docs/manual/howto/cgi.xml.fr
+++ b/docs/manual/howto/cgi.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1336196:1673917 (outdated) -->
+<!-- English Revision: 1336196:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/howto/cgi.xml.ja b/docs/manual/howto/cgi.xml.ja
index d92899ceba..b1e1f3466e 100644
--- a/docs/manual/howto/cgi.xml.ja
+++ b/docs/manual/howto/cgi.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 545841:1673917 (outdated) -->
+<!-- English Revision: 545841:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/cgi.xml.ko b/docs/manual/howto/cgi.xml.ko
index f56193d4a3..af9da64fab 100644
--- a/docs/manual/howto/cgi.xml.ko
+++ b/docs/manual/howto/cgi.xml.ko
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1673917 (outdated) -->
+<!-- English Revision: 105989:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/ssi.html.en b/docs/manual/howto/ssi.html.en
index d6b9695081..da142c9164 100644
--- a/docs/manual/howto/ssi.html.en
+++ b/docs/manual/howto/ssi.html.en
@@ -436,7 +436,7 @@ modified?</a></h3>
it is nonempty.) For a full list of the comparison operators
available to you, see the <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
documentation.</p>
-
+
<p>For example, if you wish to customize the text on your web page
based on the time of day, you could use the following recipe, placed
in the HTML page:</p>
diff --git a/docs/manual/howto/ssi.xml b/docs/manual/howto/ssi.xml
index 776b7df9cf..0671563a0d 100644
--- a/docs/manual/howto/ssi.xml
+++ b/docs/manual/howto/ssi.xml
@@ -444,7 +444,7 @@ modified?</title>
it is nonempty.) For a full list of the comparison operators
available to you, see the <module>mod_include</module>
documentation.</p>
-
+
<p>For example, if you wish to customize the text on your web page
based on the time of day, you could use the following recipe, placed
in the HTML page:</p>
diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index fda4461dbb..e96435e6fc 100644
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -138,20 +138,20 @@
(be sure the directory names do not have version numbers; for example,
the APR distribution must be under ./srclib/apr/) and use
<code>./configure</code>'s <code>--with-included-apr</code>
- option. On some platforms, you may have to install the
- corresponding <code>-dev</code> packages to allow httpd to build
+ option. On some platforms, you may have to install the
+ corresponding <code>-dev</code> packages to allow httpd to build
against your installed copy of APR and APR-Util.</dd>
<dt>Perl-Compatible Regular Expressions Library (PCRE)</dt>
- <dd>This library is required but not longer bundled with httpd.
- Download the source code from <a href="http://www.pcre.org/">http://www.pcre.org</a>,
+ <dd>This library is required but not longer bundled with httpd.
+ Download the source code from <a href="http://www.pcre.org/">http://www.pcre.org</a>,
or install a Port or Package. If your build system can't find
the pcre-config script installed by the PCRE build, point to it
- using the <code>--with-pcre</code> parameter. On some platforms,
- you may have to install the corresponding <code>-dev</code>
- package to allow httpd to build against your installed copy
+ using the <code>--with-pcre</code> parameter. On some platforms,
+ you may have to install the corresponding <code>-dev</code>
+ package to allow httpd to build against your installed copy
of PCRE.</dd>
-
+
<dt>Disk Space</dt>
<dd>Make sure you have at least 50 MB of temporary free disk
space available. After installation the server occupies
diff --git a/docs/manual/install.xml b/docs/manual/install.xml
index 31c3a21cc3..6e6554cf69 100644
--- a/docs/manual/install.xml
+++ b/docs/manual/install.xml
@@ -30,7 +30,7 @@
on Unix and Unix-like systems only. For compiling and
installation on Windows, see <a
href="platform/windows.html">Using Apache HTTP Server with Microsoft
- Windows</a> and <a
+ Windows</a> and <a
href="platform/win_compiling.html">Compiling Apache for Microsoft Windows</a>.
For other platforms, see the <a
href="platform/">platform</a> documentation.</p>
@@ -127,20 +127,20 @@
(be sure the directory names do not have version numbers; for example,
the APR distribution must be under ./srclib/apr/) and use
<code>./configure</code>'s <code>--with-included-apr</code>
- option. On some platforms, you may have to install the
- corresponding <code>-dev</code> packages to allow httpd to build
+ option. On some platforms, you may have to install the
+ corresponding <code>-dev</code> packages to allow httpd to build
against your installed copy of APR and APR-Util.</dd>
<dt>Perl-Compatible Regular Expressions Library (PCRE)</dt>
- <dd>This library is required but not longer bundled with httpd.
- Download the source code from <a href="http://www.pcre.org/">http://www.pcre.org</a>,
+ <dd>This library is required but not longer bundled with httpd.
+ Download the source code from <a href="http://www.pcre.org/">http://www.pcre.org</a>,
or install a Port or Package. If your build system can't find
the pcre-config script installed by the PCRE build, point to it
- using the <code>--with-pcre</code> parameter. On some platforms,
- you may have to install the corresponding <code>-dev</code>
- package to allow httpd to build against your installed copy
+ using the <code>--with-pcre</code> parameter. On some platforms,
+ you may have to install the corresponding <code>-dev</code>
+ package to allow httpd to build against your installed copy
of PCRE.</dd>
-
+
<dt>Disk Space</dt>
<dd>Make sure you have at least 50 MB of temporary free disk
space available. After installation the server occupies
diff --git a/docs/manual/mod/index.html.de b/docs/manual/mod/index.html.de
index 8c848b8ee0..78704db2c0 100644
--- a/docs/manual/mod/index.html.de
+++ b/docs/manual/mod/index.html.de
@@ -249,7 +249,7 @@ identifier for each request</dd>
<dt><a href="mod_version.html" id="V" name="V">mod_version</a></dt><dd>Version dependent configuration</dd>
<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
hosting</dd>
-<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
+<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
tasks</dd>
<dt><a href="mod_xml2enc.html" id="X" name="X">mod_xml2enc</a></dt><dd>Enhanced charset/internationalisation support for libxml2-based
filter modules</dd>
diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en
index 48674ce5d8..7e1bbeb042 100644
--- a/docs/manual/mod/index.html.en
+++ b/docs/manual/mod/index.html.en
@@ -245,7 +245,7 @@ identifier for each request</dd>
<dt><a href="mod_version.html" id="V" name="V">mod_version</a></dt><dd>Version dependent configuration</dd>
<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
hosting</dd>
-<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
+<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
tasks</dd>
<dt><a href="mod_xml2enc.html" id="X" name="X">mod_xml2enc</a></dt><dd>Enhanced charset/internationalisation support for libxml2-based
filter modules</dd>
diff --git a/docs/manual/mod/index.html.es b/docs/manual/mod/index.html.es
index 4c7d7a27af..2ad8b06d91 100644
--- a/docs/manual/mod/index.html.es
+++ b/docs/manual/mod/index.html.es
@@ -250,7 +250,7 @@ identifier for each request</dd>
<dt><a href="mod_version.html" id="V" name="V">mod_version</a></dt><dd>Version dependent configuration</dd>
<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
hosting</dd>
-<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
+<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
tasks</dd>
<dt><a href="mod_xml2enc.html" id="X" name="X">mod_xml2enc</a></dt><dd>Enhanced charset/internationalisation support for libxml2-based
filter modules</dd>
diff --git a/docs/manual/mod/index.html.fr b/docs/manual/mod/index.html.fr
index 113d6c828f..caa3af7537 100644
--- a/docs/manual/mod/index.html.fr
+++ b/docs/manual/mod/index.html.fr
@@ -263,7 +263,7 @@ identifiant unique pour chaque requ
<dt><a href="mod_version.html" id="V" name="V">mod_version</a></dt><dd>Version dependent configuration</dd>
<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
hosting</dd>
-<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
+<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
tasks</dd>
<dt><a href="mod_xml2enc.html" id="X" name="X">mod_xml2enc</a></dt><dd>Enhanced charset/internationalisation support for libxml2-based
filter modules</dd>
diff --git a/docs/manual/mod/index.html.ja.utf8 b/docs/manual/mod/index.html.ja.utf8
index 4fe5c8b06f..9cd556d6e8 100644
--- a/docs/manual/mod/index.html.ja.utf8
+++ b/docs/manual/mod/index.html.ja.utf8
@@ -235,7 +235,7 @@ Layer (SSL) and Transport Layer Security (TLS) protocols</dd>
<dt><a href="mod_version.html" id="V" name="V">mod_version</a></dt><dd>ãã¼ã¸ã§ã³ä¾åã®è¨å®</dd>
<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
hosting</dd>
-<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
+<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
tasks</dd>
<dt><a href="mod_xml2enc.html" id="X" name="X">mod_xml2enc</a></dt><dd>Enhanced charset/internationalisation support for libxml2-based
filter modules</dd>
diff --git a/docs/manual/mod/index.html.ko.euc-kr b/docs/manual/mod/index.html.ko.euc-kr
index 3565bd4cd4..4f8006ddb2 100644
--- a/docs/manual/mod/index.html.ko.euc-kr
+++ b/docs/manual/mod/index.html.ko.euc-kr
@@ -231,7 +231,7 @@ Layer (SSL) and Transport Layer Security (TLS) protocols</dd>
<dt><a href="mod_version.html" id="V" name="V">mod_version</a></dt><dd>¹öÀüº° ¼³Á¤</dd>
<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
hosting</dd>
-<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
+<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
tasks</dd>
<dt><a href="mod_xml2enc.html" id="X" name="X">mod_xml2enc</a></dt><dd>Enhanced charset/internationalisation support for libxml2-based
filter modules</dd>
diff --git a/docs/manual/mod/index.html.tr.utf8 b/docs/manual/mod/index.html.tr.utf8
index 873195dab7..3a20870bc6 100644
--- a/docs/manual/mod/index.html.tr.utf8
+++ b/docs/manual/mod/index.html.tr.utf8
@@ -238,7 +238,7 @@ identifier for each request</dd>
</dd>
<dt><a href="mod_version.html" id="V" name="V">mod_version</a></dt><dd>Version dependent configuration</dd>
<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Kitlesel sanal konakların devingen olarak yapılandırılmasını saÄlar</dd>
-<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
+<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
tasks</dd>
<dt><a href="mod_xml2enc.html" id="X" name="X">mod_xml2enc</a></dt><dd>Enhanced charset/internationalisation support for libxml2-based
filter modules</dd>
diff --git a/docs/manual/mod/index.html.zh-cn.utf8 b/docs/manual/mod/index.html.zh-cn.utf8
index ef2fab6432..cc57690ffa 100644
--- a/docs/manual/mod/index.html.zh-cn.utf8
+++ b/docs/manual/mod/index.html.zh-cn.utf8
@@ -240,7 +240,7 @@ identifier for each request</dd>
<dt><a href="mod_version.html" id="V" name="V">mod_version</a></dt><dd>Version dependent configuration</dd>
<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
hosting</dd>
-<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
+<dt><a href="mod_watchdog.html" id="W" name="W">mod_watchdog</a></dt><dd>provides infrastructure for other modules to periodically run
tasks</dd>
<dt><a href="mod_xml2enc.html" id="X" name="X">mod_xml2enc</a></dt><dd>Enhanced charset/internationalisation support for libxml2-based
filter modules</dd>
diff --git a/docs/manual/mod/mod_access_compat.xml.fr b/docs/manual/mod/mod_access_compat.xml.fr
index e0ef50168c..372e7b6f11 100644
--- a/docs/manual/mod/mod_access_compat.xml.fr
+++ b/docs/manual/mod/mod_access_compat.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1421821:1673892 (outdated) -->
+<!-- English Revision: 1421821:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_access_compat.xml.ja b/docs/manual/mod/mod_access_compat.xml.ja
index 983688de7d..7a68ebf638 100644
--- a/docs/manual/mod/mod_access_compat.xml.ja
+++ b/docs/manual/mod/mod_access_compat.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 675568:1673892 (outdated) -->
+<!-- English Revision: 675568:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_alias.xml.fr b/docs/manual/mod/mod_alias.xml.fr
index d3823a86f4..a701cfc806 100644
--- a/docs/manual/mod/mod_alias.xml.fr
+++ b/docs/manual/mod/mod_alias.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1653941:1673908 (outdated) -->
+<!-- English Revision: 1653941:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_alias.xml.ja b/docs/manual/mod/mod_alias.xml.ja
index b961c026a4..066ffa3146 100644
--- a/docs/manual/mod/mod_alias.xml.ja
+++ b/docs/manual/mod/mod_alias.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408:1673908 (outdated) -->
+<!-- English Revision: 151408:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_alias.xml.ko b/docs/manual/mod/mod_alias.xml.ko
index acf2bb37f8..0819a8d5df 100644
--- a/docs/manual/mod/mod_alias.xml.ko
+++ b/docs/manual/mod/mod_alias.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1673908 (outdated) -->
+<!-- English Revision: 151408:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_alias.xml.tr b/docs/manual/mod/mod_alias.xml.tr
index bbdb160279..4a25492684 100644
--- a/docs/manual/mod/mod_alias.xml.tr
+++ b/docs/manual/mod/mod_alias.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1174747:1673908 (outdated) -->
+<!-- English Revision: 1174747:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_allowmethods.xml.fr b/docs/manual/mod/mod_allowmethods.xml.fr
index 4d4c66eddc..81c9008b01 100644
--- a/docs/manual/mod/mod_allowmethods.xml.fr
+++ b/docs/manual/mod/mod_allowmethods.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1330911:1673892 (outdated) -->
+<!-- English Revision: 1330911:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_auth_digest.html.en b/docs/manual/mod/mod_auth_digest.html.en
index 6d5a605beb..c72b493d19 100644
--- a/docs/manual/mod/mod_auth_digest.html.en
+++ b/docs/manual/mod/mod_auth_digest.html.en
@@ -87,7 +87,7 @@
AuthType Digest
AuthName "private area"
AuthDigestDomain "/private/" "http://mirror.my.dom/private2/"
-
+
AuthDigestProvider file
AuthUserFile "/web/auth/.digest_pw"
Require valid-user
diff --git a/docs/manual/mod/mod_auth_digest.xml b/docs/manual/mod/mod_auth_digest.xml
index 7e3382f665..4ec93aacb3 100644
--- a/docs/manual/mod/mod_auth_digest.xml
+++ b/docs/manual/mod/mod_auth_digest.xml
@@ -68,7 +68,7 @@
AuthType Digest
AuthName "private area"
AuthDigestDomain "/private/" "http://mirror.my.dom/private2/"
-
+
AuthDigestProvider file
AuthUserFile "/web/auth/.digest_pw"
Require valid-user
diff --git a/docs/manual/mod/mod_authn_anon.html.en b/docs/manual/mod/mod_authn_anon.html.en
index ed7c11af71..1322535731 100644
--- a/docs/manual/mod/mod_authn_anon.html.en
+++ b/docs/manual/mod/mod_authn_anon.html.en
@@ -98,13 +98,13 @@
AuthType Basic
AuthBasicProvider file anon
AuthUserFile "/path/to/your/.htpasswd"
-
+
Anonymous_NoUserID off
Anonymous_MustGiveEmail on
Anonymous_VerifyEmail on
Anonymous_LogEmail on
Anonymous anonymous guest www test welcome
-
+
Require valid-user
</Directory></pre>
</div>
diff --git a/docs/manual/mod/mod_authn_anon.xml b/docs/manual/mod/mod_authn_anon.xml
index 778a11504e..330b07a37b 100644
--- a/docs/manual/mod/mod_authn_anon.xml
+++ b/docs/manual/mod/mod_authn_anon.xml
@@ -86,13 +86,13 @@
AuthType Basic
AuthBasicProvider file anon
AuthUserFile "/path/to/your/.htpasswd"
-
+
Anonymous_NoUserID off
Anonymous_MustGiveEmail on
Anonymous_VerifyEmail on
Anonymous_LogEmail on
Anonymous anonymous guest www test welcome
-
+
Require valid-user
</Directory>
</highlight>
diff --git a/docs/manual/mod/mod_authn_core.html.en b/docs/manual/mod/mod_authn_core.html.en
index 4192656142..05d6e09c41 100644
--- a/docs/manual/mod/mod_authn_core.html.en
+++ b/docs/manual/mod/mod_authn_core.html.en
@@ -74,13 +74,13 @@
</AuthnProviderAlias>
# Then check here
-<AuthnProviderAlias file file2>
+<AuthnProviderAlias file file2>
AuthUserFile "/www/conf/passwords2"
</AuthnProviderAlias>
<Directory "/var/web/pages/secure">
AuthBasicProvider file1 file2
-
+
AuthType Basic
AuthName "Protected Area"
Require valid-user
@@ -107,13 +107,13 @@ Alias "/secure" "/webpages/secure"
<Directory "/webpages/secure">
Order deny,allow
Allow from all
-
+
AuthBasicProvider ldap-other-alias ldap-alias1
-
+
AuthType Basic
AuthName "LDAP Protected Place"
Require valid-user
- # Note that Require ldap-* would not work here, since the
+ # Note that Require ldap-* would not work here, since the
# AuthnProviderAlias does not provide the config to authorization providers
# that are implemented in the same module as the authentication provider.
</Directory></pre>
diff --git a/docs/manual/mod/mod_authn_core.xml b/docs/manual/mod/mod_authn_core.xml
index 3c349d73a6..97a00ee49b 100644
--- a/docs/manual/mod/mod_authn_core.xml
+++ b/docs/manual/mod/mod_authn_core.xml
@@ -61,13 +61,13 @@
</AuthnProviderAlias>
# Then check here
-<AuthnProviderAlias file file2>
+<AuthnProviderAlias file file2>
AuthUserFile "/www/conf/passwords2"
</AuthnProviderAlias>
<Directory "/var/web/pages/secure">
AuthBasicProvider file1 file2
-
+
AuthType Basic
AuthName "Protected Area"
Require valid-user
@@ -97,13 +97,13 @@ Alias "/secure" "/webpages/secure"
<Directory "/webpages/secure">
Order deny,allow
Allow from all
-
+
AuthBasicProvider ldap-other-alias ldap-alias1
-
+
AuthType Basic
AuthName "LDAP Protected Place"
Require valid-user
- # Note that Require ldap-* would not work here, since the
+ # Note that Require ldap-* would not work here, since the
# AuthnProviderAlias does not provide the config to authorization providers
# that are implemented in the same module as the authentication provider.
</Directory>
diff --git a/docs/manual/mod/mod_authn_socache.xml.fr b/docs/manual/mod/mod_authn_socache.xml.fr
index 3e682bb48f..b7b0606a49 100644
--- a/docs/manual/mod/mod_authn_socache.xml.fr
+++ b/docs/manual/mod/mod_authn_socache.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1659902:1673892 (outdated) -->
+<!-- English Revision: 1659902:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en
index a9eb23b231..a3d289cab8 100644
--- a/docs/manual/mod/mod_authz_core.html.en
+++ b/docs/manual/mod/mod_authz_core.html.en
@@ -135,12 +135,12 @@
with <code>KnockKnock/2.0</code> will be allowed access, and all
others will be denied.</p>
- <p>When the server looks up a path via an internal
- <a class="glossarylink" href="../glossary.html#subrequest" title="see glossary">subrequest</a> such as looking
- for a <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
+ <p>When the server looks up a path via an internal
+ <a class="glossarylink" href="../glossary.html#subrequest" title="see glossary">subrequest</a> such as looking
+ for a <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
or generating a directory listing with <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>,
- per-request environment variables are <em>not</em> inherited in the
- subrequest. Additionally,
+ per-request environment variables are <em>not</em> inherited in the
+ subrequest. Additionally,
<code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> directives
are not separately evaluated in the subrequest due to the API phases
<code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> takes action in.</p>
@@ -198,7 +198,7 @@
<pre class="prettyprint lang-config"><RequireAll>
Require expr "!(%{QUERY_STRING} =~ /secret/)"
- Require expr "%{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
+ Require expr "%{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
</RequireAll></pre>
diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml
index 26c3ce2df6..57001b9bd0 100644
--- a/docs/manual/mod/mod_authz_core.xml
+++ b/docs/manual/mod/mod_authz_core.xml
@@ -117,12 +117,12 @@ SetEnvIf User-Agent "^KnockKnock/2\.0" let_me_in
with <code>KnockKnock/2.0</code> will be allowed access, and all
others will be denied.</p>
- <p>When the server looks up a path via an internal
- <glossary ref="subrequest">subrequest</glossary> such as looking
- for a <directive module="mod_dir" >DirectoryIndex</directive>
+ <p>When the server looks up a path via an internal
+ <glossary ref="subrequest">subrequest</glossary> such as looking
+ for a <directive module="mod_dir" >DirectoryIndex</directive>
or generating a directory listing with <module>mod_autoindex</module>,
- per-request environment variables are <em>not</em> inherited in the
- subrequest. Additionally,
+ per-request environment variables are <em>not</em> inherited in the
+ subrequest. Additionally,
<directive module="mod_setenvif">SetEnvIf</directive> directives
are not separately evaluated in the subrequest due to the API phases
<module>mod_setenvif</module> takes action in.</p>
@@ -186,12 +186,12 @@ SetEnvIf User-Agent "^KnockKnock/2\.0" let_me_in
<highlight language="config">
<RequireAll>
Require expr "!(%{QUERY_STRING} =~ /secret/)"
- Require expr "%{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
+ Require expr "%{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
</RequireAll>
</highlight>
<highlight language="config">
- Require expr "!(%{QUERY_STRING} =~ /secret/) && %{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
+ Require expr "!(%{QUERY_STRING} =~ /secret/) && %{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
</highlight>
<p>The syntax is described in the <a href="../expr.html">ap_expr</a>
diff --git a/docs/manual/mod/mod_autoindex.xml.fr b/docs/manual/mod/mod_autoindex.xml.fr
index 92fe7e695b..56c62df93d 100644
--- a/docs/manual/mod/mod_autoindex.xml.fr
+++ b/docs/manual/mod/mod_autoindex.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1598137:1673892 (outdated) -->
+<!-- English Revision: 1598137:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_autoindex.xml.ja b/docs/manual/mod/mod_autoindex.xml.ja
index a0421c4f51..f8a07469ef 100644
--- a/docs/manual/mod/mod_autoindex.xml.ja
+++ b/docs/manual/mod/mod_autoindex.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 689261:1673892 (outdated) -->
+<!-- English Revision: 689261:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_autoindex.xml.ko b/docs/manual/mod/mod_autoindex.xml.ko
index f1598e5d7a..f1d77890ab 100644
--- a/docs/manual/mod/mod_autoindex.xml.ko
+++ b/docs/manual/mod/mod_autoindex.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 103423:1673892 (outdated) -->
+<!-- English Revision: 103423:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_autoindex.xml.tr b/docs/manual/mod/mod_autoindex.xml.tr
index 396eb6edcb..32446971a6 100644
--- a/docs/manual/mod/mod_autoindex.xml.tr
+++ b/docs/manual/mod/mod_autoindex.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1303788:1673892 (outdated) -->
+<!-- English Revision: 1303788:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_cache.xml.fr b/docs/manual/mod/mod_cache.xml.fr
index 8ef287048c..1ccf75f208 100644
--- a/docs/manual/mod/mod_cache.xml.fr
+++ b/docs/manual/mod/mod_cache.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1590566:1673892 (outdated) -->
+<!-- English Revision: 1590566:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_cache.xml.ja b/docs/manual/mod/mod_cache.xml.ja
index c8dee0feb5..af80c0284b 100644
--- a/docs/manual/mod/mod_cache.xml.ja
+++ b/docs/manual/mod/mod_cache.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 504183:1673892 (outdated) -->
+<!-- English Revision: 504183:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_cache.xml.ko b/docs/manual/mod/mod_cache.xml.ko
index da71787739..43d8e94a5a 100644
--- a/docs/manual/mod/mod_cache.xml.ko
+++ b/docs/manual/mod/mod_cache.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105569:1673892 (outdated) -->
+<!-- English Revision: 105569:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_cgid.html.en b/docs/manual/mod/mod_cgid.html.en
index 1c0c3d9351..9dfea66e64 100644
--- a/docs/manual/mod/mod_cgid.html.en
+++ b/docs/manual/mod/mod_cgid.html.en
@@ -81,7 +81,7 @@
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The length of time to wait for more output from the
CGI program</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CGIDScriptTimeout <var>time</var>[s|ms]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>value of <code class="directive"><a href="../mod/core.html#timeout">Timeout</a></code> directive when
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>value of <code class="directive"><a href="../mod/core.html#timeout">Timeout</a></code> directive when
unset</code></td></tr>
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
@@ -90,7 +90,7 @@ unset</code></td></tr>
</td></tr>
</table>
<p>This directive limits the length of time to wait for more output from
- the CGI program. If the time is exceeded, the request and CGI are
+ the CGI program. If the time is exceeded, the request and CGI are
terminated.</p>
<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">CGIDScriptTimeout 20</pre>
@@ -118,7 +118,7 @@ the cgi daemon</td></tr>
write in the directory where the socket is located.</p>
<p>If <var>file-path</var> is not an absolute path, the location specified
- will be relative to the value of
+ will be relative to the value of
<code class="directive"><a href="../mod/core.html#defaultruntimedir">DefaultRuntimeDir</a></code>.</p>
<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">ScriptSock /var/run/cgid.sock</pre>
diff --git a/docs/manual/mod/mod_cgid.html.ja.utf8 b/docs/manual/mod/mod_cgid.html.ja.utf8
index c2f9e5996c..8cf30f1527 100644
--- a/docs/manual/mod/mod_cgid.html.ja.utf8
+++ b/docs/manual/mod/mod_cgid.html.ja.utf8
@@ -80,7 +80,7 @@
<tr><th><a href="directive-dict.html#Description">説æ:</a></th><td>The length of time to wait for more output from the
CGI program</td></tr>
<tr><th><a href="directive-dict.html#Syntax">æ§æ:</a></th><td><code>CGIDScriptTimeout <var>time</var>[s|ms]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">ããã©ã«ã:</a></th><td><code>value of <code class="directive"><a href="../mod/core.html#timeout">Timeout</a></code> directive when
+<tr><th><a href="directive-dict.html#Default">ããã©ã«ã:</a></th><td><code>value of <code class="directive"><a href="../mod/core.html#timeout">Timeout</a></code> directive when
unset</code></td></tr>
<tr><th><a href="directive-dict.html#Context">ã³ã³ããã¹ã:</a></th><td>ãµã¼ãè¨å®ãã¡ã¤ã«, ãã¼ãã£ã«ãã¹ã, ãã£ã¬ã¯ããª, .htaccess</td></tr>
<tr><th><a href="directive-dict.html#Status">ã¹ãã¼ã¿ã¹:</a></th><td>Base</td></tr>
diff --git a/docs/manual/mod/mod_cgid.html.ko.euc-kr b/docs/manual/mod/mod_cgid.html.ko.euc-kr
index 19764fc02d..83c889595f 100644
--- a/docs/manual/mod/mod_cgid.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cgid.html.ko.euc-kr
@@ -78,7 +78,7 @@
<tr><th><a href="directive-dict.html#Description">¼³¸í:</a></th><td>The length of time to wait for more output from the
CGI program</td></tr>
<tr><th><a href="directive-dict.html#Syntax">¹®¹ý:</a></th><td><code>CGIDScriptTimeout <var>time</var>[s|ms]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">±âº»°ª:</a></th><td><code>value of <code class="directive"><a href="../mod/core.html#timeout">Timeout</a></code> directive when
+<tr><th><a href="directive-dict.html#Default">±âº»°ª:</a></th><td><code>value of <code class="directive"><a href="../mod/core.html#timeout">Timeout</a></code> directive when
unset</code></td></tr>
<tr><th><a href="directive-dict.html#Context">»ç¿ëÀå¼Ò:</a></th><td>ÁÖ¼¹ö¼³Á¤, °¡»óÈ£½ºÆ®, directory, .htaccess</td></tr>
<tr><th><a href="directive-dict.html#Status">»óÅÂ:</a></th><td>Base</td></tr>
diff --git a/docs/manual/mod/mod_cgid.xml b/docs/manual/mod/mod_cgid.xml
index a901ebb5d0..6c462ff191 100644
--- a/docs/manual/mod/mod_cgid.xml
+++ b/docs/manual/mod/mod_cgid.xml
@@ -90,7 +90,7 @@ the cgi daemon</description>
write in the directory where the socket is located.</p>
<p>If <var>file-path</var> is not an absolute path, the location specified
- will be relative to the value of
+ will be relative to the value of
<directive module="core">DefaultRuntimeDir</directive>.</p>
<example><title>Example</title>
@@ -107,7 +107,7 @@ the cgi daemon</description>
<description>The length of time to wait for more output from the
CGI program</description>
<syntax>CGIDScriptTimeout <var>time</var>[s|ms]</syntax>
-<default>value of <directive module="core">Timeout</directive> directive when
+<default>value of <directive module="core">Timeout</directive> directive when
unset</default>
<contextlist><context>server config</context>
<context>virtual host</context><context>directory</context>
@@ -117,7 +117,7 @@ unset</default>
<usage>
<p>This directive limits the length of time to wait for more output from
- the CGI program. If the time is exceeded, the request and CGI are
+ the CGI program. If the time is exceeded, the request and CGI are
terminated.</p>
<example><title>Example</title>
@@ -130,4 +130,3 @@ unset</default>
</directivesynopsis>
</modulesynopsis>
-
diff --git a/docs/manual/mod/mod_dbd.html.en b/docs/manual/mod/mod_dbd.html.en
index 263e5ccdb3..1e5fe1a18c 100644
--- a/docs/manual/mod/mod_dbd.html.en
+++ b/docs/manual/mod/mod_dbd.html.en
@@ -134,7 +134,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
<p>It is up to dbd user modules to use the prepared statements
and document what statements can be specified in httpd.conf,
or to provide their own directives and use <code>ap_dbd_prepare</code>.</p>
-
+
<div class="warning"><h3>Caveat</h3>
When using prepared statements with a MySQL database, it is preferred to set
<code>reconnect</code> to 0 in the connection string as to avoid errors that
@@ -203,9 +203,9 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_dbd</td></tr>
</table>
- <p>Modules, that wish it, can have one or more SQL statements
- executed when a connection to a database is created. Example
- usage could be initializing certain values or adding a log
+ <p>Modules, that wish it, can have one or more SQL statements
+ executed when a connection to a database is created. Example
+ usage could be initializing certain values or adding a log
entry when a new connection is made to the database.</p>
</div>
diff --git a/docs/manual/mod/mod_dbd.xml b/docs/manual/mod/mod_dbd.xml
index cf246cb61a..5c6e605fdc 100644
--- a/docs/manual/mod/mod_dbd.xml
+++ b/docs/manual/mod/mod_dbd.xml
@@ -110,7 +110,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
<p>It is up to dbd user modules to use the prepared statements
and document what statements can be specified in httpd.conf,
or to provide their own directives and use <code>ap_dbd_prepare</code>.</p>
-
+
<note type="warning"><title>Caveat</title>
When using prepared statements with a MySQL database, it is preferred to set
<code>reconnect</code> to 0 in the connection string as to avoid errors that
@@ -308,9 +308,9 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
</contextlist>
<usage>
- <p>Modules, that wish it, can have one or more SQL statements
- executed when a connection to a database is created. Example
- usage could be initializing certain values or adding a log
+ <p>Modules, that wish it, can have one or more SQL statements
+ executed when a connection to a database is created. Example
+ usage could be initializing certain values or adding a log
entry when a new connection is made to the database.</p>
</usage>
</directivesynopsis>
diff --git a/docs/manual/mod/mod_deflate.xml.fr b/docs/manual/mod/mod_deflate.xml.fr
index 8bf98ceaf5..d594ed80c0 100644
--- a/docs/manual/mod/mod_deflate.xml.fr
+++ b/docs/manual/mod/mod_deflate.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1655917:1673930 (outdated) -->
+<!-- English Revision: 1655917:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_deflate.xml.ja b/docs/manual/mod/mod_deflate.xml.ja
index 65bba7d667..b3658a3e2e 100644
--- a/docs/manual/mod/mod_deflate.xml.ja
+++ b/docs/manual/mod/mod_deflate.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1673930 (outdated) -->
+<!-- English Revision: 420990:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_deflate.xml.ko b/docs/manual/mod/mod_deflate.xml.ko
index 86a896705d..09a842cb20 100644
--- a/docs/manual/mod/mod_deflate.xml.ko
+++ b/docs/manual/mod/mod_deflate.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1673930 (outdated) -->
+<!-- English Revision: 151408:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_dialup.xml.fr b/docs/manual/mod/mod_dialup.xml.fr
index efa697b6de..074586f1aa 100644
--- a/docs/manual/mod/mod_dialup.xml.fr
+++ b/docs/manual/mod/mod_dialup.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1330980:1673892 (outdated) -->
+<!-- English Revision: 1330980:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_dir.xml.fr b/docs/manual/mod/mod_dir.xml.fr
index ffe345a2dd..4d156a493c 100644
--- a/docs/manual/mod/mod_dir.xml.fr
+++ b/docs/manual/mod/mod_dir.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1586471:1673892 (outdated) -->
+<!-- English Revision: 1586471:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_dir.xml.ja b/docs/manual/mod/mod_dir.xml.ja
index 59c3c675a1..4e7c2d82bf 100644
--- a/docs/manual/mod/mod_dir.xml.ja
+++ b/docs/manual/mod/mod_dir.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1673892 (outdated) -->
+<!-- English Revision: 420990:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_dir.xml.ko b/docs/manual/mod/mod_dir.xml.ko
index 40fc879f5b..3d8d1ab96a 100644
--- a/docs/manual/mod/mod_dir.xml.ko
+++ b/docs/manual/mod/mod_dir.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1673892 (outdated) -->
+<!-- English Revision: 151408:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_dir.xml.tr b/docs/manual/mod/mod_dir.xml.tr
index e08359bd01..cdda1847d7 100644
--- a/docs/manual/mod/mod_dir.xml.tr
+++ b/docs/manual/mod/mod_dir.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1307726:1673892 (outdated) -->
+<!-- English Revision: 1307726:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_env.html.en b/docs/manual/mod/mod_env.html.en
index 2aea58f0b9..a74b6abee3 100644
--- a/docs/manual/mod/mod_env.html.en
+++ b/docs/manual/mod/mod_env.html.en
@@ -92,7 +92,7 @@ SSI pages</td></tr>
<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">SetEnv SPECIAL_PATH /foo/bin</pre>
</div>
-
+
<p> If you omit the <var>value</var> argument, the variable is set to
an empty string.</p>
diff --git a/docs/manual/mod/mod_env.xml b/docs/manual/mod/mod_env.xml
index 73062037bb..5116b39f41 100644
--- a/docs/manual/mod/mod_env.xml
+++ b/docs/manual/mod/mod_env.xml
@@ -80,7 +80,7 @@ SSI pages</description>
SetEnv SPECIAL_PATH /foo/bin
</highlight>
</example>
-
+
<p> If you omit the <var>value</var> argument, the variable is set to
an empty string.</p>
@@ -119,4 +119,3 @@ SSI pages</description>
</directivesynopsis>
</modulesynopsis>
-
diff --git a/docs/manual/mod/mod_ext_filter.xml.fr b/docs/manual/mod/mod_ext_filter.xml.fr
index 9898d91924..69834d44df 100644
--- a/docs/manual/mod/mod_ext_filter.xml.fr
+++ b/docs/manual/mod/mod_ext_filter.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1669200:1673892 (outdated) -->
+<!-- English Revision: 1669200:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_ext_filter.xml.ja b/docs/manual/mod/mod_ext_filter.xml.ja
index ba8222eeb8..be3a9ee1ce 100644
--- a/docs/manual/mod/mod_ext_filter.xml.ja
+++ b/docs/manual/mod/mod_ext_filter.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1673892 (outdated) -->
+<!-- English Revision: 420990:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_ext_filter.xml.ko b/docs/manual/mod/mod_ext_filter.xml.ko
index e1e590fda6..2528d87343 100644
--- a/docs/manual/mod/mod_ext_filter.xml.ko
+++ b/docs/manual/mod/mod_ext_filter.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1673892 (outdated) -->
+<!-- English Revision: 105989:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_firehose.html.en b/docs/manual/mod/mod_firehose.html.en
index 214b95d1a5..dbb61945b4 100644
--- a/docs/manual/mod/mod_firehose.html.en
+++ b/docs/manual/mod/mod_firehose.html.en
@@ -77,7 +77,7 @@
<p>To enable the module, it should be compiled and loaded
in to your running Apache configuration, and the directives below
used to record the data you are interested in.</p>
-
+
<p>It is possible to record both incoming and outgoing data to
the same filename if desired, as the direction of flow is recorded
within each fragment.</p>
@@ -107,7 +107,7 @@
<p>The server typically serves multiple connections simultaneously,
and as a result requests and responses need to be multiplexed before
being written to the firehose.</p>
-
+
<p>The fragment format is designed as clear text, so that a firehose
can be opened with and inspected by a normal text editor.
Alternatively, the <code class="program"><a href="../programs/firehose.html">firehose</a></code> tool can be used to
diff --git a/docs/manual/mod/mod_firehose.xml b/docs/manual/mod/mod_firehose.xml
index b1fcd6c3ab..c0c9570063 100644
--- a/docs/manual/mod/mod_firehose.xml
+++ b/docs/manual/mod/mod_firehose.xml
@@ -57,7 +57,7 @@
<p>To enable the module, it should be compiled and loaded
in to your running Apache configuration, and the directives below
used to record the data you are interested in.</p>
-
+
<p>It is possible to record both incoming and outgoing data to
the same filename if desired, as the direction of flow is recorded
within each fragment.</p>
@@ -87,7 +87,7 @@
<p>The server typically serves multiple connections simultaneously,
and as a result requests and responses need to be multiplexed before
being written to the firehose.</p>
-
+
<p>The fragment format is designed as clear text, so that a firehose
can be opened with and inspected by a normal text editor.
Alternatively, the <program>firehose</program> tool can be used to
diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index d18fcea6f4..9d7a65d932 100644
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -215,7 +215,7 @@ Header merge Cache-Control no-store env=NO_STORE</pre>
<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_headers</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>SetIfEmpty available in 2.4.7 and later, expr=value
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>SetIfEmpty available in 2.4.7 and later, expr=value
available in 2.4.10 and later</td></tr>
</table>
<p>This directive can replace, merge or remove HTTP response
@@ -225,7 +225,7 @@ available in 2.4.10 and later</td></tr>
<p> The optional <var>condition</var> argument determines which internal
table of responses headers this directive will operate against. Despite the
- name, the default value of <code>onsuccess</code> does <em>not</em> limit
+ name, the default value of <code>onsuccess</code> does <em>not</em> limit
an <var>action</var> to responses with a 2xx status code. Headers set under
this condition are still used when, for example, a request is <em>successfully</em>
proxied or generated by CGI, even when they have generated a failing status code.</p>
@@ -233,7 +233,7 @@ available in 2.4.10 and later</td></tr>
<p>When your action is a function of an existing header, you may need to specify
a condition of <code>always</code>, depending on which internal table the
original header was set in. The table that corresponds to <code>always</code> is
- used for locally generated error responses as well as successful responses.
+ used for locally generated error responses as well as successful responses.
Note also that repeating this directive with both conditions makes sense in
some scenarios because <code>always</code> is not a superset of
<code>onsuccess</code> with respect to existing headers:</p>
@@ -250,8 +250,8 @@ available in 2.4.10 and later</td></tr>
<code>onsuccess</code> condition.</li>
</ul>
- <p>Separately from the <var>condition</var> parameter described above, you
- can limit an action based on HTTP status codes for e.g. proxied or CGI
+ <p>Separately from the <var>condition</var> parameter described above, you
+ can limit an action based on HTTP status codes for e.g. proxied or CGI
requests. See the example that uses %{REQUEST_STATUS} in the section above.</p>
<p>The action it performs is determined by the first
@@ -334,11 +334,11 @@ available in 2.4.10 and later</td></tr>
<code>add</code> a <var>value</var> is specified as the next argument.
If <var>value</var>
contains spaces, it should be surrounded by double quotes.
- <var>value</var> may be a character string, a string containing
- <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> specific format specifiers (and character
+ <var>value</var> may be a character string, a string containing
+ <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> specific format specifiers (and character
literals), or an <a href="../expr.html">ap_expr</a> expression prefixed
with <em>expr=</em></p>
-
+
<p> The following format specifiers are supported in <var>value</var>:</p>
<table class="bordered"><tr class="header"><th>Format</th><th>Description</th></tr>
@@ -394,15 +394,15 @@ available in 2.4.10 and later</td></tr>
<em>boolean</em> expressions such as <If>:</p>
<ul>
<li>The starting point of the grammar is 'string' rather than 'expr'.</li>
- <li>Function calls use the %{funcname:arg} syntax rather than
+ <li>Function calls use the %{funcname:arg} syntax rather than
funcname(arg).</li>
<li>Multi-argument functions are not currently accessible from this
starting point</li>
- <li>Quote the entire parameter, such as
+ <li>Quote the entire parameter, such as
<pre class="prettyprint lang-config">Header set foo-checksum "expr=%{md5:foo}"</pre>
</li>
-
+
</ul>
</div>
@@ -430,7 +430,7 @@ available in 2.4.10 and later</td></tr>
<code class="directive">Header</code> directives are processed just
before the response is sent to the network. This means that it is
possible to set and/or override most headers, except for some headers
- added by the HTTP header filter. Prior to 2.2.12, it was not possible
+ added by the HTTP header filter. Prior to 2.2.12, it was not possible
to change the Content-Type header with this directive.</p>
@@ -447,7 +447,7 @@ available in 2.4.10 and later</td></tr>
<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_headers</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>SetIfEmpty available in 2.4.7 and later, expr=value
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>SetIfEmpty available in 2.4.7 and later, expr=value
available in 2.4.10 and later</td></tr>
</table>
<p>This directive can replace, merge, change or remove HTTP request
diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index 5a7dedb893..5be4520836 100644
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -207,7 +207,7 @@ Header merge Cache-Control no-store env=NO_STORE
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
-<compatibility>SetIfEmpty available in 2.4.7 and later, expr=value
+<compatibility>SetIfEmpty available in 2.4.7 and later, expr=value
available in 2.4.10 and later</compatibility>
<usage>
@@ -318,7 +318,7 @@ available in 2.4.10 and later</compatibility>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
-<compatibility>SetIfEmpty available in 2.4.7 and later, expr=value
+<compatibility>SetIfEmpty available in 2.4.7 and later, expr=value
available in 2.4.10 and later</compatibility>
<usage>
@@ -329,7 +329,7 @@ available in 2.4.10 and later</compatibility>
<p> The optional <var>condition</var> argument determines which internal
table of responses headers this directive will operate against. Despite the
- name, the default value of <code>onsuccess</code> does <em>not</em> limit
+ name, the default value of <code>onsuccess</code> does <em>not</em> limit
an <var>action</var> to responses with a 2xx status code. Headers set under
this condition are still used when, for example, a request is <em>successfully</em>
proxied or generated by CGI, even when they have generated a failing status code.</p>
@@ -337,7 +337,7 @@ available in 2.4.10 and later</compatibility>
<p>When your action is a function of an existing header, you may need to specify
a condition of <code>always</code>, depending on which internal table the
original header was set in. The table that corresponds to <code>always</code> is
- used for locally generated error responses as well as successful responses.
+ used for locally generated error responses as well as successful responses.
Note also that repeating this directive with both conditions makes sense in
some scenarios because <code>always</code> is not a superset of
<code>onsuccess</code> with respect to existing headers:</p>
@@ -354,8 +354,8 @@ available in 2.4.10 and later</compatibility>
<code>onsuccess</code> condition.</li>
</ul>
- <p>Separately from the <var>condition</var> parameter described above, you
- can limit an action based on HTTP status codes for e.g. proxied or CGI
+ <p>Separately from the <var>condition</var> parameter described above, you
+ can limit an action based on HTTP status codes for e.g. proxied or CGI
requests. See the example that uses %{REQUEST_STATUS} in the section above.</p>
<p>The action it performs is determined by the first
@@ -439,11 +439,11 @@ available in 2.4.10 and later</compatibility>
<code>add</code> a <var>value</var> is specified as the next argument.
If <var>value</var>
contains spaces, it should be surrounded by double quotes.
- <var>value</var> may be a character string, a string containing
- <module>mod_headers</module> specific format specifiers (and character
+ <var>value</var> may be a character string, a string containing
+ <module>mod_headers</module> specific format specifiers (and character
literals), or an <a href="../expr.html">ap_expr</a> expression prefixed
with <em>expr=</em></p>
-
+
<p> The following format specifiers are supported in <var>value</var>:</p>
<table border="1" style="zebra">
@@ -509,16 +509,16 @@ available in 2.4.10 and later</compatibility>
<em>boolean</em> expressions such as <If>:</p>
<ul>
<li>The starting point of the grammar is 'string' rather than 'expr'.</li>
- <li>Function calls use the %{funcname:arg} syntax rather than
+ <li>Function calls use the %{funcname:arg} syntax rather than
funcname(arg).</li>
<li>Multi-argument functions are not currently accessible from this
starting point</li>
- <li>Quote the entire parameter, such as
+ <li>Quote the entire parameter, such as
<highlight language="config">
Header set foo-checksum "expr=%{md5:foo}"
</highlight>
</li>
-
+
</ul>
</note>
@@ -547,11 +547,10 @@ available in 2.4.10 and later</compatibility>
<directive>Header</directive> directives are processed just
before the response is sent to the network. This means that it is
possible to set and/or override most headers, except for some headers
- added by the HTTP header filter. Prior to 2.2.12, it was not possible
+ added by the HTTP header filter. Prior to 2.2.12, it was not possible
to change the Content-Type header with this directive.</p>
</usage>
</directivesynopsis>
</modulesynopsis>
-
diff --git a/docs/manual/mod/mod_heartbeat.html.en b/docs/manual/mod/mod_heartbeat.html.en
index be6d9f3b89..c819c861b6 100644
--- a/docs/manual/mod/mod_heartbeat.html.en
+++ b/docs/manual/mod/mod_heartbeat.html.en
@@ -33,14 +33,14 @@
<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3 and later</td></tr></table>
<h3>Summary</h3>
-<p> <code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code> sends multicast messages to a <code class="module"><a href="../mod/mod_heartmonitor.html">mod_heartmonitor</a></code> listener
+<p> <code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code> sends multicast messages to a <code class="module"><a href="../mod/mod_heartmonitor.html">mod_heartmonitor</a></code> listener
that advertises the servers current connection count. Usually, <code class="module"><a href="../mod/mod_heartmonitor.html">mod_heartmonitor</a></code>
will be running on a proxy server with <code class="module"><a href="../mod/mod_lbmethod_heartbeat.html">mod_lbmethod_heartbeat</a></code> loaded, which allows
<code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> to use the "heartbeat" <em>lbmethod</em> inside
of <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code>.</p>
<p>
- <code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code> itself is loaded on the origin server(s) that serve requests
- through the proxy server(s).
+ <code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code> itself is loaded on the origin server(s) that serve requests
+ through the proxy server(s).
</p>
<div class="warning">
@@ -69,7 +69,7 @@ of <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</
packet is a simple ASCII format, similar to GET query parameters
in HTTP.
</p>
-
+
<div class="example"><h3>An Example Packet</h3><p><code>
v=1&ready=75&busy=0
</code></p></div>
@@ -96,7 +96,7 @@ status information. This address will usually correspond to a configured
<code class="directive"><a href="../mod/mod_heartmonitor.html#heartbeatlisten">HeartbeatListen</a></code> on a
frontend proxy system.</p>
<pre class="prettyprint lang-config">HeartbeatAddress 239.0.0.1:27999</pre>
-
+
</div>
</div>
diff --git a/docs/manual/mod/mod_heartbeat.xml b/docs/manual/mod/mod_heartbeat.xml
index b0b1e1242a..4c14dfa769 100644
--- a/docs/manual/mod/mod_heartbeat.xml
+++ b/docs/manual/mod/mod_heartbeat.xml
@@ -30,14 +30,14 @@
<compatibility>Available in Apache 2.3 and later</compatibility>
<summary>
-<p> <module>mod_heartbeat</module> sends multicast messages to a <module>mod_heartmonitor</module> listener
+<p> <module>mod_heartbeat</module> sends multicast messages to a <module>mod_heartmonitor</module> listener
that advertises the servers current connection count. Usually, <module>mod_heartmonitor</module>
will be running on a proxy server with <module>mod_lbmethod_heartbeat</module> loaded, which allows
<directive module="mod_proxy">ProxyPass</directive> to use the "heartbeat" <em>lbmethod</em> inside
of <directive module="mod_proxy">ProxyPass</directive>.</p>
<p>
- <module>mod_heartbeat</module> itself is loaded on the origin server(s) that serve requests
- through the proxy server(s).
+ <module>mod_heartbeat</module> itself is loaded on the origin server(s) that serve requests
+ through the proxy server(s).
</p>
<note type="warning">
@@ -57,7 +57,7 @@ of <directive module="mod_proxy">ProxyPass</directive>.</p>
packet is a simple ASCII format, similar to GET query parameters
in HTTP.
</p>
-
+
<example><title>An Example Packet</title>
v=1&ready=75&busy=0
</example>
@@ -84,7 +84,7 @@ status information. This address will usually correspond to a configured
frontend proxy system.</p>
<highlight language="config">
HeartbeatAddress 239.0.0.1:27999
-</highlight>
+</highlight>
</usage>
</directivesynopsis>
diff --git a/docs/manual/mod/mod_heartmonitor.html.en b/docs/manual/mod/mod_heartmonitor.html.en
index 4d6ffb07b0..536d8e3072 100644
--- a/docs/manual/mod/mod_heartmonitor.html.en
+++ b/docs/manual/mod/mod_heartmonitor.html.en
@@ -34,10 +34,10 @@
<h3>Summary</h3>
<p>
-<code class="module"><a href="../mod/mod_heartmonitor.html">mod_heartmonitor</a></code> listens for server status messages generated
-by <code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code> enabled origin servers and makes their status
-available to <code class="module"><a href="../mod/mod_lbmethod_heartbeat.html">mod_lbmethod_heartbeat</a></code>. This allows
-<code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> to use the "heartbeat"
+<code class="module"><a href="../mod/mod_heartmonitor.html">mod_heartmonitor</a></code> listens for server status messages generated
+by <code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code> enabled origin servers and makes their status
+available to <code class="module"><a href="../mod/mod_lbmethod_heartbeat.html">mod_lbmethod_heartbeat</a></code>. This allows
+<code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> to use the "heartbeat"
<em>lbmethod</em> inside of <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code>.
</p>
@@ -72,11 +72,11 @@ use <code class="module"><a href="../mod/mod_slotmem_shm.html">mod_slotmem_shm</
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_heartmonitor</td></tr>
</table>
<p>The <code class="directive">HeartbeatListen</code> directive specifies the
- multicast address on which the server will listen for status information from
+ multicast address on which the server will listen for status information from
<code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code>-enabled servers. This
address will usually correspond to a configured <code class="directive"><a href="../mod/mod_heartbeat.html#heartbeataddress">HeartbeatAddress</a></code> on an origin server.
</p>
-
+
<pre class="prettyprint lang-config">HeartbeatListen 239.0.0.1:27999</pre>
@@ -86,7 +86,7 @@ use <code class="module"><a href="../mod/mod_slotmem_shm.html">mod_slotmem_shm</
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="HeartbeatMaxServers" id="HeartbeatMaxServers">HeartbeatMaxServers</a> <a name="heartbeatmaxservers" id="heartbeatmaxservers">Directive</a></h2>
<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies the maximum number of servers that will be sending
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies the maximum number of servers that will be sending
heartbeat requests to this server</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>HeartbeatMaxServers <var>number-of-servers</var></code></td></tr>
<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>HeartbeatMaxServers 10</code></td></tr>
diff --git a/docs/manual/mod/mod_heartmonitor.xml b/docs/manual/mod/mod_heartmonitor.xml
index 2d9fee1330..8633ac2b9b 100644
--- a/docs/manual/mod/mod_heartmonitor.xml
+++ b/docs/manual/mod/mod_heartmonitor.xml
@@ -31,10 +31,10 @@
<summary>
<p>
-<module>mod_heartmonitor</module> listens for server status messages generated
-by <module>mod_heartbeat</module> enabled origin servers and makes their status
-available to <module>mod_lbmethod_heartbeat</module>. This allows
-<directive module="mod_proxy">ProxyPass</directive> to use the "heartbeat"
+<module>mod_heartmonitor</module> listens for server status messages generated
+by <module>mod_heartbeat</module> enabled origin servers and makes their status
+available to <module>mod_lbmethod_heartbeat</module>. This allows
+<directive module="mod_proxy">ProxyPass</directive> to use the "heartbeat"
<em>lbmethod</em> inside of <directive module="mod_proxy">ProxyPass</directive>.
</p>
@@ -60,12 +60,12 @@ use <module>mod_slotmem_shm</module>.</p>
<usage>
<p>The <directive>HeartbeatListen</directive> directive specifies the
- multicast address on which the server will listen for status information from
+ multicast address on which the server will listen for status information from
<module>mod_heartbeat</module>-enabled servers. This
address will usually correspond to a configured <directive
module="mod_heartbeat">HeartbeatAddress</directive> on an origin server.
</p>
-
+
<highlight language="config">
HeartbeatListen 239.0.0.1:27999
</highlight>
@@ -90,7 +90,7 @@ use <module>mod_slotmem_shm</module>.</p>
<directivesynopsis>
<name>HeartbeatMaxServers</name>
-<description>Specifies the maximum number of servers that will be sending
+<description>Specifies the maximum number of servers that will be sending
heartbeat requests to this server</description>
<syntax>HeartbeatMaxServers <var>number-of-servers</var></syntax>
<default>HeartbeatMaxServers 10</default>
diff --git a/docs/manual/mod/mod_include.html.en b/docs/manual/mod/mod_include.html.en
index 6dc9d145c3..b81edbe95f 100644
--- a/docs/manual/mod/mod_include.html.en
+++ b/docs/manual/mod/mod_include.html.en
@@ -177,7 +177,7 @@ AddOutputFilter INCLUDES .shtml</pre>
<dd><p>The value is a message that is sent back to the
client if an error occurs while parsing the
document. This overrides any <code class="directive"><a href="#ssierrormsg">SSIErrorMsg</a></code> directives.</p>
-
+
<div class="example"><p><code>
<!--#config errmsg="[Oops, something broke.]" -->
</code></p></div>
@@ -189,22 +189,22 @@ AddOutputFilter INCLUDES .shtml</pre>
for a count in bytes, or <code>abbrev</code> for a count
in Kb or Mb as appropriate, for example a size of 1024 bytes
will be printed as "1K".</p>
-
+
<div class="example"><p><code>
<!--#config sizefmt="abbrev" -->
</code></p></div>
-
+
</dd>
<dt><code>timefmt</code></dt>
<dd><p>The value is a string to be used by the
<code>strftime(3)</code> library routine when printing
dates.</p>
-
+
<div class="example"><p><code>
<!--#config timefmt=""%R, %B %d, %Y"" -->
</code></p></div>
-
+
</dd>
</dl>
@@ -358,7 +358,7 @@ AddOutputFilter INCLUDES .shtml</pre>
</code></p></div>
The value of <code>file</code> cannot start with a slash
- (<code>/</code>), nor can it contain <code>../</code> so as to
+ (<code>/</code>), nor can it contain <code>../</code> so as to
refer to a file above the current directory or outside of the
document root. Attempting to so will result in the error message:
<code>The given path was above the root path</code>.
diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml
index d027fac8cc..1b8599629d 100644
--- a/docs/manual/mod/mod_include.xml
+++ b/docs/manual/mod/mod_include.xml
@@ -155,7 +155,7 @@ AddOutputFilter INCLUDES .shtml
client if an error occurs while parsing the
document. This overrides any <directive
module="mod_include">SSIErrorMsg</directive> directives.</p>
-
+
<example>
<!--#config errmsg="[Oops, something broke.]" -->
</example>
@@ -167,22 +167,22 @@ AddOutputFilter INCLUDES .shtml
for a count in bytes, or <code>abbrev</code> for a count
in Kb or Mb as appropriate, for example a size of 1024 bytes
will be printed as "1K".</p>
-
+
<example>
<!--#config sizefmt="abbrev" -->
</example>
-
+
</dd>
<dt><code>timefmt</code></dt>
<dd><p>The value is a string to be used by the
<code>strftime(3)</code> library routine when printing
dates.</p>
-
+
<example>
<!--#config timefmt=""%R, %B %d, %Y"" -->
</example>
-
+
</dd>
</dl>
</section> <!-- /config -->
@@ -339,7 +339,7 @@ AddOutputFilter INCLUDES .shtml
</example>
The value of <code>file</code> cannot start with a slash
- (<code>/</code>), nor can it contain <code>../</code> so as to
+ (<code>/</code>), nor can it contain <code>../</code> so as to
refer to a file above the current directory or outside of the
document root. Attempting to so will result in the error message:
<code>The given path was above the root path</code>.
@@ -1072,4 +1072,3 @@ set</description>
</directivesynopsis>
</modulesynopsis>
-
diff --git a/docs/manual/mod/mod_lbmethod_heartbeat.html.en b/docs/manual/mod/mod_lbmethod_heartbeat.html.en
index dd7cd819e2..82b3f20fb6 100644
--- a/docs/manual/mod/mod_lbmethod_heartbeat.html.en
+++ b/docs/manual/mod/mod_lbmethod_heartbeat.html.en
@@ -37,8 +37,8 @@
heartbeat info via the <code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code> module.</p>
<p> This modules load balancing algorithm favors servers with more ready (idle)
-capacity over time, but does not select the server with the most ready capacity
-every time. Servers that have 0 active clients are penalized, with the
+capacity over time, but does not select the server with the most ready capacity
+every time. Servers that have 0 active clients are penalized, with the
assumption that they are not fully initialized.</p>
</div>
<div id="quickview"><h3 class="directives">Directives</h3>
diff --git a/docs/manual/mod/mod_lbmethod_heartbeat.xml b/docs/manual/mod/mod_lbmethod_heartbeat.xml
index 9dd28f0012..3fe7f20877 100644
--- a/docs/manual/mod/mod_lbmethod_heartbeat.xml
+++ b/docs/manual/mod/mod_lbmethod_heartbeat.xml
@@ -36,8 +36,8 @@
heartbeat info via the <module>mod_heartbeat</module> module.</p>
<p> This modules load balancing algorithm favors servers with more ready (idle)
-capacity over time, but does not select the server with the most ready capacity
-every time. Servers that have 0 active clients are penalized, with the
+capacity over time, but does not select the server with the most ready capacity
+every time. Servers that have 0 active clients are penalized, with the
assumption that they are not fully initialized.</p>
</summary>
diff --git a/docs/manual/mod/mod_ldap.xml.fr b/docs/manual/mod/mod_ldap.xml.fr
index c7e71c0879..6c555fcce7 100644
--- a/docs/manual/mod/mod_ldap.xml.fr
+++ b/docs/manual/mod/mod_ldap.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1607960:1673892 (outdated) -->
+<!-- English Revision: 1607960:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja
index 6052003aef..8736149d80 100644
--- a/docs/manual/mod/mod_log_config.xml.ja
+++ b/docs/manual/mod/mod_log_config.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 579425:1673833 (outdated) -->
+<!-- English Revision: 579425:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_log_config.xml.ko b/docs/manual/mod/mod_log_config.xml.ko
index c6866e3d75..d72bcdc615 100644
--- a/docs/manual/mod/mod_log_config.xml.ko
+++ b/docs/manual/mod/mod_log_config.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1673833 (outdated) -->
+<!-- English Revision: 105989:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_log_config.xml.tr b/docs/manual/mod/mod_log_config.xml.tr
index b7d84719e2..ec3167c096 100644
--- a/docs/manual/mod/mod_log_config.xml.tr
+++ b/docs/manual/mod/mod_log_config.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1310330:1673833 (outdated) -->
+<!-- English Revision: 1310330:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_log_forensic.html.en b/docs/manual/mod/mod_log_forensic.html.en
index a491363e99..3a98523c36 100644
--- a/docs/manual/mod/mod_log_forensic.html.en
+++ b/docs/manual/mod/mod_log_forensic.html.en
@@ -107,7 +107,7 @@
document for details on why your security could be compromised
if the directory where logfiles are stored is writable by
anyone other than the user that starts the server.</p>
- <p>The log files may contain sensitive data such as the contents of
+ <p>The log files may contain sensitive data such as the contents of
<code>Authorization:</code> headers (which can contain passwords), so
they should not be readable by anyone except the user that starts the
server.</p>
diff --git a/docs/manual/mod/mod_log_forensic.xml b/docs/manual/mod/mod_log_forensic.xml
index 23c7dc4d3d..6398e22ab4 100644
--- a/docs/manual/mod/mod_log_forensic.xml
+++ b/docs/manual/mod/mod_log_forensic.xml
@@ -91,7 +91,7 @@
document for details on why your security could be compromised
if the directory where logfiles are stored is writable by
anyone other than the user that starts the server.</p>
- <p>The log files may contain sensitive data such as the contents of
+ <p>The log files may contain sensitive data such as the contents of
<code>Authorization:</code> headers (which can contain passwords), so
they should not be readable by anyone except the user that starts the
server.</p>
diff --git a/docs/manual/mod/mod_logio.html.en b/docs/manual/mod/mod_logio.html.en
index 5bcdb3edc1..e2a3d6bbc2 100644
--- a/docs/manual/mod/mod_logio.html.en
+++ b/docs/manual/mod/mod_logio.html.en
@@ -86,7 +86,7 @@
Available in Apache 2.4.7 and later</td></tr>
<tr class="odd"><td><code>%^FB</code></td>
<td>Delay in microseconds between when the request arrived and the
- first byte of the response headers are written. Only available if
+ first byte of the response headers are written. Only available if
<code class="directive">LogIOTrackTTFB</code> is set to ON.
</td></tr>
</table>
@@ -112,7 +112,7 @@
</table>
<p>This directive configures whether this module tracks the delay
between the request being read and the first byte of the response
- headers being written. The resulting value may be logged with the
+ headers being written. The resulting value may be logged with the
<code>%^FB</code> format.</p>
</div>
diff --git a/docs/manual/mod/mod_logio.xml b/docs/manual/mod/mod_logio.xml
index 1c24ed5924..65d66a2d92 100644
--- a/docs/manual/mod/mod_logio.xml
+++ b/docs/manual/mod/mod_logio.xml
@@ -75,7 +75,7 @@
<tr><td><code>%^FB</code></td>
<td>Delay in microseconds between when the request arrived and the
- first byte of the response headers are written. Only available if
+ first byte of the response headers are written. Only available if
<directive>LogIOTrackTTFB</directive> is set to ON.
</td></tr>
</table>
@@ -101,7 +101,7 @@
<usage>
<p>This directive configures whether this module tracks the delay
between the request being read and the first byte of the response
- headers being written. The resulting value may be logged with the
+ headers being written. The resulting value may be logged with the
<code>%^FB</code> format.</p>
</usage>
</directivesynopsis>
diff --git a/docs/manual/mod/mod_lua.xml.fr b/docs/manual/mod/mod_lua.xml.fr
index d2b20b1732..f24594e79d 100644
--- a/docs/manual/mod/mod_lua.xml.fr
+++ b/docs/manual/mod/mod_lua.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1641661:1673892 (outdated) -->
+<!-- English Revision: 1641661:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_macro.xml.fr b/docs/manual/mod/mod_macro.xml.fr
index bb45eaa84c..4b2a1d3f61 100644
--- a/docs/manual/mod/mod_macro.xml.fr
+++ b/docs/manual/mod/mod_macro.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1533274:1673917 (outdated) -->
+<!-- English Revision: 1533274:1673945 (outdated) -->
<!-- French translation: Fabien Coelho -->
<!-- Updated by Lucien Gentis -->
diff --git a/docs/manual/mod/mod_proxy_ajp.xml.ja b/docs/manual/mod/mod_proxy_ajp.xml.ja
index 78ff290740..8fdefce515 100644
--- a/docs/manual/mod/mod_proxy_ajp.xml.ja
+++ b/docs/manual/mod/mod_proxy_ajp.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 669473:1673930 (outdated) -->
+<!-- English Revision: 669473:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_rewrite.xml.fr b/docs/manual/mod/mod_rewrite.xml.fr
index d0420f85de..9a24d5d740 100644
--- a/docs/manual/mod/mod_rewrite.xml.fr
+++ b/docs/manual/mod/mod_rewrite.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1668875:1673917 (outdated) -->
+<!-- English Revision: 1668875:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_sed.html.en b/docs/manual/mod/mod_sed.html.en
index e3c104e3c2..902d0c35e8 100644
--- a/docs/manual/mod/mod_sed.html.en
+++ b/docs/manual/mod/mod_sed.html.en
@@ -78,20 +78,20 @@ the author's blog</a>.</p>
<div class="example"><h3>Adding an output filter </h3><pre class="prettyprint lang-config"># In the following example, the sed filter will change the string
# "monday" to "MON" and the string "sunday" to SUN in html documents
# before sending to the client.
-<Directory "/var/www/docs/sed">
- AddOutputFilter Sed html
- OutputSed "s/monday/MON/g"
- OutputSed "s/sunday/SUN/g"
+<Directory "/var/www/docs/sed">
+ AddOutputFilter Sed html
+ OutputSed "s/monday/MON/g"
+ OutputSed "s/sunday/SUN/g"
</Directory></pre>
</div>
<div class="example"><h3>Adding an input filter </h3><pre class="prettyprint lang-config"># In the following example, the sed filter will change the string
# "monday" to "MON" and the string "sunday" to SUN in the POST data
# sent to PHP.
-<Directory "/var/www/docs/sed">
- AddInputFilter Sed php
- InputSed "s/monday/MON/g"
- InputSed "s/sunday/SUN/g"
+<Directory "/var/www/docs/sed">
+ AddInputFilter Sed php
+ InputSed "s/monday/MON/g"
+ InputSed "s/sunday/SUN/g"
</Directory></pre>
</div>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
diff --git a/docs/manual/mod/mod_sed.xml b/docs/manual/mod/mod_sed.xml
index 639a909d5e..be201d7b4a 100644
--- a/docs/manual/mod/mod_sed.xml
+++ b/docs/manual/mod/mod_sed.xml
@@ -66,11 +66,11 @@ the author's blog</a>.</p>
# In the following example, the sed filter will change the string
# "monday" to "MON" and the string "sunday" to SUN in html documents
# before sending to the client.
-<Directory "/var/www/docs/sed">
- AddOutputFilter Sed html
- OutputSed "s/monday/MON/g"
- OutputSed "s/sunday/SUN/g"
-</Directory>
+<Directory "/var/www/docs/sed">
+ AddOutputFilter Sed html
+ OutputSed "s/monday/MON/g"
+ OutputSed "s/sunday/SUN/g"
+</Directory>
</highlight>
</example>
@@ -79,11 +79,11 @@ the author's blog</a>.</p>
# In the following example, the sed filter will change the string
# "monday" to "MON" and the string "sunday" to SUN in the POST data
# sent to PHP.
-<Directory "/var/www/docs/sed">
- AddInputFilter Sed php
- InputSed "s/monday/MON/g"
- InputSed "s/sunday/SUN/g"
-</Directory>
+<Directory "/var/www/docs/sed">
+ AddInputFilter Sed php
+ InputSed "s/monday/MON/g"
+ InputSed "s/sunday/SUN/g"
+</Directory>
</highlight>
</example>
</section>
diff --git a/docs/manual/mod/mod_session.html.en b/docs/manual/mod/mod_session.html.en
index 40a25840e7..7cb2aee67f 100644
--- a/docs/manual/mod/mod_session.html.en
+++ b/docs/manual/mod/mod_session.html.en
@@ -322,7 +322,7 @@ AuthName "realm"
session from or writing the session to the chosen storage mechanism is handled
by the <code class="module"><a href="../mod/mod_session.html">mod_session</a></code> modules and corresponding configuration.
</dd>
-
+
<dt>Applications behind <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dt>
<dd>If the <code class="directive"><a href="#sessionheader">SessionHeader</a></code>
directive is used to define an HTTP request header, the session, encoded as
@@ -332,7 +332,7 @@ AuthName "realm"
above, any encryption or decryption, and the reading the session from or
writing the session to the chosen storage mechanism is handled by the
<code class="module"><a href="../mod/mod_session.html">mod_session</a></code> modules and corresponding configuration.</dd>
-
+
<dt>Standalone applications</dt>
<dd>Applications might choose to manipulate the session outside the control
of the Apache HTTP server. In this case, it is the responsibility of the
diff --git a/docs/manual/mod/mod_session.xml b/docs/manual/mod/mod_session.xml
index b6142517aa..d5e67ca5e6 100644
--- a/docs/manual/mod/mod_session.xml
+++ b/docs/manual/mod/mod_session.xml
@@ -310,7 +310,7 @@ AuthName "realm"
session from or writing the session to the chosen storage mechanism is handled
by the <module>mod_session</module> modules and corresponding configuration.
</dd>
-
+
<dt>Applications behind <module>mod_proxy</module></dt>
<dd>If the <directive module="mod_session">SessionHeader</directive>
directive is used to define an HTTP request header, the session, encoded as
@@ -320,7 +320,7 @@ AuthName "realm"
above, any encryption or decryption, and the reading the session from or
writing the session to the chosen storage mechanism is handled by the
<module>mod_session</module> modules and corresponding configuration.</dd>
-
+
<dt>Standalone applications</dt>
<dd>Applications might choose to manipulate the session outside the control
of the Apache HTTP server. In this case, it is the responsibility of the
diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en
index 4599961c42..817b8d23f2 100644
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -54,12 +54,12 @@ on characteristics of the request</td></tr>
BrowserMatch MSIE !netscape</pre>
- <p>When the server looks up a path via an internal
- <a class="glossarylink" href="../glossary.html#subrequest" title="see glossary">subrequest</a> such as looking
- for a <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
+ <p>When the server looks up a path via an internal
+ <a class="glossarylink" href="../glossary.html#subrequest" title="see glossary">subrequest</a> such as looking
+ for a <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
or generating a directory listing with <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>,
- per-request environment variables are <em>not</em> inherited in the
- subrequest. Additionally,
+ per-request environment variables are <em>not</em> inherited in the
+ subrequest. Additionally,
<code class="directive"><a href="#setenvif">SetEnvIf</a></code> directives
are not separately evaluated in the subrequest due to the API phases
<code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> takes action in.</p>
@@ -230,11 +230,11 @@ of</p>
<pre class="prettyprint lang-config">SetEnvIf Request_URI "\.gif$" object_is_image=gif
SetEnvIf Request_URI "\.jpg$" object_is_image=jpg
SetEnvIf Request_URI "\.xbm$" object_is_image=xbm
-
+
SetEnvIf Referer www\.mydomain\.example\.com intra_site_referral
-
+
SetEnvIf object_is_image xbm XBIT_PROCESSING=1
-
+
SetEnvIf ^TS ^[a-z] HAVE_TS</pre>
diff --git a/docs/manual/mod/mod_setenvif.xml b/docs/manual/mod/mod_setenvif.xml
index 2276091a2a..1b0d9ca7be 100644
--- a/docs/manual/mod/mod_setenvif.xml
+++ b/docs/manual/mod/mod_setenvif.xml
@@ -49,12 +49,12 @@ BrowserMatch ^Mozilla netscape
BrowserMatch MSIE !netscape
</highlight>
- <p>When the server looks up a path via an internal
- <glossary ref="subrequest">subrequest</glossary> such as looking
- for a <directive module="mod_dir" >DirectoryIndex</directive>
+ <p>When the server looks up a path via an internal
+ <glossary ref="subrequest">subrequest</glossary> such as looking
+ for a <directive module="mod_dir" >DirectoryIndex</directive>
or generating a directory listing with <module>mod_autoindex</module>,
- per-request environment variables are <em>not</em> inherited in the
- subrequest. Additionally,
+ per-request environment variables are <em>not</em> inherited in the
+ subrequest. Additionally,
<directive module="mod_setenvif">SetEnvIf</directive> directives
are not separately evaluated in the subrequest due to the API phases
<module>mod_setenvif</module> takes action in.</p>
@@ -226,11 +226,11 @@ of</p>
SetEnvIf Request_URI "\.gif$" object_is_image=gif
SetEnvIf Request_URI "\.jpg$" object_is_image=jpg
SetEnvIf Request_URI "\.xbm$" object_is_image=xbm
-
+
SetEnvIf Referer www\.mydomain\.example\.com intra_site_referral
-
+
SetEnvIf object_is_image xbm XBIT_PROCESSING=1
-
+
SetEnvIf ^TS ^[a-z] HAVE_TS
</highlight>
diff --git a/docs/manual/mod/mod_slotmem_plain.html.en b/docs/manual/mod/mod_slotmem_plain.html.en
index b1b8516371..4d8d5052b9 100644
--- a/docs/manual/mod/mod_slotmem_plain.html.en
+++ b/docs/manual/mod/mod_slotmem_plain.html.en
@@ -75,7 +75,7 @@
<dt>apr_status_t fgrab(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
<dd>forced grab or allocate the specified slot and mark as in-use (does not do any data copying)</dd>
-
+
<dt>apr_status_t release(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
<dd>release or free a slot and mark as not in-use (does not do any data copying)</dd>
</dl>
diff --git a/docs/manual/mod/mod_slotmem_plain.xml b/docs/manual/mod/mod_slotmem_plain.xml
index 6cd8fe5842..e7ccc39d3a 100644
--- a/docs/manual/mod/mod_slotmem_plain.xml
+++ b/docs/manual/mod/mod_slotmem_plain.xml
@@ -72,7 +72,7 @@
<dt>apr_status_t fgrab(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
<dd>forced grab or allocate the specified slot and mark as in-use (does not do any data copying)</dd>
-
+
<dt>apr_status_t release(ap_slotmem_instance_t *s, unsigned int item_id);</dt>
<dd>release or free a slot and mark as not in-use (does not do any data copying)</dd>
</dl>
diff --git a/docs/manual/mod/mod_socache_dbm.html.en b/docs/manual/mod/mod_socache_dbm.html.en
index 85624bac2d..72b2fea7c7 100644
--- a/docs/manual/mod/mod_socache_dbm.html.en
+++ b/docs/manual/mod/mod_socache_dbm.html.en
@@ -36,7 +36,7 @@
which provides for creation and access to a cache backed by a
DBM database.
</p>
-
+
<div class="example"><p><code>
dbm:/path/to/datafile
</code></p></div>
diff --git a/docs/manual/mod/mod_socache_dbm.xml b/docs/manual/mod/mod_socache_dbm.xml
index bd627f08eb..518453c8de 100644
--- a/docs/manual/mod/mod_socache_dbm.xml
+++ b/docs/manual/mod/mod_socache_dbm.xml
@@ -33,7 +33,7 @@
which provides for creation and access to a cache backed by a
DBM database.
</p>
-
+
<example>
dbm:/path/to/datafile
</example>
diff --git a/docs/manual/mod/mod_socache_memcache.html.en b/docs/manual/mod/mod_socache_memcache.html.en
index 35799cb2a1..4b127ec946 100644
--- a/docs/manual/mod/mod_socache_memcache.html.en
+++ b/docs/manual/mod/mod_socache_memcache.html.en
@@ -38,16 +38,16 @@
high-performance, distributed memory object caching system.
</p>
-
- <p>This shared object cache provider's "create" method requires a
+
+ <p>This shared object cache provider's "create" method requires a
comma separated list of memcached host/port specifications. If using
- this provider via another modules configuration (such as
+ this provider via another modules configuration (such as
<code class="directive"><a href="../mod/mod_ssl.html#sslsessioncache">SSLSessionCache</a></code>), provide
the list of servers as the optional "arg" parameter.</p>
<pre class="prettyprint lang-config">SSLSessionCache memcache:memcache.example.com:12345,memcache2.example.com:12345</pre>
-
+
<p>Details of other shared object cache providers can be found
<a href="../socache.html">here</a>.
</p>
diff --git a/docs/manual/mod/mod_socache_memcache.xml b/docs/manual/mod/mod_socache_memcache.xml
index a25a39be91..c6c0163a41 100644
--- a/docs/manual/mod/mod_socache_memcache.xml
+++ b/docs/manual/mod/mod_socache_memcache.xml
@@ -35,17 +35,17 @@
high-performance, distributed memory object caching system.
</p>
-
- <p>This shared object cache provider's "create" method requires a
+
+ <p>This shared object cache provider's "create" method requires a
comma separated list of memcached host/port specifications. If using
- this provider via another modules configuration (such as
+ this provider via another modules configuration (such as
<directive module="mod_ssl">SSLSessionCache</directive>), provide
the list of servers as the optional "arg" parameter.</p>
<highlight language="config">
SSLSessionCache memcache:memcache.example.com:12345,memcache2.example.com:12345
</highlight>
-
+
<p>Details of other shared object cache providers can be found
<a href="../socache.html">here</a>.
</p>
diff --git a/docs/manual/mod/mod_socache_shmcb.html.en b/docs/manual/mod/mod_socache_shmcb.html.en
index 2359d4c7b0..fb4025223e 100644
--- a/docs/manual/mod/mod_socache_shmcb.html.en
+++ b/docs/manual/mod/mod_socache_shmcb.html.en
@@ -36,7 +36,7 @@
which provides for creation and access to a cache backed by a
high-performance cyclic buffer inside a shared memory segment.
</p>
-
+
<div class="example"><p><code>
shmcb:/path/to/datafile(512000)
</code></p></div>
diff --git a/docs/manual/mod/mod_socache_shmcb.xml b/docs/manual/mod/mod_socache_shmcb.xml
index 7ee9c96042..22d01716e1 100644
--- a/docs/manual/mod/mod_socache_shmcb.xml
+++ b/docs/manual/mod/mod_socache_shmcb.xml
@@ -33,7 +33,7 @@
which provides for creation and access to a cache backed by a
high-performance cyclic buffer inside a shared memory segment.
</p>
-
+
<example>
shmcb:/path/to/datafile(512000)
</example>
diff --git a/docs/manual/mod/mod_ssl_ct.html.en b/docs/manual/mod/mod_ssl_ct.html.en
index 98e77f39b5..61ec477613 100644
--- a/docs/manual/mod/mod_ssl_ct.html.en
+++ b/docs/manual/mod/mod_ssl_ct.html.en
@@ -34,7 +34,7 @@
<h3>Summary</h3>
-<p>This module provides an implementation of Certificate Transparency, in
+<p>This module provides an implementation of Certificate Transparency, in
conjunction with <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> and command-line tools from the
<a href="https://code.google.com/p/certificate-transparency/">certificate-transparency</a>
open source project. The goal of Certificate Transparency is to expose the
@@ -63,11 +63,11 @@ this documentation:</p>
servers and proxies:</p>
<ul>
- <li>Signed Certificate Timestamps (SCTs) can be obtained from logs
+ <li>Signed Certificate Timestamps (SCTs) can be obtained from logs
automatically and, in conjunction with any statically configured SCTs, sent
to aware clients in the ServerHello (during the handshake).</li>
<li>SCTs can be received by the proxy from origin servers in the ServerHello,
- in a certificate extension, and/or within stapled OCSP responses; any SCTs
+ in a certificate extension, and/or within stapled OCSP responses; any SCTs
received can be partially validated on-line and optionally queued for off-line
audit.</li>
<li>The proxy can be configured to disallow communication with an origin
@@ -161,7 +161,7 @@ testing.</p>
</ul>
<p>If verification fails for at least one SCT and verification was not
- successful for at least one SCT, the connection is aborted if
+ successful for at least one SCT, the connection is aborted if
<code class="directive"><a href="#ctproxyawareness">CTProxyAwareness</a></code> is set to
<em>require</em>.</p>
@@ -223,7 +223,7 @@ testing.</p>
<dt>log URL</dt>
<dd>The URL of the log (for its API) is required by a server in order to
submit server certificates to the log. The server will submit
- each server certificate in order to obtain an SCT for each log with a
+ each server certificate in order to obtain an SCT for each log with a
configured URL, except when the log is also marked as distrusted or the
current time is not within any configured valid timestamp range.
<br />
@@ -232,7 +232,7 @@ testing.</p>
</dl>
<p>Generally, only a small subset of this information is configured for a
- particular log. Refer to the documentation for the <code class="directive"><a href="#ctstaticlogconfig">CTStaticLogConfig</a></code> directive and the
+ particular log. Refer to the documentation for the <code class="directive"><a href="#ctstaticlogconfig">CTStaticLogConfig</a></code> directive and the
<code class="program"><a href="../programs/ctlogconfig.html">ctlogconfig</a></code> command for more specific information.</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -246,7 +246,7 @@ testing.</p>
<p>Sample code in the form of a Python script to build an SCT in the correct
format from data received from a log can be found in
- <a href="https://github.com/tomrittervg/ct-tools">Tom Ritter's ct-tools
+ <a href="https://github.com/tomrittervg/ct-tools">Tom Ritter's ct-tools
repository</a>. Refer to <code>write-sct.py</code></p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
@@ -314,7 +314,7 @@ testing.</p>
<p>The directory will contain files named <code><em>PID</em>.tmp</code> for
active child processes and files named <code><em>PID</em>.out</code> for exited
- child processes. These <code>.out</code> files are ready for off-line audit.
+ child processes. These <code>.out</code> files are ready for off-line audit.
The experimental command <code>ctauditscts</code> (in the httpd source tree, not
currently installed) interfaces with <em>certificate-transparency</em> tools to
perform the audit.</p>
@@ -432,7 +432,7 @@ refreshed</td></tr>
to that certificate; the name of the subdirectory is the SHA-256 hash of the
certificate.</p>
- <p>The certificate-specific directory contains SCTs retrieved from configured
+ <p>The certificate-specific directory contains SCTs retrieved from configured
logs, SCT lists prepared from statically configured SCTs and retrieved SCTs,
and other information used for managing SCTs.</p>
@@ -473,7 +473,7 @@ ServerHello</td></tr>
</table>
<p>This directive is used to configure information about a particular log.
This directive is appropriate when configuration information changes rarely.
- If dynamic configuration updates must be supported, refer to the
+ If dynamic configuration updates must be supported, refer to the
<code class="directive"><a href="#ctlogconfigdb">CTLogConfigDB</a></code> directive.</p>
<p>Each of the six fields must be specified, but usually only a small
@@ -509,7 +509,7 @@ ServerHello</td></tr>
Timestamps. This must be provided as a decimal number.
<br />
Specify <strong><code>-</code></strong> for one of the timestamps if it is unknown.
- For example, when configuring the minimum valid timestamp for a log which remains
+ For example, when configuring the minimum valid timestamp for a log which remains
valid, specify <strong><code>-</code></strong> for <em>max-timestamp</em>.
<br />
SCTs received from this log by the proxy are invalid if the timestamp
@@ -549,7 +549,7 @@ about the fields which can be configured with this directive.</li>
<p><em>sct-directory</em> should contain one or more files with extension
<code>.sct</code>, representing one or more SCTs corresponding to the
- server certificate. If <em>sct-directory</em> is not absolute, then it is
+ server certificate. If <em>sct-directory</em> is not absolute, then it is
assumed to be relative to <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</p>
<p>If <em>sct-directory</em> is empty, no error will be raised.</p>
diff --git a/docs/manual/mod/mod_ssl_ct.xml b/docs/manual/mod/mod_ssl_ct.xml
index 4f95e6fe03..75f36e781f 100644
--- a/docs/manual/mod/mod_ssl_ct.xml
+++ b/docs/manual/mod/mod_ssl_ct.xml
@@ -31,7 +31,7 @@
<summary>
-<p>This module provides an implementation of Certificate Transparency, in
+<p>This module provides an implementation of Certificate Transparency, in
conjunction with <module>mod_ssl</module> and command-line tools from the
<a href="https://code.google.com/p/certificate-transparency/">certificate-transparency</a>
open source project. The goal of Certificate Transparency is to expose the
@@ -60,11 +60,11 @@ this documentation:</p>
servers and proxies:</p>
<ul>
- <li>Signed Certificate Timestamps (SCTs) can be obtained from logs
+ <li>Signed Certificate Timestamps (SCTs) can be obtained from logs
automatically and, in conjunction with any statically configured SCTs, sent
to aware clients in the ServerHello (during the handshake).</li>
<li>SCTs can be received by the proxy from origin servers in the ServerHello,
- in a certificate extension, and/or within stapled OCSP responses; any SCTs
+ in a certificate extension, and/or within stapled OCSP responses; any SCTs
received can be partially validated on-line and optionally queued for off-line
audit.</li>
<li>The proxy can be configured to disallow communication with an origin
@@ -136,7 +136,7 @@ testing.</p>
</ul>
<p>If verification fails for at least one SCT and verification was not
- successful for at least one SCT, the connection is aborted if
+ successful for at least one SCT, the connection is aborted if
<directive module="mod_ssl_ct">CTProxyAwareness</directive> is set to
<em>require</em>.</p>
@@ -199,7 +199,7 @@ testing.</p>
<dt>log URL</dt>
<dd>The URL of the log (for its API) is required by a server in order to
submit server certificates to the log. The server will submit
- each server certificate in order to obtain an SCT for each log with a
+ each server certificate in order to obtain an SCT for each log with a
configured URL, except when the log is also marked as distrusted or the
current time is not within any configured valid timestamp range.
<br />
@@ -208,8 +208,8 @@ testing.</p>
</dl>
<p>Generally, only a small subset of this information is configured for a
- particular log. Refer to the documentation for the <directive
- module="mod_ssl_ct">CTStaticLogConfig</directive> directive and the
+ particular log. Refer to the documentation for the <directive
+ module="mod_ssl_ct">CTStaticLogConfig</directive> directive and the
<program>ctlogconfig</program> command for more specific information.</p>
</section>
@@ -223,7 +223,7 @@ testing.</p>
<p>Sample code in the form of a Python script to build an SCT in the correct
format from data received from a log can be found in
- <a href="https://github.com/tomrittervg/ct-tools">Tom Ritter's ct-tools
+ <a href="https://github.com/tomrittervg/ct-tools">Tom Ritter's ct-tools
repository</a>. Refer to <code>write-sct.py</code></p>
</section>
@@ -290,7 +290,7 @@ testing.</p>
<p>The directory will contain files named <code><em>PID</em>.tmp</code> for
active child processes and files named <code><em>PID</em>.out</code> for exited
- child processes. These <code>.out</code> files are ready for off-line audit.
+ child processes. These <code>.out</code> files are ready for off-line audit.
The experimental command <code>ctauditscts</code> (in the httpd source tree, not
currently installed) interfaces with <em>certificate-transparency</em> tools to
perform the audit.</p>
@@ -406,7 +406,7 @@ refreshed</description>
to that certificate; the name of the subdirectory is the SHA-256 hash of the
certificate.</p>
- <p>The certificate-specific directory contains SCTs retrieved from configured
+ <p>The certificate-specific directory contains SCTs retrieved from configured
logs, SCT lists prepared from statically configured SCTs and retrieved SCTs,
and other information used for managing SCTs.</p>
</usage>
@@ -447,7 +447,7 @@ ServerHello</description>
<usage>
<p>This directive is used to configure information about a particular log.
This directive is appropriate when configuration information changes rarely.
- If dynamic configuration updates must be supported, refer to the
+ If dynamic configuration updates must be supported, refer to the
<directive module="mod_ssl_ct">CTLogConfigDB</directive> directive.</p>
<p>Each of the six fields must be specified, but usually only a small
@@ -483,7 +483,7 @@ ServerHello</description>
Timestamps. This must be provided as a decimal number.
<br />
Specify <strong><code>-</code></strong> for one of the timestamps if it is unknown.
- For example, when configuring the minimum valid timestamp for a log which remains
+ For example, when configuring the minimum valid timestamp for a log which remains
valid, specify <strong><code>-</code></strong> for <em>max-timestamp</em>.
<br />
SCTs received from this log by the proxy are invalid if the timestamp
@@ -522,7 +522,7 @@ about the fields which can be configured with this directive.</seealso>
<p><em>sct-directory</em> should contain one or more files with extension
<code>.sct</code>, representing one or more SCTs corresponding to the
- server certificate. If <em>sct-directory</em> is not absolute, then it is
+ server certificate. If <em>sct-directory</em> is not absolute, then it is
assumed to be relative to <directive module="core">ServerRoot</directive>.</p>
<p>If <em>sct-directory</em> is empty, no error will be raised.</p>
diff --git a/docs/manual/mod/mod_status.xml.fr b/docs/manual/mod/mod_status.xml.fr
index c956e13d7f..713b2d375c 100644
--- a/docs/manual/mod/mod_status.xml.fr
+++ b/docs/manual/mod/mod_status.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1331227:1673892 (outdated) -->
+<!-- English Revision: 1331227:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/mod/mod_status.xml.ja b/docs/manual/mod/mod_status.xml.ja
index 565237a31d..9b9c18cc35 100644
--- a/docs/manual/mod/mod_status.xml.ja
+++ b/docs/manual/mod/mod_status.xml.ja
@@ -2,7 +2,7 @@
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
<modulesynopsis metafile="mod_status.xml.meta">
-<!-- English Revision: 668628:1673892 (outdated) -->
+<!-- English Revision: 668628:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_status.xml.ko b/docs/manual/mod/mod_status.xml.ko
index 4bba7e55d9..38842f4362 100644
--- a/docs/manual/mod/mod_status.xml.ko
+++ b/docs/manual/mod/mod_status.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 420990:1673892 (outdated) -->
+<!-- English Revision: 420990:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_status.xml.tr b/docs/manual/mod/mod_status.xml.tr
index 344b6070a7..b894f4f813 100644
--- a/docs/manual/mod/mod_status.xml.tr
+++ b/docs/manual/mod/mod_status.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1174747:1673892 (outdated) -->
+<!-- English Revision: 1174747:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_vhost_alias.xml.tr b/docs/manual/mod/mod_vhost_alias.xml.tr
index 2f5f52e688..b342d00461 100644
--- a/docs/manual/mod/mod_vhost_alias.xml.tr
+++ b/docs/manual/mod/mod_vhost_alias.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1174747:1673917 (outdated) -->
+<!-- English Revision: 1174747:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_watchdog.html.en b/docs/manual/mod/mod_watchdog.html.en
index 87fb8178fe..b9c675033c 100644
--- a/docs/manual/mod/mod_watchdog.html.en
+++ b/docs/manual/mod/mod_watchdog.html.en
@@ -26,7 +26,7 @@
<div class="toplang">
<p><span>Available Languages: </span><a href="../en/mod/mod_watchdog.html" title="English"> en </a></p>
</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>provides infrastructure for other modules to periodically run
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>provides infrastructure for other modules to periodically run
tasks</td></tr>
<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>watchdog_module</td></tr>
@@ -34,18 +34,18 @@
<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3 and later</td></tr></table>
<h3>Summary</h3>
-<p><code class="module"><a href="../mod/mod_watchdog.html">mod_watchdog</a></code> defines programmatic hooks for other modules to
-periodically run tasks. These modules can register handlers for
-<code class="module"><a href="../mod/mod_watchdog.html">mod_watchdog</a></code> hooks. Currently, the following modules in the
-Apache distribution use this functionality:</p>
+<p><code class="module"><a href="../mod/mod_watchdog.html">mod_watchdog</a></code> defines programmatic hooks for other modules to
+periodically run tasks. These modules can register handlers for
+<code class="module"><a href="../mod/mod_watchdog.html">mod_watchdog</a></code> hooks. Currently, the following modules in the
+Apache distribution use this functionality:</p>
<ul>
<li><code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code></li>
<li><code class="module"><a href="../mod/mod_heartmonitor.html">mod_heartmonitor</a></code></li>
</ul>
<div class="warning">
-To allow a module to use <code class="module"><a href="../mod/mod_watchdog.html">mod_watchdog</a></code> functionality,
-<code class="module"><a href="../mod/mod_watchdog.html">mod_watchdog</a></code> itself must be statically linked to the server
-core or, if a dynamic module, be loaded before the calling module.
+To allow a module to use <code class="module"><a href="../mod/mod_watchdog.html">mod_watchdog</a></code> functionality,
+<code class="module"><a href="../mod/mod_watchdog.html">mod_watchdog</a></code> itself must be statically linked to the server
+core or, if a dynamic module, be loaded before the calling module.
</div>
</div>
<div id="quickview"><h3 class="directives">Directives</h3>
@@ -64,7 +64,7 @@ core or, if a dynamic module, be loaded before the calling module.
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_watchdog</td></tr>
</table>
-<p>Sets the interval at which the watchdog_step hook runs. Default is to run every
+<p>Sets the interval at which the watchdog_step hook runs. Default is to run every
second.</p>
</div>
diff --git a/docs/manual/mod/mod_watchdog.xml b/docs/manual/mod/mod_watchdog.xml
index 75cdb0765f..0d75a2a15b 100644
--- a/docs/manual/mod/mod_watchdog.xml
+++ b/docs/manual/mod/mod_watchdog.xml
@@ -22,7 +22,7 @@
<modulesynopsis metafile="mod_watchdog.xml.meta">
<name>mod_watchdog</name>
-<description>provides infrastructure for other modules to periodically run
+<description>provides infrastructure for other modules to periodically run
tasks</description>
<status>Base</status>
<sourcefile>mod_watchdog.c</sourcefile>
@@ -30,18 +30,18 @@
<compatibility>Available in Apache 2.3 and later</compatibility>
<summary>
-<p><module>mod_watchdog</module> defines programmatic hooks for other modules to
-periodically run tasks. These modules can register handlers for
-<module>mod_watchdog</module> hooks. Currently, the following modules in the
-Apache distribution use this functionality:</p>
+<p><module>mod_watchdog</module> defines programmatic hooks for other modules to
+periodically run tasks. These modules can register handlers for
+<module>mod_watchdog</module> hooks. Currently, the following modules in the
+Apache distribution use this functionality:</p>
<ul>
<li><module>mod_heartbeat</module></li>
<li><module>mod_heartmonitor</module></li>
</ul>
<note type="warning">
-To allow a module to use <module>mod_watchdog</module> functionality,
-<module>mod_watchdog</module> itself must be statically linked to the server
-core or, if a dynamic module, be loaded before the calling module.
+To allow a module to use <module>mod_watchdog</module> functionality,
+<module>mod_watchdog</module> itself must be statically linked to the server
+core or, if a dynamic module, be loaded before the calling module.
</note>
</summary>
@@ -53,9 +53,8 @@ core or, if a dynamic module, be loaded before the calling module.
<contextlist><context>server config</context></contextlist>
<usage>
-<p>Sets the interval at which the watchdog_step hook runs. Default is to run every
+<p>Sets the interval at which the watchdog_step hook runs. Default is to run every
second.</p>
</usage>
</directivesynopsis>
</modulesynopsis>
-
diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 14ecbc54b8..6d3edb6ef3 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -519,7 +519,7 @@ the child processes</td></tr>
Apache httpd to always create the file on the disk.</p>
<p>If <var>file-path</var> is not an absolute path, the location specified
- will be relative to the value of
+ will be relative to the value of
<code class="directive"><a href="../mod/core.html#defaultruntimedir">DefaultRuntimeDir</a></code>.</p>
<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">ScoreBoardFile /var/run/apache_runtime_status</pre>
diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index ac794229a9..898c5a7b33 100644
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -505,7 +505,7 @@ the child processes</description>
Apache httpd to always create the file on the disk.</p>
<p>If <var>file-path</var> is not an absolute path, the location specified
- will be relative to the value of
+ will be relative to the value of
<directive module="core">DefaultRuntimeDir</directive>.</p>
<example><title>Example</title>
diff --git a/docs/manual/mod/mpm_winnt.html.en b/docs/manual/mod/mpm_winnt.html.en
index 4f51c965e8..9f0ddbe8e5 100644
--- a/docs/manual/mod/mpm_winnt.html.en
+++ b/docs/manual/mod/mpm_winnt.html.en
@@ -39,7 +39,7 @@
which launches a single child process which in turn creates
threads to handle requests</p>
- <p>Capacity is configured using the
+ <p>Capacity is configured using the
<code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> directive,
which sets the maximum number of concurrent client connections.</p>
@@ -55,13 +55,13 @@
<p>The MPM falls back to a safer implementation, but some client requests
were not processed correctly. In order to avoid this error, use
- <code class="directive"><a href="../mod/core.html#acceptfilter">AcceptFilter</a></code> with accept filter
+ <code class="directive"><a href="../mod/core.html#acceptfilter">AcceptFilter</a></code> with accept filter
<code>none</code>.</p>
<pre class="prettyprint lang-config">AcceptFilter http none
AcceptFilter https none</pre>
-
+
<p><em>In Apache httpd 2.0 and 2.2,
<code class="directive">Win32DisableAcceptEx</code> was used for this purpose.</em></p>
@@ -80,13 +80,13 @@ AcceptFilter https none</pre>
inheriting the configuration from the parent. The behavior will
be the same as on Unix if the child process is created at startup
or restart, but if a child process is created because the prior
- one crashed or reached
+ one crashed or reached
<code class="directive"><a href="../mod/mpm_common.html#maxconnectionsperchild">MaxConnectionsPerChild</a></code>,
any pending changes to the configuration will become active in the
child at that point, and the parent and child will be using a
different configuration. If planned configuration changes have been
partially implemented and the current configuration cannot be
- parsed, the replacement child process cannot start up and the server
+ parsed, the replacement child process cannot start up and the server
will halt. Because of this behavior, configuration files should not
be changed until the time of a server restart.</li>
diff --git a/docs/manual/mod/mpm_winnt.xml b/docs/manual/mod/mpm_winnt.xml
index ae87a46db3..45012c56ce 100644
--- a/docs/manual/mod/mpm_winnt.xml
+++ b/docs/manual/mod/mpm_winnt.xml
@@ -34,7 +34,7 @@
which launches a single child process which in turn creates
threads to handle requests</p>
- <p>Capacity is configured using the
+ <p>Capacity is configured using the
<directive module="mpm_common">ThreadsPerChild</directive> directive,
which sets the maximum number of concurrent client connections.</p>
@@ -50,14 +50,14 @@
<p>The MPM falls back to a safer implementation, but some client requests
were not processed correctly. In order to avoid this error, use
- <directive module="core">AcceptFilter</directive> with accept filter
+ <directive module="core">AcceptFilter</directive> with accept filter
<code>none</code>.</p>
<highlight language="config">
AcceptFilter http none
AcceptFilter https none
</highlight>
-
+
<p><em>In Apache httpd 2.0 and 2.2,
<directive>Win32DisableAcceptEx</directive> was used for this purpose.</em></p>
@@ -76,13 +76,13 @@ AcceptFilter https none
inheriting the configuration from the parent. The behavior will
be the same as on Unix if the child process is created at startup
or restart, but if a child process is created because the prior
- one crashed or reached
+ one crashed or reached
<directive module="mpm_common">MaxConnectionsPerChild</directive>,
any pending changes to the configuration will become active in the
child at that point, and the parent and child will be using a
different configuration. If planned configuration changes have been
partially implemented and the current configuration cannot be
- parsed, the replacement child process cannot start up and the server
+ parsed, the replacement child process cannot start up and the server
will halt. Because of this behavior, configuration files should not
be changed until the time of a server restart.</li>
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index 5b3d583b99..2d7f9abf0a 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -508,7 +508,7 @@ requests</td></tr>
of the index listing</td></tr>
<tr><td><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress <var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Multicast address for heartbeat packets</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen<var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">multicast address to listen for incoming heartbeat requests </td></tr>
-<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
+<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
heartbeat requests to this server</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Path to store heartbeat data</td></tr>
<tr><td><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Path to read heartbeat data</td></tr>
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 28491010bf..871a803554 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -503,7 +503,7 @@ requests</td></tr>
of the index listing</td></tr>
<tr><td><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress <var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Multicast address for heartbeat packets</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen<var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">multicast address to listen for incoming heartbeat requests </td></tr>
-<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
+<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
heartbeat requests to this server</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Path to store heartbeat data</td></tr>
<tr><td><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Path to read heartbeat data</td></tr>
diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index f120be79d7..b52aadc297 100644
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -510,7 +510,7 @@ requests</td></tr>
of the index listing</td></tr>
<tr><td><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress <var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Multicast address for heartbeat packets</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen<var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">multicast address to listen for incoming heartbeat requests </td></tr>
-<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
+<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
heartbeat requests to this server</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Path to store heartbeat data</td></tr>
<tr><td><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Path to read heartbeat data</td></tr>
diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8
index 57037e0f10..989493921c 100644
--- a/docs/manual/mod/quickreference.html.ja.utf8
+++ b/docs/manual/mod/quickreference.html.ja.utf8
@@ -477,7 +477,7 @@ requests</td></tr>
ã¤ã³ããã¯ã¹ä¸è¦§ã®å
é ã«æ¿å
¥ããããã¡ã¤ã«ã®åå</td></tr>
<tr><td><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress <var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Multicast address for heartbeat packets</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen<var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">multicast address to listen for incoming heartbeat requests </td></tr>
-<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
+<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
heartbeat requests to this server</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Path to store heartbeat data</td></tr>
<tr><td><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Path to read heartbeat data</td></tr>
diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr
index e18656f618..f7c49373c3 100644
--- a/docs/manual/mod/quickreference.html.ko.euc-kr
+++ b/docs/manual/mod/quickreference.html.ko.euc-kr
@@ -475,7 +475,7 @@ requests</td></tr>
<tr class="odd"><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ÆÄÀϸñ·Ï À§¿¡ »ðÀÔÇÒ ÆÄÀÏÀÇ À̸§</td></tr>
<tr><td><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress <var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Multicast address for heartbeat packets</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen<var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">multicast address to listen for incoming heartbeat requests </td></tr>
-<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
+<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
heartbeat requests to this server</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Path to store heartbeat data</td></tr>
<tr><td><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Path to read heartbeat data</td></tr>
diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8
index f7b32850d1..438fce74e4 100644
--- a/docs/manual/mod/quickreference.html.tr.utf8
+++ b/docs/manual/mod/quickreference.html.tr.utf8
@@ -500,7 +500,7 @@ found</td></tr>
belirler.</td></tr>
<tr><td><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress <var>addr:port</var></a></td><td></td><td>s</td><td>D</td></tr><tr><td class="descr" colspan="4">Multicast address for heartbeat packets</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen<var>addr:port</var></a></td><td></td><td>s</td><td>D</td></tr><tr class="odd"><td class="descr" colspan="4">multicast address to listen for incoming heartbeat requests </td></tr>
-<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>D</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
+<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>D</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
heartbeat requests to this server</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>D</td></tr><tr class="odd"><td class="descr" colspan="4">Path to store heartbeat data</td></tr>
<tr><td><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>D</td></tr><tr><td class="descr" colspan="4">Path to read heartbeat data</td></tr>
diff --git a/docs/manual/mod/quickreference.html.zh-cn.utf8 b/docs/manual/mod/quickreference.html.zh-cn.utf8
index 2cf159ef90..15e7086ffe 100644
--- a/docs/manual/mod/quickreference.html.zh-cn.utf8
+++ b/docs/manual/mod/quickreference.html.zh-cn.utf8
@@ -498,7 +498,7 @@ requests</td></tr>
of the index listing</td></tr>
<tr><td><a href="mod_heartbeat.html#heartbeataddress">HeartbeatAddress <var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Multicast address for heartbeat packets</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatlisten">HeartbeatListen<var>addr:port</var></a></td><td></td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">multicast address to listen for incoming heartbeat requests </td></tr>
-<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
+<tr><td><a href="mod_heartmonitor.html#heartbeatmaxservers">HeartbeatMaxServers <var>number-of-servers</var></a></td><td> 10 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Specifies the maximum number of servers that will be sending
heartbeat requests to this server</td></tr>
<tr class="odd"><td><a href="mod_heartmonitor.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Path to store heartbeat data</td></tr>
<tr><td><a href="mod_lbmethod_heartbeat.html#heartbeatstorage">HeartbeatStorage <var>file-path</var></a></td><td> logs/hb.dat </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Path to read heartbeat data</td></tr>
diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en
index c95ff64ca6..8d505eed8b 100644
--- a/docs/manual/new_features_2_4.html.en
+++ b/docs/manual/new_features_2_4.html.en
@@ -44,7 +44,7 @@
<dl>
<dt>Run-time Loadable MPMs</dt>
- <dd>Multiple MPMs can now be <a href="mpm.html#dynamic">built
+ <dd>Multiple MPMs can now be <a href="mpm.html#dynamic">built
as loadable modules</a> at compile time.
The MPM of choice can be configured at run time.</dd>
diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml
index 0e14854b23..e2a50bcd5a 100644
--- a/docs/manual/new_features_2_4.xml
+++ b/docs/manual/new_features_2_4.xml
@@ -35,7 +35,7 @@
<title>Core Enhancements</title>
<dl>
<dt>Run-time Loadable MPMs</dt>
- <dd>Multiple MPMs can now be <a href="mpm.html#dynamic">built
+ <dd>Multiple MPMs can now be <a href="mpm.html#dynamic">built
as loadable modules</a> at compile time.
The MPM of choice can be configured at run time.</dd>
diff --git a/docs/manual/platform/rpm.html.en b/docs/manual/platform/rpm.html.en
index 9e9c052b4a..0aa0757cdc 100644
--- a/docs/manual/platform/rpm.html.en
+++ b/docs/manual/platform/rpm.html.en
@@ -182,7 +182,7 @@
# template from httpd<br />
cp /etc/sysconfig/httpd /etc/sysconfig/httpd-additional
</code></p></div>
-
+
<div class="example"><p><code>
# blank template<br />
touch /etc/sysconfig/httpd-additional
diff --git a/docs/manual/platform/rpm.xml b/docs/manual/platform/rpm.xml
index 8aac7c0dd4..2a06c4c157 100644
--- a/docs/manual/platform/rpm.xml
+++ b/docs/manual/platform/rpm.xml
@@ -177,7 +177,7 @@
# template from httpd<br />
cp /etc/sysconfig/httpd /etc/sysconfig/httpd-additional
</example>
-
+
<example>
# blank template<br />
touch /etc/sysconfig/httpd-additional
@@ -212,4 +212,3 @@
</section>
</manualpage>
-
diff --git a/docs/manual/platform/win_compiling.html.en b/docs/manual/platform/win_compiling.html.en
index 0b718bcc9f..8efc2dad4e 100644
--- a/docs/manual/platform/win_compiling.html.en
+++ b/docs/manual/platform/win_compiling.html.en
@@ -260,8 +260,8 @@
<p>The policy of the Apache HTTP Server project is to only release Unix sources.
- Windows source packages made available for download have been supplied by
- volunteers and may not be available for every release. You can still build
+ Windows source packages made available for download have been supplied by
+ volunteers and may not be available for every release. You can still build
the server on Windows from the Unix source tarball with just a few additional
steps.</p>
@@ -277,9 +277,9 @@
perl srclib\apr\build\lineends.pl
</code></p></div>
- <p>You can now build the server with the Visual Studio 6.0 development
- environment using the IDE. Command-Line builds of the server are not
- possible from Unix sources unless you export .mak files as explained
+ <p>You can now build the server with the Visual Studio 6.0 development
+ environment using the IDE. Command-Line builds of the server are not
+ possible from Unix sources unless you export .mak files as explained
below.
</p>
@@ -452,7 +452,7 @@
<h2><a name="cmake" id="cmake">Building httpd with cmake</a></h2>
- <p>The primary documentation for this build mechanism is in the
+ <p>The primary documentation for this build mechanism is in the
<code>README.cmake</code> file in the source distribution. Refer to that file
for detailed instructions.</p>
@@ -465,7 +465,7 @@
<ul>
<li>No cmake build for the APR-iconv subproject is available, and the
APR-util cmake build cannot consume an existing APR-iconv build. Thus,
- <code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code> and possibly some third-party modules
+ <code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code> and possibly some third-party modules
cannot be used.</li>
<li>The cmake build for the APR-util subproject does not support most of the
optional DBM and DBD libraries supported by the included Visual Studio
diff --git a/docs/manual/platform/win_compiling.xml b/docs/manual/platform/win_compiling.xml
index d5a92f7e08..8006c9820a 100644
--- a/docs/manual/platform/win_compiling.xml
+++ b/docs/manual/platform/win_compiling.xml
@@ -262,8 +262,8 @@
<title>Building from Unix sources</title>
<p>The policy of the Apache HTTP Server project is to only release Unix sources.
- Windows source packages made available for download have been supplied by
- volunteers and may not be available for every release. You can still build
+ Windows source packages made available for download have been supplied by
+ volunteers and may not be available for every release. You can still build
the server on Windows from the Unix source tarball with just a few additional
steps.</p>
@@ -279,9 +279,9 @@
perl srclib\apr\build\lineends.pl
</example>
- <p>You can now build the server with the Visual Studio 6.0 development
- environment using the IDE. Command-Line builds of the server are not
- possible from Unix sources unless you export .mak files as explained
+ <p>You can now build the server with the Visual Studio 6.0 development
+ environment using the IDE. Command-Line builds of the server are not
+ possible from Unix sources unless you export .mak files as explained
below.
</p>
@@ -454,7 +454,7 @@
<section id="cmake">
<title>Building httpd with cmake</title>
- <p>The primary documentation for this build mechanism is in the
+ <p>The primary documentation for this build mechanism is in the
<code>README.cmake</code> file in the source distribution. Refer to that file
for detailed instructions.</p>
@@ -467,7 +467,7 @@
<ul>
<li>No cmake build for the APR-iconv subproject is available, and the
APR-util cmake build cannot consume an existing APR-iconv build. Thus,
- <module>mod_charset_lite</module> and possibly some third-party modules
+ <module>mod_charset_lite</module> and possibly some third-party modules
cannot be used.</li>
<li>The cmake build for the APR-util subproject does not support most of the
optional DBM and DBD libraries supported by the included Visual Studio
@@ -478,4 +478,3 @@
</section>
</manualpage>
-
diff --git a/docs/manual/platform/windows.xml.ko b/docs/manual/platform/windows.xml.ko
index d88daef9f4..e35ac3c796 100644
--- a/docs/manual/platform/windows.xml.ko
+++ b/docs/manual/platform/windows.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1673892 (outdated) -->
+<!-- English Revision: 105989:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/programs/ab.html.en b/docs/manual/programs/ab.html.en
index 4934cd54fd..43d8e3a127 100644
--- a/docs/manual/programs/ab.html.en
+++ b/docs/manual/programs/ab.html.en
@@ -136,7 +136,7 @@
requests within one HTTP session. Default is no KeepAlive.</dd>
<dt><code>-l</code></dt>
- <dd>Do not report errors if the length of the responses is not constant. This
+ <dd>Do not report errors if the length of the responses is not constant. This
can be usefull for dynamic pages.<br />
Available in 2.4.7 and later.
</dd>
diff --git a/docs/manual/programs/ab.xml b/docs/manual/programs/ab.xml
index a58985e9bf..52b70ad47e 100644
--- a/docs/manual/programs/ab.xml
+++ b/docs/manual/programs/ab.xml
@@ -131,7 +131,7 @@
requests within one HTTP session. Default is no KeepAlive.</dd>
<dt><code>-l</code></dt>
- <dd>Do not report errors if the length of the responses is not constant. This
+ <dd>Do not report errors if the length of the responses is not constant. This
can be usefull for dynamic pages.<br />
Available in 2.4.7 and later.
</dd>
diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml
index 387ff084a1..40fe6c2a6a 100644
--- a/docs/manual/programs/configure.xml
+++ b/docs/manual/programs/configure.xml
@@ -422,7 +422,7 @@
configuration file. By default, all those directives will be commented
out except for the modules that are either required or explicitly selected
by a configure <code>--enable-foo</code> argument. You can change the set
- of loaded modules by activating or deactivating the <directive
+ of loaded modules by activating or deactivating the <directive
module="mod_so">LoadModule</directive> directives in
<code>httpd.conf</code>. In addition the
<directive module="mod_so">LoadModule</directive> directives for all
diff --git a/docs/manual/programs/htdigest.html.en b/docs/manual/programs/htdigest.html.en
index a6b0ff8944..992226f9c7 100644
--- a/docs/manual/programs/htdigest.html.en
+++ b/docs/manual/programs/htdigest.html.en
@@ -60,7 +60,7 @@
exist, or deleted and recreated if it does exist.</dd>
<dt><code><var>realm</var></code></dt>
- <dd>The realm name to which the user name belongs. See
+ <dd>The realm name to which the user name belongs. See
<a href="http://tools.ietf.org/html/rfc2617#section-3.2.1">
http://tools.ietf.org/html/rfc2617#section-3.2.1</a> for more details.
</dd>
diff --git a/docs/manual/programs/htdigest.xml b/docs/manual/programs/htdigest.xml
index 1459a8d446..ace28ed9b2 100644
--- a/docs/manual/programs/htdigest.xml
+++ b/docs/manual/programs/htdigest.xml
@@ -57,7 +57,7 @@
exist, or deleted and recreated if it does exist.</dd>
<dt><code><var>realm</var></code></dt>
- <dd>The realm name to which the user name belongs. See
+ <dd>The realm name to which the user name belongs. See
<a href="http://tools.ietf.org/html/rfc2617#section-3.2.1">
http://tools.ietf.org/html/rfc2617#section-3.2.1</a> for more details.
</dd>
diff --git a/docs/manual/programs/httxt2dbm.html.en b/docs/manual/programs/httxt2dbm.html.en
index 27d43f4bf6..36270b8a1f 100644
--- a/docs/manual/programs/httxt2dbm.html.en
+++ b/docs/manual/programs/httxt2dbm.html.en
@@ -28,7 +28,7 @@
<p><code>httxt2dbm</code> is used to generate dbm files from text input, for
use in <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> with the
<code>dbm</code> map type.</p>
-
+
<p>If the output file already exists, it will not be truncated. New keys will be
added and existing keys will be updated.</p>
</div>
diff --git a/docs/manual/programs/httxt2dbm.xml b/docs/manual/programs/httxt2dbm.xml
index 195201e63d..13839be8c1 100644
--- a/docs/manual/programs/httxt2dbm.xml
+++ b/docs/manual/programs/httxt2dbm.xml
@@ -29,7 +29,7 @@
<p><code>httxt2dbm</code> is used to generate dbm files from text input, for
use in <directive module="mod_rewrite">RewriteMap</directive> with the
<code>dbm</code> map type.</p>
-
+
<p>If the output file already exists, it will not be truncated. New keys will be
added and existing keys will be updated.</p>
</summary>
diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr
index 6144a16c7c..5aec2456cd 100644
--- a/docs/manual/rewrite/flags.xml.fr
+++ b/docs/manual/rewrite/flags.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1585159:1673932 (outdated) -->
+<!-- English Revision: 1585159:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/rewrite/index.html.fr b/docs/manual/rewrite/index.html.fr
index e809f69feb..c02a7a3f19 100644
--- a/docs/manual/rewrite/index.html.fr
+++ b/docs/manual/rewrite/index.html.fr
@@ -26,6 +26,8 @@
<a href="../tr/rewrite/" hreflang="tr" rel="alternate" title="Türkçe"> tr </a> |
<a href="../zh-cn/rewrite/" hreflang="zh-cn" rel="alternate" title="Simplified Chinese"> zh-cn </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<p><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> permet de modifier les requêtes
diff --git a/docs/manual/rewrite/index.xml.fr b/docs/manual/rewrite/index.xml.fr
index de2ac216ea..75eb69c41d 100644
--- a/docs/manual/rewrite/index.xml.fr
+++ b/docs/manual/rewrite/index.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1328303 -->
+<!-- English Revision: 1328303:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/rewrite/index.xml.meta b/docs/manual/rewrite/index.xml.meta
index 25046eafe9..96567025f0 100644
--- a/docs/manual/rewrite/index.xml.meta
+++ b/docs/manual/rewrite/index.xml.meta
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">tr</variant>
<variant outdated="yes">zh-cn</variant>
</variants>
diff --git a/docs/manual/rewrite/index.xml.tr b/docs/manual/rewrite/index.xml.tr
index dd52f20fc4..122d16af0a 100644
--- a/docs/manual/rewrite/index.xml.tr
+++ b/docs/manual/rewrite/index.xml.tr
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1174747:1328303 (outdated) -->
+<!-- English Revision: 1174747:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/rewrite/index.xml.zh-cn b/docs/manual/rewrite/index.xml.zh-cn
index 272adb9557..a02b3484ea 100644
--- a/docs/manual/rewrite/index.xml.zh-cn
+++ b/docs/manual/rewrite/index.xml.zh-cn
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.zh-cn.xsl"?>
-<!-- English Revision: 1028730:1328303 (outdated) -->
+<!-- English Revision: 1028730:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/rewrite/intro.html.fr b/docs/manual/rewrite/intro.html.fr
index 66b57d3e05..1ea98f3360 100644
--- a/docs/manual/rewrite/intro.html.fr
+++ b/docs/manual/rewrite/intro.html.fr
@@ -24,6 +24,8 @@
<p><span>Langues Disponibles: </span><a href="../en/rewrite/intro.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="../fr/rewrite/intro.html" title="Français"> fr </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<p>Ce document est un complément à la <a href="../mod/mod_rewrite.html">documentation de référence</a> du module
<code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>. Il décrit les concepts de base dont la
diff --git a/docs/manual/rewrite/intro.xml.fr b/docs/manual/rewrite/intro.xml.fr
index 7f1c1edbfa..67c1d34559 100644
--- a/docs/manual/rewrite/intro.xml.fr
+++ b/docs/manual/rewrite/intro.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1654831 -->
+<!-- English Revision: 1654831:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/rewrite/intro.xml.meta b/docs/manual/rewrite/intro.xml.meta
index 5aaac0fc86..ce245b2841 100644
--- a/docs/manual/rewrite/intro.xml.meta
+++ b/docs/manual/rewrite/intro.xml.meta
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
</variants>
</metafile>
diff --git a/docs/manual/rewrite/tech.html.fr b/docs/manual/rewrite/tech.html.fr
index 198dc56162..67a5448a54 100644
--- a/docs/manual/rewrite/tech.html.fr
+++ b/docs/manual/rewrite/tech.html.fr
@@ -24,6 +24,8 @@
<p><span>Langues Disponibles: </span><a href="../en/rewrite/tech.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="../fr/rewrite/tech.html" title="Français"> fr </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<p>Ce document passe en revue certains détails techniques à propos du
module mod_rewrite et de la mise en correspondance des URLs</p>
diff --git a/docs/manual/rewrite/tech.xml.fr b/docs/manual/rewrite/tech.xml.fr
index efb23ac4fd..4d9858ba0f 100644
--- a/docs/manual/rewrite/tech.xml.fr
+++ b/docs/manual/rewrite/tech.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1533275 -->
+<!-- English Revision: 1533275:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/rewrite/tech.xml.meta b/docs/manual/rewrite/tech.xml.meta
index 09c2c39746..f8fb2f4fda 100644
--- a/docs/manual/rewrite/tech.xml.meta
+++ b/docs/manual/rewrite/tech.xml.meta
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
</variants>
</metafile>
diff --git a/docs/manual/sections.xml.fr b/docs/manual/sections.xml.fr
index 11088af6f8..b2ccf2175f 100644
--- a/docs/manual/sections.xml.fr
+++ b/docs/manual/sections.xml.fr
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1636195:1673930 (outdated) -->
+<!-- English Revision: 1636195:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.ja b/docs/manual/sections.xml.ja
index 6fe92fb686..7e2cae67e9 100644
--- a/docs/manual/sections.xml.ja
+++ b/docs/manual/sections.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1673930 (outdated) -->
+<!-- English Revision: 420990:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.ko b/docs/manual/sections.xml.ko
index 9da559f515..ceafba6818 100644
--- a/docs/manual/sections.xml.ko
+++ b/docs/manual/sections.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1673930 (outdated) -->
+<!-- English Revision: 105989:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sections.xml.tr b/docs/manual/sections.xml.tr
index 0622fc0123..c190e1f699 100644
--- a/docs/manual/sections.xml.tr
+++ b/docs/manual/sections.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1300910:1673930 (outdated) -->
+<!-- English Revision: 1300910:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/ssl/ssl_faq.html.fr b/docs/manual/ssl/ssl_faq.html.fr
index fd3098911f..4919a55d61 100644
--- a/docs/manual/ssl/ssl_faq.html.fr
+++ b/docs/manual/ssl/ssl_faq.html.fr
@@ -24,6 +24,8 @@
<p><span>Langues Disponibles: </span><a href="../en/ssl/ssl_faq.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="../fr/ssl/ssl_faq.html" title="Français"> fr </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<blockquote>
<p>Le sage n'apporte pas de bonnes réponses, il pose les bonnes questions</p>
diff --git a/docs/manual/ssl/ssl_faq.xml.fr b/docs/manual/ssl/ssl_faq.xml.fr
index 56b5a98064..893bbb19c6 100644
--- a/docs/manual/ssl/ssl_faq.xml.fr
+++ b/docs/manual/ssl/ssl_faq.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English revision : 1591196 -->
+<!-- English Revision: 1591196:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/ssl/ssl_faq.xml.meta b/docs/manual/ssl/ssl_faq.xml.meta
index 61db826966..a5d5a97804 100644
--- a/docs/manual/ssl/ssl_faq.xml.meta
+++ b/docs/manual/ssl/ssl_faq.xml.meta
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
</variants>
</metafile>
diff --git a/docs/manual/ssl/ssl_howto.xml.fr b/docs/manual/ssl/ssl_howto.xml.fr
index a898641ff0..a937496315 100644
--- a/docs/manual/ssl/ssl_howto.xml.fr
+++ b/docs/manual/ssl/ssl_howto.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1635558:1673582 (outdated) -->
+<!-- English Revision: 1635558:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
diff --git a/docs/manual/suexec.html.fr b/docs/manual/suexec.html.fr
index 32bed3ea3a..0af741b807 100644
--- a/docs/manual/suexec.html.fr
+++ b/docs/manual/suexec.html.fr
@@ -27,6 +27,8 @@
<a href="./ko/suexec.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
<a href="./tr/suexec.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<p>La fonctionnalité <strong>suEXEC</strong> permet
l'exécution des programmes <strong>CGI</strong> et
diff --git a/docs/manual/suexec.xml.fr b/docs/manual/suexec.xml.fr
index 375c9f0ed5..b6e1e829e4 100644
--- a/docs/manual/suexec.xml.fr
+++ b/docs/manual/suexec.xml.fr
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1342078 -->
+<!-- English Revision: 1342078:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/suexec.xml.ja b/docs/manual/suexec.xml.ja
index 03fdc53388..ce2262aa6b 100644
--- a/docs/manual/suexec.xml.ja
+++ b/docs/manual/suexec.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 655869:1342078 (outdated) -->
+<!-- English Revision: 655869:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/suexec.xml.ko b/docs/manual/suexec.xml.ko
index ebbe583292..15815ce428 100644
--- a/docs/manual/suexec.xml.ko
+++ b/docs/manual/suexec.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1342078 (outdated) -->
+<!-- English Revision: 105989:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/suexec.xml.meta b/docs/manual/suexec.xml.meta
index 3b7b1e8915..57a8173940 100644
--- a/docs/manual/suexec.xml.meta
+++ b/docs/manual/suexec.xml.meta
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
<variant outdated="yes">tr</variant>
diff --git a/docs/manual/suexec.xml.tr b/docs/manual/suexec.xml.tr
index f198111db8..5ce2bae461 100644
--- a/docs/manual/suexec.xml.tr
+++ b/docs/manual/suexec.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1038591:1342078 (outdated) -->
+<!-- English Revision: 1038591:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index 37c8885b3d..f36b614b08 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -110,15 +110,15 @@
which the authorization directives are applied.</p>
<p>Directives that control how authorization modules respond when they don't match
- the authenticated user have been removed: This includes
- AuthzLDAPAuthoritative, AuthzDBDAuthoritative, AuthzDBMAuthoritative,
+ the authenticated user have been removed: This includes
+ AuthzLDAPAuthoritative, AuthzDBDAuthoritative, AuthzDBMAuthoritative,
AuthzGroupFileAuthoritative, AuthzUserAuthoritative,
and AuthzOwnerAuthoritative. These directives have been replaced by the
- more expressive <code class="directive"><a href="./mod/mod_authz_core.html#requireany">RequireAny</a></code>,
+ more expressive <code class="directive"><a href="./mod/mod_authz_core.html#requireany">RequireAny</a></code>,
<code class="directive"><a href="./mod/mod_authz_core.html#requirenone">RequireNone</a></code>, and
<code class="directive"><a href="./mod/mod_authz_core.html#requireall">RequireAll</a></code>.</p>
- <p>If you use <code class="module"><a href="./mod/mod_authz_dbm.html">mod_authz_dbm</a></code>, you must port your
+ <p>If you use <code class="module"><a href="./mod/mod_authz_dbm.html">mod_authz_dbm</a></code>, you must port your
configuration to use <code>Require dbm-group ...</code> in place
of <code>Require group ...</code>.</p>
@@ -227,7 +227,7 @@ Allow from example.org</pre>
<code>jsessionid</code>.
</li>
- <li><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>: The second parameter to
+ <li><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>: The second parameter to
<code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code> only
matches forward proxy content if it begins with the correct
protocol. In 2.2 and earlier, a parameter of '/' matched all
@@ -301,7 +301,7 @@ Allow from example.org</pre>
no longer supported. <code class="directive"><a href="./mod/mod_ssl.html#sslproxycheckpeercn">SSLProxyCheckPeerCN
</a></code> and <code class="directive"><a href="./mod/mod_ssl.html#sslproxycheckpeerexpire">SSLProxyCheckPeerExpire
</a></code> now default to On, causing proxy requests to HTTPS hosts
- with bad or outdated certificates to fail with a 502 status code (Bad
+ with bad or outdated certificates to fail with a 502 status code (Bad
gateway)</li>
<li><code class="program"><a href="./programs/htpasswd.html">htpasswd</a></code> now uses MD5 hash by default on
@@ -327,7 +327,7 @@ Allow from example.org</pre>
<li>The functionality provided by <code>mod_authn_alias</code>
in previous versions (i.e., the <code class="directive"><a href="./mod/mod_authn_core.html#authnprovideralias">AuthnProviderAlias</a></code> directive)
- has been moved into <code class="module"><a href="./mod/mod_authn_core.html">mod_authn_core</a></code>.
+ has been moved into <code class="module"><a href="./mod/mod_authn_core.html">mod_authn_core</a></code>.
</li>
<li><code class="module"><a href="./mod/mod_cgid.html">mod_cgid</a></code> uses the servers <code class="directive"><a href="./mod/core.html#timeout">Timeout</a></code> to limit the length of time to wait for CGI output.
@@ -359,9 +359,9 @@ Allow from example.org</pre>
- load module <code class="module"><a href="./mod/mod_access_compat.html">mod_access_compat</a></code>, or update configuration to 2.4 authorization directives.</li>
<li><code>Ignoring deprecated use of DefaultType in line NN of /path/to/httpd.conf</code> - remove <code class="directive"><a href="./mod/core.html#defaulttype">DefaultType</a></code>
and replace with other configuration settings.</li>
- <li><code>Invalid command 'AddOutputFilterByType', perhaps misspelled
+ <li><code>Invalid command 'AddOutputFilterByType', perhaps misspelled
or defined by a module not included in the server configuration
- </code> - <code class="directive"><a href="./mod/mod_filter.html#addoutputfilterbytype">AddOutputFilterByType</a></code>
+ </code> - <code class="directive"><a href="./mod/mod_filter.html#addoutputfilterbytype">AddOutputFilterByType</a></code>
has moved from the core to mod_filter, which must be loaded.</li>
</ul></li>
<li>Errors serving requests:
diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index 0b61459fb6..ab29e41bf2 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -107,15 +107,15 @@
which the authorization directives are applied.</p>
<p>Directives that control how authorization modules respond when they don't match
- the authenticated user have been removed: This includes
- AuthzLDAPAuthoritative, AuthzDBDAuthoritative, AuthzDBMAuthoritative,
+ the authenticated user have been removed: This includes
+ AuthzLDAPAuthoritative, AuthzDBDAuthoritative, AuthzDBMAuthoritative,
AuthzGroupFileAuthoritative, AuthzUserAuthoritative,
and AuthzOwnerAuthoritative. These directives have been replaced by the
- more expressive <directive module="mod_authz_core">RequireAny</directive>,
+ more expressive <directive module="mod_authz_core">RequireAny</directive>,
<directive module="mod_authz_core">RequireNone</directive>, and
<directive module="mod_authz_core">RequireAll</directive>.</p>
- <p>If you use <module>mod_authz_dbm</module>, you must port your
+ <p>If you use <module>mod_authz_dbm</module>, you must port your
configuration to use <code>Require dbm-group ...</code> in place
of <code>Require group ...</code>.</p>
@@ -256,7 +256,7 @@ Allow from example.org
<code>jsessionid</code>.
</li>
- <li><module>mod_cache</module>: The second parameter to
+ <li><module>mod_cache</module>: The second parameter to
<directive module="mod_cache">CacheEnable</directive> only
matches forward proxy content if it begins with the correct
protocol. In 2.2 and earlier, a parameter of '/' matched all
@@ -339,7 +339,7 @@ Allow from example.org
no longer supported. <directive module="mod_ssl">SSLProxyCheckPeerCN
</directive> and <directive module="mod_ssl">SSLProxyCheckPeerExpire
</directive> now default to On, causing proxy requests to HTTPS hosts
- with bad or outdated certificates to fail with a 502 status code (Bad
+ with bad or outdated certificates to fail with a 502 status code (Bad
gateway)</li>
<li><program>htpasswd</program> now uses MD5 hash by default on
@@ -364,9 +364,9 @@ Allow from example.org
</li>
<li>The functionality provided by <code>mod_authn_alias</code>
- in previous versions (i.e., the <directive
+ in previous versions (i.e., the <directive
module="mod_authn_core">AuthnProviderAlias</directive> directive)
- has been moved into <module>mod_authn_core</module>.
+ has been moved into <module>mod_authn_core</module>.
</li>
<li><module>mod_cgid</module> uses the servers <directive module="core"
@@ -399,9 +399,9 @@ Allow from example.org
- load module <module>mod_access_compat</module>, or update configuration to 2.4 authorization directives.</li>
<li><code>Ignoring deprecated use of DefaultType in line NN of /path/to/httpd.conf</code> - remove <directive module="core">DefaultType</directive>
and replace with other configuration settings.</li>
- <li><code>Invalid command 'AddOutputFilterByType', perhaps misspelled
+ <li><code>Invalid command 'AddOutputFilterByType', perhaps misspelled
or defined by a module not included in the server configuration
- </code> - <directive module="mod_filter">AddOutputFilterByType</directive>
+ </code> - <directive module="mod_filter">AddOutputFilterByType</directive>
has moved from the core to mod_filter, which must be loaded.</li>
</ul></li>
<li>Errors serving requests:
diff --git a/docs/manual/urlmapping.xml.fr b/docs/manual/urlmapping.xml.fr
index 88eb68a04e..dfd30169fe 100644
--- a/docs/manual/urlmapping.xml.fr
+++ b/docs/manual/urlmapping.xml.fr
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1561569:1673930 (outdated) -->
+<!-- English Revision: 1561569:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/urlmapping.xml.ja b/docs/manual/urlmapping.xml.ja
index ff6d6b1ad0..0c6498475e 100644
--- a/docs/manual/urlmapping.xml.ja
+++ b/docs/manual/urlmapping.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 151408:1673930 (outdated) -->
+<!-- English Revision: 151408:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/urlmapping.xml.ko b/docs/manual/urlmapping.xml.ko
index b9cb7bfcd8..870bebf64a 100644
--- a/docs/manual/urlmapping.xml.ko
+++ b/docs/manual/urlmapping.xml.ko
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1673930 (outdated) -->
+<!-- English Revision: 151408:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/urlmapping.xml.tr b/docs/manual/urlmapping.xml.tr
index 270ced3f7c..a10024504e 100644
--- a/docs/manual/urlmapping.xml.tr
+++ b/docs/manual/urlmapping.xml.tr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 1310494:1673930 (outdated) -->
+<!-- English Revision: 1310494:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/details.html.en b/docs/manual/vhosts/details.html.en
index b190a4dcfe..1b4c368bc5 100644
--- a/docs/manual/vhosts/details.html.en
+++ b/docs/manual/vhosts/details.html.en
@@ -110,7 +110,7 @@
server does not support <a class="glossarylink" href="../glossary.html#servernameindication" title="see glossary">Server Name Indication</a>.</p>
<p>The complete list of names in the <code>VirtualHost</code>
- directive are treated just like a (non wildcard) <code>ServerAlias</code>
+ directive are treated just like a (non wildcard) <code>ServerAlias</code>
(but are not overridden by any <code>ServerAlias</code> statement).</p>
<p>For every vhost various default values are set. In
diff --git a/docs/manual/vhosts/details.xml b/docs/manual/vhosts/details.xml
index 3a1c6c1541..92dc3a4b4a 100644
--- a/docs/manual/vhosts/details.xml
+++ b/docs/manual/vhosts/details.xml
@@ -110,7 +110,7 @@
ref="servernameindication">Server Name Indication</glossary>.</p>
<p>The complete list of names in the <code>VirtualHost</code>
- directive are treated just like a (non wildcard) <code>ServerAlias</code>
+ directive are treated just like a (non wildcard) <code>ServerAlias</code>
(but are not overridden by any <code>ServerAlias</code> statement).</p>
<p>For every vhost various default values are set. In
diff --git a/docs/manual/vhosts/examples.xml.fr b/docs/manual/vhosts/examples.xml.fr
index 6289e6fca8..c20dc8260c 100644
--- a/docs/manual/vhosts/examples.xml.fr
+++ b/docs/manual/vhosts/examples.xml.fr
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='ISO-8859-1' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1628690:1673930 (outdated) -->
+<!-- English Revision: 1628690:1673945 (outdated) -->
<!-- French translation by Vincent Deffontaines, Alain B. -->
<!-- reviewed by Lucien Gentis -->
diff --git a/docs/manual/vhosts/examples.xml.ja b/docs/manual/vhosts/examples.xml.ja
index bc4d48ad13..12d26a429f 100644
--- a/docs/manual/vhosts/examples.xml.ja
+++ b/docs/manual/vhosts/examples.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 659902:1673930 (outdated) -->
+<!-- English Revision: 659902:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/examples.xml.ko b/docs/manual/vhosts/examples.xml.ko
index aff71156ae..ab9f65ef12 100644
--- a/docs/manual/vhosts/examples.xml.ko
+++ b/docs/manual/vhosts/examples.xml.ko
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1673930 (outdated) -->
+<!-- English Revision: 105989:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/examples.xml.tr b/docs/manual/vhosts/examples.xml.tr
index 625f05aa33..c24e238c15 100644
--- a/docs/manual/vhosts/examples.xml.tr
+++ b/docs/manual/vhosts/examples.xml.tr
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1132802:1673930 (outdated) -->
+<!-- English Revision: 1132802:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/mass.xml.fr b/docs/manual/vhosts/mass.xml.fr
index f2aa22a0f7..129180ecf8 100644
--- a/docs/manual/vhosts/mass.xml.fr
+++ b/docs/manual/vhosts/mass.xml.fr
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1436578:1673917 (outdated) -->
+<!-- English Revision: 1436578:1673945 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!--
diff --git a/docs/manual/vhosts/mass.xml.ko b/docs/manual/vhosts/mass.xml.ko
index a0bbba4edf..5afb3c98ae 100644
--- a/docs/manual/vhosts/mass.xml.ko
+++ b/docs/manual/vhosts/mass.xml.ko
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1673917 (outdated) -->
+<!-- English Revision: 151408:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/mass.xml.tr b/docs/manual/vhosts/mass.xml.tr
index b7673762a1..0ad3b51c8a 100644
--- a/docs/manual/vhosts/mass.xml.tr
+++ b/docs/manual/vhosts/mass.xml.tr
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1174747:1673917 (outdated) -->
+<!-- English Revision: 1174747:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/name-based.xml.de b/docs/manual/vhosts/name-based.xml.de
index 9620f4d7e4..49f89b27d3 100644
--- a/docs/manual/vhosts/name-based.xml.de
+++ b/docs/manual/vhosts/name-based.xml.de
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 420990:1673917 (outdated) -->
+<!-- English Revision: 420990:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/name-based.xml.fr b/docs/manual/vhosts/name-based.xml.fr
index 70920d2e0a..1d9bee4318 100644
--- a/docs/manual/vhosts/name-based.xml.fr
+++ b/docs/manual/vhosts/name-based.xml.fr
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='ISO-8859-1' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1647229:1673917 (outdated) -->
+<!-- English Revision: 1647229:1673945 (outdated) -->
<!-- French translation by alain B, review by Vincent Deffontaines
updated by Lucien GENTIS -->
diff --git a/docs/manual/vhosts/name-based.xml.ja b/docs/manual/vhosts/name-based.xml.ja
index df4b1719cc..cfd057e48f 100644
--- a/docs/manual/vhosts/name-based.xml.ja
+++ b/docs/manual/vhosts/name-based.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1673917 (outdated) -->
+<!-- English Revision: 420990:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/name-based.xml.ko b/docs/manual/vhosts/name-based.xml.ko
index eb574c2689..34bec7bf7d 100644
--- a/docs/manual/vhosts/name-based.xml.ko
+++ b/docs/manual/vhosts/name-based.xml.ko
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 420990:1673917 (outdated) -->
+<!-- English Revision: 420990:1673945 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/name-based.xml.tr b/docs/manual/vhosts/name-based.xml.tr
index 6afa5fb31a..063b0e9dab 100644
--- a/docs/manual/vhosts/name-based.xml.tr
+++ b/docs/manual/vhosts/name-based.xml.tr
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1301398:1673917 (outdated) -->
+<!-- English Revision: 1301398:1673945 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>