Skip to content

Commit aafbfec

Browse files
author
Andre Malo
committed
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1559642 13f79535-47bb-0310-9956-ffa450edef68
1 parent 2c1e718 commit aafbfec

74 files changed

Lines changed: 676 additions & 361 deletions

Some content is hidden

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

‎docs/man/httpd.8‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
.el .ne 3
2020
.IP "\\$1" \\$2
2121
..
22-
.TH "HTTPD" 8 "2012-02-10" "Apache HTTP Server" "httpd"
22+
.TH "HTTPD" 8 "2014-01-20" "Apache HTTP Server" "httpd"
2323

2424
.SH NAME
2525
httpd \- Apache Hypertext Transfer Protocol Server
@@ -92,7 +92,7 @@ Show the settings as parsed from the config file (currently only shows the virtu
9292
Skip document root check at startup/restart\&.
9393
.TP
9494
-t
95-
Run syntax tests for configuration files only\&. The program immediately exits after these syntax parsing tests with either a return code of 0 (Syntax OK) or return code not equal to 0 (Syntax Error)\&. If -D \fIDUMP\fR_\fIVHOSTS \fRis also set, details of the virtual host configuration will be printed\&. If -D \fIDUMP\fR_\fIMODULES \fR is set, all loaded modules will be printed\&.
95+
Run syntax tests for configuration files only\&. The program immediately exits after these syntax parsing tests with either a return code of 0 (Syntax OK) or return code not equal to 0 (Syntax Error)\&. If -D \fIDUMP\fR_\fIVHOSTS \fRis also set, details of the virtual host configuration will be printed\&. If -D \fIDUMP\fR_\fIMODULES \fR is set, all loaded modules will be printed\&. If -D \fIDUMP\fR_\fICERTS \fR is set and mod_ssl is used, configured SSL certificates will be printed\&. If -D \fIDUMP\fR_\fICA\fR_\fI_CERTS \fR is set and mod_ssl is used, configured SSL CA certificates and configured directories containing SSL CA certificates will be printed\&.
9696
.TP
9797
-v
9898
Print the version of httpd, and then exit\&.

‎docs/manual/convenience.map‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ cgimapextension mod/core.html#cgimapextension
162162
charsetdefault mod/mod_charset_lite.html#charsetdefault
163163
charsetoptions mod/mod_charset_lite.html#charsetoptions
164164
charsetsourceenc mod/mod_charset_lite.html#charsetsourceenc
165+
checkbasenamematch mod/mod_speling.html#checkbasenamematch
165166
checkcaseonly mod/mod_speling.html#checkcaseonly
166167
checkspelling mod/mod_speling.html#checkspelling
167168
chrootdir mod/mod_unixd.html#chrootdir
@@ -199,6 +200,7 @@ deflatememlevel mod/mod_deflate.html#deflatememlevel
199200
deflatewindowsize mod/mod_deflate.html#deflatewindowsize
200201
deny mod/mod_access_compat.html#deny
201202
directory mod/core.html#directory
203+
directorycheckhandler mod/mod_dir.html#directorycheckhandler
202204
directoryindex mod/mod_dir.html#directoryindex
203205
directoryindexredirect mod/mod_dir.html#directoryindexredirect
204206
directorymatch mod/core.html#directorymatch
@@ -552,6 +554,7 @@ sslocspoverrideresponder mod/mod_ssl.html#sslocspoverrideresponder
552554
sslocsprespondertimeout mod/mod_ssl.html#sslocsprespondertimeout
553555
sslocspresponsemaxage mod/mod_ssl.html#sslocspresponsemaxage
554556
sslocspresponsetimeskew mod/mod_ssl.html#sslocspresponsetimeskew
557+
sslopensslconfcmd mod/mod_ssl.html#sslopensslconfcmd
555558
ssloptions mod/mod_ssl.html#ssloptions
556559
sslpassphrasedialog mod/mod_ssl.html#sslpassphrasedialog
557560
sslprotocol mod/mod_ssl.html#sslprotocol

‎docs/manual/env.html.en‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,24 @@
141141
late during request processing meaning that directives such as
142142
<code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> and <code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code> will not see the
143143
variables set with it.</li>
144+
145+
<li>When the server looks up a path via an internal
146+
<a class="glossarylink" href="./glossary.html#subrequest" title="see glossary">subrequest</a> such as looking
147+
for a <code class="directive"><a href="./mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
148+
or generating a directory listing with <code class="module"><a href="./mod/mod_autoindex.html">mod_autoindex</a></code>,
149+
per-request environment variables are <em>not</em> inherited in the
150+
subrequest. Additionally,
151+
<code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> directives
152+
are not separately evaluated in the subrequest due to the API phases
153+
<code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code> takes action in.</li>
144154
</ul>
145155

146156
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
147157
<div class="section">
148158
<h2><a name="using" id="using">Using Environment Variables</a></h2>
149159

150160

151-
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_authz_host.html">mod_authz_host</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_access_compat.html#allow">Allow</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_access_compat.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
161+
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_authz_host.html">mod_authz_host</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_authz_core.html#require">Require</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_access_compat.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
152162

153163
<h3><a name="cgi-scripts" id="cgi-scripts">CGI Scripts</a></h3>
154164

@@ -482,9 +492,7 @@ SetEnvIf Referer "^http://www\.example\.com/" local_referal
482492
# Allow browsers that do not send Referer info
483493
SetEnvIf Referer "^$" local_referal
484494
&lt;Directory /web/images&gt;
485-
Order Deny,Allow
486-
Deny from all
487-
Allow from env=local_referal
495+
Require env local_referal
488496
&lt;/Directory&gt;
489497
</pre>
490498

‎docs/manual/env.html.fr‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,23 @@
151151
cours du traitement de la requête, ce qui signifie que des
152152
directives telles que <code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> et <code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code> ne verront pas
153153
les variables qu'elle aura définies.</li>
154+
155+
<li>Lorsque le serveur cherche un chemin via une <a class="glossarylink" href="./glossary.html#subrequest" title="voir glossaire">sous-requête</a> interne (par exemple la
156+
recherche d'un <code class="directive"><a href="./mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>), ou lorsqu'il génère un
157+
listing du contenu d'un répertoire via le module
158+
<code class="module"><a href="./mod/mod_autoindex.html">mod_autoindex</a></code>, la sous-requête n'hérite pas des
159+
variables d'environnement spécifiques à la requête. En outre, à cause
160+
des phases de l'API auxquelles <code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code> prend
161+
part, les directives <code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> ne sont pas évaluées
162+
séparément dans la sous-requête.</li>
154163
</ul>
155164

156165
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
157166
<div class="section">
158167
<h2><a name="using" id="using">Utilisation des variables d'environnement</a></h2>
159168

160169

161-
<table class="related"><tr><th>Modules Apparentés</th><th>Directives Apparentées</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_authz_host.html">mod_authz_host</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_access_compat.html#allow">Allow</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_access_compat.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
170+
<table class="related"><tr><th>Modules Apparentés</th><th>Directives Apparentées</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_authz_host.html">mod_authz_host</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_authz_core.html#require">Require</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_access_compat.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
162171

163172
<h3><a name="cgi-scripts" id="cgi-scripts">Scripts CGI</a></h3>
164173

@@ -514,9 +523,7 @@ SetEnvIf Referer "^http://www\.example\.com/" local_referal
514523
# Autorise les navigateurs qui n'envoient aucune information de Referer
515524
SetEnvIf Referer "^$" local_referal
516525
&lt;Directory /web/images&gt;
517-
Order Deny,Allow
518-
Deny from all
519-
Allow from env=local_referal
526+
Require env local_referal
520527
&lt;/Directory&gt;
521528
</pre>
522529

‎docs/manual/env.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 manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
4-
<!-- English Revision: 659902:1330883 (outdated) -->
4+
<!-- English Revision: 659902:1556102 (outdated) -->
55

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

‎docs/manual/env.xml.ko‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="EUC-KR" ?>
22
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
4-
<!-- English Revision: 105989:1330883 (outdated) -->
4+
<!-- English Revision: 105989:1556102 (outdated) -->
55

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

‎docs/manual/env.xml.tr‎

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 manualpage SYSTEM "./style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
4-
<!-- English Revision: 1300910:1330883 (outdated) -->
4+
<!-- English Revision: 1300910:1556102 (outdated) -->
55
<!-- =====================================================
66
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
77
Reviewed by: Orhan Berent <berent belgeler.org>

‎docs/manual/getting-started.html.en‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ Addresses on the Web are expressed with URLs - Uniform Resource Locators
4747
<code>www.apache.org</code>), a URL-path (e.g.
4848
<code>/docs/current/getting-started.html</code>), and possibly a query
4949
string (e.g. <code>?arg=value</code>) used to pass additional
50-
arguments to the server.
50+
arguments to the server.
5151
</p>
5252

53-
<p>A client (e.g., a web browser) connects to a server (e.g., your Apache HTTP Server),
53+
<p>A client (e.g., a web browser) connects to a server (e.g., your Apache HTTP Server),
5454
with the specified protocol, and makes a <strong>request</strong> for a resource using the
5555
URL-path.</p>
5656

‎docs/manual/glossary.html.en‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,14 @@
419419
Young
420420
</dd>
421421

422+
<dt><a name="subrequest" id="subrequest">Subrequest</a></dt>
423+
<dd>Apache provides a subrequest API to modules that allows other
424+
filesystem or URL paths to be partially or fully evaluated by
425+
the server. Example consumers of this API are
426+
<code class="directive"><a href="./mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>,
427+
<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>.
428+
</dd>
429+
422430
<dt><a name="symmetriccryptophraphy" id="symmetriccryptophraphy">Symmetric
423431
Cryptography</a></dt>
424432
<dd>The study and application of <em>Ciphers</em> that use a single secret key

‎docs/manual/glossary.html.fr‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
3030
<a href="./tr/glossary.html" hreflang="tr" rel="alternate" title="T�rk�e">&nbsp;tr&nbsp;</a></p>
3131
</div>
32+
<div class="outofdate">Cette traduction peut �tre p�rim�e. V�rifiez la version
33+
anglaise pour les changements r�cents.</div>
3234

3335
<p>Ce glossaire d�finit la terminologie courante relative � Apache en
3436
particulier, et aux serveurs web en g�n�ral. Vous trouverez plus

0 commit comments

Comments
 (0)