Skip to content

Commit 9eeae7a

Browse files
machine-moonmachine-moon
authored
Merge branch 'apache:trunk' into trunk
2 parents 07edab0 + 9e31833 commit 9eeae7a

59 files changed

Lines changed: 264 additions & 167 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎changes-entries/pr68527.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*) mod_dir: Fix a crash in fixup_dir for a request not mapped to any type.
2+
PR68527. [Eric Covener]

‎docs/log-message-tags/next-number‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10597
1+
10599

‎docs/manual/mod/mod_access_compat.html.fr.utf8‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</div>
3434
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Autorisations de groupe &agrave; base de nom d'h&ocirc;te (nom ou
3535
adresse IP)</td></tr>
36-
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
36+
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td></td></tr>
3737
<tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur&nbsp;de&nbsp;Module:</a></th><td>access_compat_module</td></tr>
3838
<tr><th><a href="module-dict.html#SourceFile">Fichier&nbsp;Source:</a></th><td>mod_access_compat.c</td></tr>
3939
<tr><th><a href="module-dict.html#Compatibility">Compatibilit&eacute;:</a></th><td>Disponible dans la version 2.3 du serveur HTTP Apache
@@ -117,7 +117,7 @@ d'environnement</var>
117117
[<var>h&ocirc;te</var>|env=[!]<var>variable d'environnement</var>] ...</code></td></tr>
118118
<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r&eacute;pertoire, .htaccess</td></tr>
119119
<tr><th><a href="directive-dict.html#Override">Surcharges autoris&eacute;es:</a></th><td>Limit</td></tr>
120-
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
120+
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td></td></tr>
121121
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_access_compat</td></tr>
122122
</table>
123123
<p>La directive <code class="directive">Allow</code> permet de d&eacute;finir quels
@@ -248,7 +248,7 @@ d'environnement</var>
248248
[<var>h&ocirc;te</var>|env=[!]<var>variable d'environnement</var>] ...</code></td></tr>
249249
<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r&eacute;pertoire, .htaccess</td></tr>
250250
<tr><th><a href="directive-dict.html#Override">Surcharges autoris&eacute;es:</a></th><td>Limit</td></tr>
251-
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
251+
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td></td></tr>
252252
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_access_compat</td></tr>
253253
</table>
254254
<p>Cette directive permet de restreindre l'acc&egrave;s au serveur en
@@ -268,7 +268,7 @@ les directives <code class="directive">Allow</code> et
268268
<tr><th><a href="directive-dict.html#Default">D&eacute;faut:</a></th><td><code>Order Deny,Allow</code></td></tr>
269269
<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r&eacute;pertoire, .htaccess</td></tr>
270270
<tr><th><a href="directive-dict.html#Override">Surcharges autoris&eacute;es:</a></th><td>Limit</td></tr>
271-
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
271+
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td></td></tr>
272272
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_access_compat</td></tr>
273273
</table>
274274

@@ -424,7 +424,7 @@ et l'authentification utilisateur</td></tr>
424424
<tr><th><a href="directive-dict.html#Default">D&eacute;faut:</a></th><td><code>Satisfy All</code></td></tr>
425425
<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r&eacute;pertoire, .htaccess</td></tr>
426426
<tr><th><a href="directive-dict.html#Override">Surcharges autoris&eacute;es:</a></th><td>AuthConfig</td></tr>
427-
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
427+
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td></td></tr>
428428
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_access_compat</td></tr>
429429
</table>
430430
<p>Politique d'acc&egrave;s dans le cas o&ugrave; on utilise &agrave; la fois <code class="directive"><a href="#allow">Allow</a></code> et <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>. L'argument est soit

‎docs/manual/mod/mod_access_compat.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<name>mod_access_compat</name>
2626
<description>Group authorizations based on host (name or IP
2727
address)</description>
28-
<status>Extension</status>
28+
<status>Deprecated</status>
2929
<sourcefile>mod_access_compat.c</sourcefile>
3030
<identifier>access_compat_module</identifier>
3131
<compatibility>Available in Apache HTTP Server 2.3 as a compatibility module with

‎docs/manual/mod/mod_access_compat.xml.es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
33
<?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
4-
<!-- English Revision: 1738217 -->
4+
<!-- English Revision: 1738217:1936367 (outdated) -->
55
<!-- Spanish Translation: Daniel Ferradal -->
66

77
<!--

‎docs/manual/mod/mod_access_compat.xml.fr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
33
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
4-
<!-- English Revision: 1738217 -->
4+
<!-- English Revision: 1936367 -->
55
<!-- French translation : Lucien GENTIS -->
66
<!-- Reviewed by : Vincent Deffontaines -->
77

@@ -27,7 +27,7 @@
2727
<name>mod_access_compat</name>
2828
<description>Autorisations de groupe à base de nom d'hôte (nom ou
2929
adresse IP)</description>
30-
<status>Extension</status>
30+
<status>Obsolète</status>
3131
<sourcefile>mod_access_compat.c</sourcefile>
3232
<identifier>access_compat_module</identifier>
3333
<compatibility>Disponible dans la version 2.3 du serveur HTTP Apache

‎docs/manual/mod/mod_access_compat.xml.ja‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
33
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
4-
<!-- English Revision: 675568:1738217 (outdated) -->
4+
<!-- English Revision: 675568:1936367 (outdated) -->
55

66
<!--
77
Licensed to the Apache Software Foundation (ASF) under one or more

‎docs/manual/mod/mod_access_compat.xml.meta‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<variants>
1010
<variant>en</variant>
11-
<variant>es</variant>
11+
<variant outdated="yes">es</variant>
1212
<variant>fr</variant>
1313
<variant outdated="yes">ja</variant>
1414
</variants>

‎docs/manual/mod/mod_cern_meta.html.fr.utf8‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</div>
3333
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>La s&eacute;mantique des m&eacute;tafichiers du serveur httpd du
3434
CERN</td></tr>
35-
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
35+
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td></td></tr>
3636
<tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur&nbsp;de&nbsp;Module:</a></th><td>cern_meta_module</td></tr>
3737
<tr><th><a href="module-dict.html#SourceFile">Fichier&nbsp;Source:</a></th><td>mod_cern_meta.c</td></tr></table>
3838
<h3>Sommaire</h3>
@@ -70,7 +70,7 @@ m&eacute;tainformations dans le style du CERN</td></tr>
7070
<tr><th><a href="directive-dict.html#Default">D&eacute;faut:</a></th><td><code>MetaDir .web</code></td></tr>
7171
<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration globale, serveur virtuel, r&eacute;pertoire, .htaccess</td></tr>
7272
<tr><th><a href="directive-dict.html#Override">Surcharges autoris&eacute;es:</a></th><td>Indexes</td></tr>
73-
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
73+
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td></td></tr>
7474
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cern_meta</td></tr>
7575
</table>
7676
<p>Sp&eacute;cifie le nom du r&eacute;pertoire dans lequel Apache pourra trouver
@@ -98,7 +98,7 @@ m&eacute;tainformations dans le style du CERN</td></tr>
9898
<tr><th><a href="directive-dict.html#Default">D&eacute;faut:</a></th><td><code>MetaFiles off</code></td></tr>
9999
<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration globale, serveur virtuel, r&eacute;pertoire, .htaccess</td></tr>
100100
<tr><th><a href="directive-dict.html#Override">Surcharges autoris&eacute;es:</a></th><td>Indexes</td></tr>
101-
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
101+
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td></td></tr>
102102
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cern_meta</td></tr>
103103
</table>
104104
<p>Active ou d&eacute;sactive le traitement des m&eacute;tafichiers pour certains
@@ -114,7 +114,7 @@ style du CERN</td></tr>
114114
<tr><th><a href="directive-dict.html#Default">D&eacute;faut:</a></th><td><code>MetaSuffix .meta</code></td></tr>
115115
<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration globale, serveur virtuel, r&eacute;pertoire, .htaccess</td></tr>
116116
<tr><th><a href="directive-dict.html#Override">Surcharges autoris&eacute;es:</a></th><td>Indexes</td></tr>
117-
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
117+
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td></td></tr>
118118
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cern_meta</td></tr>
119119
</table>
120120
<p>Sp&eacute;cifie le suffixe du fichier contenant les m&eacute;tainformations.

‎docs/manual/mod/mod_cern_meta.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<name>mod_cern_meta</name>
2626
<description>CERN httpd metafile semantics</description>
27-
<status>Extension</status>
27+
<status>Deprecated</status>
2828
<sourcefile>mod_cern_meta.c</sourcefile>
2929
<identifier>cern_meta_module</identifier>
3030

0 commit comments

Comments
 (0)