Merge branch 'apache:trunk' into trunk

samkenxstream · Oct 13, 2023 · 0cf89c0 · 0cf89c0
2 parents f15d06a + afcdbee
commit 0cf89c0
Show file tree

Hide file tree

Showing 77 changed files with 2,444 additions and 1,484 deletions.
diff --git a/changes-entries/davlockdbtype.txt b/changes-entries/davlockdbtype.txt
@@ -0,0 +1 @@
+  *) mod_dav_fs: Add DavLockDBType directive.  [Joe Orton]
diff --git a/changes-entries/h2_proxy_errors.txt b/changes-entries/h2_proxy_errors.txt
@@ -0,0 +1,3 @@
+  *) mod_proxy_http2: improved error handling on connection errors while
+     response is already underway.
+     [Stefan Eissing]
diff --git a/changes-entries/h2_proxy_forwarded_host.txt b/changes-entries/h2_proxy_forwarded_host.txt
@@ -0,0 +1,4 @@
+  *) mod_proxy_http2: fix `X-Forward-Host` header to carry the correct value.
+     Fixed PR66752.
+     [Stefan Eissing]
+
diff --git a/changes-entries/h2_stream_timeout.txt b/changes-entries/h2_stream_timeout.txt
@@ -0,0 +1,2 @@
+ * mod_http2: fixed a bug in handling of stream timeouts.
+   [Stefan Eissing]
diff --git a/changes-entries/md_v2.4.24.txt b/changes-entries/md_v2.4.24.txt
@@ -0,0 +1,4 @@
+ * mod_md: fixed passing of the server environment variables to programs
+   started via MDMessageCmd and MDChallengeDns01 on *nix system.
+   See <https://github.com/icing/mod_md/issues/319>.
+   [Stefan Eissing]
diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
@@ -1 +1 @@
-10484
+10485
diff --git a/docs/manual/env.html.fr.utf8 b/docs/manual/env.html.fr.utf8
@@ -524,7 +524,7 @@ SetEnvIf Referer "^$" local_referal
 
         <p>Pour plus d'informations sur cette technique, voir le tutoriel sur
 	ServerWatch
-	"<a href="http://www.serverwatch.com/tutorials/article.php/1132731">Keeping Your Images from Adorning Other Sites</a>".</p>
+	"<a href="https://www.serverwatch.com/guides/keeping-your-images-from-adorning-other-sites/">Keeping Your Images from Adorning Other Sites</a>".</p>
 
   </div></div>
 <div class="bottomlang">

diff --git a/docs/manual/env.xml b/docs/manual/env.xml
@@ -533,7 +533,7 @@ SetEnvIf Referer "^$" local_referal
         </highlight>
 
         <p>For more information about this technique, see the
-        "<a href="http://www.serverwatch.com/tutorials/article.php/1132731"
+        "<a href="https://www.serverwatch.com/guides/keeping-your-images-from-adorning-other-sites/"
         >Keeping Your Images from Adorning Other Sites</a>"
         tutorial on ServerWatch.</p>
     </section>

diff --git a/docs/manual/env.xml.fr b/docs/manual/env.xml.fr
@@ -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.fr.xsl"?>
-<!-- English Revision: 1885046 -->
+<!-- English Revision: 1911878 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -568,7 +568,7 @@ SetEnvIf Referer "^$" local_referal
 
         <p>Pour plus d'informations sur cette technique, voir le tutoriel sur
 	ServerWatch
-	"<a href="http://www.serverwatch.com/tutorials/article.php/1132731"
+	"<a href="https://www.serverwatch.com/guides/keeping-your-images-from-adorning-other-sites/"
 	>Keeping Your Images from Adorning Other Sites</a>".</p>
     </section>
   </section>

diff --git 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:1885046 (outdated) -->
+<!-- English Revision: 659902:1911878 (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
@@ -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:1885046 (outdated) -->
+<!-- English Revision: 105989:1911878 (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
@@ -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:1885046 (outdated) -->
+<!-- English Revision: 1300910:1911878 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

diff --git a/docs/manual/mod/directives.html.fr.utf8 b/docs/manual/mod/directives.html.fr.utf8
@@ -254,6 +254,7 @@
 <li><a href="mod_ssl_ct.html#ctstaticscts">CTStaticSCTs</a></li>
 <li><a href="mod_log_config.html#customlog">CustomLog</a></li>
 <li><a href="mod_dav.html#dav" id="D" name="D">Dav</a></li>
+<li><a href="mod_dav.html#davbasepath">DavBasePath</a></li>
 <li><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity</a></li>
 <li><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB</a></li>
 <li><a href="mod_dav_fs.html#davlockdb">DavLockDB</a></li>

diff --git a/docs/manual/mod/mod_alias.html.fr.utf8 b/docs/manual/mod/mod_alias.html.fr.utf8
@@ -518,18 +518,18 @@ différente</td></tr>
 <div class="directive-section"><h2><a name="redirectrelative" id="redirectrelative">Directive</a> <a name="RedirectRelative" id="RedirectRelative">RedirectRelative</a> <a title="Lien permanent" href="#redirectrelative" class="permalink">&para;</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Redirection relative de cibles.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>RedirectRelative OFF|ON</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>RedirectRelative OFF</code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>RedirectRelative On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>RedirectRelative Off</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration globale, serveur virtuel, répertoire</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_alias</td></tr>
 <tr><th><a href="directive-dict.html#Compatibility">Compatibilité:</a></th><td>Disponible à partir de la version 2.5.1 du serveur HTTP Apache</td></tr>
 </table>
-    <p>Par défaut, si l'URL cible d'une directive
-    <code class="directive">Redirect</code> est une URL relative commençant par un
-    caractère '/', le serveur convertit cette dernière en URL absolue avant de
-    répondre au client. En définissant <code class="directive">RedirectRelative</code> à
-    "ON", l'URL relative est présentée au client sans modification.</p>
+    <p>Par défaut, si l'URL cible d'une directive <code class="directive"><a href="#redirect">Redirect</a></code> est une URL relative commençant par
+    un caractère '/', le serveur convertit cette dernière en URL absolue avant
+    de répondre au client. En définissant
+    <code class="directive">RedirectRelative</code> à "On", l'URL relative est présentée
+    au client sans modification.</p>
 
 
 </div>

diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml
@@ -642,18 +642,18 @@ ScriptAliasMatch "(?i)^/cgi-bin(.*)" "/usr/local/apache/cgi-bin$1"
 <directivesynopsis>
 <name>RedirectRelative</name>
 <description>Allows relative redirect targets.</description>
-<syntax>RedirectRelative OFF|ON</syntax>
-<default>RedirectRelative OFF</default>
+<syntax>RedirectRelative On|Off</syntax>
+<default>RedirectRelative Off</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context>
 </contextlist>
 <compatibility>2.5.1 and later</compatibility>
 
 <usage>
-    <p>By default, if the target URL of a <directive>Redirect</directive>
+    <p>By default, if the target URL of a <directive module="mod_alias">Redirect</directive>
     directive is a relative URL beginning with a '/' character, the server 
-    converts it to a an absolute URL before responding to the client. By
-    setting <directive>RedirectRelative</directive> to the value "ON",
+    converts it to an absolute URL before responding to the client. By
+    setting <directive>RedirectRelative</directive> to the value "On",
     the relative URL is presented to the client directly.</p>
 
 </usage>

diff --git a/docs/manual/mod/mod_alias.xml.es b/docs/manual/mod/mod_alias.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1799478:1911067 (outdated) -->
+<!-- English Revision: 1799478:1911948 (outdated) -->
 <!-- Spanish Translation: Daniel Ferradal <dferradal@apache.org> -->
 
 <!--

diff --git a/docs/manual/mod/mod_alias.xml.fr b/docs/manual/mod/mod_alias.xml.fr
@@ -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.fr.xsl"?>
-<!-- English Revision: 1911067 -->
+<!-- English Revision: 1911948 -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
@@ -686,19 +686,20 @@ comme un script CGI</description>
 <directivesynopsis>
 <name>RedirectRelative</name>
 <description>Redirection relative de cibles.</description>
-<syntax>RedirectRelative OFF|ON</syntax>
-<default>RedirectRelative OFF</default>
+<syntax>RedirectRelative On|Off</syntax>
+<default>RedirectRelative Off</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context>
 </contextlist>
 <compatibility>Disponible à partir de la version 2.5.1 du serveur HTTP Apache</compatibility>
 
 <usage>
-    <p>Par défaut, si l'URL cible d'une directive
-    <directive>Redirect</directive> est une URL relative commençant par un
-    caractère '/', le serveur convertit cette dernière en URL absolue avant de
-    répondre au client. En définissant <directive>RedirectRelative</directive> à
-    "ON", l'URL relative est présentée au client sans modification.</p>
+    <p>Par défaut, si l'URL cible d'une directive <directive
+    module="mod_alias">Redirect</directive> est une URL relative commençant par
+    un caractère '/', le serveur convertit cette dernière en URL absolue avant
+    de répondre au client. En définissant
+    <directive>RedirectRelative</directive> à "On", l'URL relative est présentée
+    au client sans modification.</p>
 
 </usage>
 </directivesynopsis>

diff --git 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:1911067 (outdated) -->
+<!-- English Revision: 151408:1911948 (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
@@ -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:1911067 (outdated) -->
+<!-- English Revision: 151408:1911948 (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
@@ -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:1911067 (outdated) -->
+<!-- English Revision: 1174747:1911948 (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_dav.html.fr.utf8 b/docs/manual/mod/mod_dav.html.fr.utf8
@@ -53,6 +53,7 @@ documents via le web (<a href="http://www.webdav.org/">WebDAV</a>)</td></tr>
 </ul><h3 class="directives">Directives</h3>
 <ul id="toc">
 <li><img alt="" src="../images/down.gif" /> <a href="#dav">Dav</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#davbasepath">DavBasePath</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#davdepthinfinity">DavDepthInfinity</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#davmintimeout">DavMinTimeout</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#davmsext">DavMSext</a></li>
@@ -219,6 +220,36 @@ ForceType text/plain
       enregistrer des fichiers sur votre système.
     </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="davbasepath" id="davbasepath">Directive</a> <a name="DavBasePath" id="DavBasePath">DavBasePath</a> <a title="Lien permanent" href="#davbasepath" class="permalink">&para;</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Définir le chemin de la racine du répertoire</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>DavBasePath <var>root-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>None</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>répertoire</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_dav</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilité:</a></th><td>Disponible à partir de la version 2.4.58 du serveur HTTP Apache</td></tr>
+</table>
+  <p>Si le répertoire DAV est défini en utilisant une correspondance
+  d'expression rationnelle (comme <code class="directive"><a href="../mod/core.html#locationmatch">LocationMatch</a></code>), <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ne sera pas
+  en mesure de déterminer de lui-même la racine du répertoire à partir du chemin
+  seul. En conséquence, des fournisseurs tiers (par exemple le module <a href="https://svnbook.red-bean.com/en/1.7/svn.ref.mod_dav_svn.conf.html">mod_dav_svn</a>
+  de Subversion) pourront échouer à traiter des requêtes sans disposer de la
+  valeur correcte de la racine du répertoire.</p>
+
+  <p>Pour permettre aux fournisseurs de travailler correctement en présence
+  d'une telle configuration, vous devez utiliser
+  <code class="directive">DavBasePath</code>.</p>
+
+    <pre class="prettyprint lang-config">&lt;LocationMatch "^/repos/"&gt;
+    Dav svn
+    DavBasePath /repos
+    SVNParentPath /var/svn
+&lt;/LocationMatch&gt;</pre>
+
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="davdepthinfinity" id="davdepthinfinity">Directive</a> <a name="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a> <a title="Lien permanent" href="#davdepthinfinity" class="permalink">&para;</a></h2>

diff --git a/docs/manual/mod/mod_dav.xml b/docs/manual/mod/mod_dav.xml
@@ -196,6 +196,36 @@ Alias "/php-source" "/home/gstein/php_files"
 </usage>
 </directivesynopsis>
 
+<directivesynopsis>
+<name>DavBasePath</name>
+<description>Configure repository root path</description>
+<syntax>DavBasePath <var>root-path</var></syntax>
+<default>None</default>
+<contextlist><context>directory</context></contextlist>
+<compatibility>Available in version 2.4.58 and later</compatibility>
+
+<usage>
+  <p>If a DAV repository is configured using a regular expression
+  match (such as <directive module="core">LocationMatch</directive>)
+  then <module>mod_dav</module> will not be able to find the root of
+  the repository from the pathname alone. Third-party providers (for
+  example, Subversion's <a
+  href="https://svnbook.red-bean.com/en/1.7/svn.ref.mod_dav_svn.conf.html">mod_dav_svn</a>)
+  may fail to handle requests without the correct repository root.</p>
+
+  <p>To allow providers to work correctly in such a configuration,
+  <directive>DavBasePath</directive> must be used.</p>
+
+    <highlight language="config">
+&lt;LocationMatch "^/repos/"&gt;
+    Dav svn
+    DavBasePath /repos
+    SVNParentPath /var/svn
+&lt;/LocationMatch&gt;
+    </highlight>
+</usage>
+</directivesynopsis>
+
 <directivesynopsis>
 <name>DavMinTimeout</name>
 <description>Minimum amount of time the server holds a lock on