Skip to content

Commit

Permalink
Get ready to tag httpd 2.4.41
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1864800 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
DRuggeri committed Aug 9, 2019
1 parent e77fb11 commit 8c548ae
Show file tree
Hide file tree
Showing 38 changed files with 1,201 additions and 1,107 deletions.
10 changes: 5 additions & 5 deletions docs/man/htcacheclean.8
Expand Up @@ -19,18 +19,18 @@
.el .ne 3
.IP "\\$1" \\$2
..
.TH "HTCACHECLEAN" 8 "2018-07-06" "Apache HTTP Server" "htcacheclean"
.TH "HTCACHECLEAN" 8 "2019-08-09" "Apache HTTP Server" "htcacheclean"

.SH NAME
htcacheclean \- Clean up the disk cache

.SH "SYNOPSIS"

.PP
\fB\fBhtcacheclean\fR [ -\fBD\fR ] [ -\fBv\fR ] [ -\fBt\fR ] [ -\fBr\fR ] [ -\fBn\fR ] [ -\fBR\fR\fIround\fR ] -\fBp\fR\fIpath\fR [-\fBl\fR\fIlimit\fR| -\fBL\fR\fIlimit\fR]\fR
\fB\fBhtcacheclean\fR [ -\fBD\fR ] [ -\fBv\fR ] [ -\fBt\fR ] [ -\fBr\fR ] [ -\fBn\fR ] [ -\fBR\fR\fIround\fR ] -\fBp\fR\fIpath\fR [ -\fBl\fR\fIlimit\fR ] [ -\fBL\fR\fIlimit\fR ]\fR

.PP
\fB\fBhtcacheclean\fR [ -\fBn\fR ] [ -\fBt\fR ] [ -\fBi\fR ] [ -\fBP\fR\fIpidfile\fR ] [ -\fBR\fR\fIround\fR ] -\fBd\fR\fIinterval\fR -\fBp\fR\fIpath\fR [-\fBl\fR\fIlimit\fR| -\fBL\fR\fIlimit\fR]\fR
\fB\fBhtcacheclean\fR [ -\fBn\fR ] [ -\fBt\fR ] [ -\fBi\fR ] [ -\fBP\fR\fIpidfile\fR ] [ -\fBR\fR\fIround\fR ] -\fBd\fR\fIinterval\fR -\fBp\fR\fIpath\fR [ -\fBl\fR\fIlimit\fR ] [ -\fBL\fR\fIlimit\fR ]\fR

.PP
\fB\fBhtcacheclean\fR [ -\fBv\fR ] [ -\fBR\fR\fIround\fR ] -\fBp\fR\fIpath\fR [ -\fBa\fR ] [ -\fBA\fR ]\fR
Expand Down Expand Up @@ -77,10 +77,10 @@ Specify \fIpidfile\fR as the name of the file to write the process ID to when da
Specify \fIround\fR as the amount to round sizes up to, to compensate for disk block sizes\&. Set to the block size of the cache partition\&.
.TP
\fB-l\fIlimit\fR\fR
Specify \fIlimit\fR as the total disk cache size limit\&. The value is expressed in bytes by default (or attaching \fBB\fR to the number)\&. Attach \fBK\fR for Kbytes or \fBM\fR for MBytes\&.
Specify \fIlimit\fR as the total disk cache size limit\&. The value is expressed in bytes by default (or attaching \fBB\fR to the number)\&. Attach \fBK\fR for Kbytes, \fBM\fR for MBytes or \fBG\fR for Gbytes\&.
.TP
\fB-L\fIlimit\fR\fR
Specify \fIlimit\fR as the total disk cache inode limit\&.
Specify \fIlimit\fR as the total disk cache inode limit\&. \fBK\fR, \fBM\fR or \fBG\fR suffix can also be used\&.
.TP
\fB-i\fR
Be intelligent and run only when there was a modification of the disk cache\&. This option is only possible together with the \fB-d\fR option\&.
Expand Down
7 changes: 5 additions & 2 deletions docs/man/htpasswd.1
Expand Up @@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
.TH "HTPASSWD" 1 "2018-07-06" "Apache HTTP Server" "htpasswd"
.TH "HTPASSWD" 1 "2019-08-09" "Apache HTTP Server" "htpasswd"

.SH NAME
htpasswd \- Manage user files for basic authentication
Expand Down Expand Up @@ -77,7 +77,7 @@ Use MD5 encryption for passwords\&. This is the default (since version 2\&.2\&.1
Use bcrypt encryption for passwords\&. This is currently considered to be very secure\&.
.TP
\fB-C\fR
This flag is only allowed in combination with \fB-B\fR (bcrypt encryption)\&. It sets the computing time used for the bcrypt algorithm (higher is more secure but slower, default: 5, valid: 4 to 31)\&.
This flag is only allowed in combination with \fB-B\fR (bcrypt encryption)\&. It sets the computing time used for the bcrypt algorithm (higher is more secure but slower, default: 5, valid: 4 to 17)\&.
.TP
\fB-d\fR
Use \fBcrypt()\fR encryption for passwords\&. This is not supported by the httpd server on Windows and Netware\&. This algorithm limits the password length to 8 characters\&. This algorithm is \fBinsecure\fR by today's standards\&. It used to be the default algorithm until version 2\&.2\&.17\&.
Expand Down Expand Up @@ -168,3 +168,6 @@ The MD5 algorithm used by \fBhtpasswd\fR is specific to the Apache software; pas
.PP
Usernames are limited to \fB255\fR bytes and may not include the character \fB:\fR\&.

.PP
The cost of computing a bcrypt password hash value increases with the number of rounds specified by the \fB-C\fR option\&. The \fBapr-util\fR library enforces a maximum number of rounds of 17 in version \fB1\&.6\&.0\fR and later\&.

1 change: 1 addition & 0 deletions docs/manual/convenience.map
Expand Up @@ -561,6 +561,7 @@ sessiondbdselectlabel mod/mod_session_dbd.html#sessiondbdselectlabel
sessiondbdupdatelabel mod/mod_session_dbd.html#sessiondbdupdatelabel
sessionenv mod/mod_session.html#sessionenv
sessionexclude mod/mod_session.html#sessionexclude
sessionexpiryupdateinterval mod/mod_session.html#sessionexpiryupdateinterval
sessionheader mod/mod_session.html#sessionheader
sessioninclude mod/mod_session.html#sessioninclude
sessionmaxage mod/mod_session.html#sessionmaxage
Expand Down
1 change: 1 addition & 0 deletions docs/manual/mod/directives.html.de
Expand Up @@ -603,6 +603,7 @@
<li><a href="mod_session_dbd.html#sessiondbdupdatelabel">SessionDBDUpdateLabel</a></li>
<li><a href="mod_session.html#sessionenv">SessionEnv</a></li>
<li><a href="mod_session.html#sessionexclude">SessionExclude</a></li>
<li><a href="mod_session.html#sessionexpiryupdateinterval">SessionExpiryUpdateInterval</a></li>
<li><a href="mod_session.html#sessionheader">SessionHeader</a></li>
<li><a href="mod_session.html#sessioninclude">SessionInclude</a></li>
<li><a href="mod_session.html#sessionmaxage">SessionMaxAge</a></li>
Expand Down
1 change: 1 addition & 0 deletions docs/manual/mod/directives.html.en
Expand Up @@ -604,6 +604,7 @@
<li><a href="mod_session_dbd.html#sessiondbdupdatelabel">SessionDBDUpdateLabel</a></li>
<li><a href="mod_session.html#sessionenv">SessionEnv</a></li>
<li><a href="mod_session.html#sessionexclude">SessionExclude</a></li>
<li><a href="mod_session.html#sessionexpiryupdateinterval">SessionExpiryUpdateInterval</a></li>
<li><a href="mod_session.html#sessionheader">SessionHeader</a></li>
<li><a href="mod_session.html#sessioninclude">SessionInclude</a></li>
<li><a href="mod_session.html#sessionmaxage">SessionMaxAge</a></li>
Expand Down
1 change: 1 addition & 0 deletions docs/manual/mod/directives.html.es
Expand Up @@ -606,6 +606,7 @@
<li><a href="mod_session_dbd.html#sessiondbdupdatelabel">SessionDBDUpdateLabel</a></li>
<li><a href="mod_session.html#sessionenv">SessionEnv</a></li>
<li><a href="mod_session.html#sessionexclude">SessionExclude</a></li>
<li><a href="mod_session.html#sessionexpiryupdateinterval">SessionExpiryUpdateInterval</a></li>
<li><a href="mod_session.html#sessionheader">SessionHeader</a></li>
<li><a href="mod_session.html#sessioninclude">SessionInclude</a></li>
<li><a href="mod_session.html#sessionmaxage">SessionMaxAge</a></li>
Expand Down
1 change: 1 addition & 0 deletions docs/manual/mod/directives.html.fr.utf8
Expand Up @@ -604,6 +604,7 @@
<li><a href="mod_session_dbd.html#sessiondbdupdatelabel">SessionDBDUpdateLabel</a></li>
<li><a href="mod_session.html#sessionenv">SessionEnv</a></li>
<li><a href="mod_session.html#sessionexclude">SessionExclude</a></li>
<li><a href="mod_session.html#sessionexpiryupdateinterval">SessionExpiryUpdateInterval</a></li>
<li><a href="mod_session.html#sessionheader">SessionHeader</a></li>
<li><a href="mod_session.html#sessioninclude">SessionInclude</a></li>
<li><a href="mod_session.html#sessionmaxage">SessionMaxAge</a></li>
Expand Down
1 change: 1 addition & 0 deletions docs/manual/mod/directives.html.ja.utf8
Expand Up @@ -601,6 +601,7 @@
<li><a href="mod_session_dbd.html#sessiondbdupdatelabel">SessionDBDUpdateLabel</a></li>
<li><a href="mod_session.html#sessionenv">SessionEnv</a></li>
<li><a href="mod_session.html#sessionexclude">SessionExclude</a></li>
<li><a href="mod_session.html#sessionexpiryupdateinterval">SessionExpiryUpdateInterval</a></li>
<li><a href="mod_session.html#sessionheader">SessionHeader</a></li>
<li><a href="mod_session.html#sessioninclude">SessionInclude</a></li>
<li><a href="mod_session.html#sessionmaxage">SessionMaxAge</a></li>
Expand Down
1 change: 1 addition & 0 deletions docs/manual/mod/directives.html.ko.euc-kr
Expand Up @@ -601,6 +601,7 @@
<li><a href="mod_session_dbd.html#sessiondbdupdatelabel">SessionDBDUpdateLabel</a></li>
<li><a href="mod_session.html#sessionenv">SessionEnv</a></li>
<li><a href="mod_session.html#sessionexclude">SessionExclude</a></li>
<li><a href="mod_session.html#sessionexpiryupdateinterval">SessionExpiryUpdateInterval</a></li>
<li><a href="mod_session.html#sessionheader">SessionHeader</a></li>
<li><a href="mod_session.html#sessioninclude">SessionInclude</a></li>
<li><a href="mod_session.html#sessionmaxage">SessionMaxAge</a></li>
Expand Down
1 change: 1 addition & 0 deletions docs/manual/mod/directives.html.tr.utf8
Expand Up @@ -600,6 +600,7 @@
<li><a href="mod_session_dbd.html#sessiondbdupdatelabel">SessionDBDUpdateLabel</a></li>
<li><a href="mod_session.html#sessionenv">SessionEnv</a></li>
<li><a href="mod_session.html#sessionexclude">SessionExclude</a></li>
<li><a href="mod_session.html#sessionexpiryupdateinterval">SessionExpiryUpdateInterval</a></li>
<li><a href="mod_session.html#sessionheader">SessionHeader</a></li>
<li><a href="mod_session.html#sessioninclude">SessionInclude</a></li>
<li><a href="mod_session.html#sessionmaxage">SessionMaxAge</a></li>
Expand Down
1 change: 1 addition & 0 deletions docs/manual/mod/directives.html.zh-cn.utf8
Expand Up @@ -599,6 +599,7 @@
<li><a href="mod_session_dbd.html#sessiondbdupdatelabel">SessionDBDUpdateLabel</a></li>
<li><a href="mod_session.html#sessionenv">SessionEnv</a></li>
<li><a href="mod_session.html#sessionexclude">SessionExclude</a></li>
<li><a href="mod_session.html#sessionexpiryupdateinterval">SessionExpiryUpdateInterval</a></li>
<li><a href="mod_session.html#sessionheader">SessionHeader</a></li>
<li><a href="mod_session.html#sessioninclude">SessionInclude</a></li>
<li><a href="mod_session.html#sessionmaxage">SessionMaxAge</a></li>
Expand Down
42 changes: 39 additions & 3 deletions docs/manual/mod/mod_session.html.en
Expand Up @@ -79,6 +79,7 @@
<li><img alt="" src="../images/down.gif" /> <a href="#session">Session</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessionenv">SessionEnv</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessionexclude">SessionExclude</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessionexpiryupdateinterval">SessionExpiryUpdateInterval</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessionheader">SessionHeader</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessioninclude">SessionInclude</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessionmaxage">SessionMaxAge</a></li>
Expand Down Expand Up @@ -278,7 +279,7 @@ SessionCookieName session path=/
AuthFormProvider file
AuthUserFile "conf/passwd"
AuthType form
AuthName realm
AuthName "realm"
#...</pre>
</div>

Expand Down Expand Up @@ -325,7 +326,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
Expand All @@ -335,7 +336,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
Expand Down Expand Up @@ -410,6 +411,41 @@ AuthName realm
directive does not set the <var>path</var> attribute, which must be
configured separately.</p></div>

</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="SessionExpiryUpdateInterval" id="SessionExpiryUpdateInterval">SessionExpiryUpdateInterval</a> <a name="sessionexpiryupdateinterval" id="sessionexpiryupdateinterval">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define the number of seconds a session's expiry may change without
the session being updated</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionExpiryUpdateInterval <var>interval</var></code></td></tr>
<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SessionExpiryUpdateInterval 0 (always update)</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>Extension</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_session</td></tr>
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.4.41 and later</td></tr>
</table>
<p>The <code class="directive">SessionExpiryUpdateInterval</code> directive allows
sessions to avoid the cost associated with writing the session each request
when only the expiry time has changed. This can be used to make a website
more efficient or reduce load on a database when using
<code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code>. The session is always written if the data
stored in the session has changed or the expiry has changed by more than the
configured interval.</p>

<p>Setting the interval to zero disables this directive, and the session
expiry is refreshed for each request.</p>

<p>This directive only has an effect when combined with
<code class="directive"><a href="#sessionmaxage">SessionMaxAge</a></code> to enable session
expiry. Sessions without an expiry are only written when the data stored in
the session has changed.</p>

<div class="warning"><h3>Warning</h3>
<p>Because the session expiry may not be refreshed with each request, it's
possible for sessions to expire up to <var>interval</var> seconds early.
Using a small interval usually provides sufficient savings while having a
minimal effect on expiry resolution.</p></div>

</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="SessionHeader" id="SessionHeader">SessionHeader</a> <a name="sessionheader" id="sessionheader">Directive</a></h2>
Expand Down
17 changes: 17 additions & 0 deletions docs/manual/mod/mod_session.html.fr.utf8
Expand Up @@ -29,6 +29,8 @@
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_session.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
<a href="../fr/mod/mod_session.html" title="Français">&nbsp;fr&nbsp;</a></p>
</div>
<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
anglaise pour les changements récents.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Support des sessions</td></tr>
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>session_module</td></tr>
Expand Down Expand Up @@ -88,6 +90,7 @@
<li><img alt="" src="../images/down.gif" /> <a href="#session">Session</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessionenv">SessionEnv</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessionexclude">SessionExclude</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessionexpiryupdateinterval">SessionExpiryUpdateInterval</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessionheader">SessionHeader</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessioninclude">SessionInclude</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessionmaxage">SessionMaxAge</a></li>
Expand Down Expand Up @@ -467,6 +470,20 @@ ignorée</td></tr>

</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="sessionexpiryupdateinterval" id="sessionexpiryupdateinterval">Directive</a> <a name="SessionExpiryUpdateInterval" id="SessionExpiryUpdateInterval">SessionExpiryUpdateInterval</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define the number of seconds a session's expiry may change without
the session being updated</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SessionExpiryUpdateInterval <var>interval</var></code></td></tr>
<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>SessionExpiryUpdateInterval 0 (always update)</code></td></tr>
<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration globale, serveur virtuel, répertoire, .htaccess</td></tr>
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_session</td></tr>
<tr><th><a href="directive-dict.html#Compatibility">Compatibilité:</a></th><td>Available in Apache 2.4.41 and later</td></tr>
</table><p>La documentation de cette directive
n'a pas encore t traduite. Veuillez vous reporter la version
en langue anglaise.</p></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="sessionheader" id="sessionheader">Directive</a> <a name="SessionHeader" id="SessionHeader">SessionHeader</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Importation des mises à jour de session depuis l'en-tête de
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/mod/mod_session.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: 1673563 -->
<!-- English Revision: 1673563:1864783 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->

Expand Down
2 changes: 1 addition & 1 deletion docs/manual/mod/mod_session.xml.meta
Expand Up @@ -8,6 +8,6 @@

<variants>
<variant>en</variant>
<variant>fr</variant>
<variant outdated="yes">fr</variant>
</variants>
</metafile>

0 comments on commit 8c548ae

Please sign in to comment.