summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Bowen <rbowen@apache.org>2015-04-15 16:35:10 +0000
committerRich Bowen <rbowen@apache.org>2015-04-15 16:35:10 +0000
commit9fed79814211668e00b799f50385a464a3bdbe6b (patch)
tree8852c66a37dfd64e16252424ec02a3d1a6ffc31b
parent2f339e75b0f5b8c22b2eb89b4dad38414c1a460e (diff)
downloadhttpd-9fed79814211668e00b799f50385a464a3bdbe6b.tar.gz
Rebuilds Daniel's change to the order of directictives vs topics in
manual docs git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1673855 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/mod/core.html.de2
-rw-r--r--docs/manual/mod/core.html.en2
-rw-r--r--docs/manual/mod/core.html.es2
-rw-r--r--docs/manual/mod/core.html.fr2
-rw-r--r--docs/manual/mod/core.html.ja.utf82
-rw-r--r--docs/manual/mod/core.html.tr.utf82
-rw-r--r--docs/manual/mod/event.html.en104
-rw-r--r--docs/manual/mod/event.html.fr116
-rw-r--r--docs/manual/mod/mod_access_compat.html.en2
-rw-r--r--docs/manual/mod/mod_access_compat.html.fr2
-rw-r--r--docs/manual/mod/mod_access_compat.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_actions.html.de2
-rw-r--r--docs/manual/mod/mod_actions.html.en2
-rw-r--r--docs/manual/mod/mod_actions.html.fr2
-rw-r--r--docs/manual/mod/mod_actions.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_actions.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_alias.html.en82
-rw-r--r--docs/manual/mod/mod_alias.html.fr80
-rw-r--r--docs/manual/mod/mod_alias.html.ja.utf856
-rw-r--r--docs/manual/mod/mod_alias.html.ko.euc-kr58
-rw-r--r--docs/manual/mod/mod_alias.html.tr.utf884
-rw-r--r--docs/manual/mod/mod_allowmethods.html.en2
-rw-r--r--docs/manual/mod/mod_allowmethods.html.fr2
-rw-r--r--docs/manual/mod/mod_auth_basic.html.en2
-rw-r--r--docs/manual/mod/mod_auth_basic.html.fr2
-rw-r--r--docs/manual/mod/mod_auth_basic.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_auth_basic.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_auth_digest.html.en84
-rw-r--r--docs/manual/mod/mod_auth_digest.html.fr84
-rw-r--r--docs/manual/mod/mod_auth_digest.html.ko.euc-kr138
-rw-r--r--docs/manual/mod/mod_auth_form.html.en494
-rw-r--r--docs/manual/mod/mod_auth_form.html.fr578
-rw-r--r--docs/manual/mod/mod_authn_anon.html.en86
-rw-r--r--docs/manual/mod/mod_authn_anon.html.fr90
-rw-r--r--docs/manual/mod/mod_authn_anon.html.ja.utf886
-rw-r--r--docs/manual/mod/mod_authn_anon.html.ko.euc-kr90
-rw-r--r--docs/manual/mod/mod_authn_core.html.en144
-rw-r--r--docs/manual/mod/mod_authn_core.html.fr156
-rw-r--r--docs/manual/mod/mod_authn_dbd.html.en128
-rw-r--r--docs/manual/mod/mod_authn_dbd.html.fr138
-rw-r--r--docs/manual/mod/mod_authn_dbm.html.en2
-rw-r--r--docs/manual/mod/mod_authn_dbm.html.fr2
-rw-r--r--docs/manual/mod/mod_authn_dbm.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_authn_dbm.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_authn_file.html.en2
-rw-r--r--docs/manual/mod/mod_authn_file.html.fr2
-rw-r--r--docs/manual/mod/mod_authn_file.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_authn_file.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_authn_socache.html.en110
-rw-r--r--docs/manual/mod/mod_authn_socache.html.fr134
-rw-r--r--docs/manual/mod/mod_authnz_fcgi.html.en242
-rw-r--r--docs/manual/mod/mod_authnz_ldap.html.en1220
-rw-r--r--docs/manual/mod/mod_authnz_ldap.html.fr1386
-rw-r--r--docs/manual/mod/mod_authz_core.html.en408
-rw-r--r--docs/manual/mod/mod_authz_core.html.fr404
-rw-r--r--docs/manual/mod/mod_authz_dbd.html.en168
-rw-r--r--docs/manual/mod/mod_authz_dbd.html.fr186
-rw-r--r--docs/manual/mod/mod_authz_dbm.html.en98
-rw-r--r--docs/manual/mod/mod_authz_dbm.html.fr100
-rw-r--r--docs/manual/mod/mod_authz_dbm.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_authz_groupfile.html.en68
-rw-r--r--docs/manual/mod/mod_authz_groupfile.html.fr68
-rw-r--r--docs/manual/mod/mod_authz_groupfile.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_autoindex.html.en204
-rw-r--r--docs/manual/mod/mod_autoindex.html.fr218
-rw-r--r--docs/manual/mod/mod_autoindex.html.ja.utf8220
-rw-r--r--docs/manual/mod/mod_autoindex.html.ko.euc-kr182
-rw-r--r--docs/manual/mod/mod_autoindex.html.tr.utf8184
-rw-r--r--docs/manual/mod/mod_buffer.html.en2
-rw-r--r--docs/manual/mod/mod_buffer.html.fr2
-rw-r--r--docs/manual/mod/mod_cache.html.en370
-rw-r--r--docs/manual/mod/mod_cache.html.fr424
-rw-r--r--docs/manual/mod/mod_cache.html.ja.utf888
-rw-r--r--docs/manual/mod/mod_cache.html.ko.euc-kr80
-rw-r--r--docs/manual/mod/mod_cache_disk.html.en2
-rw-r--r--docs/manual/mod/mod_cache_disk.html.fr2
-rw-r--r--docs/manual/mod/mod_cache_disk.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_cache_disk.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_cache_socache.html.en2
-rw-r--r--docs/manual/mod/mod_cache_socache.html.fr2
-rw-r--r--docs/manual/mod/mod_cern_meta.html.en2
-rw-r--r--docs/manual/mod/mod_cern_meta.html.fr2
-rw-r--r--docs/manual/mod/mod_cern_meta.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_cgi.html.en144
-rw-r--r--docs/manual/mod/mod_cgi.html.fr164
-rw-r--r--docs/manual/mod/mod_cgi.html.ja.utf8150
-rw-r--r--docs/manual/mod/mod_cgi.html.ko.euc-kr138
-rw-r--r--docs/manual/mod/mod_cgid.html.en2
-rw-r--r--docs/manual/mod/mod_cgid.html.fr2
-rw-r--r--docs/manual/mod/mod_cgid.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_cgid.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_charset_lite.html.en74
-rw-r--r--docs/manual/mod/mod_charset_lite.html.fr82
-rw-r--r--docs/manual/mod/mod_charset_lite.html.ko.euc-kr68
-rw-r--r--docs/manual/mod/mod_dav.html.en148
-rw-r--r--docs/manual/mod/mod_dav.html.fr164
-rw-r--r--docs/manual/mod/mod_dav.html.ja.utf8160
-rw-r--r--docs/manual/mod/mod_dav.html.ko.euc-kr158
-rw-r--r--docs/manual/mod/mod_dav_fs.html.en2
-rw-r--r--docs/manual/mod/mod_dav_fs.html.fr2
-rw-r--r--docs/manual/mod/mod_dav_fs.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_dav_fs.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_dav_lock.html.en2
-rw-r--r--docs/manual/mod/mod_dav_lock.html.fr2
-rw-r--r--docs/manual/mod/mod_dav_lock.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_dbd.html.en228
-rw-r--r--docs/manual/mod/mod_dbd.html.fr254
-rw-r--r--docs/manual/mod/mod_deflate.html.en332
-rw-r--r--docs/manual/mod/mod_deflate.html.fr284
-rw-r--r--docs/manual/mod/mod_deflate.html.ja.utf8320
-rw-r--r--docs/manual/mod/mod_deflate.html.ko.euc-kr308
-rw-r--r--docs/manual/mod/mod_dialup.html.en2
-rw-r--r--docs/manual/mod/mod_dialup.html.fr2
-rw-r--r--docs/manual/mod/mod_dir.html.en2
-rw-r--r--docs/manual/mod/mod_dir.html.fr2
-rw-r--r--docs/manual/mod/mod_dir.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_dir.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_dir.html.tr.utf82
-rw-r--r--docs/manual/mod/mod_dumpio.html.en28
-rw-r--r--docs/manual/mod/mod_dumpio.html.fr26
-rw-r--r--docs/manual/mod/mod_dumpio.html.ja.utf820
-rw-r--r--docs/manual/mod/mod_echo.html.en2
-rw-r--r--docs/manual/mod/mod_echo.html.fr2
-rw-r--r--docs/manual/mod/mod_echo.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_echo.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_env.html.en2
-rw-r--r--docs/manual/mod/mod_env.html.fr2
-rw-r--r--docs/manual/mod/mod_env.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_env.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_env.html.tr.utf82
-rw-r--r--docs/manual/mod/mod_example_hooks.html.en40
-rw-r--r--docs/manual/mod/mod_example_hooks.html.fr42
-rw-r--r--docs/manual/mod/mod_example_hooks.html.ko.euc-kr36
-rw-r--r--docs/manual/mod/mod_expires.html.en114
-rw-r--r--docs/manual/mod/mod_expires.html.fr114
-rw-r--r--docs/manual/mod/mod_expires.html.ja.utf8126
-rw-r--r--docs/manual/mod/mod_expires.html.ko.euc-kr124
-rw-r--r--docs/manual/mod/mod_ext_filter.html.en248
-rw-r--r--docs/manual/mod/mod_ext_filter.html.fr268
-rw-r--r--docs/manual/mod/mod_ext_filter.html.ja.utf8278
-rw-r--r--docs/manual/mod/mod_ext_filter.html.ko.euc-kr260
-rw-r--r--docs/manual/mod/mod_file_cache.html.en116
-rw-r--r--docs/manual/mod/mod_file_cache.html.fr132
-rw-r--r--docs/manual/mod/mod_file_cache.html.ko.euc-kr114
-rw-r--r--docs/manual/mod/mod_filter.html.en388
-rw-r--r--docs/manual/mod/mod_filter.html.fr448
-rw-r--r--docs/manual/mod/mod_headers.html.en304
-rw-r--r--docs/manual/mod/mod_headers.html.fr334
-rw-r--r--docs/manual/mod/mod_headers.html.ja.utf8206
-rw-r--r--docs/manual/mod/mod_headers.html.ko.euc-kr210
-rw-r--r--docs/manual/mod/mod_heartbeat.html.en38
-rw-r--r--docs/manual/mod/mod_heartbeat.html.fr40
-rw-r--r--docs/manual/mod/mod_heartmonitor.html.en2
-rw-r--r--docs/manual/mod/mod_heartmonitor.html.fr2
-rw-r--r--docs/manual/mod/mod_ident.html.en2
-rw-r--r--docs/manual/mod/mod_ident.html.fr2
-rw-r--r--docs/manual/mod/mod_ident.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_ident.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_imagemap.html.en176
-rw-r--r--docs/manual/mod/mod_imagemap.html.fr190
-rw-r--r--docs/manual/mod/mod_imagemap.html.ko.euc-kr164
-rw-r--r--docs/manual/mod/mod_include.html.en556
-rw-r--r--docs/manual/mod/mod_include.html.fr598
-rw-r--r--docs/manual/mod/mod_include.html.ja.utf8438
-rw-r--r--docs/manual/mod/mod_info.html.en40
-rw-r--r--docs/manual/mod/mod_info.html.fr40
-rw-r--r--docs/manual/mod/mod_info.html.ja.utf848
-rw-r--r--docs/manual/mod/mod_info.html.ko.euc-kr46
-rw-r--r--docs/manual/mod/mod_isapi.html.en206
-rw-r--r--docs/manual/mod/mod_isapi.html.fr228
-rw-r--r--docs/manual/mod/mod_isapi.html.ko.euc-kr200
-rw-r--r--docs/manual/mod/mod_lbmethod_heartbeat.html.en2
-rw-r--r--docs/manual/mod/mod_lbmethod_heartbeat.html.fr2
-rw-r--r--docs/manual/mod/mod_ldap.html.en678
-rw-r--r--docs/manual/mod/mod_ldap.html.fr728
-rw-r--r--docs/manual/mod/mod_log_config.html.en360
-rw-r--r--docs/manual/mod/mod_log_config.html.fr384
-rw-r--r--docs/manual/mod/mod_log_config.html.ja.utf8358
-rw-r--r--docs/manual/mod/mod_log_config.html.ko.euc-kr294
-rw-r--r--docs/manual/mod/mod_log_config.html.tr.utf8340
-rw-r--r--docs/manual/mod/mod_log_debug.html.en94
-rw-r--r--docs/manual/mod/mod_log_debug.html.fr104
-rw-r--r--docs/manual/mod/mod_log_forensic.html.en92
-rw-r--r--docs/manual/mod/mod_log_forensic.html.fr106
-rw-r--r--docs/manual/mod/mod_log_forensic.html.ja.utf888
-rw-r--r--docs/manual/mod/mod_log_forensic.html.tr.utf894
-rw-r--r--docs/manual/mod/mod_lua.html.en1254
-rw-r--r--docs/manual/mod/mod_lua.html.fr1328
-rw-r--r--docs/manual/mod/mod_macro.html.en150
-rw-r--r--docs/manual/mod/mod_macro.html.fr138
-rw-r--r--docs/manual/mod/mod_mime.html.en266
-rw-r--r--docs/manual/mod/mod_mime.html.fr284
-rw-r--r--docs/manual/mod/mod_mime.html.ja.utf8258
-rw-r--r--docs/manual/mod/mod_mime_magic.html.en44
-rw-r--r--docs/manual/mod/mod_mime_magic.html.fr46
-rw-r--r--docs/manual/mod/mod_negotiation.html.en224
-rw-r--r--docs/manual/mod/mod_negotiation.html.fr244
-rw-r--r--docs/manual/mod/mod_negotiation.html.ja.utf8216
-rw-r--r--docs/manual/mod/mod_nw_ssl.html.en2
-rw-r--r--docs/manual/mod/mod_nw_ssl.html.fr2
-rw-r--r--docs/manual/mod/mod_privileges.html.en118
-rw-r--r--docs/manual/mod/mod_privileges.html.fr146
-rw-r--r--docs/manual/mod/mod_proxy.html.en670
-rw-r--r--docs/manual/mod/mod_proxy.html.fr758
-rw-r--r--docs/manual/mod/mod_proxy.html.ja.utf8378
-rw-r--r--docs/manual/mod/mod_proxy_connect.html.en26
-rw-r--r--docs/manual/mod/mod_proxy_connect.html.fr26
-rw-r--r--docs/manual/mod/mod_proxy_connect.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_proxy_express.html.en2
-rw-r--r--docs/manual/mod/mod_proxy_express.html.fr2
-rw-r--r--docs/manual/mod/mod_proxy_ftp.html.en114
-rw-r--r--docs/manual/mod/mod_proxy_ftp.html.fr130
-rw-r--r--docs/manual/mod/mod_proxy_html.html.en2
-rw-r--r--docs/manual/mod/mod_proxy_html.html.fr2
-rw-r--r--docs/manual/mod/mod_proxy_scgi.html.en84
-rw-r--r--docs/manual/mod/mod_proxy_scgi.html.fr92
-rw-r--r--docs/manual/mod/mod_reflector.html.en32
-rw-r--r--docs/manual/mod/mod_reflector.html.fr36
-rw-r--r--docs/manual/mod/mod_remoteip.html.en84
-rw-r--r--docs/manual/mod/mod_remoteip.html.fr94
-rw-r--r--docs/manual/mod/mod_reqtimeout.html.en90
-rw-r--r--docs/manual/mod/mod_reqtimeout.html.fr92
-rw-r--r--docs/manual/mod/mod_request.html.en2
-rw-r--r--docs/manual/mod/mod_request.html.fr2
-rw-r--r--docs/manual/mod/mod_request.html.tr.utf82
-rw-r--r--docs/manual/mod/mod_rewrite.html.en72
-rw-r--r--docs/manual/mod/mod_rewrite.html.fr80
-rw-r--r--docs/manual/mod/mod_sed.html.en56
-rw-r--r--docs/manual/mod/mod_sed.html.fr64
-rw-r--r--docs/manual/mod/mod_session.html.en276
-rw-r--r--docs/manual/mod/mod_session.html.fr304
-rw-r--r--docs/manual/mod/mod_session_cookie.html.en38
-rw-r--r--docs/manual/mod/mod_session_cookie.html.fr44
-rw-r--r--docs/manual/mod/mod_session_crypto.html.en46
-rw-r--r--docs/manual/mod/mod_session_crypto.html.fr54
-rw-r--r--docs/manual/mod/mod_session_dbd.html.en160
-rw-r--r--docs/manual/mod/mod_session_dbd.html.fr190
-rw-r--r--docs/manual/mod/mod_setenvif.html.en2
-rw-r--r--docs/manual/mod/mod_setenvif.html.fr2
-rw-r--r--docs/manual/mod/mod_setenvif.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_setenvif.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_setenvif.html.tr.utf82
-rw-r--r--docs/manual/mod/mod_so.html.en94
-rw-r--r--docs/manual/mod/mod_so.html.fr100
-rw-r--r--docs/manual/mod/mod_so.html.ja.utf894
-rw-r--r--docs/manual/mod/mod_so.html.ko.euc-kr88
-rw-r--r--docs/manual/mod/mod_so.html.tr.utf8102
-rw-r--r--docs/manual/mod/mod_speling.html.en2
-rw-r--r--docs/manual/mod/mod_speling.html.fr2
-rw-r--r--docs/manual/mod/mod_speling.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_speling.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_ssl.html.en390
-rw-r--r--docs/manual/mod/mod_ssl.html.fr520
-rw-r--r--docs/manual/mod/mod_substitute.html.en2
-rw-r--r--docs/manual/mod/mod_substitute.html.fr2
-rw-r--r--docs/manual/mod/mod_suexec.html.en2
-rw-r--r--docs/manual/mod/mod_suexec.html.fr2
-rw-r--r--docs/manual/mod/mod_suexec.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_suexec.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_suexec.html.tr.utf82
-rw-r--r--docs/manual/mod/mod_unixd.html.en2
-rw-r--r--docs/manual/mod/mod_unixd.html.fr2
-rw-r--r--docs/manual/mod/mod_unixd.html.tr.utf82
-rw-r--r--docs/manual/mod/mod_userdir.html.en2
-rw-r--r--docs/manual/mod/mod_userdir.html.fr2
-rw-r--r--docs/manual/mod/mod_userdir.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_userdir.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_userdir.html.tr.utf82
-rw-r--r--docs/manual/mod/mod_usertrack.html.en26
-rw-r--r--docs/manual/mod/mod_usertrack.html.fr30
-rw-r--r--docs/manual/mod/mod_version.html.en2
-rw-r--r--docs/manual/mod/mod_version.html.ja.utf82
-rw-r--r--docs/manual/mod/mod_version.html.ko.euc-kr2
-rw-r--r--docs/manual/mod/mod_vhost_alias.html.en180
-rw-r--r--docs/manual/mod/mod_vhost_alias.html.fr190
-rw-r--r--docs/manual/mod/mod_vhost_alias.html.tr.utf8174
-rw-r--r--docs/manual/mod/mod_watchdog.html.en2
-rw-r--r--docs/manual/mod/mod_xml2enc.html.en104
-rw-r--r--docs/manual/mod/mod_xml2enc.html.fr118
-rw-r--r--docs/manual/mod/mpm_common.html.de2
-rw-r--r--docs/manual/mod/mpm_common.html.en2
-rw-r--r--docs/manual/mod/mpm_common.html.fr2
-rw-r--r--docs/manual/mod/mpm_common.html.ja.utf82
-rw-r--r--docs/manual/mod/mpm_common.html.tr.utf82
-rw-r--r--docs/manual/mod/mpm_netware.html.en2
-rw-r--r--docs/manual/mod/mpm_netware.html.fr2
-rw-r--r--docs/manual/mod/prefork.html.de84
-rw-r--r--docs/manual/mod/prefork.html.en86
-rw-r--r--docs/manual/mod/prefork.html.fr92
-rw-r--r--docs/manual/mod/prefork.html.ja.utf890
-rw-r--r--docs/manual/mod/prefork.html.tr.utf882
292 files changed, 17506 insertions, 17506 deletions
diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de
index 3c11383ebd..84e65068c7 100644
--- a/docs/manual/mod/core.html.de
+++ b/docs/manual/mod/core.html.de
@@ -120,7 +120,6 @@ Servers</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#virtualhost">&lt;VirtualHost&gt;</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Kommentare</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AcceptFilter" id="AcceptFilter">AcceptFilter</a>-<a name="acceptfilter" id="acceptfilter">Direktive</a></h2>
<table class="directive">
@@ -3602,6 +3601,7 @@ IP-Adressen angewendet werden</td></tr>
kombiniert werden, wenn eine Anfrage empfangen wird</li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Verf�gbare Sprachen: </span><a href="../de/mod/core.html" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 3ceaa2a7f8..0b70b04729 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -117,7 +117,6 @@ available</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#virtualhost">&lt;VirtualHost&gt;</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AcceptFilter" id="AcceptFilter">AcceptFilter</a> <a name="acceptfilter" id="acceptfilter">Directive</a></h2>
<table class="directive">
@@ -4488,6 +4487,7 @@ hostname or IP address</td></tr>
different sections are combined when a request is received</li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/core.html.es b/docs/manual/mod/core.html.es
index 263fb40c8a..c21c6ae5a1 100644
--- a/docs/manual/mod/core.html.es
+++ b/docs/manual/mod/core.html.es
@@ -120,7 +120,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#virtualhost">&lt;VirtualHost&gt;</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comentarios</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AcceptFilter" id="AcceptFilter">AcceptFilter</a> <a name="acceptfilter" id="acceptfilter">Directiva</a></h2>
<table class="directive">
@@ -4299,6 +4298,7 @@ hostname or IP address</td></tr>
different sections are combined when a request is received</li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Idiomas disponibles: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr
index 73dd6f3de8..ec62f5950f 100644
--- a/docs/manual/mod/core.html.fr
+++ b/docs/manual/mod/core.html.fr
@@ -119,7 +119,6 @@ disponibles</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#virtualhost">&lt;VirtualHost&gt;</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="acceptfilter" id="acceptfilter">Directive</a> <a name="AcceptFilter" id="AcceptFilter">AcceptFilter</a></h2>
<table class="directive">
@@ -4799,6 +4798,7 @@ explication de la mani�re dont ces diff�rentes sections se combinent
entre elles � la r�ception d'une requ�te</li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8
index 20ea278f8e..5f71de6689 100644
--- a/docs/manual/mod/core.html.ja.utf8
+++ b/docs/manual/mod/core.html.ja.utf8
@@ -120,7 +120,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#virtualhost">&lt;VirtualHost&gt;</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AcceptFilter" id="AcceptFilter">AcceptFilter</a> <a name="acceptfilter" id="acceptfilter">ディレクティブ</a></h2>
<table class="directive">
@@ -3517,6 +3516,7 @@ of a request or the last 63, assuming the request itself is greater than
&lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; セクションの動作法</a></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8
index 9a2765d7dd..541888f2ad 100644
--- a/docs/manual/mod/core.html.tr.utf8
+++ b/docs/manual/mod/core.html.tr.utf8
@@ -118,7 +118,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#virtualhost">&lt;VirtualHost&gt;</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AcceptFilter" id="AcceptFilter">AcceptFilter</a> <a name="acceptfilter" id="acceptfilter">Yönergesi</a></h2>
<table class="directive">
@@ -4420,6 +4419,7 @@ gerçekleşmesi için sunucunun geçmesini bekleyeceği süre.</td></tr>
çalışır?</a> belgesine bakınız.</li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/event.html.en b/docs/manual/mod/event.html.en
index fcc6e95ec7..6f25612acb 100644
--- a/docs/manual/mod/event.html.en
+++ b/docs/manual/mod/event.html.en
@@ -80,6 +80,58 @@ of consuming threads only for connections with active processing</td></tr>
<li><a href="worker.html">The worker MPM</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AsyncRequestWorkerFactor" id="AsyncRequestWorkerFactor">AsyncRequestWorkerFactor</a> <a name="asyncrequestworkerfactor" id="asyncrequestworkerfactor">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limit concurrent connections per process</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AsyncRequestWorkerFactor <var>factor</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>2</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>event</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.13 and later</td></tr>
+</table>
+ <p>The event MPM handles some connections in an asynchronous way, where
+ request worker threads are only allocated for short periods of time as
+ needed, and other connections with one request worker thread reserved per
+ connection. This can lead to situations where all workers are tied up and
+ no worker thread is available to handle new work on established async
+ connections.</p>
+
+ <p>To mitigate this problem, the event MPM does two things: Firstly, it
+ limits the number of connections accepted per process, depending on the
+ number of idle request workers. Secondly, if all workers are busy, it will
+ close connections in keep-alive state even if the keep-alive timeout has
+ not expired. This allows the respective clients to reconnect to a
+ different process which may still have worker threads available.</p>
+
+ <p>This directive can be used to fine-tune the per-process connection
+ limit. A process will only accept new connections if the current number of
+ connections (not counting connections in the "closing" state) is lower
+ than:</p>
+
+ <p class="indent"><strong>
+ <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> +
+ (<code class="directive">AsyncRequestWorkerFactor</code> *
+ <var>number of idle workers</var>)
+ </strong></p>
+
+ <p>This means the absolute maximum numbers of concurrent connections is:</p>
+
+ <p class="indent"><strong>
+ (<code class="directive">AsyncRequestWorkerFactor</code> + 1) *
+ <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code>
+ </strong></p>
+
+ <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> was called
+ <code class="directive">MaxClients</code> prior to version 2.3.13. The above value
+ shows that the old name did not accurately describe its meaning for the event MPM.</p>
+
+ <p><code class="directive">AsyncRequestWorkerFactor</code> can take non-integer
+ arguments, e.g "1.5".</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="how-it-works" id="how-it-works">How it Works</a></h2>
<p>This MPM tries to fix the 'keep alive problem' in HTTP. After a client
@@ -146,58 +198,6 @@ of consuming threads only for connections with active processing</td></tr>
</ul>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AsyncRequestWorkerFactor" id="AsyncRequestWorkerFactor">AsyncRequestWorkerFactor</a> <a name="asyncrequestworkerfactor" id="asyncrequestworkerfactor">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limit concurrent connections per process</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AsyncRequestWorkerFactor <var>factor</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>2</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>event</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.13 and later</td></tr>
-</table>
- <p>The event MPM handles some connections in an asynchronous way, where
- request worker threads are only allocated for short periods of time as
- needed, and other connections with one request worker thread reserved per
- connection. This can lead to situations where all workers are tied up and
- no worker thread is available to handle new work on established async
- connections.</p>
-
- <p>To mitigate this problem, the event MPM does two things: Firstly, it
- limits the number of connections accepted per process, depending on the
- number of idle request workers. Secondly, if all workers are busy, it will
- close connections in keep-alive state even if the keep-alive timeout has
- not expired. This allows the respective clients to reconnect to a
- different process which may still have worker threads available.</p>
-
- <p>This directive can be used to fine-tune the per-process connection
- limit. A process will only accept new connections if the current number of
- connections (not counting connections in the "closing" state) is lower
- than:</p>
-
- <p class="indent"><strong>
- <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> +
- (<code class="directive">AsyncRequestWorkerFactor</code> *
- <var>number of idle workers</var>)
- </strong></p>
-
- <p>This means the absolute maximum numbers of concurrent connections is:</p>
-
- <p class="indent"><strong>
- (<code class="directive">AsyncRequestWorkerFactor</code> + 1) *
- <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code>
- </strong></p>
-
- <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> was called
- <code class="directive">MaxClients</code> prior to version 2.3.13. The above value
- shows that the old name did not accurately describe its meaning for the event MPM.</p>
-
- <p><code class="directive">AsyncRequestWorkerFactor</code> can take non-integer
- arguments, e.g "1.5".</p>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/event.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/event.html.fr b/docs/manual/mod/event.html.fr
index 87d19b8b3d..3fae687135 100644
--- a/docs/manual/mod/event.html.fr
+++ b/docs/manual/mod/event.html.fr
@@ -82,6 +82,64 @@ mobiliser des threads que pour les connexions en cours de traitement</td></tr>
<li><a href="worker.html">Le MPM worker</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="asyncrequestworkerfactor" id="asyncrequestworkerfactor">Directive</a> <a name="AsyncRequestWorkerFactor" id="AsyncRequestWorkerFactor">AsyncRequestWorkerFactor</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limite le nombre de connexions simultan�es par thread</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AsyncRequestWorkerFactor <var>facteur</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>2</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>event</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.13</td></tr>
+</table>
+ <p>Le MPM event g�re certaines connexions de mani�re asynchrone ;
+ dans ce cas, les threads traitant la requ�te sont allou�s selon les
+ besoins et pour de courtes p�riodes. Dans les autres cas, un
+ thread est r�serv� par
+ connexion. Ceci peut conduire � des situations o� tous les threads
+ sont satur�s et o� aucun thread n'est capable d'effectuer de
+ nouvelles t�ches pour les connexions asynchrones �tablies.</p>
+
+ <p>Pour minimiser les effets de ce probl�me, le MPM event utilise
+ deux m�thodes : tout d'abord, il limite le nombre de connexions
+ simultan�es par thread en fonction du nombre de processus
+ inactifs. Ensuite, si tous les processus sont occup�s, il ferme des
+ connexions permanentes, m�me si la limite de dur�e de la connexion
+ n'a pas �t� atteinte. Ceci autorise les clients concern�s � se
+ reconnecter � un autre processus poss�dant encore des threads
+ disponibles.</p>
+
+ <p>Cette directive permet de personnaliser finement la limite du
+ nombre de connexions par thread. Un processus n'acceptera de
+ nouvelles connexions que si le nombre actuel de connexions (sans
+ compter les connexions � l'�tat "closing") est
+ inf�rieur � :</p>
+
+ <p class="indent"><strong>
+ <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> +
+ (<code class="directive">AsyncRequestWorkerFactor</code> *
+ <var>nombre de threads inactifs</var>)
+ </strong></p>
+
+ <p>En d'autres termes, le nombre maximum de connexions simultan�es
+ sera :</p>
+
+ <p class="indent"><strong>
+ (<code class="directive">AsyncRequestWorkerFactor</code> + 1) *
+ <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code>
+ </strong></p>
+
+ <p>La directive <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> se nommait
+ <code class="directive">MaxClients</code> avant la version 2.3.13. La valeur
+ ci-dessus montre que cet ancien nom ne correspondait pas � sa
+ signification exacte pour le MPM event.</p>
+
+ <p>La directive <code class="directive">AsyncRequestWorkerFactor</code>
+ accepte des valeurs d'argument de type non entier, comme "1.5".</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="how-it-works" id="how-it-works">Comment tout cela fonctionne</a></h2>
<p>Ce MPM essaie de r�soudre le 'probl�me keep alive' de HTTP.
@@ -160,64 +218,6 @@ mobiliser des threads que pour les connexions en cours de traitement</td></tr>
</ul>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="asyncrequestworkerfactor" id="asyncrequestworkerfactor">Directive</a> <a name="AsyncRequestWorkerFactor" id="AsyncRequestWorkerFactor">AsyncRequestWorkerFactor</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limite le nombre de connexions simultan�es par thread</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AsyncRequestWorkerFactor <var>facteur</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>2</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>event</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.13</td></tr>
-</table>
- <p>Le MPM event g�re certaines connexions de mani�re asynchrone ;
- dans ce cas, les threads traitant la requ�te sont allou�s selon les
- besoins et pour de courtes p�riodes. Dans les autres cas, un
- thread est r�serv� par
- connexion. Ceci peut conduire � des situations o� tous les threads
- sont satur�s et o� aucun thread n'est capable d'effectuer de
- nouvelles t�ches pour les connexions asynchrones �tablies.</p>
-
- <p>Pour minimiser les effets de ce probl�me, le MPM event utilise
- deux m�thodes : tout d'abord, il limite le nombre de connexions
- simultan�es par thread en fonction du nombre de processus
- inactifs. Ensuite, si tous les processus sont occup�s, il ferme des
- connexions permanentes, m�me si la limite de dur�e de la connexion
- n'a pas �t� atteinte. Ceci autorise les clients concern�s � se
- reconnecter � un autre processus poss�dant encore des threads
- disponibles.</p>
-
- <p>Cette directive permet de personnaliser finement la limite du
- nombre de connexions par thread. Un processus n'acceptera de
- nouvelles connexions que si le nombre actuel de connexions (sans
- compter les connexions � l'�tat "closing") est
- inf�rieur � :</p>
-
- <p class="indent"><strong>
- <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> +
- (<code class="directive">AsyncRequestWorkerFactor</code> *
- <var>nombre de threads inactifs</var>)
- </strong></p>
-
- <p>En d'autres termes, le nombre maximum de connexions simultan�es
- sera :</p>
-
- <p class="indent"><strong>
- (<code class="directive">AsyncRequestWorkerFactor</code> + 1) *
- <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code>
- </strong></p>
-
- <p>La directive <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> se nommait
- <code class="directive">MaxClients</code> avant la version 2.3.13. La valeur
- ci-dessus montre que cet ancien nom ne correspondait pas � sa
- signification exacte pour le MPM event.</p>
-
- <p>La directive <code class="directive">AsyncRequestWorkerFactor</code>
- accepte des valeurs d'argument de type non entier, comme "1.5".</p>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/event.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_access_compat.html.en b/docs/manual/mod/mod_access_compat.html.en
index 3edb360678..405b2dcbdd 100644
--- a/docs/manual/mod/mod_access_compat.html.en
+++ b/docs/manual/mod/mod_access_compat.html.en
@@ -91,7 +91,6 @@ have been deprecated by the new authz refactoring. Please see
<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_authz_core.html">mod_authz_core</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Allow" id="Allow">Allow</a> <a name="allow" id="allow">Directive</a></h2>
<table class="directive">
@@ -459,6 +458,7 @@ Satisfy Any</pre>
<li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_access_compat.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_access_compat.html.fr b/docs/manual/mod/mod_access_compat.html.fr
index fb3d157dcf..e4918ba6ef 100644
--- a/docs/manual/mod/mod_access_compat.html.fr
+++ b/docs/manual/mod/mod_access_compat.html.fr
@@ -98,7 +98,6 @@ ce module sont devenues obsol�tes depuis la refonte d'authz. Voir
<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_authz_core.html">mod_authz_core</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="allow" id="allow">Directive</a> <a name="Allow" id="Allow">Allow</a></h2>
<table class="directive">
@@ -485,6 +484,7 @@ Satisfy Any</pre>
<li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_access_compat.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_access_compat.html.ja.utf8 b/docs/manual/mod/mod_access_compat.html.ja.utf8
index 0580643e5f..199fc9b9d7 100644
--- a/docs/manual/mod/mod_access_compat.html.ja.utf8
+++ b/docs/manual/mod/mod_access_compat.html.ja.utf8
@@ -92,7 +92,6 @@
<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_authz_core.html">mod_authz_core</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Allow" id="Allow">Allow</a> <a name="allow" id="allow">ディレクティブ</a></h2>
<table class="directive">
@@ -442,6 +441,7 @@
<li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_access_compat.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_actions.html.de b/docs/manual/mod/mod_actions.html.de
index af04580398..29a15933d5 100644
--- a/docs/manual/mod/mod_actions.html.de
+++ b/docs/manual/mod/mod_actions.html.de
@@ -57,7 +57,6 @@
<li><a href="../howto/cgi.html">Dynamische Inhalte mit CGI</a></li>
<li><a href="../handler.html">Die Verwendung von Handlern</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Kommentare</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Action" id="Action">Action</a>-<a name="action" id="action">Direktive</a></h2>
<table class="directive">
@@ -161,6 +160,7 @@
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Verf�gbare Sprachen: </span><a href="../de/mod/mod_actions.html" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/mod_actions.html.en b/docs/manual/mod/mod_actions.html.en
index d0011b8dc3..2479c58131 100644
--- a/docs/manual/mod/mod_actions.html.en
+++ b/docs/manual/mod/mod_actions.html.en
@@ -53,7 +53,6 @@
<li><a href="../howto/cgi.html">Dynamic Content with CGI</a></li>
<li><a href="../handler.html">Apache httpd's Handler Use</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Action" id="Action">Action</a> <a name="action" id="action">Directive</a></h2>
<table class="directive">
@@ -150,6 +149,7 @@ Script PUT "/~bob/put.cgi"</pre>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../de/mod/mod_actions.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/mod_actions.html.fr b/docs/manual/mod/mod_actions.html.fr
index 3387e84cb3..8f5ce64679 100644
--- a/docs/manual/mod/mod_actions.html.fr
+++ b/docs/manual/mod/mod_actions.html.fr
@@ -58,7 +58,6 @@ type de m�dia ou de la m�thode de requ�te.</td></tr>
<li><a href="../handler.html">Utilisation des gestionnaires
d'Apache httpd</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="action" id="action">Directive</a> <a name="Action" id="Action">Action</a></h2>
<table class="directive">
@@ -162,6 +161,7 @@ Script PUT /~bob/put.cgi</pre>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../de/mod/mod_actions.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/mod_actions.html.ja.utf8 b/docs/manual/mod/mod_actions.html.ja.utf8
index 6c745bb9a6..7c1ca3e2dd 100644
--- a/docs/manual/mod/mod_actions.html.ja.utf8
+++ b/docs/manual/mod/mod_actions.html.ja.utf8
@@ -59,7 +59,6 @@ CGI スクリプトを実行する機能を提供</td></tr>
<li><a href="../howto/cgi.html">CGI による動的コンテンツ</a></li>
<li><a href="../handler.html">Apache のハンドラの使用</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Action" id="Action">Action</a> <a name="action" id="action">ディレクティブ</a></h2>
<table class="directive">
@@ -169,6 +168,7 @@ Apache 2.1 で導入されました</td></tr>
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../de/mod/mod_actions.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/mod_actions.html.ko.euc-kr b/docs/manual/mod/mod_actions.html.ko.euc-kr
index 8323694f37..98b0229a51 100644
--- a/docs/manual/mod/mod_actions.html.ko.euc-kr
+++ b/docs/manual/mod/mod_actions.html.ko.euc-kr
@@ -56,7 +56,6 @@
<li><a href="../howto/cgi.html">CGI�� ���� ������ ����</a></li>
<li><a href="../handler.html">����ġ���� �ڵ鷯 ���</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Action" id="Action">Action</a> <a name="action" id="action">���þ�</a></h2>
<table class="directive">
@@ -158,6 +157,7 @@
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../de/mod/mod_actions.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index c4f84f6822..b611886519 100644
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -86,47 +86,6 @@
<li><a href="../urlmapping.html">Mapping URLs to the filesystem</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="order" id="order">Order of Processing</a></h2>
-
- <p>Aliases and Redirects occurring in different contexts are processed
- like other directives according to standard <a href="../sections.html#mergin">merging rules</a>. But when multiple
- Aliases or Redirects occur in the same context (for example, in the
- same <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
- section) they are processed in a particular order.</p>
-
- <p>First, all Redirects are processed before Aliases are processed,
- and therefore a request that matches a <code class="directive"><a href="#redirect">Redirect</a></code> or <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code> will never have Aliases
- applied. Second, the Aliases and Redirects are processed in the order
- they appear in the configuration files, with the first match taking
- precedence.</p>
-
- <p>For this reason, when two or more of these directives apply to the
- same sub-path, you must list the most specific path first in order for
- all the directives to have an effect. For example, the following
- configuration will work as expected:</p>
-
- <pre class="prettyprint lang-config">Alias "/foo/bar" "/baz"
-Alias "/foo" "/gaq"</pre>
-
-
- <p>But if the above two directives were reversed in order, the
- <code>/foo</code> <code class="directive"><a href="#alias">Alias</a></code>
- would always match before the <code>/foo/bar</code> <code class="directive"><a href="#alias">Alias</a></code>, so the latter directive would be
- ignored.</p>
-
- <p>When the <code class="directive"><a href="#alias">Alias</a></code>,
- <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and
- <code class="directive"><a href="#redirect">Redirect</a></code> directives are used
- within a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
- or <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
- section, these directives will take precedence over any globally
- defined <code class="directive"><a href="#alias">Alias</a></code>,
- <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and
- <code class="directive"><a href="#redirect">Redirect</a></code> directives.</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="Alias" id="Alias">Alias</a> <a name="alias" id="alias">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps URLs to filesystem locations</td></tr>
@@ -598,6 +557,47 @@ and designates the target as a CGI script</td></tr>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="order" id="order">Order of Processing</a></h2>
+
+ <p>Aliases and Redirects occurring in different contexts are processed
+ like other directives according to standard <a href="../sections.html#mergin">merging rules</a>. But when multiple
+ Aliases or Redirects occur in the same context (for example, in the
+ same <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+ section) they are processed in a particular order.</p>
+
+ <p>First, all Redirects are processed before Aliases are processed,
+ and therefore a request that matches a <code class="directive"><a href="#redirect">Redirect</a></code> or <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code> will never have Aliases
+ applied. Second, the Aliases and Redirects are processed in the order
+ they appear in the configuration files, with the first match taking
+ precedence.</p>
+
+ <p>For this reason, when two or more of these directives apply to the
+ same sub-path, you must list the most specific path first in order for
+ all the directives to have an effect. For example, the following
+ configuration will work as expected:</p>
+
+ <pre class="prettyprint lang-config">Alias "/foo/bar" "/baz"
+Alias "/foo" "/gaq"</pre>
+
+
+ <p>But if the above two directives were reversed in order, the
+ <code>/foo</code> <code class="directive"><a href="#alias">Alias</a></code>
+ would always match before the <code>/foo/bar</code> <code class="directive"><a href="#alias">Alias</a></code>, so the latter directive would be
+ ignored.</p>
+
+ <p>When the <code class="directive"><a href="#alias">Alias</a></code>,
+ <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and
+ <code class="directive"><a href="#redirect">Redirect</a></code> directives are used
+ within a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
+ or <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
+ section, these directives will take precedence over any globally
+ defined <code class="directive"><a href="#alias">Alias</a></code>,
+ <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and
+ <code class="directive"><a href="#redirect">Redirect</a></code> directives.</p>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_alias.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_alias.html.fr b/docs/manual/mod/mod_alias.html.fr
index 3492c5c760..80bdd9f559 100644
--- a/docs/manual/mod/mod_alias.html.fr
+++ b/docs/manual/mod/mod_alias.html.fr
@@ -89,46 +89,6 @@ redirection d'URL</td></tr>
syst�me de fichiers</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="order" id="order">Chronologie du traitement</a></h2>
-
- <p>Les alias et redirections apparaissant dans diff�rents contextes
- sont trait�s comme les autres directives en respectant les <a href="../sections.html#mergin">r�gles de fusion</a> standards. Par
- contre, ils sont trait�s selon une chronologie particuli�re
- lorsqu'ils apparaissent dans le m�me contexte (par exemple, dans la
- m�me section <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>).</p>
-
- <p>Premi�rement, toutes les redirections sont trait�es avant les
- alias, et ainsi, une requ�te qui correspond � une directive
- <code class="directive"><a href="#redirect">Redirect</a></code> ou <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code> ne se verra jamais
- appliquer d'alias. Deuxi�mement, les alias et redirections sont
- trait�s selon l'ordre dans lequel ils apparaissent dans le fichier
- de configuration, seule la premi�re correspondance �tant prise en
- compte.</p>
-
- <p>Ainsi, lorsqu'une ou plusieurs de ces directives s'appliquent au
- m�me sous-r�pertoire, vous devez classer les chemins du plus pr�cis
- au moins pr�cis afin que toutes les directives puissent
- �ventuellement s'appliquer, comme dans l'exemple suivant :</p>
-
- <pre class="prettyprint lang-config">Alias /foo/bar /baz
-Alias /foo /gaq</pre>
-
-
- <p>Si l'ordre des directives �tait invers�, la directive <code class="directive"><a href="#alias">Alias</a></code> ayant pour argument
- <code>/foo</code> serait toujours appliqu�e avant la directive
- <code class="directive"><a href="#alias">Alias</a></code> ayant pour argument
- <code>/foo/bar</code>, et cette derni�re serait toujours
- ignor�e.</p>
-
- <p>La d�finition de directives <code class="directive"><a href="#alias">Alias</a></code>, <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> ou <code class="directive"><a href="#redirect">Redirect</a></code> au sein de sections
- <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> ou
- <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
- l'emporte sur d'autres d�finitions �ventuelles de ces m�mes
- directives au niveau de la configuration g�n�rale du serveur.</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="alias" id="alias">Directive</a> <a name="Alias" id="Alias">Alias</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Met en correspondance des URLs avec des chemins du syst�me
@@ -607,6 +567,46 @@ comme un script CGI</td></tr>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="order" id="order">Chronologie du traitement</a></h2>
+
+ <p>Les alias et redirections apparaissant dans diff�rents contextes
+ sont trait�s comme les autres directives en respectant les <a href="../sections.html#mergin">r�gles de fusion</a> standards. Par
+ contre, ils sont trait�s selon une chronologie particuli�re
+ lorsqu'ils apparaissent dans le m�me contexte (par exemple, dans la
+ m�me section <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>).</p>
+
+ <p>Premi�rement, toutes les redirections sont trait�es avant les
+ alias, et ainsi, une requ�te qui correspond � une directive
+ <code class="directive"><a href="#redirect">Redirect</a></code> ou <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code> ne se verra jamais
+ appliquer d'alias. Deuxi�mement, les alias et redirections sont
+ trait�s selon l'ordre dans lequel ils apparaissent dans le fichier
+ de configuration, seule la premi�re correspondance �tant prise en
+ compte.</p>
+
+ <p>Ainsi, lorsqu'une ou plusieurs de ces directives s'appliquent au
+ m�me sous-r�pertoire, vous devez classer les chemins du plus pr�cis
+ au moins pr�cis afin que toutes les directives puissent
+ �ventuellement s'appliquer, comme dans l'exemple suivant :</p>
+
+ <pre class="prettyprint lang-config">Alias /foo/bar /baz
+Alias /foo /gaq</pre>
+
+
+ <p>Si l'ordre des directives �tait invers�, la directive <code class="directive"><a href="#alias">Alias</a></code> ayant pour argument
+ <code>/foo</code> serait toujours appliqu�e avant la directive
+ <code class="directive"><a href="#alias">Alias</a></code> ayant pour argument
+ <code>/foo/bar</code>, et cette derni�re serait toujours
+ ignor�e.</p>
+
+ <p>La d�finition de directives <code class="directive"><a href="#alias">Alias</a></code>, <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> ou <code class="directive"><a href="#redirect">Redirect</a></code> au sein de sections
+ <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> ou
+ <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
+ l'emporte sur d'autres d�finitions �ventuelles de ces m�mes
+ directives au niveau de la configuration g�n�rale du serveur.</p>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_alias.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_alias.html.ja.utf8 b/docs/manual/mod/mod_alias.html.ja.utf8
index 161056b968..4d1ce9312c 100644
--- a/docs/manual/mod/mod_alias.html.ja.utf8
+++ b/docs/manual/mod/mod_alias.html.ja.utf8
@@ -84,34 +84,6 @@
<li><a href="../urlmapping.html">URL からファイルシステム上の位置へのマッピング</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="order" id="order">処理の順番</a></h2>
-
-<p>様々なコンテキスト中での Alias や Redirect は他のディレクティブと
-同じように標準の <a href="../sections.html#mergin">マージ規則</a> に
-従って処理されます。ただし、(例えば <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> セクションの中のように) 複数の Alias や Redirect が
-同じコンテキスト中に現れた場合は決まった順番で処理されます。</p>
-
-<p>まず、Alias の前にすべての Redirect が処理されます。ですから、<code class="directive"><a href="#redirect">Redirect</a></code> か <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code> にマッチするリクエストには
-Alias は決して適用されません。次に、Alias と Redirect が設定ファイル中の
-順番に適用され、最初にマッチしたものが優先されます。</p>
-
-<p>ですから、二つ以上のディレクティブが同じパスに適用されるときは、
-すべてのディレクティブの効果を得るためにはより詳しいパスを先に書く
-必要があります。例えば、次の設定は期待通りの動作をします:</p>
-
-<div class="example"><p><code>
-Alias /foo/bar /baz<br />
-Alias /foo /gaq
-</code></p></div>
-
-<p>しかし、上記の二つのディレクティブの順番が逆になると、
-<code>/foo</code> <code class="directive"><a href="#alias">Alias</a></code> が
-常に <code>/foo/bar</code> <code class="directive"><a href="#alias">Alias</a></code> より先にマッチしますので、後者は
-決して適用されることはありません。</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="Alias" id="Alias">Alias</a> <a name="alias" id="alias">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>URL をファイルシステムの位置にマップする</td></tr>
@@ -383,6 +355,34 @@ CGI スクリプトに指定</td></tr>
</code></p></div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="order" id="order">処理の順番</a></h2>
+
+<p>様々なコンテキスト中での Alias や Redirect は他のディレクティブと
+同じように標準の <a href="../sections.html#mergin">マージ規則</a> に
+従って処理されます。ただし、(例えば <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> セクションの中のように) 複数の Alias や Redirect が
+同じコンテキスト中に現れた場合は決まった順番で処理されます。</p>
+
+<p>まず、Alias の前にすべての Redirect が処理されます。ですから、<code class="directive"><a href="#redirect">Redirect</a></code> か <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code> にマッチするリクエストには
+Alias は決して適用されません。次に、Alias と Redirect が設定ファイル中の
+順番に適用され、最初にマッチしたものが優先されます。</p>
+
+<p>ですから、二つ以上のディレクティブが同じパスに適用されるときは、
+すべてのディレクティブの効果を得るためにはより詳しいパスを先に書く
+必要があります。例えば、次の設定は期待通りの動作をします:</p>
+
+<div class="example"><p><code>
+Alias /foo/bar /baz<br />
+Alias /foo /gaq
+</code></p></div>
+
+<p>しかし、上記の二つのディレクティブの順番が逆になると、
+<code>/foo</code> <code class="directive"><a href="#alias">Alias</a></code> が
+常に <code>/foo/bar</code> <code class="directive"><a href="#alias">Alias</a></code> より先にマッチしますので、後者は
+決して適用されることはありません。</p>
+
+</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_alias.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_alias.html.ko.euc-kr b/docs/manual/mod/mod_alias.html.ko.euc-kr
index 26bde588b5..e917b92922 100644
--- a/docs/manual/mod/mod_alias.html.ko.euc-kr
+++ b/docs/manual/mod/mod_alias.html.ko.euc-kr
@@ -74,35 +74,6 @@
<li><a href="../urlmapping.html">URL�� ���Ͻý��ۿ� ����</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="order" id="order">ó�� ����</a></h2>
-
-<p>���� �ٸ� �����ҿ��� Alias�� Redirect�� ����ϸ� �ٸ� ���þ��
-���� ǥ�� <a href="../sections.html#mergin">���� ���</a>��
-���� ó���Ѵ�. �׷��� ���� �����ҿ� (���� ���, ���� <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ���ǿ�)
-Alias�� Redirect�� ����ϸ� �Ʒ� ������� ó���Ѵ�.</p>
-
-<p>���� ��� Redirect�� ó���� �� Alias�� ó���Ѵ�. �׷���
-<code class="directive"><a href="#redirect">Redirect</a></code>�� <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code>�� �ش��ϴ� ��û��
-����� Alias���� �ʴ´�. �׸��� Alias�� Redirect�� �������Ͽ���
-ù��°�� ������ ���� ����Ѵ�.</p>
-
-<p>�׷��� ���� ���þ ������ ������ο� �ش��ϴ� ��� ���
-���þ �����ϱ����ؼ��� ���� ���� ��θ� ���� ����ؾ� �Ѵ�.
-���� ���, ���� ������ �ǵ��Ѵ�� �����Ѵ�:</p>
-
-<div class="example"><p><code>
-Alias /foo/bar /baz<br />
-Alias /foo /gaq
-</code></p></div>
-
-<p>�׷��� ���� �� ���þ� ������ �ٲٸ� <code>/foo/bar</code>
-<code class="directive"><a href="#alias">Alias</a></code> ������
-<code>/foo</code> <code class="directive"><a href="#alias">Alias</a></code>��
-�����ϹǷ� �׻� �ι�° ���þ �����Ѵ�.</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="Alias" id="Alias">Alias</a> <a name="alias" id="alias">���þ�</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">����:</a></th><td>URL�� Ư�� ���Ͻý��� ��ҷ� �����Ѵ�</td></tr>
@@ -350,6 +321,35 @@ Alias /foo /gaq
</code></p></div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="order" id="order">ó�� ����</a></h2>
+
+<p>���� �ٸ� �����ҿ��� Alias�� Redirect�� ����ϸ� �ٸ� ���þ��
+���� ǥ�� <a href="../sections.html#mergin">���� ���</a>��
+���� ó���Ѵ�. �׷��� ���� �����ҿ� (���� ���, ���� <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ���ǿ�)
+Alias�� Redirect�� ����ϸ� �Ʒ� ������� ó���Ѵ�.</p>
+
+<p>���� ��� Redirect�� ó���� �� Alias�� ó���Ѵ�. �׷���
+<code class="directive"><a href="#redirect">Redirect</a></code>�� <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code>�� �ش��ϴ� ��û��
+����� Alias���� �ʴ´�. �׸��� Alias�� Redirect�� �������Ͽ���
+ù��°�� ������ ���� ����Ѵ�.</p>
+
+<p>�׷��� ���� ���þ ������ ������ο� �ش��ϴ� ��� ���
+���þ �����ϱ����ؼ��� ���� ���� ��θ� ���� ����ؾ� �Ѵ�.
+���� ���, ���� ������ �ǵ��Ѵ�� �����Ѵ�:</p>
+
+<div class="example"><p><code>
+Alias /foo/bar /baz<br />
+Alias /foo /gaq
+</code></p></div>
+
+<p>�׷��� ���� �� ���þ� ������ �ٲٸ� <code>/foo/bar</code>
+<code class="directive"><a href="#alias">Alias</a></code> ������
+<code>/foo</code> <code class="directive"><a href="#alias">Alias</a></code>��
+�����ϹǷ� �׻� �ι�° ���þ �����Ѵ�.</p>
+
+</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_alias.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_alias.html.tr.utf8 b/docs/manual/mod/mod_alias.html.tr.utf8
index 4a944c469c..948a1d29d3 100644
--- a/docs/manual/mod/mod_alias.html.tr.utf8
+++ b/docs/manual/mod/mod_alias.html.tr.utf8
@@ -84,48 +84,6 @@ eşlenmesini sağlar ve URL yönlendirmesi yapar.</td></tr>
</li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="order" id="order">İşlem Sırası</a></h2>
-
- <p>Farklı bağlamlarda bulunan <code class="directive"><a href="#alias">Alias</a></code> ve <code class="directive"><a href="#redirect">Redirect</a></code>
- yönergeleri standart <a href="../sections.html#mergin">katıştırma
- kuralları</a> ile ilgili diğer yönergeler gibi işleme sokulur. Fakat
- aynı bağlam dahilinde (örneğin, aynı <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümünde) çok fazla <code class="directive"><a href="#alias">Alias</a></code> ve <code class="directive"><a href="#redirect">Redirect</a></code> varsa bunlar belli bir
- sıraya göre işleme sokulurlar.</p>
-
- <p>İlk adımda, <code class="directive"><a href="#alias">Alias</a></code>’lardan önce
- bütün <code class="directive"><a href="#redirect">Redirect</a></code> yönergeleri
- işleme sokulur. Bu bakımdan bir <code class="directive"><a href="#redirect">Redirect</a></code> veya <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code> ile eşleşen bir istek için
- hiçbir <code class="directive"><a href="#alias">Alias</a></code>
- uygulanmayacaktır. İkinci adımda yapılandırma dosyasında yer aldıkları
- sıraya göre <code class="directive"><a href="#redirect">Redirect</a></code> ve
- <code class="directive"><a href="#alias">Alias</a></code> yönergeleri işleme
- sokulurlar, dolayısıyla ilk eşleşme öncelikli olmuş olur.</p>
-
- <p>İlk eşleşmenin öncelikli olması sebebiyle, bu yönergelerin birden
- fazlası aynı alt yola uygulandığı takdirde, tüm yönergelerin etkili
- olabilmesi için en uzun yolu sıralamada en öne almalısınız. Örneğin
- aşağıdaki yapılandırma beklendiği gibi çalışacaktır:</p>
-
- <pre class="prettyprint lang-config">Alias /foo/bar /baz
-Alias /foo /gaq</pre>
-
-
- <p>Ama yukarıdaki iki satır ters sırada yerleştirilmiş olsaydı,
- <code>/foo</code> rumuzu daima <code>/foo/bar</code> rumuzundan önce
- eşleşecek, dolayısıyla ikinci yönerge yok sayılacaktı.</p>
-
- <p><code class="directive"><a href="#alias">Alias</a></code>,
- <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> ve
- <code class="directive"><a href="#redirect">Redirect</a></code>
- yönergeleri bir <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> veya <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> bölümü içinde kullanıldığında
- bu yönergeler genel alanda tanımlanmış <code class="directive"><a href="#alias">Alias</a></code>,
- <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> ve
- <code class="directive"><a href="#redirect">Redirect</a></code> yönergelerine göre
- öncelik alırlar.</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="Alias" id="Alias">Alias</a> <a name="alias" id="alias">Yönergesi</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>URL’leri dosya sistemi konumlarıyla eşler.</td></tr>
@@ -584,6 +542,48 @@ eşler ve hedefi bir CGI betiği olarak çalıştırır.</td></tr>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="order" id="order">İşlem Sırası</a></h2>
+
+ <p>Farklı bağlamlarda bulunan <code class="directive"><a href="#alias">Alias</a></code> ve <code class="directive"><a href="#redirect">Redirect</a></code>
+ yönergeleri standart <a href="../sections.html#mergin">katıştırma
+ kuralları</a> ile ilgili diğer yönergeler gibi işleme sokulur. Fakat
+ aynı bağlam dahilinde (örneğin, aynı <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümünde) çok fazla <code class="directive"><a href="#alias">Alias</a></code> ve <code class="directive"><a href="#redirect">Redirect</a></code> varsa bunlar belli bir
+ sıraya göre işleme sokulurlar.</p>
+
+ <p>İlk adımda, <code class="directive"><a href="#alias">Alias</a></code>’lardan önce
+ bütün <code class="directive"><a href="#redirect">Redirect</a></code> yönergeleri
+ işleme sokulur. Bu bakımdan bir <code class="directive"><a href="#redirect">Redirect</a></code> veya <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code> ile eşleşen bir istek için
+ hiçbir <code class="directive"><a href="#alias">Alias</a></code>
+ uygulanmayacaktır. İkinci adımda yapılandırma dosyasında yer aldıkları
+ sıraya göre <code class="directive"><a href="#redirect">Redirect</a></code> ve
+ <code class="directive"><a href="#alias">Alias</a></code> yönergeleri işleme
+ sokulurlar, dolayısıyla ilk eşleşme öncelikli olmuş olur.</p>
+
+ <p>İlk eşleşmenin öncelikli olması sebebiyle, bu yönergelerin birden
+ fazlası aynı alt yola uygulandığı takdirde, tüm yönergelerin etkili
+ olabilmesi için en uzun yolu sıralamada en öne almalısınız. Örneğin
+ aşağıdaki yapılandırma beklendiği gibi çalışacaktır:</p>
+
+ <pre class="prettyprint lang-config">Alias /foo/bar /baz
+Alias /foo /gaq</pre>
+
+
+ <p>Ama yukarıdaki iki satır ters sırada yerleştirilmiş olsaydı,
+ <code>/foo</code> rumuzu daima <code>/foo/bar</code> rumuzundan önce
+ eşleşecek, dolayısıyla ikinci yönerge yok sayılacaktı.</p>
+
+ <p><code class="directive"><a href="#alias">Alias</a></code>,
+ <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> ve
+ <code class="directive"><a href="#redirect">Redirect</a></code>
+ yönergeleri bir <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> veya <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> bölümü içinde kullanıldığında
+ bu yönergeler genel alanda tanımlanmış <code class="directive"><a href="#alias">Alias</a></code>,
+ <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> ve
+ <code class="directive"><a href="#redirect">Redirect</a></code> yönergelerine göre
+ öncelik alırlar.</p>
+
+ </div>
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_alias.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_allowmethods.html.en b/docs/manual/mod/mod_allowmethods.html.en
index 0b492eef13..09833ec632 100644
--- a/docs/manual/mod/mod_allowmethods.html.en
+++ b/docs/manual/mod/mod_allowmethods.html.en
@@ -47,7 +47,6 @@ used on an server. The most common configuration would be:</p>
<li><img alt="" src="../images/down.gif" /> <a href="#allowmethods">AllowMethods</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AllowMethods" id="AllowMethods">AllowMethods</a> <a name="allowmethods" id="allowmethods">Directive</a></h2>
<table class="directive">
@@ -80,6 +79,7 @@ kludgy implementation of <code class="directive"><a href="../mod/core.html#limit
<code class="directive"><a href="../mod/core.html#limitexcept">LimitExcept</a></code>.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_allowmethods.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_allowmethods.html.fr b/docs/manual/mod/mod_allowmethods.html.fr
index c73fcea713..54e23fbdbc 100644
--- a/docs/manual/mod/mod_allowmethods.html.fr
+++ b/docs/manual/mod/mod_allowmethods.html.fr
@@ -51,7 +51,6 @@ est du style :</p>
<li><img alt="" src="../images/down.gif" /> <a href="#allowmethods">AllowMethods</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="allowmethods" id="allowmethods">Directive</a> <a name="AllowMethods" id="AllowMethods">AllowMethods</a></h2>
<table class="directive">
@@ -85,6 +84,7 @@ d'imbrication :</p>
remplacer l'impl�mentation "bricol�e" des directives <code class="directive"><a href="../mod/core.html#limit">Limit</a></code> et <code class="directive"><a href="../mod/core.html#limitexcept">LimitExcept</a></code>.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_allowmethods.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_auth_basic.html.en b/docs/manual/mod/mod_auth_basic.html.en
index 0aa646a096..e939cd30a6 100644
--- a/docs/manual/mod/mod_auth_basic.html.en
+++ b/docs/manual/mod/mod_auth_basic.html.en
@@ -58,7 +58,6 @@
<li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li>
<li><a href="../howto/auth.html">Authentication howto</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthBasicAuthoritative" id="AuthBasicAuthoritative">AuthBasicAuthoritative</a> <a name="authbasicauthoritative" id="authbasicauthoritative">Directive</a></h2>
<table class="directive">
@@ -253,6 +252,7 @@ Digest Authentication was in force instead of Basic Authentication.
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_auth_basic.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_auth_basic.html.fr b/docs/manual/mod/mod_auth_basic.html.fr
index 568ee1e541..4a27dd5402 100644
--- a/docs/manual/mod/mod_auth_basic.html.fr
+++ b/docs/manual/mod/mod_auth_basic.html.fr
@@ -62,7 +62,6 @@
<li><a href="../howto/auth.html">Mode d'emploi de
l'authentification</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="authbasicauthoritative" id="authbasicauthoritative">Directive</a> <a name="AuthBasicAuthoritative" id="AuthBasicAuthoritative">AuthBasicAuthoritative</a></h2>
<table class="directive">
@@ -282,6 +281,7 @@ Apache</td></tr>
refuser l'acc�s.</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_auth_basic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_auth_basic.html.ja.utf8 b/docs/manual/mod/mod_auth_basic.html.ja.utf8
index a80348db0e..437d4a6de2 100644
--- a/docs/manual/mod/mod_auth_basic.html.ja.utf8
+++ b/docs/manual/mod/mod_auth_basic.html.ja.utf8
@@ -66,7 +66,6 @@
<li><code class="directive"><a href="../mod/mod_authz_core.html#&lt;satisfyone&gt;">&lt;SatisfyOne&gt;</a></code></li>
<li><a href="../howto/auth.html">Authentication howto</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthBasicAuthoritative" id="AuthBasicAuthoritative">AuthBasicAuthoritative</a> <a name="authbasicauthoritative" id="authbasicauthoritative">ディレクティブ</a></h2>
<table class="directive">
@@ -163,6 +162,7 @@ Digest Authentication was in force instead of Basic Authentication.
</table><p>このディレクティブの解説文書は
まだ翻訳されていません。英語版をご覧ください。
</p></div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_auth_basic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_auth_basic.html.ko.euc-kr b/docs/manual/mod/mod_auth_basic.html.ko.euc-kr
index fde27f13b6..df33b8b9f7 100644
--- a/docs/manual/mod/mod_auth_basic.html.ko.euc-kr
+++ b/docs/manual/mod/mod_auth_basic.html.ko.euc-kr
@@ -55,7 +55,6 @@
<li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li>
<li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthBasicAuthoritative" id="AuthBasicAuthoritative">AuthBasicAuthoritative</a> <a name="authbasicauthoritative" id="authbasicauthoritative">���þ�</a></h2>
<table class="directive">
@@ -156,6 +155,7 @@ Digest Authentication was in force instead of Basic Authentication.
</table><p>The documentation for this directive has
not been translated yet. Please have a look at the English
version.</p></div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_auth_basic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_auth_digest.html.en b/docs/manual/mod/mod_auth_digest.html.en
index f4d3116238..bb967ce339 100644
--- a/docs/manual/mod/mod_auth_digest.html.en
+++ b/docs/manual/mod/mod_auth_digest.html.en
@@ -66,48 +66,6 @@
<li><a href="../howto/auth.html">Authentication howto</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="using" id="using">Using Digest Authentication</a></h2>
-
- <p>To use MD5 Digest authentication, simply
- change the normal <code>AuthType Basic</code> and
- <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
- to <code>AuthType Digest</code> and
- <code class="directive"><a href="#authdigestprovider">AuthDigestProvider</a></code>,
- when setting up authentication, then add a
- <code class="directive"><a href="#authdigestdomain">AuthDigestDomain</a></code> directive containing at least the root
- URI(s) for this protection space.</p>
-
- <p>Appropriate user (text) files can be created using the
- <code class="program"><a href="../programs/htdigest.html">htdigest</a></code> tool.</p>
-
- <div class="example"><h3>Example:</h3><pre class="prettyprint lang-config">&lt;Location "/private/"&gt;
- AuthType Digest
- AuthName "private area"
- AuthDigestDomain "/private/" "http://mirror.my.dom/private2/"
-
- AuthDigestProvider file
- AuthUserFile "/web/auth/.digest_pw"
- Require valid-user
-&lt;/Location&gt;</pre>
-</div>
-
- <div class="note"><h3>Note</h3>
- <p>Digest authentication was intended to be more secure than basic
- authentication, but no longer fulfills that design goal. A
- man-in-the-middle attacker can trivially force the browser to downgrade
- to basic authentication. And even a passive eavesdropper can brute-force
- the password using today's graphics hardware, because the hashing
- algorithm used by digest authentication is too fast. Another problem is
- that the storage of the passwords on the server is insecure. The contents
- of a stolen htdigest file can be used directly for digest authentication.
- Therefore using <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> to encrypt the whole connection is
- strongly recommended.</p>
- <p><code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> only works properly on platforms
- where APR supports shared memory.</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="AuthDigestAlgorithm" id="AuthDigestAlgorithm">AuthDigestAlgorithm</a> <a name="authdigestalgorithm" id="authdigestalgorithm">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Selects the algorithm used to calculate the challenge and
@@ -265,6 +223,48 @@ AuthDigestShmemSize 1M</pre>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="using" id="using">Using Digest Authentication</a></h2>
+
+ <p>To use MD5 Digest authentication, simply
+ change the normal <code>AuthType Basic</code> and
+ <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
+ to <code>AuthType Digest</code> and
+ <code class="directive"><a href="#authdigestprovider">AuthDigestProvider</a></code>,
+ when setting up authentication, then add a
+ <code class="directive"><a href="#authdigestdomain">AuthDigestDomain</a></code> directive containing at least the root
+ URI(s) for this protection space.</p>
+
+ <p>Appropriate user (text) files can be created using the
+ <code class="program"><a href="../programs/htdigest.html">htdigest</a></code> tool.</p>
+
+ <div class="example"><h3>Example:</h3><pre class="prettyprint lang-config">&lt;Location "/private/"&gt;
+ AuthType Digest
+ AuthName "private area"
+ AuthDigestDomain "/private/" "http://mirror.my.dom/private2/"
+
+ AuthDigestProvider file
+ AuthUserFile "/web/auth/.digest_pw"
+ Require valid-user
+&lt;/Location&gt;</pre>
+</div>
+
+ <div class="note"><h3>Note</h3>
+ <p>Digest authentication was intended to be more secure than basic
+ authentication, but no longer fulfills that design goal. A
+ man-in-the-middle attacker can trivially force the browser to downgrade
+ to basic authentication. And even a passive eavesdropper can brute-force
+ the password using today's graphics hardware, because the hashing
+ algorithm used by digest authentication is too fast. Another problem is
+ that the storage of the passwords on the server is insecure. The contents
+ of a stolen htdigest file can be used directly for digest authentication.
+ Therefore using <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> to encrypt the whole connection is
+ strongly recommended.</p>
+ <p><code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> only works properly on platforms
+ where APR supports shared memory.</p>
+ </div>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_auth_digest.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_auth_digest.html.fr b/docs/manual/mod/mod_auth_digest.html.fr
index f18901e5a0..357b810dbb 100644
--- a/docs/manual/mod/mod_auth_digest.html.fr
+++ b/docs/manual/mod/mod_auth_digest.html.fr
@@ -72,48 +72,6 @@ condens�s</a></li>
l'authentification</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="using" id="using">Utilisation de l'authentification � base de
-condens�s</a></h2>
-
- <p>Pour utiliser l'authentification � base de condens�s MD5, vous
- devez simplement remplacer <code>AuthType Basic</code> et <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> respectivement
- par <code>AuthType Digest</code> et <code class="directive"><a href="#authdigestprovider">AuthDigestProvider</a></code> lorsque vous
- configurez l'authentification, puis ajouter une directive <code class="directive"><a href="#authdigestdomain">AuthDigestDomain</a></code> contenant au
- moins la(les) URI(s) racine(s) de la zone � prot�ger.</p>
-
- <p>On peut cr�er les fichiers utilisateur appropri�s (au format
- texte) � l'aide de l'outil <code class="program"><a href="../programs/htdigest.html">htdigest</a></code>.</p>
-
- <div class="example"><h3>Exemple :</h3><pre class="prettyprint lang-config">&lt;Location /private/&gt;
- AuthType Digest
- AuthName "private area"
- AuthDigestDomain /private/ http://mirror.my.dom/private2/
-
- AuthDigestProvider file
- AuthUserFile /web/auth/.digest_pw
- Require valid-user
-&lt;/Location&gt;</pre>
-</div>
-
- <div class="note"><h3>Note</h3>
- <p>L'authentification � base de condens� a �t� con�ue pour am�liorer
- la s�curit� par rapport � l'authentification basique, mais il
- s'av�re que ce but n'a pas �t� atteint. Un attaquant de type
- "man-in-the-middle" peut facilement forcer le navigateur � revenir �
- une authentification basique. M�me une oreille indiscr�te passive
- peut retrouver le mot de passe par force brute avec les moyens
- modernes, car l'algorithme de hashage utilis� par l'authentification
- � base de condens� est trop rapide. Autre probl�me, le stockage des
- mots de passe sur le serveur n'est pas s�r. Le contenu d'un fichier
- htdigest vol� peut �tre utilis� directement pour l'authentification
- � base de condens�. Il est donc fortement recommand� d'utiliser
- <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> pour chiffrer la connexion.</p>
- <p><code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> ne fonctionne correctement que
- sur les plates-formes o� APR supporte la m�moire partag�e.</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="authdigestalgorithm" id="authdigestalgorithm">Directive</a> <a name="AuthDigestAlgorithm" id="AuthDigestAlgorithm">AuthDigestAlgorithm</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>S�lectionne l'algorithme utilis� pour calculer les
@@ -284,6 +242,48 @@ AuthDigestShmemSize 1M</pre>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="using" id="using">Utilisation de l'authentification � base de
+condens�s</a></h2>
+
+ <p>Pour utiliser l'authentification � base de condens�s MD5, vous
+ devez simplement remplacer <code>AuthType Basic</code> et <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> respectivement
+ par <code>AuthType Digest</code> et <code class="directive"><a href="#authdigestprovider">AuthDigestProvider</a></code> lorsque vous
+ configurez l'authentification, puis ajouter une directive <code class="directive"><a href="#authdigestdomain">AuthDigestDomain</a></code> contenant au
+ moins la(les) URI(s) racine(s) de la zone � prot�ger.</p>
+
+ <p>On peut cr�er les fichiers utilisateur appropri�s (au format
+ texte) � l'aide de l'outil <code class="program"><a href="../programs/htdigest.html">htdigest</a></code>.</p>
+
+ <div class="example"><h3>Exemple :</h3><pre class="prettyprint lang-config">&lt;Location /private/&gt;
+ AuthType Digest
+ AuthName "private area"
+ AuthDigestDomain /private/ http://mirror.my.dom/private2/
+
+ AuthDigestProvider file
+ AuthUserFile /web/auth/.digest_pw
+ Require valid-user
+&lt;/Location&gt;</pre>
+</div>
+
+ <div class="note"><h3>Note</h3>
+ <p>L'authentification � base de condens� a �t� con�ue pour am�liorer
+ la s�curit� par rapport � l'authentification basique, mais il
+ s'av�re que ce but n'a pas �t� atteint. Un attaquant de type
+ "man-in-the-middle" peut facilement forcer le navigateur � revenir �
+ une authentification basique. M�me une oreille indiscr�te passive
+ peut retrouver le mot de passe par force brute avec les moyens
+ modernes, car l'algorithme de hashage utilis� par l'authentification
+ � base de condens� est trop rapide. Autre probl�me, le stockage des
+ mots de passe sur le serveur n'est pas s�r. Le contenu d'un fichier
+ htdigest vol� peut �tre utilis� directement pour l'authentification
+ � base de condens�. Il est donc fortement recommand� d'utiliser
+ <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> pour chiffrer la connexion.</p>
+ <p><code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> ne fonctionne correctement que
+ sur les plates-formes o� APR supporte la m�moire partag�e.</p>
+ </div>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_auth_digest.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_auth_digest.html.ko.euc-kr b/docs/manual/mod/mod_auth_digest.html.ko.euc-kr
index 29074e2423..01c2bd5961 100644
--- a/docs/manual/mod/mod_auth_digest.html.ko.euc-kr
+++ b/docs/manual/mod/mod_auth_digest.html.ko.euc-kr
@@ -60,75 +60,6 @@
<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="using" id="using">Digest Authentication ����ϱ�</a></h2>
-
- <p>MD5 Digest authentication�� �ſ� ���� ����� �� �ִ�.
- <code>AuthType Basic</code>�� <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> ���
- <code>AuthType Digest</code>�� <code class="directive"><a href="#authdigestprovider">AuthDigestProvider</a></code>��
- ����Ͽ� ������ ������ ������ �� �ִ�. �׸��� �ּ��� ��ȣ�Ϸ���
- ������ �⺻ URI�� <code class="directive"><a href="#authdigestdomain">AuthDigestDomain</a></code> ���þ ����Ѵ�.</p>
-
- <p><a href="../programs/htdigest.html">htdigest</a> ������
- ����Ͽ� ����� (����)������ ���� �� �ִ�.</p>
-
- <div class="example"><h3>����:</h3><p><code>
- &lt;Location /private/&gt;<br />
- <span class="indent">
- AuthType Digest<br />
- AuthName "private area"<br />
- AuthDigestDomain /private/ http://mirror.my.dom/private2/<br />
- <br />
- AuthDigestProvider file<br />
- AuthUserFile /web/auth/.digest_pw<br />
- Require valid-user<br />
- </span>
- &lt;/Location&gt;
- </code></p></div>
-
- <div class="note"><h3>����</h3>
- <p>Digest authentication�� Basic authentication���� ��
- ����������, �������� �����ؾ� �Ѵ�. 2002�� 11�� ���� digest
- authentication�� �����ϴ� ���������� <a href="http://www.w3.org/Amaya/">Amaya</a>, <a href="http://konqueror.kde.org/">Konqueror</a>, (Windows����
- ���ǹ��ڿ��� �Բ� ����ϸ� �ȵ����� - �ذ����� �Ʒ� "<a href="#msie">MS Internet Explorer ���� �ذ��ϱ�</a>"�� ����)
- Mac OS X�� Windows�� <a href="http://www.microsoft.com/windows/ie/">MS Internet
- Explorer</a>, <a href="http://www.mozilla.org">Mozilla</a>,
- <a href="http://channels.netscape.com/ns/browsers/download.jsp">Netscape</a> ���� 7, <a href="http://www.opera.com/">Opera</a>,
- <a href="http://www.apple.com/safari/">Safari</a> ���� �ִ�.
- <a href="http://lynx.isc.org/">lynx</a>�� digest authentication��
- �������� <strong>�ʴ´�</strong>. digest authentication��
- basic authentication ��ŭ �θ� �������� �ʾұ⶧���� ���
- ����ڰ� �����ϴ� �������� ����ϴ� ��쿡�� ����ؾ�
- �Ѵ�.</p>
- </div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="msie" id="msie">MS Internet Explorer ���� �ذ��ϱ�</a></h2>
- <p>���� Windows�� Internet Explorer�� Digest authentication
- ���� ���ǹ��ڿ��� �ִ� <code>GET</code> ��û�� RFC�� �ٸ���
- ó���ϴ� ������ �ִ�. ��� ������� �� ������ �ذ��� ��
- �ִ�.</p>
-
- <p>
- ù��°�� ���α׷��� �ڷḦ �Ѱ��ֱ����� <code>GET</code>
- ��� <code>POST</code> ��û�� ����ϴ� ����̴�. �� �����
- �����ϴٸ� ���� ������ �ذ�å�̴�.
- </p>
-
- <p>��, ����ġ 2.0.51���� <code>AuthDigestEnableQueryStringHack</code>
- ȯ�溯���� �����Ͽ� ������ �ذ��Ѵ�. ��û��
- <code>AuthDigestEnableQueryStringHack</code>�� �����ϸ�
- ����ġ�� MSIE ���׸� ���ذ� ��ġ�� ���ϰ� ��û URI�� digest
- �񱳿��� �����Ѵ�. �� ����� ������ ���� ����Ѵ�.</p>
-
- <div class="example"><h3>MSIE���� Digest Authentication ����ϱ�:</h3><p><code>
- BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
- </code></p></div>
-
- <p>�������� ȯ�溯�� ������ ���� �ڼ��� ������ <code class="directive"><a href="../mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code> ���þ
- �����϶�.</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="AuthDigestAlgorithm" id="AuthDigestAlgorithm">AuthDigestAlgorithm</a> <a name="authdigestalgorithm" id="authdigestalgorithm">���þ�</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">����:</a></th><td>digest authentication���� challenge�� response
@@ -283,6 +214,75 @@ URI��</td></tr>
</code></p></div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="using" id="using">Digest Authentication ����ϱ�</a></h2>
+
+ <p>MD5 Digest authentication�� �ſ� ���� ����� �� �ִ�.
+ <code>AuthType Basic</code>�� <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> ���
+ <code>AuthType Digest</code>�� <code class="directive"><a href="#authdigestprovider">AuthDigestProvider</a></code>��
+ ����Ͽ� ������ ������ ������ �� �ִ�. �׸��� �ּ��� ��ȣ�Ϸ���
+ ������ �⺻ URI�� <code class="directive"><a href="#authdigestdomain">AuthDigestDomain</a></code> ���þ ����Ѵ�.</p>
+
+ <p><a href="../programs/htdigest.html">htdigest</a> ������
+ ����Ͽ� ����� (����)������ ���� �� �ִ�.</p>
+
+ <div class="example"><h3>����:</h3><p><code>
+ &lt;Location /private/&gt;<br />
+ <span class="indent">
+ AuthType Digest<br />
+ AuthName "private area"<br />
+ AuthDigestDomain /private/ http://mirror.my.dom/private2/<br />
+ <br />
+ AuthDigestProvider file<br />
+ AuthUserFile /web/auth/.digest_pw<br />
+ Require valid-user<br />
+ </span>
+ &lt;/Location&gt;
+ </code></p></div>
+
+ <div class="note"><h3>����</h3>
+ <p>Digest authentication�� Basic authentication���� ��
+ ����������, �������� �����ؾ� �Ѵ�. 2002�� 11�� ���� digest
+ authentication�� �����ϴ� ���������� <a href="http://www.w3.org/Amaya/">Amaya</a>, <a href="http://konqueror.kde.org/">Konqueror</a>, (Windows����
+ ���ǹ��ڿ��� �Բ� ����ϸ� �ȵ����� - �ذ����� �Ʒ� "<a href="#msie">MS Internet Explorer ���� �ذ��ϱ�</a>"�� ����)
+ Mac OS X�� Windows�� <a href="http://www.microsoft.com/windows/ie/">MS Internet
+ Explorer</a>, <a href="http://www.mozilla.org">Mozilla</a>,
+ <a href="http://channels.netscape.com/ns/browsers/download.jsp">Netscape</a> ���� 7, <a href="http://www.opera.com/">Opera</a>,
+ <a href="http://www.apple.com/safari/">Safari</a> ���� �ִ�.
+ <a href="http://lynx.isc.org/">lynx</a>�� digest authentication��
+ �������� <strong>�ʴ´�</strong>. digest authentication��
+ basic authentication ��ŭ �θ� �������� �ʾұ⶧���� ���
+ ����ڰ� �����ϴ� �������� ����ϴ� ��쿡�� ����ؾ�
+ �Ѵ�.</p>
+ </div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="msie" id="msie">MS Internet Explorer ���� �ذ��ϱ�</a></h2>
+ <p>���� Windows�� Internet Explorer�� Digest authentication
+ ���� ���ǹ��ڿ��� �ִ� <code>GET</code> ��û�� RFC�� �ٸ���
+ ó���ϴ� ������ �ִ�. ��� ������� �� ������ �ذ��� ��
+ �ִ�.</p>
+
+ <p>
+ ù��°�� ���α׷��� �ڷḦ �Ѱ��ֱ����� <code>GET</code>
+ ��� <code>POST</code> ��û�� ����ϴ� ����̴�. �� �����
+ �����ϴٸ� ���� ������ �ذ�å�̴�.
+ </p>
+
+ <p>��, ����ġ 2.0.51���� <code>AuthDigestEnableQueryStringHack</code>
+ ȯ�溯���� �����Ͽ� ������ �ذ��Ѵ�. ��û��
+ <code>AuthDigestEnableQueryStringHack</code>�� �����ϸ�
+ ����ġ�� MSIE ���׸� ���ذ� ��ġ�� ���ϰ� ��û URI�� digest
+ �񱳿��� �����Ѵ�. �� ����� ������ ���� ����Ѵ�.</p>
+
+ <div class="example"><h3>MSIE���� Digest Authentication ����ϱ�:</h3><p><code>
+ BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
+ </code></p></div>
+
+ <p>�������� ȯ�溯�� ������ ���� �ڼ��� ������ <code class="directive"><a href="../mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code> ���þ
+ �����϶�.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_auth_digest.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_auth_form.html.en b/docs/manual/mod/mod_auth_form.html.en
index b13cbc7008..118443059f 100644
--- a/docs/manual/mod/mod_auth_form.html.en
+++ b/docs/manual/mod/mod_auth_form.html.en
@@ -96,253 +96,6 @@
<li><a href="../howto/auth.html">Authentication howto</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="basicconfig" id="basicconfig">Basic Configuration</a></h2>
-
- <p>To protect a particular URL with <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>, you need to
- decide where you will store your <var>session</var>, and you will need to
- decide what method you will use to authenticate. In this simple example, the
- login details will be stored in a session based on
- <code class="module"><a href="../mod/mod_session_cookie.html">mod_session_cookie</a></code>, and authentication will be attempted against
- a file using <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>. If authentication is unsuccessful,
- the user will be redirected to the form login page.</p>
-
- <div class="example"><h3>Basic example</h3><pre class="prettyprint lang-config">AuthFormProvider file
-AuthUserFile "conf/passwd"
-AuthType form
-AuthName realm
-AuthFormLoginRequiredLocation "http://example.com/login.html"
-Session On
-SessionCookieName session path=/
-SessionCryptoPassphrase secret</pre>
-</div>
-
- <p>The directive <code class="directive"><a href="../mod/mod_authn_core.html#authtype">AuthType</a></code> will enable
- the <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> authentication when set to the value <var>form</var>.
- The directives <code class="directive"><a href="#authformprovider">AuthFormProvider</a></code> and
- <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> specify that usernames
- and passwords should be checked against the chosen file.</p>
-
- <p>The directives <code class="directive"><a href="../mod/mod_session.html#session">Session</a></code>,
- <code class="directive"><a href="../mod/mod_session_cookie.html#sessioncookiename">SessionCookieName</a></code> and
- <code class="directive"><a href="../mod/mod_session_crypto.html#sessioncryptopassphrase">SessionCryptoPassphrase</a></code> create an
- encrypted session stored within an HTTP cookie on the browser. For more information
- on the different options for configuring a session, read the documentation for
- <code class="module"><a href="../mod/mod_session.html">mod_session</a></code>.</p>
-
- <p>In the simple example above, a URL has been protected by
- <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>, but the user has yet to be given an opportunity to
- enter their username and password. Options for doing so include providing a
- dedicated standalone login page for this purpose, or for providing the login
- page inline.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="standalone" id="standalone">Standalone Login</a></h2>
-
- <p>The login form can be hosted as a standalone page, or can be provided inline on
- the same page.</p>
-
- <p>When configuring the login as a standalone page, unsuccessful authentication
- attempts should be redirected to a login form created by the website for this purpose,
- using the <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code>
- directive. Typically this login page will contain an HTML form, asking the user to
- provide their usename and password.</p>
-
- <div class="example"><h3>Example login form</h3><pre class="prettyprint lang-html">&lt;form method="POST" action="/dologin.html"&gt;
- Username: &lt;input type="text" name="httpd_username" value="" /&gt;
- Password: &lt;input type="password" name="httpd_password" value="" /&gt;
- &lt;input type="submit" name="login" value="Login" /&gt;
-&lt;/form&gt;</pre>
-</div>
-
- <p>The part that does the actual login is handled by the <var>form-login-handler</var>.
- The action of the form should point at this handler, which is configured within
- Apache httpd as follows:</p>
-
- <div class="example"><h3>Form login handler example</h3><pre class="prettyprint lang-config">&lt;Location "/dologin.html"&gt;
- SetHandler form-login-handler
- AuthFormLoginRequiredLocation "http://example.com/login.html"
- AuthFormLoginSuccessLocation "http://example.com/success.html"
- AuthFormProvider file
- AuthUserFile "conf/passwd"
- AuthType form
- AuthName realm
- Session On
- SessionCookieName session path=/
- SessionCryptoPassphrase secret
-&lt;/Location&gt;</pre>
-</div>
-
- <p>The URLs specified by the
- <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code> directive will typically
- point to a page explaining to the user that their login attempt was unsuccessful, and they
- should try again. The <code class="directive"><a href="#authformloginsuccesslocation">AuthFormLoginSuccessLocation</a></code>
- directive specifies the URL the user should be redirected to upon successful login.</p>
-
- <p>Alternatively, the URL to redirect the user to on success can be embedded within the login
- form, as in the example below. As a result, the same <var>form-login-handler</var> can be
- reused for different areas of a website.</p>
-
- <div class="example"><h3>Example login form with location</h3><pre class="prettyprint lang-html">&lt;form method="POST" action="/dologin.html"&gt;
- Username: &lt;input type="text" name="httpd_username" value="" /&gt;
- Password: &lt;input type="password" name="httpd_password" value="" /&gt;
- &lt;input type="submit" name="login" value="Login" /&gt;
- &lt;input type="hidden" name="httpd_location" value="http://example.com/success.html" /&gt;
-&lt;/form&gt;</pre>
-</div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="inline" id="inline">Inline Login</a></h2>
-
- <div class="warning"><h3>Warning</h3>
- <p>A risk exists that under certain circumstances, the login form configured
- using inline login may be submitted more than once, revealing login credentials to
- the application running underneath. The administrator must ensure that the underlying
- application is properly secured to prevent abuse. If in doubt, use the
- standalone login configuration.</p>
- </div>
-
- <p>As an alternative to having a dedicated login page for a website, it is possible to
- configure <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> to authenticate users inline, without being
- redirected to another page. This allows the state of the current page to be preserved
- during the login attempt. This can be useful in a situation where a time limited
- session is in force, and the session times out in the middle of the user request. The
- user can be re-authenticated in place, and they can continue where they left off.</p>
-
- <p>If a non-authenticated user attempts to access a page protected by
- <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> that isn't configured with a
- <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code> directive,
- a <var>HTTP_UNAUTHORIZED</var> status code is returned to the browser indicating to the user
- that they are not authorized to view the page.</p>
-
- <p>To configure inline authentication, the administrator overrides the error document
- returned by the <var>HTTP_UNAUTHORIZED</var> status code with a custom error document
- containing the login form, as follows:</p>
-
- <div class="example"><h3>Basic inline example</h3><pre class="prettyprint lang-config">AuthFormProvider file
-ErrorDocument 401 "/login.shtml"
-AuthUserFile "conf/passwd"
-AuthType form
-AuthName realm
-AuthFormLoginRequiredLocation "http://example.com/login.html"
-Session On
-SessionCookieName session path=/
-SessionCryptoPassphrase secret</pre>
-</div>
-
- <p>The error document page should contain a login form with an empty action property,
- as per the example below. This has the effect of submitting the form to
- the original protected URL, without the page having to know what that
- URL is.</p>
-
- <div class="example"><h3>Example inline login form</h3><pre class="prettyprint lang-html">&lt;form method="POST" <strong>action=""</strong>&gt;
- Username: &lt;input type="text" name="httpd_username" value="" /&gt;
- Password: &lt;input type="password" name="httpd_password" value="" /&gt;
- &lt;input type="submit" name="login" value="Login" /&gt;
-&lt;/form&gt;</pre>
-</div>
-
- <p>When the end user has filled in their login details, the form will make
- an HTTP POST request to the original password protected URL.
- <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> will intercept this POST request, and if
- HTML fields are found present for the username and password, the user
- will be logged in, and the original password protected URL will be returned
- to the user as a GET request.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="inlinepreservebody" id="inlinepreservebody">Inline Login with Body Preservation</a></h2>
-
- <p>A limitation of the inline login technique described above is that should an
- HTML form POST have resulted in the request to authenticate or
- reauthenticate, the
- contents of the original form posted by the browser will be lost. Depending on
- the function of the website, this could present significant inconvenience for the
- end user.</p>
-
- <p><code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> addresses this by allowing the method and body
- of the original request to be embedded in the login form. If authentication
- is successful, the original method and body will be retried by Apache httpd, preserving
- the state of the original request.</p>
-
- <p>To enable body preservation, add three additional fields to the login form as
- per the example below.</p>
-
- <div class="example"><h3>Example with body preservation</h3><pre class="prettyprint lang-html">&lt;form method="POST" action=""&gt;
- Username: &lt;input type="text" name="httpd_username" value="" /&gt;
- Password: &lt;input type="password" name="httpd_password" value="" /&gt;
- &lt;input type="submit" name="login" value="Login" /&gt;
- <br /> <strong>&lt;input type="hidden" name="httpd_method" value="POST" /&gt;
- &lt;input type="hidden" name="httpd_mimetype" value="application/x-www-form-urlencoded" /&gt;
- &lt;input type="hidden" name="httpd_body" value="name1=value1&amp;name2=value2" /&gt;</strong><br />
-&lt;/form&gt;</pre>
-</div>
-
- <p>How the method, mimetype and body of the original request are embedded within the
- login form will depend on the platform and technology being used within the website.
- </p>
-
- <p>One option is to use the <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> module along with the
- <code class="directive"><a href="../mod/mod_request.html#keptbodysize">KeptBodySize</a></code> directive, along with a suitable
- CGI script to embed the variables in the form.</p>
-
- <p>Another option is to render the login form using a CGI script or other dynamic
- technology.</p>
-
- <div class="example"><h3>CGI example</h3><pre class="prettyprint lang-config"> AuthFormProvider file
- ErrorDocument 401 "/cgi-bin/login.cgi"
- ...</pre>
-</div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="loggingout" id="loggingout">Logging Out</a></h2>
-
- <p>To enable a user to log out of a particular session, configure a page to
- be handled by the <var>form-logout-handler</var>. Any attempt to access this
- URL will cause the username and password to be removed from the current
- session, effectively logging the user out.</p>
-
- <p>By setting the
- <code class="directive"><a href="#authformlogoutlocation">AuthFormLogoutLocation</a></code> directive,
- a URL can be specified that the browser will be redirected to on successful
- logout. This URL might explain to the user that they have been logged out, and
- give the user the option to log in again.</p>
-
- <div class="example"><h3>Basic logout example</h3><pre class="prettyprint lang-config">SetHandler form-logout-handler
-AuthName realm
-AuthFormLogoutLocation "http://example.com/loggedout.html"
-Session On
-SessionCookieName session path=/
-SessionCryptoPassphrase secret</pre>
-</div>
-
- <p>Note that logging a user out does not delete the session; it merely removes
- the username and password from the session. If this results in an empty session,
- the net effect will be the removal of that session, but this is not
- guaranteed. If you want to guarantee the removal of a session, set the
- <code class="directive"><a href="../mod/mod_session.html#sessionmaxage">SessionMaxAge</a></code> directive to a small
- value, like 1 (setting the directive to zero would mean no session age limit).
- </p>
-
- <div class="example"><h3>Basic session expiry example</h3><pre class="prettyprint lang-config">SetHandler form-logout-handler
-AuthFormLogoutLocation "http://example.com/loggedout.html"
-Session On
-SessionMaxAge 1
-SessionCookieName session path=/
-SessionCryptoPassphrase secret</pre>
-</div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="urlencoding" id="urlencoding">Usernames and Passwords</a></h2>
- <p>Note that form submission involves URLEncoding the form data:
- in this case the username and password. You should therefore
- pick usernames and passwords that avoid characters that are
- URLencoded in form submission, or you may get unexpected results.</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="AuthFormAuthoritative" id="AuthFormAuthoritative">AuthFormAuthoritative</a> <a name="authformauthoritative" id="authformauthoritative">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets whether authorization and authentication are passed to
@@ -698,6 +451,253 @@ parser has been added in 2.4.4.</td></tr>
in.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="basicconfig" id="basicconfig">Basic Configuration</a></h2>
+
+ <p>To protect a particular URL with <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>, you need to
+ decide where you will store your <var>session</var>, and you will need to
+ decide what method you will use to authenticate. In this simple example, the
+ login details will be stored in a session based on
+ <code class="module"><a href="../mod/mod_session_cookie.html">mod_session_cookie</a></code>, and authentication will be attempted against
+ a file using <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>. If authentication is unsuccessful,
+ the user will be redirected to the form login page.</p>
+
+ <div class="example"><h3>Basic example</h3><pre class="prettyprint lang-config">AuthFormProvider file
+AuthUserFile "conf/passwd"
+AuthType form
+AuthName realm
+AuthFormLoginRequiredLocation "http://example.com/login.html"
+Session On
+SessionCookieName session path=/
+SessionCryptoPassphrase secret</pre>
+</div>
+
+ <p>The directive <code class="directive"><a href="../mod/mod_authn_core.html#authtype">AuthType</a></code> will enable
+ the <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> authentication when set to the value <var>form</var>.
+ The directives <code class="directive"><a href="#authformprovider">AuthFormProvider</a></code> and
+ <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> specify that usernames
+ and passwords should be checked against the chosen file.</p>
+
+ <p>The directives <code class="directive"><a href="../mod/mod_session.html#session">Session</a></code>,
+ <code class="directive"><a href="../mod/mod_session_cookie.html#sessioncookiename">SessionCookieName</a></code> and
+ <code class="directive"><a href="../mod/mod_session_crypto.html#sessioncryptopassphrase">SessionCryptoPassphrase</a></code> create an
+ encrypted session stored within an HTTP cookie on the browser. For more information
+ on the different options for configuring a session, read the documentation for
+ <code class="module"><a href="../mod/mod_session.html">mod_session</a></code>.</p>
+
+ <p>In the simple example above, a URL has been protected by
+ <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>, but the user has yet to be given an opportunity to
+ enter their username and password. Options for doing so include providing a
+ dedicated standalone login page for this purpose, or for providing the login
+ page inline.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="standalone" id="standalone">Standalone Login</a></h2>
+
+ <p>The login form can be hosted as a standalone page, or can be provided inline on
+ the same page.</p>
+
+ <p>When configuring the login as a standalone page, unsuccessful authentication
+ attempts should be redirected to a login form created by the website for this purpose,
+ using the <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code>
+ directive. Typically this login page will contain an HTML form, asking the user to
+ provide their usename and password.</p>
+
+ <div class="example"><h3>Example login form</h3><pre class="prettyprint lang-html">&lt;form method="POST" action="/dologin.html"&gt;
+ Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+ Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+ &lt;input type="submit" name="login" value="Login" /&gt;
+&lt;/form&gt;</pre>
+</div>
+
+ <p>The part that does the actual login is handled by the <var>form-login-handler</var>.
+ The action of the form should point at this handler, which is configured within
+ Apache httpd as follows:</p>
+
+ <div class="example"><h3>Form login handler example</h3><pre class="prettyprint lang-config">&lt;Location "/dologin.html"&gt;
+ SetHandler form-login-handler
+ AuthFormLoginRequiredLocation "http://example.com/login.html"
+ AuthFormLoginSuccessLocation "http://example.com/success.html"
+ AuthFormProvider file
+ AuthUserFile "conf/passwd"
+ AuthType form
+ AuthName realm
+ Session On
+ SessionCookieName session path=/
+ SessionCryptoPassphrase secret
+&lt;/Location&gt;</pre>
+</div>
+
+ <p>The URLs specified by the
+ <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code> directive will typically
+ point to a page explaining to the user that their login attempt was unsuccessful, and they
+ should try again. The <code class="directive"><a href="#authformloginsuccesslocation">AuthFormLoginSuccessLocation</a></code>
+ directive specifies the URL the user should be redirected to upon successful login.</p>
+
+ <p>Alternatively, the URL to redirect the user to on success can be embedded within the login
+ form, as in the example below. As a result, the same <var>form-login-handler</var> can be
+ reused for different areas of a website.</p>
+
+ <div class="example"><h3>Example login form with location</h3><pre class="prettyprint lang-html">&lt;form method="POST" action="/dologin.html"&gt;
+ Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+ Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+ &lt;input type="submit" name="login" value="Login" /&gt;
+ &lt;input type="hidden" name="httpd_location" value="http://example.com/success.html" /&gt;
+&lt;/form&gt;</pre>
+</div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="inline" id="inline">Inline Login</a></h2>
+
+ <div class="warning"><h3>Warning</h3>
+ <p>A risk exists that under certain circumstances, the login form configured
+ using inline login may be submitted more than once, revealing login credentials to
+ the application running underneath. The administrator must ensure that the underlying
+ application is properly secured to prevent abuse. If in doubt, use the
+ standalone login configuration.</p>
+ </div>
+
+ <p>As an alternative to having a dedicated login page for a website, it is possible to
+ configure <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> to authenticate users inline, without being
+ redirected to another page. This allows the state of the current page to be preserved
+ during the login attempt. This can be useful in a situation where a time limited
+ session is in force, and the session times out in the middle of the user request. The
+ user can be re-authenticated in place, and they can continue where they left off.</p>
+
+ <p>If a non-authenticated user attempts to access a page protected by
+ <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> that isn't configured with a
+ <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code> directive,
+ a <var>HTTP_UNAUTHORIZED</var> status code is returned to the browser indicating to the user
+ that they are not authorized to view the page.</p>
+
+ <p>To configure inline authentication, the administrator overrides the error document
+ returned by the <var>HTTP_UNAUTHORIZED</var> status code with a custom error document
+ containing the login form, as follows:</p>
+
+ <div class="example"><h3>Basic inline example</h3><pre class="prettyprint lang-config">AuthFormProvider file
+ErrorDocument 401 "/login.shtml"
+AuthUserFile "conf/passwd"
+AuthType form
+AuthName realm
+AuthFormLoginRequiredLocation "http://example.com/login.html"
+Session On
+SessionCookieName session path=/
+SessionCryptoPassphrase secret</pre>
+</div>
+
+ <p>The error document page should contain a login form with an empty action property,
+ as per the example below. This has the effect of submitting the form to
+ the original protected URL, without the page having to know what that
+ URL is.</p>
+
+ <div class="example"><h3>Example inline login form</h3><pre class="prettyprint lang-html">&lt;form method="POST" <strong>action=""</strong>&gt;
+ Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+ Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+ &lt;input type="submit" name="login" value="Login" /&gt;
+&lt;/form&gt;</pre>
+</div>
+
+ <p>When the end user has filled in their login details, the form will make
+ an HTTP POST request to the original password protected URL.
+ <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> will intercept this POST request, and if
+ HTML fields are found present for the username and password, the user
+ will be logged in, and the original password protected URL will be returned
+ to the user as a GET request.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="inlinepreservebody" id="inlinepreservebody">Inline Login with Body Preservation</a></h2>
+
+ <p>A limitation of the inline login technique described above is that should an
+ HTML form POST have resulted in the request to authenticate or
+ reauthenticate, the
+ contents of the original form posted by the browser will be lost. Depending on
+ the function of the website, this could present significant inconvenience for the
+ end user.</p>
+
+ <p><code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> addresses this by allowing the method and body
+ of the original request to be embedded in the login form. If authentication
+ is successful, the original method and body will be retried by Apache httpd, preserving
+ the state of the original request.</p>
+
+ <p>To enable body preservation, add three additional fields to the login form as
+ per the example below.</p>
+
+ <div class="example"><h3>Example with body preservation</h3><pre class="prettyprint lang-html">&lt;form method="POST" action=""&gt;
+ Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+ Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+ &lt;input type="submit" name="login" value="Login" /&gt;
+ <br /> <strong>&lt;input type="hidden" name="httpd_method" value="POST" /&gt;
+ &lt;input type="hidden" name="httpd_mimetype" value="application/x-www-form-urlencoded" /&gt;
+ &lt;input type="hidden" name="httpd_body" value="name1=value1&amp;name2=value2" /&gt;</strong><br />
+&lt;/form&gt;</pre>
+</div>
+
+ <p>How the method, mimetype and body of the original request are embedded within the
+ login form will depend on the platform and technology being used within the website.
+ </p>
+
+ <p>One option is to use the <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> module along with the
+ <code class="directive"><a href="../mod/mod_request.html#keptbodysize">KeptBodySize</a></code> directive, along with a suitable
+ CGI script to embed the variables in the form.</p>
+
+ <p>Another option is to render the login form using a CGI script or other dynamic
+ technology.</p>
+
+ <div class="example"><h3>CGI example</h3><pre class="prettyprint lang-config"> AuthFormProvider file
+ ErrorDocument 401 "/cgi-bin/login.cgi"
+ ...</pre>
+</div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="loggingout" id="loggingout">Logging Out</a></h2>
+
+ <p>To enable a user to log out of a particular session, configure a page to
+ be handled by the <var>form-logout-handler</var>. Any attempt to access this
+ URL will cause the username and password to be removed from the current
+ session, effectively logging the user out.</p>
+
+ <p>By setting the
+ <code class="directive"><a href="#authformlogoutlocation">AuthFormLogoutLocation</a></code> directive,
+ a URL can be specified that the browser will be redirected to on successful
+ logout. This URL might explain to the user that they have been logged out, and
+ give the user the option to log in again.</p>
+
+ <div class="example"><h3>Basic logout example</h3><pre class="prettyprint lang-config">SetHandler form-logout-handler
+AuthName realm
+AuthFormLogoutLocation "http://example.com/loggedout.html"
+Session On
+SessionCookieName session path=/
+SessionCryptoPassphrase secret</pre>
+</div>
+
+ <p>Note that logging a user out does not delete the session; it merely removes
+ the username and password from the session. If this results in an empty session,
+ the net effect will be the removal of that session, but this is not
+ guaranteed. If you want to guarantee the removal of a session, set the
+ <code class="directive"><a href="../mod/mod_session.html#sessionmaxage">SessionMaxAge</a></code> directive to a small
+ value, like 1 (setting the directive to zero would mean no session age limit).
+ </p>
+
+ <div class="example"><h3>Basic session expiry example</h3><pre class="prettyprint lang-config">SetHandler form-logout-handler
+AuthFormLogoutLocation "http://example.com/loggedout.html"
+Session On
+SessionMaxAge 1
+SessionCookieName session path=/
+SessionCryptoPassphrase secret</pre>
+</div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="urlencoding" id="urlencoding">Usernames and Passwords</a></h2>
+ <p>Note that form submission involves URLEncoding the form data:
+ in this case the username and password. You should therefore
+ pick usernames and passwords that avoid characters that are
+ URLencoded in form submission, or you may get unexpected results.</p>
+ </div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_auth_form.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_auth_form.html.fr b/docs/manual/mod/mod_auth_form.html.fr
index 66e74723a1..7b348cf397 100644
--- a/docs/manual/mod/mod_auth_form.html.fr
+++ b/docs/manual/mod/mod_auth_form.html.fr
@@ -105,295 +105,6 @@
l'authentification</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="basicconfig" id="basicconfig">Configuration de base</a></h2>
-
- <p>Pour prot�ger une URL particuli�re avec le module
- <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>, vous devez d�terminer l'endroit o�
- vous allez stocker votre <var>session</var>, ainsi que la m�thode
- d'authentification. Dans cet exemple simple, les informations de
- connexion sont stock�es dans une session � l'aide du module
- <code class="module"><a href="../mod/mod_session_cookie.html">mod_session_cookie</a></code>, et l'authentification utilise
- un fichier en s'appuyant sur le module
- <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>. Si l'authentification �choue,
- l'utilisateur dera redirig� vers la page du formulaire de
- connexion.</p>
-
- <div class="example"><h3>Exemple simple</h3><pre class="prettyprint lang-config">AuthFormProvider file
-AuthUserFile conf/passwd
-AuthType form
-AuthName realm
-AuthFormLoginRequiredLocation http://example.com/login.html
-Session On
-SessionCookieName session path=/
-SessionCryptoPassphrase secret</pre>
-</div>
-
- <p>L'authentification <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> est activ�e
- en affectant la valeur <var>form</var> � la directive <code class="directive"><a href="../mod/mod_authn_core.html#authtype">AuthType</a></code>. Les directives
- <code class="directive"><a href="#authformprovider">AuthFormProvider</a></code> et
- <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
- sp�cifient que les noms d'utilisateurs et mots de passe seront
- v�rifi�s en utilisant le fichier choisi.</p>
-
- <p>Les directives <code class="directive"><a href="../mod/mod_session.html#session">Session</a></code>, <code class="directive"><a href="../mod/mod_session_cookie.html#sessioncookiename">SessionCookieName</a></code> et
- <code class="directive"><a href="../mod/mod_session_crypto.html#sessioncryptopassphrase">SessionCryptoPassphrase</a></code>
- cr�ent une session chiffr�e stock�e dans un cookie HTTP au niveau
- du navigateur. Pour plus d'informations � propos des diff�rentes
- options de configuration des sessions, reportez-vous � la
- documentation du module <code class="module"><a href="../mod/mod_session.html">mod_session</a></code>.</p>
-
- <p>Dans l'exemple simple ci-dessus, une URL a �t� prot�g�e par
- <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>, mais on doit maintenant fournir
- � l'utilisateur un moyen d'entrer un nom et un mot de passe. � cet
- effet, on peut soit �crire une page de connexion ind�pendante
- d�di�e, soit inclure le formulaire de connexion dans la page
- courante.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="standalone" id="standalone">Page de connexion d�di�e</a></h2>
-
- <p>Le formulaire de connexion peut �tre contenu dans une page
- ind�pendante, ou �tre inclus dans la page courante. </p>
-
- <p>Lorsque la connexion s'effectue � partir d'une page
- ind�pendante et si la tentative d'authentification �choue,
- l'utilisateur doit �tre redirig� vers un formulaire de connexion,
- cr�� � cet effet sur le site web, en utilisant la directive
- <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code>.
- En g�n�ral, la page de connexion contiendra un formulaire HTML
- demandant � l'utilisateur de fournir un nom et un mot de passe.</p>
-
- <div class="example"><h3>Exemple de formulaire de connexion</h3><pre class="prettyprint lang-html">&lt;form method="POST" action="/dologin.html"&gt;
- Username: &lt;input type="text" name="httpd_username" value="" /&gt;
- Password: &lt;input type="password" name="httpd_password" value="" /&gt;
- &lt;input type="submit" name="login" value="Login" /&gt;
-&lt;/form&gt;</pre>
-</div>
-
- <p>La partie o� s'effectue la connexion proprement dite est
- trait�e par le gestionnaire <var>form-login-handler</var>.
- L'action de ce formulaire doit pointer vers ce gestionnaire, ce
- que l'on configure dans Apache httpd comme suit :</p>
-
- <div class="example"><h3>Exemple de configuration du gestionnaire de
- formulaire de connexion</h3><pre class="prettyprint lang-config">&lt;Location /dologin.html&gt;
- SetHandler form-login-handler
- AuthFormLoginRequiredLocation http://example.com/login.html
- AuthFormLoginSuccessLocation http://example.com/success.html
- AuthFormProvider file
- AuthUserFile conf/passwd
- AuthType form
- AuthName realm
- Session On
- SessionCookieName session path=/
- SessionCryptoPassphrase secret
-&lt;/Location&gt;</pre>
-</div>
-
- <p>L'URL sp�cifi�e par la directive
- <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code>
- r�f�rencera en g�n�ral une page expliquant � l'utilisateur que sa
- tentative de connexion a �chou�, et qu'il doit la renouveler. La
- directive <code class="directive"><a href="#authformloginsuccesslocation">AuthFormLoginSuccessLocation</a></code>
- sp�cifie l'URL vers laquelle l'utilisateur doit �tre redirig� s'il
- s'est authentifi� avec succ�s.</p>
-
- <p>Alternativement, l'URL vers laquelle doit �tre redirig�
- l'utilisateur s'il s'est authentifi� avec succ�s peut �tre
- int�gr�e dans le formulaire de connexion, comme dans l'exemple
- ci-dessous. Il en d�coule que le m�me gestionnaire
- <var>form-login-handler</var> pourra �tre utilis� pour diff�rentes
- zones du site web.</p>
-
- <div class="example"><h3>Exemple de formulaire d'authentification multizone</h3><pre class="prettyprint lang-html">&lt;form method="POST" action="/dologin.html"&gt;
- Username: &lt;input type="text" name="httpd_username" value="" /&gt;
- Password: &lt;input type="password" name="httpd_password" value="" /&gt;
- &lt;input type="submit" name="login" value="Login" /&gt;
- &lt;input type="hidden" name="httpd_location" value="http://example.com/success.html" /&gt;
-&lt;/form&gt;</pre>
-</div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="inline" id="inline">Connexion � la vol�e</a></h2>
-
- <div class="warning"><h3>Avertissement</h3>
- <p>Il existe un risque, dans certaines circonstances, que le
- formulaire de connexion configur� pour une connexion � la vol�e
- soit soumis plusieurs fois, r�v�lant de ce fait les param�tres
- de connexion � l'application sous-jacente. L'administrateur doit
- s'assurer que cette derni�re est correctement s�curis�e afin
- d'�viter les �ventuels abus. En cas de doute, utilisez une page
- de connexion ind�pendante d�di�e.</p>
- </div>
-
- <p>Comme alternative � la page de connexion d�di�e pour un site
- web, il est possible de configurer <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>
- pour authentifier les utilisateurs � la vol�e, sans les rediriger
- vers une autre page, ce qui permet de conserver l'�tat de la page
- courante au cours de la tentative de connexion. Ceci peut s'av�rer
- utile dans le cas d'une session limit�e dans le temps, si le d�lai
- de la session a expir� pendant la requ�te de l'utilisateur. Ce
- dernier peut alors se r�authentifier � la m�me place, et
- poursuivre son activit� � partir du point o� il en �tait rest�.</p>
-
- <p>Si un utilisateur non authentifi� tente d'acc�der � une page
- prot�g�e par <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>, et si ce dernier
- n'est pas configur� avec une directive <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code>,
- un code de statut <var>HTTP_UNAUTHORIZED</var> est renvoy� vers le
- navigateur, indiquant � l'utilisateur qu'il n'est pas autoris� �
- acc�der � cette page.</p>
-
- <p>Pour configurer l'authentification � la vol�e, l'administrateur
- remplace le message d'erreur renvoy� par le code de statut
- <var>HTTP_UNAUTHORIZED</var> par un message d'erreur personnalis�
- contenant le formulaire de connexion comme suit :</p>
-
- <div class="example"><h3>Exemple simple d'authentification � la vol�e</h3><pre class="prettyprint lang-config">AuthFormProvider file
-ErrorDocument 401 /login.shtml
-AuthUserFile conf/passwd
-AuthType form
-AuthName realm
-AuthFormLoginRequiredLocation http://example.com/login.html
-Session On
-SessionCookieName session path=/
-SessionCryptoPassphrase secret</pre>
-</div>
-
- <p>La page du message d'erreur doit contenir un formulaire de
- connexion dont la propri�t� action est vide, comme dans l'exemple
- ci-dessous. Ceci a pour effet de soumettre le formulaire � l'URL
- prot�g�e originale, cette derni�re n'ayant pas besoin d'�tre
- connue de la page en cours.</p>
-
- <div class="example"><h3>Exemple de formulaire de connexion � la vol�e</h3><pre class="prettyprint lang-html">&lt;form method="POST" <strong>action=""</strong>&gt;
- Username: &lt;input type="text" name="httpd_username" value="" /&gt;
- Password: &lt;input type="password" name="httpd_password" value="" /&gt;
- &lt;input type="submit" name="login" value="Login" /&gt;
-&lt;/form&gt;</pre>
-</div>
-
- <p>Lorsque l'utilisateur final a entr� ses informations de
- connexion, le formulaire effectue une requ�te HTTP POST pour l'URL
- originale prot�g�e par mot de passe.
- <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> va alors intercepter cette requ�te
- POST, et dans le cas o� des champs HTML Utilisateur et Mot de
- passe corrects sont pr�sents, l'utilisateur sera connect�, et
- l'URL originale prot�g�e par mot de passe lui sera retourn�e en
- tant que requ�te GET.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="inlinepreservebody" id="inlinepreservebody">Connexion � la vol�e avec
- conservation du contenu</a></h2>
-
- <p>Il existe une limite � la technique de connexion � la vol�e
- d�crite ci-dessus ; si un formulaire HTML POST entra�ne une
- demande d'authentification ou de r�authentification, le contenu du
- formulaire original envoy� par le navigateur sera perdu. Cela peut
- s'av�rer plus ou moins g�nant pour l'utilisateur final selon la
- fonction du site web.</p>
-
- <p>Comme solution � ce probl�me, <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>
- permet d'int�grer la m�thode et le contenu de la requ�te originale
- dans le formulaire de connexion. Si l'authentification r�ussit,
- Apache httpd pourra refaire une tentative avec la m�thode et le contenu
- originaux, tout en conservant l'�tat de la requ�te originale.</p>
-
- <p>Pour mettre en oeuvre la conservation du contenu, vous devez
- ajouter trois champs suppl�mentaires au formulaire de connexion
- comme dans l'exemple suivant :</p>
-
- <div class="example"><h3>Exemple de formulaire avec conservation du
- contenu</h3><pre class="prettyprint lang-html">&lt;form method="POST" action=""&gt;
- Username: &lt;input type="text" name="httpd_username" value="" /&gt;
- Password: &lt;input type="password" name="httpd_password" value="" /&gt;
- &lt;input type="submit" name="login" value="Login" /&gt;
- <br /> <strong>&lt;input type="hidden" name="httpd_method" value="POST" /&gt;
- &lt;input type="hidden" name="httpd_mimetype" value="application/x-www-form-urlencoded" /&gt;
- &lt;input type="hidden" name="httpd_body" value="name1=value1&amp;name2=value2" /&gt;</strong><br />
-&lt;/form&gt;</pre>
-</div>
-
- <p>La mani�re dont la m�thode, le type MIME et le contenu de la
- requ�te originale seront int�gr�s dans le formulaire de connexion
- vont d�pendre de la plate-forme et de la technologie utilis�es au
- sein du site web.
- </p>
-
- <p>Une option consiste � utiliser le module
- <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> en association avec la directive
- <code class="directive"><a href="../mod/mod_request.html#keptbodysize">KeptBodySize</a></code>, ainsi
- qu'un script CGI adapt� pour int�grer les variables dans le
- formulaire.</p>
-
- <p>Une autre option consiste � pr�senter le formulaire de
- connexion en utilisant un script CGI ou une autre technologie
- dynamique.</p>
-
- <div class="example"><h3>Exemple avec script CGI</h3><pre class="prettyprint lang-config"> AuthFormProvider file
- ErrorDocument 401 /cgi-bin/login.cgi
- ...</pre>
-</div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="loggingout" id="loggingout">D�connexion</a></h2>
-
- <p>Pour permettre � un utilisateur de se d�connecter d'une session
- particuli�re, vous devez configurer une page pour qu'elle soit
- trait�e par le gestionnaire <var>form-logout-handler</var>. Tout
- acc�s � cette URL va entra�ner la suppression de l'Utilisateur et
- du Mot de passe de la session courante, ce qui aura pour effet de
- d�connecter l'utilisateur.</p>
-
- <p>Vous pouvez sp�cifier une URL vers laquelle le navigateur sera
- redirig� en cas de d�connection r�ussie, en d�finissant la
- directive <code class="directive"><a href="#authformlogoutlocation">AuthFormLogoutLocation</a></code>. Cette
- URL devra expliquer � l'utilisateur qu'il a �t� d�connect�, et lui
- donner la possibilit� de se connecter � nouveau.</p>
-
- <div class="example"><h3>Exemple simple de configuration de la
- d�connexion</h3><pre class="prettyprint lang-config">SetHandler form-logout-handler
-AuthName realm
-AuthFormLogoutLocation http://example.com/loggedout.html
-Session On
-SessionCookieName session path=/
-SessionCryptoPassphrase secret</pre>
-</div>
-
- <p>Notez que la d�connexion d'un utilisateur ne supprime pas la
- session ; elle supprime seulement l'utilisateur et le mot de passe
- de la session. Si la session qui en r�sulte est vide, elle sera
- probablement supprim�e, mais ce n'est pas garanti. Si vous voulez
- �tre s�r que la session sera supprim�e, affectez une valeur faible
- � la directive <code class="directive"><a href="../mod/mod_session.html#sessionmaxage">SessionMaxAge</a></code>, par exemple 1
- (affecter � cette directive la valeur z�ro signifie une session
- sans limite d'�ge).
- </p>
-
- <div class="example"><h3>Exemple simple avec dur�e de validit� de session
- limit�e</h3><pre class="prettyprint lang-config">SetHandler form-logout-handler
-AuthFormLogoutLocation http://example.com/loggedout.html
-Session On
-SessionMaxAge 1
-SessionCookieName session path=/
-SessionCryptoPassphrase secret</pre>
-</div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="urlencoding" id="urlencoding">Noms d'utilisateurs et mots de
- passe</a></h2>
- <p>Notez que la soumission d'un formulaire implique l'encodage URL
- (URLEncoding) des donn�es du formulaire, ici le nom d'utilisateur et
- le mot de passe. Vous devez donc choisir des noms d'utilisateurs et
- mots de passe qui ne contiennent pas de caract�res susceptibles
- d'�tre encod�s URL lors de la soumission du formulaire, sous peine
- d'obtenir des r�sultats inattendus.</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="authformauthoritative" id="authformauthoritative">Directive</a> <a name="AuthFormAuthoritative" id="AuthFormAuthoritative">AuthFormAuthoritative</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�termine si l'autorisation et l'authentification sont confi�s �
@@ -786,6 +497,295 @@ connexion</td></tr>
d'utilisateur qui sera utilis� pour la connexion.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="basicconfig" id="basicconfig">Configuration de base</a></h2>
+
+ <p>Pour prot�ger une URL particuli�re avec le module
+ <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>, vous devez d�terminer l'endroit o�
+ vous allez stocker votre <var>session</var>, ainsi que la m�thode
+ d'authentification. Dans cet exemple simple, les informations de
+ connexion sont stock�es dans une session � l'aide du module
+ <code class="module"><a href="../mod/mod_session_cookie.html">mod_session_cookie</a></code>, et l'authentification utilise
+ un fichier en s'appuyant sur le module
+ <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>. Si l'authentification �choue,
+ l'utilisateur dera redirig� vers la page du formulaire de
+ connexion.</p>
+
+ <div class="example"><h3>Exemple simple</h3><pre class="prettyprint lang-config">AuthFormProvider file
+AuthUserFile conf/passwd
+AuthType form
+AuthName realm
+AuthFormLoginRequiredLocation http://example.com/login.html
+Session On
+SessionCookieName session path=/
+SessionCryptoPassphrase secret</pre>
+</div>
+
+ <p>L'authentification <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> est activ�e
+ en affectant la valeur <var>form</var> � la directive <code class="directive"><a href="../mod/mod_authn_core.html#authtype">AuthType</a></code>. Les directives
+ <code class="directive"><a href="#authformprovider">AuthFormProvider</a></code> et
+ <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
+ sp�cifient que les noms d'utilisateurs et mots de passe seront
+ v�rifi�s en utilisant le fichier choisi.</p>
+
+ <p>Les directives <code class="directive"><a href="../mod/mod_session.html#session">Session</a></code>, <code class="directive"><a href="../mod/mod_session_cookie.html#sessioncookiename">SessionCookieName</a></code> et
+ <code class="directive"><a href="../mod/mod_session_crypto.html#sessioncryptopassphrase">SessionCryptoPassphrase</a></code>
+ cr�ent une session chiffr�e stock�e dans un cookie HTTP au niveau
+ du navigateur. Pour plus d'informations � propos des diff�rentes
+ options de configuration des sessions, reportez-vous � la
+ documentation du module <code class="module"><a href="../mod/mod_session.html">mod_session</a></code>.</p>
+
+ <p>Dans l'exemple simple ci-dessus, une URL a �t� prot�g�e par
+ <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>, mais on doit maintenant fournir
+ � l'utilisateur un moyen d'entrer un nom et un mot de passe. � cet
+ effet, on peut soit �crire une page de connexion ind�pendante
+ d�di�e, soit inclure le formulaire de connexion dans la page
+ courante.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="standalone" id="standalone">Page de connexion d�di�e</a></h2>
+
+ <p>Le formulaire de connexion peut �tre contenu dans une page
+ ind�pendante, ou �tre inclus dans la page courante. </p>
+
+ <p>Lorsque la connexion s'effectue � partir d'une page
+ ind�pendante et si la tentative d'authentification �choue,
+ l'utilisateur doit �tre redirig� vers un formulaire de connexion,
+ cr�� � cet effet sur le site web, en utilisant la directive
+ <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code>.
+ En g�n�ral, la page de connexion contiendra un formulaire HTML
+ demandant � l'utilisateur de fournir un nom et un mot de passe.</p>
+
+ <div class="example"><h3>Exemple de formulaire de connexion</h3><pre class="prettyprint lang-html">&lt;form method="POST" action="/dologin.html"&gt;
+ Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+ Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+ &lt;input type="submit" name="login" value="Login" /&gt;
+&lt;/form&gt;</pre>
+</div>
+
+ <p>La partie o� s'effectue la connexion proprement dite est
+ trait�e par le gestionnaire <var>form-login-handler</var>.
+ L'action de ce formulaire doit pointer vers ce gestionnaire, ce
+ que l'on configure dans Apache httpd comme suit :</p>
+
+ <div class="example"><h3>Exemple de configuration du gestionnaire de
+ formulaire de connexion</h3><pre class="prettyprint lang-config">&lt;Location /dologin.html&gt;
+ SetHandler form-login-handler
+ AuthFormLoginRequiredLocation http://example.com/login.html
+ AuthFormLoginSuccessLocation http://example.com/success.html
+ AuthFormProvider file
+ AuthUserFile conf/passwd
+ AuthType form
+ AuthName realm
+ Session On
+ SessionCookieName session path=/
+ SessionCryptoPassphrase secret
+&lt;/Location&gt;</pre>
+</div>
+
+ <p>L'URL sp�cifi�e par la directive
+ <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code>
+ r�f�rencera en g�n�ral une page expliquant � l'utilisateur que sa
+ tentative de connexion a �chou�, et qu'il doit la renouveler. La
+ directive <code class="directive"><a href="#authformloginsuccesslocation">AuthFormLoginSuccessLocation</a></code>
+ sp�cifie l'URL vers laquelle l'utilisateur doit �tre redirig� s'il
+ s'est authentifi� avec succ�s.</p>
+
+ <p>Alternativement, l'URL vers laquelle doit �tre redirig�
+ l'utilisateur s'il s'est authentifi� avec succ�s peut �tre
+ int�gr�e dans le formulaire de connexion, comme dans l'exemple
+ ci-dessous. Il en d�coule que le m�me gestionnaire
+ <var>form-login-handler</var> pourra �tre utilis� pour diff�rentes
+ zones du site web.</p>
+
+ <div class="example"><h3>Exemple de formulaire d'authentification multizone</h3><pre class="prettyprint lang-html">&lt;form method="POST" action="/dologin.html"&gt;
+ Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+ Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+ &lt;input type="submit" name="login" value="Login" /&gt;
+ &lt;input type="hidden" name="httpd_location" value="http://example.com/success.html" /&gt;
+&lt;/form&gt;</pre>
+</div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="inline" id="inline">Connexion � la vol�e</a></h2>
+
+ <div class="warning"><h3>Avertissement</h3>
+ <p>Il existe un risque, dans certaines circonstances, que le
+ formulaire de connexion configur� pour une connexion � la vol�e
+ soit soumis plusieurs fois, r�v�lant de ce fait les param�tres
+ de connexion � l'application sous-jacente. L'administrateur doit
+ s'assurer que cette derni�re est correctement s�curis�e afin
+ d'�viter les �ventuels abus. En cas de doute, utilisez une page
+ de connexion ind�pendante d�di�e.</p>
+ </div>
+
+ <p>Comme alternative � la page de connexion d�di�e pour un site
+ web, il est possible de configurer <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>
+ pour authentifier les utilisateurs � la vol�e, sans les rediriger
+ vers une autre page, ce qui permet de conserver l'�tat de la page
+ courante au cours de la tentative de connexion. Ceci peut s'av�rer
+ utile dans le cas d'une session limit�e dans le temps, si le d�lai
+ de la session a expir� pendant la requ�te de l'utilisateur. Ce
+ dernier peut alors se r�authentifier � la m�me place, et
+ poursuivre son activit� � partir du point o� il en �tait rest�.</p>
+
+ <p>Si un utilisateur non authentifi� tente d'acc�der � une page
+ prot�g�e par <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>, et si ce dernier
+ n'est pas configur� avec une directive <code class="directive"><a href="#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code>,
+ un code de statut <var>HTTP_UNAUTHORIZED</var> est renvoy� vers le
+ navigateur, indiquant � l'utilisateur qu'il n'est pas autoris� �
+ acc�der � cette page.</p>
+
+ <p>Pour configurer l'authentification � la vol�e, l'administrateur
+ remplace le message d'erreur renvoy� par le code de statut
+ <var>HTTP_UNAUTHORIZED</var> par un message d'erreur personnalis�
+ contenant le formulaire de connexion comme suit :</p>
+
+ <div class="example"><h3>Exemple simple d'authentification � la vol�e</h3><pre class="prettyprint lang-config">AuthFormProvider file
+ErrorDocument 401 /login.shtml
+AuthUserFile conf/passwd
+AuthType form
+AuthName realm
+AuthFormLoginRequiredLocation http://example.com/login.html
+Session On
+SessionCookieName session path=/
+SessionCryptoPassphrase secret</pre>
+</div>
+
+ <p>La page du message d'erreur doit contenir un formulaire de
+ connexion dont la propri�t� action est vide, comme dans l'exemple
+ ci-dessous. Ceci a pour effet de soumettre le formulaire � l'URL
+ prot�g�e originale, cette derni�re n'ayant pas besoin d'�tre
+ connue de la page en cours.</p>
+
+ <div class="example"><h3>Exemple de formulaire de connexion � la vol�e</h3><pre class="prettyprint lang-html">&lt;form method="POST" <strong>action=""</strong>&gt;
+ Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+ Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+ &lt;input type="submit" name="login" value="Login" /&gt;
+&lt;/form&gt;</pre>
+</div>
+
+ <p>Lorsque l'utilisateur final a entr� ses informations de
+ connexion, le formulaire effectue une requ�te HTTP POST pour l'URL
+ originale prot�g�e par mot de passe.
+ <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> va alors intercepter cette requ�te
+ POST, et dans le cas o� des champs HTML Utilisateur et Mot de
+ passe corrects sont pr�sents, l'utilisateur sera connect�, et
+ l'URL originale prot�g�e par mot de passe lui sera retourn�e en
+ tant que requ�te GET.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="inlinepreservebody" id="inlinepreservebody">Connexion � la vol�e avec
+ conservation du contenu</a></h2>
+
+ <p>Il existe une limite � la technique de connexion � la vol�e
+ d�crite ci-dessus ; si un formulaire HTML POST entra�ne une
+ demande d'authentification ou de r�authentification, le contenu du
+ formulaire original envoy� par le navigateur sera perdu. Cela peut
+ s'av�rer plus ou moins g�nant pour l'utilisateur final selon la
+ fonction du site web.</p>
+
+ <p>Comme solution � ce probl�me, <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>
+ permet d'int�grer la m�thode et le contenu de la requ�te originale
+ dans le formulaire de connexion. Si l'authentification r�ussit,
+ Apache httpd pourra refaire une tentative avec la m�thode et le contenu
+ originaux, tout en conservant l'�tat de la requ�te originale.</p>
+
+ <p>Pour mettre en oeuvre la conservation du contenu, vous devez
+ ajouter trois champs suppl�mentaires au formulaire de connexion
+ comme dans l'exemple suivant :</p>
+
+ <div class="example"><h3>Exemple de formulaire avec conservation du
+ contenu</h3><pre class="prettyprint lang-html">&lt;form method="POST" action=""&gt;
+ Username: &lt;input type="text" name="httpd_username" value="" /&gt;
+ Password: &lt;input type="password" name="httpd_password" value="" /&gt;
+ &lt;input type="submit" name="login" value="Login" /&gt;
+ <br /> <strong>&lt;input type="hidden" name="httpd_method" value="POST" /&gt;
+ &lt;input type="hidden" name="httpd_mimetype" value="application/x-www-form-urlencoded" /&gt;
+ &lt;input type="hidden" name="httpd_body" value="name1=value1&amp;name2=value2" /&gt;</strong><br />
+&lt;/form&gt;</pre>
+</div>
+
+ <p>La mani�re dont la m�thode, le type MIME et le contenu de la
+ requ�te originale seront int�gr�s dans le formulaire de connexion
+ vont d�pendre de la plate-forme et de la technologie utilis�es au
+ sein du site web.
+ </p>
+
+ <p>Une option consiste � utiliser le module
+ <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> en association avec la directive
+ <code class="directive"><a href="../mod/mod_request.html#keptbodysize">KeptBodySize</a></code>, ainsi
+ qu'un script CGI adapt� pour int�grer les variables dans le
+ formulaire.</p>
+
+ <p>Une autre option consiste � pr�senter le formulaire de
+ connexion en utilisant un script CGI ou une autre technologie
+ dynamique.</p>
+
+ <div class="example"><h3>Exemple avec script CGI</h3><pre class="prettyprint lang-config"> AuthFormProvider file
+ ErrorDocument 401 /cgi-bin/login.cgi
+ ...</pre>
+</div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="loggingout" id="loggingout">D�connexion</a></h2>
+
+ <p>Pour permettre � un utilisateur de se d�connecter d'une session
+ particuli�re, vous devez configurer une page pour qu'elle soit
+ trait�e par le gestionnaire <var>form-logout-handler</var>. Tout
+ acc�s � cette URL va entra�ner la suppression de l'Utilisateur et
+ du Mot de passe de la session courante, ce qui aura pour effet de
+ d�connecter l'utilisateur.</p>
+
+ <p>Vous pouvez sp�cifier une URL vers laquelle le navigateur sera
+ redirig� en cas de d�connection r�ussie, en d�finissant la
+ directive <code class="directive"><a href="#authformlogoutlocation">AuthFormLogoutLocation</a></code>. Cette
+ URL devra expliquer � l'utilisateur qu'il a �t� d�connect�, et lui
+ donner la possibilit� de se connecter � nouveau.</p>
+
+ <div class="example"><h3>Exemple simple de configuration de la
+ d�connexion</h3><pre class="prettyprint lang-config">SetHandler form-logout-handler
+AuthName realm
+AuthFormLogoutLocation http://example.com/loggedout.html
+Session On
+SessionCookieName session path=/
+SessionCryptoPassphrase secret</pre>
+</div>
+
+ <p>Notez que la d�connexion d'un utilisateur ne supprime pas la
+ session ; elle supprime seulement l'utilisateur et le mot de passe
+ de la session. Si la session qui en r�sulte est vide, elle sera
+ probablement supprim�e, mais ce n'est pas garanti. Si vous voulez
+ �tre s�r que la session sera supprim�e, affectez une valeur faible
+ � la directive <code class="directive"><a href="../mod/mod_session.html#sessionmaxage">SessionMaxAge</a></code>, par exemple 1
+ (affecter � cette directive la valeur z�ro signifie une session
+ sans limite d'�ge).
+ </p>
+
+ <div class="example"><h3>Exemple simple avec dur�e de validit� de session
+ limit�e</h3><pre class="prettyprint lang-config">SetHandler form-logout-handler
+AuthFormLogoutLocation http://example.com/loggedout.html
+Session On
+SessionMaxAge 1
+SessionCookieName session path=/
+SessionCryptoPassphrase secret</pre>
+</div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="urlencoding" id="urlencoding">Noms d'utilisateurs et mots de
+ passe</a></h2>
+ <p>Notez que la soumission d'un formulaire implique l'encodage URL
+ (URLEncoding) des donn�es du formulaire, ici le nom d'utilisateur et
+ le mot de passe. Vous devez donc choisir des noms d'utilisateurs et
+ mots de passe qui ne contiennent pas de caract�res susceptibles
+ d'�tre encod�s URL lors de la soumission du formulaire, sous peine
+ d'obtenir des r�sultats inattendus.</p>
+ </div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_auth_form.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_anon.html.en b/docs/manual/mod/mod_authn_anon.html.en
index 2b5d57399b..c023922b9e 100644
--- a/docs/manual/mod/mod_authn_anon.html.en
+++ b/docs/manual/mod/mod_authn_anon.html.en
@@ -68,49 +68,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#example">Example</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="example" id="example">Example</a></h2>
- <p>The example below is combined with "normal" htpasswd-file based
- authentication and allows users in additionally as 'guests' with the
- following properties:</p>
-
- <ul>
- <li>It insists that the user enters a userID.
- (<code class="directive"><a href="#anonymous_nouserid">Anonymous_NoUserID</a></code>)</li>
-
- <li>It insists that the user enters a password.
- (<code class="directive"><a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></code>)</li>
-
- <li>The password entered must be a valid email address, <em>i.e.</em>
- contain at least one '@' and a '.'.
- (<code class="directive"><a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></code>)</li>
-
- <li>The userID must be one of <code>anonymous guest www test
- welcome</code> and comparison is <strong>not</strong> case
- sensitive. (<code class="directive"><a href="#anonymous">Anonymous</a></code>)</li>
-
- <li>And the Email addresses entered in the passwd field are
- logged to the error log file.
- (<code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>)</li>
- </ul>
-
- <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">&lt;Directory "/var/www/html/private"&gt;
- AuthName "Use 'anonymous' &amp; Email address for guest entry"
- 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
-&lt;/Directory&gt;</pre>
-</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="Anonymous" id="Anonymous">Anonymous</a> <a name="anonymous" id="anonymous">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies userIDs that are allowed access without
@@ -210,6 +167,49 @@ formatted email address</td></tr>
addresses (see the above <code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>).</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="example" id="example">Example</a></h2>
+ <p>The example below is combined with "normal" htpasswd-file based
+ authentication and allows users in additionally as 'guests' with the
+ following properties:</p>
+
+ <ul>
+ <li>It insists that the user enters a userID.
+ (<code class="directive"><a href="#anonymous_nouserid">Anonymous_NoUserID</a></code>)</li>
+
+ <li>It insists that the user enters a password.
+ (<code class="directive"><a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></code>)</li>
+
+ <li>The password entered must be a valid email address, <em>i.e.</em>
+ contain at least one '@' and a '.'.
+ (<code class="directive"><a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></code>)</li>
+
+ <li>The userID must be one of <code>anonymous guest www test
+ welcome</code> and comparison is <strong>not</strong> case
+ sensitive. (<code class="directive"><a href="#anonymous">Anonymous</a></code>)</li>
+
+ <li>And the Email addresses entered in the passwd field are
+ logged to the error log file.
+ (<code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>)</li>
+ </ul>
+
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">&lt;Directory "/var/www/html/private"&gt;
+ AuthName "Use 'anonymous' &amp; Email address for guest entry"
+ 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
+&lt;/Directory&gt;</pre>
+</div>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authn_anon.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_anon.html.fr b/docs/manual/mod/mod_authn_anon.html.fr
index e3cd69bd46..66b19f8a2c 100644
--- a/docs/manual/mod/mod_authn_anon.html.fr
+++ b/docs/manual/mod/mod_authn_anon.html.fr
@@ -73,51 +73,6 @@ prot�g�es</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#example">Exemple</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="example" id="example">Exemple</a></h2>
- <p>L'exemple ci-dessous pr�sente un exemple de combinaison avec
- l'authentification � base de fichier htpasswd "normale", et permet
- la connexion d'utilisateurs en tant qu'invit�s avec les propri�t�s
- suivantes :</p>
-
- <ul>
- <li>Il incite l'utilisateur � fournir un identifiant.
- (<code class="directive"><a href="#anonymous_nouserid">Anonymous_NoUserID</a></code>)</li>
-
- <li>Il incite l'utilisateur � fournir un mot de passe.
- (<code class="directive"><a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></code>)</li>
-
- <li>Le mot de passe fourni doit �tre une adresse email valide,
- c'est � dire contenant au moins un '@' et un '.'.
- (<code class="directive"><a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></code>)</li>
-
- <li>Les valeurs possibles pour l'identifiant utilisateur sont
- <code>anonymous, guest, www, test ou welcome</code>, et la
- v�rification n'est <strong>pas</strong> sensible � la casse.
- (<code class="directive"><a href="#anonymous">Anonymous</a></code>)</li>
-
- <li>Les adresses email entr�es dans le champ passwd sont
- enregistr�es dans le fichier journal des erreurs.
- (<code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>)</li>
- </ul>
-
- <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">&lt;Directory /var/www/html/private&gt;
- AuthName "Use 'anonymous' &amp; Email address for guest entry"
- 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
-&lt;/Directory&gt;</pre>
-</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="anonymous" id="anonymous">Directive</a> <a name="Anonymous" id="Anonymous">Anonymous</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit la liste des identifiants utilisateur autoris�s �
@@ -227,6 +182,51 @@ email fournie comme mot de passe est correct</td></tr>
valides (voir ci-dessus la directive <code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>).</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="example" id="example">Exemple</a></h2>
+ <p>L'exemple ci-dessous pr�sente un exemple de combinaison avec
+ l'authentification � base de fichier htpasswd "normale", et permet
+ la connexion d'utilisateurs en tant qu'invit�s avec les propri�t�s
+ suivantes :</p>
+
+ <ul>
+ <li>Il incite l'utilisateur � fournir un identifiant.
+ (<code class="directive"><a href="#anonymous_nouserid">Anonymous_NoUserID</a></code>)</li>
+
+ <li>Il incite l'utilisateur � fournir un mot de passe.
+ (<code class="directive"><a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></code>)</li>
+
+ <li>Le mot de passe fourni doit �tre une adresse email valide,
+ c'est � dire contenant au moins un '@' et un '.'.
+ (<code class="directive"><a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></code>)</li>
+
+ <li>Les valeurs possibles pour l'identifiant utilisateur sont
+ <code>anonymous, guest, www, test ou welcome</code>, et la
+ v�rification n'est <strong>pas</strong> sensible � la casse.
+ (<code class="directive"><a href="#anonymous">Anonymous</a></code>)</li>
+
+ <li>Les adresses email entr�es dans le champ passwd sont
+ enregistr�es dans le fichier journal des erreurs.
+ (<code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>)</li>
+ </ul>
+
+ <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">&lt;Directory /var/www/html/private&gt;
+ AuthName "Use 'anonymous' &amp; Email address for guest entry"
+ 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
+&lt;/Directory&gt;</pre>
+</div>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authn_anon.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_anon.html.ja.utf8 b/docs/manual/mod/mod_authn_anon.html.ja.utf8
index 69e1c4def8..0e8009e9ac 100644
--- a/docs/manual/mod/mod_authn_anon.html.ja.utf8
+++ b/docs/manual/mod/mod_authn_anon.html.ja.utf8
@@ -73,49 +73,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#example">例</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="example" id="example">例</a></h2>
- <p>以下の例は「普通」の htpasswd ファイルに基づいた認証と組み合わされて
- おり、以下の要件を見たすユーザを「ゲスト」として許可します:</p>
-
- <ul>
- <li>ユーザは userID を入力しなければなりません。
- (<code class="directive"><a href="#anonymous_nouserid">Anonymous_NoUserID</a></code>)</li>
-
- <li>ユーザはパスワードを入力しなければなりません。
- (<code class="directive"><a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></code>)</li>
-
- <li>入力されたパスワードは有効な電子メールアドレスでなければ
- なりません。<em>すなわち</em>、少くとも一つの '@' と '.' が
- 含まれている必要があります。
- (<code class="directive"><a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></code>)</li>
-
- <li>userID は <code>anonymous guest www test
- welcome</code> のどれかでなければなりません。
- ユーザ名の比較は大文字小文字を区別<strong>しません。</strong></li>
-
- <li>パスワード欄に入力された電子メールアドレスはエラーログファイルに
- ロギングされます。
- (<code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>)</li>
- </ul>
-
- <div class="example"><h3>例</h3><pre class="prettyprint lang-config">&lt;Directory /var/www/html/private&gt;
- AuthName "Use 'anonymous' &amp; Email address for guest entry"
- 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
-&lt;/Directory&gt;</pre>
-</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="Anonymous" id="Anonymous">Anonymous</a> <a name="anonymous" id="anonymous">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>パスワードの検査無しでアクセスを許可する userID を指定する
@@ -214,6 +171,49 @@
(上の <code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code> 参照)。</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="example" id="example">例</a></h2>
+ <p>以下の例は「普通」の htpasswd ファイルに基づいた認証と組み合わされて
+ おり、以下の要件を見たすユーザを「ゲスト」として許可します:</p>
+
+ <ul>
+ <li>ユーザは userID を入力しなければなりません。
+ (<code class="directive"><a href="#anonymous_nouserid">Anonymous_NoUserID</a></code>)</li>
+
+ <li>ユーザはパスワードを入力しなければなりません。
+ (<code class="directive"><a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></code>)</li>
+
+ <li>入力されたパスワードは有効な電子メールアドレスでなければ
+ なりません。<em>すなわち</em>、少くとも一つの '@' と '.' が
+ 含まれている必要があります。
+ (<code class="directive"><a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></code>)</li>
+
+ <li>userID は <code>anonymous guest www test
+ welcome</code> のどれかでなければなりません。
+ ユーザ名の比較は大文字小文字を区別<strong>しません。</strong></li>
+
+ <li>パスワード欄に入力された電子メールアドレスはエラーログファイルに
+ ロギングされます。
+ (<code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>)</li>
+ </ul>
+
+ <div class="example"><h3>例</h3><pre class="prettyprint lang-config">&lt;Directory /var/www/html/private&gt;
+ AuthName "Use 'anonymous' &amp; Email address for guest entry"
+ 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
+&lt;/Directory&gt;</pre>
+</div>
+</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_authn_anon.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_anon.html.ko.euc-kr b/docs/manual/mod/mod_authn_anon.html.ko.euc-kr
index 0912ddeea5..7a3dd9b7cc 100644
--- a/docs/manual/mod/mod_authn_anon.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authn_anon.html.ko.euc-kr
@@ -66,51 +66,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#example">����</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="example" id="example">����</a></h2>
- <p>���� ���� "�Ϲ�����" htpasswd-���ϱ�� ������ �߰���
- ����ڰ� ���� ������ �����Ѵٸ� '�մ�(guest)'���� ������
- �� �ֵ��� �Ѵ�:</p>
-
- <ul>
- <li>����ڴ� ����� ���̵� �Է��ؾ� �Ѵ�. (<code class="directive"><a href="#anonymous_nouserid">Anonymous_NoUserID</a></code>)</li>
-
- <li>����ڴ� ��ȣ�� �Է��ؾ� �Ѵ�. (<code class="directive"><a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></code>)</li>
-
- <li>��ȣ�� ��ȿ�� ���ڿ��� �ּҸ� �Է��ؾ� �Ѵ�. <em>����
- ���</em> �ּ��� '@'�� '.' �Ѱ��� �����ؾ� �Ѵ�. (<code class="directive"><a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></code>)</li>
-
- <li>����� ���̵�� <code>anonymous guest www test
- welcome</code> �� �ϳ��̸�, ��ҹ��ڸ� ��������
- <strong>�ʴ´�</strong>. (<code class="directive"><a href="#anonymous">Anonymous</a></code>)</li>
-
- <li>�׸��� ��ȣ�� �Է��� ���ڿ��� �ּҸ� �����α����Ͽ�
- ����Ѵ�. (<code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>)</li>
- </ul>
-
- <div class="example"><h3>����</h3><p><code>
- &lt;Directory /foo&gt;
- <span class="indent">
- AuthName "�մ����� �湮�Ϸ��� 'anonymous'�� ���ڿ��� �ּҸ� ����϶�"<br />
- AuthType Basic<br />
- AuthBasicProvider file anon<br />
- AuthUserFile /path/to/your/.htpasswd<br />
- <br />
- Anonymous_NoUserID off<br />
- Anonymous_MustGiveEmail on<br />
- Anonymous_VerifyEmail on<br />
- Anonymous_LogEmail on<br />
- Anonymous anonymous guest www test welcome<br />
- <br />
- Order Deny,Allow<br />
- Allow from all<br />
- <br />
- Require valid-user<br />
- </span>
- &lt;/Directory&gt;
- </code></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="Anonymous" id="Anonymous">Anonymous</a> <a name="anonymous" id="anonymous">���þ�</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">����:</a></th><td>��ȣ�˻���� ������ ����� ����� ���̵����
@@ -206,6 +161,51 @@
�����ϴ��� �˻��Ѵ� (���� <code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code> ����).</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="example" id="example">����</a></h2>
+ <p>���� ���� "�Ϲ�����" htpasswd-���ϱ�� ������ �߰���
+ ����ڰ� ���� ������ �����Ѵٸ� '�մ�(guest)'���� ������
+ �� �ֵ��� �Ѵ�:</p>
+
+ <ul>
+ <li>����ڴ� ����� ���̵� �Է��ؾ� �Ѵ�. (<code class="directive"><a href="#anonymous_nouserid">Anonymous_NoUserID</a></code>)</li>
+
+ <li>����ڴ� ��ȣ�� �Է��ؾ� �Ѵ�. (<code class="directive"><a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></code>)</li>
+
+ <li>��ȣ�� ��ȿ�� ���ڿ��� �ּҸ� �Է��ؾ� �Ѵ�. <em>����
+ ���</em> �ּ��� '@'�� '.' �Ѱ��� �����ؾ� �Ѵ�. (<code class="directive"><a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></code>)</li>
+
+ <li>����� ���̵�� <code>anonymous guest www test
+ welcome</code> �� �ϳ��̸�, ��ҹ��ڸ� ��������
+ <strong>�ʴ´�</strong>. (<code class="directive"><a href="#anonymous">Anonymous</a></code>)</li>
+
+ <li>�׸��� ��ȣ�� �Է��� ���ڿ��� �ּҸ� �����α����Ͽ�
+ ����Ѵ�. (<code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>)</li>
+ </ul>
+
+ <div class="example"><h3>����</h3><p><code>
+ &lt;Directory /foo&gt;
+ <span class="indent">
+ AuthName "�մ����� �湮�Ϸ��� 'anonymous'�� ���ڿ��� �ּҸ� ����϶�"<br />
+ AuthType Basic<br />
+ AuthBasicProvider file anon<br />
+ AuthUserFile /path/to/your/.htpasswd<br />
+ <br />
+ Anonymous_NoUserID off<br />
+ Anonymous_MustGiveEmail on<br />
+ Anonymous_VerifyEmail on<br />
+ Anonymous_LogEmail on<br />
+ Anonymous anonymous guest www test welcome<br />
+ <br />
+ Order Deny,Allow<br />
+ Allow from all<br />
+ <br />
+ Require valid-user<br />
+ </span>
+ &lt;/Directory&gt;
+ </code></p></div>
+</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_authn_anon.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_core.html.en b/docs/manual/mod/mod_authn_core.html.en
index c218b3955a..09d40860b8 100644
--- a/docs/manual/mod/mod_authn_core.html.en
+++ b/docs/manual/mod/mod_authn_core.html.en
@@ -50,78 +50,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#authnalias">Creating Authentication Provider Aliases</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="authnalias" id="authnalias">Creating Authentication Provider Aliases</a></h2>
-
- <p>Extended authentication providers can be created
- within the configuration file and assigned an alias name. The alias
- providers can then be referenced through the directives
- <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> or
- <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code> in
- the same way as a base authentication provider. Besides the ability
- to create and alias an extended provider, it also allows the same
- extended authentication provider to be reference by multiple
- locations.</p>
-
- <h3><a name="example" id="example">Examples</a></h3>
-
- <p>This example checks for passwords in two different text
- files.</p>
-
- <div class="example"><h3>Checking multiple text password files</h3><pre class="prettyprint lang-config"># Check here first
-&lt;AuthnProviderAlias file file1&gt;
- AuthUserFile "/www/conf/passwords1"
-&lt;/AuthnProviderAlias&gt;
-
-# Then check here
-&lt;AuthnProviderAlias file file2&gt;
- AuthUserFile "/www/conf/passwords2"
-&lt;/AuthnProviderAlias&gt;
-
-&lt;Directory "/var/web/pages/secure"&gt;
- AuthBasicProvider file1 file2
-
- AuthType Basic
- AuthName "Protected Area"
- Require valid-user
-&lt;/Directory&gt;</pre>
-</div>
-
- <p>The example below creates two different ldap authentication
- provider aliases based on the ldap provider. This allows
- a single authenticated location to be serviced by multiple ldap
- hosts:</p>
-
- <div class="example"><h3>Checking multiple LDAP servers</h3><pre class="prettyprint lang-config">&lt;AuthnProviderAlias ldap ldap-alias1&gt;
- AuthLDAPBindDN cn=youruser,o=ctx
- AuthLDAPBindPassword yourpassword
- AuthLDAPURL ldap://ldap.host/o=ctx
-&lt;/AuthnProviderAlias&gt;
-&lt;AuthnProviderAlias ldap ldap-other-alias&gt;
- AuthLDAPBindDN cn=yourotheruser,o=dev
- AuthLDAPBindPassword yourotherpassword
- AuthLDAPURL ldap://other.ldap.host/o=dev?cn
-&lt;/AuthnProviderAlias&gt;
-
-Alias "/secure" "/webpages/secure"
-&lt;Directory "/webpages/secure"&gt;
- 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
- # AuthnProviderAlias does not provide the config to authorization providers
- # that are implemented in the same module as the authentication provider.
-&lt;/Directory&gt;</pre>
-</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="AuthName" id="AuthName">AuthName</a> <a name="authname" id="authname">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Authorization realm for use in HTTP
@@ -237,6 +165,78 @@ the specified alias</td></tr>
and Access Control</a></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="authnalias" id="authnalias">Creating Authentication Provider Aliases</a></h2>
+
+ <p>Extended authentication providers can be created
+ within the configuration file and assigned an alias name. The alias
+ providers can then be referenced through the directives
+ <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> or
+ <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code> in
+ the same way as a base authentication provider. Besides the ability
+ to create and alias an extended provider, it also allows the same
+ extended authentication provider to be reference by multiple
+ locations.</p>
+
+ <h3><a name="example" id="example">Examples</a></h3>
+
+ <p>This example checks for passwords in two different text
+ files.</p>
+
+ <div class="example"><h3>Checking multiple text password files</h3><pre class="prettyprint lang-config"># Check here first
+&lt;AuthnProviderAlias file file1&gt;
+ AuthUserFile "/www/conf/passwords1"
+&lt;/AuthnProviderAlias&gt;
+
+# Then check here
+&lt;AuthnProviderAlias file file2&gt;
+ AuthUserFile "/www/conf/passwords2"
+&lt;/AuthnProviderAlias&gt;
+
+&lt;Directory "/var/web/pages/secure"&gt;
+ AuthBasicProvider file1 file2
+
+ AuthType Basic
+ AuthName "Protected Area"
+ Require valid-user
+&lt;/Directory&gt;</pre>
+</div>
+
+ <p>The example below creates two different ldap authentication
+ provider aliases based on the ldap provider. This allows
+ a single authenticated location to be serviced by multiple ldap
+ hosts:</p>
+
+ <div class="example"><h3>Checking multiple LDAP servers</h3><pre class="prettyprint lang-config">&lt;AuthnProviderAlias ldap ldap-alias1&gt;
+ AuthLDAPBindDN cn=youruser,o=ctx
+ AuthLDAPBindPassword yourpassword
+ AuthLDAPURL ldap://ldap.host/o=ctx
+&lt;/AuthnProviderAlias&gt;
+&lt;AuthnProviderAlias ldap ldap-other-alias&gt;
+ AuthLDAPBindDN cn=yourotheruser,o=dev
+ AuthLDAPBindPassword yourotherpassword
+ AuthLDAPURL ldap://other.ldap.host/o=dev?cn
+&lt;/AuthnProviderAlias&gt;
+
+Alias "/secure" "/webpages/secure"
+&lt;Directory "/webpages/secure"&gt;
+ 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
+ # AuthnProviderAlias does not provide the config to authorization providers
+ # that are implemented in the same module as the authentication provider.
+&lt;/Directory&gt;</pre>
+</div>
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authn_core.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_core.html.fr b/docs/manual/mod/mod_authn_core.html.fr
index 99cde1e077..16d9359081 100644
--- a/docs/manual/mod/mod_authn_core.html.fr
+++ b/docs/manual/mod/mod_authn_core.html.fr
@@ -54,84 +54,6 @@
d'authentification</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="authnalias" id="authnalias">Cr�ation d'alias de fournisseurs
-d'authentification</a></h2>
-
- <p>Il est possible de cr�er des fournisseurs d'authentification
- �tendus dans le fichier de configuration et de leur assigner un
- alias. Le fournisseur ainsi nomm� peut alors �tre r�f�renc� � l'aide
- des directives <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> ou <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code> tout comme
- un fournisseur d'authentification de base. Outre la possibilit� de
- cr�er et attribuer un alias � un fournisseur �tendu, le m�me
- fournisseur d'authentification peut aussi �tre r�f�renc� par
- plusieurs sections relatives � une zone du site web.</p>
-
- <h3><a name="example" id="example">Exemples</a></h3>
-
- <p>Cet exemple v�rifie les mots de passe dans deux fichiers
- textes diff�rents.</p>
-
- <div class="example"><h3>V�rification dans plusieurs fichiers de mots de
- passe au format texte</h3><pre class="prettyprint lang-config"># Premi�re v�rification
-&lt;AuthnProviderAlias file file1&gt;
- AuthUserFile /www/conf/passwords1
-&lt;/AuthnProviderAlias&gt;
-
-# V�rification suivante
-&lt;AuthnProviderAlias file file2&gt;
- AuthUserFile /www/conf/passwords2
-&lt;/AuthnProviderAlias&gt;
-
-&lt;Directory /var/web/pages/secure&gt;
- AuthBasicProvider file1 file2
-
- AuthType Basic
- AuthName "Protected Area"
- Require valid-user
-&lt;/Directory&gt;</pre>
-</div>
-
-
-
- <p>Dans l'exemple ci-dessous, deux fournisseurs
- d'authentification ldap sont cr��s � partir du fournisseur ldap
- de base, et se voient attribuer un alias. L'authentification
- d'une m�me zone peut alors �tre trait�e par plusieurs serveurs
- ldap :</p>
-
- <div class="example"><h3>V�rification aupr�s de plusieurs serveurs
- LDAP</h3><pre class="prettyprint lang-config">&lt;AuthnProviderAlias ldap ldap-alias1&gt;
- AuthLDAPBindDN cn=youruser,o=ctx
- AuthLDAPBindPassword yourpassword
- AuthLDAPURL ldap://ldap.host/o=ctx
- &lt;/AuthnProviderAlias&gt;
- &lt;AuthnProviderAlias ldap ldap-other-alias&gt;
- AuthLDAPBindDN cn=yourotheruser,o=dev
- AuthLDAPBindPassword yourotherpassword
- AuthLDAPURL ldap://other.ldap.host/o=dev?cn
-&lt;/AuthnProviderAlias&gt;
-
-Alias /secure /webpages/secure
-&lt;Directory /webpages/secure&gt;
- Order deny,allow
- Allow from all
-
- AuthBasicProvider ldap-other-alias ldap-alias1
-
- AuthType Basic
- AuthName LDAP_Protected Place
- Require valid-user
- # Notez que Require ldap-* ne fonctionnerait pas ici, car
- # AuthnProviderAlias ne fournit pas de configuration pour les
- # fournisseurs d'autorisation impl�ment�s dans le m�me module que le
- # fournisseur d'authentification.
-&lt;/Directory&gt;</pre>
-</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="authname" id="authname">Directive</a> <a name="AuthName" id="AuthName">AuthName</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>L'identifiant de l'autorisation � utiliser avec
@@ -251,6 +173,84 @@ l'alias sp�cifi�</td></tr>
d'acc�s</a></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="authnalias" id="authnalias">Cr�ation d'alias de fournisseurs
+d'authentification</a></h2>
+
+ <p>Il est possible de cr�er des fournisseurs d'authentification
+ �tendus dans le fichier de configuration et de leur assigner un
+ alias. Le fournisseur ainsi nomm� peut alors �tre r�f�renc� � l'aide
+ des directives <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> ou <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code> tout comme
+ un fournisseur d'authentification de base. Outre la possibilit� de
+ cr�er et attribuer un alias � un fournisseur �tendu, le m�me
+ fournisseur d'authentification peut aussi �tre r�f�renc� par
+ plusieurs sections relatives � une zone du site web.</p>
+
+ <h3><a name="example" id="example">Exemples</a></h3>
+
+ <p>Cet exemple v�rifie les mots de passe dans deux fichiers
+ textes diff�rents.</p>
+
+ <div class="example"><h3>V�rification dans plusieurs fichiers de mots de
+ passe au format texte</h3><pre class="prettyprint lang-config"># Premi�re v�rification
+&lt;AuthnProviderAlias file file1&gt;
+ AuthUserFile /www/conf/passwords1
+&lt;/AuthnProviderAlias&gt;
+
+# V�rification suivante
+&lt;AuthnProviderAlias file file2&gt;
+ AuthUserFile /www/conf/passwords2
+&lt;/AuthnProviderAlias&gt;
+
+&lt;Directory /var/web/pages/secure&gt;
+ AuthBasicProvider file1 file2
+
+ AuthType Basic
+ AuthName "Protected Area"
+ Require valid-user
+&lt;/Directory&gt;</pre>
+</div>
+
+
+
+ <p>Dans l'exemple ci-dessous, deux fournisseurs
+ d'authentification ldap sont cr��s � partir du fournisseur ldap
+ de base, et se voient attribuer un alias. L'authentification
+ d'une m�me zone peut alors �tre trait�e par plusieurs serveurs
+ ldap :</p>
+
+ <div class="example"><h3>V�rification aupr�s de plusieurs serveurs
+ LDAP</h3><pre class="prettyprint lang-config">&lt;AuthnProviderAlias ldap ldap-alias1&gt;
+ AuthLDAPBindDN cn=youruser,o=ctx
+ AuthLDAPBindPassword yourpassword
+ AuthLDAPURL ldap://ldap.host/o=ctx
+ &lt;/AuthnProviderAlias&gt;
+ &lt;AuthnProviderAlias ldap ldap-other-alias&gt;
+ AuthLDAPBindDN cn=yourotheruser,o=dev
+ AuthLDAPBindPassword yourotherpassword
+ AuthLDAPURL ldap://other.ldap.host/o=dev?cn
+&lt;/AuthnProviderAlias&gt;
+
+Alias /secure /webpages/secure
+&lt;Directory /webpages/secure&gt;
+ Order deny,allow
+ Allow from all
+
+ AuthBasicProvider ldap-other-alias ldap-alias1
+
+ AuthType Basic
+ AuthName LDAP_Protected Place
+ Require valid-user
+ # Notez que Require ldap-* ne fonctionnerait pas ici, car
+ # AuthnProviderAlias ne fournit pas de configuration pour les
+ # fournisseurs d'autorisation impl�ment�s dans le m�me module que le
+ # fournisseur d'authentification.
+&lt;/Directory&gt;</pre>
+</div>
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authn_core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_dbd.html.en b/docs/manual/mod/mod_authn_dbd.html.en
index f060aea2c7..84a983f0aa 100644
--- a/docs/manual/mod/mod_authn_dbd.html.en
+++ b/docs/manual/mod/mod_authn_dbd.html.en
@@ -74,70 +74,6 @@
<li><a href="../misc/password_encryptions.html">Password Formats</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="socache" id="socache">Performance and Cacheing</a></h2>
-
-<p>Some users of DBD authentication in HTTPD 2.2/2.4 have reported that it
-imposes a problematic load on the database. This is most likely where
-an HTML page contains hundreds of objects (e.g. images, scripts, etc)
-each of which requires authentication. Users affected (or concerned)
-by this kind of problem should use <code class="module"><a href="../mod/mod_authn_socache.html">mod_authn_socache</a></code>
-to cache credentials and take most of the load off the database.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="example" id="example">Configuration Example</a></h2>
-
-<p>This simple example shows use of this module in the context of
-the Authentication and DBD frameworks.</p>
-<pre class="prettyprint lang-config"># mod_dbd configuration
-# UPDATED to include authentication cacheing
-DBDriver pgsql
-DBDParams "dbname=apacheauth user=apache password=xxxxxx"
-
-DBDMin 4
-DBDKeep 8
-DBDMax 20
-DBDExptime 300
-
-&lt;Directory "/usr/www/myhost/private"&gt;
- # mod_authn_core and mod_auth_basic configuration
- # for mod_authn_dbd
- AuthType Basic
- AuthName "My Server"
-
- # To cache credentials, put socache ahead of dbd here
- AuthBasicProvider socache dbd
-
- # Also required for caching: tell the cache to cache dbd lookups!
- AuthnCacheProvideFor dbd
- AuthnCacheContext my-server
-
- # mod_authz_core configuration
- Require valid-user
-
- # mod_authn_dbd SQL query to authenticate a user
- AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
-&lt;/Directory&gt;</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="exposed" id="exposed">Exposing Login Information</a></h2>
-
-<p>
-If httpd was built against <a class="glossarylink" href="../glossary.html#apr" title="see glossary">APR</a> version 1.3.0
-or higher, then whenever a query is made to the database server, all
-column values in the first row returned by the query are placed in the
-environment, using environment variables with the prefix "AUTHENTICATE_".
-</p>
-<p>If a database query for example returned the username, full name
-and telephone number of a user, a CGI program will have access to
-this information without the need to make a second independent database
-query to gather this additional information.</p>
-<p>This has the potential to dramatically simplify the coding and
-configuration required in some web applications.
-</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="AuthDBDUserPWQuery" id="AuthDBDUserPWQuery">AuthDBDUserPWQuery</a> <a name="authdbduserpwquery" id="authdbduserpwquery">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>SQL query to look up a password for a user</td></tr>
@@ -201,6 +137,70 @@ configuration required in some web applications.
more information.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="socache" id="socache">Performance and Cacheing</a></h2>
+
+<p>Some users of DBD authentication in HTTPD 2.2/2.4 have reported that it
+imposes a problematic load on the database. This is most likely where
+an HTML page contains hundreds of objects (e.g. images, scripts, etc)
+each of which requires authentication. Users affected (or concerned)
+by this kind of problem should use <code class="module"><a href="../mod/mod_authn_socache.html">mod_authn_socache</a></code>
+to cache credentials and take most of the load off the database.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="example" id="example">Configuration Example</a></h2>
+
+<p>This simple example shows use of this module in the context of
+the Authentication and DBD frameworks.</p>
+<pre class="prettyprint lang-config"># mod_dbd configuration
+# UPDATED to include authentication cacheing
+DBDriver pgsql
+DBDParams "dbname=apacheauth user=apache password=xxxxxx"
+
+DBDMin 4
+DBDKeep 8
+DBDMax 20
+DBDExptime 300
+
+&lt;Directory "/usr/www/myhost/private"&gt;
+ # mod_authn_core and mod_auth_basic configuration
+ # for mod_authn_dbd
+ AuthType Basic
+ AuthName "My Server"
+
+ # To cache credentials, put socache ahead of dbd here
+ AuthBasicProvider socache dbd
+
+ # Also required for caching: tell the cache to cache dbd lookups!
+ AuthnCacheProvideFor dbd
+ AuthnCacheContext my-server
+
+ # mod_authz_core configuration
+ Require valid-user
+
+ # mod_authn_dbd SQL query to authenticate a user
+ AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
+&lt;/Directory&gt;</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="exposed" id="exposed">Exposing Login Information</a></h2>
+
+<p>
+If httpd was built against <a class="glossarylink" href="../glossary.html#apr" title="see glossary">APR</a> version 1.3.0
+or higher, then whenever a query is made to the database server, all
+column values in the first row returned by the query are placed in the
+environment, using environment variables with the prefix "AUTHENTICATE_".
+</p>
+<p>If a database query for example returned the username, full name
+and telephone number of a user, a CGI program will have access to
+this information without the need to make a second independent database
+query to gather this additional information.</p>
+<p>This has the potential to dramatically simplify the coding and
+configuration required in some web applications.
+</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authn_dbd.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_dbd.html.fr b/docs/manual/mod/mod_authn_dbd.html.fr
index 219a7b2f49..ad1802dda8 100644
--- a/docs/manual/mod/mod_authn_dbd.html.fr
+++ b/docs/manual/mod/mod_authn_dbd.html.fr
@@ -77,75 +77,6 @@ SQL</td></tr>
passe</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="socache" id="socache">Performances et mise en cache</a></h2>
-
-<p>Certains utilisateurs de l'authentification DBD sous HTTPD 2.2/2.4 ont
-signal� une charge probl�matique au niveau de la base de donn�es. Cela
-se produit en g�n�ral lorsqu'une page HTML contient des centaines d'objets
-(comme des images, des scripts, etc...), chacun d'entre eux n�cessitant
-une authentification. Les utilisateurs qui rencontrent ce genre de
-probl�me peuvent utiliser le module <code class="module"><a href="../mod/mod_authn_socache.html">mod_authn_socache</a></code>
-qui permet de mettre les donn�es d'authentification en cache, et
-soulager ainsi la base de donn�es de la plus grande partie de la charge.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="example" id="example">Exemple de configuration</a></h2>
-
-<p>Voici un exemple simple d'utilisation de ce module dans un contexte
-d'authentification et de bases de donn�es.</p>
-<pre class="prettyprint lang-config"># configuration de mod_dbd
-# MISE � JOUR pour inclure la mise en cache de l'authentification
-DBDriver pgsql
-DBDParams "dbname=apacheauth user=apache password=xxxxxx"
-
-DBDMin 4
-DBDKeep 8
-DBDMax 20
-DBDExptime 300
-
-&lt;Directory /usr/www/mon-serveur/private&gt;
- # configuration de mod_authn_core et mod_auth_basic
- # pour mod_authn_dbd
- AuthType Basic
- AuthName "Mon serveur"
-
- # Pour mettre en cache les donn�es d'authentification, placez socache
- # avant dbd
- AuthBasicProvider socache dbd
-
- # Aussi n�cessaire � la mise en cache : dire au cache de mettre en
- # cache les recherches dbd !
- AuthnCacheProvideFor dbd
- AuthnCacheContext mon-serveur
-
- # configuration de mod_authz_core
- Require valid-user
-
- # la requ�te SQL de mod_authn_dbd pour authentifier un utilisateur
- AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
-&lt;/Directory&gt;</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="exposed" id="exposed">Mise � disposition des informations de connexion</a></h2>
-
-<p>
-Si httpd a �t� compil� avec la version 1.3.0 ou sup�rieure de
-l'<a class="glossarylink" href="../glossary.html#apr" title="voir glossaire">APR</a>, pour chaque requ�te envoy�e au serveur de
-base de donn�es, toutes les valeurs de colonnes du premier
-enregistrement renvoy� par la requ�te sont affect�es � des variables
-d'environnement avec le pr�fixe "AUTHENTICATE_".
-</p>
-<p>Par exemple, si une requ�te renvoie un nom d'utilisateur, un nom
-complet et un num�ro de t�l�phone, un programme CGI pourra acc�der � ces
-informations sans avoir besoin d'effectuer une deuxi�me requ�te vers la
-base de donn�es.</p>
-<p>Ceci va entra�ner une simplification consid�rable du code et de la
-configuration n�cessaire de certaines applications web.
-</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="authdbduserpwquery" id="authdbduserpwquery">Directive</a> <a name="AuthDBDUserPWQuery" id="AuthDBDUserPWQuery">AuthDBDUserPWQuery</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Requ�te SQL servant � v�rifier le mot de passe d'un
@@ -220,6 +151,75 @@ passe pour un utilisateur et un identifiant d'authentification.
plus de d�tails.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="socache" id="socache">Performances et mise en cache</a></h2>
+
+<p>Certains utilisateurs de l'authentification DBD sous HTTPD 2.2/2.4 ont
+signal� une charge probl�matique au niveau de la base de donn�es. Cela
+se produit en g�n�ral lorsqu'une page HTML contient des centaines d'objets
+(comme des images, des scripts, etc...), chacun d'entre eux n�cessitant
+une authentification. Les utilisateurs qui rencontrent ce genre de
+probl�me peuvent utiliser le module <code class="module"><a href="../mod/mod_authn_socache.html">mod_authn_socache</a></code>
+qui permet de mettre les donn�es d'authentification en cache, et
+soulager ainsi la base de donn�es de la plus grande partie de la charge.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="example" id="example">Exemple de configuration</a></h2>
+
+<p>Voici un exemple simple d'utilisation de ce module dans un contexte
+d'authentification et de bases de donn�es.</p>
+<pre class="prettyprint lang-config"># configuration de mod_dbd
+# MISE � JOUR pour inclure la mise en cache de l'authentification
+DBDriver pgsql
+DBDParams "dbname=apacheauth user=apache password=xxxxxx"
+
+DBDMin 4
+DBDKeep 8
+DBDMax 20
+DBDExptime 300
+
+&lt;Directory /usr/www/mon-serveur/private&gt;
+ # configuration de mod_authn_core et mod_auth_basic
+ # pour mod_authn_dbd
+ AuthType Basic
+ AuthName "Mon serveur"
+
+ # Pour mettre en cache les donn�es d'authentification, placez socache
+ # avant dbd
+ AuthBasicProvider socache dbd
+
+ # Aussi n�cessaire � la mise en cache : dire au cache de mettre en
+ # cache les recherches dbd !
+ AuthnCacheProvideFor dbd
+ AuthnCacheContext mon-serveur
+
+ # configuration de mod_authz_core
+ Require valid-user
+
+ # la requ�te SQL de mod_authn_dbd pour authentifier un utilisateur
+ AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
+&lt;/Directory&gt;</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="exposed" id="exposed">Mise � disposition des informations de connexion</a></h2>
+
+<p>
+Si httpd a �t� compil� avec la version 1.3.0 ou sup�rieure de
+l'<a class="glossarylink" href="../glossary.html#apr" title="voir glossaire">APR</a>, pour chaque requ�te envoy�e au serveur de
+base de donn�es, toutes les valeurs de colonnes du premier
+enregistrement renvoy� par la requ�te sont affect�es � des variables
+d'environnement avec le pr�fixe "AUTHENTICATE_".
+</p>
+<p>Par exemple, si une requ�te renvoie un nom d'utilisateur, un nom
+complet et un num�ro de t�l�phone, un programme CGI pourra acc�der � ces
+informations sans avoir besoin d'effectuer une deuxi�me requ�te vers la
+base de donn�es.</p>
+<p>Ceci va entra�ner une simplification consid�rable du code et de la
+configuration n�cessaire de certaines applications web.
+</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authn_dbd.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_dbm.html.en b/docs/manual/mod/mod_authn_dbm.html.en
index b4dd72860a..a3de3afda3 100644
--- a/docs/manual/mod/mod_authn_dbm.html.en
+++ b/docs/manual/mod/mod_authn_dbm.html.en
@@ -67,7 +67,6 @@
<li><code class="program"><a href="../programs/htdbm.html">htdbm</a></code></li>
<li><a href="../misc/password_encryptions.html">Password Formats</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthDBMType" id="AuthDBMType">AuthDBMType</a> <a name="authdbmtype" id="authdbmtype">Directive</a></h2>
<table class="directive">
@@ -139,6 +138,7 @@ passwords for authentication</td></tr>
<code class="program"><a href="../programs/htdbm.html">htdbm</a></code>.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authn_dbm.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_dbm.html.fr b/docs/manual/mod/mod_authn_dbm.html.fr
index 2c5a150b3d..c26f6f573a 100644
--- a/docs/manual/mod/mod_authn_dbm.html.fr
+++ b/docs/manual/mod/mod_authn_dbm.html.fr
@@ -68,7 +68,6 @@ d'Apache</td></tr></table>
<li><a href="../misc/password_encryptions.html">Formats de mots de
passe</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="authdbmtype" id="authdbmtype">Directive</a> <a name="AuthDBMType" id="AuthDBMType">AuthDBMType</a></h2>
<table class="directive">
@@ -147,6 +146,7 @@ des utilisateurs et de leurs mots de passe</td></tr>
inclus dans le programme <code class="program"><a href="../programs/htdbm.html">htdbm</a></code>.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authn_dbm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_dbm.html.ja.utf8 b/docs/manual/mod/mod_authn_dbm.html.ja.utf8
index 05774f11cd..b8159d8577 100644
--- a/docs/manual/mod/mod_authn_dbm.html.ja.utf8
+++ b/docs/manual/mod/mod_authn_dbm.html.ja.utf8
@@ -68,7 +68,6 @@
<code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code>
</li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthDBMType" id="AuthDBMType">AuthDBMType</a> <a name="authdbmtype" id="authdbmtype">ディレクティブ</a></h2>
<table class="directive">
@@ -132,6 +131,7 @@
更新したりすることができます。</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_authn_dbm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_dbm.html.ko.euc-kr b/docs/manual/mod/mod_authn_dbm.html.ko.euc-kr
index b3ea3924ba..8a56318c9d 100644
--- a/docs/manual/mod/mod_authn_dbm.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authn_dbm.html.ko.euc-kr
@@ -64,7 +64,6 @@
<code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code>
</li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthDBMType" id="AuthDBMType">AuthDBMType</a> <a name="authdbmtype" id="authdbmtype">���þ�</a></h2>
<table class="directive">
@@ -124,6 +123,7 @@
DBM���� ��ȣ������ ����� �����Ѵ�.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_authn_dbm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_file.html.en b/docs/manual/mod/mod_authn_file.html.en
index 58c2220c82..b7cd33e83f 100644
--- a/docs/manual/mod/mod_authn_file.html.en
+++ b/docs/manual/mod/mod_authn_file.html.en
@@ -63,7 +63,6 @@
<li><code class="program"><a href="../programs/htdigest.html">htdigest</a></code></li>
<li><a href="../misc/password_encryptions.html">Password Formats</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthUserFile" id="AuthUserFile">AuthUserFile</a> <a name="authuserfile" id="authuserfile">Directive</a></h2>
<table class="directive">
@@ -129,6 +128,7 @@ passwords for authentication</td></tr>
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authn_file.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_file.html.fr b/docs/manual/mod/mod_authn_file.html.fr
index 1c46075828..468d0b514b 100644
--- a/docs/manual/mod/mod_authn_file.html.fr
+++ b/docs/manual/mod/mod_authn_file.html.fr
@@ -65,7 +65,6 @@ d'Apache</td></tr></table>
<li><a href="../misc/password_encryptions.html">Formats de mots de
passe</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="authuserfile" id="authuserfile">Directive</a> <a name="AuthUserFile" id="AuthUserFile">AuthUserFile</a></h2>
<table class="directive">
@@ -138,6 +137,7 @@ passe</td></tr>
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authn_file.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_file.html.ja.utf8 b/docs/manual/mod/mod_authn_file.html.ja.utf8
index 756ef7b3a6..90c6c3d9d8 100644
--- a/docs/manual/mod/mod_authn_file.html.ja.utf8
+++ b/docs/manual/mod/mod_authn_file.html.ja.utf8
@@ -67,7 +67,6 @@
<li><code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code></li>
<li><code class="program"><a href="../programs/htdigest.html">htdigest</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthUserFile" id="AuthUserFile">AuthUserFile</a> <a name="authuserfile" id="authuserfile">ディレクティブ</a></h2>
<table class="directive">
@@ -139,6 +138,7 @@
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_authn_file.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_file.html.ko.euc-kr b/docs/manual/mod/mod_authn_file.html.ko.euc-kr
index 11e788f3e4..e506684e5f 100644
--- a/docs/manual/mod/mod_authn_file.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authn_file.html.ko.euc-kr
@@ -63,7 +63,6 @@
<li><a href="../programs/htpasswd.html">htpasswd</a></li>
<li><a href="../programs/htdigest.html">htdigest</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthUserFile" id="AuthUserFile">AuthUserFile</a> <a name="authuserfile" id="authuserfile">���þ�</a></h2>
<table class="directive">
@@ -122,6 +121,7 @@
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_authn_file.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_socache.html.en b/docs/manual/mod/mod_authn_socache.html.en
index 2a44561763..a799f69619 100644
--- a/docs/manual/mod/mod_authn_socache.html.en
+++ b/docs/manual/mod/mod_authn_socache.html.en
@@ -53,61 +53,6 @@ the load on backends</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#dev">Cacheing with custom modules</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="intro" id="intro">Authentication Cacheing</a></h2>
- <p>Some users of more heavyweight authentication such as SQL database
- lookups (<code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>) have reported it putting an
- unacceptable load on their authentication provider. A typical case
- in point is where an HTML page contains hundreds of objects
- (images, scripts, stylesheets, media, etc), and a request to the page
- generates hundreds of effectively-immediate requests for authenticated
- additional contents.</p>
- <p>mod_authn_socache provides a solution to this problem by
- maintaining a cache of authentication credentials.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="usage" id="usage">Usage</a></h2>
- <p>The authentication cache should be used where authentication
- lookups impose a significant load on the server, or a backend or
- network. Authentication by file (<code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>)
- or dbm (<code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code>) are unlikely to benefit,
- as these are fast and lightweight in their own right (though in some
- cases, such as a network-mounted file, cacheing may be worthwhile).
- Other providers such as SQL or LDAP based authentication are more
- likely to benefit, particularly where there is an observed
- performance issue. Amongst the standard modules, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> manages its own cache, so only
- <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code> will usually benefit from this cache.</p>
- <p>The basic rules to cache for a provider are:</p>
- <ol><li>Include the provider you're cacheing for in an
- <code class="directive">AuthnCacheProvideFor</code> directive.</li>
- <li>List <var>socache</var> ahead of the provider you're
- cacheing for in your <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> or <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code> directive.</li>
- </ol>
- <p>A simple usage example to accelerate <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>
- using dbm as a cache engine:</p>
- <pre class="prettyprint lang-config">#AuthnCacheSOCache is optional. If specified, it is server-wide
-AuthnCacheSOCache dbm
-&lt;Directory "/usr/www/myhost/private"&gt;
- AuthType Basic
- AuthName "Cached Authentication Example"
- AuthBasicProvider socache dbd
- AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
- AuthnCacheProvideFor dbd
- Require valid-user
- #Optional
- AuthnCacheContext dbd-authn-example
-&lt;/Directory&gt;</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="dev" id="dev">Cacheing with custom modules</a></h2>
- <p>Module developers should note that their modules must be enabled
- for cacheing with mod_authn_socache. A single optional API function
- <var>ap_authn_cache_store</var> is provided to cache credentials
- a provider has just looked up or generated. Usage examples are
- available in <a href="http://svn.eu.apache.org/viewvc?view=revision&amp;revision=957072">r957072</a>, in which three authn providers are enabled for cacheing.</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="AuthnCacheContext" id="AuthnCacheContext">AuthnCacheContext</a> <a name="authncachecontext" id="authncachecontext">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify a context string for use in the cache key</td></tr>
@@ -222,6 +167,61 @@ Apache HTTP Server 2.4.7 and later</td></tr>
your timeout.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="intro" id="intro">Authentication Cacheing</a></h2>
+ <p>Some users of more heavyweight authentication such as SQL database
+ lookups (<code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>) have reported it putting an
+ unacceptable load on their authentication provider. A typical case
+ in point is where an HTML page contains hundreds of objects
+ (images, scripts, stylesheets, media, etc), and a request to the page
+ generates hundreds of effectively-immediate requests for authenticated
+ additional contents.</p>
+ <p>mod_authn_socache provides a solution to this problem by
+ maintaining a cache of authentication credentials.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="usage" id="usage">Usage</a></h2>
+ <p>The authentication cache should be used where authentication
+ lookups impose a significant load on the server, or a backend or
+ network. Authentication by file (<code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>)
+ or dbm (<code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code>) are unlikely to benefit,
+ as these are fast and lightweight in their own right (though in some
+ cases, such as a network-mounted file, cacheing may be worthwhile).
+ Other providers such as SQL or LDAP based authentication are more
+ likely to benefit, particularly where there is an observed
+ performance issue. Amongst the standard modules, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> manages its own cache, so only
+ <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code> will usually benefit from this cache.</p>
+ <p>The basic rules to cache for a provider are:</p>
+ <ol><li>Include the provider you're cacheing for in an
+ <code class="directive">AuthnCacheProvideFor</code> directive.</li>
+ <li>List <var>socache</var> ahead of the provider you're
+ cacheing for in your <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> or <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code> directive.</li>
+ </ol>
+ <p>A simple usage example to accelerate <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>
+ using dbm as a cache engine:</p>
+ <pre class="prettyprint lang-config">#AuthnCacheSOCache is optional. If specified, it is server-wide
+AuthnCacheSOCache dbm
+&lt;Directory "/usr/www/myhost/private"&gt;
+ AuthType Basic
+ AuthName "Cached Authentication Example"
+ AuthBasicProvider socache dbd
+ AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
+ AuthnCacheProvideFor dbd
+ Require valid-user
+ #Optional
+ AuthnCacheContext dbd-authn-example
+&lt;/Directory&gt;</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="dev" id="dev">Cacheing with custom modules</a></h2>
+ <p>Module developers should note that their modules must be enabled
+ for cacheing with mod_authn_socache. A single optional API function
+ <var>ap_authn_cache_store</var> is provided to cache credentials
+ a provider has just looked up or generated. Usage examples are
+ available in <a href="http://svn.eu.apache.org/viewvc?view=revision&amp;revision=957072">r957072</a>, in which three authn providers are enabled for cacheing.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authn_socache.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authn_socache.html.fr b/docs/manual/mod/mod_authn_socache.html.fr
index a74033eaa2..7de8ee9b49 100644
--- a/docs/manual/mod/mod_authn_socache.html.fr
+++ b/docs/manual/mod/mod_authn_socache.html.fr
@@ -55,73 +55,6 @@ la charge des serveurs d'arri�re-plan</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#dev">La mise en cache avec les modules tiers</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="intro" id="intro">Mise en cache des donn�es d'authentification</a></h2>
- <p>Certains utilisateurs qui mettent oeuvre une authentification
- lourde s'appuyant par exemple sur des requ�tes SQL
- (<code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>) ont signal� une charge induite
- inacceptable sur leur fournisseur d'authentification. Cela se
- produit typiquement dans le cas o� une page HTML contient des
- centaines d'objets (images, scripts, pages de styles, media,
- etc...), et o� une requ�te pour cette page g�n�re des centaines de
- sous-requ�tes � effet imm�diat pour des contenus suppl�mentaires
- authentifi�s.</p>
- <p>Pour r�soudre ce probl�me, mod_authn_socache fournit une solution
- qui permet de maintenir un cache des donn�es d'authentification.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="usage" id="usage">Utilisation</a></h2>
- <p>Le cache d'authentification doit �tre utilis� lorsque les
- requ�tes d'authentification induisent une charge significative sur le
- serveur, le serveur d'arri�re-plan ou le r�seau. Cette mise en cache
- n'apportera probablement aucune am�lioration dans le cas d'une
- authentification � base de fichier (<code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>)
- ou de base de donn�es dbm (<code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code>) car ces
- m�thodes sont de par leur conception rapides et l�g�res (la mise en
- cache peut cependant s'av�rer utile dans le cas o� le fichier est
- situ� sur un montage r�seau). Les fournisseurs d'authentification
- bas�s sur SQL ou LDAP ont plus de chances de tirer parti de cette
- mise en cache, en particulier lorsqu'un probl�me de performances est
- d�tect�. <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> g�rant son propre cache,
- seul <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code> est concern� par notre sujet.</p>
- <p>Les principales r�gles � appliquer pour la mise en cache sont :</p>
- <ol><li>Inclure le fournisseur pour lequel vous voulez effectuer une
- mise en cache dans une directive
- <code class="directive">AuthnCacheProvideFor</code>.</li>
- <li>Mettre <var>socache</var> avant le fournisseur pour lequel
- vous voulez effectuer une mise en cache dans votre directive
- <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
- ou <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code>.</li>
- </ol>
- <p>Voici un exemple simple permettant d'acc�l�rer
- <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code> et utilisant dbm comme moteur de la
- mise en cache :</p>
- <pre class="prettyprint lang-config"> #AuthnCacheSOCache est optionnel. S'il est d�fini, il l'est pour
- #l'ensemble du serveur
-AuthnCacheSOCache dbm
-&lt;Directory /usr/www/myhost/private&gt;
- AuthType Basic
- AuthName "Cached Authentication Example"
- AuthBasicProvider socache dbd
- AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
- AuthnCacheProvideFor dbd
- Require valid-user
- #Optionnel
- AuthnCacheContext dbd-authn-example
-&lt;/Directory&gt;</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="dev" id="dev">La mise en cache avec les modules tiers</a></h2>
- <p>Les d�veloppeurs de modules doivent savoir que la mise en cache
- avec mod_authn_socache doit �tre activ�e dans leurs modules. La
- fonction de l'API <var>ap_authn_cache_store</var> permet de
- mettre en cache les donn�es d'authentification qu'un fournisseur
- vient de rechercher ou de g�n�rer. Vous trouverez des exemples
- d'utilisation � <a href="http://svn.eu.apache.org/viewvc?view=revision&amp;revision=957072">r957072</a>, o� trois fournisseurs authn sont activ�s pour la mise
- en cache.</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="authncachecontext" id="authncachecontext">Directive</a> <a name="AuthnCacheContext" id="AuthnCacheContext">AuthnCacheContext</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie une cha�ne de contexte � utiliser dans la cl� du
@@ -253,6 +186,73 @@ utiliser</td></tr>
d�finissez la dur�e de vie.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="intro" id="intro">Mise en cache des donn�es d'authentification</a></h2>
+ <p>Certains utilisateurs qui mettent oeuvre une authentification
+ lourde s'appuyant par exemple sur des requ�tes SQL
+ (<code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>) ont signal� une charge induite
+ inacceptable sur leur fournisseur d'authentification. Cela se
+ produit typiquement dans le cas o� une page HTML contient des
+ centaines d'objets (images, scripts, pages de styles, media,
+ etc...), et o� une requ�te pour cette page g�n�re des centaines de
+ sous-requ�tes � effet imm�diat pour des contenus suppl�mentaires
+ authentifi�s.</p>
+ <p>Pour r�soudre ce probl�me, mod_authn_socache fournit une solution
+ qui permet de maintenir un cache des donn�es d'authentification.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="usage" id="usage">Utilisation</a></h2>
+ <p>Le cache d'authentification doit �tre utilis� lorsque les
+ requ�tes d'authentification induisent une charge significative sur le
+ serveur, le serveur d'arri�re-plan ou le r�seau. Cette mise en cache
+ n'apportera probablement aucune am�lioration dans le cas d'une
+ authentification � base de fichier (<code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>)
+ ou de base de donn�es dbm (<code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code>) car ces
+ m�thodes sont de par leur conception rapides et l�g�res (la mise en
+ cache peut cependant s'av�rer utile dans le cas o� le fichier est
+ situ� sur un montage r�seau). Les fournisseurs d'authentification
+ bas�s sur SQL ou LDAP ont plus de chances de tirer parti de cette
+ mise en cache, en particulier lorsqu'un probl�me de performances est
+ d�tect�. <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> g�rant son propre cache,
+ seul <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code> est concern� par notre sujet.</p>
+ <p>Les principales r�gles � appliquer pour la mise en cache sont :</p>
+ <ol><li>Inclure le fournisseur pour lequel vous voulez effectuer une
+ mise en cache dans une directive
+ <code class="directive">AuthnCacheProvideFor</code>.</li>
+ <li>Mettre <var>socache</var> avant le fournisseur pour lequel
+ vous voulez effectuer une mise en cache dans votre directive
+ <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
+ ou <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code>.</li>
+ </ol>
+ <p>Voici un exemple simple permettant d'acc�l�rer
+ <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code> et utilisant dbm comme moteur de la
+ mise en cache :</p>
+ <pre class="prettyprint lang-config"> #AuthnCacheSOCache est optionnel. S'il est d�fini, il l'est pour
+ #l'ensemble du serveur
+AuthnCacheSOCache dbm
+&lt;Directory /usr/www/myhost/private&gt;
+ AuthType Basic
+ AuthName "Cached Authentication Example"
+ AuthBasicProvider socache dbd
+ AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
+ AuthnCacheProvideFor dbd
+ Require valid-user
+ #Optionnel
+ AuthnCacheContext dbd-authn-example
+&lt;/Directory&gt;</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="dev" id="dev">La mise en cache avec les modules tiers</a></h2>
+ <p>Les d�veloppeurs de modules doivent savoir que la mise en cache
+ avec mod_authn_socache doit �tre activ�e dans leurs modules. La
+ fonction de l'API <var>ap_authn_cache_store</var> permet de
+ mettre en cache les donn�es d'authentification qu'un fournisseur
+ vient de rechercher ou de g�n�rer. Vous trouverez des exemples
+ d'utilisation � <a href="http://svn.eu.apache.org/viewvc?view=revision&amp;revision=957072">r957072</a>, o� trois fournisseurs authn sont activ�s pour la mise
+ en cache.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authn_socache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authnz_fcgi.html.en b/docs/manual/mod/mod_authnz_fcgi.html.en
index 57575a360e..9c7d8d8f7a 100644
--- a/docs/manual/mod/mod_authnz_fcgi.html.en
+++ b/docs/manual/mod/mod_authnz_fcgi.html.en
@@ -65,6 +65,127 @@ and Access Control</a></li>
<li><code class="module"><a href="../mod/mod_proxy_fcgi.html">mod_proxy_fcgi</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthnzFcgiCheckAuthnProvider" id="AuthnzFcgiCheckAuthnProvider">AuthnzFcgiCheckAuthnProvider</a> <a name="authnzfcgicheckauthnprovider" id="authnzfcgicheckauthnprovider">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables a FastCGI application to handle the check_authn
+authentication hook.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthnzFcgiCheckAuthnProvider <em>provider-name</em>|<code>None</code>
+<em>option</em> ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</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_authnz_fcgi</td></tr>
+</table>
+ <p>This directive is used to enable a FastCGI authorizer to
+ handle a specific processing phase of authentication or
+ authorization.</p>
+
+ <p>Some capabilities of FastCGI authorizers require enablement
+ using this directive instead of
+ <code class="directive">AuthBasicProvider</code>:</p>
+
+ <ul>
+ <li>Non-Basic authentication; generally, determining the user
+ id of the client and returning it from the authorizer; see the
+ <code>UserExpr</code> option below</li>
+ <li>Selecting a custom response code; for a non-200 response
+ from the authorizer, the code from the authorizer will be the
+ status of the response</li>
+ <li>Setting the body of a non-200 response; if the authorizer
+ provides a response body with a non-200 response, that body
+ will be returned to the client; up to 8192 bytes of text are
+ supported</li>
+ </ul>
+
+ <dl>
+ <dt><em>provider-name</em></dt>
+ <dd>This is the name of a provider defined with <code class="directive">
+ AuthnzFcgiDefineProvider</code>.</dd>
+
+ <dt><code>None</code></dt>
+ <dd>Specify <code>None</code> to disable a provider enabled
+ with this directive in an outer scope, such as in a parent
+ directory.</dd>
+
+ <dt><em>option</em></dt>
+ <dd>The following options are supported:
+
+ <dl>
+ <dt>Authoritative On|Off (default On)</dt>
+ <dd>This controls whether or not other modules are allowed
+ to run when this module has a FastCGI authorizer configured
+ and it fails the request.</dd>
+
+ <dt>DefaultUser <em>userid</em></dt>
+ <dd>When the authorizer returns success and <code>UserExpr</code>
+ is configured and evaluates to an empty string (e.g., authorizer
+ didn't return a variable), this value will be used as the user
+ id. This is typically used when the authorizer has a concept of
+ guest, or unauthenticated, users and guest users are mapped to
+ some specific user id for logging and other purposes.</dd>
+
+ <dt>RequireBasicAuth On|Off (default Off)</dt>
+ <dd>This controls whether or not Basic auth is required
+ before passing the request to the authorizer. If required,
+ the authorizer won't be invoked without a user id and
+ password; 401 will be returned for a request without that.</dd>
+
+ <dt>UserExpr <em>expr</em> (no default)</dt>
+ <dd>When Basic authentication isn't provided by the client
+ and the authorizer determines the user, this expression,
+ evaluated after calling the authorizer, determines the
+ user. The expression follows <a href="../expr.html">
+ ap_expr syntax</a> and must resolve to a string. A typical
+ use is to reference a <code>Variable-<em>XXX</em></code>
+ setting returned by the authorizer using an option like
+ <code>UserExpr "%{reqenv:<em>XXX</em>}"</code>. If
+ this option is specified and the user id can't be retrieved
+ using the expression after a successful authentication, the
+ request will be rejected with a 500 error.</dd>
+
+ </dl>
+ </dd>
+ </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthnzFcgiDefineProvider" id="AuthnzFcgiDefineProvider">AuthnzFcgiDefineProvider</a> <a name="authnzfcgidefineprovider" id="authnzfcgidefineprovider">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Defines a FastCGI application as a provider for
+authentication and/or authorization</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthnzFcgiDefineProvider <em>type</em> <em>provider-name</em>
+<em>backend-address</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</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_authnz_fcgi</td></tr>
+</table>
+ <p>This directive is used to define a FastCGI application as
+ a provider for a particular phase of authentication or
+ authorization.</p>
+
+ <dl>
+ <dt><em>type</em></dt>
+ <dd>This must be set to <em>authn</em> for authentication,
+ <em>authz</em> for authorization, or <em>authnz</em> for
+ a generic FastCGI authorizer which performs both checks.</dd>
+
+ <dt><em>provider-name</em></dt>
+ <dd>This is used to assign a name to the provider which is
+ used in other directives such as
+ <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
+ and
+ <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>.</dd>
+
+ <dt><em>backend-address</em></dt>
+ <dd>This specifies the address of the application, in the form
+ <em>fcgi://hostname:port/</em>. The application process(es)
+ must be managed independently, such as with
+ <code class="program"><a href="../programs/fcgistarter.html">fcgistarter</a></code>.</dd>
+ </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="invocations" id="invocations">Invocation modes</a></h2>
@@ -407,127 +528,6 @@ Require FooAuthnz</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="AuthnzFcgiCheckAuthnProvider" id="AuthnzFcgiCheckAuthnProvider">AuthnzFcgiCheckAuthnProvider</a> <a name="authnzfcgicheckauthnprovider" id="authnzfcgicheckauthnprovider">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables a FastCGI application to handle the check_authn
-authentication hook.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthnzFcgiCheckAuthnProvider <em>provider-name</em>|<code>None</code>
-<em>option</em> ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</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_authnz_fcgi</td></tr>
-</table>
- <p>This directive is used to enable a FastCGI authorizer to
- handle a specific processing phase of authentication or
- authorization.</p>
-
- <p>Some capabilities of FastCGI authorizers require enablement
- using this directive instead of
- <code class="directive">AuthBasicProvider</code>:</p>
-
- <ul>
- <li>Non-Basic authentication; generally, determining the user
- id of the client and returning it from the authorizer; see the
- <code>UserExpr</code> option below</li>
- <li>Selecting a custom response code; for a non-200 response
- from the authorizer, the code from the authorizer will be the
- status of the response</li>
- <li>Setting the body of a non-200 response; if the authorizer
- provides a response body with a non-200 response, that body
- will be returned to the client; up to 8192 bytes of text are
- supported</li>
- </ul>
-
- <dl>
- <dt><em>provider-name</em></dt>
- <dd>This is the name of a provider defined with <code class="directive">
- AuthnzFcgiDefineProvider</code>.</dd>
-
- <dt><code>None</code></dt>
- <dd>Specify <code>None</code> to disable a provider enabled
- with this directive in an outer scope, such as in a parent
- directory.</dd>
-
- <dt><em>option</em></dt>
- <dd>The following options are supported:
-
- <dl>
- <dt>Authoritative On|Off (default On)</dt>
- <dd>This controls whether or not other modules are allowed
- to run when this module has a FastCGI authorizer configured
- and it fails the request.</dd>
-
- <dt>DefaultUser <em>userid</em></dt>
- <dd>When the authorizer returns success and <code>UserExpr</code>
- is configured and evaluates to an empty string (e.g., authorizer
- didn't return a variable), this value will be used as the user
- id. This is typically used when the authorizer has a concept of
- guest, or unauthenticated, users and guest users are mapped to
- some specific user id for logging and other purposes.</dd>
-
- <dt>RequireBasicAuth On|Off (default Off)</dt>
- <dd>This controls whether or not Basic auth is required
- before passing the request to the authorizer. If required,
- the authorizer won't be invoked without a user id and
- password; 401 will be returned for a request without that.</dd>
-
- <dt>UserExpr <em>expr</em> (no default)</dt>
- <dd>When Basic authentication isn't provided by the client
- and the authorizer determines the user, this expression,
- evaluated after calling the authorizer, determines the
- user. The expression follows <a href="../expr.html">
- ap_expr syntax</a> and must resolve to a string. A typical
- use is to reference a <code>Variable-<em>XXX</em></code>
- setting returned by the authorizer using an option like
- <code>UserExpr "%{reqenv:<em>XXX</em>}"</code>. If
- this option is specified and the user id can't be retrieved
- using the expression after a successful authentication, the
- request will be rejected with a 500 error.</dd>
-
- </dl>
- </dd>
- </dl>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthnzFcgiDefineProvider" id="AuthnzFcgiDefineProvider">AuthnzFcgiDefineProvider</a> <a name="authnzfcgidefineprovider" id="authnzfcgidefineprovider">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Defines a FastCGI application as a provider for
-authentication and/or authorization</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthnzFcgiDefineProvider <em>type</em> <em>provider-name</em>
-<em>backend-address</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</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_authnz_fcgi</td></tr>
-</table>
- <p>This directive is used to define a FastCGI application as
- a provider for a particular phase of authentication or
- authorization.</p>
-
- <dl>
- <dt><em>type</em></dt>
- <dd>This must be set to <em>authn</em> for authentication,
- <em>authz</em> for authorization, or <em>authnz</em> for
- a generic FastCGI authorizer which performs both checks.</dd>
-
- <dt><em>provider-name</em></dt>
- <dd>This is used to assign a name to the provider which is
- used in other directives such as
- <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
- and
- <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>.</dd>
-
- <dt><em>backend-address</em></dt>
- <dd>This specifies the address of the application, in the form
- <em>fcgi://hostname:port/</em>. The application process(es)
- must be managed independently, such as with
- <code class="program"><a href="../programs/fcgistarter.html">fcgistarter</a></code>.</dd>
- </dl>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authnz_fcgi.html" title="English">&nbsp;en&nbsp;</a></p>
diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en
index 0cd3701055..37e1c0e8cd 100644
--- a/docs/manual/mod/mod_authnz_ldap.html.en
+++ b/docs/manual/mod/mod_authnz_ldap.html.en
@@ -102,6 +102,616 @@ for HTTP Basic authentication.</td></tr>
<li><code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthLDAPAuthorizePrefix" id="AuthLDAPAuthorizePrefix">AuthLDAPAuthorizePrefix</a> <a name="authldapauthorizeprefix" id="authldapauthorizeprefix">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies the prefix for environment variables set during
+authorization</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPAuthorizePrefix <em>prefix</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPAuthorizePrefix AUTHORIZE_</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.6 and later</td></tr>
+</table>
+ <p>This directive allows you to override the prefix used for environment
+ variables set during LDAP authorization. If <em>AUTHENTICATE_</em> is
+ specified, consumers of these environment variables see the same information
+ whether LDAP has performed authentication, authorization, or both.</p>
+
+ <div class="note"><h3>Note</h3>
+ No authorization variables are set when a user is authorized on the basis of
+ <code>Require valid-user</code>.
+ </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="AuthLDAPBindAuthoritative" id="AuthLDAPBindAuthoritative">AuthLDAPBindAuthoritative</a> <a name="authldapbindauthoritative" id="authldapbindauthoritative">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines if other authentication providers are used when a user can be mapped to a DN but the server cannot successfully bind with the user's credentials.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPBindAuthoritative<em>off|on</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPBindAuthoritative on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>By default, subsequent authentication providers are only queried if a
+ user cannot be mapped to a DN, but not if the user can be mapped to a DN and their
+ password cannot be verified with an LDAP bind.
+ If <code class="directive"><a href="#authldapbindauthoritative">AuthLDAPBindAuthoritative</a></code>
+ is set to <em>off</em>, other configured authentication modules will have
+ a chance to validate the user if the LDAP bind (with the current user's credentials)
+ fails for any reason.</p>
+ <p> This allows users present in both LDAP and
+ <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> to authenticate
+ when the LDAP server is available but the user's account is locked or password
+ is otherwise unusable.</p>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li>
+<li><code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthLDAPBindDN" id="AuthLDAPBindDN">AuthLDAPBindDN</a> <a name="authldapbinddn" id="authldapbinddn">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Optional DN to use in binding to the LDAP server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPBindDN <em>distinguished-name</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>An optional DN used to bind to the server when searching for
+ entries. If not provided, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will use
+ an anonymous bind.</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="AuthLDAPBindPassword" id="AuthLDAPBindPassword">AuthLDAPBindPassword</a> <a name="authldapbindpassword" id="authldapbindpassword">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Password used in conjuction with the bind DN</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPBindPassword <em>password</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><em>exec:</em> was added in 2.4.5.</td></tr>
+</table>
+ <p>A bind password to use in conjunction with the bind DN. Note
+ that the bind password is probably sensitive data, and should be
+ properly protected. You should only use the <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code> and <code class="directive"><a href="#authldapbindpassword">AuthLDAPBindPassword</a></code> if you
+ absolutely need them to search the directory.</p>
+
+ <p>If the value begins with exec: the resulting command will be
+ executed and the first line returned to standard output by the
+ program will be used as the password.</p>
+<pre class="prettyprint lang-config">#Password used as-is
+AuthLDAPBindPassword secret
+
+#Run /path/to/program to get my password
+AuthLDAPBindPassword exec:/path/to/program
+
+#Run /path/to/otherProgram and provide arguments
+AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"</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="AuthLDAPCharsetConfig" id="AuthLDAPCharsetConfig">AuthLDAPCharsetConfig</a> <a name="authldapcharsetconfig" id="authldapcharsetconfig">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Language to charset conversion configuration file</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPCharsetConfig <em>file-path</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</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_authnz_ldap</td></tr>
+</table>
+ <p>The <code class="directive">AuthLDAPCharsetConfig</code> directive sets the location
+ of the language to charset conversion configuration file. <var>File-path</var> is relative
+ to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. This file specifies
+ the list of language extensions to character sets.
+ Most administrators use the provided <code>charset.conv</code>
+ file, which associates common language extensions to character sets.</p>
+
+ <p>The file contains lines in the following format:</p>
+
+ <div class="example"><p><code>
+ <var>Language-Extension</var> <var>charset</var> [<var>Language-String</var>] ...
+ </code></p></div>
+
+ <p>The case of the extension does not matter. Blank lines, and lines
+ beginning with a hash character (<code>#</code>) are ignored.</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="AuthLDAPCompareAsUser" id="AuthLDAPCompareAsUser">AuthLDAPCompareAsUser</a> <a name="authldapcompareasuser" id="authldapcompareasuser">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the authenticated user's credentials to perform authorization comparisons</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPCompareAsUser on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPCompareAsUser off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.6 and later</td></tr>
+</table>
+ <p>When set, and <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> has authenticated the
+ user, LDAP comparisons for authorization use the queried distinguished name (DN)
+ and HTTP basic authentication password of the authenticated user instead of
+ the servers configured credentials.</p>
+
+ <p> The <em>ldap-attribute</em>, <em>ldap-user</em>, and <em>ldap-group</em> (single-level only)
+ authorization checks use comparisons.</p>
+
+ <p>This directive only has effect on the comparisons performed during
+ nested group processing when <code class="directive"><a href="#authldapsearchasuser">
+ AuthLDAPSearchAsUser</a></code> is also enabled.</p>
+
+ <p> This directive should only be used when your LDAP server doesn't
+ accept anonymous comparisons and you cannot use a dedicated
+ <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
+ </p>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
+<li><code class="directive"><a href="#authldapsearchasuser">AuthLDAPSearchAsUser</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthLDAPCompareDNOnServer" id="AuthLDAPCompareDNOnServer">AuthLDAPCompareDNOnServer</a> <a name="authldapcomparednonserver" id="authldapcomparednonserver">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the LDAP server to compare the DNs</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPCompareDNOnServer on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPCompareDNOnServer on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>When set, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will use the LDAP
+ server to compare the DNs. This is the only foolproof way to
+ compare DNs. <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will search the
+ directory for the DN specified with the <a href="#reqdn"><code>Require dn</code></a> directive, then,
+ retrieve the DN and compare it with the DN retrieved from the user
+ entry. If this directive is not set,
+ <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> simply does a string comparison. It
+ is possible to get false negatives with this approach, but it is
+ much faster. Note the <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> cache can speed up
+ DN comparison in most situations.</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="AuthLDAPDereferenceAliases" id="AuthLDAPDereferenceAliases">AuthLDAPDereferenceAliases</a> <a name="authldapdereferencealiases" id="authldapdereferencealiases">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>When will the module de-reference aliases</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPDereferenceAliases never|searching|finding|always</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPDereferenceAliases always</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>This directive specifies when <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will
+ de-reference aliases during LDAP operations. The default is
+ <code>always</code>.</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="AuthLDAPGroupAttribute" id="AuthLDAPGroupAttribute">AuthLDAPGroupAttribute</a> <a name="authldapgroupattribute" id="authldapgroupattribute">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>LDAP attributes used to identify the user members of
+groups.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPGroupAttribute <em>attribute</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPGroupAttribute member uniquemember</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>This directive specifies which LDAP attributes are used to
+ check for user members within groups. Multiple attributes can be used
+ by specifying this directive multiple times. If not specified,
+ then <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> uses the <code>member</code> and
+ <code>uniquemember</code> attributes.</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="AuthLDAPGroupAttributeIsDN" id="AuthLDAPGroupAttributeIsDN">AuthLDAPGroupAttributeIsDN</a> <a name="authldapgroupattributeisdn" id="authldapgroupattributeisdn">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the DN of the client username when checking for
+group membership</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPGroupAttributeIsDN on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPGroupAttributeIsDN on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>When set <code>on</code>, this directive says to use the
+ distinguished name of the client username when checking for group
+ membership. Otherwise, the username will be used. For example,
+ assume that the client sent the username <code>bjenson</code>,
+ which corresponds to the LDAP DN <code>cn=Babs Jenson,
+ o=Example</code>. If this directive is set,
+ <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will check if the group has
+ <code>cn=Babs Jenson, o=Example</code> as a member. If this
+ directive is not set, then <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will
+ check if the group has <code>bjenson</code> as a member.</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="AuthLDAPInitialBindAsUser" id="AuthLDAPInitialBindAsUser">AuthLDAPInitialBindAsUser</a> <a name="authldapinitialbindasuser" id="authldapinitialbindasuser">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines if the server does the initial DN lookup using the basic authentication users'
+own username, instead of anonymously or with hard-coded credentials for the server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPInitialBindAsUser <em>off|on</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPInitialBindAsUser off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.6 and later</td></tr>
+</table>
+ <p>By default, the server either anonymously, or with a dedicated user and
+ password, converts the basic authentication username into an LDAP
+ distinguished name (DN). This directive forces the server to use the verbatim username
+ and password provided by the incoming user to perform the initial DN
+ search.</p>
+
+ <p> If the verbatim username can't directly bind, but needs some
+ cosmetic transformation, see <code class="directive"><a href="#authldapinitialbindpattern">
+ AuthLDAPInitialBindPattern</a></code>.</p>
+
+ <p> This directive should only be used when your LDAP server doesn't
+ accept anonymous searches and you cannot use a dedicated
+ <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
+ </p>
+
+ <div class="note"><h3>Not available with authorization-only</h3>
+ This directive can only be used if this module authenticates the user, and
+ has no effect when this module is used exclusively for authorization.
+ </div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#authldapinitialbindpattern">AuthLDAPInitialBindPattern</a></code></li>
+<li><code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code></li>
+<li><code class="directive"><a href="#authldapcompareasuser">AuthLDAPCompareAsUser</a></code></li>
+<li><code class="directive"><a href="#authldapsearchasuser">AuthLDAPSearchAsUser</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthLDAPInitialBindPattern" id="AuthLDAPInitialBindPattern">AuthLDAPInitialBindPattern</a> <a name="authldapinitialbindpattern" id="authldapinitialbindpattern">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies the transformation of the basic authentication username to be used when binding to the LDAP server
+to perform a DN lookup</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPInitialBindPattern<em><var>regex</var> <var>substitution</var></em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPInitialBindPattern (.*) $1 (remote username used verbatim)</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.6 and later</td></tr>
+</table>
+ <p>If <code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code> is set to
+ <em>ON</em>, the basic authentication username will be transformed according to the
+ regular expression and substituion arguments.</p>
+
+ <p> The regular expression argument is compared against the current basic authentication username.
+ The substitution argument may contain backreferences, but has no other variable interpolation.</p>
+
+ <p> This directive should only be used when your LDAP server doesn't
+ accept anonymous searches and you cannot use a dedicated
+ <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
+ </p>
+
+ <pre class="prettyprint lang-config">AuthLDAPInitialBindPattern (.+) $1@example.com</pre>
+
+ <pre class="prettyprint lang-config">AuthLDAPInitialBindPattern (.+) cn=$1,dc=example,dc=com</pre>
+
+
+ <div class="note"><h3>Not available with authorization-only</h3>
+ This directive can only be used if this module authenticates the user, and
+ has no effect when this module is used exclusively for authorization.
+ </div>
+ <div class="note"><h3>debugging</h3>
+ The substituted DN is recorded in the environment variable
+ <em>LDAP_BINDASUSER</em>. If the regular expression does not match the input,
+ the verbatim username is used.
+ </div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
+<li><code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthLDAPMaxSubGroupDepth" id="AuthLDAPMaxSubGroupDepth">AuthLDAPMaxSubGroupDepth</a> <a name="authldapmaxsubgroupdepth" id="authldapmaxsubgroupdepth">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies the maximum sub-group nesting depth that will be
+evaluated before the user search is discontinued.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPMaxSubGroupDepth <var>Number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPMaxSubGroupDepth 10</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.0 and later</td></tr>
+</table>
+ <p>When this directive is set to a non-zero value <code>X</code>
+ combined with use of the <code>Require ldap-group someGroupDN</code>
+ directive, the provided user credentials will be searched for
+ as a member of the <code>someGroupDN</code> directory object or of
+ any group member of the current group up to the maximum nesting
+ level <code>X</code> specified by this directive.</p>
+ <p>See the <a href="#reqgroup"><code>Require ldap-group</code></a>
+ section for a more detailed example.</p>
+
+ <div class="note"><h3>Nested groups performance</h3>
+ <p> When <code class="directive">AuthLDAPSubGroupAttribute</code> overlaps with
+ <code class="directive">AuthLDAPGroupAttribute</code> (as it does by default and
+ as required by common LDAP schemas), uncached searching for subgroups in
+ large groups can be very slow. If you use large, non-nested groups, set
+ <code class="directive">AuthLDAPMaxSubGroupDepth</code> to zero.</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="AuthLDAPRemoteUserAttribute" id="AuthLDAPRemoteUserAttribute">AuthLDAPRemoteUserAttribute</a> <a name="authldapremoteuserattribute" id="authldapremoteuserattribute">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the value of the attribute returned during the user
+query to set the REMOTE_USER environment variable</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPRemoteUserAttribute uid</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>If this directive is set, the value of the
+ <code>REMOTE_USER</code> environment variable will be set to the
+ value of the attribute specified. Make sure that this attribute is
+ included in the list of attributes in the AuthLDAPUrl definition,
+ otherwise this directive will have no effect. This directive, if
+ present, takes precedence over AuthLDAPRemoteUserIsDN. This
+ directive is useful should you want people to log into a website
+ using an email address, but a backend application expects the
+ username as a userid.</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="AuthLDAPRemoteUserIsDN" id="AuthLDAPRemoteUserIsDN">AuthLDAPRemoteUserIsDN</a> <a name="authldapremoteuserisdn" id="authldapremoteuserisdn">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the DN of the client username to set the REMOTE_USER
+environment variable</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPRemoteUserIsDN on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPRemoteUserIsDN off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>If this directive is set to on, the value of the
+ <code>REMOTE_USER</code> environment variable will be set to the full
+ distinguished name of the authenticated user, rather than just
+ the username that was passed by the client. It is turned off by
+ default.</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="AuthLDAPSearchAsUser" id="AuthLDAPSearchAsUser">AuthLDAPSearchAsUser</a> <a name="authldapsearchasuser" id="authldapsearchasuser">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the authenticated user's credentials to perform authorization searches</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPSearchAsUser on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPSearchAsUser off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.6 and later</td></tr>
+</table>
+ <p>When set, and <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> has authenticated the
+ user, LDAP searches for authorization use the queried distinguished name (DN)
+ and HTTP basic authentication password of the authenticated user instead of
+ the servers configured credentials.</p>
+
+ <p> The <em>ldap-filter</em> and <em>ldap-dn</em> authorization
+ checks use searches.</p>
+
+ <p>This directive only has effect on the comparisons performed during
+ nested group processing when <code class="directive"><a href="#authldapcompareasuser">
+ AuthLDAPCompareAsUser</a></code> is also enabled.</p>
+
+ <p> This directive should only be used when your LDAP server doesn't
+ accept anonymous searches and you cannot use a dedicated
+ <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
+ </p>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
+<li><code class="directive"><a href="#authldapcompareasuser">AuthLDAPCompareAsUser</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthLDAPSubGroupAttribute" id="AuthLDAPSubGroupAttribute">AuthLDAPSubGroupAttribute</a> <a name="authldapsubgroupattribute" id="authldapsubgroupattribute">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies the attribute labels, one value per
+directive line, used to distinguish the members of the current group that
+are groups.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPSubGroupAttribute <em>attribute</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPSubgroupAttribute member uniquemember</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.0 and later</td></tr>
+</table>
+ <p>An LDAP group object may contain members that are users and
+ members that are groups (called nested or sub groups). The
+ <code>AuthLDAPSubGroupAttribute</code> directive identifies the
+ labels of group members and the <code>AuthLDAPGroupAttribute</code>
+ directive identifies the labels of the user members. Multiple
+ attributes can be used by specifying this directive multiple times.
+ If not specified, then <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> uses the
+ <code>member</code> and <code>uniqueMember</code> attributes.</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="AuthLDAPSubGroupClass" id="AuthLDAPSubGroupClass">AuthLDAPSubGroupClass</a> <a name="authldapsubgroupclass" id="authldapsubgroupclass">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies which LDAP objectClass values identify directory
+objects that are groups during sub-group processing.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPSubGroupClass <em>LdapObjectClass</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPSubGroupClass groupOfNames groupOfUniqueNames</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.0 and later</td></tr>
+</table>
+ <p>An LDAP group object may contain members that are users and
+ members that are groups (called nested or sub groups). The
+ <code>AuthLDAPSubGroupAttribute</code> directive identifies the
+ labels of members that may be sub-groups of the current group
+ (as opposed to user members). The <code>AuthLDAPSubGroupClass</code>
+ directive specifies the LDAP objectClass values used in verifying that
+ these potential sub-groups are in fact group objects. Verified sub-groups
+ can then be searched for more user or sub-group members. Multiple
+ attributes can be used by specifying this directive multiple times.
+ If not specified, then <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> uses the
+ <code>groupOfNames</code> and <code>groupOfUniqueNames</code> values.</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="AuthLDAPUrl" id="AuthLDAPUrl">AuthLDAPUrl</a> <a name="authldapurl" id="authldapurl">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>URL specifying the LDAP search parameters</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPUrl <em>url [NONE|SSL|TLS|STARTTLS]</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>An RFC 2255 URL which specifies the LDAP search parameters
+ to use. The syntax of the URL is</p>
+<div class="example"><p><code>ldap://host:port/basedn?attribute?scope?filter</code></p></div>
+ <p>If you want to specify more than one LDAP URL that Apache should try in turn, the syntax is:</p>
+<pre class="prettyprint lang-config">AuthLDAPUrl "ldap://ldap1.example.com ldap2.example.com/dc=..."</pre>
+
+<p><em><strong>Caveat: </strong>If you specify multiple servers, you need to enclose the entire URL string in quotes;
+otherwise you will get an error: "AuthLDAPURL takes one argument, URL to define LDAP connection.." </em>
+You can of course use search parameters on each of these.</p>
+
+<dl>
+<dt>ldap</dt>
+
+ <dd>For regular ldap, use the
+ string <code>ldap</code>. For secure LDAP, use <code>ldaps</code>
+ instead. Secure LDAP is only available if Apache was linked
+ to an LDAP library with SSL support.</dd>
+
+<dt>host:port</dt>
+
+ <dd>
+ <p>The name/port of the ldap server (defaults to
+ <code>localhost:389</code> for <code>ldap</code>, and
+ <code>localhost:636</code> for <code>ldaps</code>). To
+ specify multiple, redundant LDAP servers, just list all
+ servers, separated by spaces. <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>
+ will try connecting to each server in turn, until it makes a
+ successful connection. If multiple ldap servers are specified,
+ then entire LDAP URL must be encapsulated in double quotes.</p>
+
+ <p>Once a connection has been made to a server, that
+ connection remains active for the life of the
+ <code class="program"><a href="../programs/httpd.html">httpd</a></code> process, or until the LDAP server goes
+ down.</p>
+
+ <p>If the LDAP server goes down and breaks an existing
+ connection, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will attempt to
+ re-connect, starting with the primary server, and trying
+ each redundant server in turn. Note that this is different
+ than a true round-robin search.</p>
+ </dd>
+
+<dt>basedn</dt>
+
+ <dd>The DN of the branch of the
+ directory where all searches should start from. At the very
+ least, this must be the top of your directory tree, but
+ could also specify a subtree in the directory.</dd>
+
+<dt>attribute</dt>
+
+ <dd>The attribute to search for.
+ Although RFC 2255 allows a comma-separated list of
+ attributes, only the first attribute will be used, no
+ matter how many are provided. If no attributes are
+ provided, the default is to use <code>uid</code>. It's a good
+ idea to choose an attribute that will be unique across all
+ entries in the subtree you will be using. All attributes
+ listed will be put into the environment with an AUTHENTICATE_ prefix
+ for use by other modules.</dd>
+
+<dt>scope</dt>
+
+ <dd>The scope of the search. Can be either <code>one</code> or
+ <code>sub</code>. Note that a scope of <code>base</code> is
+ also supported by RFC 2255, but is not supported by this
+ module. If the scope is not provided, or if <code>base</code> scope
+ is specified, the default is to use a scope of
+ <code>sub</code>.</dd>
+
+<dt>filter</dt>
+
+ <dd>A valid LDAP search filter. If
+ not provided, defaults to <code>(objectClass=*)</code>, which
+ will search for all objects in the tree. Filters are
+ limited to approximately 8000 characters (the definition of
+ <code>MAX_STRING_LEN</code> in the Apache source code). This
+ should be more than sufficient for any application. In 2.4.10 and later,
+ The word "none" may be used to not use any filter, which may be
+ required by some primitive LDAP servers.</dd>
+</dl>
+
+ <p>When doing searches, the attribute, filter and username passed
+ by the HTTP client are combined to create a search filter that
+ looks like
+ <code>(&amp;(<em>filter</em>)(<em>attribute</em>=<em>username</em>))</code>.</p>
+
+ <p>For example, consider an URL of
+ <code>ldap://ldap.example.com/o=Example?cn?sub?(posixid=*)</code>. When
+ a client attempts to connect using a username of <code>Babs
+ Jenson</code>, the resulting search filter will be
+ <code>(&amp;(posixid=*)(cn=Babs Jenson))</code>.</p>
+
+ <p>An optional parameter can be added to allow the LDAP Url to override
+ the connection type. This parameter can be one of the following:</p>
+
+<dl>
+ <dt>NONE</dt>
+ <dd>Establish an unsecure connection on the default LDAP port. This
+ is the same as <code>ldap://</code> on port 389.</dd>
+ <dt>SSL</dt>
+ <dd>Establish a secure connection on the default secure LDAP port.
+ This is the same as <code>ldaps://</code></dd>
+ <dt>TLS | STARTTLS</dt>
+ <dd>Establish an upgraded secure connection on the default LDAP port.
+ This connection will be initiated on port 389 by default and then
+ upgraded to a secure connection on the same port.</dd>
+</dl>
+
+ <p>See above for examples of <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code> URLs.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="contents" id="contents">Contents</a></h2>
@@ -771,616 +1381,6 @@ Require group "mygroupfile"</pre>
</ul>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthLDAPAuthorizePrefix" id="AuthLDAPAuthorizePrefix">AuthLDAPAuthorizePrefix</a> <a name="authldapauthorizeprefix" id="authldapauthorizeprefix">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies the prefix for environment variables set during
-authorization</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPAuthorizePrefix <em>prefix</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPAuthorizePrefix AUTHORIZE_</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.6 and later</td></tr>
-</table>
- <p>This directive allows you to override the prefix used for environment
- variables set during LDAP authorization. If <em>AUTHENTICATE_</em> is
- specified, consumers of these environment variables see the same information
- whether LDAP has performed authentication, authorization, or both.</p>
-
- <div class="note"><h3>Note</h3>
- No authorization variables are set when a user is authorized on the basis of
- <code>Require valid-user</code>.
- </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="AuthLDAPBindAuthoritative" id="AuthLDAPBindAuthoritative">AuthLDAPBindAuthoritative</a> <a name="authldapbindauthoritative" id="authldapbindauthoritative">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines if other authentication providers are used when a user can be mapped to a DN but the server cannot successfully bind with the user's credentials.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPBindAuthoritative<em>off|on</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPBindAuthoritative on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>By default, subsequent authentication providers are only queried if a
- user cannot be mapped to a DN, but not if the user can be mapped to a DN and their
- password cannot be verified with an LDAP bind.
- If <code class="directive"><a href="#authldapbindauthoritative">AuthLDAPBindAuthoritative</a></code>
- is set to <em>off</em>, other configured authentication modules will have
- a chance to validate the user if the LDAP bind (with the current user's credentials)
- fails for any reason.</p>
- <p> This allows users present in both LDAP and
- <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> to authenticate
- when the LDAP server is available but the user's account is locked or password
- is otherwise unusable.</p>
-
-<h3>See also</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li>
-<li><code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthLDAPBindDN" id="AuthLDAPBindDN">AuthLDAPBindDN</a> <a name="authldapbinddn" id="authldapbinddn">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Optional DN to use in binding to the LDAP server</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPBindDN <em>distinguished-name</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>An optional DN used to bind to the server when searching for
- entries. If not provided, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will use
- an anonymous bind.</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="AuthLDAPBindPassword" id="AuthLDAPBindPassword">AuthLDAPBindPassword</a> <a name="authldapbindpassword" id="authldapbindpassword">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Password used in conjuction with the bind DN</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPBindPassword <em>password</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td><em>exec:</em> was added in 2.4.5.</td></tr>
-</table>
- <p>A bind password to use in conjunction with the bind DN. Note
- that the bind password is probably sensitive data, and should be
- properly protected. You should only use the <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code> and <code class="directive"><a href="#authldapbindpassword">AuthLDAPBindPassword</a></code> if you
- absolutely need them to search the directory.</p>
-
- <p>If the value begins with exec: the resulting command will be
- executed and the first line returned to standard output by the
- program will be used as the password.</p>
-<pre class="prettyprint lang-config">#Password used as-is
-AuthLDAPBindPassword secret
-
-#Run /path/to/program to get my password
-AuthLDAPBindPassword exec:/path/to/program
-
-#Run /path/to/otherProgram and provide arguments
-AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"</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="AuthLDAPCharsetConfig" id="AuthLDAPCharsetConfig">AuthLDAPCharsetConfig</a> <a name="authldapcharsetconfig" id="authldapcharsetconfig">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Language to charset conversion configuration file</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPCharsetConfig <em>file-path</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</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_authnz_ldap</td></tr>
-</table>
- <p>The <code class="directive">AuthLDAPCharsetConfig</code> directive sets the location
- of the language to charset conversion configuration file. <var>File-path</var> is relative
- to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. This file specifies
- the list of language extensions to character sets.
- Most administrators use the provided <code>charset.conv</code>
- file, which associates common language extensions to character sets.</p>
-
- <p>The file contains lines in the following format:</p>
-
- <div class="example"><p><code>
- <var>Language-Extension</var> <var>charset</var> [<var>Language-String</var>] ...
- </code></p></div>
-
- <p>The case of the extension does not matter. Blank lines, and lines
- beginning with a hash character (<code>#</code>) are ignored.</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="AuthLDAPCompareAsUser" id="AuthLDAPCompareAsUser">AuthLDAPCompareAsUser</a> <a name="authldapcompareasuser" id="authldapcompareasuser">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the authenticated user's credentials to perform authorization comparisons</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPCompareAsUser on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPCompareAsUser off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.6 and later</td></tr>
-</table>
- <p>When set, and <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> has authenticated the
- user, LDAP comparisons for authorization use the queried distinguished name (DN)
- and HTTP basic authentication password of the authenticated user instead of
- the servers configured credentials.</p>
-
- <p> The <em>ldap-attribute</em>, <em>ldap-user</em>, and <em>ldap-group</em> (single-level only)
- authorization checks use comparisons.</p>
-
- <p>This directive only has effect on the comparisons performed during
- nested group processing when <code class="directive"><a href="#authldapsearchasuser">
- AuthLDAPSearchAsUser</a></code> is also enabled.</p>
-
- <p> This directive should only be used when your LDAP server doesn't
- accept anonymous comparisons and you cannot use a dedicated
- <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
- </p>
-
-<h3>See also</h3>
-<ul>
-<li><code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
-<li><code class="directive"><a href="#authldapsearchasuser">AuthLDAPSearchAsUser</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthLDAPCompareDNOnServer" id="AuthLDAPCompareDNOnServer">AuthLDAPCompareDNOnServer</a> <a name="authldapcomparednonserver" id="authldapcomparednonserver">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the LDAP server to compare the DNs</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPCompareDNOnServer on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPCompareDNOnServer on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>When set, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will use the LDAP
- server to compare the DNs. This is the only foolproof way to
- compare DNs. <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will search the
- directory for the DN specified with the <a href="#reqdn"><code>Require dn</code></a> directive, then,
- retrieve the DN and compare it with the DN retrieved from the user
- entry. If this directive is not set,
- <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> simply does a string comparison. It
- is possible to get false negatives with this approach, but it is
- much faster. Note the <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> cache can speed up
- DN comparison in most situations.</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="AuthLDAPDereferenceAliases" id="AuthLDAPDereferenceAliases">AuthLDAPDereferenceAliases</a> <a name="authldapdereferencealiases" id="authldapdereferencealiases">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>When will the module de-reference aliases</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPDereferenceAliases never|searching|finding|always</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPDereferenceAliases always</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>This directive specifies when <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will
- de-reference aliases during LDAP operations. The default is
- <code>always</code>.</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="AuthLDAPGroupAttribute" id="AuthLDAPGroupAttribute">AuthLDAPGroupAttribute</a> <a name="authldapgroupattribute" id="authldapgroupattribute">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>LDAP attributes used to identify the user members of
-groups.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPGroupAttribute <em>attribute</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPGroupAttribute member uniquemember</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>This directive specifies which LDAP attributes are used to
- check for user members within groups. Multiple attributes can be used
- by specifying this directive multiple times. If not specified,
- then <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> uses the <code>member</code> and
- <code>uniquemember</code> attributes.</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="AuthLDAPGroupAttributeIsDN" id="AuthLDAPGroupAttributeIsDN">AuthLDAPGroupAttributeIsDN</a> <a name="authldapgroupattributeisdn" id="authldapgroupattributeisdn">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the DN of the client username when checking for
-group membership</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPGroupAttributeIsDN on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPGroupAttributeIsDN on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>When set <code>on</code>, this directive says to use the
- distinguished name of the client username when checking for group
- membership. Otherwise, the username will be used. For example,
- assume that the client sent the username <code>bjenson</code>,
- which corresponds to the LDAP DN <code>cn=Babs Jenson,
- o=Example</code>. If this directive is set,
- <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will check if the group has
- <code>cn=Babs Jenson, o=Example</code> as a member. If this
- directive is not set, then <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will
- check if the group has <code>bjenson</code> as a member.</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="AuthLDAPInitialBindAsUser" id="AuthLDAPInitialBindAsUser">AuthLDAPInitialBindAsUser</a> <a name="authldapinitialbindasuser" id="authldapinitialbindasuser">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines if the server does the initial DN lookup using the basic authentication users'
-own username, instead of anonymously or with hard-coded credentials for the server</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPInitialBindAsUser <em>off|on</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPInitialBindAsUser off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.6 and later</td></tr>
-</table>
- <p>By default, the server either anonymously, or with a dedicated user and
- password, converts the basic authentication username into an LDAP
- distinguished name (DN). This directive forces the server to use the verbatim username
- and password provided by the incoming user to perform the initial DN
- search.</p>
-
- <p> If the verbatim username can't directly bind, but needs some
- cosmetic transformation, see <code class="directive"><a href="#authldapinitialbindpattern">
- AuthLDAPInitialBindPattern</a></code>.</p>
-
- <p> This directive should only be used when your LDAP server doesn't
- accept anonymous searches and you cannot use a dedicated
- <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
- </p>
-
- <div class="note"><h3>Not available with authorization-only</h3>
- This directive can only be used if this module authenticates the user, and
- has no effect when this module is used exclusively for authorization.
- </div>
-
-<h3>See also</h3>
-<ul>
-<li><code class="directive"><a href="#authldapinitialbindpattern">AuthLDAPInitialBindPattern</a></code></li>
-<li><code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code></li>
-<li><code class="directive"><a href="#authldapcompareasuser">AuthLDAPCompareAsUser</a></code></li>
-<li><code class="directive"><a href="#authldapsearchasuser">AuthLDAPSearchAsUser</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthLDAPInitialBindPattern" id="AuthLDAPInitialBindPattern">AuthLDAPInitialBindPattern</a> <a name="authldapinitialbindpattern" id="authldapinitialbindpattern">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies the transformation of the basic authentication username to be used when binding to the LDAP server
-to perform a DN lookup</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPInitialBindPattern<em><var>regex</var> <var>substitution</var></em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPInitialBindPattern (.*) $1 (remote username used verbatim)</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.6 and later</td></tr>
-</table>
- <p>If <code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code> is set to
- <em>ON</em>, the basic authentication username will be transformed according to the
- regular expression and substituion arguments.</p>
-
- <p> The regular expression argument is compared against the current basic authentication username.
- The substitution argument may contain backreferences, but has no other variable interpolation.</p>
-
- <p> This directive should only be used when your LDAP server doesn't
- accept anonymous searches and you cannot use a dedicated
- <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
- </p>
-
- <pre class="prettyprint lang-config">AuthLDAPInitialBindPattern (.+) $1@example.com</pre>
-
- <pre class="prettyprint lang-config">AuthLDAPInitialBindPattern (.+) cn=$1,dc=example,dc=com</pre>
-
-
- <div class="note"><h3>Not available with authorization-only</h3>
- This directive can only be used if this module authenticates the user, and
- has no effect when this module is used exclusively for authorization.
- </div>
- <div class="note"><h3>debugging</h3>
- The substituted DN is recorded in the environment variable
- <em>LDAP_BINDASUSER</em>. If the regular expression does not match the input,
- the verbatim username is used.
- </div>
-
-<h3>See also</h3>
-<ul>
-<li><code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
-<li><code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthLDAPMaxSubGroupDepth" id="AuthLDAPMaxSubGroupDepth">AuthLDAPMaxSubGroupDepth</a> <a name="authldapmaxsubgroupdepth" id="authldapmaxsubgroupdepth">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies the maximum sub-group nesting depth that will be
-evaluated before the user search is discontinued.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPMaxSubGroupDepth <var>Number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPMaxSubGroupDepth 10</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.0 and later</td></tr>
-</table>
- <p>When this directive is set to a non-zero value <code>X</code>
- combined with use of the <code>Require ldap-group someGroupDN</code>
- directive, the provided user credentials will be searched for
- as a member of the <code>someGroupDN</code> directory object or of
- any group member of the current group up to the maximum nesting
- level <code>X</code> specified by this directive.</p>
- <p>See the <a href="#reqgroup"><code>Require ldap-group</code></a>
- section for a more detailed example.</p>
-
- <div class="note"><h3>Nested groups performance</h3>
- <p> When <code class="directive">AuthLDAPSubGroupAttribute</code> overlaps with
- <code class="directive">AuthLDAPGroupAttribute</code> (as it does by default and
- as required by common LDAP schemas), uncached searching for subgroups in
- large groups can be very slow. If you use large, non-nested groups, set
- <code class="directive">AuthLDAPMaxSubGroupDepth</code> to zero.</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="AuthLDAPRemoteUserAttribute" id="AuthLDAPRemoteUserAttribute">AuthLDAPRemoteUserAttribute</a> <a name="authldapremoteuserattribute" id="authldapremoteuserattribute">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the value of the attribute returned during the user
-query to set the REMOTE_USER environment variable</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPRemoteUserAttribute uid</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>If this directive is set, the value of the
- <code>REMOTE_USER</code> environment variable will be set to the
- value of the attribute specified. Make sure that this attribute is
- included in the list of attributes in the AuthLDAPUrl definition,
- otherwise this directive will have no effect. This directive, if
- present, takes precedence over AuthLDAPRemoteUserIsDN. This
- directive is useful should you want people to log into a website
- using an email address, but a backend application expects the
- username as a userid.</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="AuthLDAPRemoteUserIsDN" id="AuthLDAPRemoteUserIsDN">AuthLDAPRemoteUserIsDN</a> <a name="authldapremoteuserisdn" id="authldapremoteuserisdn">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the DN of the client username to set the REMOTE_USER
-environment variable</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPRemoteUserIsDN on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPRemoteUserIsDN off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>If this directive is set to on, the value of the
- <code>REMOTE_USER</code> environment variable will be set to the full
- distinguished name of the authenticated user, rather than just
- the username that was passed by the client. It is turned off by
- default.</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="AuthLDAPSearchAsUser" id="AuthLDAPSearchAsUser">AuthLDAPSearchAsUser</a> <a name="authldapsearchasuser" id="authldapsearchasuser">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the authenticated user's credentials to perform authorization searches</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPSearchAsUser on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPSearchAsUser off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.6 and later</td></tr>
-</table>
- <p>When set, and <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> has authenticated the
- user, LDAP searches for authorization use the queried distinguished name (DN)
- and HTTP basic authentication password of the authenticated user instead of
- the servers configured credentials.</p>
-
- <p> The <em>ldap-filter</em> and <em>ldap-dn</em> authorization
- checks use searches.</p>
-
- <p>This directive only has effect on the comparisons performed during
- nested group processing when <code class="directive"><a href="#authldapcompareasuser">
- AuthLDAPCompareAsUser</a></code> is also enabled.</p>
-
- <p> This directive should only be used when your LDAP server doesn't
- accept anonymous searches and you cannot use a dedicated
- <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
- </p>
-
-<h3>See also</h3>
-<ul>
-<li><code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
-<li><code class="directive"><a href="#authldapcompareasuser">AuthLDAPCompareAsUser</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthLDAPSubGroupAttribute" id="AuthLDAPSubGroupAttribute">AuthLDAPSubGroupAttribute</a> <a name="authldapsubgroupattribute" id="authldapsubgroupattribute">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies the attribute labels, one value per
-directive line, used to distinguish the members of the current group that
-are groups.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPSubGroupAttribute <em>attribute</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPSubgroupAttribute member uniquemember</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.0 and later</td></tr>
-</table>
- <p>An LDAP group object may contain members that are users and
- members that are groups (called nested or sub groups). The
- <code>AuthLDAPSubGroupAttribute</code> directive identifies the
- labels of group members and the <code>AuthLDAPGroupAttribute</code>
- directive identifies the labels of the user members. Multiple
- attributes can be used by specifying this directive multiple times.
- If not specified, then <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> uses the
- <code>member</code> and <code>uniqueMember</code> attributes.</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="AuthLDAPSubGroupClass" id="AuthLDAPSubGroupClass">AuthLDAPSubGroupClass</a> <a name="authldapsubgroupclass" id="authldapsubgroupclass">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies which LDAP objectClass values identify directory
-objects that are groups during sub-group processing.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPSubGroupClass <em>LdapObjectClass</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPSubGroupClass groupOfNames groupOfUniqueNames</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.0 and later</td></tr>
-</table>
- <p>An LDAP group object may contain members that are users and
- members that are groups (called nested or sub groups). The
- <code>AuthLDAPSubGroupAttribute</code> directive identifies the
- labels of members that may be sub-groups of the current group
- (as opposed to user members). The <code>AuthLDAPSubGroupClass</code>
- directive specifies the LDAP objectClass values used in verifying that
- these potential sub-groups are in fact group objects. Verified sub-groups
- can then be searched for more user or sub-group members. Multiple
- attributes can be used by specifying this directive multiple times.
- If not specified, then <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> uses the
- <code>groupOfNames</code> and <code>groupOfUniqueNames</code> values.</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="AuthLDAPUrl" id="AuthLDAPUrl">AuthLDAPUrl</a> <a name="authldapurl" id="authldapurl">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>URL specifying the LDAP search parameters</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPUrl <em>url [NONE|SSL|TLS|STARTTLS]</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>An RFC 2255 URL which specifies the LDAP search parameters
- to use. The syntax of the URL is</p>
-<div class="example"><p><code>ldap://host:port/basedn?attribute?scope?filter</code></p></div>
- <p>If you want to specify more than one LDAP URL that Apache should try in turn, the syntax is:</p>
-<pre class="prettyprint lang-config">AuthLDAPUrl "ldap://ldap1.example.com ldap2.example.com/dc=..."</pre>
-
-<p><em><strong>Caveat: </strong>If you specify multiple servers, you need to enclose the entire URL string in quotes;
-otherwise you will get an error: "AuthLDAPURL takes one argument, URL to define LDAP connection.." </em>
-You can of course use search parameters on each of these.</p>
-
-<dl>
-<dt>ldap</dt>
-
- <dd>For regular ldap, use the
- string <code>ldap</code>. For secure LDAP, use <code>ldaps</code>
- instead. Secure LDAP is only available if Apache was linked
- to an LDAP library with SSL support.</dd>
-
-<dt>host:port</dt>
-
- <dd>
- <p>The name/port of the ldap server (defaults to
- <code>localhost:389</code> for <code>ldap</code>, and
- <code>localhost:636</code> for <code>ldaps</code>). To
- specify multiple, redundant LDAP servers, just list all
- servers, separated by spaces. <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>
- will try connecting to each server in turn, until it makes a
- successful connection. If multiple ldap servers are specified,
- then entire LDAP URL must be encapsulated in double quotes.</p>
-
- <p>Once a connection has been made to a server, that
- connection remains active for the life of the
- <code class="program"><a href="../programs/httpd.html">httpd</a></code> process, or until the LDAP server goes
- down.</p>
-
- <p>If the LDAP server goes down and breaks an existing
- connection, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> will attempt to
- re-connect, starting with the primary server, and trying
- each redundant server in turn. Note that this is different
- than a true round-robin search.</p>
- </dd>
-
-<dt>basedn</dt>
-
- <dd>The DN of the branch of the
- directory where all searches should start from. At the very
- least, this must be the top of your directory tree, but
- could also specify a subtree in the directory.</dd>
-
-<dt>attribute</dt>
-
- <dd>The attribute to search for.
- Although RFC 2255 allows a comma-separated list of
- attributes, only the first attribute will be used, no
- matter how many are provided. If no attributes are
- provided, the default is to use <code>uid</code>. It's a good
- idea to choose an attribute that will be unique across all
- entries in the subtree you will be using. All attributes
- listed will be put into the environment with an AUTHENTICATE_ prefix
- for use by other modules.</dd>
-
-<dt>scope</dt>
-
- <dd>The scope of the search. Can be either <code>one</code> or
- <code>sub</code>. Note that a scope of <code>base</code> is
- also supported by RFC 2255, but is not supported by this
- module. If the scope is not provided, or if <code>base</code> scope
- is specified, the default is to use a scope of
- <code>sub</code>.</dd>
-
-<dt>filter</dt>
-
- <dd>A valid LDAP search filter. If
- not provided, defaults to <code>(objectClass=*)</code>, which
- will search for all objects in the tree. Filters are
- limited to approximately 8000 characters (the definition of
- <code>MAX_STRING_LEN</code> in the Apache source code). This
- should be more than sufficient for any application. In 2.4.10 and later,
- The word "none" may be used to not use any filter, which may be
- required by some primitive LDAP servers.</dd>
-</dl>
-
- <p>When doing searches, the attribute, filter and username passed
- by the HTTP client are combined to create a search filter that
- looks like
- <code>(&amp;(<em>filter</em>)(<em>attribute</em>=<em>username</em>))</code>.</p>
-
- <p>For example, consider an URL of
- <code>ldap://ldap.example.com/o=Example?cn?sub?(posixid=*)</code>. When
- a client attempts to connect using a username of <code>Babs
- Jenson</code>, the resulting search filter will be
- <code>(&amp;(posixid=*)(cn=Babs Jenson))</code>.</p>
-
- <p>An optional parameter can be added to allow the LDAP Url to override
- the connection type. This parameter can be one of the following:</p>
-
-<dl>
- <dt>NONE</dt>
- <dd>Establish an unsecure connection on the default LDAP port. This
- is the same as <code>ldap://</code> on port 389.</dd>
- <dt>SSL</dt>
- <dd>Establish a secure connection on the default secure LDAP port.
- This is the same as <code>ldaps://</code></dd>
- <dt>TLS | STARTTLS</dt>
- <dd>Establish an upgraded secure connection on the default LDAP port.
- This connection will be initiated on port 389 by default and then
- upgraded to a secure connection on the same port.</dd>
-</dl>
-
- <p>See above for examples of <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code> URLs.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authnz_ldap.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authnz_ldap.html.fr b/docs/manual/mod/mod_authnz_ldap.html.fr
index 24425d8b19..ba47083df4 100644
--- a/docs/manual/mod/mod_authnz_ldap.html.fr
+++ b/docs/manual/mod/mod_authnz_ldap.html.fr
@@ -109,6 +109,699 @@ Directory</a></li>
<li><code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="authldapauthorizeprefix" id="authldapauthorizeprefix">Directive</a> <a name="AuthLDAPAuthorizePrefix" id="AuthLDAPAuthorizePrefix">AuthLDAPAuthorizePrefix</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie le pr�fixe ajout� aux variables d'environnement
+durant la phase d'autorisation</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPAuthorizePrefix <em>pr�fixe</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPAuthorizePrefix AUTHORIZE_</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.6</td></tr>
+</table>
+ <p>Cette directive permet de sp�cifier le pr�fixe ajout� aux
+ variables d'environnement durant la phase d'autorisation. Si la
+ valeur sp�cifi�e est <em>AUTHENTICATE_</em>, les utilisateurs de ces
+ variables d'environnement verront les m�mes informations, que le
+ serveur effectue une authentification, une autorisation, ou les
+ deux.</p>
+
+ <div class="note"><h3>Note</h3>
+ Aucune variable d'autorisation n'est d�finie lorsqu'un utilisateur
+ s'est vu autoriser l'acc�s via la directive <code>Require
+ valid-user</code>.
+ </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="authldapbindauthoritative" id="authldapbindauthoritative">Directive</a> <a name="AuthLDAPBindAuthoritative" id="AuthLDAPBindAuthoritative">AuthLDAPBindAuthoritative</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�termine si l'on doit utiliser d'autres fournisseurs
+d'authentification lorsque le serveur ne peut pas valider les donn�es
+d'authentification de l'utilisateur, alors que ce dernier poss�de un
+DN.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPBindAuthoritative<em>off|on</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPBindAuthoritative on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>Par d�faut, des fournisseurs d'authentification sont appel�s
+ si un utilisateur ne poss�de pas de DN, mais ne le sont pas si
+ l'utilisateur poss�de un DN et si son mot de passe ne peut pas �tre
+ v�rifi� lors d'une connexion au serveur LDAP. Si la directive
+ <code class="directive"><a href="#authldapbindauthoritative">AuthLDAPBindAuthoritative</a></code> est
+ d�finie � <em>off</em>, d'autres modules d'authentification
+ configur�s auront une chance de valider le mot de passe de
+ l'utilisateur si la tentative de connexion au serveur LDAP �choue
+ pour une raison quelconque (avec les donn�es d'authentification
+ fournies).</p>
+ <p>Ceci permet aux utilisateurs pr�sent � la fois dans l'annuaire
+ LDAP et dans un fichier <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> de s'authentifier
+ lorsque le serveur LDAP est disponible, alors que le compte de
+ l'utilisateur est verrouill� ou que son mot de passe est
+ inutilisable pour une raison quelconque.</p>
+
+<h3>Voir aussi</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li>
+<li><code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="authldapbinddn" id="authldapbinddn">Directive</a> <a name="AuthLDAPBindDN" id="AuthLDAPBindDN">AuthLDAPBindDN</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Un DN optionnel pour se connecter au serveur
+LDAP</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPBindDN <em>dn</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>Cette directive permet de d�finir un DN optionnel pour se
+ connecter au serveur afin d'y rechercher des entr�es. Si aucun DN
+ n'est sp�cifi�, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> tentera une
+ connexion anonyme.</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="authldapbindpassword" id="authldapbindpassword">Directive</a> <a name="AuthLDAPBindPassword" id="AuthLDAPBindPassword">AuthLDAPBindPassword</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Mot de passe � utiliser en conjonction avec le DN de
+connexion</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPBindPassword <em>mot-de-passe</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td><em>exec:</em> est disponible depuis la version 2.4.5 du
+serveur HTTP Apache.</td></tr>
+</table>
+ <p>Cette directive permet de sp�cifier un mot de passe � utiliser en
+ conjonction avec le DN de connexion. Notez que ce mot de passe
+ constitue en g�n�ral une donn�e sensible, et doit donc �tre prot�g�
+ de mani�re appropri�e. Vous ne devez utiliser les directives
+ <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code> et <code class="directive"><a href="#authldapbindpassword">AuthLDAPBindPassword</a></code> que si
+ vous en avez vraiment besoin pour effectuer une recherche dans
+ l'annuaire.</p>
+
+ <p>Si la valeur sp�cifi�e d�bute par "exec:", la commande qui suit sera
+ ex�cut�e, et la premi�re ligne renvoy�e par la commande sur la
+ sortie standard sera utilis�e comme mot de passe.</p>
+<pre class="prettyprint lang-config"># Mot de passe sp�cifi� directement
+AuthLDAPBindPassword secret
+
+# Ex�cution de /path/to/program pour obtenir le mot de passe
+AuthLDAPBindPassword exec:/path/to/program
+
+# Ex�cution de /path/to/otherProgram avec un argument pour obtenir le mot de passe
+AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"</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="authldapcharsetconfig" id="authldapcharsetconfig">Directive</a> <a name="AuthLDAPCharsetConfig" id="AuthLDAPCharsetConfig">AuthLDAPCharsetConfig</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Chemin du fichier de configuration de la correspondance
+langage/jeu de caract�res</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPCharsetConfig <em>chemin-fichier</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</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_authnz_ldap</td></tr>
+</table>
+ <p>La directive <code class="directive">AuthLDAPCharsetConfig</code> permet
+ de d�finir le chemin du fichier de configuration de la
+ correspondance langage/jeu de caract�res. <var>chemin-fichier</var>
+ est un chemin relatif au r�pertoire d�fini par la directive
+ <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. Ce fichier contient une liste
+ de correspondances extension de langage/jeu de caract�res. La
+ plupart des administrateurs utilisent le fichier
+ <code>charset.conv</code> fourni qui associe les extensions de
+ langage courantes � leurs jeux de caract�res.</p>
+
+ <p>Le fichier contient des lignes au format suivant :</p>
+
+ <div class="example"><p><code>
+ <var>extension de langage</var> <var>jeu de caract�res</var>
+ [<var>Nom du langage</var>] ...
+ </code></p></div>
+
+ <p>L'extension est insensible � la casse. Les lignes vides et les
+ lignes commen�ant par un di�se (<code>#</code>) sont ignor�es.</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="authldapcompareasuser" id="authldapcompareasuser">Directive</a> <a name="AuthLDAPCompareAsUser" id="AuthLDAPCompareAsUser">AuthLDAPCompareAsUser</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilisation des donn�es d'authentification de l'utilisateur
+pour effectuer les comparaisons pour l'attribution des autorisations</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPCompareAsUser on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPCompareAsUser off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version version 2.3.6</td></tr>
+</table>
+ <p>Lorsque cette directive est d�finie, et si
+ <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> a authentifi� l'utilisateur, les
+ recherches LDAP pour les autorisations utilisent le nom distinctif
+ trouv� (DN) et le mot de passe d'authentification basique HTTP de
+ l'utilisateur authentifi� au lieu des donn�es d'authentification
+ configur�es au niveau du serveur.</p>
+
+ <p>Les v�rifications d'autorisation <em>ldap-attribute</em>,
+ <em>ldap-user</em>, et <em>ldap-group</em> (niveau simple seulement)
+ utilisent des comparaisons.</p>
+
+ <p>Cette directive n'a d'effet sur les comparaisons effectu�es au
+ cours des traitements de groupe imbriqu�s, et lorsque la directive
+ <code class="directive"><a href="#authldapsearchasuser">AuthLDAPSearchAsUser</a></code>
+ est aussi activ�e.</p>
+
+ <p>Cette directive ne doit �tre utilis�e que si votre serveur LDAP
+ n'autorise pas les recherches anonymes, ou si vous ne pouvez pas
+ utiliser de nom d'utilisateur d�di� via la directive <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
+ </p>
+
+<h3>Voir aussi</h3>
+<ul>
+<li><code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
+<li><code class="directive"><a href="#authldapsearchasuser">AuthLDAPSearchAsUser</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="authldapcomparednonserver" id="authldapcomparednonserver">Directive</a> <a name="AuthLDAPCompareDNOnServer" id="AuthLDAPCompareDNOnServer">AuthLDAPCompareDNOnServer</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilise le serveur LDAP pour comparer les DNs</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPCompareDNOnServer on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPCompareDNOnServer on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>Lorsque cette directive est d�finie � on,
+ <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> utilise le serveur LDAP pour
+ comparer les DNs. Il s'agit de la seule m�thode infaillible pour
+ comparer les DNs. <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> va rechercher
+ dans l'annuaire le DN sp�cifi� par la directive <a href="#reqdn"><code>Require dn</code></a>, puis extraire ce DN et le
+ comparer avec le DN extrait de l'entr�e de l'utilisateur. Si cette
+ directive est � off, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> effectue une
+ simple comparaison de cha�nes. Cette derni�re approche peut produire
+ des faux n�gatifs, mais elle est beaucoup plus rapide. Notez
+ cependant que le cache de <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> peut acc�l�rer
+ la comparaison de DNs dans la plupart des situations.</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="authldapdereferencealiases" id="authldapdereferencealiases">Directive</a> <a name="AuthLDAPDereferenceAliases" id="AuthLDAPDereferenceAliases">AuthLDAPDereferenceAliases</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>� quel moment le module va d�r�f�rencer les
+alias</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPDereferenceAliases never|searching|finding|always</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPDereferenceAliases always</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>Cette directive permet de sp�cifier � quel moment
+ <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> va d�r�f�rencer les alias au cours
+ des op�rations li�es � LDAP. La valeur par d�faut est
+ <code>always</code>.</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="authldapgroupattribute" id="authldapgroupattribute">Directive</a> <a name="AuthLDAPGroupAttribute" id="AuthLDAPGroupAttribute">AuthLDAPGroupAttribute</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>L'attribut LDAP utilis� pour v�rifier l'appartenance d'un
+utilisateur � un groupe.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPGroupAttribute <em>attribut</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPGroupAttribute member uniquemember</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>Cette directive permet de sp�cifier quel attribut LDAP est
+ utilis� pour v�rifier l'appartenance d'un utilisateur � un
+ groupe. On peut sp�cifier plusieurs attributs en r�p�tant cette
+ directive plusieurs fois. Si la directive n'est pas d�finie,
+ <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> utilise les attributs
+ <code>member</code> et <code>uniquemember</code>.</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="authldapgroupattributeisdn" id="authldapgroupattributeisdn">Directive</a> <a name="AuthLDAPGroupAttributeIsDN" id="AuthLDAPGroupAttributeIsDN">AuthLDAPGroupAttributeIsDN</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilise le DN de l'utilisateur pour v�rifier son
+appartenance � un groupe</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPGroupAttributeIsDN on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPGroupAttributeIsDN on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>Lorsqu'elle est d�finie � <code>on</code>, cette directive
+ indique que c'est le DN de l'utilisateur qui doit �tre utilis� pour
+ v�rifier son appartenance � un groupe. Dans le cas contraire, c'est
+ le nom de l'utilisateur qui sera utilis�. Par exemple, supposons que
+ le client envoie le nom d'utilisateur <code>bjenson</code>, qui
+ correspond au DN LDAP <code>cn=Babs Jenson,o=Example</code>. Si la
+ directive est � <code>on</code>, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> va
+ v�rifier si <code>cn=Babs Jenson, o=Example</code> est un membre du
+ groupe. Dans le cas contraire, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>
+ v�rifiera si <code>bjenson</code> est un membre du groupe.</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="authldapinitialbindasuser" id="authldapinitialbindasuser">Directive</a> <a name="AuthLDAPInitialBindAsUser" id="AuthLDAPInitialBindAsUser">AuthLDAPInitialBindAsUser</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�termine si le serveur effectue la recherche initiale du
+DN en utilisant le nom propre de l'utilisateur pour l'authentification
+de base
+et non de mani�re anonyme, ou en utilisant des donn�es d'authentification
+cod�es en dur pour le serveur</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPInitialBindAsUser <em>off|on</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPInitialBindAsUser off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.6</td></tr>
+</table>
+ <p>Par d�faut, le serveur convertit le nom d'utilisateur pour
+ l'authentification de base en nom distinctif LDAP (DN) soit de
+ mani�re anonyme, soit avec un couple nom/mot de passe d�di�. Cette
+ directive permet de forcer le serveur � utiliser les v�ritables nom
+ d'utilisateur et mot de passe fournis par l'utilisateur pour
+ effectuer la recherche initiale du DN.</p>
+
+ <p>Si le nom d'utilisateur ne peut pas s'authentifier directement
+ et n�cessite de l�g�res modifications, voir la directive <code class="directive"><a href="#authldapinitialbindpattern">AuthLDAPInitialBindPattern</a></code>.</p>
+
+ <p>Cette directive ne doit �tre utilis�e que si votre serveur LDAP
+ n'autorise pas les recherches anonymes, ou si vous ne pouvez pas
+ utiliser de nom d'utilisateur d�di� via la directive <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
+ </p>
+
+ <div class="note"><h3>Non disponible dans la cas d'une autorisation seule</h3>
+ On ne peut utiliser cette directive que si ce module
+ effectue une authentification, et n'a aucun effet si ce module
+ n'est utilis� que pour les processus d'autorisation.
+ </div>
+
+<h3>Voir aussi</h3>
+<ul>
+<li><code class="directive"><a href="#authldapinitialbindpattern">AuthLDAPInitialBindPattern</a></code></li>
+<li><code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code></li>
+<li><code class="directive"><a href="#authldapcompareasuser">AuthLDAPCompareAsUser</a></code></li>
+<li><code class="directive"><a href="#authldapsearchasuser">AuthLDAPSearchAsUser</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="authldapinitialbindpattern" id="authldapinitialbindpattern">Directive</a> <a name="AuthLDAPInitialBindPattern" id="AuthLDAPInitialBindPattern">AuthLDAPInitialBindPattern</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie la modification a apporter au nom d'utilisateur
+pour l'authentification de base lors de l'authentification aupr�s du
+serveur LDAP pour effectuer une recherche de DN</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPInitialBindPattern<em><var>regex</var> <var>substitution</var></em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPInitialBindPattern (.*) $1 (nom de l'utilisateur
+distant utilis� tel quel)</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.6</td></tr>
+</table>
+ <p>Si la directive <code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code> est
+ d�finie � <em>ON</em>, le nom utilisateur pour l'authentification de
+ base sera transform� selon l'expression rationnelle
+ <var>regex</var> et l'argument <var>substitution</var> sp�cifi�s.</p>
+
+ <p>L'expression rationnelle est compar�e au nom d'utilisateur pour
+ l'authentification de base courant. L'argument
+ <var>substitution</var> peut contenir des r�f�rences arri�res, mais
+ n'effectue aucune autre interpolation de variable.</p>
+
+ <p>Cette directive ne doit �tre utilis�e que si votre serveur LDAP
+ n'autorise pas les recherches anonymes, ou si vous ne pouvez pas
+ utiliser de nom d'utilisateur d�di� via la directive <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
+ </p>
+
+ <pre class="prettyprint lang-config">AuthLDAPInitialBindPattern (.+) $1@example.com</pre>
+
+ <pre class="prettyprint lang-config">AuthLDAPInitialBindPattern (.+) cn=$1,dc=example,dc=com</pre>
+
+
+ <div class="note"><h3>Non disponible dans la cas d'une autorisation seule</h3>
+ On ne peut utiliser cette directive que si ce module
+ effectue une authentification, et n'a aucun effet si ce module
+ n'est utilis� que pour les processus d'autorisation.
+ </div>
+ <div class="note"><h3>D�bogage</h3>
+ Le DN de substitution est enregistr� dans la variable
+ d'environnement <em>LDAP_BINDASUSER</em>. Si l'expression
+ rationnelle ne convient pas, le nom d'utilisateur est utilis�
+ tel quel.
+ </div>
+
+<h3>Voir aussi</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_authnnz_ldap.html#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
+<li><code class="directive"><a href="../mod/mod_authnnz_ldap.html#authldapbinddn">AuthLDAPBindDN</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="authldapmaxsubgroupdepth" id="authldapmaxsubgroupdepth">Directive</a> <a name="AuthLDAPMaxSubGroupDepth" id="AuthLDAPMaxSubGroupDepth">AuthLDAPMaxSubGroupDepth</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie la profondeur d'imbrication des sous-groupes
+maximale prise en compte avant l'abandon de la recherche de
+l'utilisateur.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPMaxSubGroupDepth <var>Nombre</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPMaxSubGroupDepth 10</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.3.0 du serveur HTTP
+Apache</td></tr>
+</table>
+ <p>Lorsque cette directive est d�finie � une valeur <code>X</code>
+ non nulle, en combinaison avec l'utilisation de la directive
+ <code>Require ldap-group DN-groupe</code>, les donn�es de connexion
+ fournies seront utilis�es pour v�rifier l'appartenance de
+ l'utilisateur � l'objet de l'annuaire <code>DN-groupe</code> ou �
+ tout sous-groupe du groupe courant en tenant compte de la profondeur
+ d'imbrication maximale <code>X</code> sp�cifi�e par la directive.</p>
+ <p>Se r�f�rer � la section <a href="#reqgroup"><code>Require
+ ldap-group</code></a> pour un exemple plus d�taill�.</p>
+
+ <div class="note"><h3>Performances dans le cas des groupes imbriqu�s</h3>
+ <p>Lorsque les directives
+ <code class="directive">AuthLDAPSubGroupAttribute</code> et
+ <code class="directive">AuthLDAPGroupAttribute</code> se recouvrent (comme
+ c'est le cas par d�faut et requis par les sch�mas LDAP courants), la
+ recherche de sous-groupes au sein de grands groupes peut �tre tr�s
+ longue. Si vos groupes sont tr�s grands et non imbriqu�s, d�finissez
+ la directive <code class="directive">AuthLDAPMaxSubGroupDepth</code> � 0.</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="authldapremoteuserattribute" id="authldapremoteuserattribute">Directive</a> <a name="AuthLDAPRemoteUserAttribute" id="AuthLDAPRemoteUserAttribute">AuthLDAPRemoteUserAttribute</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie l'attribut dont la valeur renvoy�e au cours de la
+requ�te de l'utilisateur sera utilis�e pour d�finir la variable
+d'environnement REMOTE_USER</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPRemoteUserAttribute uid</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, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>Lorsque cette directive est d�finie, la variable d'environnement
+ <code>REMOTE_USER</code> sera d�finie � la valeur de l'attribut
+ sp�cifi�. Assurez-vous que cet attribut soit bien inclus dans la
+ liste d'attributs sp�cifi�s dans la d�finition de AuthLDAPUrl ; dans
+ le cas contraire, cette directive n'aurait aucun effet. Si elle est
+ pr�sente, cette directive l'emporte sur AuthLDAPRemoteUserIsDN. Elle
+ peut s'av�rer utile par exemple, si vous souhaitez que les
+ utilisateurs se connectent � un site web en utilisant leur adresse
+ email, alors qu'une application sous-jacente n�cessite un nom
+ d'utilisateur comme identifiant.</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="authldapremoteuserisdn" id="authldapremoteuserisdn">Directive</a> <a name="AuthLDAPRemoteUserIsDN" id="AuthLDAPRemoteUserIsDN">AuthLDAPRemoteUserIsDN</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilise le DN de l'utilisateur pour d�finir la variable
+d'environnement REMOTE_USER</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPRemoteUserIsDN on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPRemoteUserIsDN off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>Lorsque cette directive est � on, la variable d'environnement
+ <code>REMOTE_USER</code> sera d�finie avec la valeur du DN complet
+ de l'utilisateur authentifi�, et non plus avec simplement le nom
+ d'utilisateur fourni par le client. Elle est d�finie � off par
+ d�faut.</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="authldapsearchasuser" id="authldapsearchasuser">Directive</a> <a name="AuthLDAPSearchAsUser" id="AuthLDAPSearchAsUser">AuthLDAPSearchAsUser</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilise les donn�es d'authentification de l'utilisateur
+pour la recherche des autorisations</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPSearchAsUser on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPSearchAsUser off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.6</td></tr>
+</table>
+ <p>Lorsque cette directive est d�finie, et si
+ <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> a authentifi� l'utilisateur, les
+ recherches LDAP pour d�finir les autorisations utilisent le nom
+ distinctif (DN) trouv� et le mot de passe pour l'authentification de
+ base HTTP de l'utilisateur authentifi�, au lieu des donn�es
+ d'authentification configur�es au niveau du serveur.</p>
+
+ <p>Les v�rifications d'autorisation <em>ldap-filter</em> et
+ <em>ldap-dn</em> utilisent des recherches.</p>
+
+ <p>Cette directive n'a d'effet sur les comparaisons effectu�es au
+ cours des traitements de groupe imbriqu�s, et lorsque la directive
+ <code class="directive"><a href="#authldapcompareasuser">AuthLDAPCompareAsUser</a></code>
+ est aussi activ�e.</p>
+
+ <p>Cette directive ne doit �tre utilis�e que si votre serveur LDAP
+ n'autorise pas les recherches anonymes, ou si vous ne pouvez pas
+ utiliser de nom d'utilisateur d�di� via la directive <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
+ </p>
+
+
+<h3>Voir aussi</h3>
+<ul>
+<li><code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
+<li><code class="directive"><a href="#authldapcompareasuser">AuthLDAPCompareAsUser</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="authldapsubgroupattribute" id="authldapsubgroupattribute">Directive</a> <a name="AuthLDAPSubGroupAttribute" id="AuthLDAPSubGroupAttribute">AuthLDAPSubGroupAttribute</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie les noms d'attribut, un par directive, utilis�s
+pour diff�rencier les membres du groupe courant qui sont eux-m�mes des
+groupes.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPSubGroupAttribute <em>attribut</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPSubgroupAttribute member uniquemember</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.3.0 du serveur HTTP
+Apache</td></tr>
+</table>
+ <p>Un objet groupe LDAP peut contenir des membres qui sont des
+ utilisateurs et des membres qui sont eux-m�mes des groupes (appel�s
+ sous-groupes ou groupes imbriqu�s). La directive
+ <code>AuthLDAPSubGroupAttribute</code> sp�cifie l'attribut utilis�
+ pour identifier les groupes, alors que la directive
+ <code>AuthLDAPGroupAttribute</code> sp�cifie l'attribut utilis�
+ pour identifier les utilisateurs. On peut sp�cifier plusieurs
+ attributs en r�p�tant la directive plusieurs fois. Si elle n'est pas
+ d�finie, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> utilise les attributs
+ <code>member</code> et <code>uniqueMember</code>.</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="authldapsubgroupclass" id="authldapsubgroupclass">Directive</a> <a name="AuthLDAPSubGroupClass" id="AuthLDAPSubGroupClass">AuthLDAPSubGroupClass</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie quelles valeurs d'objectClass LDAP identifient les
+objets de l'annuaire qui sont des groupes au cours du traitement des
+sous-groupes.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPSubGroupClass <em>ObjectClass-LDAP</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPSubGroupClass groupOfNames groupOfUniqueNames</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.3.0 du serveur HTTP
+Apache</td></tr>
+</table>
+ <p>Un objet groupe LDAP peut contenir des membres qui sont des
+ utilisateurs et des membres qui sont eux-m�mes des groupes (appel�s
+ sous-groupes ou groupes imbriqu�s). La directive
+ <code>AuthLDAPSubGroupAttribute</code> permet d'identifier les
+ membres qui sont des sous-groupes du groupe courant (� l'oppos� des
+ membres utilisateurs). La directive
+ <code>AuthLDAPSubGroupClass</code> permet de sp�cifier les valeurs
+ d'objectClass LDAP utilis�es pour v�rifier que certains membres sont
+ en fait des objets groupe. Les sous-groupes ainsi identifi�s peuvent
+ alors faire l'objet d'une recherche d'autres membres utilisateurs ou
+ sous-groupes. On peut sp�cifier plusieurs attributs en r�p�tant
+ cette directive plusieurs fois. Si cette directive n'est pas
+ d�finie, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> utilise les attributs
+ <code>groupOfNames</code> et <code>groupOfUniqueNames</code>.</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="authldapurl" id="authldapurl">Directive</a> <a name="AuthLDAPUrl" id="AuthLDAPUrl">AuthLDAPUrl</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>L'URL permettant de sp�cifier les param�tres de la
+recherche LDAP</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPUrl <em>url [NONE|SSL|TLS|STARTTLS]</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
+</table>
+ <p>Une URL conforme � la RFC 2255 qui permet de sp�cifier les
+ param�tres � utiliser pour la recherche dans l'annuaire LDAP. La
+ syntaxe de l'URL est :</p>
+<div class="example"><p><code>ldap://h�te:port/DN-de-base?attribut?port�e?filtre</code></p></div>
+ <p>Si vous souhaitez mettre � la disposition d'Apache plusieurs URLs
+ LDAP, la syntaxe sera :</p>
+<pre class="prettyprint lang-config">AuthLDAPUrl "ldap://ldap1.example.com ldap2.example.com/dc=..."</pre>
+
+<p><em><strong>Mise en garde : </strong>Si vous sp�cifiez plusieurs
+serveurs, vous devez en entourer la liste avec des guillemets ; dans le
+cas contraire, vous g�n�rerez une erreur : "AuthLDAPURL takes one
+argument, URL to define LDAP connection..".</em> Vous pouvez bien
+entendu ajouter des param�tres de recherche � chacun des serveurs
+sp�cifi�s.</p>
+
+<dl>
+<dt>ldap</dt>
+
+ <dd>Pour ldap non s�curis�, utilisez la cha�ne
+ <code>ldap</code>. Pour ldap s�curis�, utilisez � la place la
+ cha�ne <code>ldaps</code>. LDAP s�curis� n'est disponible que si
+ Apache a �t� li� avec une biblioth�que LDAP supportant SSL.</dd>
+
+<dt>h�te:port</dt>
+
+ <dd>
+ <p>Il s'agit du nom/port du serveur ldap
+ (dont la valeur par d�faut est
+ <code>localhost:389</code> pour <code>ldap</code>, et
+ <code>localhost:636</code> pour <code>ldaps</code>). Pour
+ sp�cifier plusieurs serveurs LDAP redondants, indiquez
+ simplement leur liste en les s�parant par des espaces.
+ <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> tentera alors de se connecter
+ � chacun des serveurs jusqu'� ce qu'il parvienne � se
+ connecter avec succ�s. Notez qu'en cas de multiples serveurs
+ LDAP, l'ensemble de l'URL LDAP doit �tre entour�e de
+ guillemets.</p>
+
+ <p>lorsqu'une connection a �t� �tablie avec un serveur, elle
+ reste active pendant toute la dur�e de vie du processus
+ <code class="program"><a href="../programs/httpd.html">httpd</a></code>, ou jusqu'� ce que le serveur LDAP
+ cesse de fonctionner.</p>
+
+ <p>Si le serveur LDAP cesse de fonctionner, et ainsi
+ interrompt une
+ connexion existante, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> tentera
+ de se reconnecter en commen�ant par le premier serveur de la
+ liste, et ainsi de suite avec les serveurs redondants
+ suivants. Notez que ce processus n'a rien � voir avec une
+ v�ritable recherche de type round-robin.</p>
+ </dd>
+
+<dt>DN-de-base</dt>
+ <dd>Le DN de la branche de l'annuaire � partir de laquelle
+ toutes les recherches seront lanc�es. Il doit au moins
+ correspondre � la racine de votre annuaire, mais vous pouvez
+ aussi indiquer une branche plus sp�cifique.</dd>
+
+<dt>attribut</dt>
+
+ <dd>Il s'agit de l'attribut � utiliser pour la recherche.
+ Bien que la RFC
+ 2255 autorise une liste d'attributs s�par�s par des virgules,
+ seul le premier sera retenu, sans tenir compte des autres
+ attributs fournis. Si aucun attribut n'est fourni, l'attribut
+ par d�faut est <code>uid</code>. Il est judicieux de choisir un
+ attribut dont la valeur sera unique parmi toutes les entr�es de
+ la branche de l'annuaire que vous aurez d�finie. Tous les
+ attributs sp�cifi�s seront enregistr�s dans des variables
+ d'environnement avec le pr�fixe AUTHENTICATE_, afin de pouvoir
+ �tre utilis�s par d'autres modules.</dd>
+
+<dt>port�e</dt>
+
+ <dd>Il s'agit de la port�e de la recherche. Elle peut prendre
+ les valeurs <code>one</code> ou <code>sub</code>. Notez que la
+ RFC 2255 supporte aussi une port�e de valeur <code>base</code>,
+ mais cette derni�re n'est pas support�e par le module. Si la
+ port�e n'est pas d�finie, ou si elle est d�finie �
+ <code>base</code>, c'est la valeur de port�e par d�faut
+ <code>sub</code> qui sera utilis�e.</dd>
+
+<dt>filtre</dt>
+
+ <dd>Il s'agit d'un filtre de recherche LDAP valide. Si aucun
+ filtre n'est sp�cifi�, le filtre par d�faut
+ <code>(objectClass=*)</code> sera utilis�, ce qui corrspond �
+ une recherche de tous les types d'objets de l'arborescence. La
+ taille des filtres est limit�e � environ 8000 caract�res (valeur
+ de la macro <code>MAX_STRING_LEN</code> dans le code source
+ d'Apache), ce qui s'av�re plus que suffisant pour la plupart des
+ applications. Depuis la version 2.4.10, il est possible
+ d'utiliser le param�tre "none" pour sp�cifier qu'aucun filtre
+ n'est activ� ; ce param�tre est obligatoire avec certains
+ serveurs LDAP primitifs.</dd>
+</dl>
+
+ <p>Pour une recherche, les attribut, filtre et nom d'utilisateur
+ fournis par le client HTTP sont combin�s pour cr�er un filtre de
+ recherche du style :
+ <code>(&amp;(<em>filtre</em>)(<em>attribut</em>
+ =<em>nom-utilisateur</em>))</code>.</p>
+
+ <p>Par exemple, consid�rons l'URL
+ <code>ldap://ldap.example.com/o=Example?cn?sub?(posixid=*)</code>.
+ Lorsqu'un client tentera de se connecter en utilisant le nom
+ d'utilisateur <code>Babs Jenson</code>, le filtre de recherche sera
+ : <code>(&amp;(posixid=*)(cn=Babs Jenson))</code>.</p>
+
+ <p>On peut encore ajouter un param�tre optionnel pour permettre �
+ l'URL LDAP de surcharger le type de connexion. Ce param�tre peut
+ prendre l'une des valeurs suivantes :</p>
+
+<dl>
+ <dt>NONE</dt>
+ <dd>�tablit une connexion non s�curis�e sur le port LDAP par
+ d�faut, ce qui est �quivalent � <code>ldap://</code> sur le port
+ 389.</dd>
+ <dt>SSL</dt>
+ <dd>�tablit une connexion s�curis�e sur le port LDAP s�curis�
+ par d�faut, ce qui est �quivalent � <code>ldaps://</code>.</dd>
+ <dt>TLS | STARTTLS</dt>
+ <dd>�tablit une connexion s�curis�e par �l�vation de niveau sur
+ le port LDAP par d�faut. Cette connexion sera initialis�e sur le
+ port 389 par d�faut, puis �lev�e � un niveau de connexion
+ s�curis�e sur le m�me port.</dd>
+</dl>
+
+ <p>Voir plus haut pour des exemples d'URLs d�finies par la directive
+ <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code>.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="contents" id="contents">Sommaire</a></h2>
@@ -847,699 +1540,6 @@ Require group mygroupfile</pre>
</ul>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="authldapauthorizeprefix" id="authldapauthorizeprefix">Directive</a> <a name="AuthLDAPAuthorizePrefix" id="AuthLDAPAuthorizePrefix">AuthLDAPAuthorizePrefix</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie le pr�fixe ajout� aux variables d'environnement
-durant la phase d'autorisation</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPAuthorizePrefix <em>pr�fixe</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPAuthorizePrefix AUTHORIZE_</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.6</td></tr>
-</table>
- <p>Cette directive permet de sp�cifier le pr�fixe ajout� aux
- variables d'environnement durant la phase d'autorisation. Si la
- valeur sp�cifi�e est <em>AUTHENTICATE_</em>, les utilisateurs de ces
- variables d'environnement verront les m�mes informations, que le
- serveur effectue une authentification, une autorisation, ou les
- deux.</p>
-
- <div class="note"><h3>Note</h3>
- Aucune variable d'autorisation n'est d�finie lorsqu'un utilisateur
- s'est vu autoriser l'acc�s via la directive <code>Require
- valid-user</code>.
- </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="authldapbindauthoritative" id="authldapbindauthoritative">Directive</a> <a name="AuthLDAPBindAuthoritative" id="AuthLDAPBindAuthoritative">AuthLDAPBindAuthoritative</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�termine si l'on doit utiliser d'autres fournisseurs
-d'authentification lorsque le serveur ne peut pas valider les donn�es
-d'authentification de l'utilisateur, alors que ce dernier poss�de un
-DN.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPBindAuthoritative<em>off|on</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPBindAuthoritative on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>Par d�faut, des fournisseurs d'authentification sont appel�s
- si un utilisateur ne poss�de pas de DN, mais ne le sont pas si
- l'utilisateur poss�de un DN et si son mot de passe ne peut pas �tre
- v�rifi� lors d'une connexion au serveur LDAP. Si la directive
- <code class="directive"><a href="#authldapbindauthoritative">AuthLDAPBindAuthoritative</a></code> est
- d�finie � <em>off</em>, d'autres modules d'authentification
- configur�s auront une chance de valider le mot de passe de
- l'utilisateur si la tentative de connexion au serveur LDAP �choue
- pour une raison quelconque (avec les donn�es d'authentification
- fournies).</p>
- <p>Ceci permet aux utilisateurs pr�sent � la fois dans l'annuaire
- LDAP et dans un fichier <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> de s'authentifier
- lorsque le serveur LDAP est disponible, alors que le compte de
- l'utilisateur est verrouill� ou que son mot de passe est
- inutilisable pour une raison quelconque.</p>
-
-<h3>Voir aussi</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li>
-<li><code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="authldapbinddn" id="authldapbinddn">Directive</a> <a name="AuthLDAPBindDN" id="AuthLDAPBindDN">AuthLDAPBindDN</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Un DN optionnel pour se connecter au serveur
-LDAP</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPBindDN <em>dn</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>Cette directive permet de d�finir un DN optionnel pour se
- connecter au serveur afin d'y rechercher des entr�es. Si aucun DN
- n'est sp�cifi�, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> tentera une
- connexion anonyme.</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="authldapbindpassword" id="authldapbindpassword">Directive</a> <a name="AuthLDAPBindPassword" id="AuthLDAPBindPassword">AuthLDAPBindPassword</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Mot de passe � utiliser en conjonction avec le DN de
-connexion</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPBindPassword <em>mot-de-passe</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td><em>exec:</em> est disponible depuis la version 2.4.5 du
-serveur HTTP Apache.</td></tr>
-</table>
- <p>Cette directive permet de sp�cifier un mot de passe � utiliser en
- conjonction avec le DN de connexion. Notez que ce mot de passe
- constitue en g�n�ral une donn�e sensible, et doit donc �tre prot�g�
- de mani�re appropri�e. Vous ne devez utiliser les directives
- <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code> et <code class="directive"><a href="#authldapbindpassword">AuthLDAPBindPassword</a></code> que si
- vous en avez vraiment besoin pour effectuer une recherche dans
- l'annuaire.</p>
-
- <p>Si la valeur sp�cifi�e d�bute par "exec:", la commande qui suit sera
- ex�cut�e, et la premi�re ligne renvoy�e par la commande sur la
- sortie standard sera utilis�e comme mot de passe.</p>
-<pre class="prettyprint lang-config"># Mot de passe sp�cifi� directement
-AuthLDAPBindPassword secret
-
-# Ex�cution de /path/to/program pour obtenir le mot de passe
-AuthLDAPBindPassword exec:/path/to/program
-
-# Ex�cution de /path/to/otherProgram avec un argument pour obtenir le mot de passe
-AuthLDAPBindPassword "exec:/path/to/otherProgram argument1"</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="authldapcharsetconfig" id="authldapcharsetconfig">Directive</a> <a name="AuthLDAPCharsetConfig" id="AuthLDAPCharsetConfig">AuthLDAPCharsetConfig</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Chemin du fichier de configuration de la correspondance
-langage/jeu de caract�res</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPCharsetConfig <em>chemin-fichier</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</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_authnz_ldap</td></tr>
-</table>
- <p>La directive <code class="directive">AuthLDAPCharsetConfig</code> permet
- de d�finir le chemin du fichier de configuration de la
- correspondance langage/jeu de caract�res. <var>chemin-fichier</var>
- est un chemin relatif au r�pertoire d�fini par la directive
- <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. Ce fichier contient une liste
- de correspondances extension de langage/jeu de caract�res. La
- plupart des administrateurs utilisent le fichier
- <code>charset.conv</code> fourni qui associe les extensions de
- langage courantes � leurs jeux de caract�res.</p>
-
- <p>Le fichier contient des lignes au format suivant :</p>
-
- <div class="example"><p><code>
- <var>extension de langage</var> <var>jeu de caract�res</var>
- [<var>Nom du langage</var>] ...
- </code></p></div>
-
- <p>L'extension est insensible � la casse. Les lignes vides et les
- lignes commen�ant par un di�se (<code>#</code>) sont ignor�es.</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="authldapcompareasuser" id="authldapcompareasuser">Directive</a> <a name="AuthLDAPCompareAsUser" id="AuthLDAPCompareAsUser">AuthLDAPCompareAsUser</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilisation des donn�es d'authentification de l'utilisateur
-pour effectuer les comparaisons pour l'attribution des autorisations</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPCompareAsUser on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPCompareAsUser off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version version 2.3.6</td></tr>
-</table>
- <p>Lorsque cette directive est d�finie, et si
- <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> a authentifi� l'utilisateur, les
- recherches LDAP pour les autorisations utilisent le nom distinctif
- trouv� (DN) et le mot de passe d'authentification basique HTTP de
- l'utilisateur authentifi� au lieu des donn�es d'authentification
- configur�es au niveau du serveur.</p>
-
- <p>Les v�rifications d'autorisation <em>ldap-attribute</em>,
- <em>ldap-user</em>, et <em>ldap-group</em> (niveau simple seulement)
- utilisent des comparaisons.</p>
-
- <p>Cette directive n'a d'effet sur les comparaisons effectu�es au
- cours des traitements de groupe imbriqu�s, et lorsque la directive
- <code class="directive"><a href="#authldapsearchasuser">AuthLDAPSearchAsUser</a></code>
- est aussi activ�e.</p>
-
- <p>Cette directive ne doit �tre utilis�e que si votre serveur LDAP
- n'autorise pas les recherches anonymes, ou si vous ne pouvez pas
- utiliser de nom d'utilisateur d�di� via la directive <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
- </p>
-
-<h3>Voir aussi</h3>
-<ul>
-<li><code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
-<li><code class="directive"><a href="#authldapsearchasuser">AuthLDAPSearchAsUser</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="authldapcomparednonserver" id="authldapcomparednonserver">Directive</a> <a name="AuthLDAPCompareDNOnServer" id="AuthLDAPCompareDNOnServer">AuthLDAPCompareDNOnServer</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilise le serveur LDAP pour comparer les DNs</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPCompareDNOnServer on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPCompareDNOnServer on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>Lorsque cette directive est d�finie � on,
- <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> utilise le serveur LDAP pour
- comparer les DNs. Il s'agit de la seule m�thode infaillible pour
- comparer les DNs. <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> va rechercher
- dans l'annuaire le DN sp�cifi� par la directive <a href="#reqdn"><code>Require dn</code></a>, puis extraire ce DN et le
- comparer avec le DN extrait de l'entr�e de l'utilisateur. Si cette
- directive est � off, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> effectue une
- simple comparaison de cha�nes. Cette derni�re approche peut produire
- des faux n�gatifs, mais elle est beaucoup plus rapide. Notez
- cependant que le cache de <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> peut acc�l�rer
- la comparaison de DNs dans la plupart des situations.</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="authldapdereferencealiases" id="authldapdereferencealiases">Directive</a> <a name="AuthLDAPDereferenceAliases" id="AuthLDAPDereferenceAliases">AuthLDAPDereferenceAliases</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>� quel moment le module va d�r�f�rencer les
-alias</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPDereferenceAliases never|searching|finding|always</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPDereferenceAliases always</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>Cette directive permet de sp�cifier � quel moment
- <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> va d�r�f�rencer les alias au cours
- des op�rations li�es � LDAP. La valeur par d�faut est
- <code>always</code>.</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="authldapgroupattribute" id="authldapgroupattribute">Directive</a> <a name="AuthLDAPGroupAttribute" id="AuthLDAPGroupAttribute">AuthLDAPGroupAttribute</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>L'attribut LDAP utilis� pour v�rifier l'appartenance d'un
-utilisateur � un groupe.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPGroupAttribute <em>attribut</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPGroupAttribute member uniquemember</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>Cette directive permet de sp�cifier quel attribut LDAP est
- utilis� pour v�rifier l'appartenance d'un utilisateur � un
- groupe. On peut sp�cifier plusieurs attributs en r�p�tant cette
- directive plusieurs fois. Si la directive n'est pas d�finie,
- <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> utilise les attributs
- <code>member</code> et <code>uniquemember</code>.</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="authldapgroupattributeisdn" id="authldapgroupattributeisdn">Directive</a> <a name="AuthLDAPGroupAttributeIsDN" id="AuthLDAPGroupAttributeIsDN">AuthLDAPGroupAttributeIsDN</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilise le DN de l'utilisateur pour v�rifier son
-appartenance � un groupe</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPGroupAttributeIsDN on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPGroupAttributeIsDN on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>Lorsqu'elle est d�finie � <code>on</code>, cette directive
- indique que c'est le DN de l'utilisateur qui doit �tre utilis� pour
- v�rifier son appartenance � un groupe. Dans le cas contraire, c'est
- le nom de l'utilisateur qui sera utilis�. Par exemple, supposons que
- le client envoie le nom d'utilisateur <code>bjenson</code>, qui
- correspond au DN LDAP <code>cn=Babs Jenson,o=Example</code>. Si la
- directive est � <code>on</code>, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> va
- v�rifier si <code>cn=Babs Jenson, o=Example</code> est un membre du
- groupe. Dans le cas contraire, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>
- v�rifiera si <code>bjenson</code> est un membre du groupe.</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="authldapinitialbindasuser" id="authldapinitialbindasuser">Directive</a> <a name="AuthLDAPInitialBindAsUser" id="AuthLDAPInitialBindAsUser">AuthLDAPInitialBindAsUser</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�termine si le serveur effectue la recherche initiale du
-DN en utilisant le nom propre de l'utilisateur pour l'authentification
-de base
-et non de mani�re anonyme, ou en utilisant des donn�es d'authentification
-cod�es en dur pour le serveur</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPInitialBindAsUser <em>off|on</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPInitialBindAsUser off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.6</td></tr>
-</table>
- <p>Par d�faut, le serveur convertit le nom d'utilisateur pour
- l'authentification de base en nom distinctif LDAP (DN) soit de
- mani�re anonyme, soit avec un couple nom/mot de passe d�di�. Cette
- directive permet de forcer le serveur � utiliser les v�ritables nom
- d'utilisateur et mot de passe fournis par l'utilisateur pour
- effectuer la recherche initiale du DN.</p>
-
- <p>Si le nom d'utilisateur ne peut pas s'authentifier directement
- et n�cessite de l�g�res modifications, voir la directive <code class="directive"><a href="#authldapinitialbindpattern">AuthLDAPInitialBindPattern</a></code>.</p>
-
- <p>Cette directive ne doit �tre utilis�e que si votre serveur LDAP
- n'autorise pas les recherches anonymes, ou si vous ne pouvez pas
- utiliser de nom d'utilisateur d�di� via la directive <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
- </p>
-
- <div class="note"><h3>Non disponible dans la cas d'une autorisation seule</h3>
- On ne peut utiliser cette directive que si ce module
- effectue une authentification, et n'a aucun effet si ce module
- n'est utilis� que pour les processus d'autorisation.
- </div>
-
-<h3>Voir aussi</h3>
-<ul>
-<li><code class="directive"><a href="#authldapinitialbindpattern">AuthLDAPInitialBindPattern</a></code></li>
-<li><code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code></li>
-<li><code class="directive"><a href="#authldapcompareasuser">AuthLDAPCompareAsUser</a></code></li>
-<li><code class="directive"><a href="#authldapsearchasuser">AuthLDAPSearchAsUser</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="authldapinitialbindpattern" id="authldapinitialbindpattern">Directive</a> <a name="AuthLDAPInitialBindPattern" id="AuthLDAPInitialBindPattern">AuthLDAPInitialBindPattern</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie la modification a apporter au nom d'utilisateur
-pour l'authentification de base lors de l'authentification aupr�s du
-serveur LDAP pour effectuer une recherche de DN</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPInitialBindPattern<em><var>regex</var> <var>substitution</var></em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPInitialBindPattern (.*) $1 (nom de l'utilisateur
-distant utilis� tel quel)</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.6</td></tr>
-</table>
- <p>Si la directive <code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code> est
- d�finie � <em>ON</em>, le nom utilisateur pour l'authentification de
- base sera transform� selon l'expression rationnelle
- <var>regex</var> et l'argument <var>substitution</var> sp�cifi�s.</p>
-
- <p>L'expression rationnelle est compar�e au nom d'utilisateur pour
- l'authentification de base courant. L'argument
- <var>substitution</var> peut contenir des r�f�rences arri�res, mais
- n'effectue aucune autre interpolation de variable.</p>
-
- <p>Cette directive ne doit �tre utilis�e que si votre serveur LDAP
- n'autorise pas les recherches anonymes, ou si vous ne pouvez pas
- utiliser de nom d'utilisateur d�di� via la directive <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
- </p>
-
- <pre class="prettyprint lang-config">AuthLDAPInitialBindPattern (.+) $1@example.com</pre>
-
- <pre class="prettyprint lang-config">AuthLDAPInitialBindPattern (.+) cn=$1,dc=example,dc=com</pre>
-
-
- <div class="note"><h3>Non disponible dans la cas d'une autorisation seule</h3>
- On ne peut utiliser cette directive que si ce module
- effectue une authentification, et n'a aucun effet si ce module
- n'est utilis� que pour les processus d'autorisation.
- </div>
- <div class="note"><h3>D�bogage</h3>
- Le DN de substitution est enregistr� dans la variable
- d'environnement <em>LDAP_BINDASUSER</em>. Si l'expression
- rationnelle ne convient pas, le nom d'utilisateur est utilis�
- tel quel.
- </div>
-
-<h3>Voir aussi</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_authnnz_ldap.html#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
-<li><code class="directive"><a href="../mod/mod_authnnz_ldap.html#authldapbinddn">AuthLDAPBindDN</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="authldapmaxsubgroupdepth" id="authldapmaxsubgroupdepth">Directive</a> <a name="AuthLDAPMaxSubGroupDepth" id="AuthLDAPMaxSubGroupDepth">AuthLDAPMaxSubGroupDepth</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie la profondeur d'imbrication des sous-groupes
-maximale prise en compte avant l'abandon de la recherche de
-l'utilisateur.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPMaxSubGroupDepth <var>Nombre</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPMaxSubGroupDepth 10</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.3.0 du serveur HTTP
-Apache</td></tr>
-</table>
- <p>Lorsque cette directive est d�finie � une valeur <code>X</code>
- non nulle, en combinaison avec l'utilisation de la directive
- <code>Require ldap-group DN-groupe</code>, les donn�es de connexion
- fournies seront utilis�es pour v�rifier l'appartenance de
- l'utilisateur � l'objet de l'annuaire <code>DN-groupe</code> ou �
- tout sous-groupe du groupe courant en tenant compte de la profondeur
- d'imbrication maximale <code>X</code> sp�cifi�e par la directive.</p>
- <p>Se r�f�rer � la section <a href="#reqgroup"><code>Require
- ldap-group</code></a> pour un exemple plus d�taill�.</p>
-
- <div class="note"><h3>Performances dans le cas des groupes imbriqu�s</h3>
- <p>Lorsque les directives
- <code class="directive">AuthLDAPSubGroupAttribute</code> et
- <code class="directive">AuthLDAPGroupAttribute</code> se recouvrent (comme
- c'est le cas par d�faut et requis par les sch�mas LDAP courants), la
- recherche de sous-groupes au sein de grands groupes peut �tre tr�s
- longue. Si vos groupes sont tr�s grands et non imbriqu�s, d�finissez
- la directive <code class="directive">AuthLDAPMaxSubGroupDepth</code> � 0.</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="authldapremoteuserattribute" id="authldapremoteuserattribute">Directive</a> <a name="AuthLDAPRemoteUserAttribute" id="AuthLDAPRemoteUserAttribute">AuthLDAPRemoteUserAttribute</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie l'attribut dont la valeur renvoy�e au cours de la
-requ�te de l'utilisateur sera utilis�e pour d�finir la variable
-d'environnement REMOTE_USER</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPRemoteUserAttribute uid</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, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>Lorsque cette directive est d�finie, la variable d'environnement
- <code>REMOTE_USER</code> sera d�finie � la valeur de l'attribut
- sp�cifi�. Assurez-vous que cet attribut soit bien inclus dans la
- liste d'attributs sp�cifi�s dans la d�finition de AuthLDAPUrl ; dans
- le cas contraire, cette directive n'aurait aucun effet. Si elle est
- pr�sente, cette directive l'emporte sur AuthLDAPRemoteUserIsDN. Elle
- peut s'av�rer utile par exemple, si vous souhaitez que les
- utilisateurs se connectent � un site web en utilisant leur adresse
- email, alors qu'une application sous-jacente n�cessite un nom
- d'utilisateur comme identifiant.</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="authldapremoteuserisdn" id="authldapremoteuserisdn">Directive</a> <a name="AuthLDAPRemoteUserIsDN" id="AuthLDAPRemoteUserIsDN">AuthLDAPRemoteUserIsDN</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilise le DN de l'utilisateur pour d�finir la variable
-d'environnement REMOTE_USER</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPRemoteUserIsDN on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPRemoteUserIsDN off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>Lorsque cette directive est � on, la variable d'environnement
- <code>REMOTE_USER</code> sera d�finie avec la valeur du DN complet
- de l'utilisateur authentifi�, et non plus avec simplement le nom
- d'utilisateur fourni par le client. Elle est d�finie � off par
- d�faut.</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="authldapsearchasuser" id="authldapsearchasuser">Directive</a> <a name="AuthLDAPSearchAsUser" id="AuthLDAPSearchAsUser">AuthLDAPSearchAsUser</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilise les donn�es d'authentification de l'utilisateur
-pour la recherche des autorisations</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPSearchAsUser on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPSearchAsUser off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.6</td></tr>
-</table>
- <p>Lorsque cette directive est d�finie, et si
- <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> a authentifi� l'utilisateur, les
- recherches LDAP pour d�finir les autorisations utilisent le nom
- distinctif (DN) trouv� et le mot de passe pour l'authentification de
- base HTTP de l'utilisateur authentifi�, au lieu des donn�es
- d'authentification configur�es au niveau du serveur.</p>
-
- <p>Les v�rifications d'autorisation <em>ldap-filter</em> et
- <em>ldap-dn</em> utilisent des recherches.</p>
-
- <p>Cette directive n'a d'effet sur les comparaisons effectu�es au
- cours des traitements de groupe imbriqu�s, et lorsque la directive
- <code class="directive"><a href="#authldapcompareasuser">AuthLDAPCompareAsUser</a></code>
- est aussi activ�e.</p>
-
- <p>Cette directive ne doit �tre utilis�e que si votre serveur LDAP
- n'autorise pas les recherches anonymes, ou si vous ne pouvez pas
- utiliser de nom d'utilisateur d�di� via la directive <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code>.
- </p>
-
-
-<h3>Voir aussi</h3>
-<ul>
-<li><code class="directive"><a href="#authldapinitialbindasuser">AuthLDAPInitialBindAsUser</a></code></li>
-<li><code class="directive"><a href="#authldapcompareasuser">AuthLDAPCompareAsUser</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="authldapsubgroupattribute" id="authldapsubgroupattribute">Directive</a> <a name="AuthLDAPSubGroupAttribute" id="AuthLDAPSubGroupAttribute">AuthLDAPSubGroupAttribute</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie les noms d'attribut, un par directive, utilis�s
-pour diff�rencier les membres du groupe courant qui sont eux-m�mes des
-groupes.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPSubGroupAttribute <em>attribut</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPSubgroupAttribute member uniquemember</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.3.0 du serveur HTTP
-Apache</td></tr>
-</table>
- <p>Un objet groupe LDAP peut contenir des membres qui sont des
- utilisateurs et des membres qui sont eux-m�mes des groupes (appel�s
- sous-groupes ou groupes imbriqu�s). La directive
- <code>AuthLDAPSubGroupAttribute</code> sp�cifie l'attribut utilis�
- pour identifier les groupes, alors que la directive
- <code>AuthLDAPGroupAttribute</code> sp�cifie l'attribut utilis�
- pour identifier les utilisateurs. On peut sp�cifier plusieurs
- attributs en r�p�tant la directive plusieurs fois. Si elle n'est pas
- d�finie, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> utilise les attributs
- <code>member</code> et <code>uniqueMember</code>.</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="authldapsubgroupclass" id="authldapsubgroupclass">Directive</a> <a name="AuthLDAPSubGroupClass" id="AuthLDAPSubGroupClass">AuthLDAPSubGroupClass</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie quelles valeurs d'objectClass LDAP identifient les
-objets de l'annuaire qui sont des groupes au cours du traitement des
-sous-groupes.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPSubGroupClass <em>ObjectClass-LDAP</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthLDAPSubGroupClass groupOfNames groupOfUniqueNames</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.3.0 du serveur HTTP
-Apache</td></tr>
-</table>
- <p>Un objet groupe LDAP peut contenir des membres qui sont des
- utilisateurs et des membres qui sont eux-m�mes des groupes (appel�s
- sous-groupes ou groupes imbriqu�s). La directive
- <code>AuthLDAPSubGroupAttribute</code> permet d'identifier les
- membres qui sont des sous-groupes du groupe courant (� l'oppos� des
- membres utilisateurs). La directive
- <code>AuthLDAPSubGroupClass</code> permet de sp�cifier les valeurs
- d'objectClass LDAP utilis�es pour v�rifier que certains membres sont
- en fait des objets groupe. Les sous-groupes ainsi identifi�s peuvent
- alors faire l'objet d'une recherche d'autres membres utilisateurs ou
- sous-groupes. On peut sp�cifier plusieurs attributs en r�p�tant
- cette directive plusieurs fois. Si cette directive n'est pas
- d�finie, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> utilise les attributs
- <code>groupOfNames</code> et <code>groupOfUniqueNames</code>.</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="authldapurl" id="authldapurl">Directive</a> <a name="AuthLDAPUrl" id="AuthLDAPUrl">AuthLDAPUrl</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>L'URL permettant de sp�cifier les param�tres de la
-recherche LDAP</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthLDAPUrl <em>url [NONE|SSL|TLS|STARTTLS]</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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_authnz_ldap</td></tr>
-</table>
- <p>Une URL conforme � la RFC 2255 qui permet de sp�cifier les
- param�tres � utiliser pour la recherche dans l'annuaire LDAP. La
- syntaxe de l'URL est :</p>
-<div class="example"><p><code>ldap://h�te:port/DN-de-base?attribut?port�e?filtre</code></p></div>
- <p>Si vous souhaitez mettre � la disposition d'Apache plusieurs URLs
- LDAP, la syntaxe sera :</p>
-<pre class="prettyprint lang-config">AuthLDAPUrl "ldap://ldap1.example.com ldap2.example.com/dc=..."</pre>
-
-<p><em><strong>Mise en garde : </strong>Si vous sp�cifiez plusieurs
-serveurs, vous devez en entourer la liste avec des guillemets ; dans le
-cas contraire, vous g�n�rerez une erreur : "AuthLDAPURL takes one
-argument, URL to define LDAP connection..".</em> Vous pouvez bien
-entendu ajouter des param�tres de recherche � chacun des serveurs
-sp�cifi�s.</p>
-
-<dl>
-<dt>ldap</dt>
-
- <dd>Pour ldap non s�curis�, utilisez la cha�ne
- <code>ldap</code>. Pour ldap s�curis�, utilisez � la place la
- cha�ne <code>ldaps</code>. LDAP s�curis� n'est disponible que si
- Apache a �t� li� avec une biblioth�que LDAP supportant SSL.</dd>
-
-<dt>h�te:port</dt>
-
- <dd>
- <p>Il s'agit du nom/port du serveur ldap
- (dont la valeur par d�faut est
- <code>localhost:389</code> pour <code>ldap</code>, et
- <code>localhost:636</code> pour <code>ldaps</code>). Pour
- sp�cifier plusieurs serveurs LDAP redondants, indiquez
- simplement leur liste en les s�parant par des espaces.
- <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> tentera alors de se connecter
- � chacun des serveurs jusqu'� ce qu'il parvienne � se
- connecter avec succ�s. Notez qu'en cas de multiples serveurs
- LDAP, l'ensemble de l'URL LDAP doit �tre entour�e de
- guillemets.</p>
-
- <p>lorsqu'une connection a �t� �tablie avec un serveur, elle
- reste active pendant toute la dur�e de vie du processus
- <code class="program"><a href="../programs/httpd.html">httpd</a></code>, ou jusqu'� ce que le serveur LDAP
- cesse de fonctionner.</p>
-
- <p>Si le serveur LDAP cesse de fonctionner, et ainsi
- interrompt une
- connexion existante, <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> tentera
- de se reconnecter en commen�ant par le premier serveur de la
- liste, et ainsi de suite avec les serveurs redondants
- suivants. Notez que ce processus n'a rien � voir avec une
- v�ritable recherche de type round-robin.</p>
- </dd>
-
-<dt>DN-de-base</dt>
- <dd>Le DN de la branche de l'annuaire � partir de laquelle
- toutes les recherches seront lanc�es. Il doit au moins
- correspondre � la racine de votre annuaire, mais vous pouvez
- aussi indiquer une branche plus sp�cifique.</dd>
-
-<dt>attribut</dt>
-
- <dd>Il s'agit de l'attribut � utiliser pour la recherche.
- Bien que la RFC
- 2255 autorise une liste d'attributs s�par�s par des virgules,
- seul le premier sera retenu, sans tenir compte des autres
- attributs fournis. Si aucun attribut n'est fourni, l'attribut
- par d�faut est <code>uid</code>. Il est judicieux de choisir un
- attribut dont la valeur sera unique parmi toutes les entr�es de
- la branche de l'annuaire que vous aurez d�finie. Tous les
- attributs sp�cifi�s seront enregistr�s dans des variables
- d'environnement avec le pr�fixe AUTHENTICATE_, afin de pouvoir
- �tre utilis�s par d'autres modules.</dd>
-
-<dt>port�e</dt>
-
- <dd>Il s'agit de la port�e de la recherche. Elle peut prendre
- les valeurs <code>one</code> ou <code>sub</code>. Notez que la
- RFC 2255 supporte aussi une port�e de valeur <code>base</code>,
- mais cette derni�re n'est pas support�e par le module. Si la
- port�e n'est pas d�finie, ou si elle est d�finie �
- <code>base</code>, c'est la valeur de port�e par d�faut
- <code>sub</code> qui sera utilis�e.</dd>
-
-<dt>filtre</dt>
-
- <dd>Il s'agit d'un filtre de recherche LDAP valide. Si aucun
- filtre n'est sp�cifi�, le filtre par d�faut
- <code>(objectClass=*)</code> sera utilis�, ce qui corrspond �
- une recherche de tous les types d'objets de l'arborescence. La
- taille des filtres est limit�e � environ 8000 caract�res (valeur
- de la macro <code>MAX_STRING_LEN</code> dans le code source
- d'Apache), ce qui s'av�re plus que suffisant pour la plupart des
- applications. Depuis la version 2.4.10, il est possible
- d'utiliser le param�tre "none" pour sp�cifier qu'aucun filtre
- n'est activ� ; ce param�tre est obligatoire avec certains
- serveurs LDAP primitifs.</dd>
-</dl>
-
- <p>Pour une recherche, les attribut, filtre et nom d'utilisateur
- fournis par le client HTTP sont combin�s pour cr�er un filtre de
- recherche du style :
- <code>(&amp;(<em>filtre</em>)(<em>attribut</em>
- =<em>nom-utilisateur</em>))</code>.</p>
-
- <p>Par exemple, consid�rons l'URL
- <code>ldap://ldap.example.com/o=Example?cn?sub?(posixid=*)</code>.
- Lorsqu'un client tentera de se connecter en utilisant le nom
- d'utilisateur <code>Babs Jenson</code>, le filtre de recherche sera
- : <code>(&amp;(posixid=*)(cn=Babs Jenson))</code>.</p>
-
- <p>On peut encore ajouter un param�tre optionnel pour permettre �
- l'URL LDAP de surcharger le type de connexion. Ce param�tre peut
- prendre l'une des valeurs suivantes :</p>
-
-<dl>
- <dt>NONE</dt>
- <dd>�tablit une connexion non s�curis�e sur le port LDAP par
- d�faut, ce qui est �quivalent � <code>ldap://</code> sur le port
- 389.</dd>
- <dt>SSL</dt>
- <dd>�tablit une connexion s�curis�e sur le port LDAP s�curis�
- par d�faut, ce qui est �quivalent � <code>ldaps://</code>.</dd>
- <dt>TLS | STARTTLS</dt>
- <dd>�tablit une connexion s�curis�e par �l�vation de niveau sur
- le port LDAP par d�faut. Cette connexion sera initialis�e sur le
- port 389 par d�faut, puis �lev�e � un niveau de connexion
- s�curis�e sur le m�me port.</dd>
-</dl>
-
- <p>Voir plus haut pour des exemples d'URLs d�finies par la directive
- <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code>.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authnz_ldap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en
index 69f6fcfe2f..3f06a42208 100644
--- a/docs/manual/mod/mod_authz_core.html.en
+++ b/docs/manual/mod/mod_authz_core.html.en
@@ -61,210 +61,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#requiredirectives">The Require Directives</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="authzalias" id="authzalias">Creating Authorization Provider Aliases</a></h2>
-
- <p>Extended authorization providers can be created within the configuration
- file and assigned an alias name. The alias providers can then be referenced
- through the <code class="directive"><a href="#require">Require</a></code> directive
- in the same way as a base authorization provider. Besides the ability to
- create and alias an extended provider, it also allows the same extended
- authorization provider to be referenced by multiple locations.
- </p>
-
- <h3><a name="example" id="example">Example</a></h3>
- <p>The example below creates two different ldap authorization provider
- aliases based on the ldap-group authorization provider. This example
- allows a single authorization location to check group membership within
- multiple ldap hosts:
- </p>
-
- <pre class="prettyprint lang-config">&lt;AuthzProviderAlias ldap-group ldap-group-alias1 cn=my-group,o=ctx&gt;
- AuthLDAPBindDN cn=youruser,o=ctx
- AuthLDAPBindPassword yourpassword
- AuthLDAPURL ldap://ldap.host/o=ctx
-&lt;/AuthzProviderAlias&gt;
-
-&lt;AuthzProviderAlias ldap-group ldap-group-alias2 cn=my-other-group,o=dev&gt;
- AuthLDAPBindDN cn=yourotheruser,o=dev
- AuthLDAPBindPassword yourotherpassword
- AuthLDAPURL ldap://other.ldap.host/o=dev?cn
-&lt;/AuthzProviderAlias&gt;
-
-Alias "/secure" "/webpages/secure"
-&lt;Directory "/webpages/secure"&gt;
- Require all granted
-
- AuthBasicProvider file
-
- AuthType Basic
- AuthName LDAP_Protected_Place
-
- #implied OR operation
- Require ldap-group-alias1
- Require ldap-group-alias2
-&lt;/Directory&gt;</pre>
-
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="logic" id="logic">Authorization Containers</a></h2>
-
- <p>The authorization container directives
- <code class="directive"><a href="#requireall">&lt;RequireAll&gt;</a></code>,
- <code class="directive"><a href="#requireany">&lt;RequireAny&gt;</a></code>
- and
- <code class="directive"><a href="#requirenone">&lt;RequireNone&gt;</a></code>
- may be combined with each other and with the
- <code class="directive"><a href="#require">Require</a></code>
- directive to express complex authorization logic.</p>
-
- <p>The example below expresses the following authorization logic.
- In order to access the resource, the user must either be the
- <code>superadmin</code> user, or belong to both the
- <code>admins</code> group and the <code>Administrators</code> LDAP
- group and either belong to the <code>sales</code> group or
- have the LDAP <code>dept</code> attribute <code>sales</code>.
- Furthermore, in order to access the resource, the user must
- not belong to either the <code>temps</code> group or the
- LDAP group <code>Temporary Employees</code>.</p>
-
- <pre class="prettyprint lang-config">&lt;Directory "/www/mydocs"&gt;
- &lt;RequireAll&gt;
- &lt;RequireAny&gt;
- Require user superadmin
- &lt;RequireAll&gt;
- Require group admins
- Require ldap-group cn=Administrators,o=Airius
- &lt;RequireAny&gt;
- Require group sales
- Require ldap-attribute dept="sales"
- &lt;/RequireAny&gt;
- &lt;/RequireAll&gt;
- &lt;/RequireAny&gt;
- &lt;RequireNone&gt;
- Require group temps
- Require ldap-group cn=Temporary Employees,o=Airius
- &lt;/RequireNone&gt;
- &lt;/RequireAll&gt;
-&lt;/Directory&gt;</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
-
- <p><code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code> provides some generic authorization
- providers which can be used with the
- <code class="directive"><a href="#require">Require</a></code> directive.</p>
-
- <h3><a name="reqenv" id="reqenv">Require env</a></h3>
-
- <p>The <code>env</code> provider allows access to the server
- to be controlled based on the existence of an <a href="../env.html">environment variable</a>. When <code>Require
- env <var>env-variable</var></code> is specified, then the request is
- allowed access if the environment variable <var>env-variable</var>
- exists. The server provides the ability to set environment
- variables in a flexible way based on characteristics of the client
- request using the directives provided by
- <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>. Therefore, this directive can be
- used to allow access based on such factors as the clients
- <code>User-Agent</code> (browser type), <code>Referer</code>, or
- other HTTP request header fields.</p>
-
- <pre class="prettyprint lang-config">SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
-&lt;Directory "/docroot"&gt;
- Require env let_me_in
-&lt;/Directory&gt;</pre>
-
-
- <p>In this case, browsers with a user-agent string beginning
- 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>
- 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,
- <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>
-
-
-
- <h3><a name="reqall" id="reqall">Require all</a></h3>
-
- <p>The <code>all</code> provider mimics the functionality that
- was previously provided by the 'Allow from all' and 'Deny from all'
- directives. This provider can take one of two arguments which are
- 'granted' or 'denied'. The following examples will grant or deny
- access to all requests.</p>
-
- <pre class="prettyprint lang-config">Require all granted</pre>
-
-
- <pre class="prettyprint lang-config">Require all denied</pre>
-
-
-
-
- <h3><a name="reqmethod" id="reqmethod">Require method</a></h3>
-
- <p>The <code>method</code> provider allows using the HTTP method in
- authorization decisions. The GET and HEAD methods are treated as
- equivalent. The TRACE method is not available to this provider,
- use <code class="directive"><a href="../mod/core.html#traceenable">TraceEnable</a></code> instead.</p>
-
- <p>The following example will only allow GET, HEAD, POST, and OPTIONS
- requests:</p>
-
- <pre class="prettyprint lang-config">Require method GET POST OPTIONS</pre>
-
-
- <p>The following example will allow GET, HEAD, POST, and OPTIONS
- requests without authentication, and require a valid user for all other
- methods:</p>
-
- <pre class="prettyprint lang-config">&lt;RequireAny&gt;
- �Require method GET POST OPTIONS
- �Require valid-user
-&lt;/RequireAny&gt;</pre>
-
-
-
-
- <h3><a name="reqexpr" id="reqexpr">Require expr</a></h3>
-
- <p>The <code>expr</code> provider allows basing authorization
- decisions on arbitrary expressions.</p>
-
- <pre class="prettyprint lang-config">Require expr "%{TIME_HOUR} -ge 9 &amp;&amp; %{TIME_HOUR} -le 17"</pre>
-
-
- <pre class="prettyprint lang-config">&lt;RequireAll&gt;
- Require expr "!(%{QUERY_STRING} =~ /secret/)"
- Require expr "%{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
-&lt;/RequireAll&gt;</pre>
-
-
- <pre class="prettyprint lang-config">Require expr "!(%{QUERY_STRING} =~ /secret/) &amp;&amp; %{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"</pre>
-
-
- <p>The syntax is described in the <a href="../expr.html">ap_expr</a>
- documentation.</p>
-
- <p>Normally, the expression is evaluated before authentication. However, if
- the expression returns false and references the variable
- <code>%{REMOTE_USER}</code>, authentication will be performed and
- the expression will be re-evaluated.</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="AuthMerging" id="AuthMerging">AuthMerging</a> <a name="authmerging" id="authmerging">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls the manner in which each configuration section's
@@ -632,6 +428,210 @@ must succeed for the enclosing directive to not fail.</td></tr>
and Access Control</a></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="authzalias" id="authzalias">Creating Authorization Provider Aliases</a></h2>
+
+ <p>Extended authorization providers can be created within the configuration
+ file and assigned an alias name. The alias providers can then be referenced
+ through the <code class="directive"><a href="#require">Require</a></code> directive
+ in the same way as a base authorization provider. Besides the ability to
+ create and alias an extended provider, it also allows the same extended
+ authorization provider to be referenced by multiple locations.
+ </p>
+
+ <h3><a name="example" id="example">Example</a></h3>
+ <p>The example below creates two different ldap authorization provider
+ aliases based on the ldap-group authorization provider. This example
+ allows a single authorization location to check group membership within
+ multiple ldap hosts:
+ </p>
+
+ <pre class="prettyprint lang-config">&lt;AuthzProviderAlias ldap-group ldap-group-alias1 cn=my-group,o=ctx&gt;
+ AuthLDAPBindDN cn=youruser,o=ctx
+ AuthLDAPBindPassword yourpassword
+ AuthLDAPURL ldap://ldap.host/o=ctx
+&lt;/AuthzProviderAlias&gt;
+
+&lt;AuthzProviderAlias ldap-group ldap-group-alias2 cn=my-other-group,o=dev&gt;
+ AuthLDAPBindDN cn=yourotheruser,o=dev
+ AuthLDAPBindPassword yourotherpassword
+ AuthLDAPURL ldap://other.ldap.host/o=dev?cn
+&lt;/AuthzProviderAlias&gt;
+
+Alias "/secure" "/webpages/secure"
+&lt;Directory "/webpages/secure"&gt;
+ Require all granted
+
+ AuthBasicProvider file
+
+ AuthType Basic
+ AuthName LDAP_Protected_Place
+
+ #implied OR operation
+ Require ldap-group-alias1
+ Require ldap-group-alias2
+&lt;/Directory&gt;</pre>
+
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="logic" id="logic">Authorization Containers</a></h2>
+
+ <p>The authorization container directives
+ <code class="directive"><a href="#requireall">&lt;RequireAll&gt;</a></code>,
+ <code class="directive"><a href="#requireany">&lt;RequireAny&gt;</a></code>
+ and
+ <code class="directive"><a href="#requirenone">&lt;RequireNone&gt;</a></code>
+ may be combined with each other and with the
+ <code class="directive"><a href="#require">Require</a></code>
+ directive to express complex authorization logic.</p>
+
+ <p>The example below expresses the following authorization logic.
+ In order to access the resource, the user must either be the
+ <code>superadmin</code> user, or belong to both the
+ <code>admins</code> group and the <code>Administrators</code> LDAP
+ group and either belong to the <code>sales</code> group or
+ have the LDAP <code>dept</code> attribute <code>sales</code>.
+ Furthermore, in order to access the resource, the user must
+ not belong to either the <code>temps</code> group or the
+ LDAP group <code>Temporary Employees</code>.</p>
+
+ <pre class="prettyprint lang-config">&lt;Directory "/www/mydocs"&gt;
+ &lt;RequireAll&gt;
+ &lt;RequireAny&gt;
+ Require user superadmin
+ &lt;RequireAll&gt;
+ Require group admins
+ Require ldap-group cn=Administrators,o=Airius
+ &lt;RequireAny&gt;
+ Require group sales
+ Require ldap-attribute dept="sales"
+ &lt;/RequireAny&gt;
+ &lt;/RequireAll&gt;
+ &lt;/RequireAny&gt;
+ &lt;RequireNone&gt;
+ Require group temps
+ Require ldap-group cn=Temporary Employees,o=Airius
+ &lt;/RequireNone&gt;
+ &lt;/RequireAll&gt;
+&lt;/Directory&gt;</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
+
+ <p><code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code> provides some generic authorization
+ providers which can be used with the
+ <code class="directive"><a href="#require">Require</a></code> directive.</p>
+
+ <h3><a name="reqenv" id="reqenv">Require env</a></h3>
+
+ <p>The <code>env</code> provider allows access to the server
+ to be controlled based on the existence of an <a href="../env.html">environment variable</a>. When <code>Require
+ env <var>env-variable</var></code> is specified, then the request is
+ allowed access if the environment variable <var>env-variable</var>
+ exists. The server provides the ability to set environment
+ variables in a flexible way based on characteristics of the client
+ request using the directives provided by
+ <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>. Therefore, this directive can be
+ used to allow access based on such factors as the clients
+ <code>User-Agent</code> (browser type), <code>Referer</code>, or
+ other HTTP request header fields.</p>
+
+ <pre class="prettyprint lang-config">SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
+&lt;Directory "/docroot"&gt;
+ Require env let_me_in
+&lt;/Directory&gt;</pre>
+
+
+ <p>In this case, browsers with a user-agent string beginning
+ 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>
+ 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,
+ <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>
+
+
+
+ <h3><a name="reqall" id="reqall">Require all</a></h3>
+
+ <p>The <code>all</code> provider mimics the functionality that
+ was previously provided by the 'Allow from all' and 'Deny from all'
+ directives. This provider can take one of two arguments which are
+ 'granted' or 'denied'. The following examples will grant or deny
+ access to all requests.</p>
+
+ <pre class="prettyprint lang-config">Require all granted</pre>
+
+
+ <pre class="prettyprint lang-config">Require all denied</pre>
+
+
+
+
+ <h3><a name="reqmethod" id="reqmethod">Require method</a></h3>
+
+ <p>The <code>method</code> provider allows using the HTTP method in
+ authorization decisions. The GET and HEAD methods are treated as
+ equivalent. The TRACE method is not available to this provider,
+ use <code class="directive"><a href="../mod/core.html#traceenable">TraceEnable</a></code> instead.</p>
+
+ <p>The following example will only allow GET, HEAD, POST, and OPTIONS
+ requests:</p>
+
+ <pre class="prettyprint lang-config">Require method GET POST OPTIONS</pre>
+
+
+ <p>The following example will allow GET, HEAD, POST, and OPTIONS
+ requests without authentication, and require a valid user for all other
+ methods:</p>
+
+ <pre class="prettyprint lang-config">&lt;RequireAny&gt;
+ �Require method GET POST OPTIONS
+ �Require valid-user
+&lt;/RequireAny&gt;</pre>
+
+
+
+
+ <h3><a name="reqexpr" id="reqexpr">Require expr</a></h3>
+
+ <p>The <code>expr</code> provider allows basing authorization
+ decisions on arbitrary expressions.</p>
+
+ <pre class="prettyprint lang-config">Require expr "%{TIME_HOUR} -ge 9 &amp;&amp; %{TIME_HOUR} -le 17"</pre>
+
+
+ <pre class="prettyprint lang-config">&lt;RequireAll&gt;
+ Require expr "!(%{QUERY_STRING} =~ /secret/)"
+ Require expr "%{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
+&lt;/RequireAll&gt;</pre>
+
+
+ <pre class="prettyprint lang-config">Require expr "!(%{QUERY_STRING} =~ /secret/) &amp;&amp; %{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"</pre>
+
+
+ <p>The syntax is described in the <a href="../expr.html">ap_expr</a>
+ documentation.</p>
+
+ <p>Normally, the expression is evaluated before authentication. However, if
+ the expression returns false and references the variable
+ <code>%{REMOTE_USER}</code>, authentication will be performed and
+ the expression will be re-evaluated.</p>
+
+
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authz_core.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authz_core.html.fr b/docs/manual/mod/mod_authz_core.html.fr
index a7fb4aa85b..0b040c26b9 100644
--- a/docs/manual/mod/mod_authz_core.html.fr
+++ b/docs/manual/mod/mod_authz_core.html.fr
@@ -65,208 +65,6 @@ d'autorisation</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#requiredirectives">Les directives Require</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="authzalias" id="authzalias">Cr�ation des alias du fournisseur
-d'autorisation</a></h2>
-
- <p>Il est possible de cr�er des fournisseurs d'autorisation �tendus
- dans le fichier de configuration et de leur assigner un nom d'alias.
- On peut ensuite utiliser ces fournisseurs alias�s dans une
- directive <code class="directive"><a href="#require">Require</a></code> de
- la m�me mani�re qu'on le ferait pour des fournisseurs d'autorisation
- de base. En plus de la possibilit� de cr�er et d'aliaser un
- fournisseur �tendu, le m�me fournisseur d'autorisation �tendu peut
- �tre r�f�renc� par plusieurs localisations.
- </p>
-
- <h3><a name="example" id="example">Exemple</a></h3>
- <p>Dans l'exemple suivant, on cr�e deux alias de fournisseur
- d'autorisation ldap diff�rents bas�s sur le fournisseur
- d'autorisation ldap-group. Il est ainsi possible pour un seul
- r�pertoire de v�rifier l'appartenance � un groupe dans plusieurs
- serveurs ldap :
- </p>
-
- <pre class="prettyprint lang-config">&lt;AuthzProviderAlias ldap-group ldap-group-alias1 cn=my-group,o=ctx&gt;
- AuthLDAPBindDN cn=youruser,o=ctx
- AuthLDAPBindPassword yourpassword
- AuthLDAPURL ldap://ldap.host/o=ctx
-&lt;/AuthzProviderAlias&gt;
-
-&lt;AuthzProviderAlias ldap-group ldap-group-alias2 cn=my-other-group,o=dev&gt;
- AuthLDAPBindDN cn=yourotheruser,o=dev
- AuthLDAPBindPassword yourotherpassword
- AuthLDAPURL ldap://other.ldap.host/o=dev?cn
-&lt;/AuthzProviderAlias&gt;
-
-Alias /secure /webpages/secure
-&lt;Directory /webpages/secure&gt;
- Require all granted
-
- AuthBasicProvider file
-
- AuthType Basic
- AuthName LDAP_Protected_Place
-
- #implied OR operation
- Require ldap-group-alias1
- Require ldap-group-alias2
-&lt;/Directory&gt;</pre>
-
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="logic" id="logic">Conteneurs d'autorisation</a></h2>
-
- <p>Les directives de conteneur d'autorisation <code class="directive"><a href="#requireall">&lt;RequireAll&gt;</a></code>,
- <code class="directive"><a href="#requireany">&lt;RequireAny&gt;</a></code> et <code class="directive"><a href="#requirenone">&lt;RequireNone&gt;</a></code>
- peuvent �tre combin�es entre elles et avec la directive <code class="directive"><a href="#require">Require</a></code> pour confectionner une
- logique d'autorisation complexe.</p>
-
- <p>L'exemple ci-dessous illustre la logique d'autorisation suivante.
- Pour pouvoir acc�der � la ressource, l'utilisateur doit �tre
- l'utilisateur <code>superadmin</code>, ou appartenir aux deux
- groupes LDAP <code>admins</code> et <code>Administrateurs</code> et
- soit appartenir au groupe <code>ventes</code> ou avoir
- <code>ventes</code> comme valeur de l'attribut LDAP
- <code>dept</code>. De plus, pour pouvoir acc�der � la ressource,
- l'utilisateur ne doit appartenir ni au groupe <code>temps</code>, ni
- au groupe LDAP <code>Employ�s temporaires</code>.</p>
-
- <pre class="prettyprint lang-config">&lt;Directory /www/mydocs&gt;
- &lt;RequireAll&gt;
- &lt;RequireAny&gt;
- Require user superadmin
- &lt;RequireAll&gt;
- Require group admins
- Require ldap-group cn=Administrators,o=Airius
- &lt;RequireAny&gt;
- Require group sales
- Require ldap-attribute dept="sales"
- &lt;/RequireAny&gt;
- &lt;/RequireAll&gt;
- &lt;/RequireAny&gt;
- &lt;RequireNone&gt;
- Require group temps
- Require ldap-group cn=Temporary Employees,o=Airius
- &lt;/RequireNone&gt;
- &lt;/RequireAll&gt;
-&lt;/Directory&gt;</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="requiredirectives" id="requiredirectives">Les directives Require</a></h2>
-
- <p>Le module <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code> met � disposition des
- fournisseurs d'autorisation g�n�riques utilisables avec la directive
- <code class="directive"><a href="#require">Require</a></code>.</p>
-
- <h3><a name="reqenv" id="reqenv">Require env</a></h3>
-
- <p>Le fournisseur <code>env</code> permet de contr�ler l'acc�s au
- serveur en fonction de l'existence d'une <a href="../env.html">variable d'environnement</a>. Lorsque <code>Require
- env <var>env-variable</var></code> est sp�cifi�, la requ�te se voit
- autoriser l'acc�s si la variable d'environnement
- <var>env-variable</var> existe. Le serveur permet de d�finir
- facilement des variables d'environnement en fonction des
- caract�ristiques de la requ�te du client via les directives fournies
- par le module <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>. Cette directive Require
- env permet donc de contr�ler l'acc�s en fonction des
- valeurs des en-t�tes de la requ�te HTTP tels que
- <code>User-Agent</code> (type de navigateur), <code>Referer</code>,
- entre autres.</p>
-
- <pre class="prettyprint lang-config">SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
-&lt;Directory /docroot&gt;
- Require env let_me_in
-&lt;/Directory&gt;</pre>
-
-
- <p>Avec cet exemple, les navigateurs dont la cha�ne user-agent
- commence par <code>KnockKnock/2.0</code> se verront autoriser
- l'acc�s, alors que tous les autres seront rejet�s.</p>
-
- <p>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
- recherche d'un <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>), ou lorsqu'il g�n�re un
- listing du contenu d'un r�pertoire via le module
- <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>, la sous-requ�te n'h�rite pas des
- variables d'environnement sp�cifiques � la requ�te. En outre, � cause
- des phases de l'API auxquelles <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> prend
- part, les directives <code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> ne sont pas �valu�es
- s�par�ment dans la sous-requ�te.</p>
-
-
-
- <h3><a name="reqall" id="reqall">Require all</a></h3>
-
- <p>Le fournisseur <code>all</code> reproduit la fonctionnalit�
- pr�c�demment fournie par les directives 'Allow from all' et 'Deny
- from all'. Il accepte un argument dont les deux valeurs possibles
- sont : 'granted' ou 'denied'. Les exemples suivants autorisent ou
- interdisent l'acc�s � toutes les requ�tes.</p>
-
- <pre class="prettyprint lang-config">Require all granted</pre>
-
-
- <pre class="prettyprint lang-config">Require all denied</pre>
-
-
-
-
- <h3><a name="reqmethod" id="reqmethod">Require method</a></h3>
-
- <p>Le fournisseur <code>method</code> permet d'utiliser la m�thode
- HTTP dans le processus d'autorisation. Les m�thodes GET et HEAD sont
- ici consid�r�es comme �quivalentes. La m�thode TRACE n'est pas
- support�e par ce fournisseur ; utilisez � la place la directive
- <code class="directive"><a href="../mod/core.html#traceenable">TraceEnable</a></code>.</p>
-
- <p>Dans l'exemple suivant, seules les m�thodes GET, HEAD, POST, et
- OPTIONS sont autoris�es :</p>
-
- <pre class="prettyprint lang-config">Require method GET POST OPTIONS</pre>
-
-
- <p>Dans l'exemple suivant, les m�thodes GET, HEAD, POST, et OPTIONS
- sont autoris�es sans authentification, alors que toutes les autres
- m�thodes n�cessitent un utilisateur valide :</p>
-
- <pre class="prettyprint lang-config">&lt;RequireAny&gt;
- �Require method GET POST OPTIONS
- �Require valid-user
-&lt;/RequireAny&gt;</pre>
-
-
-
- <h3><a name="reqexpr" id="reqexpr">Require expr</a></h3>
-
- <p>Le fournisseur <code>expr</code> permet d'accorder l'autorisation
- d'acc�s de base en fonction d'expressions arbitraires.</p>
-
- <pre class="prettyprint lang-config">Require expr "%{TIME_HOUR} -ge 9 &amp;&amp; %{TIME_HOUR} -le 17"</pre>
-
-
- <pre class="prettyprint lang-config">&lt;RequireAll&gt;
- Require expr "!(%{QUERY_STRING} =~ /secret/)"
- Require expr "%{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
-&lt;/RequireAll&gt;</pre>
-
-
- <pre class="prettyprint lang-config">Require expr "!(%{QUERY_STRING} =~ /secret/) &amp;&amp; %{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"</pre>
-
-
- <p>La syntaxe de l'expression est d�crite dans la documentation de <a href="../expr.html">ap_expr</a>.</p>
-
- <p>Normalement, l'expression est �valu�e avant l'authentification.
- Cependant, si l'expression renvoie false et se r�f�re � la variable
- <code>%{REMOTE_USER}</code>, le processus d'authentification sera
- engag� et l'expression r��valu�e.</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="authmerging" id="authmerging">Directive</a> <a name="AuthMerging" id="AuthMerging">AuthMerging</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit la mani�re dont chaque logique d'autorisation des
@@ -641,6 +439,208 @@ pas.</td></tr>
contr�le d'acc�s</a></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="authzalias" id="authzalias">Cr�ation des alias du fournisseur
+d'autorisation</a></h2>
+
+ <p>Il est possible de cr�er des fournisseurs d'autorisation �tendus
+ dans le fichier de configuration et de leur assigner un nom d'alias.
+ On peut ensuite utiliser ces fournisseurs alias�s dans une
+ directive <code class="directive"><a href="#require">Require</a></code> de
+ la m�me mani�re qu'on le ferait pour des fournisseurs d'autorisation
+ de base. En plus de la possibilit� de cr�er et d'aliaser un
+ fournisseur �tendu, le m�me fournisseur d'autorisation �tendu peut
+ �tre r�f�renc� par plusieurs localisations.
+ </p>
+
+ <h3><a name="example" id="example">Exemple</a></h3>
+ <p>Dans l'exemple suivant, on cr�e deux alias de fournisseur
+ d'autorisation ldap diff�rents bas�s sur le fournisseur
+ d'autorisation ldap-group. Il est ainsi possible pour un seul
+ r�pertoire de v�rifier l'appartenance � un groupe dans plusieurs
+ serveurs ldap :
+ </p>
+
+ <pre class="prettyprint lang-config">&lt;AuthzProviderAlias ldap-group ldap-group-alias1 cn=my-group,o=ctx&gt;
+ AuthLDAPBindDN cn=youruser,o=ctx
+ AuthLDAPBindPassword yourpassword
+ AuthLDAPURL ldap://ldap.host/o=ctx
+&lt;/AuthzProviderAlias&gt;
+
+&lt;AuthzProviderAlias ldap-group ldap-group-alias2 cn=my-other-group,o=dev&gt;
+ AuthLDAPBindDN cn=yourotheruser,o=dev
+ AuthLDAPBindPassword yourotherpassword
+ AuthLDAPURL ldap://other.ldap.host/o=dev?cn
+&lt;/AuthzProviderAlias&gt;
+
+Alias /secure /webpages/secure
+&lt;Directory /webpages/secure&gt;
+ Require all granted
+
+ AuthBasicProvider file
+
+ AuthType Basic
+ AuthName LDAP_Protected_Place
+
+ #implied OR operation
+ Require ldap-group-alias1
+ Require ldap-group-alias2
+&lt;/Directory&gt;</pre>
+
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="logic" id="logic">Conteneurs d'autorisation</a></h2>
+
+ <p>Les directives de conteneur d'autorisation <code class="directive"><a href="#requireall">&lt;RequireAll&gt;</a></code>,
+ <code class="directive"><a href="#requireany">&lt;RequireAny&gt;</a></code> et <code class="directive"><a href="#requirenone">&lt;RequireNone&gt;</a></code>
+ peuvent �tre combin�es entre elles et avec la directive <code class="directive"><a href="#require">Require</a></code> pour confectionner une
+ logique d'autorisation complexe.</p>
+
+ <p>L'exemple ci-dessous illustre la logique d'autorisation suivante.
+ Pour pouvoir acc�der � la ressource, l'utilisateur doit �tre
+ l'utilisateur <code>superadmin</code>, ou appartenir aux deux
+ groupes LDAP <code>admins</code> et <code>Administrateurs</code> et
+ soit appartenir au groupe <code>ventes</code> ou avoir
+ <code>ventes</code> comme valeur de l'attribut LDAP
+ <code>dept</code>. De plus, pour pouvoir acc�der � la ressource,
+ l'utilisateur ne doit appartenir ni au groupe <code>temps</code>, ni
+ au groupe LDAP <code>Employ�s temporaires</code>.</p>
+
+ <pre class="prettyprint lang-config">&lt;Directory /www/mydocs&gt;
+ &lt;RequireAll&gt;
+ &lt;RequireAny&gt;
+ Require user superadmin
+ &lt;RequireAll&gt;
+ Require group admins
+ Require ldap-group cn=Administrators,o=Airius
+ &lt;RequireAny&gt;
+ Require group sales
+ Require ldap-attribute dept="sales"
+ &lt;/RequireAny&gt;
+ &lt;/RequireAll&gt;
+ &lt;/RequireAny&gt;
+ &lt;RequireNone&gt;
+ Require group temps
+ Require ldap-group cn=Temporary Employees,o=Airius
+ &lt;/RequireNone&gt;
+ &lt;/RequireAll&gt;
+&lt;/Directory&gt;</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requiredirectives" id="requiredirectives">Les directives Require</a></h2>
+
+ <p>Le module <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code> met � disposition des
+ fournisseurs d'autorisation g�n�riques utilisables avec la directive
+ <code class="directive"><a href="#require">Require</a></code>.</p>
+
+ <h3><a name="reqenv" id="reqenv">Require env</a></h3>
+
+ <p>Le fournisseur <code>env</code> permet de contr�ler l'acc�s au
+ serveur en fonction de l'existence d'une <a href="../env.html">variable d'environnement</a>. Lorsque <code>Require
+ env <var>env-variable</var></code> est sp�cifi�, la requ�te se voit
+ autoriser l'acc�s si la variable d'environnement
+ <var>env-variable</var> existe. Le serveur permet de d�finir
+ facilement des variables d'environnement en fonction des
+ caract�ristiques de la requ�te du client via les directives fournies
+ par le module <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>. Cette directive Require
+ env permet donc de contr�ler l'acc�s en fonction des
+ valeurs des en-t�tes de la requ�te HTTP tels que
+ <code>User-Agent</code> (type de navigateur), <code>Referer</code>,
+ entre autres.</p>
+
+ <pre class="prettyprint lang-config">SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in
+&lt;Directory /docroot&gt;
+ Require env let_me_in
+&lt;/Directory&gt;</pre>
+
+
+ <p>Avec cet exemple, les navigateurs dont la cha�ne user-agent
+ commence par <code>KnockKnock/2.0</code> se verront autoriser
+ l'acc�s, alors que tous les autres seront rejet�s.</p>
+
+ <p>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
+ recherche d'un <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>), ou lorsqu'il g�n�re un
+ listing du contenu d'un r�pertoire via le module
+ <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>, la sous-requ�te n'h�rite pas des
+ variables d'environnement sp�cifiques � la requ�te. En outre, � cause
+ des phases de l'API auxquelles <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> prend
+ part, les directives <code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> ne sont pas �valu�es
+ s�par�ment dans la sous-requ�te.</p>
+
+
+
+ <h3><a name="reqall" id="reqall">Require all</a></h3>
+
+ <p>Le fournisseur <code>all</code> reproduit la fonctionnalit�
+ pr�c�demment fournie par les directives 'Allow from all' et 'Deny
+ from all'. Il accepte un argument dont les deux valeurs possibles
+ sont : 'granted' ou 'denied'. Les exemples suivants autorisent ou
+ interdisent l'acc�s � toutes les requ�tes.</p>
+
+ <pre class="prettyprint lang-config">Require all granted</pre>
+
+
+ <pre class="prettyprint lang-config">Require all denied</pre>
+
+
+
+
+ <h3><a name="reqmethod" id="reqmethod">Require method</a></h3>
+
+ <p>Le fournisseur <code>method</code> permet d'utiliser la m�thode
+ HTTP dans le processus d'autorisation. Les m�thodes GET et HEAD sont
+ ici consid�r�es comme �quivalentes. La m�thode TRACE n'est pas
+ support�e par ce fournisseur ; utilisez � la place la directive
+ <code class="directive"><a href="../mod/core.html#traceenable">TraceEnable</a></code>.</p>
+
+ <p>Dans l'exemple suivant, seules les m�thodes GET, HEAD, POST, et
+ OPTIONS sont autoris�es :</p>
+
+ <pre class="prettyprint lang-config">Require method GET POST OPTIONS</pre>
+
+
+ <p>Dans l'exemple suivant, les m�thodes GET, HEAD, POST, et OPTIONS
+ sont autoris�es sans authentification, alors que toutes les autres
+ m�thodes n�cessitent un utilisateur valide :</p>
+
+ <pre class="prettyprint lang-config">&lt;RequireAny&gt;
+ �Require method GET POST OPTIONS
+ �Require valid-user
+&lt;/RequireAny&gt;</pre>
+
+
+
+ <h3><a name="reqexpr" id="reqexpr">Require expr</a></h3>
+
+ <p>Le fournisseur <code>expr</code> permet d'accorder l'autorisation
+ d'acc�s de base en fonction d'expressions arbitraires.</p>
+
+ <pre class="prettyprint lang-config">Require expr "%{TIME_HOUR} -ge 9 &amp;&amp; %{TIME_HOUR} -le 17"</pre>
+
+
+ <pre class="prettyprint lang-config">&lt;RequireAll&gt;
+ Require expr "!(%{QUERY_STRING} =~ /secret/)"
+ Require expr "%{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"
+&lt;/RequireAll&gt;</pre>
+
+
+ <pre class="prettyprint lang-config">Require expr "!(%{QUERY_STRING} =~ /secret/) &amp;&amp; %{REQUEST_URI} in { '/example.cgi', '/other.cgi' }"</pre>
+
+
+ <p>La syntaxe de l'expression est d�crite dans la documentation de <a href="../expr.html">ap_expr</a>.</p>
+
+ <p>Normalement, l'expression est �valu�e avant l'authentification.
+ Cependant, si l'expression renvoie false et se r�f�re � la variable
+ <code>%{REMOTE_USER}</code>, le processus d'authentification sera
+ engag� et l'expression r��valu�e.</p>
+
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authz_core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authz_dbd.html.en b/docs/manual/mod/mod_authz_dbd.html.en
index 2710cb6ed6..a3f016e33f 100644
--- a/docs/manual/mod/mod_authz_dbd.html.en
+++ b/docs/manual/mod/mod_authz_dbd.html.en
@@ -70,6 +70,90 @@
<li><code class="directive"><a href="../mod/mod_dbd.html#dbdparams">DBDParams</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthzDBDLoginToReferer" id="AuthzDBDLoginToReferer">AuthzDBDLoginToReferer</a> <a name="authzdbdlogintoreferer" id="authzdbdlogintoreferer">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines whether to redirect the Client to the Referring
+page on successful login or logout if a <code>Referer</code> request
+header is present</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthzDBDLoginToReferer On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthzDBDLoginToReferer Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</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_authz_dbd</td></tr>
+</table>
+ <p>In conjunction with <code>Require dbd-login</code> or
+ <code>Require dbd-logout</code>, this provides the option to
+ redirect the client back to the Referring page (the URL in
+ the <code>Referer</code> HTTP request header, if present).
+ When there is no <code>Referer</code> header,
+ <code>AuthzDBDLoginToReferer On</code> will be ignored.</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="AuthzDBDQuery" id="AuthzDBDQuery">AuthzDBDQuery</a> <a name="authzdbdquery" id="authzdbdquery">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify the SQL Query for the required operation</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthzDBDQuery <var>query</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</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_authz_dbd</td></tr>
+</table>
+ <p>The <code class="directive">AuthzDBDQuery</code> specifies an SQL
+ query to run. The purpose of the query depends on the
+ <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> directive in
+ effect.</p>
+ <ul>
+ <li>When used with a <code>Require dbd-group</code> directive,
+ it specifies a query to look up groups for the current user. This is
+ the standard functionality of other authorization modules such as
+ <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> and <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>.
+ The first column value of each row returned by the query statement
+ should be a string containing a group name. Zero, one, or more rows
+ may be returned.
+ <pre class="prettyprint lang-config">Require dbd-group
+AuthzDBDQuery "SELECT group FROM groups WHERE user = %s"</pre>
+
+ </li>
+ <li>When used with a <code>Require dbd-login</code> or
+ <code>Require dbd-logout</code> directive, it will never deny access,
+ but will instead execute a SQL statement designed to log the user
+ in or out. The user must already be authenticated with
+ <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>.
+ <pre class="prettyprint lang-config">Require dbd-login
+AuthzDBDQuery "UPDATE authn SET login = 'true' WHERE user = %s"</pre>
+
+ </li>
+ </ul>
+ <p>In all cases, the user's ID will be passed as a single string
+ parameter when the SQL query is executed. It may be referenced within
+ the query statement using a <code>%s</code> format specifier.</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="AuthzDBDRedirectQuery" id="AuthzDBDRedirectQuery">AuthzDBDRedirectQuery</a> <a name="authzdbdredirectquery" id="authzdbdredirectquery">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify a query to look up a login page for the user</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthzDBDRedirectQuery <var>query</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</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_authz_dbd</td></tr>
+</table>
+ <p>Specifies an optional SQL query to use after successful login
+ (or logout) to redirect the user to a URL, which may be
+ specific to the user. The user's ID will be passed as a single string
+ parameter when the SQL query is executed. It may be referenced within
+ the query statement using a <code>%s</code> format specifier.</p>
+ <pre class="prettyprint lang-config">AuthzDBDRedirectQuery "SELECT userpage FROM userpages WHERE user = %s"</pre>
+
+ <p>The first column value of the first row returned by the query
+ statement should be a string containing a URL to which to redirect
+ the client. Subsequent rows will be ignored. If no rows are returned,
+ the client will not be redirected.</p>
+ <p>Note that <code class="directive">AuthzDBDLoginToReferer</code> takes
+ precedence if both are set.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
@@ -198,90 +282,6 @@ DBDExptime 300
&lt;/Directory&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="AuthzDBDLoginToReferer" id="AuthzDBDLoginToReferer">AuthzDBDLoginToReferer</a> <a name="authzdbdlogintoreferer" id="authzdbdlogintoreferer">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines whether to redirect the Client to the Referring
-page on successful login or logout if a <code>Referer</code> request
-header is present</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthzDBDLoginToReferer On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthzDBDLoginToReferer Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</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_authz_dbd</td></tr>
-</table>
- <p>In conjunction with <code>Require dbd-login</code> or
- <code>Require dbd-logout</code>, this provides the option to
- redirect the client back to the Referring page (the URL in
- the <code>Referer</code> HTTP request header, if present).
- When there is no <code>Referer</code> header,
- <code>AuthzDBDLoginToReferer On</code> will be ignored.</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="AuthzDBDQuery" id="AuthzDBDQuery">AuthzDBDQuery</a> <a name="authzdbdquery" id="authzdbdquery">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify the SQL Query for the required operation</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthzDBDQuery <var>query</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</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_authz_dbd</td></tr>
-</table>
- <p>The <code class="directive">AuthzDBDQuery</code> specifies an SQL
- query to run. The purpose of the query depends on the
- <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> directive in
- effect.</p>
- <ul>
- <li>When used with a <code>Require dbd-group</code> directive,
- it specifies a query to look up groups for the current user. This is
- the standard functionality of other authorization modules such as
- <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> and <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>.
- The first column value of each row returned by the query statement
- should be a string containing a group name. Zero, one, or more rows
- may be returned.
- <pre class="prettyprint lang-config">Require dbd-group
-AuthzDBDQuery "SELECT group FROM groups WHERE user = %s"</pre>
-
- </li>
- <li>When used with a <code>Require dbd-login</code> or
- <code>Require dbd-logout</code> directive, it will never deny access,
- but will instead execute a SQL statement designed to log the user
- in or out. The user must already be authenticated with
- <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>.
- <pre class="prettyprint lang-config">Require dbd-login
-AuthzDBDQuery "UPDATE authn SET login = 'true' WHERE user = %s"</pre>
-
- </li>
- </ul>
- <p>In all cases, the user's ID will be passed as a single string
- parameter when the SQL query is executed. It may be referenced within
- the query statement using a <code>%s</code> format specifier.</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="AuthzDBDRedirectQuery" id="AuthzDBDRedirectQuery">AuthzDBDRedirectQuery</a> <a name="authzdbdredirectquery" id="authzdbdredirectquery">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify a query to look up a login page for the user</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthzDBDRedirectQuery <var>query</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</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_authz_dbd</td></tr>
-</table>
- <p>Specifies an optional SQL query to use after successful login
- (or logout) to redirect the user to a URL, which may be
- specific to the user. The user's ID will be passed as a single string
- parameter when the SQL query is executed. It may be referenced within
- the query statement using a <code>%s</code> format specifier.</p>
- <pre class="prettyprint lang-config">AuthzDBDRedirectQuery "SELECT userpage FROM userpages WHERE user = %s"</pre>
-
- <p>The first column value of the first row returned by the query
- statement should be a string containing a URL to which to redirect
- the client. Subsequent rows will be ignored. If no rows are returned,
- the client will not be redirected.</p>
- <p>Note that <code class="directive">AuthzDBDLoginToReferer</code> takes
- precedence if both are set.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authz_dbd.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authz_dbd.html.fr b/docs/manual/mod/mod_authz_dbd.html.fr
index dcea399ff4..85d75f7a98 100644
--- a/docs/manual/mod/mod_authz_dbd.html.fr
+++ b/docs/manual/mod/mod_authz_dbd.html.fr
@@ -75,6 +75,99 @@ d'Apache</td></tr></table>
<li><code class="directive"><a href="../mod/mod_dbd.html#dbdparams">DBDParams</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="authzdbdlogintoreferer" id="authzdbdlogintoreferer">Directive</a> <a name="AuthzDBDLoginToReferer" id="AuthzDBDLoginToReferer">AuthzDBDLoginToReferer</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit si le client doit �tre redirig� vers la page
+d'origine en cas de connexion ou de d�connexion r�ussie si un en-t�te
+de requ�te <code>Referer</code> est pr�sent</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthzDBDLoginToReferer On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthzDBDLoginToReferer Off</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_authz_dbd</td></tr>
+</table>
+ <p>Utilis�e en conjonction avec <code>Require dbd-login</code> ou
+ <code>Require dbd-logout</code>, cette directive permet de rediriger
+ le client vers la page d'origine (l'URL contenue dans l'en-t�te
+ de requ�te HTTP <code>Referer</code>, s'il est pr�sent). En
+ l'absence d'en-t�te <code>Referer</code>, la d�finition
+ <code>AuthzDBDLoginToReferer On</code> sera ignor�e.</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="authzdbdquery" id="authzdbdquery">Directive</a> <a name="AuthzDBDQuery" id="AuthzDBDQuery">AuthzDBDQuery</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit la requ�te SQL pour l'op�ration
+requise</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthzDBDQuery <var>requ�te</var></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_authz_dbd</td></tr>
+</table>
+ <p>La directive <code class="directive">AuthzDBDQuery</code> permet de
+ sp�cifier une requ�te SQL � ex�cuter. Le but de cette requ�te d�pend
+ de la directive <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> en cours de
+ traitement.</p>
+ <ul>
+ <li>Avec la directive <code>Require dbd-group</code>, elle sp�cifie
+ une requ�te permettant de rechercher les groupes d'appartenance de
+ l'utilisateur courant. Ceci correspond � la fonctionnalit� standard
+ d'autres modules d'autorisation comme
+ <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> et
+ <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>.
+ La premi�re colonne de chaque enregistrement renvoy� par la requ�te
+ doit contenir une cha�ne de caract�res correspondant � un nom de
+ groupe. La requ�te peut renvoyer z�ro, un ou plusieurs
+ enregistrements.
+ <pre class="prettyprint lang-config">Require dbd-group
+AuthzDBDQuery "SELECT group FROM groups WHERE user = %s"</pre>
+
+ </li>
+ <li>Avec la directive <code>Require dbd-login</code> ou
+ <code>Require dbd-logout</code>, elle ne refusera jamais l'acc�s,
+ mais au contraire ex�cutera une requ�te SQL permettant d'enregistrer
+ la connexion ou la d�connexion de l'utilisateur. Ce dernier doit
+ �tre d�j� authentifi� avec <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>.
+ <pre class="prettyprint lang-config">Require dbd-login
+AuthzDBDQuery "UPDATE authn SET login = 'true' WHERE user = %s"</pre>
+
+ </li>
+ </ul>
+ <p>Dans tous les cas, l'identifiant utilisateur sera transmis comme
+ param�tre sous la forme d'une simple cha�ne lorsque la requ�te SQL
+ sera ex�cut�e. Il y sera fait r�f�rence dans la requ�te en utilisant
+ le sp�cificateur de format <code>%s</code>.</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="authzdbdredirectquery" id="authzdbdredirectquery">Directive</a> <a name="AuthzDBDRedirectQuery" id="AuthzDBDRedirectQuery">AuthzDBDRedirectQuery</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit une requ�te pour rechercher une page vers laquelle
+rediriger l'utilisateur apr�s une connexion r�ussie</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthzDBDRedirectQuery <var>requ�te</var></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_authz_dbd</td></tr>
+</table>
+ <p>Sp�cifie une requ�te SQL optionnelle � utiliser apr�s une
+ connexion (ou une d�connexion) r�ussie pour rediriger l'utilisateur
+ vers une URL, qui peut �tre sp�cifique � l'utilisateur.
+ L'identifiant utilisateur sera transmis comme param�tre sous la
+ forme d'une simple cha�ne lorsque la requ�te SQL sera ex�cut�e. Il y
+ sera fait r�f�rence dans la requ�te en utilisant le sp�cificateur de
+ format <code>%s</code>.</p>
+ <pre class="prettyprint lang-config">AuthzDBDRedirectQuery "SELECT userpage FROM userpages WHERE user = %s"</pre>
+
+ <p>La premi�re colonne du premier enregistrement renvoy� par la
+ requ�te doit contenir une cha�ne de caract�res correspondant � une
+ URL vers laquelle rediriger le client. Les enregistrements suivants
+ sont ignor�s. Si aucun enregistrement n'est renvoy�, le client ne
+ sera pas redirig�.</p>
+ <p>Notez que <code class="directive">AuthzDBDLoginToReferer</code> l'emporte
+ sur cette directive si les deux sont d�finies.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="requiredirectives" id="requiredirectives">Les directives Require</a></h2>
@@ -211,99 +304,6 @@ DBDExptime 300
&lt;/Directory&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="authzdbdlogintoreferer" id="authzdbdlogintoreferer">Directive</a> <a name="AuthzDBDLoginToReferer" id="AuthzDBDLoginToReferer">AuthzDBDLoginToReferer</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit si le client doit �tre redirig� vers la page
-d'origine en cas de connexion ou de d�connexion r�ussie si un en-t�te
-de requ�te <code>Referer</code> est pr�sent</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthzDBDLoginToReferer On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>AuthzDBDLoginToReferer Off</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_authz_dbd</td></tr>
-</table>
- <p>Utilis�e en conjonction avec <code>Require dbd-login</code> ou
- <code>Require dbd-logout</code>, cette directive permet de rediriger
- le client vers la page d'origine (l'URL contenue dans l'en-t�te
- de requ�te HTTP <code>Referer</code>, s'il est pr�sent). En
- l'absence d'en-t�te <code>Referer</code>, la d�finition
- <code>AuthzDBDLoginToReferer On</code> sera ignor�e.</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="authzdbdquery" id="authzdbdquery">Directive</a> <a name="AuthzDBDQuery" id="AuthzDBDQuery">AuthzDBDQuery</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit la requ�te SQL pour l'op�ration
-requise</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthzDBDQuery <var>requ�te</var></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_authz_dbd</td></tr>
-</table>
- <p>La directive <code class="directive">AuthzDBDQuery</code> permet de
- sp�cifier une requ�te SQL � ex�cuter. Le but de cette requ�te d�pend
- de la directive <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> en cours de
- traitement.</p>
- <ul>
- <li>Avec la directive <code>Require dbd-group</code>, elle sp�cifie
- une requ�te permettant de rechercher les groupes d'appartenance de
- l'utilisateur courant. Ceci correspond � la fonctionnalit� standard
- d'autres modules d'autorisation comme
- <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> et
- <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>.
- La premi�re colonne de chaque enregistrement renvoy� par la requ�te
- doit contenir une cha�ne de caract�res correspondant � un nom de
- groupe. La requ�te peut renvoyer z�ro, un ou plusieurs
- enregistrements.
- <pre class="prettyprint lang-config">Require dbd-group
-AuthzDBDQuery "SELECT group FROM groups WHERE user = %s"</pre>
-
- </li>
- <li>Avec la directive <code>Require dbd-login</code> ou
- <code>Require dbd-logout</code>, elle ne refusera jamais l'acc�s,
- mais au contraire ex�cutera une requ�te SQL permettant d'enregistrer
- la connexion ou la d�connexion de l'utilisateur. Ce dernier doit
- �tre d�j� authentifi� avec <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>.
- <pre class="prettyprint lang-config">Require dbd-login
-AuthzDBDQuery "UPDATE authn SET login = 'true' WHERE user = %s"</pre>
-
- </li>
- </ul>
- <p>Dans tous les cas, l'identifiant utilisateur sera transmis comme
- param�tre sous la forme d'une simple cha�ne lorsque la requ�te SQL
- sera ex�cut�e. Il y sera fait r�f�rence dans la requ�te en utilisant
- le sp�cificateur de format <code>%s</code>.</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="authzdbdredirectquery" id="authzdbdredirectquery">Directive</a> <a name="AuthzDBDRedirectQuery" id="AuthzDBDRedirectQuery">AuthzDBDRedirectQuery</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit une requ�te pour rechercher une page vers laquelle
-rediriger l'utilisateur apr�s une connexion r�ussie</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AuthzDBDRedirectQuery <var>requ�te</var></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_authz_dbd</td></tr>
-</table>
- <p>Sp�cifie une requ�te SQL optionnelle � utiliser apr�s une
- connexion (ou une d�connexion) r�ussie pour rediriger l'utilisateur
- vers une URL, qui peut �tre sp�cifique � l'utilisateur.
- L'identifiant utilisateur sera transmis comme param�tre sous la
- forme d'une simple cha�ne lorsque la requ�te SQL sera ex�cut�e. Il y
- sera fait r�f�rence dans la requ�te en utilisant le sp�cificateur de
- format <code>%s</code>.</p>
- <pre class="prettyprint lang-config">AuthzDBDRedirectQuery "SELECT userpage FROM userpages WHERE user = %s"</pre>
-
- <p>La premi�re colonne du premier enregistrement renvoy� par la
- requ�te doit contenir une cha�ne de caract�res correspondant � une
- URL vers laquelle rediriger le client. Les enregistrements suivants
- sont ignor�s. Si aucun enregistrement n'est renvoy�, le client ne
- sera pas redirig�.</p>
- <p>Notez que <code class="directive">AuthzDBDLoginToReferer</code> l'emporte
- sur cette directive si les deux sont d�finies.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authz_dbd.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authz_dbm.html.en b/docs/manual/mod/mod_authz_dbm.html.en
index 0b56e30d82..481d330afe 100644
--- a/docs/manual/mod/mod_authz_dbm.html.en
+++ b/docs/manual/mod/mod_authz_dbm.html.en
@@ -54,55 +54,6 @@
<li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
-
- <p>Apache's <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>
- directives are used during the authorization phase to ensure that
- a user is allowed to access a resource. mod_authz_dbm extends the
- authorization types with <code>dbm-group</code>.</p>
-
- <p>Since v2.4.8, <a href="../expr.html">expressions</a> are supported
- within the DBM require directives.</p>
-
-<h3><a name="reqgroup" id="reqgroup">Require dbm-group</a></h3>
-
- <p>This directive specifies group membership that is required for the
- user to gain access.</p>
-
- <pre class="prettyprint lang-config">Require dbm-group admin</pre>
-
-
-
-
-<h3><a name="reqfilegroup" id="reqfilegroup">Require dbm-file-group</a></h3>
-
- <p>When this directive is specified, the user must be a member of the group
- assigned to the file being accessed.</p>
-
- <pre class="prettyprint lang-config">Require dbm-file-group</pre>
-
-
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Example usage</a></h2>
-
-<p><em>Note that using mod_authz_dbm requires you to require <code>dbm-group</code>
-instead of <code>group</code>:</em>
-</p>
-<pre class="prettyprint lang-config">&lt;Directory "/foo/bar"&gt;
- AuthType Basic
- AuthName "Secure Area"
- AuthBasicProvider dbm
- AuthDBMUserFile "site/data/users"
- AuthDBMGroupFile "site/data/users"
- Require dbm-group admin
-&lt;/Directory&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="AuthDBMGroupFile" id="AuthDBMGroupFile">AuthDBMGroupFile</a> <a name="authdbmgroupfile" id="authdbmgroupfile">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the name of the database file containing the list
@@ -181,6 +132,55 @@ store list of user groups</td></tr>
files is configured to use the same type of database.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
+
+ <p>Apache's <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>
+ directives are used during the authorization phase to ensure that
+ a user is allowed to access a resource. mod_authz_dbm extends the
+ authorization types with <code>dbm-group</code>.</p>
+
+ <p>Since v2.4.8, <a href="../expr.html">expressions</a> are supported
+ within the DBM require directives.</p>
+
+<h3><a name="reqgroup" id="reqgroup">Require dbm-group</a></h3>
+
+ <p>This directive specifies group membership that is required for the
+ user to gain access.</p>
+
+ <pre class="prettyprint lang-config">Require dbm-group admin</pre>
+
+
+
+
+<h3><a name="reqfilegroup" id="reqfilegroup">Require dbm-file-group</a></h3>
+
+ <p>When this directive is specified, the user must be a member of the group
+ assigned to the file being accessed.</p>
+
+ <pre class="prettyprint lang-config">Require dbm-file-group</pre>
+
+
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Example usage</a></h2>
+
+<p><em>Note that using mod_authz_dbm requires you to require <code>dbm-group</code>
+instead of <code>group</code>:</em>
+</p>
+<pre class="prettyprint lang-config">&lt;Directory "/foo/bar"&gt;
+ AuthType Basic
+ AuthName "Secure Area"
+ AuthBasicProvider dbm
+ AuthDBMUserFile "site/data/users"
+ AuthDBMGroupFile "site/data/users"
+ Require dbm-group admin
+&lt;/Directory&gt;</pre>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authz_dbm.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authz_dbm.html.fr b/docs/manual/mod/mod_authz_dbm.html.fr
index e8972f711f..05746eb078 100644
--- a/docs/manual/mod/mod_authz_dbm.html.fr
+++ b/docs/manual/mod/mod_authz_dbm.html.fr
@@ -59,56 +59,6 @@ d'Apache</td></tr></table>
<li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
-
- <p>Les directives <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> d'Apache permettent,
- au cours de la phase d'autorisation, de s'assurer qu'un utilisateur
- est bien autoris� � acc�der � une ressource. mod_authz_dbm ajoute
- les types d'autorisation <code>dbm-group</code> et <code>dbm-file-group</code>.</p>
-
- <p>A partir de la version 2.4.8, les directives require DBM
- supportent les <a href="../expr.html">expressions</a>.</p>
-
-<h3><a name="reqgroup" id="reqgroup">Require dbm-group</a></h3>
-
- <p>Cette directive permet de sp�cifier � quel groupe un utilisateur
- doit appartenir pour obtenir l'autorisation d'acc�s.</p>
-
- <pre class="prettyprint lang-config">Require dbm-group admin</pre>
-
-
-
-
-<h3><a name="reqfilegroup" id="reqfilegroup">Require dbm-file-group</a></h3>
-
- <p>Lorsque cette directive est d�finie, l'utilisateur doit
- appartenir au groupe du fichier pour pouvoir y acc�der.</p>
-
- <pre class="prettyprint lang-config">Require dbm-file-group</pre>
-
-
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Exemple d'utilisation</a></h2>
-
-<p><em>Notez que si vous utilisez mod_authz_dbm, le mot-cl� pour les
-groupes d'authentification qui �tait auparavant <code>group</code> est
-maintenant <code>dbm-group</code> :</em>
-</p>
-<pre class="prettyprint lang-config">&lt;Directory "/foo/bar"&gt;
- AuthType Basic
- AuthName "Secure Area"
- AuthBasicProvider dbm
- AuthDBMUserFile site/data/users
- AuthDBMGroupFile site/data/users
- Require dbm-group admin
-&lt;/Directory&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="authdbmgroupfile" id="authdbmgroupfile">Directive</a> <a name="AuthDBMGroupFile" id="AuthDBMGroupFile">AuthDBMGroupFile</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit le nom du fichier de base de donn�es contenant la
@@ -193,6 +143,56 @@ la liste des groupes d'utilisateurs</td></tr>
pour utiliser le m�me type de base de donn�es.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
+
+ <p>Les directives <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> d'Apache permettent,
+ au cours de la phase d'autorisation, de s'assurer qu'un utilisateur
+ est bien autoris� � acc�der � une ressource. mod_authz_dbm ajoute
+ les types d'autorisation <code>dbm-group</code> et <code>dbm-file-group</code>.</p>
+
+ <p>A partir de la version 2.4.8, les directives require DBM
+ supportent les <a href="../expr.html">expressions</a>.</p>
+
+<h3><a name="reqgroup" id="reqgroup">Require dbm-group</a></h3>
+
+ <p>Cette directive permet de sp�cifier � quel groupe un utilisateur
+ doit appartenir pour obtenir l'autorisation d'acc�s.</p>
+
+ <pre class="prettyprint lang-config">Require dbm-group admin</pre>
+
+
+
+
+<h3><a name="reqfilegroup" id="reqfilegroup">Require dbm-file-group</a></h3>
+
+ <p>Lorsque cette directive est d�finie, l'utilisateur doit
+ appartenir au groupe du fichier pour pouvoir y acc�der.</p>
+
+ <pre class="prettyprint lang-config">Require dbm-file-group</pre>
+
+
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Exemple d'utilisation</a></h2>
+
+<p><em>Notez que si vous utilisez mod_authz_dbm, le mot-cl� pour les
+groupes d'authentification qui �tait auparavant <code>group</code> est
+maintenant <code>dbm-group</code> :</em>
+</p>
+<pre class="prettyprint lang-config">&lt;Directory "/foo/bar"&gt;
+ AuthType Basic
+ AuthName "Secure Area"
+ AuthBasicProvider dbm
+ AuthDBMUserFile site/data/users
+ AuthDBMGroupFile site/data/users
+ Require dbm-group admin
+&lt;/Directory&gt;</pre>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authz_dbm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authz_dbm.html.ko.euc-kr b/docs/manual/mod/mod_authz_dbm.html.ko.euc-kr
index 28ed80a6a2..ad83851263 100644
--- a/docs/manual/mod/mod_authz_dbm.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authz_dbm.html.ko.euc-kr
@@ -51,7 +51,6 @@
<li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li>
<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthDBMGroupFile" id="AuthDBMGroupFile">AuthDBMGroupFile</a> <a name="authdbmgroupfile" id="authdbmgroupfile">���þ�</a></h2>
<table class="directive">
@@ -122,6 +121,7 @@
����ϵ��� �����ؾ� �Ѵ�.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_authz_dbm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authz_groupfile.html.en b/docs/manual/mod/mod_authz_groupfile.html.en
index b421614b1f..fc7388a760 100644
--- a/docs/manual/mod/mod_authz_groupfile.html.en
+++ b/docs/manual/mod/mod_authz_groupfile.html.en
@@ -53,40 +53,6 @@
<li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
-
- <p>Apache's <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>
- directives are used during the authorization phase to ensure that
- a user is allowed to access a resource. mod_authz_groupfile extends the
- authorization types with <code>group</code> and <code>group-file</code>.
- </p>
-
- <p>Since v2.4.8, <a href="../expr.html">expressions</a> are supported
- within the groupfile require directives.</p>
-
-<h3><a name="reqgroup" id="reqgroup">Require group</a></h3>
-
- <p>This directive specifies group membership that is required for the
- user to gain access.</p>
-
- <pre class="prettyprint lang-config">Require group admin</pre>
-
-
-
-
-<h3><a name="reqfilegroup" id="reqfilegroup">Require file-group</a></h3>
-
- <p>When this directive is specified, the user must be a member of the group
- assigned to the file being accessed.</p>
-
- <pre class="prettyprint lang-config">Require file-group</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="AuthGroupFile" id="AuthGroupFile">AuthGroupFile</a> <a name="authgroupfile" id="authgroupfile">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the name of a text file containing the list
@@ -120,6 +86,40 @@ of user groups for authorization</td></tr>
</div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
+
+ <p>Apache's <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>
+ directives are used during the authorization phase to ensure that
+ a user is allowed to access a resource. mod_authz_groupfile extends the
+ authorization types with <code>group</code> and <code>group-file</code>.
+ </p>
+
+ <p>Since v2.4.8, <a href="../expr.html">expressions</a> are supported
+ within the groupfile require directives.</p>
+
+<h3><a name="reqgroup" id="reqgroup">Require group</a></h3>
+
+ <p>This directive specifies group membership that is required for the
+ user to gain access.</p>
+
+ <pre class="prettyprint lang-config">Require group admin</pre>
+
+
+
+
+<h3><a name="reqfilegroup" id="reqfilegroup">Require file-group</a></h3>
+
+ <p>When this directive is specified, the user must be a member of the group
+ assigned to the file being accessed.</p>
+
+ <pre class="prettyprint lang-config">Require file-group</pre>
+
+
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_authz_groupfile.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authz_groupfile.html.fr b/docs/manual/mod/mod_authz_groupfile.html.fr
index 7b333a8461..8adbcfbeea 100644
--- a/docs/manual/mod/mod_authz_groupfile.html.fr
+++ b/docs/manual/mod/mod_authz_groupfile.html.fr
@@ -55,40 +55,6 @@ fonction de leur appartenance � un groupe sp�cifi�. Le module
<li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
-
- <p>Les directives <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> d'Apache permettent,
- au cours de la phase d'autorisation, de s'assurer qu'un utilisateur
- est bien autoris� � acc�der � une ressource. mod_authz_groupfile ajoute
- les types d'autorisation <code>group</code> et <code>file-group</code>.
- </p>
-
- <p>A partir de la version 2.4.8, les directives require groupfile
- supportent les <a href="../expr.html">expressions</a>.</p>
-
-<h3><a name="reqgroup" id="reqgroup">Require group</a></h3>
-
- <p>Cette directive permet de sp�cifier � quel groupe un utilisateur
- doit appartenir pour obtenir l'autorisation d'acc�s.</p>
-
- <pre class="prettyprint lang-config">Require group admin</pre>
-
-
-
-
-<h3><a name="reqfilegroup" id="reqfilegroup">Require file-group</a></h3>
-
- <p>Lorsque cette directive est d�finie, l'utilisateur doit
- appartenir au groupe du fichier pour pouvoir y acc�der.</p>
-
- <pre class="prettyprint lang-config">Require file-group</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="authgroupfile" id="authgroupfile">Directive</a> <a name="AuthGroupFile" id="AuthGroupFile">AuthGroupFile</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit le nom d'un fichier texte contenant la liste des
@@ -128,6 +94,40 @@ clients pourraient le t�l�charger.</p>
</div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requiredirectives" id="requiredirectives">The Require Directives</a></h2>
+
+ <p>Les directives <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> d'Apache permettent,
+ au cours de la phase d'autorisation, de s'assurer qu'un utilisateur
+ est bien autoris� � acc�der � une ressource. mod_authz_groupfile ajoute
+ les types d'autorisation <code>group</code> et <code>file-group</code>.
+ </p>
+
+ <p>A partir de la version 2.4.8, les directives require groupfile
+ supportent les <a href="../expr.html">expressions</a>.</p>
+
+<h3><a name="reqgroup" id="reqgroup">Require group</a></h3>
+
+ <p>Cette directive permet de sp�cifier � quel groupe un utilisateur
+ doit appartenir pour obtenir l'autorisation d'acc�s.</p>
+
+ <pre class="prettyprint lang-config">Require group admin</pre>
+
+
+
+
+<h3><a name="reqfilegroup" id="reqfilegroup">Require file-group</a></h3>
+
+ <p>Lorsque cette directive est d�finie, l'utilisateur doit
+ appartenir au groupe du fichier pour pouvoir y acc�der.</p>
+
+ <pre class="prettyprint lang-config">Require file-group</pre>
+
+
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_authz_groupfile.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authz_groupfile.html.ja.utf8 b/docs/manual/mod/mod_authz_groupfile.html.ja.utf8
index 26425dd2ab..27a3313e34 100644
--- a/docs/manual/mod/mod_authz_groupfile.html.ja.utf8
+++ b/docs/manual/mod/mod_authz_groupfile.html.ja.utf8
@@ -53,7 +53,6 @@
<ul class="seealso">
<li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthGroupFile" id="AuthGroupFile">AuthGroupFile</a> <a name="authgroupfile" id="authgroupfile">ディレクティブ</a></h2>
<table class="directive">
@@ -95,6 +94,7 @@
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_authz_groupfile.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr b/docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr
index 0aa3ce2494..bffb3c7511 100644
--- a/docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr
@@ -51,7 +51,6 @@
<li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li>
<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AuthGroupFile" id="AuthGroupFile">AuthGroupFile</a> <a name="authgroupfile" id="authgroupfile">���þ�</a></h2>
<table class="directive">
@@ -86,6 +85,7 @@
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_authz_groupfile.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_autoindex.html.en b/docs/manual/mod/mod_autoindex.html.en
index 529ffdf027..9864dce3c3 100644
--- a/docs/manual/mod/mod_autoindex.html.en
+++ b/docs/manual/mod/mod_autoindex.html.en
@@ -104,108 +104,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#query">Autoindex Request Query Arguments</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="query" id="query">Autoindex Request Query Arguments</a></h2>
-
-
- <p>Various query string arguments are available to give the client
- some control over the ordering of the directory listing, as well as
- what files are listed. If you do not wish to give the client this
- control, the <code><a href="#indexoptions.ignoreclient">IndexOptions
- IgnoreClient</a></code> option disables that functionality.</p>
-
- <p>The column sorting headers themselves are self-referencing
- hyperlinks that add the sort query options shown below. Any
- option below may be added to any request for the directory
- resource.</p>
-
- <ul>
- <li><code>C=N</code> sorts the directory by file name</li>
-
- <li><code>C=M</code> sorts the directory by last-modified
- date, then file name</li>
-
- <li><code>C=S</code> sorts the directory by size, then file
- name</li>
-
- <li class="separate"><code>C=D</code> sorts the directory by description, then
- file name</li>
-
- <li><code>O=A</code> sorts the listing in Ascending
- Order</li>
-
- <li class="separate"><code>O=D</code> sorts the listing in Descending
- Order</li>
-
- <li><code>F=0</code> formats the listing as a simple list
- (not FancyIndexed)</li>
-
- <li><code>F=1</code> formats the listing as a FancyIndexed
- list</li>
-
- <li class="separate"><code>F=2</code> formats the listing as an
- HTMLTable FancyIndexed list</li>
-
- <li><code>V=0</code> disables version sorting</li>
-
- <li class="separate"><code>V=1</code> enables version sorting</li>
-
- <li><code>P=<var>pattern</var></code> lists only files matching
- the given <var>pattern</var></li>
- </ul>
-
- <p>Note that the 'P'attern query argument is tested
- <em>after</em> the usual <code class="directive"><a href="#indexignore">IndexIgnore</a></code> directives are processed,
- and all file names are still subjected to the same criteria as
- any other autoindex listing. The Query Arguments parser in
- <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> will stop abruptly when an unrecognized
- option is encountered. The Query Arguments must be well formed,
- according to the table above.</p>
-
- <p>The simple example below, which can be clipped and saved in
- a header.html file, illustrates these query options. Note that
- the unknown "X" argument, for the submit button, is listed last
- to assure the arguments are all parsed before mod_autoindex
- encounters the X=Go input.</p>
-
- <div class="example"><p><code>
- &lt;form action="" method="get"&gt;<br />
- <span class="indent">
- Show me a &lt;select name="F"&gt;<br />
- <span class="indent">
- &lt;option value="0"&gt; Plain list&lt;/option&gt;<br />
- &lt;option value="1" selected="selected"&gt; Fancy list&lt;/option&gt;<br />
- &lt;option value="2"&gt; Table list&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- Sorted by &lt;select name="C"&gt;<br />
- <span class="indent">
- &lt;option value="N" selected="selected"&gt; Name&lt;/option&gt;<br />
- &lt;option value="M"&gt; Date Modified&lt;/option&gt;<br />
- &lt;option value="S"&gt; Size&lt;/option&gt;<br />
- &lt;option value="D"&gt; Description&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- &lt;select name="O"&gt;<br />
- <span class="indent">
- &lt;option value="A" selected="selected"&gt; Ascending&lt;/option&gt;<br />
- &lt;option value="D"&gt; Descending&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- &lt;select name="V"&gt;<br />
- <span class="indent">
- &lt;option value="0" selected="selected"&gt; in Normal order&lt;/option&gt;<br />
- &lt;option value="1"&gt; in Version order&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- Matching &lt;input type="text" name="P" value="*" /&gt;<br />
- &lt;input type="submit" name="X" value="Go" /&gt;<br />
- </span>
- &lt;/form&gt;
- </code></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="AddAlt" id="AddAlt">AddAlt</a> <a name="addalt" id="addalt">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Alternate text to display for a file, instead of an
@@ -1013,6 +911,108 @@ ReadmeName /include/FOOTER.html</pre>
detail.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="query" id="query">Autoindex Request Query Arguments</a></h2>
+
+
+ <p>Various query string arguments are available to give the client
+ some control over the ordering of the directory listing, as well as
+ what files are listed. If you do not wish to give the client this
+ control, the <code><a href="#indexoptions.ignoreclient">IndexOptions
+ IgnoreClient</a></code> option disables that functionality.</p>
+
+ <p>The column sorting headers themselves are self-referencing
+ hyperlinks that add the sort query options shown below. Any
+ option below may be added to any request for the directory
+ resource.</p>
+
+ <ul>
+ <li><code>C=N</code> sorts the directory by file name</li>
+
+ <li><code>C=M</code> sorts the directory by last-modified
+ date, then file name</li>
+
+ <li><code>C=S</code> sorts the directory by size, then file
+ name</li>
+
+ <li class="separate"><code>C=D</code> sorts the directory by description, then
+ file name</li>
+
+ <li><code>O=A</code> sorts the listing in Ascending
+ Order</li>
+
+ <li class="separate"><code>O=D</code> sorts the listing in Descending
+ Order</li>
+
+ <li><code>F=0</code> formats the listing as a simple list
+ (not FancyIndexed)</li>
+
+ <li><code>F=1</code> formats the listing as a FancyIndexed
+ list</li>
+
+ <li class="separate"><code>F=2</code> formats the listing as an
+ HTMLTable FancyIndexed list</li>
+
+ <li><code>V=0</code> disables version sorting</li>
+
+ <li class="separate"><code>V=1</code> enables version sorting</li>
+
+ <li><code>P=<var>pattern</var></code> lists only files matching
+ the given <var>pattern</var></li>
+ </ul>
+
+ <p>Note that the 'P'attern query argument is tested
+ <em>after</em> the usual <code class="directive"><a href="#indexignore">IndexIgnore</a></code> directives are processed,
+ and all file names are still subjected to the same criteria as
+ any other autoindex listing. The Query Arguments parser in
+ <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> will stop abruptly when an unrecognized
+ option is encountered. The Query Arguments must be well formed,
+ according to the table above.</p>
+
+ <p>The simple example below, which can be clipped and saved in
+ a header.html file, illustrates these query options. Note that
+ the unknown "X" argument, for the submit button, is listed last
+ to assure the arguments are all parsed before mod_autoindex
+ encounters the X=Go input.</p>
+
+ <div class="example"><p><code>
+ &lt;form action="" method="get"&gt;<br />
+ <span class="indent">
+ Show me a &lt;select name="F"&gt;<br />
+ <span class="indent">
+ &lt;option value="0"&gt; Plain list&lt;/option&gt;<br />
+ &lt;option value="1" selected="selected"&gt; Fancy list&lt;/option&gt;<br />
+ &lt;option value="2"&gt; Table list&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ Sorted by &lt;select name="C"&gt;<br />
+ <span class="indent">
+ &lt;option value="N" selected="selected"&gt; Name&lt;/option&gt;<br />
+ &lt;option value="M"&gt; Date Modified&lt;/option&gt;<br />
+ &lt;option value="S"&gt; Size&lt;/option&gt;<br />
+ &lt;option value="D"&gt; Description&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ &lt;select name="O"&gt;<br />
+ <span class="indent">
+ &lt;option value="A" selected="selected"&gt; Ascending&lt;/option&gt;<br />
+ &lt;option value="D"&gt; Descending&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ &lt;select name="V"&gt;<br />
+ <span class="indent">
+ &lt;option value="0" selected="selected"&gt; in Normal order&lt;/option&gt;<br />
+ &lt;option value="1"&gt; in Version order&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ Matching &lt;input type="text" name="P" value="*" /&gt;<br />
+ &lt;input type="submit" name="X" value="Go" /&gt;<br />
+ </span>
+ &lt;/form&gt;
+ </code></p></div>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_autoindex.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_autoindex.html.fr b/docs/manual/mod/mod_autoindex.html.fr
index f9e725043b..3d29963157 100644
--- a/docs/manual/mod/mod_autoindex.html.fr
+++ b/docs/manual/mod/mod_autoindex.html.fr
@@ -103,115 +103,6 @@ shell Win32 <code>dir</code></td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#query">Arguments de la requ�te d'autoindexation</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="query" id="query">Arguments de la requ�te d'autoindexation</a></h2>
-
-
- <p>La cha�ne de param�tres de la requ�te peut contenir de nombreux
- arguments permettant dans une certaine mesure au client de contr�ler
- l'ordre de l'index du r�pertoire, ainsi que la liste des fichiers �
- afficher. Si vous souhaitez d�sactiver cette fonctionnalit�,
- utilisez l'option <code><a href="#indexoptions.ignoreclient">IndexOptions
- IgnoreClient</a></code>.</p>
-
- <p>Les en-t�tes de tri des colonnes eux-m�mes sont des hyper-liens
- auto-r�f�rant qui ajoutent les options de tri � la requ�te �num�r�es
- ci-dessous qui peuvent �tre ajout�es � toute requ�te concernant la
- ressource r�pertoire.</p>
-
- <ul>
- <li><code>C=N</code> trie l'affichage en fonction du nom de
- fichier</li>
-
- <li><code>C=M</code> trie l'affichage en fonction de la date de
- derni�re modification, puis du nom de fichier</li>
-
- <li><code>C=S</code> trie l'affichage en fonction de la taille,
- puis du nom de fichier</li>
-
- <li class="separate"><code>C=D</code> trie l'affichage en fonction
- de la description, puis du nom de fichier</li>
-
- <li><code>O=A</code> trie l'affichage selon l'ordre croissant</li>
-
- <li class="separate"><code>O=D</code> trie l'affichage selon
- l'ordre d�croissant</li>
-
- <li><code>F=0</code> affiche le listing sous la forme d'une simple
- liste (sans FancyIndex)</li>
-
- <li><code>F=1</code> affiche le listing avec en-t�tes de colonnes
- sous forme de liens hyper-textes (FancyIndexed)</li>
-
- <li class="separate"><code>F=2</code> affiche le listing sous
- forme de table HTML avec en-t�tes de colonnes contenant des liens
- hyper-textes (FancyIndexed)</li>
-
- <li><code>V=0</code> d�sactive le tri en fonction de la
- version</li>
-
- <li class="separate"><code>V=1</code> active le tri en fonction de
- la version</li>
-
- <li><code>P=<var>mod�le</var></code> n'affiche que les fichiers
- correspondant au <var>mod�le</var> sp�cifi�</li>
- </ul>
-
- <p>Notez que l'argument 'P' (pour Pattern) n'est test�
- qu'<em>apr�s</em> que les directives habituelles <code class="directive"><a href="#indexignore">IndexIgnore</a></code> ont �t� trait�es,
- et que tous les noms de fichiers sont encore assujettis aux m�mes
- crit�res que pour tout autre listing auto-index�. L'interpr�teur
- d'arguments de requ�te de <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> s'arr�te
- imm�diatement s'il rencontre une option non reconnue. Les arguments
- de requ�te doivent �tre bien form�s, selon la table ci-dessus.</p>
-
- <p>Les options de requ�tes sont illustr�es par l'exemple ci-dessous,
- qui peut �tre copi� et coll� dans un fichier header.html. Notez que
- l'argument inconnu "X", pour le bouton submit, est introduit en
- dernier afin de s'assurer que tous les arguments ont �t�
- interpr�t�s avant que mod_autoindex ne rencontre l'entr�e X=Go.</p>
-
- <div class="example"><p><code>
- &lt;form action="" method="get"&gt;<br />
- <span class="indent">
- Montre moi une &lt;select name="F"&gt;<br />
- <span class="indent">
- &lt;option value="0"&gt; liste simple&lt;/option&gt;<br />
- &lt;option value="1" selected="selected"&gt; liste avec
- en-t�tes&lt;/option&gt;<br />
- &lt;option value="2"&gt; liste avec en-t�te sous forme de
- table&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- tri�e par &lt;select name="C"&gt;<br />
- <span class="indent">
- &lt;option value="N" selected="selected"&gt; nom&lt;/option&gt;<br />
- &lt;option value="M"&gt; date de modification&lt;/option&gt;<br />
- &lt;option value="S"&gt; taille&lt;/option&gt;<br />
- &lt;option value="D"&gt; description&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- &lt;select name="O"&gt;<br />
- <span class="indent">
- &lt;option value="A" selected="selected"&gt; croissant&lt;/option&gt;<br />
- &lt;option value="D"&gt; d�croissant&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- &lt;select name="V"&gt;<br />
- <span class="indent">
- &lt;option value="0" selected="selected"&gt; dans l'ordre
- normal&lt;/option&gt;<br />
- &lt;option value="1"&gt; en fonction de la version&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- correspondant � &lt;input type="text" name="P" value="*" /&gt;<br />
- &lt;input type="submit" name="X" value="Go" /&gt;<br />
- </span>
- &lt;/form&gt;
- </code></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="addalt" id="addalt">Directive</a> <a name="AddAlt" id="AddAlt">AddAlt</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Texte optionnel � afficher � la place d'un ic�ne pour un
@@ -1100,6 +991,115 @@ ReadmeName /include/FOOTER.html</pre>
d�tails.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="query" id="query">Arguments de la requ�te d'autoindexation</a></h2>
+
+
+ <p>La cha�ne de param�tres de la requ�te peut contenir de nombreux
+ arguments permettant dans une certaine mesure au client de contr�ler
+ l'ordre de l'index du r�pertoire, ainsi que la liste des fichiers �
+ afficher. Si vous souhaitez d�sactiver cette fonctionnalit�,
+ utilisez l'option <code><a href="#indexoptions.ignoreclient">IndexOptions
+ IgnoreClient</a></code>.</p>
+
+ <p>Les en-t�tes de tri des colonnes eux-m�mes sont des hyper-liens
+ auto-r�f�rant qui ajoutent les options de tri � la requ�te �num�r�es
+ ci-dessous qui peuvent �tre ajout�es � toute requ�te concernant la
+ ressource r�pertoire.</p>
+
+ <ul>
+ <li><code>C=N</code> trie l'affichage en fonction du nom de
+ fichier</li>
+
+ <li><code>C=M</code> trie l'affichage en fonction de la date de
+ derni�re modification, puis du nom de fichier</li>
+
+ <li><code>C=S</code> trie l'affichage en fonction de la taille,
+ puis du nom de fichier</li>
+
+ <li class="separate"><code>C=D</code> trie l'affichage en fonction
+ de la description, puis du nom de fichier</li>
+
+ <li><code>O=A</code> trie l'affichage selon l'ordre croissant</li>
+
+ <li class="separate"><code>O=D</code> trie l'affichage selon
+ l'ordre d�croissant</li>
+
+ <li><code>F=0</code> affiche le listing sous la forme d'une simple
+ liste (sans FancyIndex)</li>
+
+ <li><code>F=1</code> affiche le listing avec en-t�tes de colonnes
+ sous forme de liens hyper-textes (FancyIndexed)</li>
+
+ <li class="separate"><code>F=2</code> affiche le listing sous
+ forme de table HTML avec en-t�tes de colonnes contenant des liens
+ hyper-textes (FancyIndexed)</li>
+
+ <li><code>V=0</code> d�sactive le tri en fonction de la
+ version</li>
+
+ <li class="separate"><code>V=1</code> active le tri en fonction de
+ la version</li>
+
+ <li><code>P=<var>mod�le</var></code> n'affiche que les fichiers
+ correspondant au <var>mod�le</var> sp�cifi�</li>
+ </ul>
+
+ <p>Notez que l'argument 'P' (pour Pattern) n'est test�
+ qu'<em>apr�s</em> que les directives habituelles <code class="directive"><a href="#indexignore">IndexIgnore</a></code> ont �t� trait�es,
+ et que tous les noms de fichiers sont encore assujettis aux m�mes
+ crit�res que pour tout autre listing auto-index�. L'interpr�teur
+ d'arguments de requ�te de <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> s'arr�te
+ imm�diatement s'il rencontre une option non reconnue. Les arguments
+ de requ�te doivent �tre bien form�s, selon la table ci-dessus.</p>
+
+ <p>Les options de requ�tes sont illustr�es par l'exemple ci-dessous,
+ qui peut �tre copi� et coll� dans un fichier header.html. Notez que
+ l'argument inconnu "X", pour le bouton submit, est introduit en
+ dernier afin de s'assurer que tous les arguments ont �t�
+ interpr�t�s avant que mod_autoindex ne rencontre l'entr�e X=Go.</p>
+
+ <div class="example"><p><code>
+ &lt;form action="" method="get"&gt;<br />
+ <span class="indent">
+ Montre moi une &lt;select name="F"&gt;<br />
+ <span class="indent">
+ &lt;option value="0"&gt; liste simple&lt;/option&gt;<br />
+ &lt;option value="1" selected="selected"&gt; liste avec
+ en-t�tes&lt;/option&gt;<br />
+ &lt;option value="2"&gt; liste avec en-t�te sous forme de
+ table&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ tri�e par &lt;select name="C"&gt;<br />
+ <span class="indent">
+ &lt;option value="N" selected="selected"&gt; nom&lt;/option&gt;<br />
+ &lt;option value="M"&gt; date de modification&lt;/option&gt;<br />
+ &lt;option value="S"&gt; taille&lt;/option&gt;<br />
+ &lt;option value="D"&gt; description&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ &lt;select name="O"&gt;<br />
+ <span class="indent">
+ &lt;option value="A" selected="selected"&gt; croissant&lt;/option&gt;<br />
+ &lt;option value="D"&gt; d�croissant&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ &lt;select name="V"&gt;<br />
+ <span class="indent">
+ &lt;option value="0" selected="selected"&gt; dans l'ordre
+ normal&lt;/option&gt;<br />
+ &lt;option value="1"&gt; en fonction de la version&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ correspondant � &lt;input type="text" name="P" value="*" /&gt;<br />
+ &lt;input type="submit" name="X" value="Go" /&gt;<br />
+ </span>
+ &lt;/form&gt;
+ </code></p></div>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_autoindex.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_autoindex.html.ja.utf8 b/docs/manual/mod/mod_autoindex.html.ja.utf8
index 54334c68d6..e0845fe2bc 100644
--- a/docs/manual/mod/mod_autoindex.html.ja.utf8
+++ b/docs/manual/mod/mod_autoindex.html.ja.utf8
@@ -113,116 +113,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#query">Autoindex リクエストクエリー引数</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="query" id="query">Autoindex リクエストクエリー引数</a></h2>
-
-
- <p>Apache 2.0.23 で、
- コラムソートのためにクエリー引数を再編成して、
- 新しいクエリーオプションのグループを導入しました。
- 出力に対するクライアントのすべての制御を効率的に抹消
- できるように、
- <code><a href="#indexoptions.ignoreclient">IndexOptions
- IgnoreClient</a></code> が導入されました。</p>
-
- <p>コラムソートのヘッダそれ自体が、
- 下記のソートクエリーオプションを付加する
- 自分自身を参照するリンクです。
- 下記のオプションのどれでも、
- ディレクトリリソースへのリクエストに加えることができます。</p>
-
- <ul>
- <li><code>C=N</code> は、ファイル名でソートします。</li>
-
- <li><code>C=M</code> は、更新日時、
- ディレクトリ、ファイル名の順でソートします。</li>
-
- <li><code>C=S</code> は、サイズ、
- ディレクトリ、ファイル名の順でソートします。</li>
-
- <li class="separate"><code>C=D</code> は、説明、
- ディレクトリ、ファイル名の順でソートします。</li>
-
- <li><code>O=A</code> は、昇順で表をソートします。</li>
-
- <li class="separate"><code>O=D</code> は、降順で表をソートします。</li>
-
- <li><code>F=0</code> は、単純な表の書式にします。
- (FancyIndex ではありません。)</li>
-
- <li><code>F=1</code> は、FancyIndex
- 表示の表の書式にします。</li>
-
- <li><code>F=2</code> は、表を HTML
- のテーブルを使った FancyIndex の書式にします。</li>
-
- <li><code>V=0</code>
- は、バージョンによるソートを無効にします。</li>
-
- <li class="separate"><code>V=1</code>
- は、バージョンによるソートを有効にします。</li>
-
- <li><code>P=<var>pattern</var></code>
- は、与えられた <var>pattern</var>
- に適合したファイルのみを表示します。</li>
- </ul>
-
- <p>"P (パターンの P)" クエリー引数は、
- 通常の <code class="directive"><a href="#indexignore">IndexIgnore</a></code>
- ディレクティブが処理された<em>後</em>に検査され、
- ファイル名全てが、他の autoindex
- リスト処理と同様の判定基準下に置かれ続ける
- ことに注意してください。
- <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> のクエリー引数パーサ (解析) は、
- 認識不能なオプションにぶつかると即座に停止します。
- クエリー引数は上の表に従って
- 正しい形式になっていなければなりません。</p>
-
- <p>下の単純な例は、これらのクエリーオプションを
- 表します。これをそのまま切り取って HEADER.html
- ファイルに保存することもできます。
- mod_autoindex が X=Go 入力にぶつかる前に
- 引数が全て解釈されるように、
- 未知の引数 "X" はリストの最後に置かれています。</p>
-
- <div class="example"><p><code>
- &lt;form action="" method="get"&gt;<br />
- <span class="indent">
- Show me a &lt;select name="F"&gt;<br />
- <span class="indent">
- &lt;option value="0"&gt; Plain list&lt;/option&gt;<br />
- &lt;option value="1" selected="selected"&gt; Fancy list&lt;/option&gt;<br />
- &lt;option value="2"&gt; Table list&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- Sorted by &lt;select name="C"&gt;<br />
- <span class="indent">
- &lt;option value="N" selected="selected"&gt; Name&lt;/option&gt;<br />
- &lt;option value="M"&gt; Date Modified&lt;/option&gt;<br />
- &lt;option value="S"&gt; Size&lt;/option&gt;<br />
- &lt;option value="D"&gt; Description&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- &lt;select name="O"&gt;<br />
- <span class="indent">
- &lt;option value="A" selected="selected"&gt; Ascending&lt;/option&gt;<br />
- &lt;option value="D"&gt; Descending&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- &lt;select name="V"&gt;<br />
- <span class="indent">
- &lt;option value="0" selected="selected"&gt; in Normal order&lt;/option&gt;<br />
- &lt;option value="1"&gt; in Version order&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- Matching &lt;input type="text" name="P" value="*" /&gt;<br />
- &lt;input type="submit" name="X" value="Go" /&gt;<br />
- </span>
- &lt;/form&gt;
- </code></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="AddAlt" id="AddAlt">AddAlt</a> <a name="addalt" id="addalt">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>アイコンの代わりに
@@ -1043,6 +933,116 @@ Name|Date|Size|Description</code></td></tr>
もご覧下さい。</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="query" id="query">Autoindex リクエストクエリー引数</a></h2>
+
+
+ <p>Apache 2.0.23 で、
+ コラムソートのためにクエリー引数を再編成して、
+ 新しいクエリーオプションのグループを導入しました。
+ 出力に対するクライアントのすべての制御を効率的に抹消
+ できるように、
+ <code><a href="#indexoptions.ignoreclient">IndexOptions
+ IgnoreClient</a></code> が導入されました。</p>
+
+ <p>コラムソートのヘッダそれ自体が、
+ 下記のソートクエリーオプションを付加する
+ 自分自身を参照するリンクです。
+ 下記のオプションのどれでも、
+ ディレクトリリソースへのリクエストに加えることができます。</p>
+
+ <ul>
+ <li><code>C=N</code> は、ファイル名でソートします。</li>
+
+ <li><code>C=M</code> は、更新日時、
+ ディレクトリ、ファイル名の順でソートします。</li>
+
+ <li><code>C=S</code> は、サイズ、
+ ディレクトリ、ファイル名の順でソートします。</li>
+
+ <li class="separate"><code>C=D</code> は、説明、
+ ディレクトリ、ファイル名の順でソートします。</li>
+
+ <li><code>O=A</code> は、昇順で表をソートします。</li>
+
+ <li class="separate"><code>O=D</code> は、降順で表をソートします。</li>
+
+ <li><code>F=0</code> は、単純な表の書式にします。
+ (FancyIndex ではありません。)</li>
+
+ <li><code>F=1</code> は、FancyIndex
+ 表示の表の書式にします。</li>
+
+ <li><code>F=2</code> は、表を HTML
+ のテーブルを使った FancyIndex の書式にします。</li>
+
+ <li><code>V=0</code>
+ は、バージョンによるソートを無効にします。</li>
+
+ <li class="separate"><code>V=1</code>
+ は、バージョンによるソートを有効にします。</li>
+
+ <li><code>P=<var>pattern</var></code>
+ は、与えられた <var>pattern</var>
+ に適合したファイルのみを表示します。</li>
+ </ul>
+
+ <p>"P (パターンの P)" クエリー引数は、
+ 通常の <code class="directive"><a href="#indexignore">IndexIgnore</a></code>
+ ディレクティブが処理された<em>後</em>に検査され、
+ ファイル名全てが、他の autoindex
+ リスト処理と同様の判定基準下に置かれ続ける
+ ことに注意してください。
+ <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> のクエリー引数パーサ (解析) は、
+ 認識不能なオプションにぶつかると即座に停止します。
+ クエリー引数は上の表に従って
+ 正しい形式になっていなければなりません。</p>
+
+ <p>下の単純な例は、これらのクエリーオプションを
+ 表します。これをそのまま切り取って HEADER.html
+ ファイルに保存することもできます。
+ mod_autoindex が X=Go 入力にぶつかる前に
+ 引数が全て解釈されるように、
+ 未知の引数 "X" はリストの最後に置かれています。</p>
+
+ <div class="example"><p><code>
+ &lt;form action="" method="get"&gt;<br />
+ <span class="indent">
+ Show me a &lt;select name="F"&gt;<br />
+ <span class="indent">
+ &lt;option value="0"&gt; Plain list&lt;/option&gt;<br />
+ &lt;option value="1" selected="selected"&gt; Fancy list&lt;/option&gt;<br />
+ &lt;option value="2"&gt; Table list&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ Sorted by &lt;select name="C"&gt;<br />
+ <span class="indent">
+ &lt;option value="N" selected="selected"&gt; Name&lt;/option&gt;<br />
+ &lt;option value="M"&gt; Date Modified&lt;/option&gt;<br />
+ &lt;option value="S"&gt; Size&lt;/option&gt;<br />
+ &lt;option value="D"&gt; Description&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ &lt;select name="O"&gt;<br />
+ <span class="indent">
+ &lt;option value="A" selected="selected"&gt; Ascending&lt;/option&gt;<br />
+ &lt;option value="D"&gt; Descending&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ &lt;select name="V"&gt;<br />
+ <span class="indent">
+ &lt;option value="0" selected="selected"&gt; in Normal order&lt;/option&gt;<br />
+ &lt;option value="1"&gt; in Version order&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ Matching &lt;input type="text" name="P" value="*" /&gt;<br />
+ &lt;input type="submit" name="X" value="Go" /&gt;<br />
+ </span>
+ &lt;/form&gt;
+ </code></p></div>
+
+</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_autoindex.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_autoindex.html.ko.euc-kr b/docs/manual/mod/mod_autoindex.html.ko.euc-kr
index d0bb170917..151c67cf75 100644
--- a/docs/manual/mod/mod_autoindex.html.ko.euc-kr
+++ b/docs/manual/mod/mod_autoindex.html.ko.euc-kr
@@ -97,97 +97,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#query">Autoindex ��û �ƱԸ�Ʈ</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="query" id="query">Autoindex ��û �ƱԸ�Ʈ</a></h2>
-
-
- <p>����ġ 2.0.23�� �������� ���� ��û �ƱԸ�Ʈ�� �����ϰ�,
- ���ο� �ɼǵ��� �߰��ߴ�. ����� Ŭ���̾�Ʈ�� ������ ��
- ������ ����� <code><a href="#indexoptions.ignoreclient">IndexOptions
- IgnoreClient</a></code> �ɼ��� �߰��Ǿ���.</p>
-
- <p>������ �̸��� �Ʒ� ���� ���� ��û �ɼ��� ���� �ڱ�����
- ��ũ��. �Ʒ� �ɼ��� ���丮 �ڿ��� ���� � ��û����
- ����� �� �ִ�.</p>
-
- <ul>
- <li><code>C=N</code>�� ���ϸ� ���̴�</li>
-
- <li><code>C=M</code>�� �ֱ� ������ ��, �׸��� ���ϸ� ���̴�</li>
-
- <li><code>C=S</code>�� ũ�� ��, �׸��� ���ϸ� ���̴�</li>
-
- <li class="separate"><code>C=D</code>�� ���� ��, �׸��� ���ϸ�
- ���̴�</li>
-
- <li><code>O=A</code>�� ������������ ����� �����Ѵ�</li>
-
- <li class="separate"><code>O=D</code>�� ������������ ����� �����Ѵ�</li>
-
- <li><code>F=0</code>�� (FancyIndexed�� �ƴ�) ������ ��� �����̴�</li>
-
- <li><code>F=1</code>�� FancyIndexed ��� �����̴�</li>
-
- <li class="separate"><code>F=2</code>�� HTMLTable FancyIndexed ���
- �����̴�</li>
-
- <li><code>V=0</code>�� ���� ������ �������� �ʴ´�</li>
-
- <li class="separate"><code>V=1</code>�� ���� ������ �����Ѵ�</li>
-
- <li><code>P=<var>pattern</var></code>�� �־��� <var>pattern</var>��
- �ش��ϴ� ���ϸ��� ������� �����</li>
- </ul>
-
- <p>'P'attern �ƱԸ�Ʈ�� �Ϲ����� <code class="directive"><a href="#indexignore">IndexIgnore</a></code> ���þ ó���� <em>�Ŀ�</em>
- �˻��ϱ⶧����, ����� �ٸ� autoindex ������ ������ �����϶�.
- <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>�� ��û �ƱԸ�Ʈ�� �о���϶�
- �� �� ���� �ɼ��� �߰��ϸ� �� �̻� �����ʴ´�. ��û �ƱԸ�Ʈ��
- ���� ǥ�� ���� ������ �Ѵ�.</p>
-
- <p>header.html ���Ͽ� ����� �� �ִ� �Ʒ� ������ ������
- �� �ɼǵ��� �����Ѵ�. submit ������ �� �� ���� "X" �ƱԸ�Ʈ��
- mod_autoindex�� X=Go ������ ��� �ƱԸ�Ʈ�� �о������
- Ȯ���ϱ����� �������� ����ߴ�.</p>
-
- <div class="example"><p><code>
- &lt;form action="" method="get"&gt;<br />
- <span class="indent">
- Show me a &lt;select name="F"&gt;<br />
- <span class="indent">
- &lt;option value="0"&gt; Plain list&lt;/option&gt;<br />
- &lt;option value="1" selected="selected"&gt; Fancy list&lt;/option&gt;<br />
- &lt;option value="2"&gt; Table list&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- Sorted by &lt;select name="C"&gt;<br />
- <span class="indent">
- &lt;option value="N" selected="selected"&gt; Name&lt;/option&gt;<br />
- &lt;option value="M"&gt; Date Modified&lt;/option&gt;<br />
- &lt;option value="S"&gt; Size&lt;/option&gt;<br />
- &lt;option value="D"&gt; Description&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- &lt;select name="O"&gt;<br />
- <span class="indent">
- &lt;option value="A" selected="selected"&gt; Ascending&lt;/option&gt;<br />
- &lt;option value="D"&gt; Descending&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- &lt;select name="V"&gt;<br />
- <span class="indent">
- &lt;option value="0" selected="selected"&gt; in Normal order&lt;/option&gt;<br />
- &lt;option value="1"&gt; in Version order&lt;/option&gt;<br />
- </span>
- &lt;/select&gt;<br />
- Matching &lt;input type="text" name="P" value="*" /&gt;<br />
- &lt;input type="submit" name="X" value="Go" /&gt;<br />
- </span>
- &lt;/form&gt;
- </code></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="AddAlt" id="AddAlt">AddAlt</a> <a name="addalt" id="addalt">���þ�</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">����:</a></th><td>���ϸ����� ������ �����ܴ�� ����� ���� ������</td></tr>
@@ -855,6 +764,97 @@ Name|Date|Size|Description</code></td></tr>
<p>�� ������ �ڼ��� ������ <code class="directive"><a href="#headername">HeaderName</a></code>�� �����϶�.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="query" id="query">Autoindex ��û �ƱԸ�Ʈ</a></h2>
+
+
+ <p>����ġ 2.0.23�� �������� ���� ��û �ƱԸ�Ʈ�� �����ϰ�,
+ ���ο� �ɼǵ��� �߰��ߴ�. ����� Ŭ���̾�Ʈ�� ������ ��
+ ������ ����� <code><a href="#indexoptions.ignoreclient">IndexOptions
+ IgnoreClient</a></code> �ɼ��� �߰��Ǿ���.</p>
+
+ <p>������ �̸��� �Ʒ� ���� ���� ��û �ɼ��� ���� �ڱ�����
+ ��ũ��. �Ʒ� �ɼ��� ���丮 �ڿ��� ���� � ��û����
+ ����� �� �ִ�.</p>
+
+ <ul>
+ <li><code>C=N</code>�� ���ϸ� ���̴�</li>
+
+ <li><code>C=M</code>�� �ֱ� ������ ��, �׸��� ���ϸ� ���̴�</li>
+
+ <li><code>C=S</code>�� ũ�� ��, �׸��� ���ϸ� ���̴�</li>
+
+ <li class="separate"><code>C=D</code>�� ���� ��, �׸��� ���ϸ�
+ ���̴�</li>
+
+ <li><code>O=A</code>�� ������������ ����� �����Ѵ�</li>
+
+ <li class="separate"><code>O=D</code>�� ������������ ����� �����Ѵ�</li>
+
+ <li><code>F=0</code>�� (FancyIndexed�� �ƴ�) ������ ��� �����̴�</li>
+
+ <li><code>F=1</code>�� FancyIndexed ��� �����̴�</li>
+
+ <li class="separate"><code>F=2</code>�� HTMLTable FancyIndexed ���
+ �����̴�</li>
+
+ <li><code>V=0</code>�� ���� ������ �������� �ʴ´�</li>
+
+ <li class="separate"><code>V=1</code>�� ���� ������ �����Ѵ�</li>
+
+ <li><code>P=<var>pattern</var></code>�� �־��� <var>pattern</var>��
+ �ش��ϴ� ���ϸ��� ������� �����</li>
+ </ul>
+
+ <p>'P'attern �ƱԸ�Ʈ�� �Ϲ����� <code class="directive"><a href="#indexignore">IndexIgnore</a></code> ���þ ó���� <em>�Ŀ�</em>
+ �˻��ϱ⶧����, ����� �ٸ� autoindex ������ ������ �����϶�.
+ <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>�� ��û �ƱԸ�Ʈ�� �о���϶�
+ �� �� ���� �ɼ��� �߰��ϸ� �� �̻� �����ʴ´�. ��û �ƱԸ�Ʈ��
+ ���� ǥ�� ���� ������ �Ѵ�.</p>
+
+ <p>header.html ���Ͽ� ����� �� �ִ� �Ʒ� ������ ������
+ �� �ɼǵ��� �����Ѵ�. submit ������ �� �� ���� "X" �ƱԸ�Ʈ��
+ mod_autoindex�� X=Go ������ ��� �ƱԸ�Ʈ�� �о������
+ Ȯ���ϱ����� �������� ����ߴ�.</p>
+
+ <div class="example"><p><code>
+ &lt;form action="" method="get"&gt;<br />
+ <span class="indent">
+ Show me a &lt;select name="F"&gt;<br />
+ <span class="indent">
+ &lt;option value="0"&gt; Plain list&lt;/option&gt;<br />
+ &lt;option value="1" selected="selected"&gt; Fancy list&lt;/option&gt;<br />
+ &lt;option value="2"&gt; Table list&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ Sorted by &lt;select name="C"&gt;<br />
+ <span class="indent">
+ &lt;option value="N" selected="selected"&gt; Name&lt;/option&gt;<br />
+ &lt;option value="M"&gt; Date Modified&lt;/option&gt;<br />
+ &lt;option value="S"&gt; Size&lt;/option&gt;<br />
+ &lt;option value="D"&gt; Description&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ &lt;select name="O"&gt;<br />
+ <span class="indent">
+ &lt;option value="A" selected="selected"&gt; Ascending&lt;/option&gt;<br />
+ &lt;option value="D"&gt; Descending&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ &lt;select name="V"&gt;<br />
+ <span class="indent">
+ &lt;option value="0" selected="selected"&gt; in Normal order&lt;/option&gt;<br />
+ &lt;option value="1"&gt; in Version order&lt;/option&gt;<br />
+ </span>
+ &lt;/select&gt;<br />
+ Matching &lt;input type="text" name="P" value="*" /&gt;<br />
+ &lt;input type="submit" name="X" value="Go" /&gt;<br />
+ </span>
+ &lt;/form&gt;
+ </code></p></div>
+
+</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_autoindex.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_autoindex.html.tr.utf8 b/docs/manual/mod/mod_autoindex.html.tr.utf8
index c3e265287b..4248056d50 100644
--- a/docs/manual/mod/mod_autoindex.html.tr.utf8
+++ b/docs/manual/mod/mod_autoindex.html.tr.utf8
@@ -97,98 +97,6 @@ yaptığı gibi dizin içeriğini listeler.</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#query">Sütun Sıralamada Sorgu Seçenekleri</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="query" id="query">Sütun Sıralamada Sorgu Seçenekleri</a></h2>
-
-
- <p>İstemciye, dizin içeriğini listelerken neleri hangi sırada
- listeleyeceğini belirleyebilmesi için içerik üzerinde biraz denetim
- sağlayabileceği çeşitli sorgu dizgesi bileşenleri sağlanmıştır.
- Çıktı üzerinde kullanıcı denetimini tamamen ortadan kaldırmak için
- <code class="directive"><a href="#indexoptions">IndexOptions</a></code> yönergesinin
- <code><a href="#indexoptions.ignoreclient">IgnoreClient</a></code>
- seçeneği kullanılabilir.</p>
-
- <p>Sütun sıralama başlıklarının her biri hedefi kendisi olan birer hiper
- bağ olup aşağıda sıralanan sorgu seçeneklerini kullanırlar. Bu
- seçeneklerin her biri her dizin içerik listesi isteğine eklenebilir.</p>
-
- <ul>
- <li><code>C=N</code> dizini dosya adına göre sıralar</li>
-
- <li><code>C=M</code> dizini son değişiklik zamanına ve ardından dosya
- ismine göre sıralar.</li>
-
- <li><code>C=S</code> dizini boyuta ve ardından dosya adına göre
- sıralar</li>
-
- <li class="separate"><code>C=D</code> dizini açıklamaya ve ardından
- dosya adına göre sıralar.</li>
-
- <li><code>O=A</code> artan sıralama uygulanır.</li>
-
- <li class="separate"><code>O=D</code> azalan sıralama uygulanır.</li>
-
- <li><code>F=0</code> listeleme basit listeleme biçiminde yapılır
- (<code>FancyIndexing</code> seçeneği ile etkinleştirilen biçimde
- değil)</li>
-
- <li><code>F=1</code> listeleme <code>FancyIndexing</code> seçeneği ile
- etkinleştirilen biçimde yapılır</li>
-
- <li class="separate"><code>F=2</code> listeleme <code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code> ve
- <code><a href="#indexoptions.htmltable">HTMLTable</a></code> seçeneği
- ile etkinleştirilen biçimde yapılır.</li>
-
- <li><code>V=0</code> sürüme göre sıralama iptal edilir.</li>
-
- <li class="separate"><code>V=1</code> sürüme göre sıralama etkin
- kılınır.</li>
-
- <li><code>P=<var>kalıp</var></code> sadece belirtilen
- <code><em>kalıp</em></code> ile eşleşen dosyalar istelenir.</li>
- </ul>
-
- <p><code>P=<var>kalıp</var></code> sorgu seçeneğinin normalde <code class="directive"><a href="#indexignore">IndexIgnore</a></code> yönergesi işleme
- sokulduktan sonra değerlendirildiğine ve dosya isimlerinin diğer
- kendiliğinden içerik listeleme koşullarının konusu olmaya devam ettiğine
- dikkat ediniz. <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> modülündeki Sorgu
- Seçenekleri çözümleyicisi tanımadığı bir seçeneğe rastlar rastlamaz
- işlemi durdurur. Sorgu Seçenekleri yukarıda belirtilene uygun olarak iyi
- biçimli olmak zorundadır.</p>
-
- <p>Aşağıdaki basit örnekte sorgu seçeneklerinin kullanımı gösterilmiştir.
- Son satırda bulunan "submit" düğmesindeki tanınmayan "X" girdisine
- dikkat ediniz. "X=Göster" girdisi tüm seçenekler işlendikten sonra
- <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> tarafından son argüman olarak ele
- alınacak ve çözümleme işlemi o noktada duracaktır.</p>
-
- <div class="example"><pre>&lt;form action="" method="get"&gt;
- &lt;input type="text" name="P" value="*" /&gt; ile eşleşen
- &lt;select name="C"&gt;
- &lt;option value="N" selected="selected"&gt;isme&lt;/option&gt;
- &lt;option value="M"&gt; değişiklik tarihine&lt;/option&gt;
- &lt;option value="S"&gt; boyuta&lt;/option&gt;
- &lt;option value="D"&gt; açıklamaya&lt;/option&gt;
- &lt;/select&gt; göre
- &lt;select name="O"&gt;
- &lt;option value="A" selected="selected"&gt; artan&lt;/option&gt;
- &lt;option value="D"&gt; azalan&lt;/option&gt;
- &lt;/select&gt;
- &lt;select name="V"&gt;
- &lt;option value="0" selected="selected"&gt;normal&lt;/option&gt;
- &lt;option value="1"&gt; sürümlü&lt;/option&gt;
- &lt;/select&gt; sıralamayla bir
- &lt;select name="F"&gt;
- &lt;option value="0"&gt; basit liste&lt;/option&gt;
- &lt;option value="1" selected="selected"&gt; süslü liste&lt;/option&gt;
- &lt;option value="2"&gt; tablolu liste&lt;/option&gt;
- &lt;/select&gt;
- &lt;input type="submit" name="X" value="Göster" /&gt;
-&lt;/form&gt;</pre></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="AddAlt" id="AddAlt">AddAlt</a> <a name="addalt" id="addalt">Yönergesi</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Dosyaya göre seçilen simgenin yerinde gösterilecek metni belirler.
@@ -1015,6 +923,98 @@ ReadmeName /include/FOOTER.html</pre>
bakınız.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="query" id="query">Sütun Sıralamada Sorgu Seçenekleri</a></h2>
+
+
+ <p>İstemciye, dizin içeriğini listelerken neleri hangi sırada
+ listeleyeceğini belirleyebilmesi için içerik üzerinde biraz denetim
+ sağlayabileceği çeşitli sorgu dizgesi bileşenleri sağlanmıştır.
+ Çıktı üzerinde kullanıcı denetimini tamamen ortadan kaldırmak için
+ <code class="directive"><a href="#indexoptions">IndexOptions</a></code> yönergesinin
+ <code><a href="#indexoptions.ignoreclient">IgnoreClient</a></code>
+ seçeneği kullanılabilir.</p>
+
+ <p>Sütun sıralama başlıklarının her biri hedefi kendisi olan birer hiper
+ bağ olup aşağıda sıralanan sorgu seçeneklerini kullanırlar. Bu
+ seçeneklerin her biri her dizin içerik listesi isteğine eklenebilir.</p>
+
+ <ul>
+ <li><code>C=N</code> dizini dosya adına göre sıralar</li>
+
+ <li><code>C=M</code> dizini son değişiklik zamanına ve ardından dosya
+ ismine göre sıralar.</li>
+
+ <li><code>C=S</code> dizini boyuta ve ardından dosya adına göre
+ sıralar</li>
+
+ <li class="separate"><code>C=D</code> dizini açıklamaya ve ardından
+ dosya adına göre sıralar.</li>
+
+ <li><code>O=A</code> artan sıralama uygulanır.</li>
+
+ <li class="separate"><code>O=D</code> azalan sıralama uygulanır.</li>
+
+ <li><code>F=0</code> listeleme basit listeleme biçiminde yapılır
+ (<code>FancyIndexing</code> seçeneği ile etkinleştirilen biçimde
+ değil)</li>
+
+ <li><code>F=1</code> listeleme <code>FancyIndexing</code> seçeneği ile
+ etkinleştirilen biçimde yapılır</li>
+
+ <li class="separate"><code>F=2</code> listeleme <code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code> ve
+ <code><a href="#indexoptions.htmltable">HTMLTable</a></code> seçeneği
+ ile etkinleştirilen biçimde yapılır.</li>
+
+ <li><code>V=0</code> sürüme göre sıralama iptal edilir.</li>
+
+ <li class="separate"><code>V=1</code> sürüme göre sıralama etkin
+ kılınır.</li>
+
+ <li><code>P=<var>kalıp</var></code> sadece belirtilen
+ <code><em>kalıp</em></code> ile eşleşen dosyalar istelenir.</li>
+ </ul>
+
+ <p><code>P=<var>kalıp</var></code> sorgu seçeneğinin normalde <code class="directive"><a href="#indexignore">IndexIgnore</a></code> yönergesi işleme
+ sokulduktan sonra değerlendirildiğine ve dosya isimlerinin diğer
+ kendiliğinden içerik listeleme koşullarının konusu olmaya devam ettiğine
+ dikkat ediniz. <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> modülündeki Sorgu
+ Seçenekleri çözümleyicisi tanımadığı bir seçeneğe rastlar rastlamaz
+ işlemi durdurur. Sorgu Seçenekleri yukarıda belirtilene uygun olarak iyi
+ biçimli olmak zorundadır.</p>
+
+ <p>Aşağıdaki basit örnekte sorgu seçeneklerinin kullanımı gösterilmiştir.
+ Son satırda bulunan "submit" düğmesindeki tanınmayan "X" girdisine
+ dikkat ediniz. "X=Göster" girdisi tüm seçenekler işlendikten sonra
+ <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> tarafından son argüman olarak ele
+ alınacak ve çözümleme işlemi o noktada duracaktır.</p>
+
+ <div class="example"><pre>&lt;form action="" method="get"&gt;
+ &lt;input type="text" name="P" value="*" /&gt; ile eşleşen
+ &lt;select name="C"&gt;
+ &lt;option value="N" selected="selected"&gt;isme&lt;/option&gt;
+ &lt;option value="M"&gt; değişiklik tarihine&lt;/option&gt;
+ &lt;option value="S"&gt; boyuta&lt;/option&gt;
+ &lt;option value="D"&gt; açıklamaya&lt;/option&gt;
+ &lt;/select&gt; göre
+ &lt;select name="O"&gt;
+ &lt;option value="A" selected="selected"&gt; artan&lt;/option&gt;
+ &lt;option value="D"&gt; azalan&lt;/option&gt;
+ &lt;/select&gt;
+ &lt;select name="V"&gt;
+ &lt;option value="0" selected="selected"&gt;normal&lt;/option&gt;
+ &lt;option value="1"&gt; sürümlü&lt;/option&gt;
+ &lt;/select&gt; sıralamayla bir
+ &lt;select name="F"&gt;
+ &lt;option value="0"&gt; basit liste&lt;/option&gt;
+ &lt;option value="1" selected="selected"&gt; süslü liste&lt;/option&gt;
+ &lt;option value="2"&gt; tablolu liste&lt;/option&gt;
+ &lt;/select&gt;
+ &lt;input type="submit" name="X" value="Göster" /&gt;
+&lt;/form&gt;</pre></div>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_autoindex.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_buffer.html.en b/docs/manual/mod/mod_buffer.html.en
index f696509c85..04aa79eecd 100644
--- a/docs/manual/mod/mod_buffer.html.en
+++ b/docs/manual/mod/mod_buffer.html.en
@@ -78,7 +78,6 @@
<ul class="seealso">
<li><a href="../filter.html">Filters</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="BufferSize" id="BufferSize">BufferSize</a> <a name="buffersize" id="buffersize">Directive</a></h2>
<table class="directive">
@@ -95,6 +94,7 @@
The default is 128 kilobytes.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_buffer.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_buffer.html.fr b/docs/manual/mod/mod_buffer.html.fr
index 3184b17a9f..7e49a67f6a 100644
--- a/docs/manual/mod/mod_buffer.html.fr
+++ b/docs/manual/mod/mod_buffer.html.fr
@@ -81,7 +81,6 @@ d'Apache</td></tr></table>
<ul class="seealso">
<li><a href="../filter.html">Les filtres</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="buffersize" id="buffersize">Directive</a> <a name="BufferSize" id="BufferSize">BufferSize</a></h2>
<table class="directive">
@@ -98,6 +97,7 @@ d'Apache</td></tr></table>
128 ko.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_buffer.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en
index 429137e164..d0a2a6000a 100644
--- a/docs/manual/mod/mod_cache.html.en
+++ b/docs/manual/mod/mod_cache.html.en
@@ -163,191 +163,6 @@
<li><a href="../caching.html">Caching Guide</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="related" id="related">Related Modules and Directives</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_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocache">CacheSocache</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemaxtime">CacheSocacheMaxTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemintime">CacheSocacheMinTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemaxsize">CacheSocacheMaxSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadsize">CacheSocacheReadSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadtime">CacheSocacheReadTime</a></code></li></ul></td></tr></table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="sampleconf" id="sampleconf">Sample Configuration</a></h2>
- <div class="example"><h3>Sample httpd.conf</h3><pre class="prettyprint lang-config">#
-# Sample Cache Configuration
-#
-LoadModule cache_module modules/mod_cache.so
-&lt;IfModule mod_cache.c&gt;
- LoadModule cache_disk_module modules/mod_cache_disk.so
- &lt;IfModule mod_cache_disk.c&gt;
- CacheRoot "c:/cacheroot"
- CacheEnable disk "/"
- CacheDirLevels 5
- CacheDirLength 3
- &lt;/IfModule&gt;
-
- # When acting as a proxy, don't cache the list of security updates
- CacheDisable "http://security.update.server/update-list/"
-&lt;/IfModule&gt;</pre>
-</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="thunderingherd" id="thunderingherd">Avoiding the Thundering Herd</a></h2>
- <p>When a cached entry becomes stale, <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> will submit
- a conditional request to the backend, which is expected to confirm whether the
- cached entry is still fresh, and send an updated entity if not.</p>
- <p>A small but finite amount of time exists between the time the cached entity
- becomes stale, and the time the stale entity is fully refreshed. On a busy
- server, a significant number of requests might arrive during this time, and
- cause a <strong>thundering herd</strong> of requests to strike the backend
- suddenly and unpredictably.</p>
- <p>To keep the thundering herd at bay, the <code class="directive">CacheLock</code>
- directive can be used to define a directory in which locks are created for
- URLs <strong>in flight</strong>. The lock is used as a <strong>hint</strong>
- by other requests to either suppress an attempt to cache (someone else has
- gone to fetch the entity), or to indicate that a stale entry is being refreshed
- (stale content will be returned in the mean time).
- </p>
- <h3>Initial caching of an entry</h3>
-
- <p>When an entity is cached for the first time, a lock will be created for the
- entity until the response has been fully cached. During the lifetime of the
- lock, the cache will suppress the second and subsequent attempt to cache the
- same entity. While this doesn't hold back the thundering herd, it does stop
- the cache attempting to cache the same entity multiple times simultaneously.
- </p>
-
- <h3>Refreshment of a stale entry</h3>
-
- <p>When an entity reaches its freshness lifetime and becomes stale, a lock
- will be created for the entity until the response has either been confirmed as
- still fresh, or replaced by the backend. During the lifetime of the lock, the
- second and subsequent incoming request will cause stale data to be returned,
- and the thundering herd is kept at bay.</p>
-
- <h3>Locks and Cache-Control: no-cache</h3>
-
- <p>Locks are used as a <strong>hint only</strong> to enable the cache to be
- more gentle on backend servers, however the lock can be overridden if necessary.
- If the client sends a request with a Cache-Control header forcing a reload, any
- lock that may be present will be ignored, and the client's request will be
- honored immediately and the cached entry refreshed.</p>
- <p>As a further safety mechanism, locks have a configurable maximum age.
- Once this age has been reached, the lock is removed, and a new request is
- given the opportunity to create a new lock. This maximum age can be set using
- the <code class="directive">CacheLockMaxAge</code> directive, and defaults to 5
- seconds.
- </p>
-
- <h3>Example configuration</h3>
-
- <div class="example"><h3>Enabling the cache lock</h3><pre class="prettyprint lang-config">#
-# Enable the cache lock
-#
-&lt;IfModule mod_cache.c&gt;
- CacheLock on
- CacheLockPath "/tmp/mod_cache-lock"
- CacheLockMaxAge 5
-&lt;/IfModule&gt;</pre>
-</div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="finecontrol" id="finecontrol">Fine Control with the CACHE Filter</a></h2>
- <p>Under the default mode of cache operation, the cache runs as a quick handler,
- short circuiting the majority of server processing and offering the highest
- cache performance available.</p>
-
- <p>In this mode, the cache <strong>bolts onto</strong> the front of the server,
- acting as if a free standing RFC 2616 caching proxy had been placed in front of
- the server.</p>
-
- <p>While this mode offers the best performance, the administrator may find that
- under certain circumstances they may want to perform further processing on the
- request after the request is cached, such as to inject personalisation into the
- cached page, or to apply authorisation restrictions to the content. Under these
- circumstances, an administrator is often forced to place independent reverse
- proxy servers either behind or in front of the caching server to achieve this.</p>
-
- <p>To solve this problem the <code class="directive"><a href="#cachequickhandler">CacheQuickHandler
- </a></code> directive can be set to <strong>off</strong>, and the server will
- process all phases normally handled by a non-cached request, including the
- <strong>authentication and authorisation</strong> phases.</p>
-
- <p>In addition, the administrator may optionally specify the <strong>precise point
- within the filter chain</strong> where caching is to take place by adding the
- <strong>CACHE</strong> filter to the output filter chain.</p>
-
- <p>For example, to cache content before applying compression to the response,
- place the <strong>CACHE</strong> filter before the <strong>DEFLATE</strong>
- filter as in the example below:</p>
-
- <pre class="prettyprint lang-config"># Cache content before optional compression
-CacheQuickHandler off
-AddOutputFilterByType CACHE;DEFLATE text/plain</pre>
-
-
- <p>Another option is to have content cached before personalisation is applied
- by <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> (or another content processing filter). In this
- example templates containing tags understood by
- <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> are cached before being parsed:</p>
-
- <pre class="prettyprint lang-config"># Cache content before mod_include and mod_deflate
-CacheQuickHandler off
-AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html</pre>
-
-
- <p>You may place the <strong>CACHE</strong> filter anywhere you wish within the
- filter chain. In this example, content is cached after being parsed by
- <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>, but before being processed by
- <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>:</p>
-
- <pre class="prettyprint lang-config"># Cache content between mod_include and mod_deflate
-CacheQuickHandler off
-AddOutputFilterByType INCLUDES;CACHE;DEFLATE text/html</pre>
-
-
- <div class="warning"><h3>Warning:</h3>If the location of the
- <strong>CACHE</strong> filter in the filter chain is changed for any reason,
- you may need to <strong>flush your cache</strong> to ensure that your data
- served remains consistent. <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> is not in a position
- to enforce this for you.</div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="status" id="status">Cache Status and Logging</a></h2>
- <p>Once <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> has made a decision as to whether or not
- an entity is to be served from cache, the detailed reason for the decision
- is written to the subprocess environment within the request under the
- <strong>cache-status</strong> key. This reason can be logged by the
- <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> directive as
- follows:</p>
-
- <pre class="prettyprint lang-config">LogFormat "%{cache-status}e ..."</pre>
-
-
- <p>Based on the caching decision made, the reason is also written to the
- subprocess environment under one the following four keys, as appropriate:</p>
-
- <dl>
- <dt>cache-hit</dt><dd>The response was served from cache.</dd>
- <dt>cache-revalidate</dt><dd>The response was stale and was successfully
- revalidated, then served from cache.</dd>
- <dt>cache-miss</dt><dd>The response was served from the upstream server.</dd>
- <dt>cache-invalidate</dt><dd>The cached entity was invalidated by a request
- method other than GET or HEAD.</dd>
- </dl>
-
- <p>This makes it possible to support conditional logging of cached requests
- as per the following example:</p>
-
- <pre class="prettyprint lang-config">CustomLog "cached-requests.log" common env=cache-hit
-CustomLog "uncached-requests.log" common env=cache-miss
-CustomLog "revalidated-requests.log" common env=cache-revalidate
-CustomLog "invalidated-requests.log" common env=cache-invalidate</pre>
-
-
- <p>For module authors, a hook called <var>cache_status</var> is available,
- allowing modules to respond to the caching outcomes above in customised
- ways.</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="CacheDefaultExpire" id="CacheDefaultExpire">CacheDefaultExpire</a> <a name="cachedefaultexpire" id="cachedefaultexpire">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The default duration to cache a document when no expiry date is specified.</td></tr>
@@ -1044,6 +859,191 @@ CacheStaleOnError on</pre>
<li><code class="directive"><a href="#cachestorenostore">CacheStoreNoStore</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="related" id="related">Related Modules and Directives</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_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocache">CacheSocache</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemaxtime">CacheSocacheMaxTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemintime">CacheSocacheMinTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemaxsize">CacheSocacheMaxSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadsize">CacheSocacheReadSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadtime">CacheSocacheReadTime</a></code></li></ul></td></tr></table>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="sampleconf" id="sampleconf">Sample Configuration</a></h2>
+ <div class="example"><h3>Sample httpd.conf</h3><pre class="prettyprint lang-config">#
+# Sample Cache Configuration
+#
+LoadModule cache_module modules/mod_cache.so
+&lt;IfModule mod_cache.c&gt;
+ LoadModule cache_disk_module modules/mod_cache_disk.so
+ &lt;IfModule mod_cache_disk.c&gt;
+ CacheRoot "c:/cacheroot"
+ CacheEnable disk "/"
+ CacheDirLevels 5
+ CacheDirLength 3
+ &lt;/IfModule&gt;
+
+ # When acting as a proxy, don't cache the list of security updates
+ CacheDisable "http://security.update.server/update-list/"
+&lt;/IfModule&gt;</pre>
+</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="thunderingherd" id="thunderingherd">Avoiding the Thundering Herd</a></h2>
+ <p>When a cached entry becomes stale, <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> will submit
+ a conditional request to the backend, which is expected to confirm whether the
+ cached entry is still fresh, and send an updated entity if not.</p>
+ <p>A small but finite amount of time exists between the time the cached entity
+ becomes stale, and the time the stale entity is fully refreshed. On a busy
+ server, a significant number of requests might arrive during this time, and
+ cause a <strong>thundering herd</strong> of requests to strike the backend
+ suddenly and unpredictably.</p>
+ <p>To keep the thundering herd at bay, the <code class="directive">CacheLock</code>
+ directive can be used to define a directory in which locks are created for
+ URLs <strong>in flight</strong>. The lock is used as a <strong>hint</strong>
+ by other requests to either suppress an attempt to cache (someone else has
+ gone to fetch the entity), or to indicate that a stale entry is being refreshed
+ (stale content will be returned in the mean time).
+ </p>
+ <h3>Initial caching of an entry</h3>
+
+ <p>When an entity is cached for the first time, a lock will be created for the
+ entity until the response has been fully cached. During the lifetime of the
+ lock, the cache will suppress the second and subsequent attempt to cache the
+ same entity. While this doesn't hold back the thundering herd, it does stop
+ the cache attempting to cache the same entity multiple times simultaneously.
+ </p>
+
+ <h3>Refreshment of a stale entry</h3>
+
+ <p>When an entity reaches its freshness lifetime and becomes stale, a lock
+ will be created for the entity until the response has either been confirmed as
+ still fresh, or replaced by the backend. During the lifetime of the lock, the
+ second and subsequent incoming request will cause stale data to be returned,
+ and the thundering herd is kept at bay.</p>
+
+ <h3>Locks and Cache-Control: no-cache</h3>
+
+ <p>Locks are used as a <strong>hint only</strong> to enable the cache to be
+ more gentle on backend servers, however the lock can be overridden if necessary.
+ If the client sends a request with a Cache-Control header forcing a reload, any
+ lock that may be present will be ignored, and the client's request will be
+ honored immediately and the cached entry refreshed.</p>
+ <p>As a further safety mechanism, locks have a configurable maximum age.
+ Once this age has been reached, the lock is removed, and a new request is
+ given the opportunity to create a new lock. This maximum age can be set using
+ the <code class="directive">CacheLockMaxAge</code> directive, and defaults to 5
+ seconds.
+ </p>
+
+ <h3>Example configuration</h3>
+
+ <div class="example"><h3>Enabling the cache lock</h3><pre class="prettyprint lang-config">#
+# Enable the cache lock
+#
+&lt;IfModule mod_cache.c&gt;
+ CacheLock on
+ CacheLockPath "/tmp/mod_cache-lock"
+ CacheLockMaxAge 5
+&lt;/IfModule&gt;</pre>
+</div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="finecontrol" id="finecontrol">Fine Control with the CACHE Filter</a></h2>
+ <p>Under the default mode of cache operation, the cache runs as a quick handler,
+ short circuiting the majority of server processing and offering the highest
+ cache performance available.</p>
+
+ <p>In this mode, the cache <strong>bolts onto</strong> the front of the server,
+ acting as if a free standing RFC 2616 caching proxy had been placed in front of
+ the server.</p>
+
+ <p>While this mode offers the best performance, the administrator may find that
+ under certain circumstances they may want to perform further processing on the
+ request after the request is cached, such as to inject personalisation into the
+ cached page, or to apply authorisation restrictions to the content. Under these
+ circumstances, an administrator is often forced to place independent reverse
+ proxy servers either behind or in front of the caching server to achieve this.</p>
+
+ <p>To solve this problem the <code class="directive"><a href="#cachequickhandler">CacheQuickHandler
+ </a></code> directive can be set to <strong>off</strong>, and the server will
+ process all phases normally handled by a non-cached request, including the
+ <strong>authentication and authorisation</strong> phases.</p>
+
+ <p>In addition, the administrator may optionally specify the <strong>precise point
+ within the filter chain</strong> where caching is to take place by adding the
+ <strong>CACHE</strong> filter to the output filter chain.</p>
+
+ <p>For example, to cache content before applying compression to the response,
+ place the <strong>CACHE</strong> filter before the <strong>DEFLATE</strong>
+ filter as in the example below:</p>
+
+ <pre class="prettyprint lang-config"># Cache content before optional compression
+CacheQuickHandler off
+AddOutputFilterByType CACHE;DEFLATE text/plain</pre>
+
+
+ <p>Another option is to have content cached before personalisation is applied
+ by <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> (or another content processing filter). In this
+ example templates containing tags understood by
+ <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> are cached before being parsed:</p>
+
+ <pre class="prettyprint lang-config"># Cache content before mod_include and mod_deflate
+CacheQuickHandler off
+AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html</pre>
+
+
+ <p>You may place the <strong>CACHE</strong> filter anywhere you wish within the
+ filter chain. In this example, content is cached after being parsed by
+ <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>, but before being processed by
+ <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>:</p>
+
+ <pre class="prettyprint lang-config"># Cache content between mod_include and mod_deflate
+CacheQuickHandler off
+AddOutputFilterByType INCLUDES;CACHE;DEFLATE text/html</pre>
+
+
+ <div class="warning"><h3>Warning:</h3>If the location of the
+ <strong>CACHE</strong> filter in the filter chain is changed for any reason,
+ you may need to <strong>flush your cache</strong> to ensure that your data
+ served remains consistent. <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> is not in a position
+ to enforce this for you.</div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="status" id="status">Cache Status and Logging</a></h2>
+ <p>Once <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> has made a decision as to whether or not
+ an entity is to be served from cache, the detailed reason for the decision
+ is written to the subprocess environment within the request under the
+ <strong>cache-status</strong> key. This reason can be logged by the
+ <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> directive as
+ follows:</p>
+
+ <pre class="prettyprint lang-config">LogFormat "%{cache-status}e ..."</pre>
+
+
+ <p>Based on the caching decision made, the reason is also written to the
+ subprocess environment under one the following four keys, as appropriate:</p>
+
+ <dl>
+ <dt>cache-hit</dt><dd>The response was served from cache.</dd>
+ <dt>cache-revalidate</dt><dd>The response was stale and was successfully
+ revalidated, then served from cache.</dd>
+ <dt>cache-miss</dt><dd>The response was served from the upstream server.</dd>
+ <dt>cache-invalidate</dt><dd>The cached entity was invalidated by a request
+ method other than GET or HEAD.</dd>
+ </dl>
+
+ <p>This makes it possible to support conditional logging of cached requests
+ as per the following example:</p>
+
+ <pre class="prettyprint lang-config">CustomLog "cached-requests.log" common env=cache-hit
+CustomLog "uncached-requests.log" common env=cache-miss
+CustomLog "revalidated-requests.log" common env=cache-revalidate
+CustomLog "invalidated-requests.log" common env=cache-invalidate</pre>
+
+
+ <p>For module authors, a hook called <var>cache_status</var> is available,
+ allowing modules to respond to the caching outcomes above in customised
+ ways.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_cache.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cache.html.fr b/docs/manual/mod/mod_cache.html.fr
index 106894687c..7760f19a4c 100644
--- a/docs/manual/mod/mod_cache.html.fr
+++ b/docs/manual/mod/mod_cache.html.fr
@@ -174,218 +174,6 @@
cache</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="related" id="related">Modules apparent�s et directives</a></h2>
- <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_cache_socache.html">mod_cache_socache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocache">CacheSocache</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemaxtime">CacheSocacheMaxTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemintime">CacheSocacheMinTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemaxsize">CacheSocacheMaxSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadsize">CacheSocacheReadSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadtime">CacheSocacheReadTime</a></code></li></ul></td></tr></table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="sampleconf" id="sampleconf">Exemple de configuration</a></h2>
- <div class="example"><h3>Extrait de httpd.conf</h3><pre class="prettyprint lang-config">#
-# Exemple de configuration du cache
-#
-LoadModule cache_module modules/mod_cache.so
-&lt;IfModule mod_cache.c&gt;
- LoadModule cache_disk_module modules/mod_cache_disk.so
- &lt;IfModule mod_cache_disk.c&gt;
- CacheRoot c:/cacheroot
- CacheEnable disk /
- CacheDirLevels 5
- CacheDirLength 3
- &lt;/IfModule&gt;
-
- # Lorsqu'on sert de mandataire, on ne met pas en cache la liste
-# des mises � jour de s�curit�
- CacheDisable http://security.update.server/update-list/
-&lt;/IfModule&gt;</pre>
-</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="thunderingherd" id="thunderingherd">Eviter une temp�te de requ�te</a></h2>
- <p>Lorsqu'une entr�e du cache est p�rim�e, <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>
- soumet une requ�te conditionnelle au processus d'arri�re-plan, qui est
- cens� confirmer la validit� de l'entr�e du cache, ou dans la n�gative
- envoyer une entr�e mise � jour.</p>
- <p>Un court mais non n�gligeable laps de temps existe entre le moment
- o� l'entr�e du cache est p�rim�e, et le moment o� elle est mise �
- jour. Sur un serveur fortement charg�, un certain nombre de requ�tes
- peut arriver pendant ce laps de temps, et provoquer une
- <strong>temp�te</strong> de requ�tes susceptibles de saturer le
- processus d'arri�re-plan de mani�re soudaine et impr�dictible.</p>
- <p>Pour contenir cette temp�te, on peut utiliser la directive
- <code class="directive">CacheLock</code> afin de d�finir un r�pertoire o�
- seront cr��s <strong>� la vol�e</strong> des verrous pour les URLs.
- Ces verrous sont utilis�s comme autant d'<strong>indications</strong>
- par les autres requ�tes, soit pour emp�cher une tentative de mise en
- cache (un autre processus est en train de r�cup�rer l'entit�), soit
- pour indiquer qu'une entr�e p�rim�e est en cours de mise � jour
- (pendant ce temps, c'est le contenu p�rim� qui sera renvoy�).
- </p>
- <h3>Mise en cache initiale d'une entr�e</h3>
-
- <p>Lorsqu'une entit� est mise en cache pour la premi�re fois, un
- verrou est cr�� pour cette entit� jusqu'� ce que la r�ponse ait �t�
- enti�rement mise en cache. Pendant la dur�e de vie du verrou, le
- cache va emp�cher une seconde tentative de mise en cache de la m�me
- entit�. Bien que cela ne suffise pas � contenir la temp�te de
- requ�tes, toute tentative de mettre en cache la m�me entit�
- plusieurs fois simultan�ment est stopp�e.
- </p>
-
- <h3>Mise � jour d'une entr�e p�rim�e</h3>
-
- <p>Lorsqu'une entr�e atteint la limite de sa dur�e de vie, et
- devient par cons�quent p�rim�e, un verrou est cr�� pour cette entit�
- jusqu'� ce que la r�ponse ait �t� soit confirm�e comme encore
- valide, soit remplac�e par le processus d'arri�re-plan. Pendant la
- dur�e de vie du verrou, une seconde requ�te entrante va provoquer le
- renvoi de la donn�e p�rim�e, et la temp�te de requ�tes sera
- contenue.</p>
-
- <h3>Verrous et en-t�te Cache-Control: no-cache</h3>
-
- <p>Les verrous ne sont utilis�s <strong>qu'� titre
- indicatif</strong> pour enjoindre le cache � �tre plus coop�ratif
- avec les serveurs d'arri�re-plan, et il est possible de passer outre
- si n�cessaire. Si le client envoie une requ�te contenant un en-t�te
- Cache-Control imposant un nouveau t�l�chargement de l'entit�, tout
- verrou �ventuel sera ignor�, la requ�te du client sera honor�e
- imm�diatement, et l'entr�e du cache mise � jour.</p>
-
- <p>Comme m�canisme de s�curit� suppl�mentaire, la dur�e de vie
- maximale des verrous est configurable. Lorsque cette limite est
- atteinte, le verrou est supprim� et une autre requ�te peut alors en
- cr�er un nouveau. Cette dur�e de vie peut �tre d�finie via la
- directive <code class="directive">CacheLockMaxAge</code>, et sa valeur par
- d�faut est de 5 secondes.
- </p>
-
- <h3>Exemple de configuration</h3>
-
- <div class="example"><h3>Activation du verrouillage du cache</h3><pre class="prettyprint lang-config">#
-# Active le verrouillage du cache
-#
-&lt;IfModule mod_cache.c&gt;
- CacheLock on
- CacheLockPath /tmp/mod_cache-lock
- CacheLockMaxAge 5
-&lt;/IfModule&gt;</pre>
-</div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="finecontrol" id="finecontrol">Contr�le fin via le filtre CACHE</a></h2>
- <p>Dans son mode de fonctionnement par d�faut, le cache s'ex�cute sous
- la forme d'un gestionnaire rapide, court-circuitant la majorit� des
- traitements du serveur et fournissant ainsi une mise en cache
- poss�dant les plus hautes performances disponibles.</p>
-
- <p>Dans ce mode, le cache <strong>s'incruste</strong> devant le
- serveur, comme si un mandataire de mise en cache ind�pendant RFC 2616
- �tait plac� devant ce dernier.</p>
-
- <p>Bien que que ce mode offre les meilleures performances, les
- administrateurs peuvent souhaiter, dans certaines circonstances,
- effectuer des traitements sur la requ�te apr�s que cette derni�re ait
- �t� mise en cache, comme ajouter du contenu personnalis� � la page
- mise en cache, ou appliquer des restrictions d'autorisations au
- contenu. Pour y parvenir, l'administrateur sera alors souvent forc� de
- placer des serveurs mandataires inverses ind�pendants soit derri�re,
- soit devant le serveur de mise en cache.</p>
-
- <p>Pour r�soudre ce probl�me, la directive <code class="directive"><a href="#cachequickhandler">CacheQuickHandler</a></code> peut �tre d�finie �
- <strong>off</strong>, afin que le serveur traite toutes les phases
- normalement ex�cut�es par une requ�te non mise en cache, y compris les
- phases <strong>d'authentification et d'autorisation</strong>.</p>
-
- <p>En outre, l'administrateur peut �ventuellement sp�cifier le
- <strong>point pr�cis dans la cha�ne de filtrage</strong> o� devra
- intervenir la mise en cache en ajoutant le filtre
- <strong>CACHE</strong> � la cha�ne de filtrage en sortie.</p>
-
- <p>Par exemple, pour mettre en cache le contenu avant d'appliquer une
- compression � la r�ponse, placez le filtre <strong>CACHE</strong>
- avant le filtre <strong>DEFLATE</strong> comme dans l'exemple suivant
- :</p>
-
- <pre class="prettyprint lang-config"># Mise en cache du contenu avant la compression optionnelle
-CacheQuickHandler off
-AddOutputFilterByType CACHE;DEFLATE text/plain</pre>
-
-
- <p>Une autre possibilit� consiste � mettre en cache le contenu avant
- l'ajout de contenu personnalis� via <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> (ou
- tout autre filtre de traitement de contenu). Dans l'exemple suivant,
- les mod�les contenant des balises comprises par
- <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> sont mis en cache avant d'�tre
- interpr�t�s :</p>
-
- <pre class="prettyprint lang-config"># Mise en cache du contenu avant l'intervention de mod_include et
- # mod_deflate
-CacheQuickHandler off
-AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html</pre>
-
-
- <p>Vous pouvez ins�rer le filtre <strong>CACHE</strong> en tout point
- de la cha�ne de filtrage. Dans l'exemple suivant, le contenu est mis
- en cache apr�s avoir �t� interpr�t� par <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>,
- mais avant d'�tre trait� par <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> :</p>
-
- <pre class="prettyprint lang-config"># Mise en cache du contenu entre les interventions de mod_include et
- # mod_deflate
-CacheQuickHandler off
-AddOutputFilterByType INCLUDES;CACHE;DEFLATE text/html</pre>
-
-
- <div class="warning"><h3>Avertissement :</h3>Si pour une raison
- ou pour une autre, le point d'insertion du filtre
- <strong>CACHE</strong> dans la cha�ne de filtrage est modifi�, vous
- devez <strong>vider votre cache</strong> pour �tre s�r que les donn�es
- servies soient � jour. En effet, <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> n'est pas
- en mesure d'effectuer cette op�ration � votre place.</div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="status" id="status">Etat du cache et journalisation</a></h2>
- <p>Lorsque <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> a d�cid� s'il devait ou non
- servir une entit� depuis le cache, les raisons pr�cises de cette
- d�cision sont enregistr�es dans l'environnement du sous-processus
- interne � la requ�te sous la cl� <strong>cache-status</strong>.
- Cette information peut �tre journalis�e via la directive <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> comme suit :</p>
-
- <pre class="prettyprint lang-config">LogFormat "%{cache-status}e ..."</pre>
-
-
- <p>En fonction de la d�cision prise, l'information est aussi �crite
- dans l'environnement du sous-processus sous une des quatre cl�s
- suivantes :</p>
-
- <dl>
- <dt>cache-hit</dt><dd>Le contenu a �t� servi depuis le cache.</dd>
- <dt>cache-revalidate</dt><dd>Le contenu du cache �tait p�rim�, a �t�
- mis � jour avec succ�s, puis servi depuis le cache.</dd>
- <dt>cache-miss</dt><dd>Le contenu n'�tait pas dans le cache et a �t�
- servi directement depuis le serveur demand�.</dd>
- <dt>cache-invalidate</dt><dd>L'entit� du cache est devenue invalide
- suite � une requ�te d'un type autre que GET ou HEAD.</dd>
- </dl>
-
- <p>Il est alors possible d'envisager une journalisation conditionnelle
- du traitement des requ�tes par rapport au cache comme dans l'exemple
- suivant :</p>
-
- <pre class="prettyprint lang-config">CustomLog cached-requests.log common env=cache-hit
-CustomLog uncached-requests.log common env=cache-miss
-CustomLog revalidated-requests.log common env=cache-revalidate
-CustomLog invalidated-requests.log common env=cache-invalidate</pre>
-
-
- <p>Pour les concepteurs de modules, une accroche (hook) nomm�e
- <var>cache_status</var> est disponible et permet aux modules de
- r�pondre aux r�sultats de la v�rification du cache ci-dessus de mani�re
- personnalis�e.</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="cachedefaultexpire" id="cachedefaultexpire">Directive</a> <a name="CacheDefaultExpire" id="CacheDefaultExpire">CacheDefaultExpire</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>La dur�e par d�faut de mise en cache d'un document
@@ -1160,6 +948,218 @@ marqu�es comme priv�es</td></tr>
<li><code class="directive"><a href="#cachestorenostore">CacheStoreNoStore</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="related" id="related">Modules apparent�s et directives</a></h2>
+ <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_cache_socache.html">mod_cache_socache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocache">CacheSocache</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemaxtime">CacheSocacheMaxTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemintime">CacheSocacheMinTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemaxsize">CacheSocacheMaxSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadsize">CacheSocacheReadSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadtime">CacheSocacheReadTime</a></code></li></ul></td></tr></table>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="sampleconf" id="sampleconf">Exemple de configuration</a></h2>
+ <div class="example"><h3>Extrait de httpd.conf</h3><pre class="prettyprint lang-config">#
+# Exemple de configuration du cache
+#
+LoadModule cache_module modules/mod_cache.so
+&lt;IfModule mod_cache.c&gt;
+ LoadModule cache_disk_module modules/mod_cache_disk.so
+ &lt;IfModule mod_cache_disk.c&gt;
+ CacheRoot c:/cacheroot
+ CacheEnable disk /
+ CacheDirLevels 5
+ CacheDirLength 3
+ &lt;/IfModule&gt;
+
+ # Lorsqu'on sert de mandataire, on ne met pas en cache la liste
+# des mises � jour de s�curit�
+ CacheDisable http://security.update.server/update-list/
+&lt;/IfModule&gt;</pre>
+</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="thunderingherd" id="thunderingherd">Eviter une temp�te de requ�te</a></h2>
+ <p>Lorsqu'une entr�e du cache est p�rim�e, <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>
+ soumet une requ�te conditionnelle au processus d'arri�re-plan, qui est
+ cens� confirmer la validit� de l'entr�e du cache, ou dans la n�gative
+ envoyer une entr�e mise � jour.</p>
+ <p>Un court mais non n�gligeable laps de temps existe entre le moment
+ o� l'entr�e du cache est p�rim�e, et le moment o� elle est mise �
+ jour. Sur un serveur fortement charg�, un certain nombre de requ�tes
+ peut arriver pendant ce laps de temps, et provoquer une
+ <strong>temp�te</strong> de requ�tes susceptibles de saturer le
+ processus d'arri�re-plan de mani�re soudaine et impr�dictible.</p>
+ <p>Pour contenir cette temp�te, on peut utiliser la directive
+ <code class="directive">CacheLock</code> afin de d�finir un r�pertoire o�
+ seront cr��s <strong>� la vol�e</strong> des verrous pour les URLs.
+ Ces verrous sont utilis�s comme autant d'<strong>indications</strong>
+ par les autres requ�tes, soit pour emp�cher une tentative de mise en
+ cache (un autre processus est en train de r�cup�rer l'entit�), soit
+ pour indiquer qu'une entr�e p�rim�e est en cours de mise � jour
+ (pendant ce temps, c'est le contenu p�rim� qui sera renvoy�).
+ </p>
+ <h3>Mise en cache initiale d'une entr�e</h3>
+
+ <p>Lorsqu'une entit� est mise en cache pour la premi�re fois, un
+ verrou est cr�� pour cette entit� jusqu'� ce que la r�ponse ait �t�
+ enti�rement mise en cache. Pendant la dur�e de vie du verrou, le
+ cache va emp�cher une seconde tentative de mise en cache de la m�me
+ entit�. Bien que cela ne suffise pas � contenir la temp�te de
+ requ�tes, toute tentative de mettre en cache la m�me entit�
+ plusieurs fois simultan�ment est stopp�e.
+ </p>
+
+ <h3>Mise � jour d'une entr�e p�rim�e</h3>
+
+ <p>Lorsqu'une entr�e atteint la limite de sa dur�e de vie, et
+ devient par cons�quent p�rim�e, un verrou est cr�� pour cette entit�
+ jusqu'� ce que la r�ponse ait �t� soit confirm�e comme encore
+ valide, soit remplac�e par le processus d'arri�re-plan. Pendant la
+ dur�e de vie du verrou, une seconde requ�te entrante va provoquer le
+ renvoi de la donn�e p�rim�e, et la temp�te de requ�tes sera
+ contenue.</p>
+
+ <h3>Verrous et en-t�te Cache-Control: no-cache</h3>
+
+ <p>Les verrous ne sont utilis�s <strong>qu'� titre
+ indicatif</strong> pour enjoindre le cache � �tre plus coop�ratif
+ avec les serveurs d'arri�re-plan, et il est possible de passer outre
+ si n�cessaire. Si le client envoie une requ�te contenant un en-t�te
+ Cache-Control imposant un nouveau t�l�chargement de l'entit�, tout
+ verrou �ventuel sera ignor�, la requ�te du client sera honor�e
+ imm�diatement, et l'entr�e du cache mise � jour.</p>
+
+ <p>Comme m�canisme de s�curit� suppl�mentaire, la dur�e de vie
+ maximale des verrous est configurable. Lorsque cette limite est
+ atteinte, le verrou est supprim� et une autre requ�te peut alors en
+ cr�er un nouveau. Cette dur�e de vie peut �tre d�finie via la
+ directive <code class="directive">CacheLockMaxAge</code>, et sa valeur par
+ d�faut est de 5 secondes.
+ </p>
+
+ <h3>Exemple de configuration</h3>
+
+ <div class="example"><h3>Activation du verrouillage du cache</h3><pre class="prettyprint lang-config">#
+# Active le verrouillage du cache
+#
+&lt;IfModule mod_cache.c&gt;
+ CacheLock on
+ CacheLockPath /tmp/mod_cache-lock
+ CacheLockMaxAge 5
+&lt;/IfModule&gt;</pre>
+</div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="finecontrol" id="finecontrol">Contr�le fin via le filtre CACHE</a></h2>
+ <p>Dans son mode de fonctionnement par d�faut, le cache s'ex�cute sous
+ la forme d'un gestionnaire rapide, court-circuitant la majorit� des
+ traitements du serveur et fournissant ainsi une mise en cache
+ poss�dant les plus hautes performances disponibles.</p>
+
+ <p>Dans ce mode, le cache <strong>s'incruste</strong> devant le
+ serveur, comme si un mandataire de mise en cache ind�pendant RFC 2616
+ �tait plac� devant ce dernier.</p>
+
+ <p>Bien que que ce mode offre les meilleures performances, les
+ administrateurs peuvent souhaiter, dans certaines circonstances,
+ effectuer des traitements sur la requ�te apr�s que cette derni�re ait
+ �t� mise en cache, comme ajouter du contenu personnalis� � la page
+ mise en cache, ou appliquer des restrictions d'autorisations au
+ contenu. Pour y parvenir, l'administrateur sera alors souvent forc� de
+ placer des serveurs mandataires inverses ind�pendants soit derri�re,
+ soit devant le serveur de mise en cache.</p>
+
+ <p>Pour r�soudre ce probl�me, la directive <code class="directive"><a href="#cachequickhandler">CacheQuickHandler</a></code> peut �tre d�finie �
+ <strong>off</strong>, afin que le serveur traite toutes les phases
+ normalement ex�cut�es par une requ�te non mise en cache, y compris les
+ phases <strong>d'authentification et d'autorisation</strong>.</p>
+
+ <p>En outre, l'administrateur peut �ventuellement sp�cifier le
+ <strong>point pr�cis dans la cha�ne de filtrage</strong> o� devra
+ intervenir la mise en cache en ajoutant le filtre
+ <strong>CACHE</strong> � la cha�ne de filtrage en sortie.</p>
+
+ <p>Par exemple, pour mettre en cache le contenu avant d'appliquer une
+ compression � la r�ponse, placez le filtre <strong>CACHE</strong>
+ avant le filtre <strong>DEFLATE</strong> comme dans l'exemple suivant
+ :</p>
+
+ <pre class="prettyprint lang-config"># Mise en cache du contenu avant la compression optionnelle
+CacheQuickHandler off
+AddOutputFilterByType CACHE;DEFLATE text/plain</pre>
+
+
+ <p>Une autre possibilit� consiste � mettre en cache le contenu avant
+ l'ajout de contenu personnalis� via <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> (ou
+ tout autre filtre de traitement de contenu). Dans l'exemple suivant,
+ les mod�les contenant des balises comprises par
+ <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> sont mis en cache avant d'�tre
+ interpr�t�s :</p>
+
+ <pre class="prettyprint lang-config"># Mise en cache du contenu avant l'intervention de mod_include et
+ # mod_deflate
+CacheQuickHandler off
+AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html</pre>
+
+
+ <p>Vous pouvez ins�rer le filtre <strong>CACHE</strong> en tout point
+ de la cha�ne de filtrage. Dans l'exemple suivant, le contenu est mis
+ en cache apr�s avoir �t� interpr�t� par <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>,
+ mais avant d'�tre trait� par <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> :</p>
+
+ <pre class="prettyprint lang-config"># Mise en cache du contenu entre les interventions de mod_include et
+ # mod_deflate
+CacheQuickHandler off
+AddOutputFilterByType INCLUDES;CACHE;DEFLATE text/html</pre>
+
+
+ <div class="warning"><h3>Avertissement :</h3>Si pour une raison
+ ou pour une autre, le point d'insertion du filtre
+ <strong>CACHE</strong> dans la cha�ne de filtrage est modifi�, vous
+ devez <strong>vider votre cache</strong> pour �tre s�r que les donn�es
+ servies soient � jour. En effet, <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> n'est pas
+ en mesure d'effectuer cette op�ration � votre place.</div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="status" id="status">Etat du cache et journalisation</a></h2>
+ <p>Lorsque <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> a d�cid� s'il devait ou non
+ servir une entit� depuis le cache, les raisons pr�cises de cette
+ d�cision sont enregistr�es dans l'environnement du sous-processus
+ interne � la requ�te sous la cl� <strong>cache-status</strong>.
+ Cette information peut �tre journalis�e via la directive <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> comme suit :</p>
+
+ <pre class="prettyprint lang-config">LogFormat "%{cache-status}e ..."</pre>
+
+
+ <p>En fonction de la d�cision prise, l'information est aussi �crite
+ dans l'environnement du sous-processus sous une des quatre cl�s
+ suivantes :</p>
+
+ <dl>
+ <dt>cache-hit</dt><dd>Le contenu a �t� servi depuis le cache.</dd>
+ <dt>cache-revalidate</dt><dd>Le contenu du cache �tait p�rim�, a �t�
+ mis � jour avec succ�s, puis servi depuis le cache.</dd>
+ <dt>cache-miss</dt><dd>Le contenu n'�tait pas dans le cache et a �t�
+ servi directement depuis le serveur demand�.</dd>
+ <dt>cache-invalidate</dt><dd>L'entit� du cache est devenue invalide
+ suite � une requ�te d'un type autre que GET ou HEAD.</dd>
+ </dl>
+
+ <p>Il est alors possible d'envisager une journalisation conditionnelle
+ du traitement des requ�tes par rapport au cache comme dans l'exemple
+ suivant :</p>
+
+ <pre class="prettyprint lang-config">CustomLog cached-requests.log common env=cache-hit
+CustomLog uncached-requests.log common env=cache-miss
+CustomLog revalidated-requests.log common env=cache-revalidate
+CustomLog invalidated-requests.log common env=cache-invalidate</pre>
+
+
+ <p>Pour les concepteurs de modules, une accroche (hook) nomm�e
+ <var>cache_status</var> est disponible et permet aux modules de
+ r�pondre aux r�sultats de la v�rification du cache ci-dessus de mani�re
+ personnalis�e.</p>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cache.html.ja.utf8 b/docs/manual/mod/mod_cache.html.ja.utf8
index 42c2ae8139..3338ee183a 100644
--- a/docs/manual/mod/mod_cache.html.ja.utf8
+++ b/docs/manual/mod/mod_cache.html.ja.utf8
@@ -105,50 +105,6 @@
<li><a href="../caching.html">キャッシュ機能</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="related" id="related">関連モジュールとディレクティブ</a></h2>
- <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_dist.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachesize">MCacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></code></li></ul></td></tr></table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="sampleconf" id="sampleconf">サンプル設定</a></h2>
- <div class="example"><h3>Sample httpd.conf</h3><p><code>
- #<br />
- # Sample Cache Configuration<br />
- #<br />
- LoadModule cache_module modules/mod_cache.so<br />
- <br />
- &lt;IfModule mod_cache.c&gt;<br />
- <span class="indent">
- #LoadModule cache_disk_module modules/mod_cache_disk.so<br />
- # If you want to use mod_cache_disk instead of mod_mem_cache,<br />
- # uncomment the line above and comment out the LoadModule line below.<br />
- &lt;IfModule mod_cache_disk.c&gt;<br />
- <span class="indent">
- CacheRoot c:/cacheroot<br />
- CacheEnable disk /<br />
- CacheDirLevels 5<br />
- CacheDirLength 3<br />
- </span>
- &lt;/IfModule&gt; <br />
- <br />
- LoadModule mem_cache_module modules/mod_mem_cache.so<br />
- &lt;IfModule mod_mem_cache.c&gt;<br />
- <span class="indent">
- CacheEnable mem /<br />
- MCacheSize 4096<br />
- MCacheMaxObjectCount 100<br />
- MCacheMinObjectSize 1<br />
- MCacheMaxObjectSize 2048<br />
- </span>
- &lt;/IfModule&gt;<br />
- <br />
- # When acting as a proxy, don't cache the list of security updates<br />
- CacheDisable http://security.update.server/update-list/<br />
- </span>
- &lt;/IfModule&gt;
- </code></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="CacheDefaultExpire" id="CacheDefaultExpire">CacheDefaultExpire</a> <a name="cachedefaultexpire" id="cachedefaultexpire">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>期日が指定されていないときにドキュメントをキャッシュするデフォルトの期間</td></tr>
@@ -646,6 +602,50 @@
<li><code class="directive"><a href="#cachestorenostore">CacheStoreNoStore</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="related" id="related">関連モジュールとディレクティブ</a></h2>
+ <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_dist.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachesize">MCacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></code></li></ul></td></tr></table>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="sampleconf" id="sampleconf">サンプル設定</a></h2>
+ <div class="example"><h3>Sample httpd.conf</h3><p><code>
+ #<br />
+ # Sample Cache Configuration<br />
+ #<br />
+ LoadModule cache_module modules/mod_cache.so<br />
+ <br />
+ &lt;IfModule mod_cache.c&gt;<br />
+ <span class="indent">
+ #LoadModule cache_disk_module modules/mod_cache_disk.so<br />
+ # If you want to use mod_cache_disk instead of mod_mem_cache,<br />
+ # uncomment the line above and comment out the LoadModule line below.<br />
+ &lt;IfModule mod_cache_disk.c&gt;<br />
+ <span class="indent">
+ CacheRoot c:/cacheroot<br />
+ CacheEnable disk /<br />
+ CacheDirLevels 5<br />
+ CacheDirLength 3<br />
+ </span>
+ &lt;/IfModule&gt; <br />
+ <br />
+ LoadModule mem_cache_module modules/mod_mem_cache.so<br />
+ &lt;IfModule mod_mem_cache.c&gt;<br />
+ <span class="indent">
+ CacheEnable mem /<br />
+ MCacheSize 4096<br />
+ MCacheMaxObjectCount 100<br />
+ MCacheMinObjectSize 1<br />
+ MCacheMaxObjectSize 2048<br />
+ </span>
+ &lt;/IfModule&gt;<br />
+ <br />
+ # When acting as a proxy, don't cache the list of security updates<br />
+ CacheDisable http://security.update.server/update-list/<br />
+ </span>
+ &lt;/IfModule&gt;
+ </code></p></div>
+</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cache.html.ko.euc-kr b/docs/manual/mod/mod_cache.html.ko.euc-kr
index 3c557de164..99d77ddea3 100644
--- a/docs/manual/mod/mod_cache.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cache.html.ko.euc-kr
@@ -95,46 +95,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#sampleconf">������</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="related" id="related">���õ� ���� ���þ�</a></h2>
- <table class="related"><tr><th>���õ� ���</th><th>���õ� ���þ�</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachesize">CacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcinterval">CacheGcInterval</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheexpirycheck">CacheExpiryCheck</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachetimemargin">CacheTimeMargin</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcdaily">CacheGcDaily</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcunused">CacheGcUnused</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcclean">CacheGcClean</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcmemusage">CacheGcMemUsage</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachesize">MCacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></code></li></ul></td></tr></table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="sampleconf" id="sampleconf">������</a></h2>
- <div class="example"><h3>Sample httpd.conf</h3><p><code>
- #<br />
- # ���� ij�� ����<br />
- #<br />
- LoadModule cache_module modules/mod_cache.so<br />
- <br />
- &lt;IfModule mod_cache.c&gt;<br />
- <span class="indent">
- #LoadModule cache_disk_module modules/mod_cache_disk.so<br />
- &lt;IfModule mod_cache_disk.c&gt;<br />
- <span class="indent">
- CacheRoot c:/cacheroot<br />
- CacheSize 256<br />
- CacheEnable disk /<br />
- CacheDirLevels 5<br />
- CacheDirLength 3<br />
- </span>
- &lt;/IfModule&gt; <br />
- <br />
- LoadModule mem_cache_module modules/mod_mem_cache.so<br />
- &lt;IfModule mod_mem_cache.c&gt;<br />
- <span class="indent">
- CacheEnable mem /<br />
- MCacheSize 4096<br />
- MCacheMaxObjectCount 100<br />
- MCacheMinObjectSize 1<br />
- MCacheMaxObjectSize 2048<br />
- </span>
- &lt;/IfModule&gt;<br />
- </span>
- &lt;/IfModule&gt;
- </code></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="CacheDefaultExpire" id="CacheDefaultExpire">CacheDefaultExpire</a> <a name="cachedefaultexpire" id="cachedefaultexpire">���þ�</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">����:</a></th><td>����ð��� ������������ ������ ij���� �⺻ �Ⱓ.</td></tr>
@@ -495,6 +455,46 @@
<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_cache</td></tr>
</table><p>Documentation not yet translated. Please see English version of document.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="related" id="related">���õ� ���� ���þ�</a></h2>
+ <table class="related"><tr><th>���õ� ���</th><th>���õ� ���þ�</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachesize">CacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcinterval">CacheGcInterval</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheexpirycheck">CacheExpiryCheck</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachetimemargin">CacheTimeMargin</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcdaily">CacheGcDaily</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcunused">CacheGcUnused</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcclean">CacheGcClean</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachegcmemusage">CacheGcMemUsage</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachesize">MCacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></code></li></ul></td></tr></table>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="sampleconf" id="sampleconf">������</a></h2>
+ <div class="example"><h3>Sample httpd.conf</h3><p><code>
+ #<br />
+ # ���� ij�� ����<br />
+ #<br />
+ LoadModule cache_module modules/mod_cache.so<br />
+ <br />
+ &lt;IfModule mod_cache.c&gt;<br />
+ <span class="indent">
+ #LoadModule cache_disk_module modules/mod_cache_disk.so<br />
+ &lt;IfModule mod_cache_disk.c&gt;<br />
+ <span class="indent">
+ CacheRoot c:/cacheroot<br />
+ CacheSize 256<br />
+ CacheEnable disk /<br />
+ CacheDirLevels 5<br />
+ CacheDirLength 3<br />
+ </span>
+ &lt;/IfModule&gt; <br />
+ <br />
+ LoadModule mem_cache_module modules/mod_mem_cache.so<br />
+ &lt;IfModule mod_mem_cache.c&gt;<br />
+ <span class="indent">
+ CacheEnable mem /<br />
+ MCacheSize 4096<br />
+ MCacheMaxObjectCount 100<br />
+ MCacheMinObjectSize 1<br />
+ MCacheMaxObjectSize 2048<br />
+ </span>
+ &lt;/IfModule&gt;<br />
+ </span>
+ &lt;/IfModule&gt;
+ </code></p></div>
+</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cache_disk.html.en b/docs/manual/mod/mod_cache_disk.html.en
index f5741bdf18..1c9d640ee9 100644
--- a/docs/manual/mod/mod_cache_disk.html.en
+++ b/docs/manual/mod/mod_cache_disk.html.en
@@ -88,7 +88,6 @@
<li><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code></li>
<li><a href="../caching.html">Caching Guide</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CacheDirLength" id="CacheDirLength">CacheDirLength</a> <a name="cachedirlength" id="cachedirlength">Directive</a></h2>
<table class="directive">
@@ -257,6 +256,7 @@ stored</td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_cache_disk.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cache_disk.html.fr b/docs/manual/mod/mod_cache_disk.html.fr
index 3dbd9d7110..e9de7ee2b7 100644
--- a/docs/manual/mod/mod_cache_disk.html.fr
+++ b/docs/manual/mod/mod_cache_disk.html.fr
@@ -92,7 +92,6 @@ cache HTTP.</td></tr>
<li><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code></li>
<li><a href="../caching.html">Guide de la mise en cache</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="cachedirlength" id="cachedirlength">Directive</a> <a name="CacheDirLength" id="CacheDirLength">CacheDirLength</a></h2>
<table class="directive">
@@ -275,6 +274,7 @@ seront stock�s</td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_cache_disk.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cache_disk.html.ja.utf8 b/docs/manual/mod/mod_cache_disk.html.ja.utf8
index d3b934db84..330ccdedde 100644
--- a/docs/manual/mod/mod_cache_disk.html.ja.utf8
+++ b/docs/manual/mod/mod_cache_disk.html.ja.utf8
@@ -65,7 +65,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#cacheroot">CacheRoot</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CacheDirLength" id="CacheDirLength">CacheDirLength</a> <a name="cachedirlength" id="cachedirlength">ディレクティブ</a></h2>
<table class="directive">
@@ -197,6 +196,7 @@
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_cache_disk.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cache_disk.html.ko.euc-kr b/docs/manual/mod/mod_cache_disk.html.ko.euc-kr
index 1288ec2949..11eac3a292 100644
--- a/docs/manual/mod/mod_cache_disk.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cache_disk.html.ko.euc-kr
@@ -64,7 +64,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#cacheroot">CacheRoot</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CacheDirLength" id="CacheDirLength">CacheDirLength</a> <a name="cachedirlength" id="cachedirlength">���þ�</a></h2>
<table class="directive">
@@ -191,6 +190,7 @@
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_cache_disk.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cache_socache.html.en b/docs/manual/mod/mod_cache_socache.html.en
index e4840e36ee..f9a3941698 100644
--- a/docs/manual/mod/mod_cache_socache.html.en
+++ b/docs/manual/mod/mod_cache_socache.html.en
@@ -83,7 +83,6 @@ CacheSocacheMaxSize 102400
<li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li>
<li><a href="../caching.html">Caching Guide</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CacheSocache" id="CacheSocache">CacheSocache</a> <a name="cachesocache" id="cachesocache">Directive</a></h2>
<table class="directive">
@@ -233,6 +232,7 @@ cache</td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_cache_socache.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cache_socache.html.fr b/docs/manual/mod/mod_cache_socache.html.fr
index 501ccf70be..68177ebaa2 100644
--- a/docs/manual/mod/mod_cache_socache.html.fr
+++ b/docs/manual/mod/mod_cache_socache.html.fr
@@ -84,7 +84,6 @@ CacheSocacheMaxSize 102400
<li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li>
<li><a href="../caching.html">Guide de la mise en cache</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="cachesocache" id="cachesocache">Directive</a> <a name="CacheSocache" id="CacheSocache">CacheSocache</a></h2>
<table class="directive">
@@ -246,6 +245,7 @@ Apache</td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_cache_socache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cern_meta.html.en b/docs/manual/mod/mod_cern_meta.html.en
index 255ac6322e..779c61e7f6 100644
--- a/docs/manual/mod/mod_cern_meta.html.en
+++ b/docs/manual/mod/mod_cern_meta.html.en
@@ -56,7 +56,6 @@
<li><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code></li>
<li><code class="module"><a href="../mod/mod_asis.html">mod_asis</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="MetaDir" id="MetaDir">MetaDir</a> <a name="metadir" id="metadir">Directive</a></h2>
<table class="directive">
@@ -123,6 +122,7 @@ meta information</td></tr>
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_cern_meta.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cern_meta.html.fr b/docs/manual/mod/mod_cern_meta.html.fr
index fedaebb27c..1aea5c6d17 100644
--- a/docs/manual/mod/mod_cern_meta.html.fr
+++ b/docs/manual/mod/mod_cern_meta.html.fr
@@ -58,7 +58,6 @@ CERN</td></tr>
<li><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code></li>
<li><code class="module"><a href="../mod/mod_asis.html">mod_asis</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="metadir" id="metadir">Directive</a> <a name="MetaDir" id="MetaDir">MetaDir</a></h2>
<table class="directive">
@@ -128,6 +127,7 @@ style du CERN</td></tr>
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_cern_meta.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cern_meta.html.ko.euc-kr b/docs/manual/mod/mod_cern_meta.html.ko.euc-kr
index 15ac58049c..feb49a1ce3 100644
--- a/docs/manual/mod/mod_cern_meta.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cern_meta.html.ko.euc-kr
@@ -56,7 +56,6 @@
<li><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code></li>
<li><code class="module"><a href="../mod/mod_asis.html">mod_asis</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="MetaDir" id="MetaDir">MetaDir</a> <a name="metadir" id="metadir">���þ�</a></h2>
<table class="directive">
@@ -116,6 +115,7 @@
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_cern_meta.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cgi.html.en b/docs/manual/mod/mod_cgi.html.en
index 10f8548cf5..b7e88eec75 100644
--- a/docs/manual/mod/mod_cgi.html.en
+++ b/docs/manual/mod/mod_cgi.html.en
@@ -78,6 +78,78 @@
<li><a href="http://www.ietf.org/rfc/rfc3875">CGI Specification</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptLog" id="ScriptLog">ScriptLog</a> <a name="scriptlog" id="scriptlog">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location of the CGI script error logfile</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptLog <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p>The <code class="directive">ScriptLog</code> directive sets the CGI
+ script error logfile. If no <code class="directive">ScriptLog</code> is given,
+ no error log is created. If given, any CGI errors are logged into the
+ filename given as argument. If this is a relative file or path it is
+ taken relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.
+ </p>
+
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">ScriptLog logs/cgi_log</pre>
+</div>
+
+ <p>This log will be opened as the user the child processes run
+ as, <em>i.e.</em> the user specified in the main <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code> directive. This means that
+ either the directory the script log is in needs to be writable
+ by that user or the file needs to be manually created and set
+ to be writable by that user. If you place the script log in
+ your main logs directory, do <strong>NOT</strong> change the
+ directory permissions to make it writable by the user the child
+ processes run as.</p>
+
+ <p>Note that script logging is meant to be a debugging feature
+ when writing CGI scripts, and is not meant to be activated
+ continuously on running servers. It is not optimized for speed
+ or efficiency, and may have security problems if used in a
+ manner other than that for which it was designed.</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="ScriptLogBuffer" id="ScriptLogBuffer">ScriptLogBuffer</a> <a name="scriptlogbuffer" id="scriptlogbuffer">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum amount of PUT or POST requests that will be recorded
+in the scriptlog</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptLogBuffer <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ScriptLogBuffer 1024</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p>The size of any PUT or POST entity body that is logged to
+ the file is limited, to prevent the log file growing too big
+ too quickly if large bodies are being received. By default, up
+ to 1024 bytes are logged, but this can be changed with this
+ directive.</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="ScriptLogLength" id="ScriptLogLength">ScriptLogLength</a> <a name="scriptloglength" id="scriptloglength">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Size limit of the CGI script logfile</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptLogLength <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ScriptLogLength 10385760</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p><code class="directive">ScriptLogLength</code> can be used to limit the
+ size of the CGI script logfile. Since the logfile logs a lot of
+ information per CGI error (all request headers, all script output)
+ it can grow to be a big file. To prevent problems due to unbounded
+ growth, this directive can be used to set an maximum file-size for
+ the CGI logfile. If the file exceeds this size, no more
+ information will be written to it.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="env" id="env">CGI Environment variables</a></h2>
<p>The server will set the CGI environment variables as described
@@ -162,78 +234,6 @@
not output anything on standard output or standard error).</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="ScriptLog" id="ScriptLog">ScriptLog</a> <a name="scriptlog" id="scriptlog">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location of the CGI script error logfile</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptLog <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p>The <code class="directive">ScriptLog</code> directive sets the CGI
- script error logfile. If no <code class="directive">ScriptLog</code> is given,
- no error log is created. If given, any CGI errors are logged into the
- filename given as argument. If this is a relative file or path it is
- taken relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.
- </p>
-
- <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">ScriptLog logs/cgi_log</pre>
-</div>
-
- <p>This log will be opened as the user the child processes run
- as, <em>i.e.</em> the user specified in the main <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code> directive. This means that
- either the directory the script log is in needs to be writable
- by that user or the file needs to be manually created and set
- to be writable by that user. If you place the script log in
- your main logs directory, do <strong>NOT</strong> change the
- directory permissions to make it writable by the user the child
- processes run as.</p>
-
- <p>Note that script logging is meant to be a debugging feature
- when writing CGI scripts, and is not meant to be activated
- continuously on running servers. It is not optimized for speed
- or efficiency, and may have security problems if used in a
- manner other than that for which it was designed.</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="ScriptLogBuffer" id="ScriptLogBuffer">ScriptLogBuffer</a> <a name="scriptlogbuffer" id="scriptlogbuffer">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum amount of PUT or POST requests that will be recorded
-in the scriptlog</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptLogBuffer <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ScriptLogBuffer 1024</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p>The size of any PUT or POST entity body that is logged to
- the file is limited, to prevent the log file growing too big
- too quickly if large bodies are being received. By default, up
- to 1024 bytes are logged, but this can be changed with this
- directive.</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="ScriptLogLength" id="ScriptLogLength">ScriptLogLength</a> <a name="scriptloglength" id="scriptloglength">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Size limit of the CGI script logfile</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptLogLength <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ScriptLogLength 10385760</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p><code class="directive">ScriptLogLength</code> can be used to limit the
- size of the CGI script logfile. Since the logfile logs a lot of
- information per CGI error (all request headers, all script output)
- it can grow to be a big file. To prevent problems due to unbounded
- growth, this directive can be used to set an maximum file-size for
- the CGI logfile. If the file exceeds this size, no more
- information will be written to it.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_cgi.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cgi.html.fr b/docs/manual/mod/mod_cgi.html.fr
index af193e8226..8fbeb925f9 100644
--- a/docs/manual/mod/mod_cgi.html.fr
+++ b/docs/manual/mod/mod_cgi.html.fr
@@ -78,6 +78,88 @@ utilisateurs diff�rents</a></li>
CGI</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="scriptlog" id="scriptlog">Directive</a> <a name="ScriptLog" id="ScriptLog">ScriptLog</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Chemin du fichier journal des erreurs du script
+CGI</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ScriptLog <var>chemin fichier</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p>La directive <code class="directive">ScriptLog</code> permet de d�finir
+ le chemin du fichier journal des erreurs du script CGI. Si cette
+ directive n'est pas d�finie, aucune journalisation des erreurs n'est
+ effectu�e. Si elle est d�finie, toute erreur CGI sera enregistr�e
+ dans le fichier dont le nom est fourni en argument. S'il s'agit d'un
+ chemin de fichier relatif, il est consid�r� par rapport au
+ r�pertoire d�fini par la directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.
+ </p>
+
+ <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">ScriptLog logs/cgi_log</pre>
+</div>
+
+ <p>Ce journal sera ouvert par l'utilisateur sous lequel les
+ processus enfants s'ex�cutent, c'est � dire l'utilisateur sp�cifi�
+ par la directive du serveur <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code>. Ceci implique que le
+ r�pertoire dans lequel se trouve le journal doit �tre accessible en
+ �criture pour cet utilisateur, ou bien que le fichier est cr��
+ manuellement et accessible en �criture pour cet utilisateur. Si vous
+ placez le journal du script dans votre r�pertoire principal des
+ journaux, ne modifiez <strong>JAMAIS</strong> les permissions de ce
+ dernier afin de le le rendre accessible en �criture par
+ l'utilisateur sous lequel les processus enfants s'ex�cutent.</p>
+
+ <p>Notez que l'on ne doit activer la journalisation des scripts
+ qu'� des fins de d�bogage lors de l'�criture de scripts CGI, et non
+ de mani�re permanente sur un serveur en production. Elle n'est pas
+ optimis�e en terme de performances et d'efficacit�, et peut
+ pr�senter des probl�mes de s�curit� si on l'utilise dans un cadre
+ autre que celui pour lequel elle a �t� con�ue.</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="scriptlogbuffer" id="scriptlogbuffer">Directive</a> <a name="ScriptLogBuffer" id="ScriptLogBuffer">ScriptLogBuffer</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Taille maximale des requ�tes PUT ou POST qui seront
+enregistr�es dans le journal du script</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ScriptLogBuffer <var>octets</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ScriptLogBuffer 1024</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p>Cette directive permet de limiter la taille du corps de toute
+ entit� PUT ou POST qui sera enregistr�e dans le journal, afin
+ de pr�venir une croissance trop importante et trop rapide du fichier
+ journal due � la r�ception de corps de requ�te de grandes tailles.
+ Cette directive permet de modifier cette taille maximale, dont la
+ valeur par d�faut est de 1024 octets.</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="scriptloglength" id="scriptloglength">Directive</a> <a name="ScriptLogLength" id="ScriptLogLength">ScriptLogLength</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Taille maximale du fichier journal des scripts
+CGI</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ScriptLogLength <var>octets</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ScriptLogLength 10385760</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p>La directive <code class="directive">ScriptLogLength</code> permet de
+ d�finir la taille maximale du fichier journal des scripts CGI. Comme
+ le fichier journal accumule une grande quantit� d'informations par
+ erreur CGI (tous les en-t�tes de la requ�te, toutes les sorties du
+ script), il peut vite atteindre une grande taille. En limitant la
+ taille du fichier, cette directive permet d'�viter les probl�mes que
+ causerait sa croissance sans limites. Lorsque le fichier a atteint
+ cette taille maximale, plus aucune information n'y est
+ enregistr�e.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="env" id="env">Les variables d'environnement CGI</a></h2>
<p>Le serveur va d�finir les variables d'environnement CGI comme
@@ -171,88 +253,6 @@ CGI</a></li>
d'erreurs).</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="scriptlog" id="scriptlog">Directive</a> <a name="ScriptLog" id="ScriptLog">ScriptLog</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Chemin du fichier journal des erreurs du script
-CGI</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ScriptLog <var>chemin fichier</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p>La directive <code class="directive">ScriptLog</code> permet de d�finir
- le chemin du fichier journal des erreurs du script CGI. Si cette
- directive n'est pas d�finie, aucune journalisation des erreurs n'est
- effectu�e. Si elle est d�finie, toute erreur CGI sera enregistr�e
- dans le fichier dont le nom est fourni en argument. S'il s'agit d'un
- chemin de fichier relatif, il est consid�r� par rapport au
- r�pertoire d�fini par la directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.
- </p>
-
- <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">ScriptLog logs/cgi_log</pre>
-</div>
-
- <p>Ce journal sera ouvert par l'utilisateur sous lequel les
- processus enfants s'ex�cutent, c'est � dire l'utilisateur sp�cifi�
- par la directive du serveur <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code>. Ceci implique que le
- r�pertoire dans lequel se trouve le journal doit �tre accessible en
- �criture pour cet utilisateur, ou bien que le fichier est cr��
- manuellement et accessible en �criture pour cet utilisateur. Si vous
- placez le journal du script dans votre r�pertoire principal des
- journaux, ne modifiez <strong>JAMAIS</strong> les permissions de ce
- dernier afin de le le rendre accessible en �criture par
- l'utilisateur sous lequel les processus enfants s'ex�cutent.</p>
-
- <p>Notez que l'on ne doit activer la journalisation des scripts
- qu'� des fins de d�bogage lors de l'�criture de scripts CGI, et non
- de mani�re permanente sur un serveur en production. Elle n'est pas
- optimis�e en terme de performances et d'efficacit�, et peut
- pr�senter des probl�mes de s�curit� si on l'utilise dans un cadre
- autre que celui pour lequel elle a �t� con�ue.</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="scriptlogbuffer" id="scriptlogbuffer">Directive</a> <a name="ScriptLogBuffer" id="ScriptLogBuffer">ScriptLogBuffer</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Taille maximale des requ�tes PUT ou POST qui seront
-enregistr�es dans le journal du script</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ScriptLogBuffer <var>octets</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ScriptLogBuffer 1024</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p>Cette directive permet de limiter la taille du corps de toute
- entit� PUT ou POST qui sera enregistr�e dans le journal, afin
- de pr�venir une croissance trop importante et trop rapide du fichier
- journal due � la r�ception de corps de requ�te de grandes tailles.
- Cette directive permet de modifier cette taille maximale, dont la
- valeur par d�faut est de 1024 octets.</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="scriptloglength" id="scriptloglength">Directive</a> <a name="ScriptLogLength" id="ScriptLogLength">ScriptLogLength</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Taille maximale du fichier journal des scripts
-CGI</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ScriptLogLength <var>octets</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ScriptLogLength 10385760</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p>La directive <code class="directive">ScriptLogLength</code> permet de
- d�finir la taille maximale du fichier journal des scripts CGI. Comme
- le fichier journal accumule une grande quantit� d'informations par
- erreur CGI (tous les en-t�tes de la requ�te, toutes les sorties du
- script), il peut vite atteindre une grande taille. En limitant la
- taille du fichier, cette directive permet d'�viter les probl�mes que
- causerait sa croissance sans limites. Lorsque le fichier a atteint
- cette taille maximale, plus aucune information n'y est
- enregistr�e.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cgi.html.ja.utf8 b/docs/manual/mod/mod_cgi.html.ja.utf8
index b5b26e07cc..65b41c3b1b 100644
--- a/docs/manual/mod/mod_cgi.html.ja.utf8
+++ b/docs/manual/mod/mod_cgi.html.ja.utf8
@@ -75,6 +75,81 @@
<li><a href="http://www.ietf.org/rfc/rfc3875">CGI 規格書</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptLog" id="ScriptLog">ScriptLog</a> <a name="scriptlog" id="scriptlog">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>CGI スクリプトのエラーログファイルの場所</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptLog <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p><code class="directive">ScriptLog</code> ディレクティブは CGI スクリプトの
+ エラーログファイルを設定します。<code class="directive">ScriptLog</code> が
+ 設定されていないときは、
+ エラーログは作成されません。設定されているときは、CGI
+ のエラーはすべて引数として与えられているファイル名にログされます。
+ 相対パスで指定されているときは、
+ <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>からの相対パスとして
+ 扱われます。</p>
+
+ <div class="example"><h3>例</h3><pre class="prettyprint lang-config">ScriptLog logs/cgi_log</pre>
+</div>
+
+ <p>このログは子プロセスが実行されているユーザとしてオープンされます。
+ <em>すなわち</em>、<code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code> ディレクティブで指定された
+ ユーザです。これは、スクリプトログが書かれるディレクトリがそのユーザで
+ 書き込み可能か、スクリプトファイルが手動で作成され、そのユーザで
+ 書き込み可能になっている必要があるということです。スクリプトログを
+ アクセスログなどのためのログディレクトリに書かれるようにしたときは、
+ そのディレクトリを子プロセスを実行しているユーザの権限で
+ 書き込み可能には<strong>しない</strong>ようにしてください。</p>
+
+ <p>スクリプトのログ収集は CGI スクリプトを書くときの
+ デバッグ用の機能として意図されていて、通常のサーバで
+ 常に使用されるようには意図されていないということに注意してください。
+ 速度や効率は最適化されておらず、設計された以外の方法で使用されると
+ セキュリティの問題があるかもしれません。</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="ScriptLogBuffer" id="ScriptLogBuffer">ScriptLogBuffer</a> <a name="scriptlogbuffer" id="scriptlogbuffer">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>スクリプトログに記録される PUT や POST リクエストの内容の上限</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptLogBuffer <em>bytes</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ScriptLogBuffer 1024</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p>大きな本体を受け取ったときにログファイルがすぐに大きくなりすぎる
+ 問題を避けるために、ファイルにログ収集される PUT と POST
+ の本体の大きさは制限されています。デフォルトでは、1024
+ バイトまでがログ収集されますが、
+ このディレクティブはそれを変更することができます。
+ </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="ScriptLogLength" id="ScriptLogLength">ScriptLogLength</a> <a name="scriptloglength" id="scriptloglength">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>CGI スクリプトのログファイルの大きさの上限</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptLogLength <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ScriptLogLength 10385760</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p><code class="directive">ScriptLogLength</code> は CGI スクリプトのログファイル
+ の大きさを制限するために使用することができます。ログファイルは
+ CGI のエラー毎に大量の情報 (リクエストのすべてのヘッダ、
+ すべての出力)をログしますので、すぐに大きなファイルになります。
+ この大きさの制限がないことによる問題を防ぐために、
+ このディレクティブを使って CGI のログファイルの
+ 最大のファイルサイズを設定することができます。
+ ファイルがこの大きさを超えた場合は、それ以上は書き込まれません。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="env" id="env">CGI 環境変数</a></h2>
<p>サーバは <a href="http://www.ietf.org/rfc/rfc3875">CGI
@@ -165,81 +240,6 @@
%stdout や %stderr はありません)。</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="ScriptLog" id="ScriptLog">ScriptLog</a> <a name="scriptlog" id="scriptlog">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>CGI スクリプトのエラーログファイルの場所</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptLog <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p><code class="directive">ScriptLog</code> ディレクティブは CGI スクリプトの
- エラーログファイルを設定します。<code class="directive">ScriptLog</code> が
- 設定されていないときは、
- エラーログは作成されません。設定されているときは、CGI
- のエラーはすべて引数として与えられているファイル名にログされます。
- 相対パスで指定されているときは、
- <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>からの相対パスとして
- 扱われます。</p>
-
- <div class="example"><h3>例</h3><pre class="prettyprint lang-config">ScriptLog logs/cgi_log</pre>
-</div>
-
- <p>このログは子プロセスが実行されているユーザとしてオープンされます。
- <em>すなわち</em>、<code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code> ディレクティブで指定された
- ユーザです。これは、スクリプトログが書かれるディレクトリがそのユーザで
- 書き込み可能か、スクリプトファイルが手動で作成され、そのユーザで
- 書き込み可能になっている必要があるということです。スクリプトログを
- アクセスログなどのためのログディレクトリに書かれるようにしたときは、
- そのディレクトリを子プロセスを実行しているユーザの権限で
- 書き込み可能には<strong>しない</strong>ようにしてください。</p>
-
- <p>スクリプトのログ収集は CGI スクリプトを書くときの
- デバッグ用の機能として意図されていて、通常のサーバで
- 常に使用されるようには意図されていないということに注意してください。
- 速度や効率は最適化されておらず、設計された以外の方法で使用されると
- セキュリティの問題があるかもしれません。</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="ScriptLogBuffer" id="ScriptLogBuffer">ScriptLogBuffer</a> <a name="scriptlogbuffer" id="scriptlogbuffer">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>スクリプトログに記録される PUT や POST リクエストの内容の上限</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptLogBuffer <em>bytes</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ScriptLogBuffer 1024</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p>大きな本体を受け取ったときにログファイルがすぐに大きくなりすぎる
- 問題を避けるために、ファイルにログ収集される PUT と POST
- の本体の大きさは制限されています。デフォルトでは、1024
- バイトまでがログ収集されますが、
- このディレクティブはそれを変更することができます。
- </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="ScriptLogLength" id="ScriptLogLength">ScriptLogLength</a> <a name="scriptloglength" id="scriptloglength">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>CGI スクリプトのログファイルの大きさの上限</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptLogLength <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ScriptLogLength 10385760</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p><code class="directive">ScriptLogLength</code> は CGI スクリプトのログファイル
- の大きさを制限するために使用することができます。ログファイルは
- CGI のエラー毎に大量の情報 (リクエストのすべてのヘッダ、
- すべての出力)をログしますので、すぐに大きなファイルになります。
- この大きさの制限がないことによる問題を防ぐために、
- このディレクティブを使って CGI のログファイルの
- 最大のファイルサイズを設定することができます。
- ファイルがこの大きさを超えた場合は、それ以上は書き込まれません。</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cgi.html.ko.euc-kr b/docs/manual/mod/mod_cgi.html.ko.euc-kr
index f1283ef7b5..a274ebfaad 100644
--- a/docs/manual/mod/mod_cgi.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cgi.html.ko.euc-kr
@@ -78,6 +78,75 @@
<li><a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI ǥ��</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptLog" id="ScriptLog">ScriptLog</a> <a name="scriptlog" id="scriptlog">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>CGI ��ũ��Ʈ �����α������� ��ġ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ScriptLog <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p><code class="directive">ScriptLog</code> ���þ�� CGI ��ũ��Ʈ
+ �����α������� �����Ѵ�. <code class="directive">ScriptLog</code>��
+ ������������� �����α׸� ������ �ʴ´�. ����ϸ� �ƱԸ�Ʈ��
+ ������ ���Ͽ� CGI ������ ����Ѵ�. ����θ� �����ϸ�
+ <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>�� ����η�
+ �޾Ƶ��δ�.
+ </p>
+
+ <div class="example"><h3>����</h3><p><code>
+ ScriptLog logs/cgi_log
+ </code></p></div>
+
+ <p>�ڽ� ���μ����� �����ϴ� �����, <em>��</em> <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> ���þ�� ������ �����
+ �������� �α׸� ����. �׷��� �� ����ڰ� ��ũ��Ʈ �αװ�
+ �ִ� ���丮�� ��������� �ִ���, ���� �̸� ������ ����
+ �� ����ڿ��� ��������� ��� �Ѵ�. ��ũ��Ʈ �α׸� �� �α�
+ ���丮�� �дٸ� �ڽ� ���μ����� �����ϴ� ����ڿ��� ���������
+ �ֱ����� ���丮 ������ �������� <strong>����</strong>.</p>
+
+ <p>��ũ��Ʈ �α״� CGI ��ũ��Ʈ�� �ۼ��Ҷ� ������� ����
+ �뵵���� ������ �����ϴ� ���� ��� ����ϱ������� �ƴ���
+ �����϶�. �ӵ��� ȿ�����鿡�� ����ȭ�� �ȵ��ְ�, ������
+ �����̿��� ������� ����ϸ� ���Ȼ� ������ �� �� �ִ�.</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="ScriptLogBuffer" id="ScriptLogBuffer">ScriptLogBuffer</a> <a name="scriptlogbuffer" id="scriptlogbuffer">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>��ũ��Ʈ �α׿� ����� PUT Ȥ�� POST ��û�� �ִ뷮</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ScriptLogBuffer <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ScriptLogBuffer 1024</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p>ū ������ �޾Ƽ� �α������� �ʹ� ���� Ŀ���� ������ ��������
+ ���Ͽ� ����� PUT Ȥ�� POST ������ ũ�⸦ �����Ѵ�. �⺻������
+ 1024 ����Ʈ���� �α׿� ���������, �� ���þ ����Ͽ�
+ ������ �� �ִ�.</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="ScriptLogLength" id="ScriptLogLength">ScriptLogLength</a> <a name="scriptloglength" id="scriptloglength">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>CGI ��ũ��Ʈ �α������� ũ�� ����</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ScriptLogLength <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ScriptLogLength 10385760</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+ <p><code class="directive">ScriptLogLength</code>�� CGI ��ũ��Ʈ
+ �α������� ũ�⸦ �����Ѵ�. CGI ������ �߻��Ҷ����� (���
+ ��û ���, ��� ��ũ��Ʈ ��� ��) ���� ������ �α׿�
+ ��ϵDZ⶧���� ������ �ſ� Ŀ�� �� �ִ�. ������ ������ Ŀ����
+ ������ �������� �� ���þ ����Ͽ� CGI �α������� �ִ�
+ ����ũ�⸦ �����Ѵ�. ������ ũ�Ⱑ ������ ���� ������ ��
+ �̻� ������ ��������ʴ´�.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="env" id="env">CGI ȯ�溯��</a></h2>
<p>������ ������ ���� ������� <a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI ǥ��</a>�� �����ϴ�
@@ -158,75 +227,6 @@
�ʾҴٸ� %stdout�� %stderr �κ��� ������ �� �ִ�).</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="ScriptLog" id="ScriptLog">ScriptLog</a> <a name="scriptlog" id="scriptlog">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>CGI ��ũ��Ʈ �����α������� ��ġ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ScriptLog <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p><code class="directive">ScriptLog</code> ���þ�� CGI ��ũ��Ʈ
- �����α������� �����Ѵ�. <code class="directive">ScriptLog</code>��
- ������������� �����α׸� ������ �ʴ´�. ����ϸ� �ƱԸ�Ʈ��
- ������ ���Ͽ� CGI ������ ����Ѵ�. ����θ� �����ϸ�
- <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>�� ����η�
- �޾Ƶ��δ�.
- </p>
-
- <div class="example"><h3>����</h3><p><code>
- ScriptLog logs/cgi_log
- </code></p></div>
-
- <p>�ڽ� ���μ����� �����ϴ� �����, <em>��</em> <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> ���þ�� ������ �����
- �������� �α׸� ����. �׷��� �� ����ڰ� ��ũ��Ʈ �αװ�
- �ִ� ���丮�� ��������� �ִ���, ���� �̸� ������ ����
- �� ����ڿ��� ��������� ��� �Ѵ�. ��ũ��Ʈ �α׸� �� �α�
- ���丮�� �дٸ� �ڽ� ���μ����� �����ϴ� ����ڿ��� ���������
- �ֱ����� ���丮 ������ �������� <strong>����</strong>.</p>
-
- <p>��ũ��Ʈ �α״� CGI ��ũ��Ʈ�� �ۼ��Ҷ� ������� ����
- �뵵���� ������ �����ϴ� ���� ��� ����ϱ������� �ƴ���
- �����϶�. �ӵ��� ȿ�����鿡�� ����ȭ�� �ȵ��ְ�, ������
- �����̿��� ������� ����ϸ� ���Ȼ� ������ �� �� �ִ�.</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="ScriptLogBuffer" id="ScriptLogBuffer">ScriptLogBuffer</a> <a name="scriptlogbuffer" id="scriptlogbuffer">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>��ũ��Ʈ �α׿� ����� PUT Ȥ�� POST ��û�� �ִ뷮</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ScriptLogBuffer <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ScriptLogBuffer 1024</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p>ū ������ �޾Ƽ� �α������� �ʹ� ���� Ŀ���� ������ ��������
- ���Ͽ� ����� PUT Ȥ�� POST ������ ũ�⸦ �����Ѵ�. �⺻������
- 1024 ����Ʈ���� �α׿� ���������, �� ���þ ����Ͽ�
- ������ �� �ִ�.</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="ScriptLogLength" id="ScriptLogLength">ScriptLogLength</a> <a name="scriptloglength" id="scriptloglength">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>CGI ��ũ��Ʈ �α������� ũ�� ����</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ScriptLogLength <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ScriptLogLength 10385760</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
- <p><code class="directive">ScriptLogLength</code>�� CGI ��ũ��Ʈ
- �α������� ũ�⸦ �����Ѵ�. CGI ������ �߻��Ҷ����� (���
- ��û ���, ��� ��ũ��Ʈ ��� ��) ���� ������ �α׿�
- ��ϵDZ⶧���� ������ �ſ� Ŀ�� �� �ִ�. ������ ������ Ŀ����
- ������ �������� �� ���þ ����Ͽ� CGI �α������� �ִ�
- ����ũ�⸦ �����Ѵ�. ������ ũ�Ⱑ ������ ���� ������ ��
- �̻� ������ ��������ʴ´�.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cgid.html.en b/docs/manual/mod/mod_cgid.html.en
index 7d683ebf39..134d4b70e1 100644
--- a/docs/manual/mod/mod_cgid.html.en
+++ b/docs/manual/mod/mod_cgid.html.en
@@ -74,7 +74,6 @@
<li><a href="../suexec.html">Running CGI programs under different
user IDs</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CGIDScriptTimeout" id="CGIDScriptTimeout">CGIDScriptTimeout</a> <a name="cgidscripttimeout" id="cgidscripttimeout">Directive</a></h2>
<table class="directive">
@@ -126,6 +125,7 @@ the cgi daemon</td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_cgid.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cgid.html.fr b/docs/manual/mod/mod_cgid.html.fr
index 177297b396..97b5674935 100644
--- a/docs/manual/mod/mod_cgid.html.fr
+++ b/docs/manual/mod/mod_cgid.html.fr
@@ -78,7 +78,6 @@ thread�s</td></tr></table>
<li><a href="../suexec.html">Ex�cution de programmes CGI sous des
utilisateurs diff�rents</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="cgidscripttimeout" id="cgidscripttimeout">Directive</a> <a name="CGIDScriptTimeout" id="CGIDScriptTimeout">CGIDScriptTimeout</a></h2>
<table class="directive">
@@ -130,6 +129,7 @@ communiquer avec le d�mon CGI</td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_cgid.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cgid.html.ja.utf8 b/docs/manual/mod/mod_cgid.html.ja.utf8
index f989689d95..ad143a50b6 100644
--- a/docs/manual/mod/mod_cgid.html.ja.utf8
+++ b/docs/manual/mod/mod_cgid.html.ja.utf8
@@ -73,7 +73,6 @@
<li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li>
<li><a href="../suexec.html">CGI プログラムを違うユーザ ID で実行する</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CGIDScriptTimeout" id="CGIDScriptTimeout">CGIDScriptTimeout</a> <a name="cgidscripttimeout" id="cgidscripttimeout">ディレクティブ</a></h2>
<table class="directive">
@@ -113,6 +112,7 @@ unset</code></td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_cgid.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_cgid.html.ko.euc-kr b/docs/manual/mod/mod_cgid.html.ko.euc-kr
index 189bda1143..2eaed876d0 100644
--- a/docs/manual/mod/mod_cgid.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cgid.html.ko.euc-kr
@@ -71,7 +71,6 @@
<li><a href="../suexec.html">�ٸ� ����� ID�� CGI ���α׷�
�����ϱ�</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CGIDScriptTimeout" id="CGIDScriptTimeout">CGIDScriptTimeout</a> <a name="cgidscripttimeout" id="cgidscripttimeout">���þ�</a></h2>
<table class="directive">
@@ -109,6 +108,7 @@ unset</code></td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_cgid.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_charset_lite.html.en b/docs/manual/mod/mod_charset_lite.html.en
index 3d2b75eb4f..cf88e52c6e 100644
--- a/docs/manual/mod/mod_charset_lite.html.en
+++ b/docs/manual/mod/mod_charset_lite.html.en
@@ -60,43 +60,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#problems">Common Problems</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="problems" id="problems">Common Problems</a></h2>
-
- <h3>Invalid character set names</h3>
-
- <p>The character set name parameters of <code class="directive"><a href="#charsetsourceenc">CharsetSourceEnc</a></code> and
- <code class="directive"><a href="#charsetdefault">CharsetDefault</a></code>
- must be acceptable to the translation mechanism used by
- <a class="glossarylink" href="../glossary.html#apr" title="see glossary">APR</a> on the system where
- <code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code> is deployed. These character
- set names are not standardized and are usually not the same as
- the corresponding values used in http headers. Currently, APR
- can only use iconv(3), so you can easily test your character set
- names using the iconv(1) program, as follows:</p>
-
- <div class="example"><p><code>
- iconv -f charsetsourceenc-value -t charsetdefault-value
- </code></p></div>
-
-
- <h3>Mismatch between character set of content and translation
- rules</h3>
-
- <p>If the translation rules don't make sense for the content,
- translation can fail in various ways, including:</p>
-
- <ul>
- <li>The translation mechanism may return a bad return code,
- and the connection will be aborted.</li>
-
- <li>The translation mechanism may silently place special
- characters (e.g., question marks) in the output buffer when
- it cannot translate the input buffer.</li>
- </ul>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CharsetDefault" id="CharsetDefault">CharsetDefault</a> <a name="charsetdefault" id="charsetdefault">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Charset to translate into</td></tr>
@@ -200,6 +163,43 @@
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="problems" id="problems">Common Problems</a></h2>
+
+ <h3>Invalid character set names</h3>
+
+ <p>The character set name parameters of <code class="directive"><a href="#charsetsourceenc">CharsetSourceEnc</a></code> and
+ <code class="directive"><a href="#charsetdefault">CharsetDefault</a></code>
+ must be acceptable to the translation mechanism used by
+ <a class="glossarylink" href="../glossary.html#apr" title="see glossary">APR</a> on the system where
+ <code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code> is deployed. These character
+ set names are not standardized and are usually not the same as
+ the corresponding values used in http headers. Currently, APR
+ can only use iconv(3), so you can easily test your character set
+ names using the iconv(1) program, as follows:</p>
+
+ <div class="example"><p><code>
+ iconv -f charsetsourceenc-value -t charsetdefault-value
+ </code></p></div>
+
+
+ <h3>Mismatch between character set of content and translation
+ rules</h3>
+
+ <p>If the translation rules don't make sense for the content,
+ translation can fail in various ways, including:</p>
+
+ <ul>
+ <li>The translation mechanism may return a bad return code,
+ and the connection will be aborted.</li>
+
+ <li>The translation mechanism may silently place special
+ characters (e.g., question marks) in the output buffer when
+ it cannot translate the input buffer.</li>
+ </ul>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_charset_lite.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_charset_lite.html.fr b/docs/manual/mod/mod_charset_lite.html.fr
index 9ff6662532..709f162c61 100644
--- a/docs/manual/mod/mod_charset_lite.html.fr
+++ b/docs/manual/mod/mod_charset_lite.html.fr
@@ -64,47 +64,6 @@ traductions ou les r�encodages</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#problems">Probl�mes courants</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="problems" id="problems">Probl�mes courants</a></h2>
-
- <h3>Noms de jeux de caract�res non valides</h3>
-
- <p>Les noms des jeux de caract�res pass�s en param�tres aux
- directives <code class="directive"><a href="#charsetsourceenc">CharsetSourceEnc</a></code> et
- <code class="directive"><a href="#charsetdefault">CharsetDefault</a></code>
- doivent �tre reconnus par le m�canisme de traduction utilis� par
- <a class="glossarylink" href="../glossary.html#apr" title="voir glossaire">APR</a> sur le syst�me o�
- <code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code> est utilis�. Ces noms de jeux de
- caract�res ne sont pas standardis�s, et sont en g�n�ral diff�rents
- des valeurs qui leur correspondent dans les en-t�tes HTTP.
- Actuellement, APR ne peut utiliser que iconv(3) ; vous pouvez donc
- tester facilement vos noms de jeux de caract�res en utilisant le
- programme iconv(1), de la mani�re suivante :</p>
-
- <div class="example"><p><code>
- iconv -f valeur-charsetsourceenc -t valeur-charsetdefault
- </code></p></div>
-
-
- <h3>Incompatibilit� entre le jeu de caract�res du
- contenu et les r�gles de traduction</h3>
-
- <p>Si les r�gles de traduction ne peuvent s'appliquer au contenu,
- la traduction peut �chouer avec des cons�quences diverses, comme
- :</p>
-
- <ul>
- <li>Le m�canisme de traduction peut renvoyer un mauvais code de
- retour, et la connexion sera interrompue.</li>
-
- <li>Le m�canisme de traduction peut ins�rer silencieusement des
- caract�res sp�ciaux (par exemple des points d'interrogation) dans
- le tampon de sortie lorsqu'il n'est pas en mesure de traduire le
- tampon d'entr�e.</li>
- </ul>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="charsetdefault" id="charsetdefault">Directive</a> <a name="CharsetDefault" id="CharsetDefault">CharsetDefault</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Jeu de caract�re vers lequel la traduction doit
@@ -218,6 +177,47 @@ caract�res</td></tr>
</div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="problems" id="problems">Probl�mes courants</a></h2>
+
+ <h3>Noms de jeux de caract�res non valides</h3>
+
+ <p>Les noms des jeux de caract�res pass�s en param�tres aux
+ directives <code class="directive"><a href="#charsetsourceenc">CharsetSourceEnc</a></code> et
+ <code class="directive"><a href="#charsetdefault">CharsetDefault</a></code>
+ doivent �tre reconnus par le m�canisme de traduction utilis� par
+ <a class="glossarylink" href="../glossary.html#apr" title="voir glossaire">APR</a> sur le syst�me o�
+ <code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code> est utilis�. Ces noms de jeux de
+ caract�res ne sont pas standardis�s, et sont en g�n�ral diff�rents
+ des valeurs qui leur correspondent dans les en-t�tes HTTP.
+ Actuellement, APR ne peut utiliser que iconv(3) ; vous pouvez donc
+ tester facilement vos noms de jeux de caract�res en utilisant le
+ programme iconv(1), de la mani�re suivante :</p>
+
+ <div class="example"><p><code>
+ iconv -f valeur-charsetsourceenc -t valeur-charsetdefault
+ </code></p></div>
+
+
+ <h3>Incompatibilit� entre le jeu de caract�res du
+ contenu et les r�gles de traduction</h3>
+
+ <p>Si les r�gles de traduction ne peuvent s'appliquer au contenu,
+ la traduction peut �chouer avec des cons�quences diverses, comme
+ :</p>
+
+ <ul>
+ <li>Le m�canisme de traduction peut renvoyer un mauvais code de
+ retour, et la connexion sera interrompue.</li>
+
+ <li>Le m�canisme de traduction peut ins�rer silencieusement des
+ caract�res sp�ciaux (par exemple des points d'interrogation) dans
+ le tampon de sortie lorsqu'il n'est pas en mesure de traduire le
+ tampon d'entr�e.</li>
+ </ul>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_charset_lite.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_charset_lite.html.ko.euc-kr b/docs/manual/mod/mod_charset_lite.html.ko.euc-kr
index 30a8064eee..554accd2e1 100644
--- a/docs/manual/mod/mod_charset_lite.html.ko.euc-kr
+++ b/docs/manual/mod/mod_charset_lite.html.ko.euc-kr
@@ -66,40 +66,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#problems">�Ϲ����� ������</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="problems" id="problems">�Ϲ����� ������</a></h2>
-
- <h3>�߸��� �������� �̸�</h3>
-
- <p><code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code>�� ����ϴ� �ý�����
- ARP ��������� <code class="directive"><a href="#charsetsourceenc">CharsetSourceEnc</a></code>��
- <code class="directive"><a href="#charsetdefault">CharsetDefault</a></code>��
- �Ķ������ �������� �̸��� ó���� �� �־�� �Ѵ�. ��������
- �̸��� ǥ��ȭ���� �ʾҰ�, http ����� ����ϴ� ���� �׻�
- ������ �ʴ�. ���� APR�� iconv(3)���� ����ϱ⶧����,
- ������ ���� iconv(1) ���α׷��� ����Ͽ� Ư�� ��������
- �̸��� ����� �� �ִ��� ���� �� �� �ִ�:</p>
-
- <div class="example"><p><code>
- iconv -f charsetsourceenc-value -t charsetdefault-value
- </code></p></div>
-
-
- <h3>����� ��ȯ��Ģ�� ���������� ���� �ٸ�</h3>
-
- <p>��ȯ��Ģ�� ��Ȳ�� ���������� ������ ���� ���� �������
- ��ȯ�� ������ �� �ִ�:</p>
-
- <ul>
- <li>��ȯ����� ���� ��ȯ�ڵ带 ��ȯ�ϰ� ������ ������
- �� �ִ�.</li>
-
- <li>�Է¹��۸� ��ȯ���� ���Ҷ� ��¹��ۿ� ��� Ư����
- ���ڸ� (��, ����ǥ) ���� �� �ִ�.</li>
- </ul>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CharsetDefault" id="CharsetDefault">CharsetDefault</a> <a name="charsetdefault" id="charsetdefault">���þ�</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">����:</a></th><td>��ȯ�� ��������</td></tr>
@@ -192,6 +158,40 @@
<p>Solaris 8�� iconv�� �� ������ ���������� �����Ѵ�.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="problems" id="problems">�Ϲ����� ������</a></h2>
+
+ <h3>�߸��� �������� �̸�</h3>
+
+ <p><code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code>�� ����ϴ� �ý�����
+ ARP ��������� <code class="directive"><a href="#charsetsourceenc">CharsetSourceEnc</a></code>��
+ <code class="directive"><a href="#charsetdefault">CharsetDefault</a></code>��
+ �Ķ������ �������� �̸��� ó���� �� �־�� �Ѵ�. ��������
+ �̸��� ǥ��ȭ���� �ʾҰ�, http ����� ����ϴ� ���� �׻�
+ ������ �ʴ�. ���� APR�� iconv(3)���� ����ϱ⶧����,
+ ������ ���� iconv(1) ���α׷��� ����Ͽ� Ư�� ��������
+ �̸��� ����� �� �ִ��� ���� �� �� �ִ�:</p>
+
+ <div class="example"><p><code>
+ iconv -f charsetsourceenc-value -t charsetdefault-value
+ </code></p></div>
+
+
+ <h3>����� ��ȯ��Ģ�� ���������� ���� �ٸ�</h3>
+
+ <p>��ȯ��Ģ�� ��Ȳ�� ���������� ������ ���� ���� �������
+ ��ȯ�� ������ �� �ִ�:</p>
+
+ <ul>
+ <li>��ȯ����� ���� ��ȯ�ڵ带 ��ȯ�ϰ� ������ ������
+ �� �ִ�.</li>
+
+ <li>�Է¹��۸� ��ȯ���� ���Ҷ� ��¹��ۿ� ��� Ư����
+ ���ڸ� (��, ����ǥ) ���� �� �ִ�.</li>
+ </ul>
+
+</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_charset_lite.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dav.html.en b/docs/manual/mod/mod_dav.html.en
index abbe7c859c..8a464b2819 100644
--- a/docs/manual/mod/mod_dav.html.en
+++ b/docs/manual/mod/mod_dav.html.en
@@ -60,6 +60,80 @@
<li><a href="http://www.webdav.org">WebDAV Resources</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Dav" id="Dav">Dav</a> <a name="dav" id="dav">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable WebDAV HTTP methods</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Dav On|Off|<var>provider-name</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Dav Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</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_dav</td></tr>
+</table>
+ <p>Use the <code class="directive">Dav</code> directive to enable the
+ WebDAV HTTP methods for the given container:</p>
+
+ <pre class="prettyprint lang-config">&lt;Location "/foo"&gt;
+ Dav On
+&lt;/Location&gt;</pre>
+
+
+ <p>The value <code>On</code> is actually an alias for the default
+ provider <code>filesystem</code> which is served by the <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code> module. Note, that once you have DAV enabled
+ for some location, it <em>cannot</em> be disabled for sublocations.
+ For a complete configuration example have a look at the <a href="#example">section above</a>.</p>
+
+ <div class="warning">
+ Do not enable WebDAV until you have secured your server. Otherwise
+ everyone will be able to distribute files on your system.
+ </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="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a> <a name="davdepthinfinity" id="davdepthinfinity">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Allow PROPFIND, Depth: Infinity requests</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DavDepthInfinity on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DavDepthInfinity off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_dav</td></tr>
+</table>
+ <p>Use the <code class="directive">DavDepthInfinity</code> directive to
+ allow the processing of <code>PROPFIND</code> requests containing the
+ header 'Depth: Infinity'. Because this type of request could constitute
+ a denial-of-service attack, by default it is not allowed.</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="DavMinTimeout" id="DavMinTimeout">DavMinTimeout</a> <a name="davmintimeout" id="davmintimeout">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Minimum amount of time the server holds a lock on
+a DAV resource</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DavMinTimeout <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DavMinTimeout 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_dav</td></tr>
+</table>
+ <p>When a client requests a DAV resource lock, it can also
+ specify a time when the lock will be automatically removed by
+ the server. This value is only a request, and the server can
+ ignore it or inform the client of an arbitrary value.</p>
+
+ <p>Use the <code class="directive">DavMinTimeout</code> directive to specify, in
+ seconds, the minimum lock timeout to return to a client.
+ Microsoft Web Folders defaults to a timeout of 120 seconds; the
+ <code class="directive">DavMinTimeout</code> can override this to a higher value
+ (like 600 seconds) to reduce the chance of the client losing
+ the lock due to network latency.</p>
+
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">&lt;Location "/MSWord"&gt;
+ DavMinTimeout 600
+&lt;/Location&gt;</pre>
+</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="example" id="example">Enabling WebDAV</a></h2>
<p>To enable <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>, add the following to a
@@ -172,80 +246,6 @@ Alias "/php-source" "/home/gstein/php_files"
<code>http://example.com/php-source</code> can be used with a DAV
client to manipulate them.</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="Dav" id="Dav">Dav</a> <a name="dav" id="dav">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable WebDAV HTTP methods</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Dav On|Off|<var>provider-name</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Dav Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory</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_dav</td></tr>
-</table>
- <p>Use the <code class="directive">Dav</code> directive to enable the
- WebDAV HTTP methods for the given container:</p>
-
- <pre class="prettyprint lang-config">&lt;Location "/foo"&gt;
- Dav On
-&lt;/Location&gt;</pre>
-
-
- <p>The value <code>On</code> is actually an alias for the default
- provider <code>filesystem</code> which is served by the <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code> module. Note, that once you have DAV enabled
- for some location, it <em>cannot</em> be disabled for sublocations.
- For a complete configuration example have a look at the <a href="#example">section above</a>.</p>
-
- <div class="warning">
- Do not enable WebDAV until you have secured your server. Otherwise
- everyone will be able to distribute files on your system.
- </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="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a> <a name="davdepthinfinity" id="davdepthinfinity">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Allow PROPFIND, Depth: Infinity requests</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DavDepthInfinity on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DavDepthInfinity off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_dav</td></tr>
-</table>
- <p>Use the <code class="directive">DavDepthInfinity</code> directive to
- allow the processing of <code>PROPFIND</code> requests containing the
- header 'Depth: Infinity'. Because this type of request could constitute
- a denial-of-service attack, by default it is not allowed.</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="DavMinTimeout" id="DavMinTimeout">DavMinTimeout</a> <a name="davmintimeout" id="davmintimeout">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Minimum amount of time the server holds a lock on
-a DAV resource</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DavMinTimeout <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DavMinTimeout 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_dav</td></tr>
-</table>
- <p>When a client requests a DAV resource lock, it can also
- specify a time when the lock will be automatically removed by
- the server. This value is only a request, and the server can
- ignore it or inform the client of an arbitrary value.</p>
-
- <p>Use the <code class="directive">DavMinTimeout</code> directive to specify, in
- seconds, the minimum lock timeout to return to a client.
- Microsoft Web Folders defaults to a timeout of 120 seconds; the
- <code class="directive">DavMinTimeout</code> can override this to a higher value
- (like 600 seconds) to reduce the chance of the client losing
- the lock due to network latency.</p>
-
- <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">&lt;Location "/MSWord"&gt;
- DavMinTimeout 600
-&lt;/Location&gt;</pre>
-</div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_dav.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dav.html.fr b/docs/manual/mod/mod_dav.html.fr
index 5c8888b707..d274d67908 100644
--- a/docs/manual/mod/mod_dav.html.fr
+++ b/docs/manual/mod/mod_dav.html.fr
@@ -63,6 +63,88 @@ documents via le web (<a href="http://www.webdav.org/">WebDAV</a>)</td></tr>
<li><a href="http://www.webdav.org">Ressources WebDAV</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="dav" id="dav">Directive</a> <a name="Dav" id="Dav">Dav</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Active les m�thodes HTTP WebDAV</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>Dav On|Off|<var>nom fournisseur</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>Dav Off</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>
+</table>
+ <p>La directive <code class="directive">Dav</code> permet d'activer les
+ m�thodes HTTP WebDAV pour le conteneur condid�r� :</p>
+
+ <pre class="prettyprint lang-config">&lt;Location /foo&gt;
+ Dav On
+&lt;/Location&gt;</pre>
+
+
+ <p>La valeur <code>On</code> est en fait un alias vers le
+ fournisseur par d�faut <code>filesystem</code> impl�ment� par le
+ module <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code>. Notez que lorsque DAV est activ�
+ pour un conteneur, on <em>ne peut pas</em> le d�sactiver pour ses
+ sous-conteneurs. Pour un exemple de configuration complet,
+ reportez-vous � la <a href="#example">section pr�c�dente</a>.</p>
+
+ <div class="warning">
+ N'activez pas WebDAV tant que votre serveur n'est pas s�curis�. Si
+ vous passez outre cette recommandation, tout le monde pourra
+ 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="davdepthinfinity" id="davdepthinfinity">Directive</a> <a name="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Autorise les requ�tes PROPFIND avec en-t�te Depth:
+Infinity</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>DavDepthInfinity on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>DavDepthInfinity off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, 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>
+</table>
+ <p>La directive <code class="directive">DavDepthInfinity</code> permet
+ d'autoriser le traitement des requ�tes <code>PROPFIND</code>
+ contenant l'en-t�te Depth: Infinity. Par d�faut, ce type de requ�te
+ n'est pas autoris�, car il peut favoriser les attaques de type D�ni
+ de service.</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="davmintimeout" id="davmintimeout">Directive</a> <a name="DavMinTimeout" id="DavMinTimeout">DavMinTimeout</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dur�e minimale pendant laquelle le serveur maintient un
+verrou sur une ressource DAV</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>DavMinTimeout <var>secondes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>DavMinTimeout 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, 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>
+</table>
+ <p>Lorsqu'un client demande le verrouillage d'une ressource DAV, il
+ peut aussi sp�cifier une dur�e au bout de laquelle le verrou sera
+ automatiquement supprim� par le serveur. Cette valeur ne constitue
+ qu'une demande, et le serveur peut l'ignorer ou informer le client
+ qu'il va utiliser une valeur arbitraire.</p>
+
+ <p>La directive <code class="directive">DavMinTimeout</code> permet de
+ sp�cifier, en secondes, la dur�e minimale de verrouillage � renvoyer
+ au client. Les R�pertoires Web de Microsoft pr�sentent une dur�e par
+ d�faut de 120 secondes ; la directive
+ <code class="directive">DavMinTimeout</code> permet de d�finir une valeur
+ sup�rieure (par exemple 600 secondes), afin de r�duire les risques
+ de perte du verrou par le client suite � une surcharge du
+ r�seau.</p>
+
+ <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">&lt;Location /MSWord&gt;
+ DavMinTimeout 600
+&lt;/Location&gt;</pre>
+</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="example" id="example">Activation de WebDAV</a></h2>
<p>Pour activer le module <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>, ajoutez la ligne
@@ -187,88 +269,6 @@ ForceType text/plain
<code>http://example.com/php-source</code> pour les manipuler avec
DAV.</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="dav" id="dav">Directive</a> <a name="Dav" id="Dav">Dav</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Active les m�thodes HTTP WebDAV</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>Dav On|Off|<var>nom fournisseur</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>Dav Off</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>
-</table>
- <p>La directive <code class="directive">Dav</code> permet d'activer les
- m�thodes HTTP WebDAV pour le conteneur condid�r� :</p>
-
- <pre class="prettyprint lang-config">&lt;Location /foo&gt;
- Dav On
-&lt;/Location&gt;</pre>
-
-
- <p>La valeur <code>On</code> est en fait un alias vers le
- fournisseur par d�faut <code>filesystem</code> impl�ment� par le
- module <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code>. Notez que lorsque DAV est activ�
- pour un conteneur, on <em>ne peut pas</em> le d�sactiver pour ses
- sous-conteneurs. Pour un exemple de configuration complet,
- reportez-vous � la <a href="#example">section pr�c�dente</a>.</p>
-
- <div class="warning">
- N'activez pas WebDAV tant que votre serveur n'est pas s�curis�. Si
- vous passez outre cette recommandation, tout le monde pourra
- 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="davdepthinfinity" id="davdepthinfinity">Directive</a> <a name="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Autorise les requ�tes PROPFIND avec en-t�te Depth:
-Infinity</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>DavDepthInfinity on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>DavDepthInfinity off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, 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>
-</table>
- <p>La directive <code class="directive">DavDepthInfinity</code> permet
- d'autoriser le traitement des requ�tes <code>PROPFIND</code>
- contenant l'en-t�te Depth: Infinity. Par d�faut, ce type de requ�te
- n'est pas autoris�, car il peut favoriser les attaques de type D�ni
- de service.</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="davmintimeout" id="davmintimeout">Directive</a> <a name="DavMinTimeout" id="DavMinTimeout">DavMinTimeout</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dur�e minimale pendant laquelle le serveur maintient un
-verrou sur une ressource DAV</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>DavMinTimeout <var>secondes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>DavMinTimeout 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, 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>
-</table>
- <p>Lorsqu'un client demande le verrouillage d'une ressource DAV, il
- peut aussi sp�cifier une dur�e au bout de laquelle le verrou sera
- automatiquement supprim� par le serveur. Cette valeur ne constitue
- qu'une demande, et le serveur peut l'ignorer ou informer le client
- qu'il va utiliser une valeur arbitraire.</p>
-
- <p>La directive <code class="directive">DavMinTimeout</code> permet de
- sp�cifier, en secondes, la dur�e minimale de verrouillage � renvoyer
- au client. Les R�pertoires Web de Microsoft pr�sentent une dur�e par
- d�faut de 120 secondes ; la directive
- <code class="directive">DavMinTimeout</code> permet de d�finir une valeur
- sup�rieure (par exemple 600 secondes), afin de r�duire les risques
- de perte du verrou par le client suite � une surcharge du
- r�seau.</p>
-
- <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">&lt;Location /MSWord&gt;
- DavMinTimeout 600
-&lt;/Location&gt;</pre>
-</div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_dav.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dav.html.ja.utf8 b/docs/manual/mod/mod_dav.html.ja.utf8
index 174fdba6ae..ac9c002ae5 100644
--- a/docs/manual/mod/mod_dav.html.ja.utf8
+++ b/docs/manual/mod/mod_dav.html.ja.utf8
@@ -66,6 +66,86 @@
<li><a href="http://www.webdav.org">WebDAV Resources</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Dav" id="Dav">Dav</a> <a name="dav" id="dav">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>WebDAV HTTP メソッドを有効にします</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Dav On|Off|<var>provider-name</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Dav Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dav</td></tr>
+</table>
+ <p>与えられたコンテナで WebDAV HTTP メソッドが使えるようにするには
+ 次のようにします。</p>
+
+ <pre class="prettyprint lang-config">&lt;Location /foo&gt;
+ Dav On
+&lt;/Location&gt;</pre>
+
+
+ <p><code>On</code> という指定は実際には <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code>
+ で提供されているデフォルトのプロバイダ、<code>filesystem</code>
+ へのエイリアスになっています。一度あるロケーションで DAV
+ を有効にした後は、そのサブロケーションで<em>無効化することはできない</em>
+ ということに注意してください。完全な設定例は<a href="#example">上記のセクション</a> をご覧下さい。</p>
+
+ <div class="warning">
+ サーバのセキュリティが確保できるまで WebDAV を有効にしないでください。
+ そうしなければ誰でもそのサーバでファイルを配布することができるように
+ なってしまいます。
+ </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="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a> <a name="davdepthinfinity" id="davdepthinfinity">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>PROPFIND, Depth: Infinity リクエストを許可します</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DavDepthInfinity on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DavDepthInfinity off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dav</td></tr>
+</table>
+ <p>'Depth: Infinity' を含んでいる
+ <code>PROPFIND</code> リクエストを処理できるようにするには、
+ <code class="directive">DavDepthInfinity</code>
+ ディレクティブを使います。このタイプのリクエストは
+ denial-of-service アタックとなりうるので、
+ デフォルトでは許可されていません。</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="DavMinTimeout" id="DavMinTimeout">DavMinTimeout</a> <a name="davmintimeout" id="davmintimeout">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サーバが DAV リソースのロックを維持する最小時間です。
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DavMinTimeout <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DavMinTimeout 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dav</td></tr>
+</table>
+ <p>クライアントが DAV リソースロックを要求した場合、
+ ロックがサーバによって自動的に解除されるまでの時間を
+ 同時に指定することができます。この値は単なるリクエストであって、
+ サーバはこれを無視することもできますし、
+ 任意の値をクライアントに通知することもできます。</p>
+
+ <p>クライアントに戻すロックタイムアウトの最小時間を、
+ 秒で、指定するために <code class="directive">DavMinTimeout</code>
+ ディレクティブを使います。
+ マイクロソフトのウェブフォルダのデフォルトでは 120 秒ですが;
+ ネットワークの遅延のせいでクライアントがロックを失うのを減らすために、
+ <code class="directive">DavMinTimeout</code> を使って
+ これをもっと大きな値 (例えば 600 秒) に上書きできます。</p>
+
+ <div class="example"><h3>例</h3><pre class="prettyprint lang-config">&lt;Location /MSWord&gt;
+ DavMinTimeout 600
+&lt;/Location&gt;</pre>
+</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="example" id="example">Enabling WebDAV</a></h2>
<p>mod_dav を有効にするには、<code>httpd.conf</code>
@@ -176,86 +256,6 @@ Alias /php-source /home/gstein/php_files
<code>http://example.com/php-source</code> を DAV クライアントによる
が操作のために使うことができます。</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="Dav" id="Dav">Dav</a> <a name="dav" id="dav">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>WebDAV HTTP メソッドを有効にします</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Dav On|Off|<var>provider-name</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Dav Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dav</td></tr>
-</table>
- <p>与えられたコンテナで WebDAV HTTP メソッドが使えるようにするには
- 次のようにします。</p>
-
- <pre class="prettyprint lang-config">&lt;Location /foo&gt;
- Dav On
-&lt;/Location&gt;</pre>
-
-
- <p><code>On</code> という指定は実際には <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code>
- で提供されているデフォルトのプロバイダ、<code>filesystem</code>
- へのエイリアスになっています。一度あるロケーションで DAV
- を有効にした後は、そのサブロケーションで<em>無効化することはできない</em>
- ということに注意してください。完全な設定例は<a href="#example">上記のセクション</a> をご覧下さい。</p>
-
- <div class="warning">
- サーバのセキュリティが確保できるまで WebDAV を有効にしないでください。
- そうしなければ誰でもそのサーバでファイルを配布することができるように
- なってしまいます。
- </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="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a> <a name="davdepthinfinity" id="davdepthinfinity">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>PROPFIND, Depth: Infinity リクエストを許可します</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DavDepthInfinity on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DavDepthInfinity off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dav</td></tr>
-</table>
- <p>'Depth: Infinity' を含んでいる
- <code>PROPFIND</code> リクエストを処理できるようにするには、
- <code class="directive">DavDepthInfinity</code>
- ディレクティブを使います。このタイプのリクエストは
- denial-of-service アタックとなりうるので、
- デフォルトでは許可されていません。</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="DavMinTimeout" id="DavMinTimeout">DavMinTimeout</a> <a name="davmintimeout" id="davmintimeout">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サーバが DAV リソースのロックを維持する最小時間です。
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DavMinTimeout <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DavMinTimeout 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dav</td></tr>
-</table>
- <p>クライアントが DAV リソースロックを要求した場合、
- ロックがサーバによって自動的に解除されるまでの時間を
- 同時に指定することができます。この値は単なるリクエストであって、
- サーバはこれを無視することもできますし、
- 任意の値をクライアントに通知することもできます。</p>
-
- <p>クライアントに戻すロックタイムアウトの最小時間を、
- 秒で、指定するために <code class="directive">DavMinTimeout</code>
- ディレクティブを使います。
- マイクロソフトのウェブフォルダのデフォルトでは 120 秒ですが;
- ネットワークの遅延のせいでクライアントがロックを失うのを減らすために、
- <code class="directive">DavMinTimeout</code> を使って
- これをもっと大きな値 (例えば 600 秒) に上書きできます。</p>
-
- <div class="example"><h3>例</h3><pre class="prettyprint lang-config">&lt;Location /MSWord&gt;
- DavMinTimeout 600
-&lt;/Location&gt;</pre>
-</div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_dav.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dav.html.ko.euc-kr b/docs/manual/mod/mod_dav.html.ko.euc-kr
index 1e7d0fa4b2..ea2171e847 100644
--- a/docs/manual/mod/mod_dav.html.ko.euc-kr
+++ b/docs/manual/mod/mod_dav.html.ko.euc-kr
@@ -63,6 +63,85 @@
<li><a href="http://www.webdav.org">WebDAV ����</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Dav" id="Dav">Dav</a> <a name="dav" id="dav">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>WebDAV HTTP �޽�带 �����Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>Dav On|Off|<var>provider-name</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>Dav Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>directory</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_dav</td></tr>
+</table>
+ <p>������ ��ġ���� WebDAV HTTP �޽�带 ����Ϸ���
+ <code class="directive">Dav</code> ���þ ����Ѵ�:</p>
+
+ <div class="example"><p><code>
+ &lt;Location /foo&gt;<br />
+ <span class="indent">
+ Dav On<br />
+ </span>
+ &lt;/Location&gt;
+ </code></p></div>
+
+ <p><code>On</code> ���� ������ <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code>
+ ����� �����ϴ� �⺻ �������� <code>filesystem</code>��
+ ��Ī�̴�. � ��ġ���� DAV�� �����ϸ� ������������ DAV��
+ �����ϵ��� ������ �� <em>������</em> �����϶�. ������
+ �������� <a href="#example">���� ��</a>�� �����϶�.</p>
+
+ <div class="warning">
+ ������ �����ϰ� �����Ҷ����� WebDAV�� ������� ����. �׷���
+ ������ ������ ������ ���� ������ �й��� �� �ְ� �ȴ�.
+ </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="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a> <a name="davdepthinfinity" id="davdepthinfinity">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>PROPFIND�� Depth: Infinity ��û�� �㰡�Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DavDepthInfinity on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>DavDepthInfinity off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ, directory</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_dav</td></tr>
+</table>
+ <p><code class="directive">DavDepthInfinity</code> ���þ ����ϸ�
+ 'Depth: Infinity' ����� ���� <code>PROPFIND</code> ��û��
+ �㰡�Ѵ�. �̷� ��û�� ����Ͽ� ���񽺰ź� ������ �����ϱ�
+ ������ �⺻������ ������� �ʴ´�.</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="DavMinTimeout" id="DavMinTimeout">DavMinTimeout</a> <a name="davmintimeout" id="davmintimeout">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>������ DAV �ڿ��� ���� ������ ����� �ּҽð�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DavMinTimeout <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>DavMinTimeout 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ, directory</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_dav</td></tr>
+</table>
+ <p>Ŭ���̾�Ʈ�� DAV �ڿ��� ���(lock)�� ��û�Ҷ� ������
+ �˾Ƽ� ����� ������ �� �ִ� �ð��� ���� �˷��� �� �ִ�. �� ����
+ ���� ��û�ϻ��̸�, ������ Ŭ���̾�Ʈ�� ��û�� ���� �����ϰ�
+ Ŭ���̾�Ʈ���� ������ �ð��� �˷��� �� �ִ�.</p>
+
+ <p><code class="directive">DavMinTimeout</code> ���þ�� Ŭ���̾�Ʈ����
+ ���� �ּ� ��� �ð��� (�ʴ���) �����Ѵ�. Microsoft Web Folders��
+ �⺻������ 120 �ʸ� ����Ѵ�. <code class="directive">DavMinTimeout</code>��
+ (600 �ʿ� ����) �� ���� ���� ����ϸ� Ŭ���̾�Ʈ�� ��Ʈ��
+ ���������� ����� �ҰԵǴ� ��츦 ���� �� �ִ�.</p>
+
+ <div class="example"><h3>����</h3><p><code>
+ &lt;Location /MSWord&gt;<br />
+ <span class="indent">
+ DavMinTimeout 600<br />
+ </span>
+ &lt;/Location&gt;
+ </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="example" id="example">WebDAV ����ϱ�</a></h2>
<p><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>�� ����Ϸ��� <code>httpd.conf</code>
@@ -179,85 +258,6 @@ Alias /php-source /home/gstein/php_files<br />
<code>http://example.com/php-source</code>�δ� DAV Ŭ���̾�Ʈ����
��ũ��Ʈ�� ������ �� �ִ�.</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="Dav" id="Dav">Dav</a> <a name="dav" id="dav">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>WebDAV HTTP �޽�带 �����Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>Dav On|Off|<var>provider-name</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>Dav Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>directory</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_dav</td></tr>
-</table>
- <p>������ ��ġ���� WebDAV HTTP �޽�带 ����Ϸ���
- <code class="directive">Dav</code> ���þ ����Ѵ�:</p>
-
- <div class="example"><p><code>
- &lt;Location /foo&gt;<br />
- <span class="indent">
- Dav On<br />
- </span>
- &lt;/Location&gt;
- </code></p></div>
-
- <p><code>On</code> ���� ������ <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code>
- ����� �����ϴ� �⺻ �������� <code>filesystem</code>��
- ��Ī�̴�. � ��ġ���� DAV�� �����ϸ� ������������ DAV��
- �����ϵ��� ������ �� <em>������</em> �����϶�. ������
- �������� <a href="#example">���� ��</a>�� �����϶�.</p>
-
- <div class="warning">
- ������ �����ϰ� �����Ҷ����� WebDAV�� ������� ����. �׷���
- ������ ������ ������ ���� ������ �й��� �� �ְ� �ȴ�.
- </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="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a> <a name="davdepthinfinity" id="davdepthinfinity">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>PROPFIND�� Depth: Infinity ��û�� �㰡�Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DavDepthInfinity on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>DavDepthInfinity off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ, directory</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_dav</td></tr>
-</table>
- <p><code class="directive">DavDepthInfinity</code> ���þ ����ϸ�
- 'Depth: Infinity' ����� ���� <code>PROPFIND</code> ��û��
- �㰡�Ѵ�. �̷� ��û�� ����Ͽ� ���񽺰ź� ������ �����ϱ�
- ������ �⺻������ ������� �ʴ´�.</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="DavMinTimeout" id="DavMinTimeout">DavMinTimeout</a> <a name="davmintimeout" id="davmintimeout">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>������ DAV �ڿ��� ���� ������ ����� �ּҽð�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DavMinTimeout <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>DavMinTimeout 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ, directory</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_dav</td></tr>
-</table>
- <p>Ŭ���̾�Ʈ�� DAV �ڿ��� ���(lock)�� ��û�Ҷ� ������
- �˾Ƽ� ����� ������ �� �ִ� �ð��� ���� �˷��� �� �ִ�. �� ����
- ���� ��û�ϻ��̸�, ������ Ŭ���̾�Ʈ�� ��û�� ���� �����ϰ�
- Ŭ���̾�Ʈ���� ������ �ð��� �˷��� �� �ִ�.</p>
-
- <p><code class="directive">DavMinTimeout</code> ���þ�� Ŭ���̾�Ʈ����
- ���� �ּ� ��� �ð��� (�ʴ���) �����Ѵ�. Microsoft Web Folders��
- �⺻������ 120 �ʸ� ����Ѵ�. <code class="directive">DavMinTimeout</code>��
- (600 �ʿ� ����) �� ���� ���� ����ϸ� Ŭ���̾�Ʈ�� ��Ʈ��
- ���������� ����� �ҰԵǴ� ��츦 ���� �� �ִ�.</p>
-
- <div class="example"><h3>����</h3><p><code>
- &lt;Location /MSWord&gt;<br />
- <span class="indent">
- DavMinTimeout 600<br />
- </span>
- &lt;/Location&gt;
- </code></p></div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_dav.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dav_fs.html.en b/docs/manual/mod/mod_dav_fs.html.en
index 4e0e0280bc..4f252369c2 100644
--- a/docs/manual/mod/mod_dav_fs.html.en
+++ b/docs/manual/mod/mod_dav_fs.html.en
@@ -56,7 +56,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="DavLockDB" id="DavLockDB">DavLockDB</a> <a name="davlockdb" id="davlockdb">Directive</a></h2>
<table class="directive">
@@ -88,6 +87,7 @@
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_dav_fs.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dav_fs.html.fr b/docs/manual/mod/mod_dav_fs.html.fr
index f538ffff06..339370cd7d 100644
--- a/docs/manual/mod/mod_dav_fs.html.fr
+++ b/docs/manual/mod/mod_dav_fs.html.fr
@@ -60,7 +60,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="davlockdb" id="davlockdb">Directive</a> <a name="DavLockDB" id="DavLockDB">DavLockDB</a></h2>
<table class="directive">
@@ -96,6 +95,7 @@
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_dav_fs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dav_fs.html.ja.utf8 b/docs/manual/mod/mod_dav_fs.html.ja.utf8
index 30094c040c..6eaae0b144 100644
--- a/docs/manual/mod/mod_dav_fs.html.ja.utf8
+++ b/docs/manual/mod/mod_dav_fs.html.ja.utf8
@@ -63,7 +63,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="DavLockDB" id="DavLockDB">DavLockDB</a> <a name="davlockdb" id="davlockdb">ディレクティブ</a></h2>
<table class="directive">
@@ -86,6 +85,7 @@
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_dav_fs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dav_fs.html.ko.euc-kr b/docs/manual/mod/mod_dav_fs.html.ko.euc-kr
index 7b04d47b9c..babdf635bd 100644
--- a/docs/manual/mod/mod_dav_fs.html.ko.euc-kr
+++ b/docs/manual/mod/mod_dav_fs.html.ko.euc-kr
@@ -58,7 +58,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="DavLockDB" id="DavLockDB">DavLockDB</a> <a name="davlockdb" id="davlockdb">���þ�</a></h2>
<table class="directive">
@@ -91,6 +90,7 @@
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_dav_fs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dav_lock.html.en b/docs/manual/mod/mod_dav_lock.html.en
index a0a99db81b..7014c28ae4 100644
--- a/docs/manual/mod/mod_dav_lock.html.en
+++ b/docs/manual/mod/mod_dav_lock.html.en
@@ -64,7 +64,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="DavGenericLockDB" id="DavGenericLockDB">DavGenericLockDB</a> <a name="davgenericlockdb" id="davgenericlockdb">Directive</a></h2>
<table class="directive">
@@ -94,6 +93,7 @@
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_dav_lock.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dav_lock.html.fr b/docs/manual/mod/mod_dav_lock.html.fr
index bfa2192d71..08a554cae0 100644
--- a/docs/manual/mod/mod_dav_lock.html.fr
+++ b/docs/manual/mod/mod_dav_lock.html.fr
@@ -69,7 +69,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="davgenericlockdb" id="davgenericlockdb">Directive</a> <a name="DavGenericLockDB" id="DavGenericLockDB">DavGenericLockDB</a></h2>
<table class="directive">
@@ -103,6 +102,7 @@
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_dav_lock.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dav_lock.html.ja.utf8 b/docs/manual/mod/mod_dav_lock.html.ja.utf8
index f6775347ce..bf07de0d9d 100644
--- a/docs/manual/mod/mod_dav_lock.html.ja.utf8
+++ b/docs/manual/mod/mod_dav_lock.html.ja.utf8
@@ -67,7 +67,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="DavGenericLockDB" id="DavGenericLockDB">DavGenericLockDB</a> <a name="davgenericlockdb" id="davgenericlockdb">ディレクティブ</a></h2>
<table class="directive">
@@ -98,6 +97,7 @@
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_dav_lock.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dbd.html.en b/docs/manual/mod/mod_dbd.html.en
index 158a00038f..edd3585bb0 100644
--- a/docs/manual/mod/mod_dbd.html.en
+++ b/docs/manual/mod/mod_dbd.html.en
@@ -67,120 +67,6 @@
<li><a href="../misc/password_encryptions.html">Password Formats</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="pooling" id="pooling">Connection Pooling</a></h2>
- <p>This module manages database connections, in a manner
- optimised for the platform. On non-threaded platforms,
- it provides a persistent connection in the manner of
- classic LAMP (Linux, Apache, Mysql, Perl/PHP/Python).
- On threaded platform, it provides an altogether more
- scalable and efficient <em>connection pool</em>, as
- described in <a href="http://www.apachetutor.org/dev/reslist">this
- article at ApacheTutor</a>. Note that <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code>
- supersedes the modules presented in that article.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="API" id="API">Apache DBD API</a></h2>
- <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> exports five functions for other modules
- to use. The API is as follows:</p>
-
-<pre class="prettyprint lang-c">typedef struct {
- apr_dbd_t *handle;
- apr_dbd_driver_t *driver;
- apr_hash_t *prepared;
-} ap_dbd_t;
-
-/* Export functions to access the database */
-
-/* acquire a connection that MUST be explicitly closed.
- * Returns NULL on error
- */
-AP_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t*, server_rec*);
-
-/* release a connection acquired with ap_dbd_open */
-AP_DECLARE(void) ap_dbd_close(server_rec*, ap_dbd_t*);
-
-/* acquire a connection that will have the lifetime of a request
- * and MUST NOT be explicitly closed. Return NULL on error.
- * This is the preferred function for most applications.
- */
-AP_DECLARE(ap_dbd_t*) ap_dbd_acquire(request_rec*);
-
-/* acquire a connection that will have the lifetime of a connection
- * and MUST NOT be explicitly closed. Return NULL on error.
- */
-AP_DECLARE(ap_dbd_t*) ap_dbd_cacquire(conn_rec*);
-
-/* Prepare a statement for use by a client module */
-AP_DECLARE(void) ap_dbd_prepare(server_rec*, const char*, const char*);
-
-/* Also export them as optional functions for modules that prefer it */
-APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_open, (apr_pool_t*, server_rec*));
-APR_DECLARE_OPTIONAL_FN(void, ap_dbd_close, (server_rec*, ap_dbd_t*));
-APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
-APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_cacquire, (conn_rec*));
-APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const char*));</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="prepared" id="prepared">SQL Prepared Statements</a></h2>
- <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> supports SQL prepared statements on behalf
- of modules that may wish to use them. Each prepared statement
- must be assigned a name (label), and they are stored in a hash:
- the <code>prepared</code> field of an <code>ap_dbd_t</code>.
- Hash entries are of type <code>apr_dbd_prepared_t</code>
- and can be used in any of the apr_dbd prepared statement
- SQL query or select commands.</p>
-
- <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
- arise from the MySQL client reconnecting without properly resetting the
- prepared statements. If set to 1, any broken connections will be attempted
- fixed, but as mod_dbd is not informed, the prepared statements will be invalidated.
- </div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="security" id="security">SECURITY WARNING</a></h2>
-
- <p>Any web/database application needs to secure itself against SQL
- injection attacks. In most cases, Apache DBD is safe, because
- applications use prepared statements, and untrusted inputs are
- only ever used as data. Of course, if you use it via third-party
- modules, you should ascertain what precautions they may require.</p>
- <p>However, the <var>FreeTDS</var> driver is inherently
- <strong>unsafe</strong>. The underlying library doesn't support
- prepared statements, so the driver emulates them, and the
- untrusted input is merged into the SQL statement.</p>
- <p>It can be made safe by <em>untainting</em> all inputs:
- a process inspired by Perl's taint checking. Each input
- is matched against a regexp, and only the match is used,
- according to the Perl idiom:</p>
- <div class="example"><pre><code> $untrusted =~ /([a-z]+)/;
- $trusted = $1;</code></pre></div>
- <p>To use this, the untainting regexps must be included in the
- prepared statements configured. The regexp follows immediately
- after the % in the prepared statement, and is enclosed in
- curly brackets {}. For example, if your application expects
- alphanumeric input, you can use:</p>
- <div class="example"><p><code>
- <code>"SELECT foo FROM bar WHERE input = %s"</code>
- </code></p></div>
- <p>with other drivers, and suffer nothing worse than a failed query.
- But with FreeTDS you'd need:</p>
- <div class="example"><p><code>
- <code>"SELECT foo FROM bar WHERE input = %{([A-Za-z0-9]+)}s"</code>
- </code></p></div>
- <p>Now anything that doesn't match the regexp's $1 match is
- discarded, so the statement is safe.</p>
- <p>An alternative to this may be the third-party ODBC driver,
- which offers the security of genuine prepared statements.</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="DBDExptime" id="DBDExptime">DBDExptime</a> <a name="dbdexptime" id="dbdexptime">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Keepalive time for idle connections</td></tr>
@@ -338,6 +224,120 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
driver in apr_dbd_mysql.so.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="pooling" id="pooling">Connection Pooling</a></h2>
+ <p>This module manages database connections, in a manner
+ optimised for the platform. On non-threaded platforms,
+ it provides a persistent connection in the manner of
+ classic LAMP (Linux, Apache, Mysql, Perl/PHP/Python).
+ On threaded platform, it provides an altogether more
+ scalable and efficient <em>connection pool</em>, as
+ described in <a href="http://www.apachetutor.org/dev/reslist">this
+ article at ApacheTutor</a>. Note that <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code>
+ supersedes the modules presented in that article.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="API" id="API">Apache DBD API</a></h2>
+ <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> exports five functions for other modules
+ to use. The API is as follows:</p>
+
+<pre class="prettyprint lang-c">typedef struct {
+ apr_dbd_t *handle;
+ apr_dbd_driver_t *driver;
+ apr_hash_t *prepared;
+} ap_dbd_t;
+
+/* Export functions to access the database */
+
+/* acquire a connection that MUST be explicitly closed.
+ * Returns NULL on error
+ */
+AP_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t*, server_rec*);
+
+/* release a connection acquired with ap_dbd_open */
+AP_DECLARE(void) ap_dbd_close(server_rec*, ap_dbd_t*);
+
+/* acquire a connection that will have the lifetime of a request
+ * and MUST NOT be explicitly closed. Return NULL on error.
+ * This is the preferred function for most applications.
+ */
+AP_DECLARE(ap_dbd_t*) ap_dbd_acquire(request_rec*);
+
+/* acquire a connection that will have the lifetime of a connection
+ * and MUST NOT be explicitly closed. Return NULL on error.
+ */
+AP_DECLARE(ap_dbd_t*) ap_dbd_cacquire(conn_rec*);
+
+/* Prepare a statement for use by a client module */
+AP_DECLARE(void) ap_dbd_prepare(server_rec*, const char*, const char*);
+
+/* Also export them as optional functions for modules that prefer it */
+APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_open, (apr_pool_t*, server_rec*));
+APR_DECLARE_OPTIONAL_FN(void, ap_dbd_close, (server_rec*, ap_dbd_t*));
+APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
+APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_cacquire, (conn_rec*));
+APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const char*));</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="prepared" id="prepared">SQL Prepared Statements</a></h2>
+ <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> supports SQL prepared statements on behalf
+ of modules that may wish to use them. Each prepared statement
+ must be assigned a name (label), and they are stored in a hash:
+ the <code>prepared</code> field of an <code>ap_dbd_t</code>.
+ Hash entries are of type <code>apr_dbd_prepared_t</code>
+ and can be used in any of the apr_dbd prepared statement
+ SQL query or select commands.</p>
+
+ <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
+ arise from the MySQL client reconnecting without properly resetting the
+ prepared statements. If set to 1, any broken connections will be attempted
+ fixed, but as mod_dbd is not informed, the prepared statements will be invalidated.
+ </div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="security" id="security">SECURITY WARNING</a></h2>
+
+ <p>Any web/database application needs to secure itself against SQL
+ injection attacks. In most cases, Apache DBD is safe, because
+ applications use prepared statements, and untrusted inputs are
+ only ever used as data. Of course, if you use it via third-party
+ modules, you should ascertain what precautions they may require.</p>
+ <p>However, the <var>FreeTDS</var> driver is inherently
+ <strong>unsafe</strong>. The underlying library doesn't support
+ prepared statements, so the driver emulates them, and the
+ untrusted input is merged into the SQL statement.</p>
+ <p>It can be made safe by <em>untainting</em> all inputs:
+ a process inspired by Perl's taint checking. Each input
+ is matched against a regexp, and only the match is used,
+ according to the Perl idiom:</p>
+ <div class="example"><pre><code> $untrusted =~ /([a-z]+)/;
+ $trusted = $1;</code></pre></div>
+ <p>To use this, the untainting regexps must be included in the
+ prepared statements configured. The regexp follows immediately
+ after the % in the prepared statement, and is enclosed in
+ curly brackets {}. For example, if your application expects
+ alphanumeric input, you can use:</p>
+ <div class="example"><p><code>
+ <code>"SELECT foo FROM bar WHERE input = %s"</code>
+ </code></p></div>
+ <p>with other drivers, and suffer nothing worse than a failed query.
+ But with FreeTDS you'd need:</p>
+ <div class="example"><p><code>
+ <code>"SELECT foo FROM bar WHERE input = %{([A-Za-z0-9]+)}s"</code>
+ </code></p></div>
+ <p>Now anything that doesn't match the regexp's $1 match is
+ discarded, so the statement is safe.</p>
+ <p>An alternative to this may be the third-party ODBC driver,
+ which offers the security of genuine prepared statements.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_dbd.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dbd.html.fr b/docs/manual/mod/mod_dbd.html.fr
index cdc08466d2..584370f6da 100644
--- a/docs/manual/mod/mod_dbd.html.fr
+++ b/docs/manual/mod/mod_dbd.html.fr
@@ -69,133 +69,6 @@
passe</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="pooling" id="pooling">Regroupement des connexions</a></h2>
- <p>Ce module g�re de mani�re optimis�e en fonction de la plate-forme
- les connexions aux bases de donn�es. Sur les plates-formes non
- thread�es, il maintient une connexion persistente � la mani�re d'un
- LAMP classique (Linux, Apache, Mysql, Perl/PHP/Python). Sur les
- plates-formes thread�es, il maintient un <em>groupe de
- connexions</em> � la fois plus �volutif et plus efficace, comme
- d�crit dans <a href="http://www.apachetutor.org/dev/reslist">cet
- article d'ApacheTutor</a>. Notez que <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code>
- remplace les modules pr�sent�s dans cet article.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="API" id="API">API DBD d'Apache</a></h2>
- <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> exporte cinq fonctions que d'autres
- modules pourront utiliser. L'API se pr�sente comme suit :</p>
-
- <pre class="prettyprint lang-c">typedef struct {
- apr_dbd_t *handle;
- apr_dbd_driver_t *driver;
- apr_hash_t *prepared;
-} ap_dbd_t;
-
-/* Fonctions export�es pour acc�der � la base de donn�es */
-
-/* ouvre une connexion qui DOIT avoir �t� explicitement ferm�e.
- * Renvoie NULL en cas d'erreur
- */
-AP_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t*, server_rec*);
-
-/* ferme une connexion ouverte avec ap_dbd_open */
-AP_DECLARE(void) ap_dbd_close(server_rec*, ap_dbd_t*);
-
-/* acquiert une connexion qui aura la dur�e de vie de la requ�te et qui
- * NE DOIT PAS avoir �t� explicitement ferm�e. Renvoie NULL en cas
- * d'erreur. C'est la fonction recommand�e pour la plupart des
- * applications.
- */
-AP_DECLARE(ap_dbd_t*) ap_dbd_acquire(request_rec*);
-
-/* acquiert une connexion qui aura la dur�e de vie d'une connexion et
- * qui NE DOIT PAS avoir �t� explicitement ferm�e. Renvoie NULL en cas
- * d'erreur.
- */
-AP_DECLARE(ap_dbd_t*) ap_dbd_cacquire(conn_rec*);
-
-/* Pr�pare une requ�te qu'un module client pourra utiliser */
-AP_DECLARE(void) ap_dbd_prepare(server_rec*, const char*, const char*);
-
-/* Exporte aussi ces fonctions � titre optionnel mour les modules qui
- * p�f�reraient les utiliser */
-APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_open, (apr_pool_t*, server_rec*));
-APR_DECLARE_OPTIONAL_FN(void, ap_dbd_close, (server_rec*, ap_dbd_t*));
-APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
-APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_cacquire, (conn_rec*));
-APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const char*));</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="prepared" id="prepared">Requ�tes SQL pr�par�es</a></h2>
- <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> supporte les requ�tes SQL pr�par�es �
- destination des modules qui pourraient les utiliser. Chaque requ�te
- pr�par�e doit poss�der un nom (�tiquette), et est stock�e dans un
- condens� (hash) : les condens�s sont du type
- <code>apr_dbd_prepared_t</code> et s'utilisent dans toute requ�te
- SQL ou commande select pr�par�e par apr_dbd.</p>
-
- <p>Il est du ressort des modules utilisateurs de dbd d'utiliser les
- requ�tes pr�par�es et de pr�ciser quelles requ�tes doivent �tre
- sp�cifi�es dans httpd.conf, ou de fournir leurs propres directives
- et d'utiliser <code>ap_dbd_prepare</code>.</p>
-
- <div class="warning"><h3>Avertissement</h3>
- Lorsqu'on utilise des requ�tes pr�par�es avec des bases de
- donn�es MySQL, il est pr�f�rable de d�finir
- <code>reconnect</code> � 0 dans la cha�ne de connexion, afin
- d'�viter des erreurs provoqu�es par un client MySQL qui se
- reconnecterait sans r�initialiser correctement les requ�tes
- pr�par�es. Si <code>reconnect</code> est d�fini � 1, toute
- connexion d�fectueuse sera sens�e �tre r�par�e, mais comme
- mod_dbd n'en est pas inform�, les requ�tes pr�par�es seront
- invalid�es.
- </div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="security" id="security">AVERTISSEMENT DE SECURITE</a></h2>
-
- <p>Toute application web impliquant une base de donn�es doit se
- prot�ger elle-m�me contre les attaques de type injection SQL. Dans
- la plupart des cas Apache DBD est s�r, car les applications
- utilisent des requ�tes pr�par�es, et les entr�es non sures ne seront
- utilis�es qu'� titre de donn�es. Bien entendu, si vous l'utilisez
- via un module tiers, vous devez �tre au fait des pr�cautions �
- prendre.</p>
- <p>Cependant, le pilote <var>FreeTDS</var> est <strong>non
- s�r</strong> de par sa nature-m�me. Comme la biblioth�que
- sous-jacente ne supporte pas les requ�tes pr�par�es, le pilote en
- effectue une �mulation, et les entr�es non s�res sont fusionn�es
- avec la requ�te SQL.</p>
- <p>Il peut �tre s�curis� en <em>d�contaminant</em> toutes les
- entr�es : un processus inspir� de la recherche de contaminations
- (<strong>taint mode</strong>) de
- Perl. Chaque entr�e est compar�e � une expression rationnelle, et
- seules les entr�es qui correspondent sont utilis�es, en accord avec
- le langage Perl :</p>
- <div class="example"><pre><code> $untrusted =~ /([a-z]+)/;
- $trusted = $1;</code></pre></div>
- <p>Pour utiliser ceci, les expressions rationnelles de
- d�contamination doivent �tre incluses dans les requ�tes pr�par�es.
- L'expression rationnelle doit se situer imm�diatement apr�s le
- caract�re % dans la requ�te pr�par�e, et doit �tre entour�e
- d'accolades {}. Par exemple, si votre application attend une entr�e
- alphanum�rique, vous pouvez utiliser :</p>
- <div class="example"><p><code>
- <code>"SELECT foo FROM bar WHERE input = %s"</code>
- </code></p></div>
- <p>avec d'autres pilotes, et ne risquer au pire qu'une requ�te
- �chou�e. Mais avec FreeTDS, vous devez utiliser :</p>
- <div class="example"><p><code>
- <code>"SELECT foo FROM bar WHERE input = %{([A-Za-z0-9]+)}s"</code>
- </code></p></div>
- <p>tout ce qui ne correspond pas � l'expression rationnelle est
- alors rejet�, et la requ�te est maintenant s�re.</p>
- <p>Alternativement, vous pouvez utiliser le pilote ODBC tiers, qui
- offre la s�curit� des requ�tes pr�par�es authentiques.</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="dbdexptime" id="dbdexptime">Directive</a> <a name="DBDExptime" id="DBDExptime">DBDExptime</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dur�e de vie des connexions inactives</td></tr>
@@ -365,6 +238,133 @@ donn�es</td></tr>
dans la biblioth�que apr_dbd_mysql.so.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="pooling" id="pooling">Regroupement des connexions</a></h2>
+ <p>Ce module g�re de mani�re optimis�e en fonction de la plate-forme
+ les connexions aux bases de donn�es. Sur les plates-formes non
+ thread�es, il maintient une connexion persistente � la mani�re d'un
+ LAMP classique (Linux, Apache, Mysql, Perl/PHP/Python). Sur les
+ plates-formes thread�es, il maintient un <em>groupe de
+ connexions</em> � la fois plus �volutif et plus efficace, comme
+ d�crit dans <a href="http://www.apachetutor.org/dev/reslist">cet
+ article d'ApacheTutor</a>. Notez que <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code>
+ remplace les modules pr�sent�s dans cet article.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="API" id="API">API DBD d'Apache</a></h2>
+ <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> exporte cinq fonctions que d'autres
+ modules pourront utiliser. L'API se pr�sente comme suit :</p>
+
+ <pre class="prettyprint lang-c">typedef struct {
+ apr_dbd_t *handle;
+ apr_dbd_driver_t *driver;
+ apr_hash_t *prepared;
+} ap_dbd_t;
+
+/* Fonctions export�es pour acc�der � la base de donn�es */
+
+/* ouvre une connexion qui DOIT avoir �t� explicitement ferm�e.
+ * Renvoie NULL en cas d'erreur
+ */
+AP_DECLARE(ap_dbd_t*) ap_dbd_open(apr_pool_t*, server_rec*);
+
+/* ferme une connexion ouverte avec ap_dbd_open */
+AP_DECLARE(void) ap_dbd_close(server_rec*, ap_dbd_t*);
+
+/* acquiert une connexion qui aura la dur�e de vie de la requ�te et qui
+ * NE DOIT PAS avoir �t� explicitement ferm�e. Renvoie NULL en cas
+ * d'erreur. C'est la fonction recommand�e pour la plupart des
+ * applications.
+ */
+AP_DECLARE(ap_dbd_t*) ap_dbd_acquire(request_rec*);
+
+/* acquiert une connexion qui aura la dur�e de vie d'une connexion et
+ * qui NE DOIT PAS avoir �t� explicitement ferm�e. Renvoie NULL en cas
+ * d'erreur.
+ */
+AP_DECLARE(ap_dbd_t*) ap_dbd_cacquire(conn_rec*);
+
+/* Pr�pare une requ�te qu'un module client pourra utiliser */
+AP_DECLARE(void) ap_dbd_prepare(server_rec*, const char*, const char*);
+
+/* Exporte aussi ces fonctions � titre optionnel mour les modules qui
+ * p�f�reraient les utiliser */
+APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_open, (apr_pool_t*, server_rec*));
+APR_DECLARE_OPTIONAL_FN(void, ap_dbd_close, (server_rec*, ap_dbd_t*));
+APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_acquire, (request_rec*));
+APR_DECLARE_OPTIONAL_FN(ap_dbd_t*, ap_dbd_cacquire, (conn_rec*));
+APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const char*));</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="prepared" id="prepared">Requ�tes SQL pr�par�es</a></h2>
+ <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> supporte les requ�tes SQL pr�par�es �
+ destination des modules qui pourraient les utiliser. Chaque requ�te
+ pr�par�e doit poss�der un nom (�tiquette), et est stock�e dans un
+ condens� (hash) : les condens�s sont du type
+ <code>apr_dbd_prepared_t</code> et s'utilisent dans toute requ�te
+ SQL ou commande select pr�par�e par apr_dbd.</p>
+
+ <p>Il est du ressort des modules utilisateurs de dbd d'utiliser les
+ requ�tes pr�par�es et de pr�ciser quelles requ�tes doivent �tre
+ sp�cifi�es dans httpd.conf, ou de fournir leurs propres directives
+ et d'utiliser <code>ap_dbd_prepare</code>.</p>
+
+ <div class="warning"><h3>Avertissement</h3>
+ Lorsqu'on utilise des requ�tes pr�par�es avec des bases de
+ donn�es MySQL, il est pr�f�rable de d�finir
+ <code>reconnect</code> � 0 dans la cha�ne de connexion, afin
+ d'�viter des erreurs provoqu�es par un client MySQL qui se
+ reconnecterait sans r�initialiser correctement les requ�tes
+ pr�par�es. Si <code>reconnect</code> est d�fini � 1, toute
+ connexion d�fectueuse sera sens�e �tre r�par�e, mais comme
+ mod_dbd n'en est pas inform�, les requ�tes pr�par�es seront
+ invalid�es.
+ </div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="security" id="security">AVERTISSEMENT DE SECURITE</a></h2>
+
+ <p>Toute application web impliquant une base de donn�es doit se
+ prot�ger elle-m�me contre les attaques de type injection SQL. Dans
+ la plupart des cas Apache DBD est s�r, car les applications
+ utilisent des requ�tes pr�par�es, et les entr�es non sures ne seront
+ utilis�es qu'� titre de donn�es. Bien entendu, si vous l'utilisez
+ via un module tiers, vous devez �tre au fait des pr�cautions �
+ prendre.</p>
+ <p>Cependant, le pilote <var>FreeTDS</var> est <strong>non
+ s�r</strong> de par sa nature-m�me. Comme la biblioth�que
+ sous-jacente ne supporte pas les requ�tes pr�par�es, le pilote en
+ effectue une �mulation, et les entr�es non s�res sont fusionn�es
+ avec la requ�te SQL.</p>
+ <p>Il peut �tre s�curis� en <em>d�contaminant</em> toutes les
+ entr�es : un processus inspir� de la recherche de contaminations
+ (<strong>taint mode</strong>) de
+ Perl. Chaque entr�e est compar�e � une expression rationnelle, et
+ seules les entr�es qui correspondent sont utilis�es, en accord avec
+ le langage Perl :</p>
+ <div class="example"><pre><code> $untrusted =~ /([a-z]+)/;
+ $trusted = $1;</code></pre></div>
+ <p>Pour utiliser ceci, les expressions rationnelles de
+ d�contamination doivent �tre incluses dans les requ�tes pr�par�es.
+ L'expression rationnelle doit se situer imm�diatement apr�s le
+ caract�re % dans la requ�te pr�par�e, et doit �tre entour�e
+ d'accolades {}. Par exemple, si votre application attend une entr�e
+ alphanum�rique, vous pouvez utiliser :</p>
+ <div class="example"><p><code>
+ <code>"SELECT foo FROM bar WHERE input = %s"</code>
+ </code></p></div>
+ <p>avec d'autres pilotes, et ne risquer au pire qu'une requ�te
+ �chou�e. Mais avec FreeTDS, vous devez utiliser :</p>
+ <div class="example"><p><code>
+ <code>"SELECT foo FROM bar WHERE input = %{([A-Za-z0-9]+)}s"</code>
+ </code></p></div>
+ <p>tout ce qui ne correspond pas � l'expression rationnelle est
+ alors rejet�, et la requ�te est maintenant s�re.</p>
+ <p>Alternativement, vous pouvez utiliser le pilote ODBC tiers, qui
+ offre la s�curit� des requ�tes pr�par�es authentiques.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_dbd.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_deflate.html.en b/docs/manual/mod/mod_deflate.html.en
index ec74a5f2ac..41852d194b 100644
--- a/docs/manual/mod/mod_deflate.html.en
+++ b/docs/manual/mod/mod_deflate.html.en
@@ -64,172 +64,6 @@ content</a></li>
<li><a href="../filter.html">Filters</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="recommended" id="recommended">Sample Configurations</a></h2>
- <div class="warning"><h3>Compression and TLS</h3>
- <p>Some web applications are vulnerable to an information disclosure
- attack when a TLS connection carries deflate compressed data. For more
- information, review the details of the "BREACH" family of attacks.</p>
- </div>
- <p>This is a simple configuration that compresses common text-based content types.</p>
-
- <div class="example"><h3>Compress only a few types</h3><pre class="prettyprint lang-config">AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript</pre>
-</div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enable" id="enable">Enabling Compression</a></h2>
- <div class="warning"><h3>Compression and TLS</h3>
- <p>Some web applications are vulnerable to an information disclosure
- attack when a TLS connection carries deflate compressed data. For more
- information, review the details of the "BREACH" family of attacks.</p>
- </div>
-
- <h3><a name="output" id="output">Output Compression</a></h3>
- <p>Compression is implemented by the <code>DEFLATE</code>
- <a href="../filter.html">filter</a>. The following directive
- will enable compression for documents in the container where it
- is placed:</p>
-
- <pre class="prettyprint lang-config">SetOutputFilter DEFLATE
-SetEnvIfNoCase Request_URI "\.(?:gif|jpe?g|png)$" no-gzip</pre>
-
-
- <p>If you want to restrict the compression to particular MIME types
- in general, you may use the <code class="directive"><a href="../mod/mod_filter.html#addoutputfilterbytype">AddOutputFilterByType</a></code> directive. Here is an example of
- enabling compression only for the html files of the Apache
- documentation:</p>
-
- <pre class="prettyprint lang-config">&lt;Directory "/your-server-root/manual"&gt;
- AddOutputFilterByType DEFLATE text/html
-&lt;/Directory&gt;</pre>
-
-
- <div class="note"><h3>Note</h3>
- The <code>DEFLATE</code> filter is always inserted after RESOURCE
- filters like PHP or SSI. It never touches internal subrequests.
- </div>
- <div class="note"><h3>Note</h3>
- There is an environment variable <code>force-gzip</code>,
- set via <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code>, which
- will ignore the accept-encoding setting of your browser and will
- send compressed output.
- </div>
-
-
- <h3><a name="inflate" id="inflate">Output Decompression</a></h3>
- <p>The <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> module also provides a filter for
- inflating/uncompressing a gzip compressed response body. In order to activate
- this feature you have to insert the <code>INFLATE</code> filter into
- the output filter chain using <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code> or <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code>, for example:</p>
-
- <pre class="prettyprint lang-config">&lt;Location "/dav-area"&gt;
- ProxyPass "http://example.com/"
- SetOutputFilter INFLATE
-&lt;/Location&gt;</pre>
-
-
- <p>This Example will uncompress gzip'ed output from example.com, so other
- filters can do further processing with it.
- </p>
-
-
- <h3><a name="input" id="input">Input Decompression</a></h3>
- <p>The <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> module also provides a filter for
- decompressing a gzip compressed request body . In order to activate
- this feature you have to insert the <code>DEFLATE</code> filter into
- the input filter chain using <code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code> or <code class="directive"><a href="../mod/mod_mime.html#addinputfilter">AddInputFilter</a></code>, for example:</p>
-
- <pre class="prettyprint lang-config">&lt;Location "/dav-area"&gt;
- SetInputFilter DEFLATE
-&lt;/Location&gt;</pre>
-
-
- <p>Now if a request contains a <code>Content-Encoding:
- gzip</code> header, the body will be automatically decompressed.
- Few browsers have the ability to gzip request bodies. However,
- some special applications actually do support request
- compression, for instance some <a href="http://www.webdav.org">WebDAV</a> clients.</p>
-
- <div class="warning"><h3>Note on Content-Length</h3>
- <p>If you evaluate the request body yourself, <em>don't trust
- the <code>Content-Length</code> header!</em>
- The Content-Length header reflects the length of the
- incoming data from the client and <em>not</em> the byte count of
- the decompressed data stream.</p>
- </div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="proxies" id="proxies">Dealing with proxy servers</a></h2>
-
- <p>The <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> module sends a <code>Vary:
- Accept-Encoding</code> HTTP response header to alert proxies that
- a cached response should be sent only to clients that send the
- appropriate <code>Accept-Encoding</code> request header. This
- prevents compressed content from being sent to a client that will
- not understand it.</p>
-
- <p>If you use some special exclusions dependent
- on, for example, the <code>User-Agent</code> header, you must
- manually configure an addition to the <code>Vary</code> header
- to alert proxies of the additional restrictions. For example,
- in a typical configuration where the addition of the <code>DEFLATE</code>
- filter depends on the <code>User-Agent</code>, you should add:</p>
-
- <pre class="prettyprint lang-config">Header append Vary User-Agent</pre>
-
-
- <p>If your decision about compression depends on other information
- than request headers (<em>e.g.</em> HTTP version), you have to set the
- <code>Vary</code> header to the value <code>*</code>. This prevents
- compliant proxies from caching entirely.</p>
-
- <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">Header set Vary *</pre>
-</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="precompressed" id="precompressed">Serving pre-compressed
-content</a></h2>
-
- <p>Since <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> re-compresses content each
- time a request is made, some performance benefit can be derived by
- pre-compressing the content and telling mod_deflate to serve them
- without re-compressing them. This may be accomplished using a
- configuration like the following:</p>
-
- <pre class="prettyprint lang-config">&lt;IfModule mod_headers.c&gt;
- # Serve gzip compressed CSS files if they exist
- # and the client accepts gzip.
- RewriteCond "%{HTTP:Accept-encoding}" "gzip"
- RewriteCond "%{REQUEST_FILENAME}\.gz" -s
- RewriteRule "^(.*)\.css" "$1\.css\.gz" [QSA]
-
- # Serve gzip compressed JS files if they exist
- # and the client accepts gzip.
- RewriteCond "%{HTTP:Accept-encoding}" "gzip"
- RewriteCond "%{REQUEST_FILENAME}\.gz" -s
- RewriteRule "^(.*)\.js" "$1\.js\.gz" [QSA]
-
-
- # Serve correct content types, and prevent mod_deflate double gzip.
- RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1]
- RewriteRule "\.js\.gz$" "-" [T=text/javascript,E=no-gzip:1]
-
-
- &lt;FilesMatch "(\.js\.gz|\.css\.gz)$"&gt;
- # Serve correct encoding type.
- Header append Content-Encoding gzip
-
- # Force proxies to cache gzipped &amp;
- # non-gzipped css/js files separately.
- Header append Vary Accept-Encoding
- &lt;/FilesMatch&gt;
-&lt;/IfModule&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="DeflateBufferSize" id="DeflateBufferSize">DeflateBufferSize</a> <a name="deflatebuffersize" id="deflatebuffersize">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fragment size to be compressed at one time by zlib</td></tr>
@@ -398,6 +232,172 @@ CustomLog "logs/deflate_log" deflate</pre>
higher the window size, the higher can the compression ratio be expected.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="recommended" id="recommended">Sample Configurations</a></h2>
+ <div class="warning"><h3>Compression and TLS</h3>
+ <p>Some web applications are vulnerable to an information disclosure
+ attack when a TLS connection carries deflate compressed data. For more
+ information, review the details of the "BREACH" family of attacks.</p>
+ </div>
+ <p>This is a simple configuration that compresses common text-based content types.</p>
+
+ <div class="example"><h3>Compress only a few types</h3><pre class="prettyprint lang-config">AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript</pre>
+</div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">Enabling Compression</a></h2>
+ <div class="warning"><h3>Compression and TLS</h3>
+ <p>Some web applications are vulnerable to an information disclosure
+ attack when a TLS connection carries deflate compressed data. For more
+ information, review the details of the "BREACH" family of attacks.</p>
+ </div>
+
+ <h3><a name="output" id="output">Output Compression</a></h3>
+ <p>Compression is implemented by the <code>DEFLATE</code>
+ <a href="../filter.html">filter</a>. The following directive
+ will enable compression for documents in the container where it
+ is placed:</p>
+
+ <pre class="prettyprint lang-config">SetOutputFilter DEFLATE
+SetEnvIfNoCase Request_URI "\.(?:gif|jpe?g|png)$" no-gzip</pre>
+
+
+ <p>If you want to restrict the compression to particular MIME types
+ in general, you may use the <code class="directive"><a href="../mod/mod_filter.html#addoutputfilterbytype">AddOutputFilterByType</a></code> directive. Here is an example of
+ enabling compression only for the html files of the Apache
+ documentation:</p>
+
+ <pre class="prettyprint lang-config">&lt;Directory "/your-server-root/manual"&gt;
+ AddOutputFilterByType DEFLATE text/html
+&lt;/Directory&gt;</pre>
+
+
+ <div class="note"><h3>Note</h3>
+ The <code>DEFLATE</code> filter is always inserted after RESOURCE
+ filters like PHP or SSI. It never touches internal subrequests.
+ </div>
+ <div class="note"><h3>Note</h3>
+ There is an environment variable <code>force-gzip</code>,
+ set via <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code>, which
+ will ignore the accept-encoding setting of your browser and will
+ send compressed output.
+ </div>
+
+
+ <h3><a name="inflate" id="inflate">Output Decompression</a></h3>
+ <p>The <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> module also provides a filter for
+ inflating/uncompressing a gzip compressed response body. In order to activate
+ this feature you have to insert the <code>INFLATE</code> filter into
+ the output filter chain using <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code> or <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code>, for example:</p>
+
+ <pre class="prettyprint lang-config">&lt;Location "/dav-area"&gt;
+ ProxyPass "http://example.com/"
+ SetOutputFilter INFLATE
+&lt;/Location&gt;</pre>
+
+
+ <p>This Example will uncompress gzip'ed output from example.com, so other
+ filters can do further processing with it.
+ </p>
+
+
+ <h3><a name="input" id="input">Input Decompression</a></h3>
+ <p>The <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> module also provides a filter for
+ decompressing a gzip compressed request body . In order to activate
+ this feature you have to insert the <code>DEFLATE</code> filter into
+ the input filter chain using <code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code> or <code class="directive"><a href="../mod/mod_mime.html#addinputfilter">AddInputFilter</a></code>, for example:</p>
+
+ <pre class="prettyprint lang-config">&lt;Location "/dav-area"&gt;
+ SetInputFilter DEFLATE
+&lt;/Location&gt;</pre>
+
+
+ <p>Now if a request contains a <code>Content-Encoding:
+ gzip</code> header, the body will be automatically decompressed.
+ Few browsers have the ability to gzip request bodies. However,
+ some special applications actually do support request
+ compression, for instance some <a href="http://www.webdav.org">WebDAV</a> clients.</p>
+
+ <div class="warning"><h3>Note on Content-Length</h3>
+ <p>If you evaluate the request body yourself, <em>don't trust
+ the <code>Content-Length</code> header!</em>
+ The Content-Length header reflects the length of the
+ incoming data from the client and <em>not</em> the byte count of
+ the decompressed data stream.</p>
+ </div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="proxies" id="proxies">Dealing with proxy servers</a></h2>
+
+ <p>The <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> module sends a <code>Vary:
+ Accept-Encoding</code> HTTP response header to alert proxies that
+ a cached response should be sent only to clients that send the
+ appropriate <code>Accept-Encoding</code> request header. This
+ prevents compressed content from being sent to a client that will
+ not understand it.</p>
+
+ <p>If you use some special exclusions dependent
+ on, for example, the <code>User-Agent</code> header, you must
+ manually configure an addition to the <code>Vary</code> header
+ to alert proxies of the additional restrictions. For example,
+ in a typical configuration where the addition of the <code>DEFLATE</code>
+ filter depends on the <code>User-Agent</code>, you should add:</p>
+
+ <pre class="prettyprint lang-config">Header append Vary User-Agent</pre>
+
+
+ <p>If your decision about compression depends on other information
+ than request headers (<em>e.g.</em> HTTP version), you have to set the
+ <code>Vary</code> header to the value <code>*</code>. This prevents
+ compliant proxies from caching entirely.</p>
+
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">Header set Vary *</pre>
+</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="precompressed" id="precompressed">Serving pre-compressed
+content</a></h2>
+
+ <p>Since <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> re-compresses content each
+ time a request is made, some performance benefit can be derived by
+ pre-compressing the content and telling mod_deflate to serve them
+ without re-compressing them. This may be accomplished using a
+ configuration like the following:</p>
+
+ <pre class="prettyprint lang-config">&lt;IfModule mod_headers.c&gt;
+ # Serve gzip compressed CSS files if they exist
+ # and the client accepts gzip.
+ RewriteCond "%{HTTP:Accept-encoding}" "gzip"
+ RewriteCond "%{REQUEST_FILENAME}\.gz" -s
+ RewriteRule "^(.*)\.css" "$1\.css\.gz" [QSA]
+
+ # Serve gzip compressed JS files if they exist
+ # and the client accepts gzip.
+ RewriteCond "%{HTTP:Accept-encoding}" "gzip"
+ RewriteCond "%{REQUEST_FILENAME}\.gz" -s
+ RewriteRule "^(.*)\.js" "$1\.js\.gz" [QSA]
+
+
+ # Serve correct content types, and prevent mod_deflate double gzip.
+ RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1]
+ RewriteRule "\.js\.gz$" "-" [T=text/javascript,E=no-gzip:1]
+
+
+ &lt;FilesMatch "(\.js\.gz|\.css\.gz)$"&gt;
+ # Serve correct encoding type.
+ Header append Content-Encoding gzip
+
+ # Force proxies to cache gzipped &amp;
+ # non-gzipped css/js files separately.
+ Header append Vary Accept-Encoding
+ &lt;/FilesMatch&gt;
+&lt;/IfModule&gt;</pre>
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_deflate.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_deflate.html.fr b/docs/manual/mod/mod_deflate.html.fr
index 1397ca481d..7e54334111 100644
--- a/docs/manual/mod/mod_deflate.html.fr
+++ b/docs/manual/mod/mod_deflate.html.fr
@@ -63,148 +63,6 @@ client</td></tr>
<li><a href="../filter.html">Les filtres</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="recommended" id="recommended">Exemples de configurations</a></h2>
- <div class="warning"><h3>Compression et TLS</h3>
- <p>Certaines applications web sont vuln�rables aux attaques
- visant le vol d'information lorsqu'une connexion TLS transmet
- des donn�es compress�es par deflate. Pour plus de d�tails,
- �tudiez les attaques de la famille "BREACH".</p>
- </div>
- <p>Voici une configuration simple qui comprime les contenus � base
- de texte courants.</p>
-
- <div class="example"><h3>Ne comprime que certains types de documents</h3><pre class="prettyprint lang-config">AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript</pre>
-</div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enable" id="enable">Activation de la compression</a></h2>
-
- <div class="warning"><h3>Compression et TLS</h3>
- <p>Certaines applications web sont vuln�rables aux attaques pour
- vol d'information lorsque la connexion TLS transmet des donn�es
- compress�es par deflate. Pour plus d'informations, voir en
- d�tails la famille d'attaques de type "BREACH".</p>
- </div>
-
- <h3><a name="output" id="output">Compression de la sortie</a></h3>
- <p>La compression est impl�ment�e par le <a href="../filter.html">filtre</a> <code>DEFLATE</code>. La
- directive suivante active la compression des documents dans le
- conteneur o� elle est plac�e :</p>
-
- <pre class="prettyprint lang-config">SetOutputFilter DEFLATE
-SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip</pre>
-
-
- <p>Si vous voulez limiter la compression � certains types MIME
- particuliers, vous pouvez utiliser la directive <code class="directive"><a href="../mod/mod_filter.html#addoutputfilterbytype">AddOutputFilterByType</a></code>. Voici un exemple
- o� la compression n'est activ�e que pour les fichiers html de la
- documentation d'Apache :</p>
-
- <pre class="prettyprint lang-config">&lt;Directory "/your-server-root/manual"&gt;
- AddOutputFilterByType DEFLATE text/html
-&lt;/Directory&gt;</pre>
-
-
- <div class="note"><h3>Note</h3>
- Le filtre <code>DEFLATE</code> est toujours ins�r� apr�s les
- filtres RESOURCE comme PHP ou SSI. Il n'affecte jamais les
- sous-requ�tes internes.
- </div>
- <div class="note"><h3>Note</h3>
- La variable d'environnement <code>force-gzip</code>, d�finie �
- l'aide de la directive <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code>, permet d'ignorer la
- configuration de votre navigateur quant aux codages accept�s, et
- d'envoyer sans condition une sortie comprim�e.
- </div>
-
-
- <h3><a name="inflate" id="inflate">D�compression de la sortie</a></h3>
- <p>Le module <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> fournit aussi un filtre
- permettant de d�comprimer un corps de r�ponse comprim� par gzip.
- Pour activer cette fonctionnalit�, vous devez ins�rer le filtre
- <code>INFLATE</code> dans la cha�ne de filtrage en sortie via la
- directive <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code> ou
- <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code>, comme
- dans l'exemple suivant :</p>
-
- <pre class="prettyprint lang-config">&lt;Location /dav-area&gt;
- ProxyPass http://example.com/
- SetOutputFilter INFLATE
-&lt;/Location&gt;</pre>
-
-
- <p>Dans cet exemple, les sorties comprim�es par gzip en
- provenance de example.com seront d�comprim�es afin de pouvoir
- �tre �ventuellement trait�es par d'autres filtres.
- </p>
-
-
- <h3><a name="input" id="input">D�compression de l'entr�e</a></h3>
- <p>Le module <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> fournit �galement un filtre
- permettant de d�comprimer un corps de requ�te comprim� par gzip.
- Pour activer cette fonctionnalit�, vous devez ins�rer le filtre
- <code>DEFLATE</code> dans la cha�ne de filtrage en entr�e via la
- directive <code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code> ou
- <code class="directive"><a href="../mod/mod_mime.html#addinputfilter">AddInputFilter</a></code>, comme
- dans l'exemple suivant :</p>
-
- <pre class="prettyprint lang-config">&lt;Location /dav-area&gt;
- SetInputFilter DEFLATE
-&lt;/Location&gt;</pre>
-
-
- <p>D�sormais, si une requ�te contient un en-t�te
- <code>Content-Encoding: gzip</code>, son corps sera
- automatiquement d�comprim�. Peu de navigateurs sont actuellement
- en mesure de comprimer les corps de requ�tes. Cependant,
- certaines applications sp�cialis�es supportent les requ�tes
- comprim�es, comme par exemple certains clients <a href="http://www.webdav.org">WebDAV</a>.</p>
-
- <div class="warning"><h3>Note � propos de l'en-t�te
- <code>Content-Length</code></h3>
- <p>Si vous �valuez vous-m�me la taille du corps de requ�te,
- <em>ne faites pas confiance � l'en-t�te
- <code>Content-Length</code>!</em> L'en-t�te
- Content-Length indique la longueur des donn�es en provenance du
- client, et <em>non</em> la quantit� d'octets que repr�sente le
- flux de donn�es d�compress�.</p>
- </div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="proxies" id="proxies">Prise en compte des serveurs mandataires</a></h2>
-
- <p>Le module <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> envoie un en-t�te de
- r�ponse HTTP <code>Vary: Accept-Encoding</code> pour avertir les
- mandataires qu'une r�ponse enregistr�e dans le cache ne doit �tre
- envoy�e qu'aux clients qui ont envoy� l'en-t�te de requ�te
- <code>Accept-Encoding</code> appropri�. Ceci permet d'�viter l'envoi
- d'un contenu comprim� � un client qui ne sera pas en mesure
- de l'interpr�ter.</p>
-
- <p>Si vous avez d�fini des exclusions sp�cifiques d�pendant, par
- exemple, de l'en-t�te <code>User-Agent</code>, vous devez
- ajouter manuellement des donn�es � l'en-t�te <code>Vary</code> afin
- d'informer les mandataires des restrictions suppl�mentaires. Par
- exemple, dans la configuration classique o� l'addition du filtre
- <code>DEFLATE</code> d�pend du contenu de l'en-t�te
- <code>User-Agent</code>, vous devez sp�cifier :</p>
-
- <pre class="prettyprint lang-config">Header append Vary User-Agent</pre>
-
-
- <p>Si votre d�cision de comprimer le contenu d�pend d'autres
- informations que celles contenues dans les en-t�tes de la requ�te
- (par exemple la version HTTP), vous devez attribuer � l'en-t�te
- <code>Vary</code> la valeur <code>*</code>, ce qui permet d'emp�cher
- les mandataires compatibles de tout mettre en cache.</p>
-
- <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">Header set Vary *</pre>
-</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="deflatebuffersize" id="deflatebuffersize">Directive</a> <a name="DeflateBufferSize" id="DeflateBufferSize">DeflateBufferSize</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Taille du fragment que zlib devra comprimer en une seule
@@ -390,6 +248,148 @@ compression</td></tr>
grand sera le taux de compression auquel on pourra s'attendre.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="recommended" id="recommended">Exemples de configurations</a></h2>
+ <div class="warning"><h3>Compression et TLS</h3>
+ <p>Certaines applications web sont vuln�rables aux attaques
+ visant le vol d'information lorsqu'une connexion TLS transmet
+ des donn�es compress�es par deflate. Pour plus de d�tails,
+ �tudiez les attaques de la famille "BREACH".</p>
+ </div>
+ <p>Voici une configuration simple qui comprime les contenus � base
+ de texte courants.</p>
+
+ <div class="example"><h3>Ne comprime que certains types de documents</h3><pre class="prettyprint lang-config">AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript</pre>
+</div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">Activation de la compression</a></h2>
+
+ <div class="warning"><h3>Compression et TLS</h3>
+ <p>Certaines applications web sont vuln�rables aux attaques pour
+ vol d'information lorsque la connexion TLS transmet des donn�es
+ compress�es par deflate. Pour plus d'informations, voir en
+ d�tails la famille d'attaques de type "BREACH".</p>
+ </div>
+
+ <h3><a name="output" id="output">Compression de la sortie</a></h3>
+ <p>La compression est impl�ment�e par le <a href="../filter.html">filtre</a> <code>DEFLATE</code>. La
+ directive suivante active la compression des documents dans le
+ conteneur o� elle est plac�e :</p>
+
+ <pre class="prettyprint lang-config">SetOutputFilter DEFLATE
+SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip</pre>
+
+
+ <p>Si vous voulez limiter la compression � certains types MIME
+ particuliers, vous pouvez utiliser la directive <code class="directive"><a href="../mod/mod_filter.html#addoutputfilterbytype">AddOutputFilterByType</a></code>. Voici un exemple
+ o� la compression n'est activ�e que pour les fichiers html de la
+ documentation d'Apache :</p>
+
+ <pre class="prettyprint lang-config">&lt;Directory "/your-server-root/manual"&gt;
+ AddOutputFilterByType DEFLATE text/html
+&lt;/Directory&gt;</pre>
+
+
+ <div class="note"><h3>Note</h3>
+ Le filtre <code>DEFLATE</code> est toujours ins�r� apr�s les
+ filtres RESOURCE comme PHP ou SSI. Il n'affecte jamais les
+ sous-requ�tes internes.
+ </div>
+ <div class="note"><h3>Note</h3>
+ La variable d'environnement <code>force-gzip</code>, d�finie �
+ l'aide de la directive <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code>, permet d'ignorer la
+ configuration de votre navigateur quant aux codages accept�s, et
+ d'envoyer sans condition une sortie comprim�e.
+ </div>
+
+
+ <h3><a name="inflate" id="inflate">D�compression de la sortie</a></h3>
+ <p>Le module <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> fournit aussi un filtre
+ permettant de d�comprimer un corps de r�ponse comprim� par gzip.
+ Pour activer cette fonctionnalit�, vous devez ins�rer le filtre
+ <code>INFLATE</code> dans la cha�ne de filtrage en sortie via la
+ directive <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code> ou
+ <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code>, comme
+ dans l'exemple suivant :</p>
+
+ <pre class="prettyprint lang-config">&lt;Location /dav-area&gt;
+ ProxyPass http://example.com/
+ SetOutputFilter INFLATE
+&lt;/Location&gt;</pre>
+
+
+ <p>Dans cet exemple, les sorties comprim�es par gzip en
+ provenance de example.com seront d�comprim�es afin de pouvoir
+ �tre �ventuellement trait�es par d'autres filtres.
+ </p>
+
+
+ <h3><a name="input" id="input">D�compression de l'entr�e</a></h3>
+ <p>Le module <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> fournit �galement un filtre
+ permettant de d�comprimer un corps de requ�te comprim� par gzip.
+ Pour activer cette fonctionnalit�, vous devez ins�rer le filtre
+ <code>DEFLATE</code> dans la cha�ne de filtrage en entr�e via la
+ directive <code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code> ou
+ <code class="directive"><a href="../mod/mod_mime.html#addinputfilter">AddInputFilter</a></code>, comme
+ dans l'exemple suivant :</p>
+
+ <pre class="prettyprint lang-config">&lt;Location /dav-area&gt;
+ SetInputFilter DEFLATE
+&lt;/Location&gt;</pre>
+
+
+ <p>D�sormais, si une requ�te contient un en-t�te
+ <code>Content-Encoding: gzip</code>, son corps sera
+ automatiquement d�comprim�. Peu de navigateurs sont actuellement
+ en mesure de comprimer les corps de requ�tes. Cependant,
+ certaines applications sp�cialis�es supportent les requ�tes
+ comprim�es, comme par exemple certains clients <a href="http://www.webdav.org">WebDAV</a>.</p>
+
+ <div class="warning"><h3>Note � propos de l'en-t�te
+ <code>Content-Length</code></h3>
+ <p>Si vous �valuez vous-m�me la taille du corps de requ�te,
+ <em>ne faites pas confiance � l'en-t�te
+ <code>Content-Length</code>!</em> L'en-t�te
+ Content-Length indique la longueur des donn�es en provenance du
+ client, et <em>non</em> la quantit� d'octets que repr�sente le
+ flux de donn�es d�compress�.</p>
+ </div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="proxies" id="proxies">Prise en compte des serveurs mandataires</a></h2>
+
+ <p>Le module <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> envoie un en-t�te de
+ r�ponse HTTP <code>Vary: Accept-Encoding</code> pour avertir les
+ mandataires qu'une r�ponse enregistr�e dans le cache ne doit �tre
+ envoy�e qu'aux clients qui ont envoy� l'en-t�te de requ�te
+ <code>Accept-Encoding</code> appropri�. Ceci permet d'�viter l'envoi
+ d'un contenu comprim� � un client qui ne sera pas en mesure
+ de l'interpr�ter.</p>
+
+ <p>Si vous avez d�fini des exclusions sp�cifiques d�pendant, par
+ exemple, de l'en-t�te <code>User-Agent</code>, vous devez
+ ajouter manuellement des donn�es � l'en-t�te <code>Vary</code> afin
+ d'informer les mandataires des restrictions suppl�mentaires. Par
+ exemple, dans la configuration classique o� l'addition du filtre
+ <code>DEFLATE</code> d�pend du contenu de l'en-t�te
+ <code>User-Agent</code>, vous devez sp�cifier :</p>
+
+ <pre class="prettyprint lang-config">Header append Vary User-Agent</pre>
+
+
+ <p>Si votre d�cision de comprimer le contenu d�pend d'autres
+ informations que celles contenues dans les en-t�tes de la requ�te
+ (par exemple la version HTTP), vous devez attribuer � l'en-t�te
+ <code>Vary</code> la valeur <code>*</code>, ce qui permet d'emp�cher
+ les mandataires compatibles de tout mettre en cache.</p>
+
+ <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">Header set Vary *</pre>
+</div>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_deflate.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_deflate.html.ja.utf8 b/docs/manual/mod/mod_deflate.html.ja.utf8
index 481f835015..ef35210b7a 100644
--- a/docs/manual/mod/mod_deflate.html.ja.utf8
+++ b/docs/manual/mod/mod_deflate.html.ja.utf8
@@ -64,6 +64,166 @@
<li><a href="../filter.html">Filters</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DeflateBufferSize" id="DeflateBufferSize">DeflateBufferSize</a> <a name="deflatebuffersize" id="deflatebuffersize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>zlib が一度に圧縮する塊の大きさ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateBufferSize <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DeflateBufferSize 8096</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+</table>
+ <p><code class="directive">DeflateBufferSize</code> ディレクティブは
+ zlib が一度に圧縮する塊の大きさをバイト単位で指定します。</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="DeflateCompressionLevel" id="DeflateCompressionLevel">DeflateCompressionLevel</a> <a name="deflatecompressionlevel" id="deflatecompressionlevel">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>出力に対して行なう圧縮の程度</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateCompressionLevel <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Zlib のデフォルト</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>This directive is available since Apache 2.0.45</td></tr>
+</table>
+ <p><code class="directive">DeflateCompressionLevel</code> ディレクティブは
+ 圧縮の程度を設定します。大きな値では、より圧縮が行なわれますが、
+ CPU 資源を消費します。</p>
+ <p>値は 1 (低圧縮) から 9 (高圧縮) です。</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="DeflateFilterNote" id="DeflateFilterNote">DeflateFilterNote</a> <a name="deflatefilternote" id="deflatefilternote">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ロギング用に圧縮比をメモに追加</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateFilterNote [<var>type</var>] <var>notename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td><var>type</var> is available since Apache 2.0.45</td></tr>
+</table>
+ <p><code class="directive">DeflateFilterNote</code> ディレクティブは
+ 圧縮比に関するメモがリクエストに付加されることを指定します。
+ メモ (note) の名前はディレクティブに指定された値です。
+ メモは<a href="../logs.html#accesslog">アクセスログ</a>に
+ 値を記録し、統計を取る目的にも使えます。</p>
+
+ <div class="example"><h3>例</h3><p><code>
+ DeflateFilterNote ratio<br />
+ <br />
+ LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate<br />
+ CustomLog logs/deflate_log deflate
+ </code></p></div>
+
+ <p>ログからもっと精密な値を抽出したい場合は、<var>type</var>
+ 引数を使用して、データタイプをログのメモとして残すように指定できます。
+ <var>type</var> は次のうちの一つです。</p>
+
+ <dl>
+ <dt><code>Input</code></dt>
+ <dd>フィルタの入力ストリームのバイトカウントをメモに保存する。</dd>
+
+ <dt><code>Output</code></dt>
+ <dd>フィルタの出力ストリームのバイトカウントをメモに保存する。</dd>
+
+ <dt><code>Ratio</code></dt>
+ <dd>圧縮率 (<code>出力 / 入力 * 100</code>) をメモに保存する。
+ <var>type</var> 引数を省略した場合は、これがデフォルトとなります。</dd>
+ </dl>
+
+ <p>まとめると、次のようにログを取ることになるでしょう。</p>
+
+ <div class="example"><h3>精密なログ採取</h3><p><code>
+ DeflateFilterNote Input instream<br />
+ DeflateFilterNote Output outstream<br />
+ DeflateFilterNote Ratio ratio<br />
+ <br />
+ LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate<br />
+ CustomLog logs/deflate_log deflate
+ </code></p></div>
+
+<h3>参照</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DeflateInflateLimitRequestBody" id="DeflateInflateLimitRequestBody">DeflateInflateLimitRequestBody</a> <a name="deflateinflatelimitrequestbody" id="deflateinflatelimitrequestbody">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Maximum size of inflated request bodies</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateInflateLimitRequestBody<var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>None, but LimitRequestBody applies after deflation</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.4.10 and later</td></tr>
+</table><p>このディレクティブの解説文書は
+ まだ翻訳されていません。英語版をご覧ください。
+ </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="DeflateInflateRatioBurst" id="DeflateInflateRatioBurst">DeflateInflateRatioBurst</a> <a name="deflateinflateratioburst" id="deflateinflateratioburst">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Maximum number of times the inflation ratio for request bodies
+ can be crossed</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateInflateRatioBurst <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>3</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.4.10 and later</td></tr>
+</table><p>このディレクティブの解説文書は
+ まだ翻訳されていません。英語版をご覧ください。
+ </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="DeflateInflateRatioLimit" id="DeflateInflateRatioLimit">DeflateInflateRatioLimit</a> <a name="deflateinflateratiolimit" id="deflateinflateratiolimit">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Maximum inflation ratio for request bodies</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateInflateRatioLimit <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>200</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.4.10 and later</td></tr>
+</table><p>このディレクティブの解説文書は
+ まだ翻訳されていません。英語版をご覧ください。
+ </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="DeflateMemLevel" id="DeflateMemLevel">DeflateMemLevel</a> <a name="deflatememlevel" id="deflatememlevel">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>zlib が圧縮に使うメモリのレベルを指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateMemLevel <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DeflateMemLevel 9</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+</table>
+ <p><code class="directive">DeflateMemLevel</code> ディレクティブは
+ zlib が圧縮に使うメモリのレベルを設定します (1 から 9 の間の値)。
+ (訳注: 2 を底とする対数の値になります。
+ 8 程度が良いでしょう。)</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="DeflateWindowSize" id="DeflateWindowSize">DeflateWindowSize</a> <a name="deflatewindowsize" id="deflatewindowsize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Zlib の圧縮用ウィンドウの大きさ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateWindowSize <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DeflateWindowSize 15</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+</table>
+ <p><code class="directive">DeflateWindowSize</code> ディレクティブは
+ zlib の圧縮用ウィンドウ (訳注: zlib で使用される履歴バッファ)
+ の大きさを指定します (1 から 15 の間の値)。
+ 一般的に大きなウィンドウサイズを使用すると圧縮率が向上します。
+ (訳注: 2 を底とする対数の値になります。
+ 8 から 15 にするのが良いでしょう。)</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="recommended" id="recommended">サンプル設定</a></h2>
<p>下にせっかちな人向けの簡単な設定例を示します。</p>
@@ -258,166 +418,6 @@
Header set Vary *
</code></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="DeflateBufferSize" id="DeflateBufferSize">DeflateBufferSize</a> <a name="deflatebuffersize" id="deflatebuffersize">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>zlib が一度に圧縮する塊の大きさ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateBufferSize <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DeflateBufferSize 8096</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
-</table>
- <p><code class="directive">DeflateBufferSize</code> ディレクティブは
- zlib が一度に圧縮する塊の大きさをバイト単位で指定します。</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="DeflateCompressionLevel" id="DeflateCompressionLevel">DeflateCompressionLevel</a> <a name="deflatecompressionlevel" id="deflatecompressionlevel">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>出力に対して行なう圧縮の程度</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateCompressionLevel <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Zlib のデフォルト</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>This directive is available since Apache 2.0.45</td></tr>
-</table>
- <p><code class="directive">DeflateCompressionLevel</code> ディレクティブは
- 圧縮の程度を設定します。大きな値では、より圧縮が行なわれますが、
- CPU 資源を消費します。</p>
- <p>値は 1 (低圧縮) から 9 (高圧縮) です。</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="DeflateFilterNote" id="DeflateFilterNote">DeflateFilterNote</a> <a name="deflatefilternote" id="deflatefilternote">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ロギング用に圧縮比をメモに追加</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateFilterNote [<var>type</var>] <var>notename</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td><var>type</var> is available since Apache 2.0.45</td></tr>
-</table>
- <p><code class="directive">DeflateFilterNote</code> ディレクティブは
- 圧縮比に関するメモがリクエストに付加されることを指定します。
- メモ (note) の名前はディレクティブに指定された値です。
- メモは<a href="../logs.html#accesslog">アクセスログ</a>に
- 値を記録し、統計を取る目的にも使えます。</p>
-
- <div class="example"><h3>例</h3><p><code>
- DeflateFilterNote ratio<br />
- <br />
- LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate<br />
- CustomLog logs/deflate_log deflate
- </code></p></div>
-
- <p>ログからもっと精密な値を抽出したい場合は、<var>type</var>
- 引数を使用して、データタイプをログのメモとして残すように指定できます。
- <var>type</var> は次のうちの一つです。</p>
-
- <dl>
- <dt><code>Input</code></dt>
- <dd>フィルタの入力ストリームのバイトカウントをメモに保存する。</dd>
-
- <dt><code>Output</code></dt>
- <dd>フィルタの出力ストリームのバイトカウントをメモに保存する。</dd>
-
- <dt><code>Ratio</code></dt>
- <dd>圧縮率 (<code>出力 / 入力 * 100</code>) をメモに保存する。
- <var>type</var> 引数を省略した場合は、これがデフォルトとなります。</dd>
- </dl>
-
- <p>まとめると、次のようにログを取ることになるでしょう。</p>
-
- <div class="example"><h3>精密なログ採取</h3><p><code>
- DeflateFilterNote Input instream<br />
- DeflateFilterNote Output outstream<br />
- DeflateFilterNote Ratio ratio<br />
- <br />
- LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate<br />
- CustomLog logs/deflate_log deflate
- </code></p></div>
-
-<h3>参照</h3>
-<ul>
-<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DeflateInflateLimitRequestBody" id="DeflateInflateLimitRequestBody">DeflateInflateLimitRequestBody</a> <a name="deflateinflatelimitrequestbody" id="deflateinflatelimitrequestbody">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Maximum size of inflated request bodies</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateInflateLimitRequestBody<var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>None, but LimitRequestBody applies after deflation</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>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.4.10 and later</td></tr>
-</table><p>このディレクティブの解説文書は
- まだ翻訳されていません。英語版をご覧ください。
- </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="DeflateInflateRatioBurst" id="DeflateInflateRatioBurst">DeflateInflateRatioBurst</a> <a name="deflateinflateratioburst" id="deflateinflateratioburst">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Maximum number of times the inflation ratio for request bodies
- can be crossed</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateInflateRatioBurst <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>3</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>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.4.10 and later</td></tr>
-</table><p>このディレクティブの解説文書は
- まだ翻訳されていません。英語版をご覧ください。
- </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="DeflateInflateRatioLimit" id="DeflateInflateRatioLimit">DeflateInflateRatioLimit</a> <a name="deflateinflateratiolimit" id="deflateinflateratiolimit">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Maximum inflation ratio for request bodies</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateInflateRatioLimit <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>200</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>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.4.10 and later</td></tr>
-</table><p>このディレクティブの解説文書は
- まだ翻訳されていません。英語版をご覧ください。
- </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="DeflateMemLevel" id="DeflateMemLevel">DeflateMemLevel</a> <a name="deflatememlevel" id="deflatememlevel">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>zlib が圧縮に使うメモリのレベルを指定</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateMemLevel <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DeflateMemLevel 9</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
-</table>
- <p><code class="directive">DeflateMemLevel</code> ディレクティブは
- zlib が圧縮に使うメモリのレベルを設定します (1 から 9 の間の値)。
- (訳注: 2 を底とする対数の値になります。
- 8 程度が良いでしょう。)</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="DeflateWindowSize" id="DeflateWindowSize">DeflateWindowSize</a> <a name="deflatewindowsize" id="deflatewindowsize">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Zlib の圧縮用ウィンドウの大きさ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateWindowSize <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DeflateWindowSize 15</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
-</table>
- <p><code class="directive">DeflateWindowSize</code> ディレクティブは
- zlib の圧縮用ウィンドウ (訳注: zlib で使用される履歴バッファ)
- の大きさを指定します (1 から 15 の間の値)。
- 一般的に大きなウィンドウサイズを使用すると圧縮率が向上します。
- (訳注: 2 を底とする対数の値になります。
- 8 から 15 にするのが良いでしょう。)</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_deflate.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_deflate.html.ko.euc-kr b/docs/manual/mod/mod_deflate.html.ko.euc-kr
index bcf266f318..5529f23fe0 100644
--- a/docs/manual/mod/mod_deflate.html.ko.euc-kr
+++ b/docs/manual/mod/mod_deflate.html.ko.euc-kr
@@ -62,6 +62,160 @@
<li><a href="../filter.html">����</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DeflateBufferSize" id="DeflateBufferSize">DeflateBufferSize</a> <a name="deflatebuffersize" id="deflatebuffersize">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>zlib�� �ѹ��� ������ ũ��</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateBufferSize <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>DeflateBufferSize 8096</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
+</table>
+ <p><code class="directive">DeflateBufferSize</code> ���þ�� zlib��
+ �ѹ��� ������ ����Ʈ���� �����Ѵ�.</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="DeflateCompressionLevel" id="DeflateCompressionLevel">DeflateCompressionLevel</a> <a name="deflatecompressionlevel" id="deflatecompressionlevel">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>����� ������� �����ϴ°�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateCompressionLevel <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>Zlib's default</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td>����ġ 2.0.45 ����</td></tr>
+</table>
+ <p><code class="directive">DeflateCompressionLevel</code> ���þ��
+ ����� ��������� �����Ѵ�. ���� Ŭ���� ������� ����������,
+ CPU�� �� ���� ����Ѵ�.</p>
+ <p>(���� �� ����) 1�� (���� ���� ����) 9 ������ ���� �����Ѵ�.</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="DeflateFilterNote" id="DeflateFilterNote">DeflateFilterNote</a> <a name="deflatefilternote" id="deflatefilternote">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>������� �α׿� ����Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateFilterNote [<var>type</var>] <var>notename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td><var>type</var>�� ����ġ 2.0.4 ����</td></tr>
+</table>
+ <p><code class="directive">DeflateFilterNote</code> ���þ�� ��û��
+ ������� �α׿� ����ϴ� ��ȣ�� �����Ѵ�. ��ȣ �̸��� ���þ��
+ ������ ���̴�. ��踦 ���� <a href="../logs.html#accesslog">����
+ �α�</a>���� ��ȣ�� ����� �� �ִ�.</p>
+
+ <div class="example"><h3>����</h3><p><code>
+ DeflateFilterNote ratio<br />
+ <br />
+ LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate<br />
+ CustomLog logs/deflate_log deflate
+ </code></p></div>
+
+ <p>�α׿��� �� ��Ȯ�� ���� �����Ϸ��� <var>type</var> �ƱԸ�Ʈ��
+ ����� �ڷḦ �����Ѵ�. <var>type</var>�� ������ �ϳ��̴�:</p>
+
+ <dl>
+ <dt><code>Input</code></dt>
+ <dd>���� �Է½�Ʈ���� ����Ʈ���� �����Ѵ�.</dd>
+
+ <dt><code>Output</code></dt>
+ <dd>���� ��½�Ʈ���� ����Ʈ���� �����Ѵ�..</dd>
+
+ <dt><code>Ratio</code></dt>
+ <dd>������� (<code>output/input * 100</code>) �����Ѵ�.
+ <var>type</var> �ƱԸ�Ʈ�� �����ϸ� ����ϴ� �⺻���̴�.</dd>
+ </dl>
+
+ <p>�׷��� �̷��� �α׿� ����� �� �ִ�:</p>
+
+ <div class="example"><h3>������ �α�</h3><p><code>
+ DeflateFilterNote Input instream<br />
+ DeflateFilterNote Output outstream<br />
+ DeflateFilterNote Ratio ratio<br />
+ <br />
+ LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate<br />
+ CustomLog logs/deflate_log deflate
+ </code></p></div>
+
+<h3>����</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DeflateInflateLimitRequestBody" id="DeflateInflateLimitRequestBody">DeflateInflateLimitRequestBody</a> <a name="deflateinflatelimitrequestbody" id="deflateinflatelimitrequestbody">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>Maximum size of inflated request bodies</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateInflateLimitRequestBody<var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>None, but LimitRequestBody applies after deflation</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td>2.4.10 and later</td></tr>
+</table><p>The documentation for this directive has
+ not been translated yet. Please have a look at the English
+ version.</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="DeflateInflateRatioBurst" id="DeflateInflateRatioBurst">DeflateInflateRatioBurst</a> <a name="deflateinflateratioburst" id="deflateinflateratioburst">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>Maximum number of times the inflation ratio for request bodies
+ can be crossed</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateInflateRatioBurst <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>3</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td>2.4.10 and later</td></tr>
+</table><p>The documentation for this directive has
+ not been translated yet. Please have a look at the English
+ version.</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="DeflateInflateRatioLimit" id="DeflateInflateRatioLimit">DeflateInflateRatioLimit</a> <a name="deflateinflateratiolimit" id="deflateinflateratiolimit">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>Maximum inflation ratio for request bodies</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateInflateRatioLimit <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>200</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td>2.4.10 and later</td></tr>
+</table><p>The documentation for this directive has
+ not been translated yet. Please have a look at the English
+ version.</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="DeflateMemLevel" id="DeflateMemLevel">DeflateMemLevel</a> <a name="deflatememlevel" id="deflatememlevel">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>zlib�� �����Ҷ� ����ϴ� �޸𸮷�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateMemLevel <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>DeflateMemLevel 9</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
+</table>
+ <p><code class="directive">DeflateMemLevel</code> ���þ�� zlib��
+ �����Ҷ� �󸶸�ŭ �޸𸮸� ������� �����Ѵ�. (1�� 9 ������
+ ��)</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="DeflateWindowSize" id="DeflateWindowSize">DeflateWindowSize</a> <a name="deflatewindowsize" id="deflatewindowsize">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>Zlib ���� window size</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateWindowSize <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>DeflateWindowSize 15</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
+</table>
+ <p><code class="directive">DeflateWindowSize</code> ���þ�� zlib
+ ���� window size�� (1�� 15 ������ ��) �����Ѵ�. �Ϲ�������
+ window size�� Ŭ���� ������� �����Ѵ�.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="recommended" id="recommended">�ߺ� ����</a></h2>
<p>���� ����� ���� �ߺ� �����̴�.</p>
@@ -250,160 +404,6 @@
Header set Vary *
</code></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="DeflateBufferSize" id="DeflateBufferSize">DeflateBufferSize</a> <a name="deflatebuffersize" id="deflatebuffersize">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>zlib�� �ѹ��� ������ ũ��</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateBufferSize <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>DeflateBufferSize 8096</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
-</table>
- <p><code class="directive">DeflateBufferSize</code> ���þ�� zlib��
- �ѹ��� ������ ����Ʈ���� �����Ѵ�.</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="DeflateCompressionLevel" id="DeflateCompressionLevel">DeflateCompressionLevel</a> <a name="deflatecompressionlevel" id="deflatecompressionlevel">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>����� ������� �����ϴ°�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateCompressionLevel <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>Zlib's default</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td>����ġ 2.0.45 ����</td></tr>
-</table>
- <p><code class="directive">DeflateCompressionLevel</code> ���þ��
- ����� ��������� �����Ѵ�. ���� Ŭ���� ������� ����������,
- CPU�� �� ���� ����Ѵ�.</p>
- <p>(���� �� ����) 1�� (���� ���� ����) 9 ������ ���� �����Ѵ�.</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="DeflateFilterNote" id="DeflateFilterNote">DeflateFilterNote</a> <a name="deflatefilternote" id="deflatefilternote">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>������� �α׿� ����Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateFilterNote [<var>type</var>] <var>notename</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td><var>type</var>�� ����ġ 2.0.4 ����</td></tr>
-</table>
- <p><code class="directive">DeflateFilterNote</code> ���þ�� ��û��
- ������� �α׿� ����ϴ� ��ȣ�� �����Ѵ�. ��ȣ �̸��� ���þ��
- ������ ���̴�. ��踦 ���� <a href="../logs.html#accesslog">����
- �α�</a>���� ��ȣ�� ����� �� �ִ�.</p>
-
- <div class="example"><h3>����</h3><p><code>
- DeflateFilterNote ratio<br />
- <br />
- LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate<br />
- CustomLog logs/deflate_log deflate
- </code></p></div>
-
- <p>�α׿��� �� ��Ȯ�� ���� �����Ϸ��� <var>type</var> �ƱԸ�Ʈ��
- ����� �ڷḦ �����Ѵ�. <var>type</var>�� ������ �ϳ��̴�:</p>
-
- <dl>
- <dt><code>Input</code></dt>
- <dd>���� �Է½�Ʈ���� ����Ʈ���� �����Ѵ�.</dd>
-
- <dt><code>Output</code></dt>
- <dd>���� ��½�Ʈ���� ����Ʈ���� �����Ѵ�..</dd>
-
- <dt><code>Ratio</code></dt>
- <dd>������� (<code>output/input * 100</code>) �����Ѵ�.
- <var>type</var> �ƱԸ�Ʈ�� �����ϸ� ����ϴ� �⺻���̴�.</dd>
- </dl>
-
- <p>�׷��� �̷��� �α׿� ����� �� �ִ�:</p>
-
- <div class="example"><h3>������ �α�</h3><p><code>
- DeflateFilterNote Input instream<br />
- DeflateFilterNote Output outstream<br />
- DeflateFilterNote Ratio ratio<br />
- <br />
- LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate<br />
- CustomLog logs/deflate_log deflate
- </code></p></div>
-
-<h3>����</h3>
-<ul>
-<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DeflateInflateLimitRequestBody" id="DeflateInflateLimitRequestBody">DeflateInflateLimitRequestBody</a> <a name="deflateinflatelimitrequestbody" id="deflateinflatelimitrequestbody">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>Maximum size of inflated request bodies</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateInflateLimitRequestBody<var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>None, but LimitRequestBody applies after deflation</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>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td>2.4.10 and later</td></tr>
-</table><p>The documentation for this directive has
- not been translated yet. Please have a look at the English
- version.</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="DeflateInflateRatioBurst" id="DeflateInflateRatioBurst">DeflateInflateRatioBurst</a> <a name="deflateinflateratioburst" id="deflateinflateratioburst">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>Maximum number of times the inflation ratio for request bodies
- can be crossed</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateInflateRatioBurst <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>3</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>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td>2.4.10 and later</td></tr>
-</table><p>The documentation for this directive has
- not been translated yet. Please have a look at the English
- version.</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="DeflateInflateRatioLimit" id="DeflateInflateRatioLimit">DeflateInflateRatioLimit</a> <a name="deflateinflateratiolimit" id="deflateinflateratiolimit">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>Maximum inflation ratio for request bodies</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateInflateRatioLimit <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>200</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>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td>2.4.10 and later</td></tr>
-</table><p>The documentation for this directive has
- not been translated yet. Please have a look at the English
- version.</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="DeflateMemLevel" id="DeflateMemLevel">DeflateMemLevel</a> <a name="deflatememlevel" id="deflatememlevel">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>zlib�� �����Ҷ� ����ϴ� �޸𸮷�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateMemLevel <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>DeflateMemLevel 9</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
-</table>
- <p><code class="directive">DeflateMemLevel</code> ���þ�� zlib��
- �����Ҷ� �󸶸�ŭ �޸𸮸� ������� �����Ѵ�. (1�� 9 ������
- ��)</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="DeflateWindowSize" id="DeflateWindowSize">DeflateWindowSize</a> <a name="deflatewindowsize" id="deflatewindowsize">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>Zlib ���� window size</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>DeflateWindowSize <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>DeflateWindowSize 15</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_deflate</td></tr>
-</table>
- <p><code class="directive">DeflateWindowSize</code> ���þ�� zlib
- ���� window size�� (1�� 15 ������ ��) �����Ѵ�. �Ϲ�������
- window size�� Ŭ���� ������� �����Ѵ�.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_deflate.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dialup.html.en b/docs/manual/mod/mod_dialup.html.en
index c08fca1d87..16524cd712 100644
--- a/docs/manual/mod/mod_dialup.html.en
+++ b/docs/manual/mod/mod_dialup.html.en
@@ -53,7 +53,6 @@ once the timer hits. From there the handler can continue to send data to the cl
<li><img alt="" src="../images/down.gif" /> <a href="#modemstandard">ModemStandard</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ModemStandard" id="ModemStandard">ModemStandard</a> <a name="modemstandard" id="modemstandard">Directive</a></h2>
<table class="directive">
@@ -72,6 +71,7 @@ once the timer hits. From there the handler can continue to send data to the cl
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_dialup.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dialup.html.fr b/docs/manual/mod/mod_dialup.html.fr
index 0af133314e..c83ad00f37 100644
--- a/docs/manual/mod/mod_dialup.html.fr
+++ b/docs/manual/mod/mod_dialup.html.fr
@@ -60,7 +60,6 @@ client.</p>
<li><img alt="" src="../images/down.gif" /> <a href="#modemstandard">ModemStandard</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="modemstandard" id="modemstandard">Directive</a> <a name="ModemStandard" id="ModemStandard">ModemStandard</a></h2>
<table class="directive">
@@ -80,6 +79,7 @@ souhaitez simuler.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_dialup.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en
index 59bfc3faf6..7139b54edc 100644
--- a/docs/manual/mod/mod_dir.html.en
+++ b/docs/manual/mod/mod_dir.html.en
@@ -68,7 +68,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#fallbackresource">FallbackResource</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="DirectoryCheckHandler" id="DirectoryCheckHandler">DirectoryCheckHandler</a> <a name="directorycheckhandler" id="directorycheckhandler">Directive</a></h2>
<table class="directive">
@@ -307,6 +306,7 @@ later</td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_dir.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dir.html.fr b/docs/manual/mod/mod_dir.html.fr
index a4d8702af5..d138285bc1 100644
--- a/docs/manual/mod/mod_dir.html.fr
+++ b/docs/manual/mod/mod_dir.html.fr
@@ -71,7 +71,6 @@ de r�pertoire</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#fallbackresource">FallbackResource</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="directorycheckhandler" id="directorycheckhandler">Directive</a> <a name="DirectoryCheckHandler" id="DirectoryCheckHandler">DirectoryCheckHandler</a></h2>
<table class="directive">
@@ -342,6 +341,7 @@ de la version 2.4.4 du serveur HTTP Apache.</td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_dir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dir.html.ja.utf8 b/docs/manual/mod/mod_dir.html.ja.utf8
index 94fc063947..9266338650 100644
--- a/docs/manual/mod/mod_dir.html.ja.utf8
+++ b/docs/manual/mod/mod_dir.html.ja.utf8
@@ -76,7 +76,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#fallbackresource">FallbackResource</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="DirectoryCheckHandler" id="DirectoryCheckHandler">DirectoryCheckHandler</a> <a name="directorycheckhandler" id="directorycheckhandler">ディレクティブ</a></h2>
<table class="directive">
@@ -223,6 +222,7 @@ act as if "DirectoryCheckHandler ON" was specified.</td></tr>
<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dir</td></tr>
</table><p>Documentation not yet translated. Please see English version of document.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_dir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dir.html.ko.euc-kr b/docs/manual/mod/mod_dir.html.ko.euc-kr
index 3fc8089353..4485d25c4b 100644
--- a/docs/manual/mod/mod_dir.html.ko.euc-kr
+++ b/docs/manual/mod/mod_dir.html.ko.euc-kr
@@ -69,7 +69,6 @@ index ������ �����Ѵ�</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#fallbackresource">FallbackResource</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="DirectoryCheckHandler" id="DirectoryCheckHandler">DirectoryCheckHandler</a> <a name="directorycheckhandler" id="directorycheckhandler">���þ�</a></h2>
<table class="directive">
@@ -208,6 +207,7 @@ act as if "DirectoryCheckHandler ON" was specified.</td></tr>
<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_dir</td></tr>
</table><p>Documentation not yet translated. Please see English version of document.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_dir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dir.html.tr.utf8 b/docs/manual/mod/mod_dir.html.tr.utf8
index 10e412dead..65d68a215d 100644
--- a/docs/manual/mod/mod_dir.html.tr.utf8
+++ b/docs/manual/mod/mod_dir.html.tr.utf8
@@ -67,7 +67,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#fallbackresource">FallbackResource</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="DirectoryCheckHandler" id="DirectoryCheckHandler">DirectoryCheckHandler</a> <a name="directorycheckhandler" id="directorycheckhandler">Yönergesi</a></h2>
<table class="directive">
@@ -320,6 +319,7 @@
</div>
+
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_dir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dumpio.html.en b/docs/manual/mod/mod_dumpio.html.en
index 245b587ddd..8b608cf29e 100644
--- a/docs/manual/mod/mod_dumpio.html.en
+++ b/docs/manual/mod/mod_dumpio.html.en
@@ -54,20 +54,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#enable">Enabling dumpio Support</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enable" id="enable">Enabling dumpio Support</a></h2>
-
-
- <p>To enable the module, it should be compiled and loaded
- in to your running Apache configuration. Logging can then
- be enabled or disabled separately for input and output via
- the below directives. Additionally, <code class="module"><a href="../mod/mod_dumpio.html">mod_dumpio</a></code>
- needs to be configured to <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> <code>trace7</code>:
- </p>
- <pre class="prettyprint lang-config">LogLevel dumpio:trace7</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="DumpIOInput" id="DumpIOInput">DumpIOInput</a> <a name="dumpioinput" id="dumpioinput">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dump all input data to the error log</td></tr>
@@ -103,6 +89,20 @@ later.</td></tr>
</div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">Enabling dumpio Support</a></h2>
+
+
+ <p>To enable the module, it should be compiled and loaded
+ in to your running Apache configuration. Logging can then
+ be enabled or disabled separately for input and output via
+ the below directives. Additionally, <code class="module"><a href="../mod/mod_dumpio.html">mod_dumpio</a></code>
+ needs to be configured to <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> <code>trace7</code>:
+ </p>
+ <pre class="prettyprint lang-config">LogLevel dumpio:trace7</pre>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_dumpio.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dumpio.html.fr b/docs/manual/mod/mod_dumpio.html.fr
index 7d6a0f9ff8..224f51fda2 100644
--- a/docs/manual/mod/mod_dumpio.html.fr
+++ b/docs/manual/mod/mod_dumpio.html.fr
@@ -56,19 +56,6 @@ erreurs de la mani�re souhait�e.</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#enable">Activation du support dumpio</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enable" id="enable">Activation du support dumpio</a></h2>
-
-
- <p>Pour activer le module, ce dernier doit �tre compil� et charg�
- par l'interm�diaire de la configuration de votre instance d'Apache.
- La journalisation peut ensuite �tre activ�e ou d�sactiv�e s�par�ment
- pour les entr�es et sorties � l'aide des directives ci-dessous. En
- outre, <code class="module"><a href="../mod/mod_dumpio.html">mod_dumpio</a></code> doit �tre configur� � <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> <code>trace7</code> :</p>
- <pre class="prettyprint lang-config">LogLevel dumpio:trace7</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="dumpioinput" id="dumpioinput">Directive</a> <a name="DumpIOInput" id="DumpIOInput">DumpIOInput</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enregistre toutes les entr�es dans le journal des
@@ -106,6 +93,19 @@ d'Apache.</td></tr>
</div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">Activation du support dumpio</a></h2>
+
+
+ <p>Pour activer le module, ce dernier doit �tre compil� et charg�
+ par l'interm�diaire de la configuration de votre instance d'Apache.
+ La journalisation peut ensuite �tre activ�e ou d�sactiv�e s�par�ment
+ pour les entr�es et sorties � l'aide des directives ci-dessous. En
+ outre, <code class="module"><a href="../mod/mod_dumpio.html">mod_dumpio</a></code> doit �tre configur� � <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> <code>trace7</code> :</p>
+ <pre class="prettyprint lang-config">LogLevel dumpio:trace7</pre>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_dumpio.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_dumpio.html.ja.utf8 b/docs/manual/mod/mod_dumpio.html.ja.utf8
index 0aee76fe49..5984acb733 100644
--- a/docs/manual/mod/mod_dumpio.html.ja.utf8
+++ b/docs/manual/mod/mod_dumpio.html.ja.utf8
@@ -58,16 +58,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#enable">dumpio サポートを有効にする</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enable" id="enable">dumpio サポートを有効にする</a></h2>
-
-
- <p>このモジュールを有効にするには、モジュールがコンパイルされていて、
- 実行する Apache の設定でサーバに組み込まれている必要があります。
- ロギング機能は、以下のディレクティブを使って有効にしたり
- 無効にしたりできます。</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="DumpIOInput" id="DumpIOInput">DumpIOInput</a> <a name="dumpioinput" id="dumpioinput">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>エラーログにすべての入力データをダンプ</td></tr>
@@ -103,6 +93,16 @@
</code></p></div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">dumpio サポートを有効にする</a></h2>
+
+
+ <p>このモジュールを有効にするには、モジュールがコンパイルされていて、
+ 実行する Apache の設定でサーバに組み込まれている必要があります。
+ ロギング機能は、以下のディレクティブを使って有効にしたり
+ 無効にしたりできます。</p>
+</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_dumpio.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_echo.html.en b/docs/manual/mod/mod_echo.html.en
index 306cf5f00c..429c7727c6 100644
--- a/docs/manual/mod/mod_echo.html.en
+++ b/docs/manual/mod/mod_echo.html.en
@@ -45,7 +45,6 @@ modules</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#protocolecho">ProtocolEcho</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ProtocolEcho" id="ProtocolEcho">ProtocolEcho</a> <a name="protocolecho" id="protocolecho">Directive</a></h2>
<table class="directive">
@@ -63,6 +62,7 @@ modules</td></tr>
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_echo.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_echo.html.fr b/docs/manual/mod/mod_echo.html.fr
index dc62730494..2636c05f08 100644
--- a/docs/manual/mod/mod_echo.html.fr
+++ b/docs/manual/mod/mod_echo.html.fr
@@ -45,7 +45,6 @@ protocole</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#protocolecho">ProtocolEcho</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="protocolecho" id="protocolecho">Directive</a> <a name="ProtocolEcho" id="ProtocolEcho">ProtocolEcho</a></h2>
<table class="directive">
@@ -63,6 +62,7 @@ protocole</td></tr>
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_echo.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_echo.html.ja.utf8 b/docs/manual/mod/mod_echo.html.ja.utf8
index fc31313e2d..6fc09a6f56 100644
--- a/docs/manual/mod/mod_echo.html.ja.utf8
+++ b/docs/manual/mod/mod_echo.html.ja.utf8
@@ -45,7 +45,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#protocolecho">ProtocolEcho</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ProtocolEcho" id="ProtocolEcho">ProtocolEcho</a> <a name="protocolecho" id="protocolecho">ディレクティブ</a></h2>
<table class="directive">
@@ -63,6 +62,7 @@
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_echo.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_echo.html.ko.euc-kr b/docs/manual/mod/mod_echo.html.ko.euc-kr
index 29d2796bfc..1c4a300e37 100644
--- a/docs/manual/mod/mod_echo.html.ko.euc-kr
+++ b/docs/manual/mod/mod_echo.html.ko.euc-kr
@@ -47,7 +47,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#protocolecho">ProtocolEcho</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ProtocolEcho" id="ProtocolEcho">ProtocolEcho</a> <a name="protocolecho" id="protocolecho">���þ�</a></h2>
<table class="directive">
@@ -66,6 +65,7 @@
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_echo.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_env.html.en b/docs/manual/mod/mod_env.html.en
index 3e932f632f..bc12efc1f9 100644
--- a/docs/manual/mod/mod_env.html.en
+++ b/docs/manual/mod/mod_env.html.en
@@ -55,7 +55,6 @@ SSI pages</td></tr>
<li><a href="../env.html">Environment Variables</a></li>
<li><code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="PassEnv" id="PassEnv">PassEnv</a> <a name="passenv" id="passenv">Directive</a></h2>
<table class="directive">
@@ -129,6 +128,7 @@ SSI pages</td></tr>
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_env.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_env.html.fr b/docs/manual/mod/mod_env.html.fr
index e1f4e8e2d1..f09e7030cc 100644
--- a/docs/manual/mod/mod_env.html.fr
+++ b/docs/manual/mod/mod_env.html.fr
@@ -57,7 +57,6 @@ pages SSI</td></tr>
<li><a href="../env.html">Variables d'environnement</a></li>
<li><code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="passenv" id="passenv">Directive</a> <a name="PassEnv" id="PassEnv">PassEnv</a></h2>
<table class="directive">
@@ -136,6 +135,7 @@ shell</td></tr>
</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_env.html.ja.utf8 b/docs/manual/mod/mod_env.html.ja.utf8
index 816f4fc337..b9e6b2f4d2 100644
--- a/docs/manual/mod/mod_env.html.ja.utf8
+++ b/docs/manual/mod/mod_env.html.ja.utf8
@@ -57,7 +57,6 @@
<ul class="seealso">
<li><a href="../env.html">環境変数</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="PassEnv" id="PassEnv">PassEnv</a> <a name="passenv" id="passenv">ディレクティブ</a></h2>
<table class="directive">
@@ -115,6 +114,7 @@
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_env.html.ko.euc-kr b/docs/manual/mod/mod_env.html.ko.euc-kr
index 9990fc87a3..2e671f578f 100644
--- a/docs/manual/mod/mod_env.html.ko.euc-kr
+++ b/docs/manual/mod/mod_env.html.ko.euc-kr
@@ -53,7 +53,6 @@
<ul class="seealso">
<li><a href="../env.html">ȯ�溯��</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="PassEnv" id="PassEnv">PassEnv</a> <a name="passenv" id="passenv">���þ�</a></h2>
<table class="directive">
@@ -108,6 +107,7 @@
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_env.html.tr.utf8 b/docs/manual/mod/mod_env.html.tr.utf8
index 6bec9e3e5c..896f23dea6 100644
--- a/docs/manual/mod/mod_env.html.tr.utf8
+++ b/docs/manual/mod/mod_env.html.tr.utf8
@@ -56,7 +56,6 @@ etmek için kullanılır.</td></tr>
<li><a href="../env.html">Ortam Değişkenleri</a></li>
<li><code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="PassEnv" id="PassEnv">PassEnv</a> <a name="passenv" id="passenv">Yönergesi</a></h2>
<table class="directive">
@@ -130,6 +129,7 @@ etmek için kullanılır.</td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_example_hooks.html.en b/docs/manual/mod/mod_example_hooks.html.en
index f435406217..10fc2328e7 100644
--- a/docs/manual/mod/mod_example_hooks.html.en
+++ b/docs/manual/mod/mod_example_hooks.html.en
@@ -60,6 +60,26 @@
<li><img alt="" src="../images/down.gif" /> <a href="#using">Using the <code>mod_example_hooks</code> Module</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Example" id="Example">Example</a> <a name="example" id="example">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Demonstration directive to illustrate the Apache module
+API</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Example</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_example_hooks</td></tr>
+</table>
+ <p>The <code class="directive">Example</code> directive just sets a demonstration
+ flag which the example module's content handler displays. It
+ takes no arguments. If you browse to an URL to which the
+ example-hooks content-handler applies, you will get a display of the
+ routines within the module and how and in what order they were
+ called to service the document request. The effect of this
+ directive one can observe under the point "<code>Example
+ directive declared here: YES/NO</code>".</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="compiling" id="compiling">Compiling the example_hooks module</a></h2>
@@ -128,26 +148,6 @@
to browse to this location and see the brief display mentioned
earlier.</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="Example" id="Example">Example</a> <a name="example" id="example">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Demonstration directive to illustrate the Apache module
-API</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Example</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>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_example_hooks</td></tr>
-</table>
- <p>The <code class="directive">Example</code> directive just sets a demonstration
- flag which the example module's content handler displays. It
- takes no arguments. If you browse to an URL to which the
- example-hooks content-handler applies, you will get a display of the
- routines within the module and how and in what order they were
- called to service the document request. The effect of this
- directive one can observe under the point "<code>Example
- directive declared here: YES/NO</code>".</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_example_hooks.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_example_hooks.html.fr b/docs/manual/mod/mod_example_hooks.html.fr
index 16e6aaf4de..ce31ddf843 100644
--- a/docs/manual/mod/mod_example_hooks.html.fr
+++ b/docs/manual/mod/mod_example_hooks.html.fr
@@ -64,6 +64,27 @@
<code>mod_example_hooks</code></a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="example" id="example">Directive</a> <a name="Example" id="Example">Example</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directive de d�monstration pour illustrer l'API des modules
+Apache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>Example</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_example_hooks</td></tr>
+</table>
+ <p>La directive <code class="directive">Example</code> n'a pour fonction que
+ de d�finir un drapeau de d�monstration que le gestionnaire de
+ contenu du module example_hooks va afficher. Elle ne poss�de aucun
+ argument. Si vous naviguez vers une URL � laquelle le gestionnaire
+ de contenu example_hooks s'applique, vous verrez s'afficher les routines
+ du module, ainsi que l'ordre dans lequel elles ont �t� appel�es pour
+ servir le document demand�. On peut observer l'effet de cette
+ directive dans la phrase "<code>Example
+ directive declared here: YES/NO</code>".</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="compiling" id="compiling">Compilation du module example_hooks</a></h2>
@@ -141,27 +162,6 @@
vous devriez pouvoir acc�der � ce fichier et voir s'afficher ce qui
a �t� d�crit plus haut.</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="example" id="example">Directive</a> <a name="Example" id="Example">Example</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directive de d�monstration pour illustrer l'API des modules
-Apache</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>Example</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_example_hooks</td></tr>
-</table>
- <p>La directive <code class="directive">Example</code> n'a pour fonction que
- de d�finir un drapeau de d�monstration que le gestionnaire de
- contenu du module example_hooks va afficher. Elle ne poss�de aucun
- argument. Si vous naviguez vers une URL � laquelle le gestionnaire
- de contenu example_hooks s'applique, vous verrez s'afficher les routines
- du module, ainsi que l'ordre dans lequel elles ont �t� appel�es pour
- servir le document demand�. On peut observer l'effet de cette
- directive dans la phrase "<code>Example
- directive declared here: YES/NO</code>".</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_example_hooks.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_example_hooks.html.ko.euc-kr b/docs/manual/mod/mod_example_hooks.html.ko.euc-kr
index f922009dbf..218cb90807 100644
--- a/docs/manual/mod/mod_example_hooks.html.ko.euc-kr
+++ b/docs/manual/mod/mod_example_hooks.html.ko.euc-kr
@@ -59,6 +59,24 @@
<li><img alt="" src="../images/down.gif" /> <a href="#using"><code>mod_example_hooks</code> ��� ����ϱ�</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Example" id="Example">Example</a> <a name="example" id="example">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>����ġ ��� API�� �����ϱ����� ���� ���þ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>Example</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_example_hooks</td></tr>
+</table>
+ <p><code class="directive">Example</code> ���þ�� example �����
+ �����ڵ鷯�� ������ ������ ������ ���θ� �����Ѵ�. �� ���þ��
+ �ƱԸ�Ʈ�� �����ʴ´�. example �����ڵ鷯�� ������ URL��
+ �����ϸ� ���� ��û�� �����ϱ����� ���ȿ� �Լ����� ���
+ �׸��� � ������ �Ҹ����� �� �� �ִ�. �� ���þ��� ȿ����
+ "<code>Example directive declared here: YES/NO</code>"��
+ Ȯ���� �� �ִ�.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="compiling" id="compiling">example ��� �������ϱ�</a></h2>
@@ -131,24 +149,6 @@
<p>������ ������� �� �� ��ġ�� ����¡�ϸ� �տ��� ����
������ ���Ե� ���̴�.</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="Example" id="Example">Example</a> <a name="example" id="example">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>����ġ ��� API�� �����ϱ����� ���� ���þ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>Example</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>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_example_hooks</td></tr>
-</table>
- <p><code class="directive">Example</code> ���þ�� example �����
- �����ڵ鷯�� ������ ������ ������ ���θ� �����Ѵ�. �� ���þ��
- �ƱԸ�Ʈ�� �����ʴ´�. example �����ڵ鷯�� ������ URL��
- �����ϸ� ���� ��û�� �����ϱ����� ���ȿ� �Լ����� ���
- �׸��� � ������ �Ҹ����� �� �� �ִ�. �� ���þ��� ȿ����
- "<code>Example directive declared here: YES/NO</code>"��
- Ȯ���� �� �ִ�.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_example_hooks.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_expires.html.en b/docs/manual/mod/mod_expires.html.en
index 3f67827d42..2802f87eec 100644
--- a/docs/manual/mod/mod_expires.html.en
+++ b/docs/manual/mod/mod_expires.html.en
@@ -71,63 +71,6 @@ criteria</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#AltSyn">Alternate Interval Syntax</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="AltSyn" id="AltSyn">Alternate Interval Syntax</a></h2>
- <p>The <code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> and
- <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> directives
- can also be defined in a more readable syntax of the form:</p>
-
- <pre class="prettyprint lang-config">ExpiresDefault "<var>base</var> [plus <var>num</var> <var>type</var>] [<var>num</var> <var>type</var>] ..."
-ExpiresByType type/encoding "<var>base</var> [plus <var>num</var> <var>type</var>] [<var>num</var> <var>type</var>] ..."</pre>
-
-
- <p>where <var>base</var> is one of:</p>
-
- <ul>
- <li><code>access</code></li>
-
- <li><code>now</code> (equivalent to
- '<code>access</code>')</li>
-
- <li><code>modification</code></li>
- </ul>
-
- <p>The <code>plus</code> keyword is optional. <var>num</var>
- should be an integer value [acceptable to <code>atoi()</code>],
- and <var>type</var> is one of:</p>
-
- <ul>
- <li><code>years</code></li>
- <li><code>months</code></li>
- <li><code>weeks</code></li>
- <li><code>days</code></li>
- <li><code>hours</code></li>
- <li><code>minutes</code></li>
- <li><code>seconds</code></li>
- </ul>
-
- <p>For example, any of the following directives can be used to
- make documents expire 1 month after being accessed, by
- default:</p>
-
- <pre class="prettyprint lang-config">ExpiresDefault "access plus 1 month"
-ExpiresDefault "access plus 4 weeks"
-ExpiresDefault "access plus 30 days"</pre>
-
-
- <p>The expiry time can be fine-tuned by adding several
- '<var>num</var> <var>type</var>' clauses:</p>
-
- <pre class="prettyprint lang-config">ExpiresByType text/html "access plus 1 month 15 days 2 hours"
-ExpiresByType image/gif "modification plus 5 hours 3 minutes"</pre>
-
-
- <p>Note that if you use a modification date based setting, the
- Expires header will <strong>not</strong> be added to content
- that does not come from a file on disk. This is due to the fact
- that there is no modification time for such content.</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="ExpiresActive" id="ExpiresActive">ExpiresActive</a> <a name="expiresactive" id="expiresactive">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables generation of <code>Expires</code>
@@ -237,6 +180,63 @@ ExpiresByType text/html M604800</pre>
description as well.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="AltSyn" id="AltSyn">Alternate Interval Syntax</a></h2>
+ <p>The <code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> and
+ <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> directives
+ can also be defined in a more readable syntax of the form:</p>
+
+ <pre class="prettyprint lang-config">ExpiresDefault "<var>base</var> [plus <var>num</var> <var>type</var>] [<var>num</var> <var>type</var>] ..."
+ExpiresByType type/encoding "<var>base</var> [plus <var>num</var> <var>type</var>] [<var>num</var> <var>type</var>] ..."</pre>
+
+
+ <p>where <var>base</var> is one of:</p>
+
+ <ul>
+ <li><code>access</code></li>
+
+ <li><code>now</code> (equivalent to
+ '<code>access</code>')</li>
+
+ <li><code>modification</code></li>
+ </ul>
+
+ <p>The <code>plus</code> keyword is optional. <var>num</var>
+ should be an integer value [acceptable to <code>atoi()</code>],
+ and <var>type</var> is one of:</p>
+
+ <ul>
+ <li><code>years</code></li>
+ <li><code>months</code></li>
+ <li><code>weeks</code></li>
+ <li><code>days</code></li>
+ <li><code>hours</code></li>
+ <li><code>minutes</code></li>
+ <li><code>seconds</code></li>
+ </ul>
+
+ <p>For example, any of the following directives can be used to
+ make documents expire 1 month after being accessed, by
+ default:</p>
+
+ <pre class="prettyprint lang-config">ExpiresDefault "access plus 1 month"
+ExpiresDefault "access plus 4 weeks"
+ExpiresDefault "access plus 30 days"</pre>
+
+
+ <p>The expiry time can be fine-tuned by adding several
+ '<var>num</var> <var>type</var>' clauses:</p>
+
+ <pre class="prettyprint lang-config">ExpiresByType text/html "access plus 1 month 15 days 2 hours"
+ExpiresByType image/gif "modification plus 5 hours 3 minutes"</pre>
+
+
+ <p>Note that if you use a modification date based setting, the
+ Expires header will <strong>not</strong> be added to content
+ that does not come from a file on disk. This is due to the fact
+ that there is no modification time for such content.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_expires.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_expires.html.fr b/docs/manual/mod/mod_expires.html.fr
index bfd13f2852..96f68421b2 100644
--- a/docs/manual/mod/mod_expires.html.fr
+++ b/docs/manual/mod/mod_expires.html.fr
@@ -74,63 +74,6 @@ l'utilisateur</td></tr>
l'intervalle</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="AltSyn" id="AltSyn">Autre syntaxe de d�finition de
-l'intervalle</a></h2>
- <p>Pour une syntaxe plus lisible, on peut aussi utiliser les
- directives <code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> et <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> comme suit :</p>
-
- <pre class="prettyprint lang-config">ExpiresDefault "<var>base</var> [plus <var>num</var> <var>type</var>] [<var>num</var> <var>type</var>] ..."
-ExpiresByType type/encoding "<var>base</var> [plus <var>num</var> <var>type</var>] [<var>num</var> <var>type</var>] ..."</pre>
-
-
- <p>o� <var>base</var> peut �tre :</p>
-
- <ul>
- <li><code>access</code></li>
-
- <li><code>now</code> (�quivalent �
- '<code>access</code>')</li>
-
- <li><code>modification</code></li>
- </ul>
-
- <p>Le mot-cl� <code>plus</code> est optionnel. <var>num</var> doit
- correspondre � une valeur enti�re [compatible avec
- <code>atoi()</code>], et <var>type</var> peut �tre choisi parmi :</p>
-
- <ul>
- <li><code>years</code></li>
- <li><code>months</code></li>
- <li><code>weeks</code></li>
- <li><code>days</code></li>
- <li><code>hours</code></li>
- <li><code>minutes</code></li>
- <li><code>seconds</code></li>
- </ul>
-
- <p>Par exemple, pour faire expirer par d�faut les documents 1 mois
- apr�s leur acc�s, on peut utiliser une des directives suivantes :</p>
- <pre class="prettyprint lang-config">ExpiresDefault "access plus 1 month"
-ExpiresDefault "access plus 4 weeks"
-ExpiresDefault "access plus 30 days"</pre>
-
-
-
- <p>La date d'expiration peut �tre d�finie plus pr�cis�ment en
- ajoutant plusieurs clauses '<var>num</var> <var>type</var>' :</p>
-
- <pre class="prettyprint lang-config">ExpiresByType text/html "access plus 1 month 15 days 2 hours"
-ExpiresByType image/gif "modification plus 5 hours 3 minutes"</pre>
-
-
- <p>Notez que si vous utilisez une configuration bas�e sur la date de
- modification, l'en-t�te Expires ne sera pas ajout� � un contenu qui
- ne provient pas directement d'un fichier sur disque ; et ceci tout
- simplement parce que ce type de contenu ne poss�de pas de date de
- modification.</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="expiresactive" id="expiresactive">Directive</a> <a name="ExpiresActive" id="ExpiresActive">ExpiresActive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Active la g�n�ration d'en-t�tes
@@ -243,6 +186,63 @@ d'expiration</td></tr>
syntaxe de l'argument, ainsi que la description de la <a href="#AltSyn">syntaxe alternative</a>.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="AltSyn" id="AltSyn">Autre syntaxe de d�finition de
+l'intervalle</a></h2>
+ <p>Pour une syntaxe plus lisible, on peut aussi utiliser les
+ directives <code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> et <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> comme suit :</p>
+
+ <pre class="prettyprint lang-config">ExpiresDefault "<var>base</var> [plus <var>num</var> <var>type</var>] [<var>num</var> <var>type</var>] ..."
+ExpiresByType type/encoding "<var>base</var> [plus <var>num</var> <var>type</var>] [<var>num</var> <var>type</var>] ..."</pre>
+
+
+ <p>o� <var>base</var> peut �tre :</p>
+
+ <ul>
+ <li><code>access</code></li>
+
+ <li><code>now</code> (�quivalent �
+ '<code>access</code>')</li>
+
+ <li><code>modification</code></li>
+ </ul>
+
+ <p>Le mot-cl� <code>plus</code> est optionnel. <var>num</var> doit
+ correspondre � une valeur enti�re [compatible avec
+ <code>atoi()</code>], et <var>type</var> peut �tre choisi parmi :</p>
+
+ <ul>
+ <li><code>years</code></li>
+ <li><code>months</code></li>
+ <li><code>weeks</code></li>
+ <li><code>days</code></li>
+ <li><code>hours</code></li>
+ <li><code>minutes</code></li>
+ <li><code>seconds</code></li>
+ </ul>
+
+ <p>Par exemple, pour faire expirer par d�faut les documents 1 mois
+ apr�s leur acc�s, on peut utiliser une des directives suivantes :</p>
+ <pre class="prettyprint lang-config">ExpiresDefault "access plus 1 month"
+ExpiresDefault "access plus 4 weeks"
+ExpiresDefault "access plus 30 days"</pre>
+
+
+
+ <p>La date d'expiration peut �tre d�finie plus pr�cis�ment en
+ ajoutant plusieurs clauses '<var>num</var> <var>type</var>' :</p>
+
+ <pre class="prettyprint lang-config">ExpiresByType text/html "access plus 1 month 15 days 2 hours"
+ExpiresByType image/gif "modification plus 5 hours 3 minutes"</pre>
+
+
+ <p>Notez que si vous utilisez une configuration bas�e sur la date de
+ modification, l'en-t�te Expires ne sera pas ajout� � un contenu qui
+ ne provient pas directement d'un fichier sur disque ; et ceci tout
+ simplement parce que ce type de contenu ne poss�de pas de date de
+ modification.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_expires.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_expires.html.ja.utf8 b/docs/manual/mod/mod_expires.html.ja.utf8
index 6b1ae5ac31..dafc094d44 100644
--- a/docs/manual/mod/mod_expires.html.ja.utf8
+++ b/docs/manual/mod/mod_expires.html.ja.utf8
@@ -68,69 +68,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#AltSyn">代替期間指定構文</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="AltSyn" id="AltSyn">代替期間指定構文</a></h2>
-
- <p><code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> ディレクティブと
- <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> ディレクティブは
- 以下のより読み易い構文を使って定義することができます:</p>
-
- <div class="example"><p><code>
- ExpiresDefault "&lt;base&gt; [plus] {&lt;num&gt;
- &lt;type&gt;}*"<br />
- ExpiresByType type/encoding "&lt;base&gt; [plus]
- {&lt;num&gt; &lt;type&gt;}*"
- </code></p></div>
-
- <p>&lt;base&gt; は以下のどれかです:</p>
-
- <ul>
- <li><code>access</code></li>
-
- <li><code>now</code> ('<code>access</code>' と等価)</li>
-
- <li><code>modification</code></li>
- </ul>
-
- <p><code>plus</code> キーワードは省略可能です。&lt;num&gt;
- は (<code>atoi()</code> が受け付ける) 整数値、
- &lt;type&gt; は以下のどれかです:</p>
-
- <ul>
- <li><code>years</code></li>
- <li><code>months</code></li>
- <li><code>weeks</code></li>
- <li><code>days</code></li>
- <li><code>hours</code></li>
- <li><code>minutes</code></li>
- <li><code>seconds</code></li>
- </ul>
-
- <p>例えば、以下のディレクティブはどれもデフォルトで文書がアクセスの 1 ヶ月後に
- 期限が切れるようにするために使えます:</p>
-
- <div class="example"><p><code>
- ExpiresDefault "access plus 1 month"<br />
- ExpiresDefault "access plus 4 weeks"<br />
- ExpiresDefault "access plus 30 days"
- </code></p></div>
-
- <p>期限切れ時刻はいくつか
- '&lt;num&gt; &lt;type&gt;' 節を追加することでより細かく
- 制御することができます:</p>
-
- <div class="example"><p><code>
- ExpiresByType text/html "access plus 1 month 15
- days 2 hours"<br />
- ExpiresByType image/gif "modification plus 5 hours 3
- minutes"
- </code></p></div>
-
- <p>修正時刻に基づいた設定を使用している場合、Expires ヘッダは
- ディスクのファイル以外のコンテンツには<strong>追加されない</strong>ことに注意
- してください。そのようなコンテンツには修正時刻は存在しないからです。</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="ExpiresActive" id="ExpiresActive">ExpiresActive</a> <a name="expiresactive" id="expiresactive">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code>Expires</code> ヘッダの生成を有効にする</td></tr>
@@ -230,6 +167,69 @@
参照してください。</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="AltSyn" id="AltSyn">代替期間指定構文</a></h2>
+
+ <p><code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> ディレクティブと
+ <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> ディレクティブは
+ 以下のより読み易い構文を使って定義することができます:</p>
+
+ <div class="example"><p><code>
+ ExpiresDefault "&lt;base&gt; [plus] {&lt;num&gt;
+ &lt;type&gt;}*"<br />
+ ExpiresByType type/encoding "&lt;base&gt; [plus]
+ {&lt;num&gt; &lt;type&gt;}*"
+ </code></p></div>
+
+ <p>&lt;base&gt; は以下のどれかです:</p>
+
+ <ul>
+ <li><code>access</code></li>
+
+ <li><code>now</code> ('<code>access</code>' と等価)</li>
+
+ <li><code>modification</code></li>
+ </ul>
+
+ <p><code>plus</code> キーワードは省略可能です。&lt;num&gt;
+ は (<code>atoi()</code> が受け付ける) 整数値、
+ &lt;type&gt; は以下のどれかです:</p>
+
+ <ul>
+ <li><code>years</code></li>
+ <li><code>months</code></li>
+ <li><code>weeks</code></li>
+ <li><code>days</code></li>
+ <li><code>hours</code></li>
+ <li><code>minutes</code></li>
+ <li><code>seconds</code></li>
+ </ul>
+
+ <p>例えば、以下のディレクティブはどれもデフォルトで文書がアクセスの 1 ヶ月後に
+ 期限が切れるようにするために使えます:</p>
+
+ <div class="example"><p><code>
+ ExpiresDefault "access plus 1 month"<br />
+ ExpiresDefault "access plus 4 weeks"<br />
+ ExpiresDefault "access plus 30 days"
+ </code></p></div>
+
+ <p>期限切れ時刻はいくつか
+ '&lt;num&gt; &lt;type&gt;' 節を追加することでより細かく
+ 制御することができます:</p>
+
+ <div class="example"><p><code>
+ ExpiresByType text/html "access plus 1 month 15
+ days 2 hours"<br />
+ ExpiresByType image/gif "modification plus 5 hours 3
+ minutes"
+ </code></p></div>
+
+ <p>修正時刻に基づいた設定を使用している場合、Expires ヘッダは
+ ディスクのファイル以外のコンテンツには<strong>追加されない</strong>ことに注意
+ してください。そのようなコンテンツには修正時刻は存在しないからです。</p>
+</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_expires.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_expires.html.ko.euc-kr b/docs/manual/mod/mod_expires.html.ko.euc-kr
index 7cff9b2eb9..18babecef0 100644
--- a/docs/manual/mod/mod_expires.html.ko.euc-kr
+++ b/docs/manual/mod/mod_expires.html.ko.euc-kr
@@ -66,68 +66,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#AltSyn">�ٸ� ���� ����</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="AltSyn" id="AltSyn">�ٸ� ���� ����</a></h2>
- <p><code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code>��
- <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code>
- ���þ �� �б� ���� �������� ����� �� �ִ�:</p>
-
- <div class="example"><p><code>
- ExpiresDefault "&lt;base&gt; [plus] {&lt;num&gt;
- &lt;type&gt;}*"<br />
- ExpiresByType type/encoding "&lt;base&gt; [plus]
- {&lt;num&gt; &lt;type&gt;}*"
- </code></p></div>
-
- <p>&lt;base&gt;�� ������ �ϳ��̴�:</p>
-
- <ul>
- <li><code>access</code></li>
-
- <li><code>now</code> ('<code>access</code>'�� ����)</li>
-
- <li><code>modification</code></li>
- </ul>
-
- <p><code>plus</code> Ű����� ��� �ȴ�. &lt;num&gt;��
- [<code>atoi()</code>�� ����� �� �ִ�] �������̴�.
- &lt;type&gt;�� ������ �ϳ��̴�:</p>
-
- <ul>
- <li><code>years</code></li>
- <li><code>months</code></li>
- <li><code>weeks</code></li>
- <li><code>days</code></li>
- <li><code>hours</code></li>
- <li><code>minutes</code></li>
- <li><code>seconds</code></li>
- </ul>
-
- <p>���� ���, ���� ��δ� ������ �⺻������ ���ӵ��� 1���Ŀ�
- ����ȴٰ� �����Ѵ�:</p>
-
- <div class="example"><p><code>
- ExpiresDefault "access plus 1 month"<br />
- ExpiresDefault "access plus 4 weeks"<br />
- ExpiresDefault "access plus 30 days"
- </code></p></div>
-
- <p>'&lt;num&gt; &lt;type&gt;' ������ �ݺ��ؼ� ����Ͽ�
- ����ð��� �ڼ��� ������ �� �ִ�:</p>
-
- <div class="example"><p><code>
- ExpiresByType text/html "access plus 1 month 15
- days 2 hours"<br />
- ExpiresByType image/gif "modification plus 5 hours 3
- minutes"
- </code></p></div>
-
- <p>���� �����ð�(modification)�� �������� ����ð��� �����ϴ�
- ��� ������ ��ũ�� �ִ� ���Ͽ��� �������� �ʴ´ٸ� Expires
- ����� ������ <strong>�ʴ´�</strong>. �� ��� ���뿡 �����ð���
- ���� �����̴�.</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="ExpiresActive" id="ExpiresActive">ExpiresActive</a> <a name="expiresactive" id="expiresactive">���þ�</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">����:</a></th><td><code>Expires</code> ����� �����Ѵ�</td></tr>
@@ -220,6 +158,68 @@
�����϶�.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="AltSyn" id="AltSyn">�ٸ� ���� ����</a></h2>
+ <p><code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code>��
+ <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code>
+ ���þ �� �б� ���� �������� ����� �� �ִ�:</p>
+
+ <div class="example"><p><code>
+ ExpiresDefault "&lt;base&gt; [plus] {&lt;num&gt;
+ &lt;type&gt;}*"<br />
+ ExpiresByType type/encoding "&lt;base&gt; [plus]
+ {&lt;num&gt; &lt;type&gt;}*"
+ </code></p></div>
+
+ <p>&lt;base&gt;�� ������ �ϳ��̴�:</p>
+
+ <ul>
+ <li><code>access</code></li>
+
+ <li><code>now</code> ('<code>access</code>'�� ����)</li>
+
+ <li><code>modification</code></li>
+ </ul>
+
+ <p><code>plus</code> Ű����� ��� �ȴ�. &lt;num&gt;��
+ [<code>atoi()</code>�� ����� �� �ִ�] �������̴�.
+ &lt;type&gt;�� ������ �ϳ��̴�:</p>
+
+ <ul>
+ <li><code>years</code></li>
+ <li><code>months</code></li>
+ <li><code>weeks</code></li>
+ <li><code>days</code></li>
+ <li><code>hours</code></li>
+ <li><code>minutes</code></li>
+ <li><code>seconds</code></li>
+ </ul>
+
+ <p>���� ���, ���� ��δ� ������ �⺻������ ���ӵ��� 1���Ŀ�
+ ����ȴٰ� �����Ѵ�:</p>
+
+ <div class="example"><p><code>
+ ExpiresDefault "access plus 1 month"<br />
+ ExpiresDefault "access plus 4 weeks"<br />
+ ExpiresDefault "access plus 30 days"
+ </code></p></div>
+
+ <p>'&lt;num&gt; &lt;type&gt;' ������ �ݺ��ؼ� ����Ͽ�
+ ����ð��� �ڼ��� ������ �� �ִ�:</p>
+
+ <div class="example"><p><code>
+ ExpiresByType text/html "access plus 1 month 15
+ days 2 hours"<br />
+ ExpiresByType image/gif "modification plus 5 hours 3
+ minutes"
+ </code></p></div>
+
+ <p>���� �����ð�(modification)�� �������� ����ð��� �����ϴ�
+ ��� ������ ��ũ�� �ִ� ���Ͽ��� �������� �ʴ´ٸ� Expires
+ ����� ������ <strong>�ʴ´�</strong>. �� ��� ���뿡 �����ð���
+ ���� �����̴�.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_expires.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ext_filter.html.en b/docs/manual/mod/mod_ext_filter.html.en
index 87696b791d..1160b11bcd 100644
--- a/docs/manual/mod/mod_ext_filter.html.en
+++ b/docs/manual/mod/mod_ext_filter.html.en
@@ -74,130 +74,6 @@ delivery to the client</td></tr>
<li><a href="../filter.html">Filters</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Examples</a></h2>
-
- <h3>Generating HTML from some other type of response</h3>
- <pre class="prettyprint lang-config"># mod_ext_filter directive to define a filter
-# to HTML-ize text/c files using the external
-# program /usr/bin/enscript, with the type of
-# the result set to text/html
-ExtFilterDefine c-to-html mode=output \
- intype=text/c outtype=text/html \
- cmd="/usr/bin/enscript --color -W html -Ec -o - -"
-
-&lt;Directory "/export/home/trawick/apacheinst/htdocs/c"&gt;
- # core directive to cause the new filter to
- # be run on output
- SetOutputFilter c-to-html
-
- # mod_mime directive to set the type of .c
- # files to text/c
- AddType text/c .c
-&lt;/Directory&gt;</pre>
-
-
-
- <h3>Implementing a content encoding filter</h3>
- <p>Note: this gzip example is just for the purposes of illustration.
- Please refer to <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> for a practical
- implementation.</p>
-
- <pre class="prettyprint lang-config"># mod_ext_filter directive to define the external filter
-ExtFilterDefine gzip mode=output cmd=/bin/gzip
-
-&lt;Location "/gzipped"&gt;
-
- # core directive to cause the gzip filter to be
- # run on output
- SetOutputFilter gzip
-
- # mod_headers directive to add
- # "Content-Encoding: gzip" header field
- Header set Content-Encoding gzip
-&lt;/Location&gt;</pre>
-
-
-
- <h3>Slowing down the server</h3>
- <pre class="prettyprint lang-config"># mod_ext_filter directive to define a filter
-# which runs everything through cat; cat doesn't
-# modify anything; it just introduces extra pathlength
-# and consumes more resources
-ExtFilterDefine slowdown mode=output cmd=/bin/cat \
- preservescontentlength
-
-&lt;Location "/"&gt;
- # core directive to cause the slowdown filter to
- # be run several times on output
- #
- SetOutputFilter slowdown;slowdown;slowdown
-&lt;/Location&gt;</pre>
-
-
-
- <h3>Using sed to replace text in the response</h3>
- <pre class="prettyprint lang-config"># mod_ext_filter directive to define a filter which
-# replaces text in the response
-#
-ExtFilterDefine fixtext mode=output intype=text/html \
- cmd="/bin/sed s/verdana/arial/g"
-
-&lt;Location "/"&gt;
- # core directive to cause the fixtext filter to
- # be run on output
- SetOutputFilter fixtext
-&lt;/Location&gt;</pre>
-
-
-<div class="note">
-<p>You can do the same thing using <code class="module"><a href="../mod/mod_substitute.html">mod_substitute</a></code>
-without invoking an external process.</p>
-</div>
-
-
- <h3>Tracing another filter</h3>
- <pre class="prettyprint lang-config"># Trace the data read and written by mod_deflate
-# for a particular client (IP 192.168.1.31)
-# experiencing compression problems.
-# This filter will trace what goes into mod_deflate.
-ExtFilterDefine tracebefore \
- cmd="/bin/tracefilter.pl /tmp/tracebefore" \
- EnableEnv=trace_this_client
-
-# This filter will trace what goes after mod_deflate.
-# Note that without the ftype parameter, the default
-# filter type of AP_FTYPE_RESOURCE would cause the
-# filter to be placed *before* mod_deflate in the filter
-# chain. Giving it a numeric value slightly higher than
-# AP_FTYPE_CONTENT_SET will ensure that it is placed
-# after mod_deflate.
-ExtFilterDefine traceafter \
- cmd="/bin/tracefilter.pl /tmp/traceafter" \
- EnableEnv=trace_this_client ftype=21
-
-&lt;Directory "/usr/local/docs"&gt;
- SetEnvIf Remote_Addr 192.168.1.31 trace_this_client
- SetOutputFilter tracebefore;deflate;traceafter
-&lt;/Directory&gt;</pre>
-
-
- <div class="example"><h3>Here is the filter which traces the data:</h3><pre class="prettyprint lang-perl">#!/usr/local/bin/perl -w
-use strict;
-
-open(SAVE, "&gt;$ARGV[0]")
- or die "can't open $ARGV[0]: $?";
-
-while (&lt;STDIN&gt;) {
- print SAVE $_;
- print $_;
-}
-
-close(SAVE);</pre>
-</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="ExtFilterDefine" id="ExtFilterDefine">ExtFilterDefine</a> <a name="extfilterdefine" id="extfilterdefine">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define an external filter</td></tr>
@@ -327,6 +203,130 @@ close(SAVE);</pre>
in the Apache error log.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Examples</a></h2>
+
+ <h3>Generating HTML from some other type of response</h3>
+ <pre class="prettyprint lang-config"># mod_ext_filter directive to define a filter
+# to HTML-ize text/c files using the external
+# program /usr/bin/enscript, with the type of
+# the result set to text/html
+ExtFilterDefine c-to-html mode=output \
+ intype=text/c outtype=text/html \
+ cmd="/usr/bin/enscript --color -W html -Ec -o - -"
+
+&lt;Directory "/export/home/trawick/apacheinst/htdocs/c"&gt;
+ # core directive to cause the new filter to
+ # be run on output
+ SetOutputFilter c-to-html
+
+ # mod_mime directive to set the type of .c
+ # files to text/c
+ AddType text/c .c
+&lt;/Directory&gt;</pre>
+
+
+
+ <h3>Implementing a content encoding filter</h3>
+ <p>Note: this gzip example is just for the purposes of illustration.
+ Please refer to <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> for a practical
+ implementation.</p>
+
+ <pre class="prettyprint lang-config"># mod_ext_filter directive to define the external filter
+ExtFilterDefine gzip mode=output cmd=/bin/gzip
+
+&lt;Location "/gzipped"&gt;
+
+ # core directive to cause the gzip filter to be
+ # run on output
+ SetOutputFilter gzip
+
+ # mod_headers directive to add
+ # "Content-Encoding: gzip" header field
+ Header set Content-Encoding gzip
+&lt;/Location&gt;</pre>
+
+
+
+ <h3>Slowing down the server</h3>
+ <pre class="prettyprint lang-config"># mod_ext_filter directive to define a filter
+# which runs everything through cat; cat doesn't
+# modify anything; it just introduces extra pathlength
+# and consumes more resources
+ExtFilterDefine slowdown mode=output cmd=/bin/cat \
+ preservescontentlength
+
+&lt;Location "/"&gt;
+ # core directive to cause the slowdown filter to
+ # be run several times on output
+ #
+ SetOutputFilter slowdown;slowdown;slowdown
+&lt;/Location&gt;</pre>
+
+
+
+ <h3>Using sed to replace text in the response</h3>
+ <pre class="prettyprint lang-config"># mod_ext_filter directive to define a filter which
+# replaces text in the response
+#
+ExtFilterDefine fixtext mode=output intype=text/html \
+ cmd="/bin/sed s/verdana/arial/g"
+
+&lt;Location "/"&gt;
+ # core directive to cause the fixtext filter to
+ # be run on output
+ SetOutputFilter fixtext
+&lt;/Location&gt;</pre>
+
+
+<div class="note">
+<p>You can do the same thing using <code class="module"><a href="../mod/mod_substitute.html">mod_substitute</a></code>
+without invoking an external process.</p>
+</div>
+
+
+ <h3>Tracing another filter</h3>
+ <pre class="prettyprint lang-config"># Trace the data read and written by mod_deflate
+# for a particular client (IP 192.168.1.31)
+# experiencing compression problems.
+# This filter will trace what goes into mod_deflate.
+ExtFilterDefine tracebefore \
+ cmd="/bin/tracefilter.pl /tmp/tracebefore" \
+ EnableEnv=trace_this_client
+
+# This filter will trace what goes after mod_deflate.
+# Note that without the ftype parameter, the default
+# filter type of AP_FTYPE_RESOURCE would cause the
+# filter to be placed *before* mod_deflate in the filter
+# chain. Giving it a numeric value slightly higher than
+# AP_FTYPE_CONTENT_SET will ensure that it is placed
+# after mod_deflate.
+ExtFilterDefine traceafter \
+ cmd="/bin/tracefilter.pl /tmp/traceafter" \
+ EnableEnv=trace_this_client ftype=21
+
+&lt;Directory "/usr/local/docs"&gt;
+ SetEnvIf Remote_Addr 192.168.1.31 trace_this_client
+ SetOutputFilter tracebefore;deflate;traceafter
+&lt;/Directory&gt;</pre>
+
+
+ <div class="example"><h3>Here is the filter which traces the data:</h3><pre class="prettyprint lang-perl">#!/usr/local/bin/perl -w
+use strict;
+
+open(SAVE, "&gt;$ARGV[0]")
+ or die "can't open $ARGV[0]: $?";
+
+while (&lt;STDIN&gt;) {
+ print SAVE $_;
+ print $_;
+}
+
+close(SAVE);</pre>
+</div>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_ext_filter.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ext_filter.html.fr b/docs/manual/mod/mod_ext_filter.html.fr
index 955b465dcc..4705185828 100644
--- a/docs/manual/mod/mod_ext_filter.html.fr
+++ b/docs/manual/mod/mod_ext_filter.html.fr
@@ -77,140 +77,6 @@ externe avant de l'envoyer au client</td></tr>
<li><a href="../filter.html">Filtres</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Exemples</a></h2>
-
- <h3>G�n�rer du HTML � partir d'un autre type de
- contenu</h3>
-
- <pre class="prettyprint lang-config"># la directive de mod_ext_filter d�finissant un filtre
-# permettant de mettre des fichiers text/c au format HTML en
-# utilisant le programme externe /usr/bin/enscript, le type du
-# fichier r�sultant �tant d�fini � text/html
-ExtFilterDefine c-to-html mode=output \
- intype=text/c outtype=text/html \
- cmd="/usr/bin/enscript --color -W html -Ec -o - -"
-
-&lt;Directory "/export/home/trawick/apacheinst/htdocs/c"&gt;
- # directive de base permettant de traiter la sortie avec le
- # nouveau filtre
- SetOutputFilter c-to-html
-
- # directive de mod_mime d�finissant le type des fichiers dont
- # le nom poss�de l'extension .c � text/c
- AddType text/c .c
-&lt;/Directory&gt;</pre>
-
-
-
- <h3>Impl�mentation d'un filtre de codage de
- contenu</h3>
- <p>Note : cet exemple avec gzip n'est fourni qu'� titre
- d'illustration. Veuillez vous reporter � la documentation de
- <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> pour un exemple d'impl�mentation plus
- pratique.</p>
-
- <pre class="prettyprint lang-config"># la directive de mod_ext_filter qui d�finit le filtre externe
-ExtFilterDefine gzip mode=output cmd=/bin/gzip
-
-&lt;Location /gzipped&gt;
-
- # directive de base permettant de traiter la sortie avec le
- # filtre gzip
- SetOutputFilter gzip
-
- # la directive de mod_headers permettant d'ajouter le champ
- # d'en-t�te "Content-Encoding: gzip"
- Header set Content-Encoding gzip
-&lt;/Location&gt;</pre>
-
-
-
-
- <h3>Ralentissement du serveur</h3>
- <pre class="prettyprint lang-config"># directive de mod_ext_filter d�finissant un filtre qui fait
-# passer tous les flux en sortie par la commande cat ; cat ne
-# modifie rien ; elle ne fait que compliquer le cheminement des
-# flux et consommer des ressources suppl�mentaires
- ExtFilterDefine slowdown mode=output cmd=/bin/cat \
-ExtFilterDefine slowdown mode=output cmd=/bin/cat \
- preservescontentlength
-
-&lt;Location /&gt;
- # directive de base permettant de traiter plusieurs fois la
- # sortie avec le filtre slowdown
- #
- SetOutputFilter slowdown;slowdown;slowdown
-&lt;/Location&gt;</pre>
-
-
-
- <h3>Utilisation de sed pour remplacer du texte dans la
- r�ponse</h3>
-
- <pre class="prettyprint lang-config"># directive de mod_ext_filter d�finissant un filtre qui
-# remplace du texte dans la r�ponse
-#
-ExtFilterDefine fixtext mode=output intype=text/html \
- cmd="/bin/sed s/verdana/arial/g"
-
-&lt;Location /&gt;
- # directive de base permettant de traiter la sortie avec le
- # filtre fixtext
- SetOutputFilter fixtext
-&lt;/Location&gt;</pre>
-
-
-<div class="note">
-<p>Vous pouvez aussi utiliser <code class="module"><a href="../mod/mod_substitute.html">mod_substitute</a></code> pour
-effectuer le m�me traitement sans avoir � invoquer un programme
-externe.</p>
-</div>
-
-
-
- <h3>Tracer un autre filtre</h3>
- <pre class="prettyprint lang-config"># Trace les donn�es lues et �crites par mod_deflate pour un
-# client particulier (IP 192.168.1.31) qui a des probl�mes de
-# compression.
-# Ce premier filtre va tracer ce qui entre dans mod_deflate.
-ExtFilterDefine tracebefore \
- cmd="/bin/tracefilter.pl /tmp/tracebefore" \
- EnableEnv=trace_this_client
-
-# Ce second filtre va tracer ce qui sort de mod_deflate.
-# Notez que sans le param�tre ftype, le type de filtre par
-# d�faut AP_FTYPE_RESOURCE placerait le filtre *avant*
-# mod_deflate dans la cha�ne de filtrage. Le fait d'affecter
-# � ce param�tre une valeur num�rique sensiblement sup�rieure �
-# AP_FTYPE_CONTENT_SET permet de s'assurer que le filtre sera
-# plac� apr�s mod_deflate.
-ExtFilterDefine traceafter \
- cmd="/bin/tracefilter.pl /tmp/traceafter" \
- EnableEnv=trace_this_client ftype=21
-
-&lt;Directory /usr/local/docs&gt;
- SetEnvIf Remote_Addr 192.168.1.31 trace_this_client
- SetOutputFilter tracebefore;deflate;traceafter
-&lt;/Directory&gt;</pre>
-
-
- <div class="example"><h3>Voici le filtre qui trace les donn�es :</h3><pre class="prettyprint lang-perl">#!/usr/local/bin/perl -w
-use strict;
-
-open(SAVE, "&gt;$ARGV[0]")
- or die "can't open $ARGV[0]: $?";
-
-while (&lt;STDIN&gt;) {
- print SAVE $_;
- print $_;
-}
-
-close(SAVE);</pre>
-</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="extfilterdefine" id="extfilterdefine">Directive</a> <a name="ExtFilterDefine" id="ExtFilterDefine">ExtFilterDefine</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit un filtre externe</td></tr>
@@ -350,6 +216,140 @@ close(SAVE);</pre>
seront enregistr�s dans le journal des erreurs d'Apache.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Exemples</a></h2>
+
+ <h3>G�n�rer du HTML � partir d'un autre type de
+ contenu</h3>
+
+ <pre class="prettyprint lang-config"># la directive de mod_ext_filter d�finissant un filtre
+# permettant de mettre des fichiers text/c au format HTML en
+# utilisant le programme externe /usr/bin/enscript, le type du
+# fichier r�sultant �tant d�fini � text/html
+ExtFilterDefine c-to-html mode=output \
+ intype=text/c outtype=text/html \
+ cmd="/usr/bin/enscript --color -W html -Ec -o - -"
+
+&lt;Directory "/export/home/trawick/apacheinst/htdocs/c"&gt;
+ # directive de base permettant de traiter la sortie avec le
+ # nouveau filtre
+ SetOutputFilter c-to-html
+
+ # directive de mod_mime d�finissant le type des fichiers dont
+ # le nom poss�de l'extension .c � text/c
+ AddType text/c .c
+&lt;/Directory&gt;</pre>
+
+
+
+ <h3>Impl�mentation d'un filtre de codage de
+ contenu</h3>
+ <p>Note : cet exemple avec gzip n'est fourni qu'� titre
+ d'illustration. Veuillez vous reporter � la documentation de
+ <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> pour un exemple d'impl�mentation plus
+ pratique.</p>
+
+ <pre class="prettyprint lang-config"># la directive de mod_ext_filter qui d�finit le filtre externe
+ExtFilterDefine gzip mode=output cmd=/bin/gzip
+
+&lt;Location /gzipped&gt;
+
+ # directive de base permettant de traiter la sortie avec le
+ # filtre gzip
+ SetOutputFilter gzip
+
+ # la directive de mod_headers permettant d'ajouter le champ
+ # d'en-t�te "Content-Encoding: gzip"
+ Header set Content-Encoding gzip
+&lt;/Location&gt;</pre>
+
+
+
+
+ <h3>Ralentissement du serveur</h3>
+ <pre class="prettyprint lang-config"># directive de mod_ext_filter d�finissant un filtre qui fait
+# passer tous les flux en sortie par la commande cat ; cat ne
+# modifie rien ; elle ne fait que compliquer le cheminement des
+# flux et consommer des ressources suppl�mentaires
+ ExtFilterDefine slowdown mode=output cmd=/bin/cat \
+ExtFilterDefine slowdown mode=output cmd=/bin/cat \
+ preservescontentlength
+
+&lt;Location /&gt;
+ # directive de base permettant de traiter plusieurs fois la
+ # sortie avec le filtre slowdown
+ #
+ SetOutputFilter slowdown;slowdown;slowdown
+&lt;/Location&gt;</pre>
+
+
+
+ <h3>Utilisation de sed pour remplacer du texte dans la
+ r�ponse</h3>
+
+ <pre class="prettyprint lang-config"># directive de mod_ext_filter d�finissant un filtre qui
+# remplace du texte dans la r�ponse
+#
+ExtFilterDefine fixtext mode=output intype=text/html \
+ cmd="/bin/sed s/verdana/arial/g"
+
+&lt;Location /&gt;
+ # directive de base permettant de traiter la sortie avec le
+ # filtre fixtext
+ SetOutputFilter fixtext
+&lt;/Location&gt;</pre>
+
+
+<div class="note">
+<p>Vous pouvez aussi utiliser <code class="module"><a href="../mod/mod_substitute.html">mod_substitute</a></code> pour
+effectuer le m�me traitement sans avoir � invoquer un programme
+externe.</p>
+</div>
+
+
+
+ <h3>Tracer un autre filtre</h3>
+ <pre class="prettyprint lang-config"># Trace les donn�es lues et �crites par mod_deflate pour un
+# client particulier (IP 192.168.1.31) qui a des probl�mes de
+# compression.
+# Ce premier filtre va tracer ce qui entre dans mod_deflate.
+ExtFilterDefine tracebefore \
+ cmd="/bin/tracefilter.pl /tmp/tracebefore" \
+ EnableEnv=trace_this_client
+
+# Ce second filtre va tracer ce qui sort de mod_deflate.
+# Notez que sans le param�tre ftype, le type de filtre par
+# d�faut AP_FTYPE_RESOURCE placerait le filtre *avant*
+# mod_deflate dans la cha�ne de filtrage. Le fait d'affecter
+# � ce param�tre une valeur num�rique sensiblement sup�rieure �
+# AP_FTYPE_CONTENT_SET permet de s'assurer que le filtre sera
+# plac� apr�s mod_deflate.
+ExtFilterDefine traceafter \
+ cmd="/bin/tracefilter.pl /tmp/traceafter" \
+ EnableEnv=trace_this_client ftype=21
+
+&lt;Directory /usr/local/docs&gt;
+ SetEnvIf Remote_Addr 192.168.1.31 trace_this_client
+ SetOutputFilter tracebefore;deflate;traceafter
+&lt;/Directory&gt;</pre>
+
+
+ <div class="example"><h3>Voici le filtre qui trace les donn�es :</h3><pre class="prettyprint lang-perl">#!/usr/local/bin/perl -w
+use strict;
+
+open(SAVE, "&gt;$ARGV[0]")
+ or die "can't open $ARGV[0]: $?";
+
+while (&lt;STDIN&gt;) {
+ print SAVE $_;
+ print $_;
+}
+
+close(SAVE);</pre>
+</div>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_ext_filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ext_filter.html.ja.utf8 b/docs/manual/mod/mod_ext_filter.html.ja.utf8
index ab7f37ed5b..fbd4d0e31a 100644
--- a/docs/manual/mod/mod_ext_filter.html.ja.utf8
+++ b/docs/manual/mod/mod_ext_filter.html.ja.utf8
@@ -74,6 +74,145 @@
<li><a href="../filter.html">フィルタ</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExtFilterDefine" id="ExtFilterDefine">ExtFilterDefine</a> <a name="extfilterdefine" id="extfilterdefine">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>外部フィルタを定義</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ExtFilterDefine <var>filtername</var> <var>parameters</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_ext_filter</td></tr>
+</table>
+ <p><code class="directive">ExtFilterDefine</code> は、実行するプログラムや
+ 引数など、外部フィルタの特性を定義します。</p>
+
+ <p><var>filtername</var> は定義するフィルタの名前を指定します。
+ この名前は後で <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code>
+ ディレクティブで指定できます。名前は登録されるすべてのフィルタで
+ 一意でなくてはなりません。<em>現時点では、フィルタの登録 API からは
+ エラーは報告されません。ですから、重複する名前を使ってしまったときでも
+ ユーザにはそのことは報告されません。</em></p>
+
+ <p>続くパラメータの順番は関係無く、それらは実行する外部コマンドと、
+ 他の特性を定義します。<code>cmd=</code> だけが必須のパラメータです。
+ 指定可能なパラメータは:</p>
+
+ <dl>
+ <dt><code>cmd=<var>cmdline</var></code></dt>
+
+ <dd><code>cmd=</code> キーワードは実行する外部コマンドを指定します。
+ プログラム名の後に引数がある場合は、コマンド行は引用符で囲む
+ 必要があります (<em>例えば</em>、<code>cmd="<var>/bin/mypgm</var>
+ <var>arg1</var> <var>arg2</var>"</code> のように)。プログラムは
+ シェル経由でなく、直接実行されますので、通常のシェル用の
+ エスケープは必要ありません。プログラムの引数は空白で区切られます。
+ プログラムの引数の一部となる必要のある空白はバックスペースでエスケープ
+ できます。引数の一部になるバックスラッシュはバックスラッシュで
+ エスケープする必要があります。標準の CGI 環境変数に加えて、
+ 環境変数 DOCUMENT_URI, DOCUMENT_PATH_INFO, and
+ QUERY_STRING_UNESCAPED がプログラムのために設定されます。</dd>
+
+ <dt><code>mode=<var>mode</var></code></dt>
+
+ <dd>応答を処理するフィルタには <code>mode=output</code> (デフォルト)
+ を使います。リクエストを処理するフィルタには <code>mode=input</code>
+ を使います。<code>mode=input</code> は Apache 2.1 以降で利用可能です。</dd>
+
+ <dt><code>intype=<var>imt</var></code></dt>
+
+ <dd>このパラメータはフィルタされるべきドキュメントの
+ インターネットメディアタイプ (<em>すなわち</em>、MIME タイプ) を
+ 指定します。デフォルトではすべてのドキュメントがフィルタされます。
+ <code>intype=</code> が指定されていれば、フィルタは指定されていない
+ ドキュメントには適用されなくなります。</dd>
+
+ <dt><code>outtype=<var>imt</var></code></dt>
+
+ <dd>このパラメータはフィルタされたドキュメントの
+ インターネットメディアタイプ (<em>すなわち</em>、MIME タイプ) を
+ 指定します。フィルタ動作にともなってインターネットメディアタイプが
+ 変わる場合に有用です。デフォルトではインターネットメディアタイプは
+ 変更されません。</dd>
+
+ <dt><code>PreservesContentLength</code></dt>
+
+ <dd><code>PreservesContentLength</code> キーワードはフィルタが
+ content length <span class="transnote">(<em>訳注:</em> コンテントの長さ)</span>
+ を変更しないということを指定します。ほとんどのフィルタは
+ content length を変更するため、これはデフォルトではありません。
+ フィルタが長さを変えないときは、このキーワードを指定すると
+ よいでしょう。</dd>
+
+ <dt><code>ftype=<var>filtertype</var></code></dt>
+
+ <dd>このパラメータはフィルタが登録されるべきフィルタタイプの
+ 数値を指定します。ほとんどの場合は、デフォルトの AP_FTYPE_RESOURCE で
+ 十分です。フィルタがフィルタチェーンの別の場所で動作する必要がある
+ 場合は、このパラメータを指定する必要があります。指定可能な値は
+ util_filter.h の AP_FTYPE_foo 定義を参照してください。</dd>
+
+ <dt><code>disableenv=<var>env</var></code></dt>
+
+ <dd>設定されていた場合にフィルタを無効にするための環境変数を
+ 指定します。</dd>
+
+ <dt><code>enableenv=<var>env</var></code></dt>
+
+ <dd>このパラメータはフィルタが有効になるために設定されていなければ
+ ならない環境変数を指定します。</dd>
+ </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExtFilterOptions" id="ExtFilterOptions">ExtFilterOptions</a> <a name="extfilteroptions" id="extfilteroptions">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> のオプションを設定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ExtFilterOptions <var>option</var> [<var>option</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ExtFilterOptions DebugLevel=0 NoLogStderr</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_ext_filter</td></tr>
+</table>
+ <p><code class="directive">ExtFilterOptions</code> ディレクティブは
+ <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> の特別な処理用のオプションを
+ 指定します。<var>Option</var> には以下のどれかを指定します。</p>
+
+ <dl>
+ <dt><code>DebugLevel=<var>n</var></code></dt>
+
+ <dd>
+ <code>DebugLevel</code> で <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>
+ の生成するデバッグメッセージのレベルを設定できます。
+ デフォルトでは、デバッグメッセージは生成されません。
+ これは <code>DebugLevel=0</code> と設定するのと同じです。
+ 数字が大きくなればなるほど、より多くのデバッグメッセージが
+ 生成され、サーバの性能は落ちます。数値の実際の意味は
+ <code>mod_ext_filter.c</code> の先頭近くの DBGLVL_ 定数の
+ 定義で説明されています。
+
+ <p>注: デバッグメッセージを Apache のエラーログに
+ 保存するようにするためには、core のディレクティブ
+ <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code>
+ を使う必要があります。</p>
+ </dd>
+
+ <dt><code>LogStderr | NoLogStderr</code></dt>
+
+ <dd><code>LogStderr</code> キーワードは外部フィルタプログラムにより
+ 標準エラー <span class="transnote">(<em>訳注:</em> stderr)</span> に書かれたメッセージを
+ Apache のエラーログに保存するようにします。<code>NoLogStderr</code> は
+ 逆に保存しないようにします。</dd>
+ </dl>
+
+ <div class="example"><h3>例</h3><p><code>
+ ExtFilterOptions LogStderr DebugLevel=0
+ </code></p></div>
+
+ <p>この例では、フィルタの標準出力に書かれたメッセージは
+ Apache のエラーログに保存されます。<code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> からは
+ デバッグメッセージは生成されません。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="examples" id="examples">例</a></h2>
@@ -225,145 +364,6 @@
</code></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="ExtFilterDefine" id="ExtFilterDefine">ExtFilterDefine</a> <a name="extfilterdefine" id="extfilterdefine">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>外部フィルタを定義</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ExtFilterDefine <var>filtername</var> <var>parameters</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_ext_filter</td></tr>
-</table>
- <p><code class="directive">ExtFilterDefine</code> は、実行するプログラムや
- 引数など、外部フィルタの特性を定義します。</p>
-
- <p><var>filtername</var> は定義するフィルタの名前を指定します。
- この名前は後で <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code>
- ディレクティブで指定できます。名前は登録されるすべてのフィルタで
- 一意でなくてはなりません。<em>現時点では、フィルタの登録 API からは
- エラーは報告されません。ですから、重複する名前を使ってしまったときでも
- ユーザにはそのことは報告されません。</em></p>
-
- <p>続くパラメータの順番は関係無く、それらは実行する外部コマンドと、
- 他の特性を定義します。<code>cmd=</code> だけが必須のパラメータです。
- 指定可能なパラメータは:</p>
-
- <dl>
- <dt><code>cmd=<var>cmdline</var></code></dt>
-
- <dd><code>cmd=</code> キーワードは実行する外部コマンドを指定します。
- プログラム名の後に引数がある場合は、コマンド行は引用符で囲む
- 必要があります (<em>例えば</em>、<code>cmd="<var>/bin/mypgm</var>
- <var>arg1</var> <var>arg2</var>"</code> のように)。プログラムは
- シェル経由でなく、直接実行されますので、通常のシェル用の
- エスケープは必要ありません。プログラムの引数は空白で区切られます。
- プログラムの引数の一部となる必要のある空白はバックスペースでエスケープ
- できます。引数の一部になるバックスラッシュはバックスラッシュで
- エスケープする必要があります。標準の CGI 環境変数に加えて、
- 環境変数 DOCUMENT_URI, DOCUMENT_PATH_INFO, and
- QUERY_STRING_UNESCAPED がプログラムのために設定されます。</dd>
-
- <dt><code>mode=<var>mode</var></code></dt>
-
- <dd>応答を処理するフィルタには <code>mode=output</code> (デフォルト)
- を使います。リクエストを処理するフィルタには <code>mode=input</code>
- を使います。<code>mode=input</code> は Apache 2.1 以降で利用可能です。</dd>
-
- <dt><code>intype=<var>imt</var></code></dt>
-
- <dd>このパラメータはフィルタされるべきドキュメントの
- インターネットメディアタイプ (<em>すなわち</em>、MIME タイプ) を
- 指定します。デフォルトではすべてのドキュメントがフィルタされます。
- <code>intype=</code> が指定されていれば、フィルタは指定されていない
- ドキュメントには適用されなくなります。</dd>
-
- <dt><code>outtype=<var>imt</var></code></dt>
-
- <dd>このパラメータはフィルタされたドキュメントの
- インターネットメディアタイプ (<em>すなわち</em>、MIME タイプ) を
- 指定します。フィルタ動作にともなってインターネットメディアタイプが
- 変わる場合に有用です。デフォルトではインターネットメディアタイプは
- 変更されません。</dd>
-
- <dt><code>PreservesContentLength</code></dt>
-
- <dd><code>PreservesContentLength</code> キーワードはフィルタが
- content length <span class="transnote">(<em>訳注:</em> コンテントの長さ)</span>
- を変更しないということを指定します。ほとんどのフィルタは
- content length を変更するため、これはデフォルトではありません。
- フィルタが長さを変えないときは、このキーワードを指定すると
- よいでしょう。</dd>
-
- <dt><code>ftype=<var>filtertype</var></code></dt>
-
- <dd>このパラメータはフィルタが登録されるべきフィルタタイプの
- 数値を指定します。ほとんどの場合は、デフォルトの AP_FTYPE_RESOURCE で
- 十分です。フィルタがフィルタチェーンの別の場所で動作する必要がある
- 場合は、このパラメータを指定する必要があります。指定可能な値は
- util_filter.h の AP_FTYPE_foo 定義を参照してください。</dd>
-
- <dt><code>disableenv=<var>env</var></code></dt>
-
- <dd>設定されていた場合にフィルタを無効にするための環境変数を
- 指定します。</dd>
-
- <dt><code>enableenv=<var>env</var></code></dt>
-
- <dd>このパラメータはフィルタが有効になるために設定されていなければ
- ならない環境変数を指定します。</dd>
- </dl>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ExtFilterOptions" id="ExtFilterOptions">ExtFilterOptions</a> <a name="extfilteroptions" id="extfilteroptions">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> のオプションを設定</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ExtFilterOptions <var>option</var> [<var>option</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ExtFilterOptions DebugLevel=0 NoLogStderr</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_ext_filter</td></tr>
-</table>
- <p><code class="directive">ExtFilterOptions</code> ディレクティブは
- <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> の特別な処理用のオプションを
- 指定します。<var>Option</var> には以下のどれかを指定します。</p>
-
- <dl>
- <dt><code>DebugLevel=<var>n</var></code></dt>
-
- <dd>
- <code>DebugLevel</code> で <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>
- の生成するデバッグメッセージのレベルを設定できます。
- デフォルトでは、デバッグメッセージは生成されません。
- これは <code>DebugLevel=0</code> と設定するのと同じです。
- 数字が大きくなればなるほど、より多くのデバッグメッセージが
- 生成され、サーバの性能は落ちます。数値の実際の意味は
- <code>mod_ext_filter.c</code> の先頭近くの DBGLVL_ 定数の
- 定義で説明されています。
-
- <p>注: デバッグメッセージを Apache のエラーログに
- 保存するようにするためには、core のディレクティブ
- <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code>
- を使う必要があります。</p>
- </dd>
-
- <dt><code>LogStderr | NoLogStderr</code></dt>
-
- <dd><code>LogStderr</code> キーワードは外部フィルタプログラムにより
- 標準エラー <span class="transnote">(<em>訳注:</em> stderr)</span> に書かれたメッセージを
- Apache のエラーログに保存するようにします。<code>NoLogStderr</code> は
- 逆に保存しないようにします。</dd>
- </dl>
-
- <div class="example"><h3>例</h3><p><code>
- ExtFilterOptions LogStderr DebugLevel=0
- </code></p></div>
-
- <p>この例では、フィルタの標準出力に書かれたメッセージは
- Apache のエラーログに保存されます。<code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> からは
- デバッグメッセージは生成されません。</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_ext_filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ext_filter.html.ko.euc-kr b/docs/manual/mod/mod_ext_filter.html.ko.euc-kr
index 7bc325a747..8a60b5abef 100644
--- a/docs/manual/mod/mod_ext_filter.html.ko.euc-kr
+++ b/docs/manual/mod/mod_ext_filter.html.ko.euc-kr
@@ -73,6 +73,136 @@
<li><a href="../filter.html">����</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExtFilterDefine" id="ExtFilterDefine">ExtFilterDefine</a> <a name="extfilterdefine" id="extfilterdefine">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�ܺ� ���͸� �����Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ExtFilterDefine <var>filtername</var> <var>parameters</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_ext_filter</td></tr>
+</table>
+ <p><code class="directive">ExtFilterDefine</code> ���þ�� �ܺ�
+ ������ ������ ������ ���α׷�, �ƱԸ�Ʈ�� �����Ѵ�.</p>
+
+ <p><var>filtername</var>�� ������ ���� �̸��� �����Ѵ�.
+ �� �̸��� SetOutputFilter ���þ�� ����Ѵ�. ����� ���
+ ���͵鰣�� �̸��� ��ġ�� �ȵȴ�. <em>���� ���͵�� API��
+ ������ �������� �ʴ´�. �׷��� ����ڴ� �̸��� ��ġ�� ������
+ ���� ���Ѵ�.</em></p>
+
+ <p>������ �ܺ� ���ɾ�� �ٸ� ������ �����ϴ� ������ �ƱԸ�Ʈ��
+ � ������ ���͵� �����ϴ�. ��, <code>cmd=</code> �Ķ���ʹ�
+ �ݵ�� �ʿ��ϴ�. ����� �� �ִ� �Ķ���ʹ� ������ ����:</p>
+
+ <dl>
+ <dt><code>cmd=<var>cmdline</var></code></dt>
+
+ <dd><code>cmd=</code> Ű����� ������ �ܺ� ���ɾ �����Ѵ�.
+ ���α׷��� �ڿ� �ƱԸ�Ʈ�� �ִٸ� �������� �ֵ���ǥ��
+ ����� �Ѵ� (<em>���� ���</em>,
+ <code>cmd="<var>/bin/mypgm</var> <var>arg1</var>
+ <var>arg2</var>"</code>). ���� ��ġ���ʰ� ���� ���α׷���
+ �����ϱ⶧���� �Ϲ����� �� ����ǥ�� �ʿ����. ���α׷�
+ �ƱԸ�Ʈ���� �������� �����Ѵ�. ���α׷� �ƱԸ�Ʈ�� ������
+ �ִٸ� ���� �տ� �齽������ ����ؾ� �Ѵ�. �齽������
+ �ƱԸ�Ʈ�� �Ϻζ�� �齽������ �ι� ����ؾ� �Ѵ�. ���α׷���
+ �����Ҷ� ǥ�� CGI ȯ�溯���� �߰��� DOCUMENT_URI,
+ DOCUMENT_PATH_INFO, QUERY_STRING_UNESCAPED ������ �����Ѵ�.</dd>
+
+ <dt><code>mode=<var>mode</var></code></dt>
+
+ <dd>������ ó���ϴ� ���ʹ� (�⺻����) <code>mode=output</code>��
+ ����Ѵ�. ��û�� ó���ϴ� ���ʹ� <code>mode=input</code>��
+ ����Ѵ�. <code>mode=input</code>�� ����ġ 2.1�� �߰��Ǿ���.</dd>
+
+ <dt><code>intype=<var>imt</var></code></dt>
+
+ <dd>�� �Ķ���ʹ� ���ͷ� ó���� ������ ���ͳ� media
+ type(<em>��</em>, MIME type)�� �����Ѵ�. �⺻������ ���
+ ������ ���ͷ� ó���Ѵ�. <code>intype=</code>�� �����ϸ�
+ �ٸ� type�� ������ ���ͷ� ó������ �ʴ´�.</dd>
+
+ <dt><code>outtype=<var>imt</var></code></dt>
+
+ <dd>�� �Ķ���ʹ� ���ͷ� ó���� ������ ���ͳ� media
+ type(<em>��</em>, MIME type)�� �����Ѵ�. ����ó�� �۾��߿�
+ ���ͳ� media type�� �����Ҷ� �����ϴ�. �⺻������, ���ͳ�
+ media type�� ������ �ʴ´�.</dd>
+
+ <dt><code>PreservesContentLength</code></dt>
+
+ <dd><code>PreservesContentLength</code> Ű����� ���Ͱ�
+ content length�� �����ϵ��� �Ѵ�. ��κ��� ���Ͱ� content
+ length�� �����ϹǷ� �� Ű����� �⺻���� �ƴϴ�. ���Ͱ�
+ ���̸� �����Ҷ��� �� Ű���带 ����ؾ� �Ѵ�.</dd>
+
+ <dt><code>ftype=<var>filtertype</var></code></dt>
+
+ <dd>�� �Ķ���ʹ� ���� ������ ���� ���ڰ��� �����Ѵ�.
+ ��κ��� ��� �⺻���� AP_FTYPE_RESOURCE�� �����ϴ�.
+ ���͸� �����ϴ� ������ �ڿ����Ϳ� �޶���ϴ� ��� ��
+ �Ķ���Ͱ� �ʿ��ϴ�. ������ ���� �˷��� util_filter.h��
+ �ִ� AP_FTYPE_* ���Ǹ� �����϶�.</dd>
+
+ <dt><code>disableenv=<var>env</var></code></dt>
+
+ <dd>�� �Ķ���ͷ� ������ ȯ�溯���� ���ǵǾ��ٸ� ���͸�
+ ������� �ʴ´�.</dd>
+
+ <dt><code>enableenv=<var>env</var></code></dt>
+
+ <dd>�� �Ķ���ͷ� ������ ȯ�溯���� ���ǵ� ��� ���͸�
+ ����Ѵ�.</dd>
+ </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExtFilterOptions" id="ExtFilterOptions">ExtFilterOptions</a> <a name="extfilteroptions" id="extfilteroptions">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> �ɼ��� �����Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ExtFilterOptions <var>option</var> [<var>option</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ExtFilterOptions DebugLevel=0 NoLogStderr</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>directory</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_ext_filter</td></tr>
+</table>
+ <p><code class="directive">ExtFilterOptions</code> ���þ��
+ <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>�� Ư���� ó���ɼ��� �����Ѵ�.
+ <var>Option</var>�� ������ �ϳ���.</p>
+
+ <dl>
+ <dt><code>DebugLevel=<var>n</var></code></dt>
+
+ <dd>
+ <code>DebugLevel</code> �����
+ <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>�� ����ϴ� ����� ����
+ ������ ���Ѵ�. �⺻���� ����׹��� ������� �ʴ´�.
+ �̴� <code>DebugLevel=0</code>�� ����. ���� ���ڸ�
+ ����Ҽ���, �� ���� ����׹��� ��ϵǰ� ���� ������
+ ��������. ���ڰ��� ���� �ǹ̴� <code>mod_ext_filter.c</code>
+ �պκп� �ִ� DBGLVL_ ��� ���ǿ� �������ִ�.
+
+ <p>����: ���� �α׸� ����Ϸ��� core ���þ� <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code>�� ����Ͽ� ����׹���
+ ����ġ �����α׿� ����ؾ� �Ѵ�.</p>
+ </dd>
+
+ <dt><code>LogStderr | NoLogStderr</code></dt>
+
+ <dd><code>LogStderr</code> Ű����� �ܺ� ���� ���α׷���
+ ǥ�ؿ����� ����ϴ� ������ ����ġ �����α׿� ����Ѵ�.
+ <code>NoLogStderr</code>�� �� ����� ���� �ʴ´�.</dd>
+ </dl>
+
+ <div class="example"><h3>����</h3><p><code>
+ ExtFilterOptions LogStderr DebugLevel=0
+ </code></p></div>
+
+ <p>���� ������ ����ϸ� ���Ͱ� ǥ�ؿ����� ����ϴ� ������
+ ����ġ �����α׿� ����ϰ�, <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>��
+ ��ü ����׹��� ������� �ʴ´�. </p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="examples" id="examples">����</a></h2>
@@ -217,136 +347,6 @@
</code></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="ExtFilterDefine" id="ExtFilterDefine">ExtFilterDefine</a> <a name="extfilterdefine" id="extfilterdefine">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�ܺ� ���͸� �����Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ExtFilterDefine <var>filtername</var> <var>parameters</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_ext_filter</td></tr>
-</table>
- <p><code class="directive">ExtFilterDefine</code> ���þ�� �ܺ�
- ������ ������ ������ ���α׷�, �ƱԸ�Ʈ�� �����Ѵ�.</p>
-
- <p><var>filtername</var>�� ������ ���� �̸��� �����Ѵ�.
- �� �̸��� SetOutputFilter ���þ�� ����Ѵ�. ����� ���
- ���͵鰣�� �̸��� ��ġ�� �ȵȴ�. <em>���� ���͵�� API��
- ������ �������� �ʴ´�. �׷��� ����ڴ� �̸��� ��ġ�� ������
- ���� ���Ѵ�.</em></p>
-
- <p>������ �ܺ� ���ɾ�� �ٸ� ������ �����ϴ� ������ �ƱԸ�Ʈ��
- � ������ ���͵� �����ϴ�. ��, <code>cmd=</code> �Ķ���ʹ�
- �ݵ�� �ʿ��ϴ�. ����� �� �ִ� �Ķ���ʹ� ������ ����:</p>
-
- <dl>
- <dt><code>cmd=<var>cmdline</var></code></dt>
-
- <dd><code>cmd=</code> Ű����� ������ �ܺ� ���ɾ �����Ѵ�.
- ���α׷��� �ڿ� �ƱԸ�Ʈ�� �ִٸ� �������� �ֵ���ǥ��
- ����� �Ѵ� (<em>���� ���</em>,
- <code>cmd="<var>/bin/mypgm</var> <var>arg1</var>
- <var>arg2</var>"</code>). ���� ��ġ���ʰ� ���� ���α׷���
- �����ϱ⶧���� �Ϲ����� �� ����ǥ�� �ʿ����. ���α׷�
- �ƱԸ�Ʈ���� �������� �����Ѵ�. ���α׷� �ƱԸ�Ʈ�� ������
- �ִٸ� ���� �տ� �齽������ ����ؾ� �Ѵ�. �齽������
- �ƱԸ�Ʈ�� �Ϻζ�� �齽������ �ι� ����ؾ� �Ѵ�. ���α׷���
- �����Ҷ� ǥ�� CGI ȯ�溯���� �߰��� DOCUMENT_URI,
- DOCUMENT_PATH_INFO, QUERY_STRING_UNESCAPED ������ �����Ѵ�.</dd>
-
- <dt><code>mode=<var>mode</var></code></dt>
-
- <dd>������ ó���ϴ� ���ʹ� (�⺻����) <code>mode=output</code>��
- ����Ѵ�. ��û�� ó���ϴ� ���ʹ� <code>mode=input</code>��
- ����Ѵ�. <code>mode=input</code>�� ����ġ 2.1�� �߰��Ǿ���.</dd>
-
- <dt><code>intype=<var>imt</var></code></dt>
-
- <dd>�� �Ķ���ʹ� ���ͷ� ó���� ������ ���ͳ� media
- type(<em>��</em>, MIME type)�� �����Ѵ�. �⺻������ ���
- ������ ���ͷ� ó���Ѵ�. <code>intype=</code>�� �����ϸ�
- �ٸ� type�� ������ ���ͷ� ó������ �ʴ´�.</dd>
-
- <dt><code>outtype=<var>imt</var></code></dt>
-
- <dd>�� �Ķ���ʹ� ���ͷ� ó���� ������ ���ͳ� media
- type(<em>��</em>, MIME type)�� �����Ѵ�. ����ó�� �۾��߿�
- ���ͳ� media type�� �����Ҷ� �����ϴ�. �⺻������, ���ͳ�
- media type�� ������ �ʴ´�.</dd>
-
- <dt><code>PreservesContentLength</code></dt>
-
- <dd><code>PreservesContentLength</code> Ű����� ���Ͱ�
- content length�� �����ϵ��� �Ѵ�. ��κ��� ���Ͱ� content
- length�� �����ϹǷ� �� Ű����� �⺻���� �ƴϴ�. ���Ͱ�
- ���̸� �����Ҷ��� �� Ű���带 ����ؾ� �Ѵ�.</dd>
-
- <dt><code>ftype=<var>filtertype</var></code></dt>
-
- <dd>�� �Ķ���ʹ� ���� ������ ���� ���ڰ��� �����Ѵ�.
- ��κ��� ��� �⺻���� AP_FTYPE_RESOURCE�� �����ϴ�.
- ���͸� �����ϴ� ������ �ڿ����Ϳ� �޶���ϴ� ��� ��
- �Ķ���Ͱ� �ʿ��ϴ�. ������ ���� �˷��� util_filter.h��
- �ִ� AP_FTYPE_* ���Ǹ� �����϶�.</dd>
-
- <dt><code>disableenv=<var>env</var></code></dt>
-
- <dd>�� �Ķ���ͷ� ������ ȯ�溯���� ���ǵǾ��ٸ� ���͸�
- ������� �ʴ´�.</dd>
-
- <dt><code>enableenv=<var>env</var></code></dt>
-
- <dd>�� �Ķ���ͷ� ������ ȯ�溯���� ���ǵ� ��� ���͸�
- ����Ѵ�.</dd>
- </dl>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ExtFilterOptions" id="ExtFilterOptions">ExtFilterOptions</a> <a name="extfilteroptions" id="extfilteroptions">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> �ɼ��� �����Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ExtFilterOptions <var>option</var> [<var>option</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ExtFilterOptions DebugLevel=0 NoLogStderr</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>directory</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_ext_filter</td></tr>
-</table>
- <p><code class="directive">ExtFilterOptions</code> ���þ��
- <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>�� Ư���� ó���ɼ��� �����Ѵ�.
- <var>Option</var>�� ������ �ϳ���.</p>
-
- <dl>
- <dt><code>DebugLevel=<var>n</var></code></dt>
-
- <dd>
- <code>DebugLevel</code> �����
- <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>�� ����ϴ� ����� ����
- ������ ���Ѵ�. �⺻���� ����׹��� ������� �ʴ´�.
- �̴� <code>DebugLevel=0</code>�� ����. ���� ���ڸ�
- ����Ҽ���, �� ���� ����׹��� ��ϵǰ� ���� ������
- ��������. ���ڰ��� ���� �ǹ̴� <code>mod_ext_filter.c</code>
- �պκп� �ִ� DBGLVL_ ��� ���ǿ� �������ִ�.
-
- <p>����: ���� �α׸� ����Ϸ��� core ���þ� <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code>�� ����Ͽ� ����׹���
- ����ġ �����α׿� ����ؾ� �Ѵ�.</p>
- </dd>
-
- <dt><code>LogStderr | NoLogStderr</code></dt>
-
- <dd><code>LogStderr</code> Ű����� �ܺ� ���� ���α׷���
- ǥ�ؿ����� ����ϴ� ������ ����ġ �����α׿� ����Ѵ�.
- <code>NoLogStderr</code>�� �� ����� ���� �ʴ´�.</dd>
- </dl>
-
- <div class="example"><h3>����</h3><p><code>
- ExtFilterOptions LogStderr DebugLevel=0
- </code></p></div>
-
- <p>���� ������ ����ϸ� ���Ͱ� ǥ�ؿ����� ����ϴ� ������
- ����ġ �����α׿� ����ϰ�, <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>��
- ��ü ����׹��� ������� �ʴ´�. </p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_ext_filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_file_cache.html.en b/docs/manual/mod/mod_file_cache.html.en
index e2fba57cc5..ab0bbbdb3a 100644
--- a/docs/manual/mod/mod_file_cache.html.en
+++ b/docs/manual/mod/mod_file_cache.html.en
@@ -70,6 +70,64 @@
<li><img alt="" src="../images/down.gif" /> <a href="#using">Using mod_file_cache</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheFile" id="CacheFile">CacheFile</a> <a name="cachefile" id="cachefile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cache a list of file handles at startup time</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheFile <var>file-path</var> [<var>file-path</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_file_cache</td></tr>
+</table>
+ <p>The <code class="directive">CacheFile</code> directive opens handles to
+ one or more files (given as whitespace separated arguments) and
+ places these handles into the cache at server startup
+ time. Handles to cached files are automatically closed on a server
+ shutdown. When the files have changed on the filesystem, the
+ server should be restarted to re-cache them.</p>
+
+ <p>Be careful with the <var>file-path</var> arguments: They have
+ to literally match the filesystem path Apache's URL-to-filename
+ translation handlers create. We cannot compare inodes or other
+ stuff to match paths through symbolic links <em>etc.</em>
+ because that again would cost extra <code>stat()</code> system
+ calls which is not acceptable. This module may or may not work
+ with filenames rewritten by <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> or
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
+
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">CacheFile /usr/local/apache/htdocs/index.html</pre>
+</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="MMapFile" id="MMapFile">MMapFile</a> <a name="mmapfile" id="mmapfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Map a list of files into memory at startup time</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MMapFile <var>file-path</var> [<var>file-path</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_file_cache</td></tr>
+</table>
+ <p>The <code class="directive">MMapFile</code> directive maps one or more files
+ (given as whitespace separated arguments) into memory at server
+ startup time. They are automatically unmapped on a server
+ shutdown. When the files have changed on the filesystem at
+ least a <code>HUP</code> or <code>USR1</code> signal should be send to
+ the server to re-<code>mmap()</code> them.</p>
+
+ <p>Be careful with the <var>file-path</var> arguments: They have
+ to literally match the filesystem path Apache's URL-to-filename
+ translation handlers create. We cannot compare inodes or other
+ stuff to match paths through symbolic links <em>etc.</em>
+ because that again would cost extra <code>stat()</code> system
+ calls which is not acceptable. This module may or may not work
+ with filenames rewritten by <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> or
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
+
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">MMapFile /usr/local/apache/htdocs/index.html</pre>
+</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="using" id="using">Using mod_file_cache</a></h2>
@@ -144,64 +202,6 @@
</code></p></div>
</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="CacheFile" id="CacheFile">CacheFile</a> <a name="cachefile" id="cachefile">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cache a list of file handles at startup time</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheFile <var>file-path</var> [<var>file-path</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_file_cache</td></tr>
-</table>
- <p>The <code class="directive">CacheFile</code> directive opens handles to
- one or more files (given as whitespace separated arguments) and
- places these handles into the cache at server startup
- time. Handles to cached files are automatically closed on a server
- shutdown. When the files have changed on the filesystem, the
- server should be restarted to re-cache them.</p>
-
- <p>Be careful with the <var>file-path</var> arguments: They have
- to literally match the filesystem path Apache's URL-to-filename
- translation handlers create. We cannot compare inodes or other
- stuff to match paths through symbolic links <em>etc.</em>
- because that again would cost extra <code>stat()</code> system
- calls which is not acceptable. This module may or may not work
- with filenames rewritten by <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> or
- <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
-
- <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">CacheFile /usr/local/apache/htdocs/index.html</pre>
-</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="MMapFile" id="MMapFile">MMapFile</a> <a name="mmapfile" id="mmapfile">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Map a list of files into memory at startup time</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MMapFile <var>file-path</var> [<var>file-path</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_file_cache</td></tr>
-</table>
- <p>The <code class="directive">MMapFile</code> directive maps one or more files
- (given as whitespace separated arguments) into memory at server
- startup time. They are automatically unmapped on a server
- shutdown. When the files have changed on the filesystem at
- least a <code>HUP</code> or <code>USR1</code> signal should be send to
- the server to re-<code>mmap()</code> them.</p>
-
- <p>Be careful with the <var>file-path</var> arguments: They have
- to literally match the filesystem path Apache's URL-to-filename
- translation handlers create. We cannot compare inodes or other
- stuff to match paths through symbolic links <em>etc.</em>
- because that again would cost extra <code>stat()</code> system
- calls which is not acceptable. This module may or may not work
- with filenames rewritten by <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> or
- <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
-
- <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">MMapFile /usr/local/apache/htdocs/index.html</pre>
-</div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_file_cache.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_file_cache.html.fr b/docs/manual/mod/mod_file_cache.html.fr
index d499be35ff..441436cb0d 100644
--- a/docs/manual/mod/mod_file_cache.html.fr
+++ b/docs/manual/mod/mod_file_cache.html.fr
@@ -78,6 +78,72 @@ fichiers</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#using">Utilisation de mod_file_cache</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="cachefile" id="cachefile">Directive</a> <a name="CacheFile" id="CacheFile">CacheFile</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Met en cache une liste de gestionnaires de fichiers au
+d�marrage</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>CacheFile <var>chemin fichier</var> [<var>chemin fichier</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_file_cache</td></tr>
+</table>
+ <p>La directive <code class="directive">CacheFile</code> permet d'associer
+ des gestionnaires � un ou plusieurs fichiers (s�par�s par des
+ espaces), et de placer ceux-ci dans le cache au d�marrage du
+ serveur. Les gestionnaires des fichiers mis en cache sont
+ automatiquement ferm�s � l'arr�t du serveur. Lorsqu'un ou plusieurs
+ fichiers ont �t� modifi�s sur disque, le serveur doit �tre red�marr�
+ afin que les modifications soient prises en compte par le cache.</p>
+
+ <p>Soyez prudent avec les arguments <var>chemin fichier</var> : ils
+ doivent correspondre exactement au chemin du syst�me de fichier que
+ cr�ent les gestionnaires de traduction URL-vers-nom-fichier
+ d'Apache. On ne peut pas comparer des inodes ou autres identifiants
+ pour mettre en correspondance des chemins � l'aide de liens
+ symboliques <em>(etc...)</em>, car l� encore, ceci n�cessiterait un
+ appel � <code>stat()</code> suppl�mentaire, ce qui n'est pas acceptable.
+ Il n'est pas garanti que ce module fonctionne avec des noms de
+ fichiers r��crits par <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> ou
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
+
+ <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">CacheFile /usr/local/apache/htdocs/index.html</pre>
+</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="mmapfile" id="mmapfile">Directive</a> <a name="MMapFile" id="MMapFile">MMapFile</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Charge au d�marrage une liste de fichiers en m�moire</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>MMapFile <var>chemin fichier</var> [<var>chemin fichier</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_file_cache</td></tr>
+</table>
+ <p>La directive <code class="directive">MMapFile</code> permet de charger un
+ ou plusieurs fichiers (s�par�s par des espaces) en m�moire au
+ d�marrage du serveur. Ceux-ci sont automatiquement d�charg�s de la
+ m�moire � l'arr�t du serveur. Lorsqu'un ou plusieurs fichiers ont
+ �t� modifi�s sur disque, on doit au minimum envoyer un signal
+ <code>HUP</code> ou <code>USR1</code> au serveur afin de les
+ re<code>mmap()</code>er.</p>
+
+ <p>Soyez prudent avec les arguments <var>chemin fichier</var> : ils
+ doivent correspondre exactement au chemin du syst�me de fichier que
+ cr�ent les gestionnaires de traduction URL-vers-nom-fichier
+ d'Apache. On ne peut pas comparer des inodes ou autres identifiants
+ pour mettre en correspondance des chemins � l'aide de liens
+ symboliques <em>(etc...)</em>, car l� encore, ceci n�cessiterait un
+ appel � <code>stat()</code> suppl�mentaire, ce qui n'est pas
+ acceptable.
+ Il n'est pas garanti que ce module fonctionne avec des noms de
+ fichiers r��crits par <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> ou
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
+
+ <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">MMapFile /usr/local/apache/htdocs/index.html</pre>
+</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="using" id="using">Utilisation de mod_file_cache</a></h2>
@@ -169,72 +235,6 @@ fichiers</td></tr>
</code></p></div>
</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="cachefile" id="cachefile">Directive</a> <a name="CacheFile" id="CacheFile">CacheFile</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Met en cache une liste de gestionnaires de fichiers au
-d�marrage</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>CacheFile <var>chemin fichier</var> [<var>chemin fichier</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_file_cache</td></tr>
-</table>
- <p>La directive <code class="directive">CacheFile</code> permet d'associer
- des gestionnaires � un ou plusieurs fichiers (s�par�s par des
- espaces), et de placer ceux-ci dans le cache au d�marrage du
- serveur. Les gestionnaires des fichiers mis en cache sont
- automatiquement ferm�s � l'arr�t du serveur. Lorsqu'un ou plusieurs
- fichiers ont �t� modifi�s sur disque, le serveur doit �tre red�marr�
- afin que les modifications soient prises en compte par le cache.</p>
-
- <p>Soyez prudent avec les arguments <var>chemin fichier</var> : ils
- doivent correspondre exactement au chemin du syst�me de fichier que
- cr�ent les gestionnaires de traduction URL-vers-nom-fichier
- d'Apache. On ne peut pas comparer des inodes ou autres identifiants
- pour mettre en correspondance des chemins � l'aide de liens
- symboliques <em>(etc...)</em>, car l� encore, ceci n�cessiterait un
- appel � <code>stat()</code> suppl�mentaire, ce qui n'est pas acceptable.
- Il n'est pas garanti que ce module fonctionne avec des noms de
- fichiers r��crits par <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> ou
- <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
-
- <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">CacheFile /usr/local/apache/htdocs/index.html</pre>
-</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="mmapfile" id="mmapfile">Directive</a> <a name="MMapFile" id="MMapFile">MMapFile</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Charge au d�marrage une liste de fichiers en m�moire</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>MMapFile <var>chemin fichier</var> [<var>chemin fichier</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_file_cache</td></tr>
-</table>
- <p>La directive <code class="directive">MMapFile</code> permet de charger un
- ou plusieurs fichiers (s�par�s par des espaces) en m�moire au
- d�marrage du serveur. Ceux-ci sont automatiquement d�charg�s de la
- m�moire � l'arr�t du serveur. Lorsqu'un ou plusieurs fichiers ont
- �t� modifi�s sur disque, on doit au minimum envoyer un signal
- <code>HUP</code> ou <code>USR1</code> au serveur afin de les
- re<code>mmap()</code>er.</p>
-
- <p>Soyez prudent avec les arguments <var>chemin fichier</var> : ils
- doivent correspondre exactement au chemin du syst�me de fichier que
- cr�ent les gestionnaires de traduction URL-vers-nom-fichier
- d'Apache. On ne peut pas comparer des inodes ou autres identifiants
- pour mettre en correspondance des chemins � l'aide de liens
- symboliques <em>(etc...)</em>, car l� encore, ceci n�cessiterait un
- appel � <code>stat()</code> suppl�mentaire, ce qui n'est pas
- acceptable.
- Il n'est pas garanti que ce module fonctionne avec des noms de
- fichiers r��crits par <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> ou
- <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
-
- <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">MMapFile /usr/local/apache/htdocs/index.html</pre>
-</div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_file_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_file_cache.html.ko.euc-kr b/docs/manual/mod/mod_file_cache.html.ko.euc-kr
index 300804af31..892a51308b 100644
--- a/docs/manual/mod/mod_file_cache.html.ko.euc-kr
+++ b/docs/manual/mod/mod_file_cache.html.ko.euc-kr
@@ -71,6 +71,63 @@
<li><img alt="" src="../images/down.gif" /> <a href="#using">mod_file_cache ����ϱ�</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheFile" id="CacheFile">CacheFile</a> <a name="cachefile" id="cachefile">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>���۽� ���� ���� �ڵ��� ij���Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>CacheFile <var>file-path</var> [<var>file-path</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_file_cache</td></tr>
+</table>
+ <p><code class="directive">CacheFile</code> ���þ�� ������ �����Ҷ�
+ ���� ������ ����(open) ���ϵ��� �ڵ��� ij���� �����Ѵ�.
+ ���� ����� �ڵ����� ij���� ������ �ڵ��� �ݴ´�(close).
+ ���Ͻý��ۿ��� ������ ����Ǹ� ������ �ٽ� ij���ϱ�����
+ ������ ������ؾ� �Ѵ�.</p>
+
+ <p><var>file-path</var> �ƱԸ�Ʈ�� �����ض�. �ƱԸ�Ʈ��
+ ����ġ�� URL-���ϸ� ��ȯ �ڵ鷯�� ���� ���Ͻý��� ��ο�
+ ��Ȯ�� ��ġ�ؾ� �Ѵ�. �ѹ� �� ���ʿ��� <code>stat()</code>
+ �ý���ȣ���� �ʿ��ϱ⶧���� inode�� �ɺ���ũ <em>��</em>��
+ ��θ� ������ �� ����. �� ����� <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code>��
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>�� ���ۼ��� ���ϸ��� �ٷ� ��
+ �ֱ⵵ ���⵵ �ϴ�.</p>
+
+ <div class="example"><h3>����</h3><p><code>
+ CacheFile /usr/local/apache/htdocs/index.html
+ </code></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="MMapFile" id="MMapFile">MMapFile</a> <a name="mmapfile" id="mmapfile">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>���۽� ���� ������ �޸𸮿� �����Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>MMapFile <var>file-path</var> [<var>file-path</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_file_cache</td></tr>
+</table>
+ <p><code class="directive">MMapFile</code> ���þ�� ������ �����Ҷ�
+ (�������� ������ �ƱԸ�Ʈ�� ������) ���� ������ �޸𸮿�
+ �����Ѵ�(map). ���� ����� �ڵ����� ������ Ǭ��(unmap).
+ ���Ͻý��ۿ��� ������ ����Ǹ� ���ϵ��� �ٽ�
+ <code>mmap()</code>�ϱ����� �ּ��� ������ <code>HUP</code>�̳�
+ <code>USR1</code> �ñ׳��� ������ �Ѵ�.</p>
+
+ <p><var>file-path</var> �ƱԸ�Ʈ�� �����ض�. �ƱԸ�Ʈ��
+ ����ġ�� URL-���ϸ� ��ȯ �ڵ鷯�� ���� ���Ͻý��� ��ο�
+ ��Ȯ�� ��ġ�ؾ� �Ѵ�. �ѹ� �� ���ʿ��� <code>stat()</code>
+ �ý���ȣ���� �ʿ��ϱ⶧���� inode�� �ɺ���ũ <em>��</em>��
+ ��θ� ������ �� ����. �� ����� <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code>��
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>�� ���ۼ��� ���ϸ��� �ٷ� ��
+ �ֱ⵵ ���⵵ �ϴ�.</p>
+
+ <div class="example"><h3>����</h3><p><code>
+ MMapFile /usr/local/apache/htdocs/index.html
+ </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="using" id="using">mod_file_cache ����ϱ�</a></h2>
@@ -139,63 +196,6 @@
</code></p></div>
</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="CacheFile" id="CacheFile">CacheFile</a> <a name="cachefile" id="cachefile">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>���۽� ���� ���� �ڵ��� ij���Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>CacheFile <var>file-path</var> [<var>file-path</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_file_cache</td></tr>
-</table>
- <p><code class="directive">CacheFile</code> ���þ�� ������ �����Ҷ�
- ���� ������ ����(open) ���ϵ��� �ڵ��� ij���� �����Ѵ�.
- ���� ����� �ڵ����� ij���� ������ �ڵ��� �ݴ´�(close).
- ���Ͻý��ۿ��� ������ ����Ǹ� ������ �ٽ� ij���ϱ�����
- ������ ������ؾ� �Ѵ�.</p>
-
- <p><var>file-path</var> �ƱԸ�Ʈ�� �����ض�. �ƱԸ�Ʈ��
- ����ġ�� URL-���ϸ� ��ȯ �ڵ鷯�� ���� ���Ͻý��� ��ο�
- ��Ȯ�� ��ġ�ؾ� �Ѵ�. �ѹ� �� ���ʿ��� <code>stat()</code>
- �ý���ȣ���� �ʿ��ϱ⶧���� inode�� �ɺ���ũ <em>��</em>��
- ��θ� ������ �� ����. �� ����� <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code>��
- <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>�� ���ۼ��� ���ϸ��� �ٷ� ��
- �ֱ⵵ ���⵵ �ϴ�.</p>
-
- <div class="example"><h3>����</h3><p><code>
- CacheFile /usr/local/apache/htdocs/index.html
- </code></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="MMapFile" id="MMapFile">MMapFile</a> <a name="mmapfile" id="mmapfile">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>���۽� ���� ������ �޸𸮿� �����Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>MMapFile <var>file-path</var> [<var>file-path</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_file_cache</td></tr>
-</table>
- <p><code class="directive">MMapFile</code> ���þ�� ������ �����Ҷ�
- (�������� ������ �ƱԸ�Ʈ�� ������) ���� ������ �޸𸮿�
- �����Ѵ�(map). ���� ����� �ڵ����� ������ Ǭ��(unmap).
- ���Ͻý��ۿ��� ������ ����Ǹ� ���ϵ��� �ٽ�
- <code>mmap()</code>�ϱ����� �ּ��� ������ <code>HUP</code>�̳�
- <code>USR1</code> �ñ׳��� ������ �Ѵ�.</p>
-
- <p><var>file-path</var> �ƱԸ�Ʈ�� �����ض�. �ƱԸ�Ʈ��
- ����ġ�� URL-���ϸ� ��ȯ �ڵ鷯�� ���� ���Ͻý��� ��ο�
- ��Ȯ�� ��ġ�ؾ� �Ѵ�. �ѹ� �� ���ʿ��� <code>stat()</code>
- �ý���ȣ���� �ʿ��ϱ⶧���� inode�� �ɺ���ũ <em>��</em>��
- ��θ� ������ �� ����. �� ����� <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code>��
- <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>�� ���ۼ��� ���ϸ��� �ٷ� ��
- �ֱ⵵ ���⵵ �ϴ�.</p>
-
- <div class="example"><h3>����</h3><p><code>
- MMapFile /usr/local/apache/htdocs/index.html
- </code></p></div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_file_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_filter.html.en b/docs/manual/mod/mod_filter.html.en
index ba54748b99..2880584819 100644
--- a/docs/manual/mod/mod_filter.html.en
+++ b/docs/manual/mod/mod_filter.html.en
@@ -66,200 +66,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#protocol">Protocol Handling</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="smart" id="smart">Smart Filtering</a></h2>
- <p>In the traditional filtering model, filters are inserted unconditionally
- using <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code> and family.
- Each filter then needs to determine whether to run, and there is little
- flexibility available for server admins to allow the chain to be
- configured dynamically.</p>
-
- <p><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> by contrast gives server administrators a
- great deal of flexibility in configuring the filter chain. In fact,
- filters can be inserted based on complex boolean
- <a href="../expr.html">expressions</a> This generalises the limited
- flexibility offered by <code class="directive">AddOutputFilterByType</code>.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="terms" id="terms">Filter Declarations, Providers and Chains</a></h2>
- <p class="figure">
- <img src="../images/mod_filter_old.gif" width="160" height="310" alt="[This image displays the traditional filter model]" /><br />
- <dfn>Figure 1:</dfn> The traditional filter model</p>
-
- <p>In the traditional model, output filters are a simple chain
- from the content generator (handler) to the client. This works well
- provided the filter chain can be correctly configured, but presents
- problems when the filters need to be configured dynamically based on
- the outcome of the handler.</p>
-
- <p class="figure">
- <img src="../images/mod_filter_new.gif" width="423" height="331" alt="[This image shows the mod_filter model]" /><br />
- <dfn>Figure 2:</dfn> The <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> model</p>
-
- <p><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> works by introducing indirection into
- the filter chain. Instead of inserting filters in the chain, we insert
- a filter harness which in turn dispatches conditionally
- to a filter provider. Any content filter may be used as a provider
- to <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>; no change to existing filter modules
- is required (although it may be possible to simplify them). There can be
- multiple providers for one filter, but no more than one provider will
- run for any single request.</p>
-
- <p>A filter chain comprises any number of instances of the filter
- harness, each of which may have any number of providers. A special
- case is that of a single provider with unconditional dispatch: this
- is equivalent to inserting the provider filter directly into the chain.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="config" id="config">Configuring the Chain</a></h2>
- <p>There are three stages to configuring a filter chain with
- <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>. For details of the directives, see below.</p>
-
- <dl>
- <dt>Declare Filters</dt>
- <dd>The <code class="directive"><a href="#filterdeclare">FilterDeclare</a></code> directive
- declares a filter, assigning it a name and filter type. Required
- only if the filter is not the default type AP_FTYPE_RESOURCE.</dd>
-
- <dt>Register Providers</dt>
- <dd>The <code class="directive"><a href="#filterprovider">FilterProvider</a></code>
- directive registers a provider with a filter. The filter may have
- been declared with <code class="directive"><a href="#filterdeclare">FilterDeclare</a></code>; if not, FilterProvider will implicitly
- declare it with the default type AP_FTYPE_RESOURCE. The provider
- must have been
- registered with <code>ap_register_output_filter</code> by some module.
- The final argument to <code class="directive"><a href="#filterprovider">FilterProvider</a></code> is an expression: the provider will be
- selected to run for a request if and only if the expression evaluates
- to true. The expression may evaluate HTTP request or response
- headers, environment variables, or the Handler used by this request.
- Unlike earlier versions, mod_filter now supports complex expressions
- involving multiple criteria with AND / OR logic (&amp;&amp; / ||)
- and brackets. The details of the expression syntax are described in
- the <a href="../expr.html">ap_expr documentation</a>.</dd>
-
- <dt>Configure the Chain</dt>
- <dd>The above directives build components of a smart filter chain,
- but do not configure it to run. The <code class="directive"><a href="#filterchain">FilterChain</a></code> directive builds a filter chain from smart
- filters declared, offering the flexibility to insert filters at the
- beginning or end of the chain, remove a filter, or clear the chain.</dd>
-</dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="errordocs" id="errordocs">Filtering and Response Status</a></h2>
- <p>mod_filter normally only runs filters on responses with
- HTTP status 200 (OK). If you want to filter documents with
- other response statuses, you can set the <var>filter-errordocs</var>
- environment variable, and it will work on all responses
- regardless of status. To refine this further, you can use
- expression conditions with <code class="directive">FilterProvider</code>.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="upgrade" id="upgrade">Upgrading from Apache HTTP Server 2.2 Configuration</a></h2>
- <p>The <code class="directive"><a href="#filterprovider">FilterProvider</a></code>
- directive has changed from httpd 2.2: the <var>match</var> and
- <var>dispatch</var> arguments are replaced with a single but
- more versatile <var>expression</var>. In general, you can convert
- a match/dispatch pair to the two sides of an expression, using
- something like:</p>
- <div class="example"><p><code>"dispatch = 'match'"</code></p></div>
- <p>The Request headers, Response headers and Environment variables
- are now interpreted from syntax <var>%{req:foo}</var>,
- <var>%{resp:foo}</var> and <var>%{env:foo}</var> respectively.
- The variables <var>%{HANDLER}</var> and <var>%{CONTENT_TYPE}</var>
- are also supported.</p>
- <p>Note that the match no longer support substring matches. They can be
- replaced by regular expression matches.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Examples</a></h2>
- <dl>
- <dt>Server side Includes (SSI)</dt>
- <dd>A simple case of replacing <code class="directive">AddOutputFilterByType</code>
- <pre class="prettyprint lang-config">FilterDeclare SSI
-FilterProvider SSI INCLUDES "%{CONTENT_TYPE} =~ m|^text/html|"
-FilterChain SSI</pre>
-
- </dd>
-
- <dt>Server side Includes (SSI)</dt>
- <dd>The same as the above but dispatching on handler (classic
- SSI behaviour; .shtml files get processed).
- <pre class="prettyprint lang-config">FilterProvider SSI INCLUDES "%{HANDLER} = 'server-parsed'"
-FilterChain SSI</pre>
-
- </dd>
-
- <dt>Emulating mod_gzip with mod_deflate</dt>
- <dd>Insert INFLATE filter only if "gzip" is NOT in the
- Accept-Encoding header. This filter runs with ftype CONTENT_SET.
- <pre class="prettyprint lang-config">FilterDeclare gzip CONTENT_SET
-FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/"
-FilterChain gzip</pre>
-
- </dd>
-
- <dt>Image Downsampling</dt>
- <dd>Suppose we want to downsample all web images, and have filters
- for GIF, JPEG and PNG.
- <pre class="prettyprint lang-config">FilterProvider unpack jpeg_unpack "%{CONTENT_TYPE} = 'image/jpeg'"
-FilterProvider unpack gif_unpack "%{CONTENT_TYPE} = 'image/gif'"
-FilterProvider unpack png_unpack "%{CONTENT_TYPE} = 'image/png'"
-
-FilterProvider downsample downsample_filter "%{CONTENT_TYPE} = m|^image/(jpeg|gif|png)|"
-FilterProtocol downsample "change=yes"
-
-FilterProvider repack jpeg_pack "%{CONTENT_TYPE} = 'image/jpeg'"
-FilterProvider repack gif_pack "%{CONTENT_TYPE} = 'image/gif'"
-FilterProvider repack png_pack "%{CONTENT_TYPE} = 'image/png'"
-&lt;Location "/image-filter"&gt;
- FilterChain unpack downsample repack
-&lt;/Location&gt;</pre>
-
- </dd>
- </dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="protocol" id="protocol">Protocol Handling</a></h2>
- <p>Historically, each filter is responsible for ensuring that whatever
- changes it makes are correctly represented in the HTTP response headers,
- and that it does not run when it would make an illegal change. This
- imposes a burden on filter authors to re-implement some common
- functionality in every filter:</p>
-
- <ul>
- <li>Many filters will change the content, invalidating existing content
- tags, checksums, hashes, and lengths.</li>
-
- <li>Filters that require an entire, unbroken response in input need to
- ensure they don't get byteranges from a backend.</li>
-
- <li>Filters that transform output in a filter need to ensure they don't
- violate a <code>Cache-Control: no-transform</code> header from the
- backend.</li>
-
- <li>Filters may make responses uncacheable.</li>
- </ul>
-
- <p><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> aims to offer generic handling of these
- details of filter implementation, reducing the complexity required of
- content filter modules. This is work-in-progress; the
- <code class="directive"><a href="#filterprotocol">FilterProtocol</a></code> implements
- some of this functionality for back-compatibility with Apache 2.0
- modules. For httpd 2.1 and later, the
- <code>ap_register_output_filter_protocol</code> and
- <code>ap_filter_protocol</code> API enables filter modules to
- declare their own behaviour.</p>
-
- <p>At the same time, <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> should not interfere
- with a filter that wants to handle all aspects of the protocol. By
- default (i.e. in the absence of any <code class="directive"><a href="#filterprotocol">FilterProtocol</a></code> directives), <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>
- will leave the headers untouched.</p>
-
- <p>At the time of writing, this feature is largely untested,
- as modules in common use are designed to work with 2.0.
- Modules using it should test it carefully.</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="AddOutputFilterByType" id="AddOutputFilterByType">AddOutputFilterByType</a> <a name="addoutputfilterbytype" id="addoutputfilterbytype">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>assigns an output filter to a particular media-type</td></tr>
@@ -490,6 +296,200 @@ for a complete reference and examples.</li>
</dl>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="smart" id="smart">Smart Filtering</a></h2>
+ <p>In the traditional filtering model, filters are inserted unconditionally
+ using <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code> and family.
+ Each filter then needs to determine whether to run, and there is little
+ flexibility available for server admins to allow the chain to be
+ configured dynamically.</p>
+
+ <p><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> by contrast gives server administrators a
+ great deal of flexibility in configuring the filter chain. In fact,
+ filters can be inserted based on complex boolean
+ <a href="../expr.html">expressions</a> This generalises the limited
+ flexibility offered by <code class="directive">AddOutputFilterByType</code>.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="terms" id="terms">Filter Declarations, Providers and Chains</a></h2>
+ <p class="figure">
+ <img src="../images/mod_filter_old.gif" width="160" height="310" alt="[This image displays the traditional filter model]" /><br />
+ <dfn>Figure 1:</dfn> The traditional filter model</p>
+
+ <p>In the traditional model, output filters are a simple chain
+ from the content generator (handler) to the client. This works well
+ provided the filter chain can be correctly configured, but presents
+ problems when the filters need to be configured dynamically based on
+ the outcome of the handler.</p>
+
+ <p class="figure">
+ <img src="../images/mod_filter_new.gif" width="423" height="331" alt="[This image shows the mod_filter model]" /><br />
+ <dfn>Figure 2:</dfn> The <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> model</p>
+
+ <p><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> works by introducing indirection into
+ the filter chain. Instead of inserting filters in the chain, we insert
+ a filter harness which in turn dispatches conditionally
+ to a filter provider. Any content filter may be used as a provider
+ to <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>; no change to existing filter modules
+ is required (although it may be possible to simplify them). There can be
+ multiple providers for one filter, but no more than one provider will
+ run for any single request.</p>
+
+ <p>A filter chain comprises any number of instances of the filter
+ harness, each of which may have any number of providers. A special
+ case is that of a single provider with unconditional dispatch: this
+ is equivalent to inserting the provider filter directly into the chain.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="config" id="config">Configuring the Chain</a></h2>
+ <p>There are three stages to configuring a filter chain with
+ <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>. For details of the directives, see below.</p>
+
+ <dl>
+ <dt>Declare Filters</dt>
+ <dd>The <code class="directive"><a href="#filterdeclare">FilterDeclare</a></code> directive
+ declares a filter, assigning it a name and filter type. Required
+ only if the filter is not the default type AP_FTYPE_RESOURCE.</dd>
+
+ <dt>Register Providers</dt>
+ <dd>The <code class="directive"><a href="#filterprovider">FilterProvider</a></code>
+ directive registers a provider with a filter. The filter may have
+ been declared with <code class="directive"><a href="#filterdeclare">FilterDeclare</a></code>; if not, FilterProvider will implicitly
+ declare it with the default type AP_FTYPE_RESOURCE. The provider
+ must have been
+ registered with <code>ap_register_output_filter</code> by some module.
+ The final argument to <code class="directive"><a href="#filterprovider">FilterProvider</a></code> is an expression: the provider will be
+ selected to run for a request if and only if the expression evaluates
+ to true. The expression may evaluate HTTP request or response
+ headers, environment variables, or the Handler used by this request.
+ Unlike earlier versions, mod_filter now supports complex expressions
+ involving multiple criteria with AND / OR logic (&amp;&amp; / ||)
+ and brackets. The details of the expression syntax are described in
+ the <a href="../expr.html">ap_expr documentation</a>.</dd>
+
+ <dt>Configure the Chain</dt>
+ <dd>The above directives build components of a smart filter chain,
+ but do not configure it to run. The <code class="directive"><a href="#filterchain">FilterChain</a></code> directive builds a filter chain from smart
+ filters declared, offering the flexibility to insert filters at the
+ beginning or end of the chain, remove a filter, or clear the chain.</dd>
+</dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="errordocs" id="errordocs">Filtering and Response Status</a></h2>
+ <p>mod_filter normally only runs filters on responses with
+ HTTP status 200 (OK). If you want to filter documents with
+ other response statuses, you can set the <var>filter-errordocs</var>
+ environment variable, and it will work on all responses
+ regardless of status. To refine this further, you can use
+ expression conditions with <code class="directive">FilterProvider</code>.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="upgrade" id="upgrade">Upgrading from Apache HTTP Server 2.2 Configuration</a></h2>
+ <p>The <code class="directive"><a href="#filterprovider">FilterProvider</a></code>
+ directive has changed from httpd 2.2: the <var>match</var> and
+ <var>dispatch</var> arguments are replaced with a single but
+ more versatile <var>expression</var>. In general, you can convert
+ a match/dispatch pair to the two sides of an expression, using
+ something like:</p>
+ <div class="example"><p><code>"dispatch = 'match'"</code></p></div>
+ <p>The Request headers, Response headers and Environment variables
+ are now interpreted from syntax <var>%{req:foo}</var>,
+ <var>%{resp:foo}</var> and <var>%{env:foo}</var> respectively.
+ The variables <var>%{HANDLER}</var> and <var>%{CONTENT_TYPE}</var>
+ are also supported.</p>
+ <p>Note that the match no longer support substring matches. They can be
+ replaced by regular expression matches.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Examples</a></h2>
+ <dl>
+ <dt>Server side Includes (SSI)</dt>
+ <dd>A simple case of replacing <code class="directive">AddOutputFilterByType</code>
+ <pre class="prettyprint lang-config">FilterDeclare SSI
+FilterProvider SSI INCLUDES "%{CONTENT_TYPE} =~ m|^text/html|"
+FilterChain SSI</pre>
+
+ </dd>
+
+ <dt>Server side Includes (SSI)</dt>
+ <dd>The same as the above but dispatching on handler (classic
+ SSI behaviour; .shtml files get processed).
+ <pre class="prettyprint lang-config">FilterProvider SSI INCLUDES "%{HANDLER} = 'server-parsed'"
+FilterChain SSI</pre>
+
+ </dd>
+
+ <dt>Emulating mod_gzip with mod_deflate</dt>
+ <dd>Insert INFLATE filter only if "gzip" is NOT in the
+ Accept-Encoding header. This filter runs with ftype CONTENT_SET.
+ <pre class="prettyprint lang-config">FilterDeclare gzip CONTENT_SET
+FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/"
+FilterChain gzip</pre>
+
+ </dd>
+
+ <dt>Image Downsampling</dt>
+ <dd>Suppose we want to downsample all web images, and have filters
+ for GIF, JPEG and PNG.
+ <pre class="prettyprint lang-config">FilterProvider unpack jpeg_unpack "%{CONTENT_TYPE} = 'image/jpeg'"
+FilterProvider unpack gif_unpack "%{CONTENT_TYPE} = 'image/gif'"
+FilterProvider unpack png_unpack "%{CONTENT_TYPE} = 'image/png'"
+
+FilterProvider downsample downsample_filter "%{CONTENT_TYPE} = m|^image/(jpeg|gif|png)|"
+FilterProtocol downsample "change=yes"
+
+FilterProvider repack jpeg_pack "%{CONTENT_TYPE} = 'image/jpeg'"
+FilterProvider repack gif_pack "%{CONTENT_TYPE} = 'image/gif'"
+FilterProvider repack png_pack "%{CONTENT_TYPE} = 'image/png'"
+&lt;Location "/image-filter"&gt;
+ FilterChain unpack downsample repack
+&lt;/Location&gt;</pre>
+
+ </dd>
+ </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="protocol" id="protocol">Protocol Handling</a></h2>
+ <p>Historically, each filter is responsible for ensuring that whatever
+ changes it makes are correctly represented in the HTTP response headers,
+ and that it does not run when it would make an illegal change. This
+ imposes a burden on filter authors to re-implement some common
+ functionality in every filter:</p>
+
+ <ul>
+ <li>Many filters will change the content, invalidating existing content
+ tags, checksums, hashes, and lengths.</li>
+
+ <li>Filters that require an entire, unbroken response in input need to
+ ensure they don't get byteranges from a backend.</li>
+
+ <li>Filters that transform output in a filter need to ensure they don't
+ violate a <code>Cache-Control: no-transform</code> header from the
+ backend.</li>
+
+ <li>Filters may make responses uncacheable.</li>
+ </ul>
+
+ <p><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> aims to offer generic handling of these
+ details of filter implementation, reducing the complexity required of
+ content filter modules. This is work-in-progress; the
+ <code class="directive"><a href="#filterprotocol">FilterProtocol</a></code> implements
+ some of this functionality for back-compatibility with Apache 2.0
+ modules. For httpd 2.1 and later, the
+ <code>ap_register_output_filter_protocol</code> and
+ <code>ap_filter_protocol</code> API enables filter modules to
+ declare their own behaviour.</p>
+
+ <p>At the same time, <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> should not interfere
+ with a filter that wants to handle all aspects of the protocol. By
+ default (i.e. in the absence of any <code class="directive"><a href="#filterprotocol">FilterProtocol</a></code> directives), <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>
+ will leave the headers untouched.</p>
+
+ <p>At the time of writing, this feature is largely untested,
+ as modules in common use are designed to work with 2.0.
+ Modules using it should test it carefully.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_filter.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_filter.html.fr b/docs/manual/mod/mod_filter.html.fr
index b6af2d1bdf..771b22418e 100644
--- a/docs/manual/mod/mod_filter.html.fr
+++ b/docs/manual/mod/mod_filter.html.fr
@@ -75,230 +75,6 @@ serveur HTTP Apache 2.2</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#protocol">Gestion de protocole</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="smart" id="smart">Filtrage intelligent</a></h2>
- <p>Dans le mod�le de filtrage traditionnel, les filtres sont ins�r�s
- sans condition � l'aide de la directive <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code> et des directives
- apparent�es. Chaque filtre doit ensuite d�terminer s'il doit
- s'ex�cuter ou non, et les administrateurs du serveur disposent de
- peu de souplesse pour faire en sorte que la cha�ne soit trait�e de
- mani�re dynamique.</p>
-
- <p><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>, � l'oppos�, fournit aux
- administrateurs du serveur un grand degr� de souplesse pour
- configurer la cha�ne de filtrage. Concr�tement, la d�cision
- d'ins�rer un filtre peut �tre prise en fonction d'une <a href="../expr.html">expression</a> bool�enne complexe. Ceci
- g�n�ralise le fonctionnement relativement souple de la directive
- <code class="directive">AddOutputFilterByType</code>.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="terms" id="terms">D�clarations de filtres, fournisseurs et
-cha�nes</a></h2>
- <p class="figure">
- <img src="../images/mod_filter_old.gif" width="160" height="310" alt="[Cette image illustre le mod�le de filtrage traditionnel]" /><br />
- <dfn>Figure 1:</dfn> Le mod�le de filtrage traditionnel</p>
-
- <p>Dans le mod�le traditionnel, les filtres en sortie constituent
- une simple cha�ne s'�tendant depuis le g�n�rateur de contenu (ou
- gestionnaire) jusqu'au client. Ce fonctionnement peut convenir s'il
- permet d'atteindre le but recherch�, mais pose
- probl�me lorsque cette cha�ne doit �tre configur�e dynamiquement en
- fonction de la sortie du gestionnaire.</p>
-
- <p class="figure">
- <img src="../images/mod_filter_new.gif" width="423" height="331" alt="[Cette image illustre le mod�le de fonctionnement de mod_filter]" /><br />
- <dfn>Figure 2:</dfn> Le mod�le de fonctionnement de
- <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code></p>
-
- <p>Le fonctionnement de <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> consiste �
- introduire des branchements dans la cha�ne de filtrage. Plut�t que
- d'ins�rer directement des filtres dans la cha�ne, on ins�re un
- s�lecteur de filtre qui va effectuer un branchement conditionnel
- vers un fournisseur de filtre. <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> peut
- utiliser tout filtre de contenu comme fournisseur ; aucune
- modification des modules de filtrage existants n'est n�cessaire
- (bien qu'il soit tout de m�me possible de les simplifier). Il peut y
- avoir plusieurs fournisseurs pour un seul filtre, mais un seul
- fournisseur sera choisi pour chaque requ�te.</p>
-
- <p>Une cha�ne de filtrage peut comporter autant d'instances du
- s�lecteur de filtre que l'on souhaite, chacune d'entre elles pouvant
- disposer de plusieurs fournisseurs. Un s�lecteur de filtre poss�dant
- un seul fournisseur dont le choix est inconditionnel constitue un
- cas particulier : cette situation est �quivalente � l'insertion
- directe du filtre dans la cha�ne.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="config" id="config">Configuration de la cha�ne de
-filtrage</a></h2>
- <p>Trois �tapes sont n�cessaires pour configurer une cha�ne de
- filtrage avec <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>. Voir ci-dessous la
- description d�taill�e des directives.</p>
-
- <dl>
- <dt>D�claration des filtres</dt>
- <dd>La directive <code class="directive"><a href="#filterdeclare">FilterDeclare</a></code> permet de d�clarer un
- filtre en lui assignant un nom et un type. Elle n'est obligatoire
- que si le filtre n'est pas du type par d�faut
- AP_FTYPE_RESOURCE.</dd>
-
- <dt>Enregistrement des fournisseurs</dt>
- <dd>La directive <code class="directive"><a href="#filterprovider">FilterProvider</a></code> permet d'associer un
- fournisseur � un filtre. Le filtre a �t� �ventuellement d�clar� �
- l'aide de la directive <code class="directive"><a href="#filterdeclare">FilterDeclare</a></code> ; si ce n'est pas le cas, FilterProvider
- va le d�clarer implicitement avec le type par d�faut
- AP_FTYPE_RESOURCE. Le fournisseur doit avoir �t� enregistr� �
- l'aide de <code>ap_register_output_filter</code> par un module
- quelconque. Le dernier argument de la directive <code class="directive"><a href="#filterprovider">FilterProvider</a></code> est une expression :
- le fournisseur s'ex�cutera pour une requ�te si et seulement si
- l'expression est �valu�e vraie. L'expression peut �valuer une
- requ�te HTTP ou les en-t�tes de la r�ponse, des variables
- d'environnement, ou le gestionnaire utilis� par cette requ�te. � la
- diff�rence des version pr�c�dentes, mod_filter supporte d�sormais
- les expressions complexes associant des crit�res multiples au moyen
- d'une logique AND / OR (&amp;&amp; / ||) et de parenth�ses. Pour les
- d�tails sur la syntaxe de l'expression, voir la <a href="../expr.html">documentation sur ap_expr</a>.</dd>
-
- <dt>Configuration de la cha�ne de filtrage</dt>
- <dd>Les directives ci-dessus permettent d'�laborer les �l�ments
- d'une cha�ne de filtrage intelligente, mais pas de les configurer en
- vue de leur ex�cution. La directive <code class="directive"><a href="#filterchain">FilterChain</a></code> �labore une cha�ne de filtrage �
- partir de filtres intelligents d�clar�s, permettant avec souplesse
- d'ins�rer des filtres au d�but ou � la fin de la cha�ne, de
- supprimer un filtre ou m�me la cha�ne compl�te.</dd>
-</dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="errordocs" id="errordocs">Filtrage et statut de la r�ponse</a></h2>
- <p>Normalement, mod_filter n'applique les filtres qu'aux r�ponses
- poss�dant un statut HTTP 200 (OK). Pour pouvoir filtrer des
- documents poss�dant un autre statut, vous devez d�finir la variable
- d'environnement <var>filter-errordocs</var>, les r�ponses �tant
- alors filtr�es sans se pr�occuper de leur statut. Pour d�finir ce
- comportement de mani�re plus fine, vous pouvez utiliser des
- conditions dans la directive
- <code class="directive">FilterProvider</code>.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="upgrade" id="upgrade">Mise � jour depuis une configuration du
-serveur HTTP Apache 2.2</a></h2>
- <p>La directive <code class="directive"><a href="#filterprovider">FilterProvider</a></code> a �t� modifi�e par
- rapport � httpd 2.2 : les arguments <var>match</var> et
- <var>dispatch</var> ont �t� remplac�s par l'argument unique
- <var>expression</var> plus polyvalent. En g�n�ral, il est possible
- de convertir une paire match/dispatch vers les deux c�t�s d'une
- expression, de la mani�re suivante :</p>
- <div class="example"><p><code>"dispatch = 'match'"</code></p></div>
- <p>Les en-t�tes de requ�te et de r�ponse et les variables
- d'environnement sont maintenant interpr�t�s selon les syntaxes
- respectives <var>%{req:foo}</var>, <var>%{resp:foo}</var> et
- <var>%{env:foo}</var>. Les variables <var>%{HANDLER}</var> et
- <var>%{CONTENT_TYPE}</var> sont �galement support�es.</p>
- <p>Notez que l'�valuation de l'expression ne supporte plus les
- comparaisons de sous-cha�nes. Ces derni�res peuvent
- �tre remplac�es par des comparaisons d'expressions rationnelles.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Exemples</a></h2>
- <dl>
- <dt>Inclusions c�t� serveur (SSI)</dt>
- <dd>Un exemple simple de remplacement de la directive <code class="directive"><a href="../mod/core.html#addoutputfilterbytype">AddOutputFilterByType</a></code>
- <pre class="prettyprint lang-config">FilterDeclare SSI
-FilterProvider SSI INCLUDES "%{CONTENT_TYPE} =~ m|^text/html|"
-FilterChain SSI</pre>
-
- </dd>
-
- <dt>Inclusions c�t� serveur (SSI)</dt>
- <dd>M�me exemple que ci-dessus, mais envoi vers un gestionnaire
- (comportement classique des SSI ; les fichiers .shtml sont
- trait�s).
- <pre class="prettyprint lang-config">FilterProvider SSI INCLUDES "%{HANDLER} = 'server-parsed'"
-FilterChain SSI</pre>
-
- </dd>
-
- <dt>�mulation de mod_gzip avec mod_deflate</dt>
- <dd>Insertion du filtre INFLATE seulement si l'en-t�te
- Accept-Encoding a une valeur autre que "gzip". Ce filtre s'ex�cute
- avec le type ftype CONTENT_SET.
- <pre class="prettyprint lang-config">FilterDeclare gzip CONTENT_SET
-FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/"
-FilterChain gzip</pre>
-
- </dd>
-
- <dt>Diminution de la r�solution d'une image</dt>
- <dd>Supposons que nous voulions r�duire la r�solution de toutes les
- images web, et que nous disposions de filtres pour les images GIF,
- JPEG et PNG.
- <pre class="prettyprint lang-config">FilterProvider unpack jpeg_unpack "%{CONTENT_TYPE} = 'image/jpeg'"
-FilterProvider unpack gif_unpack "%{CONTENT_TYPE} = 'image/gif'"
-FilterProvider unpack png_unpack "%{CONTENT_TYPE} = 'image/png'"
-
-FilterProvider downsample downsample_filter "%{CONTENT_TYPE} = m|^image/(jpeg|gif|png)|"
-FilterProtocol downsample "change=yes"
-
-FilterProvider repack jpeg_pack "%{CONTENT_TYPE} = 'image/jpeg'"
-FilterProvider repack gif_pack "%{CONTENT_TYPE} = 'image/gif'"
-FilterProvider repack png_pack "%{CONTENT_TYPE} = 'image/png'"
-&lt;Location /image-filter&gt;
- FilterChain unpack downsample repack
-&lt;/Location&gt;</pre>
-
- </dd>
- </dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="protocol" id="protocol">Gestion de protocole</a></h2>
- <p>Historiquement, tout filtre doit s'assurer que toute modification
- qu'il effectue est correctement repr�sent�e dans les en-t�tes de la
- r�ponse HTTP, et qu'il ne s'ex�cutera pas si cette ex�cution
- r�sultait en une modification interdite. Ceci impose aux auteurs de
- filtres la corv�e de r�impl�menter certaines fonctionnalit�s
- communes dans chaque filtre :</p>
-
- <ul>
- <li>De nombreux filtres modifient les contenus, et de ce fait
- invalident les balises de ces contenus, leur somme de
- contr�le, leur condens� (hash) existant, ainsi que leur
- taille.</li>
-
- <li>Les filtres qui n�cessitent une r�ponse enti�re et non tronqu�e en
- entr�e, doivent s'assurer qu'il n'ont pas re�u une r�ponse � une
- requ�te partielle.</li>
-
- <li>Les filtres qui modifient la sortie d'un autre filtre doivent
- s'assurer qu'ils ne violent pas la directive d'un en-t�te
- <code>Cache-Control: no-transform</code> �ventuel.</li>
-
- <li>Les filtres peuvent agir sur des r�ponses de fa�on � ce qu'elles
- ne puissent plus �tre mises en cache.</li>
- </ul>
-
- <p><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> a pour but de g�rer de mani�re
- g�n�rale ces d�tails de l'impl�mentation des filtres, r�duisant par
- l�-m�me la complexit� des modules de filtrage de contenu. Le
- travail permettant d'atteindre ce but est cependant toujours en
- cours ; la directive <code class="directive"><a href="#filterprotocol">FilterProtocol</a></code>
- impl�mente certaines de ces fonctionnalit�s � des fins de
- compatibilit� ascendante avec les modules d'Apache 2.0. Pour les
- versions 2.1 et sup�rieures de httpd, les API
- <code>ap_register_output_filter_protocol</code> et
- <code>ap_filter_protocol</code> permettent aux modules de filtrage
- de d�finir leurs propres comportements.</p>
-
- <p>Cependant, <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> ne doit pas interf�rer
- avec un filtre qui g�re d�j� tous les aspects du protocole. Par
- d�faut (c'est � dire en l'absence de toute directive <code class="directive"><a href="#filterprotocol">FilterProtocol</a></code>),
- <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> ne modifiera donc pas les en-t�tes.</p>
-
- <p>Au moment o� ces lignes sont �crites, cette fonctionnalit� a �t�
- tr�s peu test�e, car les modules d'usage courant ont �t� con�us pour
- fonctionner avec httpd 2.0. Les modules qui l'utilisent devront donc
- l'exp�rimenter avec pr�cautions.</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="addoutputfilterbytype" id="addoutputfilterbytype">Directive</a> <a name="AddOutputFilterByType" id="AddOutputFilterByType">AddOutputFilterByType</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>assigne un filtre en sortie pour un type de m�dia
@@ -536,6 +312,230 @@ provenance de <code class="module"><a href="../mod/mod_filter.html">mod_filter</
</dl>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="smart" id="smart">Filtrage intelligent</a></h2>
+ <p>Dans le mod�le de filtrage traditionnel, les filtres sont ins�r�s
+ sans condition � l'aide de la directive <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code> et des directives
+ apparent�es. Chaque filtre doit ensuite d�terminer s'il doit
+ s'ex�cuter ou non, et les administrateurs du serveur disposent de
+ peu de souplesse pour faire en sorte que la cha�ne soit trait�e de
+ mani�re dynamique.</p>
+
+ <p><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>, � l'oppos�, fournit aux
+ administrateurs du serveur un grand degr� de souplesse pour
+ configurer la cha�ne de filtrage. Concr�tement, la d�cision
+ d'ins�rer un filtre peut �tre prise en fonction d'une <a href="../expr.html">expression</a> bool�enne complexe. Ceci
+ g�n�ralise le fonctionnement relativement souple de la directive
+ <code class="directive">AddOutputFilterByType</code>.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="terms" id="terms">D�clarations de filtres, fournisseurs et
+cha�nes</a></h2>
+ <p class="figure">
+ <img src="../images/mod_filter_old.gif" width="160" height="310" alt="[Cette image illustre le mod�le de filtrage traditionnel]" /><br />
+ <dfn>Figure 1:</dfn> Le mod�le de filtrage traditionnel</p>
+
+ <p>Dans le mod�le traditionnel, les filtres en sortie constituent
+ une simple cha�ne s'�tendant depuis le g�n�rateur de contenu (ou
+ gestionnaire) jusqu'au client. Ce fonctionnement peut convenir s'il
+ permet d'atteindre le but recherch�, mais pose
+ probl�me lorsque cette cha�ne doit �tre configur�e dynamiquement en
+ fonction de la sortie du gestionnaire.</p>
+
+ <p class="figure">
+ <img src="../images/mod_filter_new.gif" width="423" height="331" alt="[Cette image illustre le mod�le de fonctionnement de mod_filter]" /><br />
+ <dfn>Figure 2:</dfn> Le mod�le de fonctionnement de
+ <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code></p>
+
+ <p>Le fonctionnement de <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> consiste �
+ introduire des branchements dans la cha�ne de filtrage. Plut�t que
+ d'ins�rer directement des filtres dans la cha�ne, on ins�re un
+ s�lecteur de filtre qui va effectuer un branchement conditionnel
+ vers un fournisseur de filtre. <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> peut
+ utiliser tout filtre de contenu comme fournisseur ; aucune
+ modification des modules de filtrage existants n'est n�cessaire
+ (bien qu'il soit tout de m�me possible de les simplifier). Il peut y
+ avoir plusieurs fournisseurs pour un seul filtre, mais un seul
+ fournisseur sera choisi pour chaque requ�te.</p>
+
+ <p>Une cha�ne de filtrage peut comporter autant d'instances du
+ s�lecteur de filtre que l'on souhaite, chacune d'entre elles pouvant
+ disposer de plusieurs fournisseurs. Un s�lecteur de filtre poss�dant
+ un seul fournisseur dont le choix est inconditionnel constitue un
+ cas particulier : cette situation est �quivalente � l'insertion
+ directe du filtre dans la cha�ne.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="config" id="config">Configuration de la cha�ne de
+filtrage</a></h2>
+ <p>Trois �tapes sont n�cessaires pour configurer une cha�ne de
+ filtrage avec <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>. Voir ci-dessous la
+ description d�taill�e des directives.</p>
+
+ <dl>
+ <dt>D�claration des filtres</dt>
+ <dd>La directive <code class="directive"><a href="#filterdeclare">FilterDeclare</a></code> permet de d�clarer un
+ filtre en lui assignant un nom et un type. Elle n'est obligatoire
+ que si le filtre n'est pas du type par d�faut
+ AP_FTYPE_RESOURCE.</dd>
+
+ <dt>Enregistrement des fournisseurs</dt>
+ <dd>La directive <code class="directive"><a href="#filterprovider">FilterProvider</a></code> permet d'associer un
+ fournisseur � un filtre. Le filtre a �t� �ventuellement d�clar� �
+ l'aide de la directive <code class="directive"><a href="#filterdeclare">FilterDeclare</a></code> ; si ce n'est pas le cas, FilterProvider
+ va le d�clarer implicitement avec le type par d�faut
+ AP_FTYPE_RESOURCE. Le fournisseur doit avoir �t� enregistr� �
+ l'aide de <code>ap_register_output_filter</code> par un module
+ quelconque. Le dernier argument de la directive <code class="directive"><a href="#filterprovider">FilterProvider</a></code> est une expression :
+ le fournisseur s'ex�cutera pour une requ�te si et seulement si
+ l'expression est �valu�e vraie. L'expression peut �valuer une
+ requ�te HTTP ou les en-t�tes de la r�ponse, des variables
+ d'environnement, ou le gestionnaire utilis� par cette requ�te. � la
+ diff�rence des version pr�c�dentes, mod_filter supporte d�sormais
+ les expressions complexes associant des crit�res multiples au moyen
+ d'une logique AND / OR (&amp;&amp; / ||) et de parenth�ses. Pour les
+ d�tails sur la syntaxe de l'expression, voir la <a href="../expr.html">documentation sur ap_expr</a>.</dd>
+
+ <dt>Configuration de la cha�ne de filtrage</dt>
+ <dd>Les directives ci-dessus permettent d'�laborer les �l�ments
+ d'une cha�ne de filtrage intelligente, mais pas de les configurer en
+ vue de leur ex�cution. La directive <code class="directive"><a href="#filterchain">FilterChain</a></code> �labore une cha�ne de filtrage �
+ partir de filtres intelligents d�clar�s, permettant avec souplesse
+ d'ins�rer des filtres au d�but ou � la fin de la cha�ne, de
+ supprimer un filtre ou m�me la cha�ne compl�te.</dd>
+</dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="errordocs" id="errordocs">Filtrage et statut de la r�ponse</a></h2>
+ <p>Normalement, mod_filter n'applique les filtres qu'aux r�ponses
+ poss�dant un statut HTTP 200 (OK). Pour pouvoir filtrer des
+ documents poss�dant un autre statut, vous devez d�finir la variable
+ d'environnement <var>filter-errordocs</var>, les r�ponses �tant
+ alors filtr�es sans se pr�occuper de leur statut. Pour d�finir ce
+ comportement de mani�re plus fine, vous pouvez utiliser des
+ conditions dans la directive
+ <code class="directive">FilterProvider</code>.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="upgrade" id="upgrade">Mise � jour depuis une configuration du
+serveur HTTP Apache 2.2</a></h2>
+ <p>La directive <code class="directive"><a href="#filterprovider">FilterProvider</a></code> a �t� modifi�e par
+ rapport � httpd 2.2 : les arguments <var>match</var> et
+ <var>dispatch</var> ont �t� remplac�s par l'argument unique
+ <var>expression</var> plus polyvalent. En g�n�ral, il est possible
+ de convertir une paire match/dispatch vers les deux c�t�s d'une
+ expression, de la mani�re suivante :</p>
+ <div class="example"><p><code>"dispatch = 'match'"</code></p></div>
+ <p>Les en-t�tes de requ�te et de r�ponse et les variables
+ d'environnement sont maintenant interpr�t�s selon les syntaxes
+ respectives <var>%{req:foo}</var>, <var>%{resp:foo}</var> et
+ <var>%{env:foo}</var>. Les variables <var>%{HANDLER}</var> et
+ <var>%{CONTENT_TYPE}</var> sont �galement support�es.</p>
+ <p>Notez que l'�valuation de l'expression ne supporte plus les
+ comparaisons de sous-cha�nes. Ces derni�res peuvent
+ �tre remplac�es par des comparaisons d'expressions rationnelles.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Exemples</a></h2>
+ <dl>
+ <dt>Inclusions c�t� serveur (SSI)</dt>
+ <dd>Un exemple simple de remplacement de la directive <code class="directive"><a href="../mod/core.html#addoutputfilterbytype">AddOutputFilterByType</a></code>
+ <pre class="prettyprint lang-config">FilterDeclare SSI
+FilterProvider SSI INCLUDES "%{CONTENT_TYPE} =~ m|^text/html|"
+FilterChain SSI</pre>
+
+ </dd>
+
+ <dt>Inclusions c�t� serveur (SSI)</dt>
+ <dd>M�me exemple que ci-dessus, mais envoi vers un gestionnaire
+ (comportement classique des SSI ; les fichiers .shtml sont
+ trait�s).
+ <pre class="prettyprint lang-config">FilterProvider SSI INCLUDES "%{HANDLER} = 'server-parsed'"
+FilterChain SSI</pre>
+
+ </dd>
+
+ <dt>�mulation de mod_gzip avec mod_deflate</dt>
+ <dd>Insertion du filtre INFLATE seulement si l'en-t�te
+ Accept-Encoding a une valeur autre que "gzip". Ce filtre s'ex�cute
+ avec le type ftype CONTENT_SET.
+ <pre class="prettyprint lang-config">FilterDeclare gzip CONTENT_SET
+FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/"
+FilterChain gzip</pre>
+
+ </dd>
+
+ <dt>Diminution de la r�solution d'une image</dt>
+ <dd>Supposons que nous voulions r�duire la r�solution de toutes les
+ images web, et que nous disposions de filtres pour les images GIF,
+ JPEG et PNG.
+ <pre class="prettyprint lang-config">FilterProvider unpack jpeg_unpack "%{CONTENT_TYPE} = 'image/jpeg'"
+FilterProvider unpack gif_unpack "%{CONTENT_TYPE} = 'image/gif'"
+FilterProvider unpack png_unpack "%{CONTENT_TYPE} = 'image/png'"
+
+FilterProvider downsample downsample_filter "%{CONTENT_TYPE} = m|^image/(jpeg|gif|png)|"
+FilterProtocol downsample "change=yes"
+
+FilterProvider repack jpeg_pack "%{CONTENT_TYPE} = 'image/jpeg'"
+FilterProvider repack gif_pack "%{CONTENT_TYPE} = 'image/gif'"
+FilterProvider repack png_pack "%{CONTENT_TYPE} = 'image/png'"
+&lt;Location /image-filter&gt;
+ FilterChain unpack downsample repack
+&lt;/Location&gt;</pre>
+
+ </dd>
+ </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="protocol" id="protocol">Gestion de protocole</a></h2>
+ <p>Historiquement, tout filtre doit s'assurer que toute modification
+ qu'il effectue est correctement repr�sent�e dans les en-t�tes de la
+ r�ponse HTTP, et qu'il ne s'ex�cutera pas si cette ex�cution
+ r�sultait en une modification interdite. Ceci impose aux auteurs de
+ filtres la corv�e de r�impl�menter certaines fonctionnalit�s
+ communes dans chaque filtre :</p>
+
+ <ul>
+ <li>De nombreux filtres modifient les contenus, et de ce fait
+ invalident les balises de ces contenus, leur somme de
+ contr�le, leur condens� (hash) existant, ainsi que leur
+ taille.</li>
+
+ <li>Les filtres qui n�cessitent une r�ponse enti�re et non tronqu�e en
+ entr�e, doivent s'assurer qu'il n'ont pas re�u une r�ponse � une
+ requ�te partielle.</li>
+
+ <li>Les filtres qui modifient la sortie d'un autre filtre doivent
+ s'assurer qu'ils ne violent pas la directive d'un en-t�te
+ <code>Cache-Control: no-transform</code> �ventuel.</li>
+
+ <li>Les filtres peuvent agir sur des r�ponses de fa�on � ce qu'elles
+ ne puissent plus �tre mises en cache.</li>
+ </ul>
+
+ <p><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> a pour but de g�rer de mani�re
+ g�n�rale ces d�tails de l'impl�mentation des filtres, r�duisant par
+ l�-m�me la complexit� des modules de filtrage de contenu. Le
+ travail permettant d'atteindre ce but est cependant toujours en
+ cours ; la directive <code class="directive"><a href="#filterprotocol">FilterProtocol</a></code>
+ impl�mente certaines de ces fonctionnalit�s � des fins de
+ compatibilit� ascendante avec les modules d'Apache 2.0. Pour les
+ versions 2.1 et sup�rieures de httpd, les API
+ <code>ap_register_output_filter_protocol</code> et
+ <code>ap_filter_protocol</code> permettent aux modules de filtrage
+ de d�finir leurs propres comportements.</p>
+
+ <p>Cependant, <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> ne doit pas interf�rer
+ avec un filtre qui g�re d�j� tous les aspects du protocole. Par
+ d�faut (c'est � dire en l'absence de toute directive <code class="directive"><a href="#filterprotocol">FilterProtocol</a></code>),
+ <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> ne modifiera donc pas les en-t�tes.</p>
+
+ <p>Au moment o� ces lignes sont �crites, cette fonctionnalit� a �t�
+ tr�s peu test�e, car les modules d'usage courant ont �t� con�us pour
+ fonctionner avec httpd 2.0. Les modules qui l'utilisent devront donc
+ l'exp�rimenter avec pr�cautions.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index 8b22e094bd..7a5a45a704 100644
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -52,158 +52,6 @@ headers</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="order" id="order">Order of Processing</a></h2>
-
- <p>The directives provided by <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> can
- occur almost anywhere within the server configuration, and can be
- limited in scope by enclosing them in <a href="../sections.html">configuration sections</a>.</p>
-
- <p>Order of processing is important and is affected both by the
- order in the configuration file and by placement in <a href="../sections.html#mergin">configuration sections</a>. These
- two directives have a different effect if reversed:</p>
-
- <pre class="prettyprint lang-config">RequestHeader append MirrorID "mirror 12"
-RequestHeader unset MirrorID</pre>
-
-
- <p>This way round, the <code>MirrorID</code> header is not set. If
- reversed, the MirrorID header is set to "mirror 12".</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="early" id="early">Early and Late Processing</a></h2>
- <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> can be applied either early or late
- in the request. The normal mode is late, when <em>Request</em> Headers are
- set immediately before running the content generator and <em>Response</em>
- Headers just as the response is sent down the wire. Always use
- Late mode in an operational server.</p>
-
- <p>Early mode is designed as a test/debugging aid for developers.
- Directives defined using the <code>early</code> keyword are set
- right at the beginning of processing the request. This means
- they can be used to simulate different requests and set up test
- cases, but it also means that headers may be changed at any time
- by other modules before generating a Response.</p>
-
- <p>Because early directives are processed before the request path's
- configuration is traversed, early headers can only be set in a
- main server or virtual host context. Early directives cannot depend
- on a request path, so they will fail in contexts such as
- <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> or
- <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Examples</a></h2>
-
- <ol>
- <li>
- Copy all request headers that begin with "TS" to the
- response headers:
-
- <pre class="prettyprint lang-config">Header echo ^TS</pre>
-
- </li>
-
- <li>
- Add a header, <code>MyHeader</code>, to the response including a
- timestamp for when the request was received and how long it
- took to begin serving the request. This header can be used by
- the client to intuit load on the server or in isolating
- bottlenecks between the client and the server.
-
- <pre class="prettyprint lang-config">Header set MyHeader "%D %t"</pre>
-
-
- <p>results in this header being added to the response:</p>
-
- <div class="example"><p><code>
- MyHeader: D=3775428 t=991424704447256
- </code></p></div>
- </li>
-
- <li>
- Say hello to Joe
-
- <pre class="prettyprint lang-config">Header set MyHeader "Hello Joe. It took %D microseconds for Apache to serve this request."</pre>
-
-
- <p>results in this header being added to the response:</p>
-
- <div class="example"><p><code>
- MyHeader: Hello Joe. It took D=3775428 microseconds for Apache
- to serve this request.
- </code></p></div>
- </li>
-
- <li>
- Conditionally send <code>MyHeader</code> on the response if and
- only if header <code>MyRequestHeader</code> is present on the request.
- This is useful for constructing headers in response to some client
- stimulus. Note that this example requires the services of the
- <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> module.
-
- <pre class="prettyprint lang-config">SetEnvIf MyRequestHeader myvalue HAVE_MyRequestHeader
-Header set MyHeader "%D %t mytext" env=HAVE_MyRequestHeader</pre>
-
-
- <p>If the header <code>MyRequestHeader: myvalue</code> is present on
- the HTTP request, the response will contain the following header:</p>
-
- <div class="example"><p><code>
- MyHeader: D=3775428 t=991424704447256 mytext
- </code></p></div>
- </li>
-
- <li>
- Enable DAV to work with Apache running HTTP through SSL hardware
- (<a href="http://svn.haxx.se/users/archive-2006-03/0549.shtml">problem
- description</a>) by replacing <var>https:</var> with
- <var>http:</var> in the <var>Destination</var> header:
-
- <pre class="prettyprint lang-config">RequestHeader edit Destination ^https: http: early</pre>
-
- </li>
-
- <li>
- Set the same header value under multiple nonexclusive conditions,
- but do not duplicate the value in the final header.
- If all of the following conditions applied to a request (i.e.,
- if the <code>CGI</code>, <code>NO_CACHE</code> and
- <code>NO_STORE</code> environment variables all existed for the
- request):
-
- <pre class="prettyprint lang-config">Header merge Cache-Control no-cache env=CGI
-Header merge Cache-Control no-cache env=NO_CACHE
-Header merge Cache-Control no-store env=NO_STORE</pre>
-
-
- <p>then the response would contain the following header:</p>
-
- <div class="example"><p><code>
- Cache-Control: no-cache, no-store
- </code></p></div>
-
- <p>If <code>append</code> was used instead of <code>merge</code>,
- then the response would contain the following header:</p>
-
- <div class="example"><p><code>
- Cache-Control: no-cache, no-cache, no-store
- </code></p></div>
- </li>
- <li>
- Set a test cookie if and only if the client didn't send us a cookie
- <pre class="prettyprint lang-config">Header set Set-Cookie testcookie "expr=-z %{req:Cookie}"</pre>
-
- </li>
- <li>
- Append a Caching header for responses with a HTTP status code of 200
- <pre class="prettyprint lang-config">Header append Cache-Control s-maxage=600 "expr=%{REQUEST_STATUS} == 200"</pre>
-
- </li>
-
- </ol>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Header" id="Header">Header</a> <a name="header" id="header">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure HTTP response headers</td></tr>
@@ -544,6 +392,158 @@ available in 2.4.10 and later</td></tr>
input filters to be overridden or modified.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="order" id="order">Order of Processing</a></h2>
+
+ <p>The directives provided by <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> can
+ occur almost anywhere within the server configuration, and can be
+ limited in scope by enclosing them in <a href="../sections.html">configuration sections</a>.</p>
+
+ <p>Order of processing is important and is affected both by the
+ order in the configuration file and by placement in <a href="../sections.html#mergin">configuration sections</a>. These
+ two directives have a different effect if reversed:</p>
+
+ <pre class="prettyprint lang-config">RequestHeader append MirrorID "mirror 12"
+RequestHeader unset MirrorID</pre>
+
+
+ <p>This way round, the <code>MirrorID</code> header is not set. If
+ reversed, the MirrorID header is set to "mirror 12".</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="early" id="early">Early and Late Processing</a></h2>
+ <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> can be applied either early or late
+ in the request. The normal mode is late, when <em>Request</em> Headers are
+ set immediately before running the content generator and <em>Response</em>
+ Headers just as the response is sent down the wire. Always use
+ Late mode in an operational server.</p>
+
+ <p>Early mode is designed as a test/debugging aid for developers.
+ Directives defined using the <code>early</code> keyword are set
+ right at the beginning of processing the request. This means
+ they can be used to simulate different requests and set up test
+ cases, but it also means that headers may be changed at any time
+ by other modules before generating a Response.</p>
+
+ <p>Because early directives are processed before the request path's
+ configuration is traversed, early headers can only be set in a
+ main server or virtual host context. Early directives cannot depend
+ on a request path, so they will fail in contexts such as
+ <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> or
+ <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Examples</a></h2>
+
+ <ol>
+ <li>
+ Copy all request headers that begin with "TS" to the
+ response headers:
+
+ <pre class="prettyprint lang-config">Header echo ^TS</pre>
+
+ </li>
+
+ <li>
+ Add a header, <code>MyHeader</code>, to the response including a
+ timestamp for when the request was received and how long it
+ took to begin serving the request. This header can be used by
+ the client to intuit load on the server or in isolating
+ bottlenecks between the client and the server.
+
+ <pre class="prettyprint lang-config">Header set MyHeader "%D %t"</pre>
+
+
+ <p>results in this header being added to the response:</p>
+
+ <div class="example"><p><code>
+ MyHeader: D=3775428 t=991424704447256
+ </code></p></div>
+ </li>
+
+ <li>
+ Say hello to Joe
+
+ <pre class="prettyprint lang-config">Header set MyHeader "Hello Joe. It took %D microseconds for Apache to serve this request."</pre>
+
+
+ <p>results in this header being added to the response:</p>
+
+ <div class="example"><p><code>
+ MyHeader: Hello Joe. It took D=3775428 microseconds for Apache
+ to serve this request.
+ </code></p></div>
+ </li>
+
+ <li>
+ Conditionally send <code>MyHeader</code> on the response if and
+ only if header <code>MyRequestHeader</code> is present on the request.
+ This is useful for constructing headers in response to some client
+ stimulus. Note that this example requires the services of the
+ <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> module.
+
+ <pre class="prettyprint lang-config">SetEnvIf MyRequestHeader myvalue HAVE_MyRequestHeader
+Header set MyHeader "%D %t mytext" env=HAVE_MyRequestHeader</pre>
+
+
+ <p>If the header <code>MyRequestHeader: myvalue</code> is present on
+ the HTTP request, the response will contain the following header:</p>
+
+ <div class="example"><p><code>
+ MyHeader: D=3775428 t=991424704447256 mytext
+ </code></p></div>
+ </li>
+
+ <li>
+ Enable DAV to work with Apache running HTTP through SSL hardware
+ (<a href="http://svn.haxx.se/users/archive-2006-03/0549.shtml">problem
+ description</a>) by replacing <var>https:</var> with
+ <var>http:</var> in the <var>Destination</var> header:
+
+ <pre class="prettyprint lang-config">RequestHeader edit Destination ^https: http: early</pre>
+
+ </li>
+
+ <li>
+ Set the same header value under multiple nonexclusive conditions,
+ but do not duplicate the value in the final header.
+ If all of the following conditions applied to a request (i.e.,
+ if the <code>CGI</code>, <code>NO_CACHE</code> and
+ <code>NO_STORE</code> environment variables all existed for the
+ request):
+
+ <pre class="prettyprint lang-config">Header merge Cache-Control no-cache env=CGI
+Header merge Cache-Control no-cache env=NO_CACHE
+Header merge Cache-Control no-store env=NO_STORE</pre>
+
+
+ <p>then the response would contain the following header:</p>
+
+ <div class="example"><p><code>
+ Cache-Control: no-cache, no-store
+ </code></p></div>
+
+ <p>If <code>append</code> was used instead of <code>merge</code>,
+ then the response would contain the following header:</p>
+
+ <div class="example"><p><code>
+ Cache-Control: no-cache, no-cache, no-store
+ </code></p></div>
+ </li>
+ <li>
+ Set a test cookie if and only if the client didn't send us a cookie
+ <pre class="prettyprint lang-config">Header set Set-Cookie testcookie "expr=-z %{req:Cookie}"</pre>
+
+ </li>
+ <li>
+ Append a Caching header for responses with a HTTP status code of 200
+ <pre class="prettyprint lang-config">Header append Cache-Control s-maxage=600 "expr=%{REQUEST_STATUS} == 200"</pre>
+
+ </li>
+
+ </ol>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_headers.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_headers.html.fr b/docs/manual/mod/mod_headers.html.fr
index 97ae18b11c..4d2dde3775 100644
--- a/docs/manual/mod/mod_headers.html.fr
+++ b/docs/manual/mod/mod_headers.html.fr
@@ -53,173 +53,6 @@ tardif</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#examples">Exemples</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="order" id="order">Chronologie du traitement</a></h2>
-
- <p>Les directives fournies par <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> peuvent
- s'ins�rer presque partout dans la configuration du serveur, et on
- peut limiter leur port�e en les pla�ant dans des <a href="../sections.html">sections de configuration</a>.</p>
-
- <p>La chronologie du traitement est importante et est affect�e par
- l'ordre d'apparition des directives dans le fichier de configuration
- et par leur placement dans les <a href="../sections.html#mergin">sections de configuration</a>. Ainsi,
- ces deux directives ont un effet diff�rent si leur ordre est invers�
- :</p>
-
- <pre class="prettyprint lang-config">RequestHeader append MirrorID "mirror 12"
-RequestHeader unset MirrorID</pre>
-
-
- <p>Dans cet ordre, l'en-t�te <code>MirrorID</code> n'est pas d�fini.
- Si l'ordre des directives �tait invers�, l'en-t�te
- <code>MirrorID</code> serait d�fini � "mirror 12".</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="early" id="early">Traitement pr�coce et traitement
-tardif</a></h2>
- <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> peut agir soir pr�cocement, soit
- tardivement au niveau de la requ�te. Le mode normal est le mode
- tardif, lorsque les en-t�tes de <em>requ�te</em> sont d�finis, imm�diatement
- avant l'ex�cution du g�n�rateur de contenu, et pour les en-t�tes de
- <em>r�ponse</em>, juste au moment o� la r�ponse est envoy�e sur le r�seau.
- Utilisez toujours le mode tardif sur un serveur en production.</p>
-
- <p>Le mode pr�coce a �t� con�u � des fins d'aide aux tests et au
- d�bogage pour les d�veloppeurs. Les directives d�finies en utilisant
- le mot-cl� <code>early</code> sont cens�es agir au tout d�but du
- traitement de la requ�te. Cela signifie que l'on peut les utiliser
- pour simuler diff�rentes requ�tes et d�finir des situations de test,
- tout en gardant � l'esprit que les en-t�tes peuvent �tre modifi�s �
- tout moment par d'autres modules avant que le r�ponse ne soit
- g�n�r�e.</p>
-
- <p>Comme les directives pr�coces sont trait�es avant que le
- chemin de la requ�te ne soit parcouru, les en-t�tes
- pr�coces ne peuvent �tre d�finis que dans un contexte de serveur
- principal ou de serveur virtuel. Les directives pr�coces ne peuvent
- pas d�pendre d'un chemin de requ�te, si bien qu'elles �choueront
- dans des contextes tels que <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ou <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Exemples</a></h2>
-
- <ol>
- <li>
- Copie tous les en-t�tes de requ�te qui commencent par "TS" vers
- les en-t�tes de la r�ponse :
-
- <pre class="prettyprint lang-config">Header echo ^TS</pre>
-
- </li>
-
- <li>
- Ajoute � la r�ponse un en-t�te, <code>mon-en-t�te</code>, qui
- contient un horodatage permettant de d�terminer le moment o� la
- requ�te a �t� re�ue, et le temps qui s'est �coul� jusqu'� ce que
- la requ�te ait commenc� � �tre servie. Cet en-t�te peut �tre
- utilis� par le client pour estimer la charge du serveur ou
- isoler les goulets d'�tranglement entre le client et le
- serveur.
-
- <pre class="prettyprint lang-config">Header set mon-en-t�te "%D %t"</pre>
-
-
- <p>le r�sultat est l'ajout � la r�ponse d'un en-t�te du type :</p>
-
- <div class="example"><p><code>
- mon-en-t�te: D=3775428 t=991424704447256
- </code></p></div>
- </li>
-
- <li>
- Dit Bonjour � Joe
-
- <div class="example"><p><code>
- Header set mon-en-t�te "Bonjour Joe. Il a fallu %D microsecondes \<br />
- � Apache pour servir cette requ�te."
- </code></p></div>
-
- <p>le r�sultat est l'ajout � la r�ponse d'un en-t�te du type :</p>
-
- <pre class="prettyprint lang-config"> Header set MyHeader "Bonjour Joe. Il a fallu D=3775428 microsecondes � Apache
- pour servir cette requ�te."</pre>
-
- </li>
-
- <li>
- Ajoute l'en-t�te <code>mon-en-t�te</code> � la r�ponse si et
- seulement si l'en-t�te <code>mon-en-t�te-requ�te</code> est
- pr�sent dans la requ�te. Ceci peut s'av�rer utile pour g�n�rer
- des en-t�tes de r�ponse "� la t�te du client". Notez que cet
- exemple n�cessite les services du module
- <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>.
-
- <pre class="prettyprint lang-config">SetEnvIf MyRequestHeader myvalue HAVE_MyRequestHeader
-Header set MyHeader "%D %t mytext" env=HAVE_MyRequestHeader</pre>
-
-
- <p>Si l'en-t�te <code>mon-en-t�te-requ�te: mavaleur</code> est
- pr�sent dans la requ�te HTTP, la r�ponse contiendra un en-t�te
- du type :</p>
-
- <div class="example"><p><code>
- mon-en-t�te: D=3775428 t=991424704447256 montexte
- </code></p></div>
- </li>
-
- <li>
- Permet � DAV de fonctionner avec Apache sur SSL (voir la <a href="http://svn.haxx.se/users/archive-2006-03/0549.shtml">description
- du probl�me</a>) en rempla�ant <var>https:</var> par
- <var>http:</var> dans l'en-t�te <var>Destination</var> :
-
- <pre class="prettyprint lang-config">RequestHeader edit Destination ^https: http: early</pre>
-
- </li>
-
- <li>
- D�finit la valeur d'un m�me en-t�te sous de multiples conditions
- non exclusives, mais ne duplique pas une valeur d�j� d�finie
- dans l'en-t�te qui en r�sulte. Si toutes les conditions
- suivantes sont satisfaites pour une requ�te (en d'autres termes,
- si les trois variables d'environnement <code>CGI</code>,
- <code>NO_CACHE</code> et <code>NO_STORE</code> existent pour la
- requ�te) :
-
- <pre class="prettyprint lang-config">Header merge Cache-Control no-cache env=CGI
-Header merge Cache-Control no-cache env=NO_CACHE
-Header merge Cache-Control no-store env=NO_STORE</pre>
-
-
- <p>alors, la r�ponse contiendra l'en-t�te suivant :</p>
-
- <div class="example"><p><code>
- Cache-Control: no-cache, no-store
- </code></p></div>
-
- <p>Si <code>append</code> avait �t� utilis� � la place de
- <code>merge</code>, la r�ponse aurait contenu l'en-t�te suivant
- :</p>
-
- <div class="example"><p><code>
- Cache-Control: no-cache, no-cache, no-store
- </code></p></div>
- </li>
- <li>
- D�finit un cookie de test si et seulement si le client n'envoie
- pas de cookie
- <pre class="prettyprint lang-config">Header set Set-Cookie testcookie "expr=-z %{req:Cookie}"</pre>
-
- </li>
- <li>
- Ajoute un en-t�te de mise en cache pour les r�ponses avec un
- code d'�tat HTTP de 200
- <pre class="prettyprint lang-config">Header append Cache-Control s-maxage=600 "expr=%{REQUEST_STATUS} == 200"</pre>
-
- </li>
-
- </ol>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="header" id="header">Directive</a> <a name="Header" id="Header">Header</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure les en-t�tes d'une r�ponse HTTP</td></tr>
@@ -605,6 +438,173 @@ version 2.4.10</td></tr>
d'Apache.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="order" id="order">Chronologie du traitement</a></h2>
+
+ <p>Les directives fournies par <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> peuvent
+ s'ins�rer presque partout dans la configuration du serveur, et on
+ peut limiter leur port�e en les pla�ant dans des <a href="../sections.html">sections de configuration</a>.</p>
+
+ <p>La chronologie du traitement est importante et est affect�e par
+ l'ordre d'apparition des directives dans le fichier de configuration
+ et par leur placement dans les <a href="../sections.html#mergin">sections de configuration</a>. Ainsi,
+ ces deux directives ont un effet diff�rent si leur ordre est invers�
+ :</p>
+
+ <pre class="prettyprint lang-config">RequestHeader append MirrorID "mirror 12"
+RequestHeader unset MirrorID</pre>
+
+
+ <p>Dans cet ordre, l'en-t�te <code>MirrorID</code> n'est pas d�fini.
+ Si l'ordre des directives �tait invers�, l'en-t�te
+ <code>MirrorID</code> serait d�fini � "mirror 12".</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="early" id="early">Traitement pr�coce et traitement
+tardif</a></h2>
+ <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> peut agir soir pr�cocement, soit
+ tardivement au niveau de la requ�te. Le mode normal est le mode
+ tardif, lorsque les en-t�tes de <em>requ�te</em> sont d�finis, imm�diatement
+ avant l'ex�cution du g�n�rateur de contenu, et pour les en-t�tes de
+ <em>r�ponse</em>, juste au moment o� la r�ponse est envoy�e sur le r�seau.
+ Utilisez toujours le mode tardif sur un serveur en production.</p>
+
+ <p>Le mode pr�coce a �t� con�u � des fins d'aide aux tests et au
+ d�bogage pour les d�veloppeurs. Les directives d�finies en utilisant
+ le mot-cl� <code>early</code> sont cens�es agir au tout d�but du
+ traitement de la requ�te. Cela signifie que l'on peut les utiliser
+ pour simuler diff�rentes requ�tes et d�finir des situations de test,
+ tout en gardant � l'esprit que les en-t�tes peuvent �tre modifi�s �
+ tout moment par d'autres modules avant que le r�ponse ne soit
+ g�n�r�e.</p>
+
+ <p>Comme les directives pr�coces sont trait�es avant que le
+ chemin de la requ�te ne soit parcouru, les en-t�tes
+ pr�coces ne peuvent �tre d�finis que dans un contexte de serveur
+ principal ou de serveur virtuel. Les directives pr�coces ne peuvent
+ pas d�pendre d'un chemin de requ�te, si bien qu'elles �choueront
+ dans des contextes tels que <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ou <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Exemples</a></h2>
+
+ <ol>
+ <li>
+ Copie tous les en-t�tes de requ�te qui commencent par "TS" vers
+ les en-t�tes de la r�ponse :
+
+ <pre class="prettyprint lang-config">Header echo ^TS</pre>
+
+ </li>
+
+ <li>
+ Ajoute � la r�ponse un en-t�te, <code>mon-en-t�te</code>, qui
+ contient un horodatage permettant de d�terminer le moment o� la
+ requ�te a �t� re�ue, et le temps qui s'est �coul� jusqu'� ce que
+ la requ�te ait commenc� � �tre servie. Cet en-t�te peut �tre
+ utilis� par le client pour estimer la charge du serveur ou
+ isoler les goulets d'�tranglement entre le client et le
+ serveur.
+
+ <pre class="prettyprint lang-config">Header set mon-en-t�te "%D %t"</pre>
+
+
+ <p>le r�sultat est l'ajout � la r�ponse d'un en-t�te du type :</p>
+
+ <div class="example"><p><code>
+ mon-en-t�te: D=3775428 t=991424704447256
+ </code></p></div>
+ </li>
+
+ <li>
+ Dit Bonjour � Joe
+
+ <div class="example"><p><code>
+ Header set mon-en-t�te "Bonjour Joe. Il a fallu %D microsecondes \<br />
+ � Apache pour servir cette requ�te."
+ </code></p></div>
+
+ <p>le r�sultat est l'ajout � la r�ponse d'un en-t�te du type :</p>
+
+ <pre class="prettyprint lang-config"> Header set MyHeader "Bonjour Joe. Il a fallu D=3775428 microsecondes � Apache
+ pour servir cette requ�te."</pre>
+
+ </li>
+
+ <li>
+ Ajoute l'en-t�te <code>mon-en-t�te</code> � la r�ponse si et
+ seulement si l'en-t�te <code>mon-en-t�te-requ�te</code> est
+ pr�sent dans la requ�te. Ceci peut s'av�rer utile pour g�n�rer
+ des en-t�tes de r�ponse "� la t�te du client". Notez que cet
+ exemple n�cessite les services du module
+ <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>.
+
+ <pre class="prettyprint lang-config">SetEnvIf MyRequestHeader myvalue HAVE_MyRequestHeader
+Header set MyHeader "%D %t mytext" env=HAVE_MyRequestHeader</pre>
+
+
+ <p>Si l'en-t�te <code>mon-en-t�te-requ�te: mavaleur</code> est
+ pr�sent dans la requ�te HTTP, la r�ponse contiendra un en-t�te
+ du type :</p>
+
+ <div class="example"><p><code>
+ mon-en-t�te: D=3775428 t=991424704447256 montexte
+ </code></p></div>
+ </li>
+
+ <li>
+ Permet � DAV de fonctionner avec Apache sur SSL (voir la <a href="http://svn.haxx.se/users/archive-2006-03/0549.shtml">description
+ du probl�me</a>) en rempla�ant <var>https:</var> par
+ <var>http:</var> dans l'en-t�te <var>Destination</var> :
+
+ <pre class="prettyprint lang-config">RequestHeader edit Destination ^https: http: early</pre>
+
+ </li>
+
+ <li>
+ D�finit la valeur d'un m�me en-t�te sous de multiples conditions
+ non exclusives, mais ne duplique pas une valeur d�j� d�finie
+ dans l'en-t�te qui en r�sulte. Si toutes les conditions
+ suivantes sont satisfaites pour une requ�te (en d'autres termes,
+ si les trois variables d'environnement <code>CGI</code>,
+ <code>NO_CACHE</code> et <code>NO_STORE</code> existent pour la
+ requ�te) :
+
+ <pre class="prettyprint lang-config">Header merge Cache-Control no-cache env=CGI
+Header merge Cache-Control no-cache env=NO_CACHE
+Header merge Cache-Control no-store env=NO_STORE</pre>
+
+
+ <p>alors, la r�ponse contiendra l'en-t�te suivant :</p>
+
+ <div class="example"><p><code>
+ Cache-Control: no-cache, no-store
+ </code></p></div>
+
+ <p>Si <code>append</code> avait �t� utilis� � la place de
+ <code>merge</code>, la r�ponse aurait contenu l'en-t�te suivant
+ :</p>
+
+ <div class="example"><p><code>
+ Cache-Control: no-cache, no-cache, no-store
+ </code></p></div>
+ </li>
+ <li>
+ D�finit un cookie de test si et seulement si le client n'envoie
+ pas de cookie
+ <pre class="prettyprint lang-config">Header set Set-Cookie testcookie "expr=-z %{req:Cookie}"</pre>
+
+ </li>
+ <li>
+ Ajoute un en-t�te de mise en cache pour les r�ponses avec un
+ code d'�tat HTTP de 200
+ <pre class="prettyprint lang-config">Header append Cache-Control s-maxage=600 "expr=%{REQUEST_STATUS} == 200"</pre>
+
+ </li>
+
+ </ol>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_headers.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_headers.html.ja.utf8 b/docs/manual/mod/mod_headers.html.ja.utf8
index a4a05c6297..8dce0e9fb7 100644
--- a/docs/manual/mod/mod_headers.html.ja.utf8
+++ b/docs/manual/mod/mod_headers.html.ja.utf8
@@ -57,109 +57,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#examples">例</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="order" id="order">処理の順番</a></h2>
-
- <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> のディレクティブはサーバ設定のほぼどこにでも
- 書くことができ、影響する範囲を<a href="../sections.html">設定用セクション</a>で囲むことで限定する
- ことができます。</p>
-
- <p>処理の順番は重要で、設定ファイル中の順番と、<a href="../sections.html">設定用セクション</a>内の位置との両方に
- 影響されます。以下の二つのヘッダは順番が逆になると
- 違う結果になります:</p>
-
- <div class="example"><p><code>
- RequestHeader append MirrorID "mirror 12"<br />
- RequestHeader unset MirrorID
- </code></p></div>
-
- <p>この順番の場合は、<code>MirrorID</code> ヘッダは設定されません。
- 逆になっていると、MirrorID ヘッダは "mirror 12" に設定されます。</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="early" id="early">早期処理、後期処理</a></h2>
- <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> では、リクエストの早期か後期かの
- どちらで適用するかを選べます。通常は後期モードで、
- コンテンツ生成が実行される直前にリクエストヘッダがセットされ、
- レスポンスとして送出される直前にレスポンスヘッダがセットされます。
- 運用中のサーバでは必ず後期モードを使ってください。</p>
-
- <p>早期モードは開発者向けのテスト/デバッグ用に設計されています。
- <code>early</code> キーワード指定されたディレクティブによって、
- リクエスト処理の開始地点になります。
- つまり、異なるリクエストを試したりテストケースをセットアップするのに
- 活用できる一方で、レスポンスを生成する前に他のモジュールによって
- ヘッダが書き換えられてしまうかもしれないということを意味します。</p>
-
- <p>early ディレクティブではリクエストパスの設定が解決される前に
- 処理されるので、メインサーバかバーチャルホストコンテキストでのみ、
- 早期ヘッダをセットできます。early ディレクティブはリクエストパスに
- 依存することはできませんので、<code>&lt;Directory&gt;</code> や
- <code>&lt;Location&gt;</code> といったコンテキスト内では使用
- できません。</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">例</a></h2>
-
- <ol>
- <li>リクエストヘッダ中の "TS" で始まるフィールドをすべて応答ヘッダに
- コピーします:
- <div class="example"><p><code>
- Header echo ^TS
- </code></p></div>
- </li>
-
- <li>
- リクエストを受け付けた時刻とリクエストを処理した時間を入れたヘッダ、
- <code>MyHeader</code> を応答に追加します。このヘッダはクライアントが
- サーバの負荷を直観的に知るためや、クライアント-サーバ間の
- ボトルネックを調べるために使うことができます。
-
- <div class="example"><p><code>
- Header add MyHeader "%D %t"
- </code></p></div>
-
- <p>上記の設定では、以下のようなヘッダが応答に追加されることになります:</p>
-
- <div class="example"><p><code>
- MyHeader: D=3775428 t=991424704447256
- </code></p></div>
- </li>
-
- <li>
- Joe にあいさつをします:
-
- <div class="example"><p><code>
- Header add MyHeader "Hello Joe. It took %D microseconds for Apache to serve this request."
- </code></p></div>
-
- <p>以下のようなヘッダが応答に追加されることになります</p>
-
- <div class="example"><p><code>
- MyHeader: Hello Joe. It took D=3775428 microseconds for Apache to serve this request.
- </code></p></div>
- </li>
-
- <li>リクエストに "MyRequestHeader" があるときに限り <code>MyHeader</code> を応答に
- 付けます。これは、クライアントの要求に応えてヘッダを作成するときに
- 役に立ちます。この例では <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> モジュールが必要なことに
- 注意してください。
-
- <div class="example"><p><code>
- SetEnvIf MyRequestHeader value HAVE_MyRequestHeader<br />
- Header add MyHeader "%D %t mytext" env=HAVE_MyRequestHeader
- </code></p></div>
-
- <p>もし HTTP リクエストに <code>MyRequestHeader: value</code> ヘッダが
- あると、応答には以下のようなヘッダが付加されます。</p>
-
- <div class="example"><p><code>
- MyHeader: D=3775428 t=991424704447256 mytext
- </code></p></div>
- </li>
- </ol>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Header" id="Header">Header</a> <a name="header" id="header">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>HTTP 応答ヘッダの設定</td></tr>
@@ -344,6 +241,109 @@
生成されたヘッダを上書きしたり修正したりできるようになっています。</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="order" id="order">処理の順番</a></h2>
+
+ <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> のディレクティブはサーバ設定のほぼどこにでも
+ 書くことができ、影響する範囲を<a href="../sections.html">設定用セクション</a>で囲むことで限定する
+ ことができます。</p>
+
+ <p>処理の順番は重要で、設定ファイル中の順番と、<a href="../sections.html">設定用セクション</a>内の位置との両方に
+ 影響されます。以下の二つのヘッダは順番が逆になると
+ 違う結果になります:</p>
+
+ <div class="example"><p><code>
+ RequestHeader append MirrorID "mirror 12"<br />
+ RequestHeader unset MirrorID
+ </code></p></div>
+
+ <p>この順番の場合は、<code>MirrorID</code> ヘッダは設定されません。
+ 逆になっていると、MirrorID ヘッダは "mirror 12" に設定されます。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="early" id="early">早期処理、後期処理</a></h2>
+ <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> では、リクエストの早期か後期かの
+ どちらで適用するかを選べます。通常は後期モードで、
+ コンテンツ生成が実行される直前にリクエストヘッダがセットされ、
+ レスポンスとして送出される直前にレスポンスヘッダがセットされます。
+ 運用中のサーバでは必ず後期モードを使ってください。</p>
+
+ <p>早期モードは開発者向けのテスト/デバッグ用に設計されています。
+ <code>early</code> キーワード指定されたディレクティブによって、
+ リクエスト処理の開始地点になります。
+ つまり、異なるリクエストを試したりテストケースをセットアップするのに
+ 活用できる一方で、レスポンスを生成する前に他のモジュールによって
+ ヘッダが書き換えられてしまうかもしれないということを意味します。</p>
+
+ <p>early ディレクティブではリクエストパスの設定が解決される前に
+ 処理されるので、メインサーバかバーチャルホストコンテキストでのみ、
+ 早期ヘッダをセットできます。early ディレクティブはリクエストパスに
+ 依存することはできませんので、<code>&lt;Directory&gt;</code> や
+ <code>&lt;Location&gt;</code> といったコンテキスト内では使用
+ できません。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">例</a></h2>
+
+ <ol>
+ <li>リクエストヘッダ中の "TS" で始まるフィールドをすべて応答ヘッダに
+ コピーします:
+ <div class="example"><p><code>
+ Header echo ^TS
+ </code></p></div>
+ </li>
+
+ <li>
+ リクエストを受け付けた時刻とリクエストを処理した時間を入れたヘッダ、
+ <code>MyHeader</code> を応答に追加します。このヘッダはクライアントが
+ サーバの負荷を直観的に知るためや、クライアント-サーバ間の
+ ボトルネックを調べるために使うことができます。
+
+ <div class="example"><p><code>
+ Header add MyHeader "%D %t"
+ </code></p></div>
+
+ <p>上記の設定では、以下のようなヘッダが応答に追加されることになります:</p>
+
+ <div class="example"><p><code>
+ MyHeader: D=3775428 t=991424704447256
+ </code></p></div>
+ </li>
+
+ <li>
+ Joe にあいさつをします:
+
+ <div class="example"><p><code>
+ Header add MyHeader "Hello Joe. It took %D microseconds for Apache to serve this request."
+ </code></p></div>
+
+ <p>以下のようなヘッダが応答に追加されることになります</p>
+
+ <div class="example"><p><code>
+ MyHeader: Hello Joe. It took D=3775428 microseconds for Apache to serve this request.
+ </code></p></div>
+ </li>
+
+ <li>リクエストに "MyRequestHeader" があるときに限り <code>MyHeader</code> を応答に
+ 付けます。これは、クライアントの要求に応えてヘッダを作成するときに
+ 役に立ちます。この例では <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> モジュールが必要なことに
+ 注意してください。
+
+ <div class="example"><p><code>
+ SetEnvIf MyRequestHeader value HAVE_MyRequestHeader<br />
+ Header add MyHeader "%D %t mytext" env=HAVE_MyRequestHeader
+ </code></p></div>
+
+ <p>もし HTTP リクエストに <code>MyRequestHeader: value</code> ヘッダが
+ あると、応答には以下のようなヘッダが付加されます。</p>
+
+ <div class="example"><p><code>
+ MyHeader: D=3775428 t=991424704447256 mytext
+ </code></p></div>
+ </li>
+ </ol>
+</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_headers.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_headers.html.ko.euc-kr b/docs/manual/mod/mod_headers.html.ko.euc-kr
index c0be03e7c5..2a33cace21 100644
--- a/docs/manual/mod/mod_headers.html.ko.euc-kr
+++ b/docs/manual/mod/mod_headers.html.ko.euc-kr
@@ -54,111 +54,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#examples">����</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="order" id="order">ó�� ����</a></h2>
-
- <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code>�� �����ϴ� ���þ�� ����������
- ���� ��� ��ҿ��� ����� �� ������, <a href="../sections.html">���� ����</a>���� ���μ� ���þ���
- ������ ������ ���� �ִ�.</p>
-
- <p>ó�������� �߿��ϸ�, �������Ͽ� ���� ������ <a href="../sections.html#mergin">���� ����</a>�� ������ �޴´�.
- ���� �� ���þ �ݴ�� ������ ȿ���� �޶�����.</p>
-
- <div class="example"><p><code>
- RequestHeader append MirrorID "mirror 12"<br />
- RequestHeader unset MirrorID
- </code></p></div>
-
- <p>���� ���� ������ <code>MirrorID</code> ����� ������
- �ʴ´�. �ݴ�� ������ MirrorID ����� "mirror 12"�� �����Ѵ�.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="early" id="early">�̸�(early) ó���� ����(late) ó��</a></h2>
- <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code>�� ��û �ʱ⳪ ���߿� ������
- �� �ִ�. ������ ��������ڸ� �����ϱ� ������ ��û �����
- �����ϰ� ������ ��Ʈ���� ���� ���� ����� �����ϴ� ����(late)
- ����� ����Ѵ�. ���� �����ϴ� ���������� �׻� ���� �����
- ����϶�.</p>
-
- <p>�̸�(early) ����� �����ڸ� ���� �˻�/���������� �������.
- <code>early</code> Ű���带 ����Ͽ� ������ ���þ�� ��û��
- ó���ϱ� �����Ҷ� �����Ѵ�. ��, �ٸ� ��û�� ���ǽ����ϰų�
- �˻縦 �ϱ����� ����� �� ������, ������ �����ϱ� ���� �ٸ�
- ����� �ҽÿ� ����� ������ �� �ִ�.</p>
-
- <p>��û��ο� ���� ������ ���캸�� ���� �̸� ���þ
- ó���ϱ⶧���� �̸� ��� ���þ�� �ּ����̳� ����ȣ��Ʈ
- �����ҿ����� ����� �� �ִ�. �̸� ���þ�� ��û��ο�
- ������ �� ���⶧���� <code>&lt;Directory&gt;</code>��
- <code>&lt;Location&gt;</code>���� �����ҿ��� ����� ��
- ����.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">����</a></h2>
-
- <ol>
- <li>
- "TS"�� �����ϴ� ��� ��û ����� ���� ����� �����Ѵ�.
-
- <div class="example"><p><code>
- Header echo ^TS
- </code></p></div>
- </li>
-
- <li>
- ���信 ��û�� ���� �ð��� ��û�� �����ϴµ� �ɸ� �ð���
- �˷��ִ� <code>MyHeader</code> ����� �߰��Ѵ�. Ŭ���̾�Ʈ��
- �� ����� ���� ������ ���ϸ� �����ϰų� Ŭ���̾�Ʈ��
- �������� �������� ã�� �� �ִ�.
-
- <div class="example"><p><code>
- Header add MyHeader "%D %t"
- </code></p></div>
-
- <p>���信 ������ ���� ����� �����.</p>
-
- <div class="example"><p><code>
- MyHeader: D=3775428 t=991424704447256
- </code></p></div>
- </li>
-
- <li>
- Joe���� �ȳ�
-
- <div class="example"><p><code>
- Header add MyHeader "Hello Joe. It took %D microseconds \<br />
- for Apache to serve this request."
- </code></p></div>
-
- <p>���信 ������ ���� ����� �����.</p>
-
- <div class="example"><p><code>
- MyHeader: Hello Joe. It took D=3775428 microseconds for Apache
- to serve this request.
- </code></p></div>
- </li>
-
- <li>
- ��û�� "MyRequestHeader" ����� �ִ� ��쿡�� ����������
- ���信 <code>MyHeader</code>�� ������. Ư�� Ŭ���̾�Ʈ���Ը�
- ���信 ����� �߰��Ҷ� �����ϴ�. �� ������ �����Ϸ���
- <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> ����� �ʿ��ϴ�.
-
- <div class="example"><p><code>
- SetEnvIf MyRequestHeader value HAVE_MyRequestHeader<br />
- Header add MyHeader "%D %t mytext" env=HAVE_MyRequestHeader<br />
- </code></p></div>
-
- <p>HTTP ��û�� <code>MyRequestHeader: value</code> �����
- �ִٸ�, ���信 ������ ���� ����� �����.</p>
-
- <div class="example"><p><code>
- MyHeader: D=3775428 t=991424704447256 mytext
- </code></p></div>
- </li>
- </ol>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Header" id="Header">Header</a> <a name="header" id="header">���þ�</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">����:</a></th><td>HTTP ���� ����� �����Ѵ�</td></tr>
@@ -332,6 +227,111 @@
������ �� �ִ�.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="order" id="order">ó�� ����</a></h2>
+
+ <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code>�� �����ϴ� ���þ�� ����������
+ ���� ��� ��ҿ��� ����� �� ������, <a href="../sections.html">���� ����</a>���� ���μ� ���þ���
+ ������ ������ ���� �ִ�.</p>
+
+ <p>ó�������� �߿��ϸ�, �������Ͽ� ���� ������ <a href="../sections.html#mergin">���� ����</a>�� ������ �޴´�.
+ ���� �� ���þ �ݴ�� ������ ȿ���� �޶�����.</p>
+
+ <div class="example"><p><code>
+ RequestHeader append MirrorID "mirror 12"<br />
+ RequestHeader unset MirrorID
+ </code></p></div>
+
+ <p>���� ���� ������ <code>MirrorID</code> ����� ������
+ �ʴ´�. �ݴ�� ������ MirrorID ����� "mirror 12"�� �����Ѵ�.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="early" id="early">�̸�(early) ó���� ����(late) ó��</a></h2>
+ <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code>�� ��û �ʱ⳪ ���߿� ������
+ �� �ִ�. ������ ��������ڸ� �����ϱ� ������ ��û �����
+ �����ϰ� ������ ��Ʈ���� ���� ���� ����� �����ϴ� ����(late)
+ ����� ����Ѵ�. ���� �����ϴ� ���������� �׻� ���� �����
+ ����϶�.</p>
+
+ <p>�̸�(early) ����� �����ڸ� ���� �˻�/���������� �������.
+ <code>early</code> Ű���带 ����Ͽ� ������ ���þ�� ��û��
+ ó���ϱ� �����Ҷ� �����Ѵ�. ��, �ٸ� ��û�� ���ǽ����ϰų�
+ �˻縦 �ϱ����� ����� �� ������, ������ �����ϱ� ���� �ٸ�
+ ����� �ҽÿ� ����� ������ �� �ִ�.</p>
+
+ <p>��û��ο� ���� ������ ���캸�� ���� �̸� ���þ
+ ó���ϱ⶧���� �̸� ��� ���þ�� �ּ����̳� ����ȣ��Ʈ
+ �����ҿ����� ����� �� �ִ�. �̸� ���þ�� ��û��ο�
+ ������ �� ���⶧���� <code>&lt;Directory&gt;</code>��
+ <code>&lt;Location&gt;</code>���� �����ҿ��� ����� ��
+ ����.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">����</a></h2>
+
+ <ol>
+ <li>
+ "TS"�� �����ϴ� ��� ��û ����� ���� ����� �����Ѵ�.
+
+ <div class="example"><p><code>
+ Header echo ^TS
+ </code></p></div>
+ </li>
+
+ <li>
+ ���信 ��û�� ���� �ð��� ��û�� �����ϴµ� �ɸ� �ð���
+ �˷��ִ� <code>MyHeader</code> ����� �߰��Ѵ�. Ŭ���̾�Ʈ��
+ �� ����� ���� ������ ���ϸ� �����ϰų� Ŭ���̾�Ʈ��
+ �������� �������� ã�� �� �ִ�.
+
+ <div class="example"><p><code>
+ Header add MyHeader "%D %t"
+ </code></p></div>
+
+ <p>���信 ������ ���� ����� �����.</p>
+
+ <div class="example"><p><code>
+ MyHeader: D=3775428 t=991424704447256
+ </code></p></div>
+ </li>
+
+ <li>
+ Joe���� �ȳ�
+
+ <div class="example"><p><code>
+ Header add MyHeader "Hello Joe. It took %D microseconds \<br />
+ for Apache to serve this request."
+ </code></p></div>
+
+ <p>���信 ������ ���� ����� �����.</p>
+
+ <div class="example"><p><code>
+ MyHeader: Hello Joe. It took D=3775428 microseconds for Apache
+ to serve this request.
+ </code></p></div>
+ </li>
+
+ <li>
+ ��û�� "MyRequestHeader" ����� �ִ� ��쿡�� ����������
+ ���信 <code>MyHeader</code>�� ������. Ư�� Ŭ���̾�Ʈ���Ը�
+ ���信 ����� �߰��Ҷ� �����ϴ�. �� ������ �����Ϸ���
+ <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> ����� �ʿ��ϴ�.
+
+ <div class="example"><p><code>
+ SetEnvIf MyRequestHeader value HAVE_MyRequestHeader<br />
+ Header add MyHeader "%D %t mytext" env=HAVE_MyRequestHeader<br />
+ </code></p></div>
+
+ <p>HTTP ��û�� <code>MyRequestHeader: value</code> �����
+ �ִٸ�, ���信 ������ ���� ����� �����.</p>
+
+ <div class="example"><p><code>
+ MyHeader: D=3775428 t=991424704447256 mytext
+ </code></p></div>
+ </li>
+ </ol>
+</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_headers.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_heartbeat.html.en b/docs/manual/mod/mod_heartbeat.html.en
index 6e6b6aac0b..3916389814 100644
--- a/docs/manual/mod/mod_heartbeat.html.en
+++ b/docs/manual/mod/mod_heartbeat.html.en
@@ -61,6 +61,25 @@ of <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</
<li><img alt="" src="../images/down.gif" /> <a href="#consuming">Consuming mod_heartbeat Output</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="HeartbeatAddress" id="HeartbeatAddress">HeartbeatAddress</a> <a name="heartbeataddress" id="heartbeataddress">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Multicast address for heartbeat packets</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>HeartbeatAddress <var>addr:port</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>disabled</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_heartbeat</td></tr>
+</table>
+<p>The <code class="directive">HeartbeatAddress</code> directive specifies the
+multicast address to which <code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code> will send
+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 class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="consuming" id="consuming">Consuming mod_heartbeat Output</a></h2>
@@ -81,25 +100,6 @@ v=1&amp;ready=75&amp;busy=0
</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="HeartbeatAddress" id="HeartbeatAddress">HeartbeatAddress</a> <a name="heartbeataddress" id="heartbeataddress">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Multicast address for heartbeat packets</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>HeartbeatAddress <var>addr:port</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>disabled</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_heartbeat</td></tr>
-</table>
-<p>The <code class="directive">HeartbeatAddress</code> directive specifies the
-multicast address to which <code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code> will send
-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>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_heartbeat.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_heartbeat.html.fr b/docs/manual/mod/mod_heartbeat.html.fr
index 83ebcaeb51..7e1e8cdd69 100644
--- a/docs/manual/mod/mod_heartbeat.html.fr
+++ b/docs/manual/mod/mod_heartbeat.html.fr
@@ -67,6 +67,26 @@ du serveur HTTP Apache</td></tr></table>
<li><img alt="" src="../images/down.gif" /> <a href="#consuming">Utilisation de la sortie de mod_heartbeat</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="heartbeataddress" id="heartbeataddress">Directive</a> <a name="HeartbeatAddress" id="HeartbeatAddress">HeartbeatAddress</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Adresse multicast � laquelle envoyer les requ�tes
+heartbeat</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>HeartbeatAddress <var>addr:port</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>disabled</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_heartbeat</td></tr>
+</table>
+ <p>La directive <code class="directive">HeartbeatAddress</code> permet de
+ sp�cifier l'adresse multicast � laquelle <code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code> va
+ envoyer ses informations. En g�n�ral, cette adresse correspond � la
+ valeur d�finie par la directive <code class="directive"><a href="../mod/mod_heartmonitor.html#heartbeatlisten">HeartbeatListen</a></code> sur le serveur
+ mandataire frontal.</p>
+ <pre class="prettyprint lang-config">HeartbeatAddress 239.0.0.1:27999</pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="consuming" id="consuming">Utilisation de la sortie de mod_heartbeat</a></h2>
@@ -87,26 +107,6 @@ v=1&amp;ready=75&amp;busy=0
</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="heartbeataddress" id="heartbeataddress">Directive</a> <a name="HeartbeatAddress" id="HeartbeatAddress">HeartbeatAddress</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Adresse multicast � laquelle envoyer les requ�tes
-heartbeat</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>HeartbeatAddress <var>addr:port</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>disabled</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_heartbeat</td></tr>
-</table>
- <p>La directive <code class="directive">HeartbeatAddress</code> permet de
- sp�cifier l'adresse multicast � laquelle <code class="module"><a href="../mod/mod_heartbeat.html">mod_heartbeat</a></code> va
- envoyer ses informations. En g�n�ral, cette adresse correspond � la
- valeur d�finie par la directive <code class="directive"><a href="../mod/mod_heartmonitor.html#heartbeatlisten">HeartbeatListen</a></code> sur le serveur
- mandataire frontal.</p>
- <pre class="prettyprint lang-config">HeartbeatAddress 239.0.0.1:27999</pre>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_heartbeat.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_heartmonitor.html.en b/docs/manual/mod/mod_heartmonitor.html.en
index 8d8c7c2eeb..f086d62645 100644
--- a/docs/manual/mod/mod_heartmonitor.html.en
+++ b/docs/manual/mod/mod_heartmonitor.html.en
@@ -61,7 +61,6 @@ use <code class="module"><a href="../mod/mod_slotmem_shm.html">mod_slotmem_shm</
<li><img alt="" src="../images/down.gif" /> <a href="#heartbeatstorage">HeartbeatStorage</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="HeartbeatListen" id="HeartbeatListen">HeartbeatListen</a> <a name="heartbeatlisten" id="heartbeatlisten">Directive</a></h2>
<table class="directive">
@@ -116,6 +115,7 @@ heartbeat requests to this server</td></tr>
<code class="module"><a href="../mod/mod_slotmem_shm.html">mod_slotmem_shm</a></code> is not loaded.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_heartmonitor.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_heartmonitor.html.fr b/docs/manual/mod/mod_heartmonitor.html.fr
index 558e84704c..43e6b51cb5 100644
--- a/docs/manual/mod/mod_heartmonitor.html.fr
+++ b/docs/manual/mod/mod_heartmonitor.html.fr
@@ -62,7 +62,6 @@ configuration suppl�mentaire n'est requise pour utiliser
<li><img alt="" src="../images/down.gif" /> <a href="#heartbeatstorage">HeartbeatStorage</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="heartbeatlisten" id="heartbeatlisten">Directive</a> <a name="HeartbeatListen" id="HeartbeatListen">HeartbeatListen</a></h2>
<table class="directive">
@@ -123,6 +122,7 @@ des requ�tes heartbeat � ce serveur.</td></tr>
pas charg�.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_heartmonitor.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ident.html.en b/docs/manual/mod/mod_ident.html.en
index 2b990a3890..a27189d427 100644
--- a/docs/manual/mod/mod_ident.html.en
+++ b/docs/manual/mod/mod_ident.html.en
@@ -48,7 +48,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="IdentityCheck" id="IdentityCheck">IdentityCheck</a> <a name="identitycheck" id="identitycheck">Directive</a></h2>
<table class="directive">
@@ -96,6 +95,7 @@ user</td></tr>
timeout value according to your local network speed.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_ident.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ident.html.fr b/docs/manual/mod/mod_ident.html.fr
index 499f418c4a..2f6f4f6c24 100644
--- a/docs/manual/mod/mod_ident.html.fr
+++ b/docs/manual/mod/mod_ident.html.fr
@@ -50,7 +50,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="identitycheck" id="identitycheck">Directive</a> <a name="IdentityCheck" id="IdentityCheck">IdentityCheck</a></h2>
<table class="directive">
@@ -105,6 +104,7 @@ ident</td></tr>
valeur de ce d�lai en fonction du d�bit de votre r�seau local.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_ident.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ident.html.ja.utf8 b/docs/manual/mod/mod_ident.html.ja.utf8
index b294db7ee6..ddac05552c 100644
--- a/docs/manual/mod/mod_ident.html.ja.utf8
+++ b/docs/manual/mod/mod_ident.html.ja.utf8
@@ -48,7 +48,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="IdentityCheck" id="IdentityCheck">IdentityCheck</a> <a name="identitycheck" id="identitycheck">ディレクティブ</a></h2>
<table class="directive">
@@ -96,6 +95,7 @@
合わせてタイムアウト値を調節するのがよいでしょう。</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_ident.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ident.html.ko.euc-kr b/docs/manual/mod/mod_ident.html.ko.euc-kr
index 8d16692065..74ad729206 100644
--- a/docs/manual/mod/mod_ident.html.ko.euc-kr
+++ b/docs/manual/mod/mod_ident.html.ko.euc-kr
@@ -49,7 +49,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="IdentityCheck" id="IdentityCheck">IdentityCheck</a> <a name="identitycheck" id="identitycheck">���þ�</a></h2>
<table class="directive">
@@ -93,6 +92,7 @@
������ �� �ִ�.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_ident.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_imagemap.html.en b/docs/manual/mod/mod_imagemap.html.en
index 1c57a17595..68204cb92a 100644
--- a/docs/manual/mod/mod_imagemap.html.en
+++ b/docs/manual/mod/mod_imagemap.html.en
@@ -70,6 +70,94 @@
<li><img alt="" src="../images/down.gif" /> <a href="#referencing">Referencing your mapfile</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ImapBase" id="ImapBase">ImapBase</a> <a name="imapbase" id="imapbase">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Default <code>base</code> for imagemap files</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ImapBase map|referer|<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ImapBase http://servername/</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#Override">Override:</a></th><td>Indexes</td></tr>
+<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_imagemap</td></tr>
+</table>
+ <p>The <code class="directive">ImapBase</code> directive sets the default
+ <code>base</code> used in the imagemap files. Its value is
+ overridden by a <code>base</code> directive within the imagemap
+ file. If not present, the <code>base</code> defaults to
+ <code>http://<var>servername</var>/</code>.</p>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ImapDefault" id="ImapDefault">ImapDefault</a> <a name="imapdefault" id="imapdefault">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Default action when an imagemap is called with coordinates
+that are not explicitly mapped</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ImapDefault error|nocontent|map|referer|<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ImapDefault nocontent</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#Override">Override:</a></th><td>Indexes</td></tr>
+<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_imagemap</td></tr>
+</table>
+ <p>The <code class="directive">ImapDefault</code> directive sets the default
+ <code>default</code> used in the imagemap files. Its value is
+ overridden by a <code>default</code> directive within the
+ imagemap file. If not present, the <code>default</code> action
+ is <code>nocontent</code>, which means that a <code>204 No
+ Content</code> is sent to the client. In this case, the client
+ should continue to display the original page.</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="ImapMenu" id="ImapMenu">ImapMenu</a> <a name="imapmenu" id="imapmenu">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Action if no coordinates are given when calling
+an imagemap</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ImapMenu none|formatted|semiformatted|unformatted</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ImapMenu formatted</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#Override">Override:</a></th><td>Indexes</td></tr>
+<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_imagemap</td></tr>
+</table>
+ <p>The <code class="directive">ImapMenu</code> directive determines the
+ action taken if an imagemap file is called without valid
+ coordinates.</p>
+
+ <dl>
+ <dt><code>none</code></dt>
+ <dd>If ImapMenu is <code>none</code>, no menu is generated,
+ and the <code>default</code> action is performed.</dd>
+
+ <dt><code>formatted</code></dt>
+ <dd>A <code>formatted</code> menu is the simplest menu.
+ Comments in the imagemap file are ignored. A level one header
+ is printed, then an hrule, then the links each on a separate
+ line. The menu has a consistent, plain look close to that of
+ a directory listing.</dd>
+
+ <dt><code>semiformatted</code></dt>
+ <dd>In the <code>semiformatted</code> menu, comments are
+ printed where they occur in the imagemap file. Blank lines
+ are turned into HTML breaks. No header or hrule is printed,
+ but otherwise the menu is the same as a
+ <code>formatted</code> menu.</dd>
+
+ <dt><code>unformatted</code></dt>
+ <dd>Comments are printed, blank lines are ignored. Nothing is
+ printed that does not appear in the imagemap file. All breaks
+ and headers must be included as comments in the imagemap
+ file. This gives you the most flexibility over the appearance
+ of your menus, but requires you to treat your map files as
+ HTML instead of plaintext.</dd>
+ </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="features" id="features">New Features</a></h2>
@@ -292,94 +380,6 @@
</code></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="ImapBase" id="ImapBase">ImapBase</a> <a name="imapbase" id="imapbase">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Default <code>base</code> for imagemap files</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ImapBase map|referer|<var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ImapBase http://servername/</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#Override">Override:</a></th><td>Indexes</td></tr>
-<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_imagemap</td></tr>
-</table>
- <p>The <code class="directive">ImapBase</code> directive sets the default
- <code>base</code> used in the imagemap files. Its value is
- overridden by a <code>base</code> directive within the imagemap
- file. If not present, the <code>base</code> defaults to
- <code>http://<var>servername</var>/</code>.</p>
-
-<h3>See also</h3>
-<ul>
-<li><code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ImapDefault" id="ImapDefault">ImapDefault</a> <a name="imapdefault" id="imapdefault">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Default action when an imagemap is called with coordinates
-that are not explicitly mapped</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ImapDefault error|nocontent|map|referer|<var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ImapDefault nocontent</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#Override">Override:</a></th><td>Indexes</td></tr>
-<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_imagemap</td></tr>
-</table>
- <p>The <code class="directive">ImapDefault</code> directive sets the default
- <code>default</code> used in the imagemap files. Its value is
- overridden by a <code>default</code> directive within the
- imagemap file. If not present, the <code>default</code> action
- is <code>nocontent</code>, which means that a <code>204 No
- Content</code> is sent to the client. In this case, the client
- should continue to display the original page.</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="ImapMenu" id="ImapMenu">ImapMenu</a> <a name="imapmenu" id="imapmenu">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Action if no coordinates are given when calling
-an imagemap</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ImapMenu none|formatted|semiformatted|unformatted</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ImapMenu formatted</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#Override">Override:</a></th><td>Indexes</td></tr>
-<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_imagemap</td></tr>
-</table>
- <p>The <code class="directive">ImapMenu</code> directive determines the
- action taken if an imagemap file is called without valid
- coordinates.</p>
-
- <dl>
- <dt><code>none</code></dt>
- <dd>If ImapMenu is <code>none</code>, no menu is generated,
- and the <code>default</code> action is performed.</dd>
-
- <dt><code>formatted</code></dt>
- <dd>A <code>formatted</code> menu is the simplest menu.
- Comments in the imagemap file are ignored. A level one header
- is printed, then an hrule, then the links each on a separate
- line. The menu has a consistent, plain look close to that of
- a directory listing.</dd>
-
- <dt><code>semiformatted</code></dt>
- <dd>In the <code>semiformatted</code> menu, comments are
- printed where they occur in the imagemap file. Blank lines
- are turned into HTML breaks. No header or hrule is printed,
- but otherwise the menu is the same as a
- <code>formatted</code> menu.</dd>
-
- <dt><code>unformatted</code></dt>
- <dd>Comments are printed, blank lines are ignored. Nothing is
- printed that does not appear in the imagemap file. All breaks
- and headers must be included as comments in the imagemap
- file. This gives you the most flexibility over the appearance
- of your menus, but requires you to treat your map files as
- HTML instead of plaintext.</dd>
- </dl>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_imagemap.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_imagemap.html.fr b/docs/manual/mod/mod_imagemap.html.fr
index 1ea8f1b3ca..7c23ab8b07 100644
--- a/docs/manual/mod/mod_imagemap.html.fr
+++ b/docs/manual/mod/mod_imagemap.html.fr
@@ -72,6 +72,101 @@
imagemap</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="imapbase" id="imapbase">Directive</a> <a name="ImapBase" id="ImapBase">ImapBase</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Valeur par d�faut de la directive <code>base</code> des
+fichiers imagemap</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ImapBase map|referer|<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ImapBase http://nom_serveur/</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>Indexes</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_imagemap</td></tr>
+</table>
+ <p>La directive <code class="directive">ImapBase</code> permet de d�finir la
+ valeur par d�faut de la directive <code>base</code> des fichiers
+ imagemap. Sa valeur est �cras�e par la pr�sence �ventuelle d'une
+ directive <code>base</code> dans le fichier imagemap. Si cette
+ directive est absente, la valeur par d�faut de la directive
+ <code>base</code> est
+ <code>http://<var>nom_serveur</var>/</code>.</p>
+
+<h3>Voir aussi</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="imapdefault" id="imapdefault">Directive</a> <a name="ImapDefault" id="ImapDefault">ImapDefault</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Action � entreprendre par d�faut lorsqu'un fichier imagemap
+est invoqu� avec des coordonn�es qui ne correspondent � aucune
+cible</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ImapDefault error|nocontent|map|referer|<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ImapDefault nocontent</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>Indexes</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_imagemap</td></tr>
+</table>
+ <p>La directive <code class="directive">ImapDefault</code> permet de d�finir
+ la valeur par d�faut de la directive <code>default</code> utilis�e
+ dans les fichiers imagemap. Sa valeur est �cras�e par la pr�sence
+ �ventuelle d'une directive <code>default</code> dans le fichier
+ imagemap. Si cette directive est absente, l'action associ�e �
+ <code>default</code> est <code>nocontent</code>, ce qui implique
+ l'envoi d'un code de statut <code>204 No Content</code> au client.
+ Dans ce cas, le client doit continuer � afficher la m�me page.</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="imapmenu" id="imapmenu">Directive</a> <a name="ImapMenu" id="ImapMenu">ImapMenu</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Action � entreprendre si aucune coordonn�e n'est fournie
+lorsqu'on invoque un fichier imagemap</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ImapMenu none|formatted|semiformatted|unformatted</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ImapMenu formatted</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>Indexes</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_imagemap</td></tr>
+</table>
+ <p>La directive <code class="directive">ImapMenu</code> permet de sp�cifier
+ l'action � entreprendre lorsqu'un fichier imagemap est invoqu� sans
+ coordonn�es valides.</p>
+
+ <dl>
+ <dt><code>none</code></dt>
+ <dd>Si l'argument d'ImapMenu est <code>none</code>, aucun menu
+ n'est g�n�r�, et l'action <code>default</code> est effectu�e.</dd>
+
+ <dt><code>formatted</code></dt>
+ <dd>Le menu <code>formatted</code> est le menu le plus simple. Les
+ commentaires du fichier imagemap sont ignor�s. Un en-t�te de
+ niveau un est affich�, puis un s�parateur horizontal, puis chacun
+ des liens sur une ligne s�par�e. L'aspect du menu est similaire �
+ celui d'un listing de r�pertoire.</dd>
+
+ <dt><code>semiformatted</code></dt>
+ <dd>Dans le menu <code>semiformatted</code>, les commentaires sont
+ affich�s au moment o� ils apparaissent dans le fichier imagemap.
+ Les lignes vides sont interpr�t�es comme des lignes de s�paration
+ HTML. Aucun en-t�te ni s�parateur horizontal n'est affich�. � part
+ ces diff�rences, le menu <code>semiformatted</code> est identique
+ au menu <code>formatted</code>.</dd>
+
+ <dt><code>unformatted</code></dt>
+ <dd>Les commentaires sont affich�s et les lignes vides sont
+ ignor�es. N'est affich� que ce qui apparait dans le fichier
+ imagemap. Toutes les lignes de s�paration HTML et les
+ en-t�tes doivent �tre inclus en tant que commentaires dans le
+ fichier imagemap. Cela vous procure une grande souplesse pour
+ d�finir l'apparence de vos menus, mais vous oblige � r�diger vos
+ fichiers imagemap en HTML, et non en texte plat.</dd>
+ </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="features" id="features">Nouvelles fonctionnalit�s</a></h2>
@@ -309,101 +404,6 @@ imagemap</a></h2>
</code></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="imapbase" id="imapbase">Directive</a> <a name="ImapBase" id="ImapBase">ImapBase</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Valeur par d�faut de la directive <code>base</code> des
-fichiers imagemap</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ImapBase map|referer|<var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ImapBase http://nom_serveur/</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>Indexes</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_imagemap</td></tr>
-</table>
- <p>La directive <code class="directive">ImapBase</code> permet de d�finir la
- valeur par d�faut de la directive <code>base</code> des fichiers
- imagemap. Sa valeur est �cras�e par la pr�sence �ventuelle d'une
- directive <code>base</code> dans le fichier imagemap. Si cette
- directive est absente, la valeur par d�faut de la directive
- <code>base</code> est
- <code>http://<var>nom_serveur</var>/</code>.</p>
-
-<h3>Voir aussi</h3>
-<ul>
-<li><code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="imapdefault" id="imapdefault">Directive</a> <a name="ImapDefault" id="ImapDefault">ImapDefault</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Action � entreprendre par d�faut lorsqu'un fichier imagemap
-est invoqu� avec des coordonn�es qui ne correspondent � aucune
-cible</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ImapDefault error|nocontent|map|referer|<var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ImapDefault nocontent</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>Indexes</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_imagemap</td></tr>
-</table>
- <p>La directive <code class="directive">ImapDefault</code> permet de d�finir
- la valeur par d�faut de la directive <code>default</code> utilis�e
- dans les fichiers imagemap. Sa valeur est �cras�e par la pr�sence
- �ventuelle d'une directive <code>default</code> dans le fichier
- imagemap. Si cette directive est absente, l'action associ�e �
- <code>default</code> est <code>nocontent</code>, ce qui implique
- l'envoi d'un code de statut <code>204 No Content</code> au client.
- Dans ce cas, le client doit continuer � afficher la m�me page.</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="imapmenu" id="imapmenu">Directive</a> <a name="ImapMenu" id="ImapMenu">ImapMenu</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Action � entreprendre si aucune coordonn�e n'est fournie
-lorsqu'on invoque un fichier imagemap</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ImapMenu none|formatted|semiformatted|unformatted</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ImapMenu formatted</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>Indexes</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_imagemap</td></tr>
-</table>
- <p>La directive <code class="directive">ImapMenu</code> permet de sp�cifier
- l'action � entreprendre lorsqu'un fichier imagemap est invoqu� sans
- coordonn�es valides.</p>
-
- <dl>
- <dt><code>none</code></dt>
- <dd>Si l'argument d'ImapMenu est <code>none</code>, aucun menu
- n'est g�n�r�, et l'action <code>default</code> est effectu�e.</dd>
-
- <dt><code>formatted</code></dt>
- <dd>Le menu <code>formatted</code> est le menu le plus simple. Les
- commentaires du fichier imagemap sont ignor�s. Un en-t�te de
- niveau un est affich�, puis un s�parateur horizontal, puis chacun
- des liens sur une ligne s�par�e. L'aspect du menu est similaire �
- celui d'un listing de r�pertoire.</dd>
-
- <dt><code>semiformatted</code></dt>
- <dd>Dans le menu <code>semiformatted</code>, les commentaires sont
- affich�s au moment o� ils apparaissent dans le fichier imagemap.
- Les lignes vides sont interpr�t�es comme des lignes de s�paration
- HTML. Aucun en-t�te ni s�parateur horizontal n'est affich�. � part
- ces diff�rences, le menu <code>semiformatted</code> est identique
- au menu <code>formatted</code>.</dd>
-
- <dt><code>unformatted</code></dt>
- <dd>Les commentaires sont affich�s et les lignes vides sont
- ignor�es. N'est affich� que ce qui apparait dans le fichier
- imagemap. Toutes les lignes de s�paration HTML et les
- en-t�tes doivent �tre inclus en tant que commentaires dans le
- fichier imagemap. Cela vous procure une grande souplesse pour
- d�finir l'apparence de vos menus, mais vous oblige � r�diger vos
- fichiers imagemap en HTML, et non en texte plat.</dd>
- </dl>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_imagemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_imagemap.html.ko.euc-kr b/docs/manual/mod/mod_imagemap.html.ko.euc-kr
index 9d99a0db36..e8ea7d8377 100644
--- a/docs/manual/mod/mod_imagemap.html.ko.euc-kr
+++ b/docs/manual/mod/mod_imagemap.html.ko.euc-kr
@@ -67,6 +67,88 @@
<li><img alt="" src="../images/down.gif" /> <a href="#referencing">������ ����ϱ�</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ImapBase" id="ImapBase">ImapBase</a> <a name="imapbase" id="imapbase">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�̹����� ���Ͽ��� <code>base</code> �⺻��</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ImapBase map|referer|<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ImapBase http://servername/</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#Override">Override �ɼ�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_imagemap</td></tr>
+</table>
+ <p><code class="directive">ImapBase</code> ���þ�� �̹����� ���Ͽ���
+ ����� <code>base</code> �⺻���� �����Ѵ�. �̹����� ����
+ �ȿ��� <code>base</code> ���þ ����ϸ� ���⼭ ������
+ ���� �����Ѵ�. �� ��� ���ٸ�, <code>base</code> �⺻����
+ <code>http://<var>servername</var>/</code>�̴�.</p>
+
+<h3>����</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ImapDefault" id="ImapDefault">ImapDefault</a> <a name="imapdefault" id="imapdefault">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�̹����ʿ� ��� �������� �ش����� �ʴ� ��ǥ�� ��
+��� �⺻ �ൿ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ImapDefault error|nocontent|map|referer|<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ImapDefault nocontent</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#Override">Override �ɼ�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_imagemap</td></tr>
+</table>
+ <p><code class="directive">ImapDefault</code> ���þ�� �̹�����
+ ���Ͽ��� ����� <code>default</code> �⺻���� �����Ѵ�.
+ �̹����� ���� �ȿ��� <code>default</code> ���þ ����ϸ�
+ ���⼭ ������ ���� �����Ѵ�. �� ��� ���ٸ�, <code>default</code>
+ �ൿ�� Ŭ���̾�Ʈ���� <code>204 No Content</code>�� ������
+ <code>nocontent</code>�̴�. �� ��� Ŭ���̾�Ʈ�� ���� ��������
+ �״�� ������� �Ѵ�.</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="ImapMenu" id="ImapMenu">ImapMenu</a> <a name="imapmenu" id="imapmenu">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>��ǥ���� �̹����� ��û�� ���� �ൿ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ImapMenu none|formatted|semiformatted|unformatted</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#Override">Override �ɼ�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_imagemap</td></tr>
+</table>
+ <p><code class="directive">ImapMenu</code> ���þ�� �̹����� ���Ͽ�
+ ��ȿ�� ��ǥ�� ���� ���� ��� ���� �ൿ�� �����Ѵ�.</p>
+
+ <dl>
+ <dt><code>none</code></dt>
+ <dd>ImapMenu�� <code>none</code>�̸�, �޴��� �������ʰ�
+ <code>default</code> �ൿ�� ���Ѵ�.</dd>
+
+ <dt><code>formatted</code></dt>
+ <dd><code>formatted</code> �޴��� ���� ������ �޴���.
+ �̹����� ������ �ּ��� �����Ѵ�. ���� ū ǥ���� ��������
+ ����ϰ�, ��ũ�� ���پ� ����Ѵ�. �޴��� �ϰ��ǰ� �����ϸ�,
+ ���丮 ��ϰ� �����ϴ�.</dd>
+
+ <dt><code>semiformatted</code></dt>
+ <dd><code>semiformatted</code> �޴��� �̹����� ���Ͽ�
+ ������ �ּ��� ����Ѵ�. ������ HTML ��ٲ����� ��ȯ�Ѵ�.
+ ǥ���� �������� �׸��� ������, �������� <code>formatted</code>
+ �޴��� ����.</dd>
+
+ <dt><code>unformatted</code></dt>
+ <dd>�ּ��� ����ϰ�, ������ �����Ѵ�. �̹����� ���Ͽ�
+ �ִ� ���븸 ����Ѵ�. �̹����� ������ �ּ��� �ʿ��� ���
+ ��ٲް� ǥ���� ����� �Ѵ�. �޴��� �ܰ��� ���� ����������
+ �ٹ� �� ������, �̹����� ������ ��ǻ� �Ϲ� ����������
+ �ƴ� HTML�� ���� �Ѵ�.</dd>
+ </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="features" id="features">���ο� ���</a></h2>
@@ -275,88 +357,6 @@
</code></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="ImapBase" id="ImapBase">ImapBase</a> <a name="imapbase" id="imapbase">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�̹����� ���Ͽ��� <code>base</code> �⺻��</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ImapBase map|referer|<var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ImapBase http://servername/</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#Override">Override �ɼ�:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_imagemap</td></tr>
-</table>
- <p><code class="directive">ImapBase</code> ���þ�� �̹����� ���Ͽ���
- ����� <code>base</code> �⺻���� �����Ѵ�. �̹����� ����
- �ȿ��� <code>base</code> ���þ ����ϸ� ���⼭ ������
- ���� �����Ѵ�. �� ��� ���ٸ�, <code>base</code> �⺻����
- <code>http://<var>servername</var>/</code>�̴�.</p>
-
-<h3>����</h3>
-<ul>
-<li><code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ImapDefault" id="ImapDefault">ImapDefault</a> <a name="imapdefault" id="imapdefault">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�̹����ʿ� ��� �������� �ش����� �ʴ� ��ǥ�� ��
-��� �⺻ �ൿ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ImapDefault error|nocontent|map|referer|<var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ImapDefault nocontent</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#Override">Override �ɼ�:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_imagemap</td></tr>
-</table>
- <p><code class="directive">ImapDefault</code> ���þ�� �̹�����
- ���Ͽ��� ����� <code>default</code> �⺻���� �����Ѵ�.
- �̹����� ���� �ȿ��� <code>default</code> ���þ ����ϸ�
- ���⼭ ������ ���� �����Ѵ�. �� ��� ���ٸ�, <code>default</code>
- �ൿ�� Ŭ���̾�Ʈ���� <code>204 No Content</code>�� ������
- <code>nocontent</code>�̴�. �� ��� Ŭ���̾�Ʈ�� ���� ��������
- �״�� ������� �Ѵ�.</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="ImapMenu" id="ImapMenu">ImapMenu</a> <a name="imapmenu" id="imapmenu">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>��ǥ���� �̹����� ��û�� ���� �ൿ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ImapMenu none|formatted|semiformatted|unformatted</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#Override">Override �ɼ�:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_imagemap</td></tr>
-</table>
- <p><code class="directive">ImapMenu</code> ���þ�� �̹����� ���Ͽ�
- ��ȿ�� ��ǥ�� ���� ���� ��� ���� �ൿ�� �����Ѵ�.</p>
-
- <dl>
- <dt><code>none</code></dt>
- <dd>ImapMenu�� <code>none</code>�̸�, �޴��� �������ʰ�
- <code>default</code> �ൿ�� ���Ѵ�.</dd>
-
- <dt><code>formatted</code></dt>
- <dd><code>formatted</code> �޴��� ���� ������ �޴���.
- �̹����� ������ �ּ��� �����Ѵ�. ���� ū ǥ���� ��������
- ����ϰ�, ��ũ�� ���پ� ����Ѵ�. �޴��� �ϰ��ǰ� �����ϸ�,
- ���丮 ��ϰ� �����ϴ�.</dd>
-
- <dt><code>semiformatted</code></dt>
- <dd><code>semiformatted</code> �޴��� �̹����� ���Ͽ�
- ������ �ּ��� ����Ѵ�. ������ HTML ��ٲ����� ��ȯ�Ѵ�.
- ǥ���� �������� �׸��� ������, �������� <code>formatted</code>
- �޴��� ����.</dd>
-
- <dt><code>unformatted</code></dt>
- <dd>�ּ��� ����ϰ�, ������ �����Ѵ�. �̹����� ���Ͽ�
- �ִ� ���븸 ����Ѵ�. �̹����� ������ �ּ��� �ʿ��� ���
- ��ٲް� ǥ���� ����� �Ѵ�. �޴��� �ܰ��� ���� ����������
- �ٹ� �� ������, �̹����� ������ ��ǻ� �Ϲ� ����������
- �ƴ� HTML�� ���� �Ѵ�.</dd>
- </dl>
-
-</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_imagemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_include.html.en b/docs/manual/mod/mod_include.html.en
index df0000eeaf..1a4f2d7950 100644
--- a/docs/manual/mod/mod_include.html.en
+++ b/docs/manual/mod/mod_include.html.en
@@ -70,6 +70,284 @@
<li><a href="../howto/ssi.html">SSI Tutorial</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSIEndTag" id="SSIEndTag">SSIEndTag</a> <a name="ssiendtag" id="ssiendtag">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>String that ends an include element</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSIEndTag <var>tag</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSIEndTag "--&gt;"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<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_include</td></tr>
+</table>
+ <p>This directive changes the string that <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
+ looks for to mark the end of an include element.</p>
+
+ <pre class="prettyprint lang-config">SSIEndTag "%&gt;"</pre>
+
+
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#ssistarttag">SSIStartTag</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSIErrorMsg" id="SSIErrorMsg">SSIErrorMsg</a> <a name="ssierrormsg" id="ssierrormsg">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Error message displayed when there is an SSI
+error</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSIErrorMsg <var>message</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSIErrorMsg "[an error occurred while processing this
+directive]"</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#Override">Override:</a></th><td>All</td></tr>
+<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_include</td></tr>
+</table>
+ <p>The <code class="directive">SSIErrorMsg</code> directive changes the error
+ message displayed when <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> encounters an
+ error. For production servers you may consider changing the default
+ error message to <code>"&lt;!-- Error --&gt;"</code> so that
+ the message is not presented to the user.</p>
+
+ <p>This directive has the same effect as the <code>&lt;!--#config
+ errmsg=<var>message</var> --&gt;</code> element.</p>
+
+ <pre class="prettyprint lang-config">SSIErrorMsg "&lt;!-- Error --&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="SSIETag" id="SSIETag">SSIETag</a> <a name="ssietag" id="ssietag">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls whether ETags are generated by the server.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSIETag on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSIETag off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<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_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.2.15 and later.</td></tr>
+</table>
+ <p>Under normal circumstances, a file filtered by <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
+ may contain elements that are either dynamically generated, or that may
+ have changed independently of the original file. As a result, by default
+ the server is asked not to generate an <code>ETag</code> header for the
+ response by adding <code>no-etag</code> to the request notes.</p>
+
+ <p>The <code class="directive">SSIETag</code> directive suppresses this
+ behaviour, and allows the server to generate an <code>ETag</code> header.
+ This can be used to enable caching of the output. Note that a backend server
+ or dynamic content generator may generate an ETag of its own, ignoring
+ <code>no-etag</code>, and this ETag will be passed by
+ <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> regardless of the value of this setting.
+ <code class="directive">SSIETag</code> can take on the following values:</p>
+
+ <dl>
+
+ <dt><code>off</code></dt>
+ <dd><code>no-etag</code> will be added to the request notes, and the server
+ is asked not to generate an ETag. Where a server ignores the value of
+ <code>no-etag</code> and generates an ETag anyway, the ETag will be
+ respected.</dd>
+
+ <dt><code>on</code></dt>
+ <dd>Existing ETags will be respected, and ETags generated by the server will
+ be passed on in the response.</dd>
+
+ </dl>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSILastModified" id="SSILastModified">SSILastModified</a> <a name="ssilastmodified" id="ssilastmodified">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls whether <code>Last-Modified</code> headers are generated by the
+server.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSILastModified on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSILastModified off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<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_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.2.15 and later.</td></tr>
+</table>
+ <p>Under normal circumstances, a file filtered by <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
+ may contain elements that are either dynamically generated, or that may
+ have changed independently of the original file. As a result, by default
+ the <code>Last-Modified</code> header is stripped from the response.</p>
+
+ <p>The <code class="directive">SSILastModified</code> directive overrides this
+ behaviour, and allows the <code>Last-Modified</code> header to be respected
+ if already present, or set if the header is not already present. This can
+ be used to enable caching of the output. <code class="directive">SSILastModified</code>
+ can take on the following values:</p>
+
+ <dl>
+
+ <dt><code>off</code></dt>
+ <dd>The <code>Last-Modified</code> header will be stripped from responses,
+ unless the <code class="directive"><a href="#xbithack">XBitHack</a></code> directive
+ is set to <code>full</code> as described below.</dd>
+
+ <dt><code>on</code></dt>
+ <dd>The <code>Last-Modified</code> header will be respected if already
+ present in a response, and added to the response if the response is a
+ file and the header is missing. The
+ <code class="directive"><a href="#ssilastmodified">SSILastModified</a></code> directive
+ takes precedence over <code class="directive"><a href="#xbithack">XBitHack</a></code>.</dd>
+
+ </dl>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSILegacyExprParser" id="SSILegacyExprParser">SSILegacyExprParser</a> <a name="ssilegacyexprparser" id="ssilegacyexprparser">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable compatibility mode for conditional expressions.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSILegacyExprParser on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSILegacyExprParser off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<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_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.13 and later.</td></tr>
+</table>
+ <p>As of version 2.3.13, <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> has switched to the
+ new <a href="../expr.html">ap_expr</a> syntax for conditional expressions
+ in <code>#if</code> flow control elements. This directive allows to
+ switch to the <a href="#legacyexpr">old syntax</a> which is compatible
+ with Apache HTTPD version 2.2.x and earlier.
+ </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="SSIStartTag" id="SSIStartTag">SSIStartTag</a> <a name="ssistarttag" id="ssistarttag">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>String that starts an include element</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSIStartTag <var>tag</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSIStartTag "&lt;!--#"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<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_include</td></tr>
+</table>
+ <p>This directive changes the string that <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
+ looks for to mark an include element to process.</p>
+
+ <p>You may want to use this option if you have 2 servers parsing the
+ output of a file each processing different commands (possibly at
+ different times).</p>
+
+ <pre class="prettyprint lang-config"> SSIStartTag "&lt;%"<br />
+ SSIEndTag "%&gt;"</pre>
+
+
+ <p>The example given above, which also specifies a matching
+ <code class="directive"><a href="#ssiendtag">SSIEndTag</a></code>, will
+ allow you to use SSI directives as shown in the example
+ below:</p>
+
+ <div class="example"><h3>SSI directives with alternate start and end tags</h3><p><code>
+ &lt;%printenv %&gt;
+ </code></p></div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#ssiendtag">SSIEndTag</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSITimeFormat" id="SSITimeFormat">SSITimeFormat</a> <a name="ssitimeformat" id="ssitimeformat">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures the format in which date strings are
+displayed</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSITimeFormat <var>formatstring</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSITimeFormat "%A, %d-%b-%Y %H:%M:%S %Z"</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#Override">Override:</a></th><td>All</td></tr>
+<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_include</td></tr>
+</table>
+<p>This directive changes the format in which date strings are displayed
+ when echoing <code>DATE</code> environment variables. The
+ <var>formatstring</var> is as in <code>strftime(3)</code> from the
+ C standard library.</p>
+
+ <p>This directive has the same effect as the <code>&lt;!--#config
+ timefmt=<var>formatstring</var> --&gt;</code> element.</p>
+
+ <pre class="prettyprint lang-config">SSITimeFormat "%R, %B %d, %Y"</pre>
+
+
+ <p>The above directive would cause times to be displayed in the
+ format "22:26, June 14, 2002".</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="SSIUndefinedEcho" id="SSIUndefinedEcho">SSIUndefinedEcho</a> <a name="ssiundefinedecho" id="ssiundefinedecho">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>String displayed when an unset variable is echoed</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSIUndefinedEcho <var>string</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSIUndefinedEcho "(none)"</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#Override">Override:</a></th><td>All</td></tr>
+<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_include</td></tr>
+</table>
+ <p>This directive changes the string that <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
+ displays when a variable is not set and "echoed".</p>
+
+ <pre class="prettyprint lang-config">SSIUndefinedEcho "&lt;!-- undef --&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="XBitHack" id="XBitHack">XBitHack</a> <a name="xbithack" id="xbithack">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Parse SSI directives in files with the execute bit
+set</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>XBitHack on|off|full</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>XBitHack off</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#Override">Override:</a></th><td>Options</td></tr>
+<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_include</td></tr>
+</table>
+ <p>The <code class="directive">XBitHack</code> directive controls the parsing
+ of ordinary html documents. This directive only affects files associated
+ with the <a class="glossarylink" href="../glossary.html#mime-type" title="see glossary">MIME-type</a> <code>text/html</code>. <code class="directive">XBitHack</code> can take on the following values:</p>
+
+ <dl>
+ <dt><code>off</code></dt>
+ <dd>No special treatment of executable files.</dd>
+
+ <dt><code>on</code></dt>
+ <dd>Any <code>text/html</code> file that has the user-execute bit
+ set will be treated as a server-parsed html document.</dd>
+
+ <dt><code>full</code></dt>
+ <dd>As for <code>on</code> but also test the group-execute bit.
+ If it is set, then set the <code>Last-modified</code> date of the
+ returned file to be the last modified time of the file. If
+ it is not set, then no last-modified date is sent. Setting
+ this bit allows clients and proxies to cache the result of
+ the request.
+
+ <div class="note"><h3>Note</h3>
+ <p>You would not want to use the full option, unless you assure the
+ group-execute bit is unset for every SSI script which might <code>#include</code> a CGI or otherwise produces different output on
+ each hit (or could potentially change on subsequent requests).</p>
+
+ <p>The <code class="directive"><a href="#ssilastmodified">SSILastModified</a></code>
+ directive takes precedence over the
+ <code class="directive"><a href="#xbithack">XBitHack</a></code> directive when
+ <code class="directive"><a href="#ssilastmodified">SSILastModified</a></code> is set to
+ <code>on</code>.</p>
+ </div>
+
+ </dd>
+ </dl>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="enabling" id="enabling">Enabling Server-Side Includes</a></h2>
@@ -804,284 +1082,6 @@ AddOutputFilter INCLUDES .shtml</pre>
</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="SSIEndTag" id="SSIEndTag">SSIEndTag</a> <a name="ssiendtag" id="ssiendtag">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>String that ends an include element</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSIEndTag <var>tag</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSIEndTag "--&gt;"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<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_include</td></tr>
-</table>
- <p>This directive changes the string that <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
- looks for to mark the end of an include element.</p>
-
- <pre class="prettyprint lang-config">SSIEndTag "%&gt;"</pre>
-
-
-
-<h3>See also</h3>
-<ul>
-<li><code class="directive"><a href="#ssistarttag">SSIStartTag</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SSIErrorMsg" id="SSIErrorMsg">SSIErrorMsg</a> <a name="ssierrormsg" id="ssierrormsg">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Error message displayed when there is an SSI
-error</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSIErrorMsg <var>message</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSIErrorMsg "[an error occurred while processing this
-directive]"</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#Override">Override:</a></th><td>All</td></tr>
-<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_include</td></tr>
-</table>
- <p>The <code class="directive">SSIErrorMsg</code> directive changes the error
- message displayed when <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> encounters an
- error. For production servers you may consider changing the default
- error message to <code>"&lt;!-- Error --&gt;"</code> so that
- the message is not presented to the user.</p>
-
- <p>This directive has the same effect as the <code>&lt;!--#config
- errmsg=<var>message</var> --&gt;</code> element.</p>
-
- <pre class="prettyprint lang-config">SSIErrorMsg "&lt;!-- Error --&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="SSIETag" id="SSIETag">SSIETag</a> <a name="ssietag" id="ssietag">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls whether ETags are generated by the server.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSIETag on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSIETag off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<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_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.2.15 and later.</td></tr>
-</table>
- <p>Under normal circumstances, a file filtered by <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
- may contain elements that are either dynamically generated, or that may
- have changed independently of the original file. As a result, by default
- the server is asked not to generate an <code>ETag</code> header for the
- response by adding <code>no-etag</code> to the request notes.</p>
-
- <p>The <code class="directive">SSIETag</code> directive suppresses this
- behaviour, and allows the server to generate an <code>ETag</code> header.
- This can be used to enable caching of the output. Note that a backend server
- or dynamic content generator may generate an ETag of its own, ignoring
- <code>no-etag</code>, and this ETag will be passed by
- <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> regardless of the value of this setting.
- <code class="directive">SSIETag</code> can take on the following values:</p>
-
- <dl>
-
- <dt><code>off</code></dt>
- <dd><code>no-etag</code> will be added to the request notes, and the server
- is asked not to generate an ETag. Where a server ignores the value of
- <code>no-etag</code> and generates an ETag anyway, the ETag will be
- respected.</dd>
-
- <dt><code>on</code></dt>
- <dd>Existing ETags will be respected, and ETags generated by the server will
- be passed on in the response.</dd>
-
- </dl>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SSILastModified" id="SSILastModified">SSILastModified</a> <a name="ssilastmodified" id="ssilastmodified">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls whether <code>Last-Modified</code> headers are generated by the
-server.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSILastModified on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSILastModified off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<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_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.2.15 and later.</td></tr>
-</table>
- <p>Under normal circumstances, a file filtered by <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
- may contain elements that are either dynamically generated, or that may
- have changed independently of the original file. As a result, by default
- the <code>Last-Modified</code> header is stripped from the response.</p>
-
- <p>The <code class="directive">SSILastModified</code> directive overrides this
- behaviour, and allows the <code>Last-Modified</code> header to be respected
- if already present, or set if the header is not already present. This can
- be used to enable caching of the output. <code class="directive">SSILastModified</code>
- can take on the following values:</p>
-
- <dl>
-
- <dt><code>off</code></dt>
- <dd>The <code>Last-Modified</code> header will be stripped from responses,
- unless the <code class="directive"><a href="#xbithack">XBitHack</a></code> directive
- is set to <code>full</code> as described below.</dd>
-
- <dt><code>on</code></dt>
- <dd>The <code>Last-Modified</code> header will be respected if already
- present in a response, and added to the response if the response is a
- file and the header is missing. The
- <code class="directive"><a href="#ssilastmodified">SSILastModified</a></code> directive
- takes precedence over <code class="directive"><a href="#xbithack">XBitHack</a></code>.</dd>
-
- </dl>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SSILegacyExprParser" id="SSILegacyExprParser">SSILegacyExprParser</a> <a name="ssilegacyexprparser" id="ssilegacyexprparser">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable compatibility mode for conditional expressions.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSILegacyExprParser on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSILegacyExprParser off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<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_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.3.13 and later.</td></tr>
-</table>
- <p>As of version 2.3.13, <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> has switched to the
- new <a href="../expr.html">ap_expr</a> syntax for conditional expressions
- in <code>#if</code> flow control elements. This directive allows to
- switch to the <a href="#legacyexpr">old syntax</a> which is compatible
- with Apache HTTPD version 2.2.x and earlier.
- </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="SSIStartTag" id="SSIStartTag">SSIStartTag</a> <a name="ssistarttag" id="ssistarttag">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>String that starts an include element</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSIStartTag <var>tag</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSIStartTag "&lt;!--#"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<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_include</td></tr>
-</table>
- <p>This directive changes the string that <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
- looks for to mark an include element to process.</p>
-
- <p>You may want to use this option if you have 2 servers parsing the
- output of a file each processing different commands (possibly at
- different times).</p>
-
- <pre class="prettyprint lang-config"> SSIStartTag "&lt;%"<br />
- SSIEndTag "%&gt;"</pre>
-
-
- <p>The example given above, which also specifies a matching
- <code class="directive"><a href="#ssiendtag">SSIEndTag</a></code>, will
- allow you to use SSI directives as shown in the example
- below:</p>
-
- <div class="example"><h3>SSI directives with alternate start and end tags</h3><p><code>
- &lt;%printenv %&gt;
- </code></p></div>
-
-<h3>See also</h3>
-<ul>
-<li><code class="directive"><a href="#ssiendtag">SSIEndTag</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SSITimeFormat" id="SSITimeFormat">SSITimeFormat</a> <a name="ssitimeformat" id="ssitimeformat">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures the format in which date strings are
-displayed</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSITimeFormat <var>formatstring</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSITimeFormat "%A, %d-%b-%Y %H:%M:%S %Z"</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#Override">Override:</a></th><td>All</td></tr>
-<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_include</td></tr>
-</table>
-<p>This directive changes the format in which date strings are displayed
- when echoing <code>DATE</code> environment variables. The
- <var>formatstring</var> is as in <code>strftime(3)</code> from the
- C standard library.</p>
-
- <p>This directive has the same effect as the <code>&lt;!--#config
- timefmt=<var>formatstring</var> --&gt;</code> element.</p>
-
- <pre class="prettyprint lang-config">SSITimeFormat "%R, %B %d, %Y"</pre>
-
-
- <p>The above directive would cause times to be displayed in the
- format "22:26, June 14, 2002".</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="SSIUndefinedEcho" id="SSIUndefinedEcho">SSIUndefinedEcho</a> <a name="ssiundefinedecho" id="ssiundefinedecho">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>String displayed when an unset variable is echoed</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSIUndefinedEcho <var>string</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSIUndefinedEcho "(none)"</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#Override">Override:</a></th><td>All</td></tr>
-<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_include</td></tr>
-</table>
- <p>This directive changes the string that <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
- displays when a variable is not set and "echoed".</p>
-
- <pre class="prettyprint lang-config">SSIUndefinedEcho "&lt;!-- undef --&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="XBitHack" id="XBitHack">XBitHack</a> <a name="xbithack" id="xbithack">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Parse SSI directives in files with the execute bit
-set</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>XBitHack on|off|full</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>XBitHack off</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#Override">Override:</a></th><td>Options</td></tr>
-<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_include</td></tr>
-</table>
- <p>The <code class="directive">XBitHack</code> directive controls the parsing
- of ordinary html documents. This directive only affects files associated
- with the <a class="glossarylink" href="../glossary.html#mime-type" title="see glossary">MIME-type</a> <code>text/html</code>. <code class="directive">XBitHack</code> can take on the following values:</p>
-
- <dl>
- <dt><code>off</code></dt>
- <dd>No special treatment of executable files.</dd>
-
- <dt><code>on</code></dt>
- <dd>Any <code>text/html</code> file that has the user-execute bit
- set will be treated as a server-parsed html document.</dd>
-
- <dt><code>full</code></dt>
- <dd>As for <code>on</code> but also test the group-execute bit.
- If it is set, then set the <code>Last-modified</code> date of the
- returned file to be the last modified time of the file. If
- it is not set, then no last-modified date is sent. Setting
- this bit allows clients and proxies to cache the result of
- the request.
-
- <div class="note"><h3>Note</h3>
- <p>You would not want to use the full option, unless you assure the
- group-execute bit is unset for every SSI script which might <code>#include</code> a CGI or otherwise produces different output on
- each hit (or could potentially change on subsequent requests).</p>
-
- <p>The <code class="directive"><a href="#ssilastmodified">SSILastModified</a></code>
- directive takes precedence over the
- <code class="directive"><a href="#xbithack">XBitHack</a></code> directive when
- <code class="directive"><a href="#ssilastmodified">SSILastModified</a></code> is set to
- <code>on</code>.</p>
- </div>
-
- </dd>
- </dl>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_include.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_include.html.fr b/docs/manual/mod/mod_include.html.fr
index 712416d031..31379ca073 100644
--- a/docs/manual/mod/mod_include.html.fr
+++ b/docs/manual/mod/mod_include.html.fr
@@ -72,6 +72,305 @@ Includes ou SSI)</td></tr>
<li><a href="../howto/ssi.html">Tutoriel SSI</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ssiendtag" id="ssiendtag">Directive</a> <a name="SSIEndTag" id="SSIEndTag">SSIEndTag</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cha�ne qui termine l'�l�ment include</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSIEndTag <var>tag</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSIEndTag "--&gt;"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_include</td></tr>
+</table>
+ <p>Cette directive permet de modifier la cha�ne que
+ <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> interpr�te comme la fin d'un �l�ment
+ include.</p>
+
+ <pre class="prettyprint lang-config">SSIEndTag "%&gt;"</pre>
+
+
+
+<h3>Voir aussi</h3>
+<ul>
+<li><code class="directive"><a href="#ssistarttag">SSIStartTag</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ssierrormsg" id="ssierrormsg">Directive</a> <a name="SSIErrorMsg" id="SSIErrorMsg">SSIErrorMsg</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Message d'erreur affich� lorsqu'une erreur SSI
+survient</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSIErrorMsg <var>message</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSIErrorMsg "[an error occurred while processing this
+directive]"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</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_include</td></tr>
+</table>
+ <p>La directive <code class="directive">SSIErrorMsg</code> permet de
+ modifier le message d'erreur affich� lorsqu'une erreur SSI survient.
+ Pour les serveurs en production, il est recommand� de modifier le
+ message d'erreur par d�faut en <code>"&lt;!-- Error
+ --&gt;"</code>, de fa�on � ce que le message ne soit pas
+ pr�sent� � l'utilisateur.</p>
+
+ <p>Cette directive a le m�me effet que l'�l�ment
+ <code>&lt;!--#config errmsg=<var>message</var> --&gt;</code>.</p>
+
+ <pre class="prettyprint lang-config">SSIErrorMsg "&lt;!-- Error --&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="ssietag" id="ssietag">Directive</a> <a name="SSIETag" id="SSIETag">SSIETag</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit si des en-t�tes ETags sont g�n�r�s par le serveur.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSIETag on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSIETag off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</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_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.2.15 du serveur HTTP
+Apache.</td></tr>
+</table>
+ <p>Dans le cas g�n�ral, un fichier filtr� par
+ <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> peut contenir des �l�ments soit
+ g�n�r�s dynamiquement, soit �ventuellement modifi�s ind�pendemment
+ du fichier original. En cons�quence, il est demand� par d�faut au
+ serveur de ne pas g�n�rer d'en-t�te <code>ETag</code> � la r�ponse
+ en ajoutant <code>no-etag</code> aux informations de requ�te.</p>
+
+ <p>Ce comportement peut �tre modifi� via la directive
+ <code class="directive">SSIETag</code> qui permet au serveur de g�n�rer un
+ en-t�te <code>ETag</code>. On peut aussi l'utiliser pour la mise
+ en cache de la sortie. Notez qu'un serveur d'arri�re-plan ou un
+ g�n�rateur de contenu dynamique peut lui-m�me g�n�rer un en-t�te
+ <code>ETag</code>, en ignorant l'information <code>no-etag</code>,
+ cet en-t�te <code>ETag</code> �tant transmis par
+ <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> sans tenir compte de la d�finition de
+ la pr�sente directive. La directive <code class="directive">SSIETag</code>
+ peut prendre une des valeurs suivantes :</p>
+
+ <dl>
+
+ <dt><code>off</code></dt>
+ <dd><code>no-etag</code> sera ajout� aux informations de
+ requ�te, et il sera demand� au serveur de ne pas g�n�rer
+ d'en-t�te <code>ETag</code>. Lorsqu'un serveur ignore la valeur
+ de <code>no-etag</code> et g�n�re tout de m�me un en-t�te
+ <code>ETag</code>, ce dernier sera respect�.</dd>
+
+ <dt><code>on</code></dt>
+ <dd>Les en-t�tes <code>ETag</code> existants seront respect�s,
+ et ceux g�n�r�s par le serveur seront ajout�s � la r�ponse.</dd>
+
+ </dl>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ssilastmodified" id="ssilastmodified">Directive</a> <a name="SSILastModified" id="SSILastModified">SSILastModified</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit si des en-t�tes <code>Last-Modified</code> sont
+g�n�r�s par le serveur.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSILastModified on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSILastModified off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</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_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.2.15 du serveur HTTP
+Apache.</td></tr>
+</table>
+ <p>Dans le cas g�n�ral, un fichier filtr� par
+ <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> peut contenir des �l�ments soit
+ g�n�r�s dynamiquement, soit �ventuellement modifi�s ind�pendemment
+ du fichier original. En cons�quence, l'en-t�te
+ <code>Last-Modified</code> est supprim� par d�faut de la r�ponse.</p>
+
+ <p>La directive <code class="directive">SSILastModified</code> permet de
+ modifier ce comportement en faisant en sorte que l'en-t�te
+ <code>Last-Modified</code> soit respect� s'il est d�j� pr�sent, ou
+ d�fini dans le cas contraire. On peut aussi l'utiliser pour la mise
+ en cache de la sortie. La directive
+ <code class="directive">SSILastModified</code> peut prendre une des
+ valeurs suivantes :</p>
+
+ <dl>
+
+ <dt><code>off</code></dt>
+ <dd>L'en-t�te <code>Last-Modified</code> sera supprim� des
+ r�ponses, � moins que la directive <code class="directive"><a href="#xbithack">XBitHack</a></code> ne soit d�finie �
+ <code>full</code> comme d�crit plus loin.</dd>
+
+ <dt><code>on</code></dt>
+ <dd>L'en-t�te <code>Last-Modified</code> sera respect� s'il est
+ d�j� pr�sent, et ajout� � la r�ponse si cette derni�re est un
+ fichier et si l'en-t�te est manquant. La directive <code class="directive"><a href="#ssilastmodified">SSILastModified</a></code> l'emporte sur
+ la directive <code class="directive"><a href="#xbithack">XBitHack</a></code>.</dd>
+
+ </dl>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ssilegacyexprparser" id="ssilegacyexprparser">Directive</a> <a name="SSILegacyExprParser" id="SSILegacyExprParser">SSILegacyExprParser</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Active le mode de compatibilit� pour les expressions
+conditionnelles.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSILegacyExprParser on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSILegacyExprParser off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</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_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.3.13.</td></tr>
+</table>
+ <p>Depuis la version 2.3.13, <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> a adopt�
+ la nouvelle syntaxe <a href="../expr.html">ap_expr</a> pour ses
+ expressions conditionnelles dans les �l�ments de contr�le de flux
+ <code>#if</code>. Cette directive permet de r�activer l'<a href="#legacyexpr">ancienne syntaxe</a> qui est compatible avec les
+ versions 2.2.x et ant�rieures d'Apache HTTPD.
+ </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="ssistarttag" id="ssistarttag">Directive</a> <a name="SSIStartTag" id="SSIStartTag">SSIStartTag</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cha�ne qui marque le d�but d'un �l�ment
+include</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSIStartTag <var>tag</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSIStartTag "&lt;!--#"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_include</td></tr>
+</table>
+ <p>Cette directive permet de modifier la cha�ne que
+ <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> interpr�te comme le d�but d'un �l�ment
+ include.</p>
+
+ <p>Cette option peut vous �tre utile si vous avez deux serveurs qui
+ interpr�tent un fichier avec des commandes diff�rentes (et
+ �ventuellement � des moments diff�rents).</p>
+
+ <pre class="prettyprint lang-config"> SSIStartTag "&lt;%"<br />
+ SSIEndTag "%&gt;"</pre>
+
+
+ <p>Avec l'exemple ci-dessus, qui d�finit aussi une directive
+ <code class="directive"><a href="#ssiendtag">SSIEndTag</a></code>, vous pourrez
+ inscrire des directives SSI comme dans l'exemple suivant :</p>
+
+ <div class="example"><h3>Directives SSI avec marques de d�but et de fin
+ personnalis�es</h3><p><code>
+ &lt;%printenv %&gt;
+ </code></p></div>
+
+<h3>Voir aussi</h3>
+<ul>
+<li><code class="directive"><a href="#ssiendtag">SSIEndTag</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ssitimeformat" id="ssitimeformat">Directive</a> <a name="SSITimeFormat" id="SSITimeFormat">SSITimeFormat</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configuration du format d'affichage des dates</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSITimeFormat <var>cha�ne de formatage</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSITimeFormat "%A, %d-%b-%Y %H:%M:%S %Z"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</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_include</td></tr>
+</table>
+<p>Cette directive permet de modifier le format d'affichage des
+variables d'environnement <code>DATE</code>. La <var>cha�ne de
+formatage</var> est identique � celle de la fonction
+<code>strftime(3)</code> de la biblioth�que C standard.</p>
+
+ <p>Cette directive a le m�me effet que l'�l�ment
+ <code>&lt;!--#config timefmt=<var>cha�ne de formatage</var>
+ --&gt;</code>.</p>
+
+ <pre class="prettyprint lang-config">SSITimeFormat "%R, %B %d, %Y"</pre>
+
+
+ <p>Avec l'exemple ci-dessus, les dates seront affich�es dans le
+ style "22:26, June 14, 2002".</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="ssiundefinedecho" id="ssiundefinedecho">Directive</a> <a name="SSIUndefinedEcho" id="SSIUndefinedEcho">SSIUndefinedEcho</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cha�ne � afficher lorsqu'on tente d'extraire le contenu
+d'une variable non d�finie</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSIUndefinedEcho <var>cha�ne</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSIUndefinedEcho "(none)"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</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_include</td></tr>
+</table>
+ <p>Cette directive permet de modifier la cha�ne affich�e par
+ <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> lorsqu'on tente d'extraire le contenu
+ d'une variable non d�finie.</p>
+
+ <pre class="prettyprint lang-config">SSIUndefinedEcho "&lt;!-- nondef --&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="xbithack" id="xbithack">Directive</a> <a name="XBitHack" id="XBitHack">XBitHack</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Interpr�te les directives SSI dans les fichiers dont le bit
+d'ex�cution est positionn�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>XBitHack on|off|full</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>XBitHack off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>Options</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_include</td></tr>
+</table>
+ <p>La directive <code class="directive">XBitHack</code> permet de contr�ler
+ l'interpr�tation des documents html standards. Elle n'affecte que
+ les fichiers dont le <a class="glossarylink" href="../glossary.html#type mime" title="voir glossaire">type MIME</a> est
+ <code>text/html</code>. <code class="directive">XBitHack</code> peut prendre
+ les valeurs suivantes :</p>
+
+ <dl>
+ <dt><code>off</code></dt>
+ <dd>Aucun traitement particulier pour les fichiers
+ ex�cutables.</dd>
+
+ <dt><code>on</code></dt>
+ <dd>Tout fichier <code>text/html</code> dont le bit d'ex�cution
+ est positionn� pour le propri�taire sera trait� en tant que
+ document html interpr�t� par le serveur.</dd>
+
+ <dt><code>full</code></dt>
+ <dd>Identique � <code>on</code>, avec test du bit d'ex�cution pour
+ le groupe. Si ce dernier est positionn�, la date de <code>derni�re
+ modification</code> du fichier renvoy� est d�finie � la date de
+ derni�re modification du fichier. Dans le cas contraire, aucune
+ date de derni�re modification n'est renvoy�e. Le positionnement de
+ ce bit permet aux clients et aux mandataires de g�rer la mise en
+ cache du r�sultat de la requ�te.
+
+ <div class="note"><h3>Note</h3>
+ <p>Il est recommand� de n'utiliser l'option full que dans le cas
+ o� vous �tes certain que le bit d'ex�cution du groupe est non
+ positionn� pour les scripts SSI qui pourraient effectuer l'<code>#include</code> d'un programme CGI ou bien produire des sorties
+ diff�rentes � chaque acc�s (ou seraient susceptibles d'�tre
+ modifi�es au cours des requ�tes ult�rieures).</p>
+
+ <p>Lorsqu'elle est d�finie � <code>on</code>, la directive
+ <code class="directive"><a href="#ssilastmodified">SSILastModified</a></code>
+ l'emporte sur la directive <code class="directive"><a href="#xbithack">XBitHack</a></code>.</p>
+ </div>
+
+ </dd>
+ </dl>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="enabling" id="enabling">Activation des SSI</a></h2>
@@ -862,305 +1161,6 @@ AddOutputFilter INCLUDES .shtml</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="ssiendtag" id="ssiendtag">Directive</a> <a name="SSIEndTag" id="SSIEndTag">SSIEndTag</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cha�ne qui termine l'�l�ment include</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSIEndTag <var>tag</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSIEndTag "--&gt;"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_include</td></tr>
-</table>
- <p>Cette directive permet de modifier la cha�ne que
- <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> interpr�te comme la fin d'un �l�ment
- include.</p>
-
- <pre class="prettyprint lang-config">SSIEndTag "%&gt;"</pre>
-
-
-
-<h3>Voir aussi</h3>
-<ul>
-<li><code class="directive"><a href="#ssistarttag">SSIStartTag</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ssierrormsg" id="ssierrormsg">Directive</a> <a name="SSIErrorMsg" id="SSIErrorMsg">SSIErrorMsg</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Message d'erreur affich� lorsqu'une erreur SSI
-survient</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSIErrorMsg <var>message</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSIErrorMsg "[an error occurred while processing this
-directive]"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</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_include</td></tr>
-</table>
- <p>La directive <code class="directive">SSIErrorMsg</code> permet de
- modifier le message d'erreur affich� lorsqu'une erreur SSI survient.
- Pour les serveurs en production, il est recommand� de modifier le
- message d'erreur par d�faut en <code>"&lt;!-- Error
- --&gt;"</code>, de fa�on � ce que le message ne soit pas
- pr�sent� � l'utilisateur.</p>
-
- <p>Cette directive a le m�me effet que l'�l�ment
- <code>&lt;!--#config errmsg=<var>message</var> --&gt;</code>.</p>
-
- <pre class="prettyprint lang-config">SSIErrorMsg "&lt;!-- Error --&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="ssietag" id="ssietag">Directive</a> <a name="SSIETag" id="SSIETag">SSIETag</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit si des en-t�tes ETags sont g�n�r�s par le serveur.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSIETag on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSIETag off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</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_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.2.15 du serveur HTTP
-Apache.</td></tr>
-</table>
- <p>Dans le cas g�n�ral, un fichier filtr� par
- <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> peut contenir des �l�ments soit
- g�n�r�s dynamiquement, soit �ventuellement modifi�s ind�pendemment
- du fichier original. En cons�quence, il est demand� par d�faut au
- serveur de ne pas g�n�rer d'en-t�te <code>ETag</code> � la r�ponse
- en ajoutant <code>no-etag</code> aux informations de requ�te.</p>
-
- <p>Ce comportement peut �tre modifi� via la directive
- <code class="directive">SSIETag</code> qui permet au serveur de g�n�rer un
- en-t�te <code>ETag</code>. On peut aussi l'utiliser pour la mise
- en cache de la sortie. Notez qu'un serveur d'arri�re-plan ou un
- g�n�rateur de contenu dynamique peut lui-m�me g�n�rer un en-t�te
- <code>ETag</code>, en ignorant l'information <code>no-etag</code>,
- cet en-t�te <code>ETag</code> �tant transmis par
- <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> sans tenir compte de la d�finition de
- la pr�sente directive. La directive <code class="directive">SSIETag</code>
- peut prendre une des valeurs suivantes :</p>
-
- <dl>
-
- <dt><code>off</code></dt>
- <dd><code>no-etag</code> sera ajout� aux informations de
- requ�te, et il sera demand� au serveur de ne pas g�n�rer
- d'en-t�te <code>ETag</code>. Lorsqu'un serveur ignore la valeur
- de <code>no-etag</code> et g�n�re tout de m�me un en-t�te
- <code>ETag</code>, ce dernier sera respect�.</dd>
-
- <dt><code>on</code></dt>
- <dd>Les en-t�tes <code>ETag</code> existants seront respect�s,
- et ceux g�n�r�s par le serveur seront ajout�s � la r�ponse.</dd>
-
- </dl>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ssilastmodified" id="ssilastmodified">Directive</a> <a name="SSILastModified" id="SSILastModified">SSILastModified</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit si des en-t�tes <code>Last-Modified</code> sont
-g�n�r�s par le serveur.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSILastModified on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSILastModified off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</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_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.2.15 du serveur HTTP
-Apache.</td></tr>
-</table>
- <p>Dans le cas g�n�ral, un fichier filtr� par
- <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> peut contenir des �l�ments soit
- g�n�r�s dynamiquement, soit �ventuellement modifi�s ind�pendemment
- du fichier original. En cons�quence, l'en-t�te
- <code>Last-Modified</code> est supprim� par d�faut de la r�ponse.</p>
-
- <p>La directive <code class="directive">SSILastModified</code> permet de
- modifier ce comportement en faisant en sorte que l'en-t�te
- <code>Last-Modified</code> soit respect� s'il est d�j� pr�sent, ou
- d�fini dans le cas contraire. On peut aussi l'utiliser pour la mise
- en cache de la sortie. La directive
- <code class="directive">SSILastModified</code> peut prendre une des
- valeurs suivantes :</p>
-
- <dl>
-
- <dt><code>off</code></dt>
- <dd>L'en-t�te <code>Last-Modified</code> sera supprim� des
- r�ponses, � moins que la directive <code class="directive"><a href="#xbithack">XBitHack</a></code> ne soit d�finie �
- <code>full</code> comme d�crit plus loin.</dd>
-
- <dt><code>on</code></dt>
- <dd>L'en-t�te <code>Last-Modified</code> sera respect� s'il est
- d�j� pr�sent, et ajout� � la r�ponse si cette derni�re est un
- fichier et si l'en-t�te est manquant. La directive <code class="directive"><a href="#ssilastmodified">SSILastModified</a></code> l'emporte sur
- la directive <code class="directive"><a href="#xbithack">XBitHack</a></code>.</dd>
-
- </dl>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ssilegacyexprparser" id="ssilegacyexprparser">Directive</a> <a name="SSILegacyExprParser" id="SSILegacyExprParser">SSILegacyExprParser</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Active le mode de compatibilit� pour les expressions
-conditionnelles.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSILegacyExprParser on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSILegacyExprParser off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</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_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.3.13.</td></tr>
-</table>
- <p>Depuis la version 2.3.13, <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> a adopt�
- la nouvelle syntaxe <a href="../expr.html">ap_expr</a> pour ses
- expressions conditionnelles dans les �l�ments de contr�le de flux
- <code>#if</code>. Cette directive permet de r�activer l'<a href="#legacyexpr">ancienne syntaxe</a> qui est compatible avec les
- versions 2.2.x et ant�rieures d'Apache HTTPD.
- </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="ssistarttag" id="ssistarttag">Directive</a> <a name="SSIStartTag" id="SSIStartTag">SSIStartTag</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cha�ne qui marque le d�but d'un �l�ment
-include</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSIStartTag <var>tag</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSIStartTag "&lt;!--#"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_include</td></tr>
-</table>
- <p>Cette directive permet de modifier la cha�ne que
- <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> interpr�te comme le d�but d'un �l�ment
- include.</p>
-
- <p>Cette option peut vous �tre utile si vous avez deux serveurs qui
- interpr�tent un fichier avec des commandes diff�rentes (et
- �ventuellement � des moments diff�rents).</p>
-
- <pre class="prettyprint lang-config"> SSIStartTag "&lt;%"<br />
- SSIEndTag "%&gt;"</pre>
-
-
- <p>Avec l'exemple ci-dessus, qui d�finit aussi une directive
- <code class="directive"><a href="#ssiendtag">SSIEndTag</a></code>, vous pourrez
- inscrire des directives SSI comme dans l'exemple suivant :</p>
-
- <div class="example"><h3>Directives SSI avec marques de d�but et de fin
- personnalis�es</h3><p><code>
- &lt;%printenv %&gt;
- </code></p></div>
-
-<h3>Voir aussi</h3>
-<ul>
-<li><code class="directive"><a href="#ssiendtag">SSIEndTag</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ssitimeformat" id="ssitimeformat">Directive</a> <a name="SSITimeFormat" id="SSITimeFormat">SSITimeFormat</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configuration du format d'affichage des dates</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSITimeFormat <var>cha�ne de formatage</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSITimeFormat "%A, %d-%b-%Y %H:%M:%S %Z"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</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_include</td></tr>
-</table>
-<p>Cette directive permet de modifier le format d'affichage des
-variables d'environnement <code>DATE</code>. La <var>cha�ne de
-formatage</var> est identique � celle de la fonction
-<code>strftime(3)</code> de la biblioth�que C standard.</p>
-
- <p>Cette directive a le m�me effet que l'�l�ment
- <code>&lt;!--#config timefmt=<var>cha�ne de formatage</var>
- --&gt;</code>.</p>
-
- <pre class="prettyprint lang-config">SSITimeFormat "%R, %B %d, %Y"</pre>
-
-
- <p>Avec l'exemple ci-dessus, les dates seront affich�es dans le
- style "22:26, June 14, 2002".</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="ssiundefinedecho" id="ssiundefinedecho">Directive</a> <a name="SSIUndefinedEcho" id="SSIUndefinedEcho">SSIUndefinedEcho</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cha�ne � afficher lorsqu'on tente d'extraire le contenu
-d'une variable non d�finie</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SSIUndefinedEcho <var>cha�ne</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SSIUndefinedEcho "(none)"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</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_include</td></tr>
-</table>
- <p>Cette directive permet de modifier la cha�ne affich�e par
- <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> lorsqu'on tente d'extraire le contenu
- d'une variable non d�finie.</p>
-
- <pre class="prettyprint lang-config">SSIUndefinedEcho "&lt;!-- nondef --&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="xbithack" id="xbithack">Directive</a> <a name="XBitHack" id="XBitHack">XBitHack</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Interpr�te les directives SSI dans les fichiers dont le bit
-d'ex�cution est positionn�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>XBitHack on|off|full</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>XBitHack off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>Options</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_include</td></tr>
-</table>
- <p>La directive <code class="directive">XBitHack</code> permet de contr�ler
- l'interpr�tation des documents html standards. Elle n'affecte que
- les fichiers dont le <a class="glossarylink" href="../glossary.html#type mime" title="voir glossaire">type MIME</a> est
- <code>text/html</code>. <code class="directive">XBitHack</code> peut prendre
- les valeurs suivantes :</p>
-
- <dl>
- <dt><code>off</code></dt>
- <dd>Aucun traitement particulier pour les fichiers
- ex�cutables.</dd>
-
- <dt><code>on</code></dt>
- <dd>Tout fichier <code>text/html</code> dont le bit d'ex�cution
- est positionn� pour le propri�taire sera trait� en tant que
- document html interpr�t� par le serveur.</dd>
-
- <dt><code>full</code></dt>
- <dd>Identique � <code>on</code>, avec test du bit d'ex�cution pour
- le groupe. Si ce dernier est positionn�, la date de <code>derni�re
- modification</code> du fichier renvoy� est d�finie � la date de
- derni�re modification du fichier. Dans le cas contraire, aucune
- date de derni�re modification n'est renvoy�e. Le positionnement de
- ce bit permet aux clients et aux mandataires de g�rer la mise en
- cache du r�sultat de la requ�te.
-
- <div class="note"><h3>Note</h3>
- <p>Il est recommand� de n'utiliser l'option full que dans le cas
- o� vous �tes certain que le bit d'ex�cution du groupe est non
- positionn� pour les scripts SSI qui pourraient effectuer l'<code>#include</code> d'un programme CGI ou bien produire des sorties
- diff�rentes � chaque acc�s (ou seraient susceptibles d'�tre
- modifi�es au cours des requ�tes ult�rieures).</p>
-
- <p>Lorsqu'elle est d�finie � <code>on</code>, la directive
- <code class="directive"><a href="#ssilastmodified">SSILastModified</a></code>
- l'emporte sur la directive <code class="directive"><a href="#xbithack">XBitHack</a></code>.</p>
- </div>
-
- </dd>
- </dl>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_include.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_include.html.ja.utf8 b/docs/manual/mod/mod_include.html.ja.utf8
index 60af7bb531..be118a2384 100644
--- a/docs/manual/mod/mod_include.html.ja.utf8
+++ b/docs/manual/mod/mod_include.html.ja.utf8
@@ -73,6 +73,225 @@
<li><a href="../howto/ssi.html">SSI チュートリアル</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSIEndTag" id="SSIEndTag">SSIEndTag</a> <a name="ssiendtag" id="ssiendtag">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>include 要素を終了させる文字列</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIEndTag <var>tag</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIEndTag "--&gt;"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.0.30 以降で利用可能</td></tr>
+</table>
+ <p>このディレクティブは <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> が探す、
+ include 要素の終了を示す文字列を変更します。</p>
+
+ <div class="example"><h3>例</h3><p><code>
+ SSIEndTag "%&gt;"
+ </code></p></div>
+
+
+<h3>参照</h3>
+<ul>
+<li><code class="directive"><a href="#ssistarttag">SSIStartTag</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSIErrorMsg" id="SSIErrorMsg">SSIErrorMsg</a> <a name="ssierrormsg" id="ssierrormsg">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>SSI のエラーがあったときに表示されるエラーメッセージ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIErrorMsg <var>message</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIErrorMsg "[an error occurred while processing this
+directive]"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書き:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>バージョン 2.0.30 以降で使用可能</td></tr>
+</table>
+ <p><code class="directive">SSIErrorMsg</code> ディレクティブは <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
+ がエラーが起こったときに表示するメッセージを変更します。プロダクションサーバでは
+ メッセージがユーザに表示されないようにするために
+ デフォルトエラーメッセージを <code>"&lt;!-- Error --&gt;"</code>
+ に変えるというようなことを考えるかもしれません。</p>
+
+ <p>このディレクティブは <code>&lt;!--#config
+ errmsg=<var>message</var> --&gt;</code> 要素と同じ効果になります。</p>
+
+ <div class="example"><h3>例</h3><p><code>
+ SSIErrorMsg "&lt;!-- Error --&gt;"
+ </code></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="SSIETag" id="SSIETag">SSIETag</a> <a name="ssietag" id="ssietag">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Controls whether ETags are generated by the server.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIETag on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIETag off</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>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>Available in version 2.2.15 and later.</td></tr>
+</table><p>このディレクティブの解説文書は
+ まだ翻訳されていません。英語版をご覧ください。
+ </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="SSILastModified" id="SSILastModified">SSILastModified</a> <a name="ssilastmodified" id="ssilastmodified">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Controls whether <code>Last-Modified</code> headers are generated by the
+server.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSILastModified on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSILastModified off</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>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>Available in version 2.2.15 and later.</td></tr>
+</table><p>このディレクティブの解説文書は
+ まだ翻訳されていません。英語版をご覧ください。
+ </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="SSILegacyExprParser" id="SSILegacyExprParser">SSILegacyExprParser</a> <a name="ssilegacyexprparser" id="ssilegacyexprparser">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Enable compatibility mode for conditional expressions.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSILegacyExprParser on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSILegacyExprParser off</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>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>Available in version 2.3.13 and later.</td></tr>
+</table><p>このディレクティブの解説文書は
+ まだ翻訳されていません。英語版をご覧ください。
+ </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="SSIStartTag" id="SSIStartTag">SSIStartTag</a> <a name="ssistarttag" id="ssistarttag">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>include 要素を開始する文字列</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIStartTag <var>tag</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIStartTag "&lt;!--#"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>バージョン 2.0.30 以降で使用可能</td></tr>
+</table>
+
+ <p>このディレクティブは <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> が探す、include
+ 要素の開始を示す文字列を変更します。</p>
+
+ <p>二つのサーバで (もしかすると別々の段階で) ファイルの出力を解析していて、
+ それぞれに違うコマンドを処理させたい、
+ というようなときにこのオプションを使います。</p>
+
+ <div class="example"><h3>例</h3><p><code>
+ SSIStartTag "&lt;%"<br />
+ SSIEndTag "%&gt;"
+ </code></p></div>
+
+ <p>上の例のように対応する
+ <code class="directive"><a href="#ssiendtag">SSIEndTag</a></code> を併せて使うと、
+ 下に示す例のように SSI ディレクティブを使えます:</p>
+
+ <div class="example"><h3>違う開始と終了のタグを使った SSI ディレクティブ</h3><p><code>
+ &lt;%printenv %&gt;
+ </code></p></div>
+
+<h3>参照</h3>
+<ul>
+<li><code class="directive"><a href="#ssiendtag">SSIEndTag</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSITimeFormat" id="SSITimeFormat">SSITimeFormat</a> <a name="ssitimeformat" id="ssitimeformat">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>日付けを現す文字列の書式を設定する</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSITimeFormat <var>formatstring</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSITimeFormat "%A, %d-%b-%Y %H:%M:%S %Z"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書き:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.0.30 以降で使用可能</td></tr>
+</table>
+<p>このディレクティブは <code>DATE</code> 環境変数を echo して日付を現す文字列が
+ 表示されるときの書式を変更します。<var>formatstring</var> は
+ C 標準ライブラリの <code>strftime(3)</code> と同じ形式です。</p>
+
+ <p>このディレクティブは <code>&lt;!--#config
+ timefmt=<var>formatstring</var> --&gt;</code> 要素と同じ効果になります。</p>
+
+ <div class="example"><h3>例</h3><p><code>
+ SSITimeFormat "%R, %B %d, %Y"
+ </code></p></div>
+
+ <p>上のディレクティブでは、日付は "22:26, June 14, 2002" という
+ 形式で表示されます。</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="SSIUndefinedEcho" id="SSIUndefinedEcho">SSIUndefinedEcho</a> <a name="ssiundefinedecho" id="ssiundefinedecho">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>未定義の変数が echo されたときに表示される文字列</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIUndefinedEcho <var>string</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIUndefinedEcho "(none)"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書き:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.0.34 以降で利用可能</td></tr>
+</table>
+ <p>このディレクティブは変数が定義されていないにも関わらず
+ "echo" されたときに <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
+ が表示する文字列を変更します。</p>
+
+ <div class="example"><h3>例</h3><p><code>
+ SSIUndefinedEcho "&lt;!-- undef --&gt;"
+ </code></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="XBitHack" id="XBitHack">XBitHack</a> <a name="xbithack" id="xbithack">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>実行ビットが設定されたファイルの SSI ディレクティブを
+解析する</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>XBitHack on|off|full</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>XBitHack off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書き:</a></th><td>Options</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+</table>
+ <p><code class="directive">XBitHack</code> ディレクティブは通常の HTML
+ ドキュメントの解析を制御します。このディレクティブは <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を参照">MIME タイプ</a>
+ <code>text/html</code> と関連付けられているファイルにのみ影響します。
+ <code class="directive">XBitHack</code> は以下の値をとることができます。</p>
+
+ <dl>
+ <dt><code>off</code></dt>
+ <dd>実行可能ファイルに対して特別な扱いをしません。</dd>
+
+ <dt><code>on</code></dt>
+ <dd>ユーザの実行ビットが設定されている <code>text/html</code>
+ ファイルは全てサーバで解析する html ドキュメントとして扱われます。</dd>
+
+ <dt><code>full</code></dt>
+ <dd><code>on</code> と同様ですが、グループ実行ビットもテストします。
+ もしそれが設定されていれば、返されるファイルの <code>Last-modified</code> の
+ 日付をファイルの最終修正時刻にします。それが設定されていないときは、
+ last-modified の日付は送られません。このビットを設定すると、
+ クライアントやプロキシがリクエストをキャッシュできるようになります。
+
+ <div class="note"><strong>注意</strong> 他の CGI を <code>#include</code>
+ するかもしれないものや、各アクセスに対して違う出力を生成する
+ (もしくは後のリクエストで変わるかもしれないもの)
+ すべての SSI スクリプトに対してグループ実行ビットが
+ 設定されていないことを確認できない場合は、full は使わない方が良い
+ でしょう。</div>
+ </dd>
+ </dl>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="enabling" id="enabling">Server-Side Includes を有効にする</a></h2>
@@ -648,225 +867,6 @@
正規表現の意味がどうであろうとエスケープは必要です。</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="SSIEndTag" id="SSIEndTag">SSIEndTag</a> <a name="ssiendtag" id="ssiendtag">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>include 要素を終了させる文字列</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIEndTag <var>tag</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIEndTag "--&gt;"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.0.30 以降で利用可能</td></tr>
-</table>
- <p>このディレクティブは <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> が探す、
- include 要素の終了を示す文字列を変更します。</p>
-
- <div class="example"><h3>例</h3><p><code>
- SSIEndTag "%&gt;"
- </code></p></div>
-
-
-<h3>参照</h3>
-<ul>
-<li><code class="directive"><a href="#ssistarttag">SSIStartTag</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SSIErrorMsg" id="SSIErrorMsg">SSIErrorMsg</a> <a name="ssierrormsg" id="ssierrormsg">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>SSI のエラーがあったときに表示されるエラーメッセージ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIErrorMsg <var>message</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIErrorMsg "[an error occurred while processing this
-directive]"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">上書き:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>バージョン 2.0.30 以降で使用可能</td></tr>
-</table>
- <p><code class="directive">SSIErrorMsg</code> ディレクティブは <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
- がエラーが起こったときに表示するメッセージを変更します。プロダクションサーバでは
- メッセージがユーザに表示されないようにするために
- デフォルトエラーメッセージを <code>"&lt;!-- Error --&gt;"</code>
- に変えるというようなことを考えるかもしれません。</p>
-
- <p>このディレクティブは <code>&lt;!--#config
- errmsg=<var>message</var> --&gt;</code> 要素と同じ効果になります。</p>
-
- <div class="example"><h3>例</h3><p><code>
- SSIErrorMsg "&lt;!-- Error --&gt;"
- </code></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="SSIETag" id="SSIETag">SSIETag</a> <a name="ssietag" id="ssietag">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Controls whether ETags are generated by the server.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIETag on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIETag off</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>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>Available in version 2.2.15 and later.</td></tr>
-</table><p>このディレクティブの解説文書は
- まだ翻訳されていません。英語版をご覧ください。
- </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="SSILastModified" id="SSILastModified">SSILastModified</a> <a name="ssilastmodified" id="ssilastmodified">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Controls whether <code>Last-Modified</code> headers are generated by the
-server.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSILastModified on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSILastModified off</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>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>Available in version 2.2.15 and later.</td></tr>
-</table><p>このディレクティブの解説文書は
- まだ翻訳されていません。英語版をご覧ください。
- </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="SSILegacyExprParser" id="SSILegacyExprParser">SSILegacyExprParser</a> <a name="ssilegacyexprparser" id="ssilegacyexprparser">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Enable compatibility mode for conditional expressions.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSILegacyExprParser on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSILegacyExprParser off</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>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>Available in version 2.3.13 and later.</td></tr>
-</table><p>このディレクティブの解説文書は
- まだ翻訳されていません。英語版をご覧ください。
- </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="SSIStartTag" id="SSIStartTag">SSIStartTag</a> <a name="ssistarttag" id="ssistarttag">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>include 要素を開始する文字列</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIStartTag <var>tag</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIStartTag "&lt;!--#"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>バージョン 2.0.30 以降で使用可能</td></tr>
-</table>
-
- <p>このディレクティブは <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> が探す、include
- 要素の開始を示す文字列を変更します。</p>
-
- <p>二つのサーバで (もしかすると別々の段階で) ファイルの出力を解析していて、
- それぞれに違うコマンドを処理させたい、
- というようなときにこのオプションを使います。</p>
-
- <div class="example"><h3>例</h3><p><code>
- SSIStartTag "&lt;%"<br />
- SSIEndTag "%&gt;"
- </code></p></div>
-
- <p>上の例のように対応する
- <code class="directive"><a href="#ssiendtag">SSIEndTag</a></code> を併せて使うと、
- 下に示す例のように SSI ディレクティブを使えます:</p>
-
- <div class="example"><h3>違う開始と終了のタグを使った SSI ディレクティブ</h3><p><code>
- &lt;%printenv %&gt;
- </code></p></div>
-
-<h3>参照</h3>
-<ul>
-<li><code class="directive"><a href="#ssiendtag">SSIEndTag</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SSITimeFormat" id="SSITimeFormat">SSITimeFormat</a> <a name="ssitimeformat" id="ssitimeformat">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>日付けを現す文字列の書式を設定する</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSITimeFormat <var>formatstring</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSITimeFormat "%A, %d-%b-%Y %H:%M:%S %Z"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">上書き:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.0.30 以降で使用可能</td></tr>
-</table>
-<p>このディレクティブは <code>DATE</code> 環境変数を echo して日付を現す文字列が
- 表示されるときの書式を変更します。<var>formatstring</var> は
- C 標準ライブラリの <code>strftime(3)</code> と同じ形式です。</p>
-
- <p>このディレクティブは <code>&lt;!--#config
- timefmt=<var>formatstring</var> --&gt;</code> 要素と同じ効果になります。</p>
-
- <div class="example"><h3>例</h3><p><code>
- SSITimeFormat "%R, %B %d, %Y"
- </code></p></div>
-
- <p>上のディレクティブでは、日付は "22:26, June 14, 2002" という
- 形式で表示されます。</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="SSIUndefinedEcho" id="SSIUndefinedEcho">SSIUndefinedEcho</a> <a name="ssiundefinedecho" id="ssiundefinedecho">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>未定義の変数が echo されたときに表示される文字列</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIUndefinedEcho <var>string</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIUndefinedEcho "(none)"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">上書き:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.0.34 以降で利用可能</td></tr>
-</table>
- <p>このディレクティブは変数が定義されていないにも関わらず
- "echo" されたときに <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
- が表示する文字列を変更します。</p>
-
- <div class="example"><h3>例</h3><p><code>
- SSIUndefinedEcho "&lt;!-- undef --&gt;"
- </code></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="XBitHack" id="XBitHack">XBitHack</a> <a name="xbithack" id="xbithack">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>実行ビットが設定されたファイルの SSI ディレクティブを
-解析する</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>XBitHack on|off|full</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>XBitHack off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト, ディレクトリ, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">上書き:</a></th><td>Options</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
-</table>
- <p><code class="directive">XBitHack</code> ディレクティブは通常の HTML
- ドキュメントの解析を制御します。このディレクティブは <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を参照">MIME タイプ</a>
- <code>text/html</code> と関連付けられているファイルにのみ影響します。
- <code class="directive">XBitHack</code> は以下の値をとることができます。</p>
-
- <dl>
- <dt><code>off</code></dt>
- <dd>実行可能ファイルに対して特別な扱いをしません。</dd>
-
- <dt><code>on</code></dt>
- <dd>ユーザの実行ビットが設定されている <code>text/html</code>
- ファイルは全てサーバで解析する html ドキュメントとして扱われます。</dd>
-
- <dt><code>full</code></dt>
- <dd><code>on</code> と同様ですが、グループ実行ビットもテストします。
- もしそれが設定されていれば、返されるファイルの <code>Last-modified</code> の
- 日付をファイルの最終修正時刻にします。それが設定されていないときは、
- last-modified の日付は送られません。このビットを設定すると、
- クライアントやプロキシがリクエストをキャッシュできるようになります。
-
- <div class="note"><strong>注意</strong> 他の CGI を <code>#include</code>
- するかもしれないものや、各アクセスに対して違う出力を生成する
- (もしくは後のリクエストで変わるかもしれないもの)
- すべての SSI スクリプトに対してグループ実行ビットが
- 設定されていないことを確認できない場合は、full は使わない方が良い
- でしょう。</div>
- </dd>
- </dl>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_include.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en
index 1249991023..79b5b0a86c 100644
--- a/docs/manual/mod/mod_info.html.en
+++ b/docs/manual/mod/mod_info.html.en
@@ -70,6 +70,26 @@ configuration</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#limitations">Known Limitations</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddModuleInfo" id="AddModuleInfo">AddModuleInfo</a> <a name="addmoduleinfo" id="addmoduleinfo">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Adds additional information to the module
+information displayed by the server-info handler</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddModuleInfo <var>module-name</var> <var>string</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_info</td></tr>
+</table>
+ <p>This allows the content of <var>string</var> to be shown as
+ HTML interpreted, <strong>Additional Information</strong> for
+ the module <var>module-name</var>. Example:</p>
+
+ <pre class="prettyprint lang-config">AddModuleInfo mod_deflate.c 'See &lt;a \
+ href="http://httpd.apache.org/docs/2.4/mod/mod_deflate.html"&gt;\
+ http://httpd.apache.org/docs/2.4/mod/mod_deflate.html&lt;/a&gt;'</pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="security" id="security">Security Issues</a></h2>
<p>Once <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> is loaded into the server, its
@@ -168,26 +188,6 @@ configuration</td></tr>
might not be listed.</li>
</ul>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddModuleInfo" id="AddModuleInfo">AddModuleInfo</a> <a name="addmoduleinfo" id="addmoduleinfo">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Adds additional information to the module
-information displayed by the server-info handler</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddModuleInfo <var>module-name</var> <var>string</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_info</td></tr>
-</table>
- <p>This allows the content of <var>string</var> to be shown as
- HTML interpreted, <strong>Additional Information</strong> for
- the module <var>module-name</var>. Example:</p>
-
- <pre class="prettyprint lang-config">AddModuleInfo mod_deflate.c 'See &lt;a \
- href="http://httpd.apache.org/docs/2.4/mod/mod_deflate.html"&gt;\
- http://httpd.apache.org/docs/2.4/mod/mod_deflate.html&lt;/a&gt;'</pre>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_info.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_info.html.fr b/docs/manual/mod/mod_info.html.fr
index 1f4eac00b8..0907a61358 100644
--- a/docs/manual/mod/mod_info.html.fr
+++ b/docs/manual/mod/mod_info.html.fr
@@ -72,6 +72,26 @@ serveur</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#limitations">Limitations connues</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="addmoduleinfo" id="addmoduleinfo">Directive</a> <a name="AddModuleInfo" id="AddModuleInfo">AddModuleInfo</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ajoute des donn�es suppl�mentaires aux informations de
+module affich�es par le gestionnaire server-info</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AddModuleInfo <var>nom-module</var> <var>cha�ne</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_info</td></tr>
+</table>
+ <p>Cette directive permet d'afficher le contenu de <var>cha�ne</var>
+ en tant qu'<strong>Information suppl�mentaire</strong> interpr�t�e
+ en HTML pour le module <var>nom-module</var>. Exemple :</p>
+
+ <pre class="prettyprint lang-config">AddModuleInfo mod_deflate.c 'See &lt;a \
+ href="http://httpd.apache.org/docs/2.4/mod/mod_deflate.html"&gt;\
+ http://httpd.apache.org/docs/2.4/mod/mod_deflate.html&lt;/a&gt;'</pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="security" id="security">Probl�mes li�s � la s�curit�</a></h2>
<p>Une fois <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> charg� dans le serveur, sa
@@ -178,26 +198,6 @@ serveur</td></tr>
prises en compte.</li>
</ul>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="addmoduleinfo" id="addmoduleinfo">Directive</a> <a name="AddModuleInfo" id="AddModuleInfo">AddModuleInfo</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ajoute des donn�es suppl�mentaires aux informations de
-module affich�es par le gestionnaire server-info</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AddModuleInfo <var>nom-module</var> <var>cha�ne</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_info</td></tr>
-</table>
- <p>Cette directive permet d'afficher le contenu de <var>cha�ne</var>
- en tant qu'<strong>Information suppl�mentaire</strong> interpr�t�e
- en HTML pour le module <var>nom-module</var>. Exemple :</p>
-
- <pre class="prettyprint lang-config">AddModuleInfo mod_deflate.c 'See &lt;a \
- href="http://httpd.apache.org/docs/2.4/mod/mod_deflate.html"&gt;\
- http://httpd.apache.org/docs/2.4/mod/mod_deflate.html&lt;/a&gt;'</pre>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_info.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_info.html.ja.utf8 b/docs/manual/mod/mod_info.html.ja.utf8
index fc88471218..431ac73615 100644
--- a/docs/manual/mod/mod_info.html.ja.utf8
+++ b/docs/manual/mod/mod_info.html.ja.utf8
@@ -79,6 +79,30 @@
<li><img alt="" src="../images/down.gif" /> <a href="#limitations">既知の制限</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddModuleInfo" id="AddModuleInfo">AddModuleInfo</a> <a name="addmoduleinfo" id="addmoduleinfo">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>server-info ハンドラにより表示されるモジュールの情報に
+追加の情報を付け加える</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddModuleInfo <var>module-name</var> <var>string</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_info</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>Apache 1.3 以降</td></tr>
+</table>
+ <p>これは、<var>string</var> の内容がモジュール <var>module-name</var>
+ の<strong>追加情報</strong> として HTML
+ として解釈され、表示されるようにします。例:</p>
+
+ <div class="example"><p><code>
+ AddModuleInfo mod_deflate.c 'See &lt;a \<br />
+ <span class="indent">
+ href="http://www.apache.org/docs/2.4/mod/mod_deflate.html"&gt;\<br />
+ http://www.apache.org/docs/2.4/mod/mod_deflate.html&lt;/a&gt;'
+ </span>
+ </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="security" id="security">Security Issues</a></h2>
<p>一旦 <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> がサーバに読み込まれると、
@@ -161,30 +185,6 @@
のディレクティブは表示されないかもしれません。</li>
</ul>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddModuleInfo" id="AddModuleInfo">AddModuleInfo</a> <a name="addmoduleinfo" id="addmoduleinfo">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>server-info ハンドラにより表示されるモジュールの情報に
-追加の情報を付け加える</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddModuleInfo <var>module-name</var> <var>string</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_info</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>Apache 1.3 以降</td></tr>
-</table>
- <p>これは、<var>string</var> の内容がモジュール <var>module-name</var>
- の<strong>追加情報</strong> として HTML
- として解釈され、表示されるようにします。例:</p>
-
- <div class="example"><p><code>
- AddModuleInfo mod_deflate.c 'See &lt;a \<br />
- <span class="indent">
- href="http://www.apache.org/docs/2.4/mod/mod_deflate.html"&gt;\<br />
- http://www.apache.org/docs/2.4/mod/mod_deflate.html&lt;/a&gt;'
- </span>
- </code></p></div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_info.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_info.html.ko.euc-kr b/docs/manual/mod/mod_info.html.ko.euc-kr
index d3af4d25b9..66e4205820 100644
--- a/docs/manual/mod/mod_info.html.ko.euc-kr
+++ b/docs/manual/mod/mod_info.html.ko.euc-kr
@@ -63,6 +63,29 @@
<li><img alt="" src="../images/down.gif" /> <a href="#limitations">�˷��� �Ѱ�</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddModuleInfo" id="AddModuleInfo">AddModuleInfo</a> <a name="addmoduleinfo" id="addmoduleinfo">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>��⿡ ���� �߰� ������ server-info �ڵ鷯�� �����ֵ���
+�߰��Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>AddModuleInfo <var>module-name</var> <var>string</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_info</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td>����ġ 1.3 ����</td></tr>
+</table>
+ <p><var>module-name</var> ��⿡ ���� <strong>�߰� ����</strong>��
+ <var>string</var>�� ������ HTML�� �����ش�. ���� ���,</p>
+
+ <div class="example"><p><code>
+ AddModuleInfo mod_deflate.c 'See &lt;a \<br />
+ <span class="indent">
+ href="http://www.apache.org/docs/2.4/mod/mod_deflate.html"&gt;\<br />
+ http://www.apache.org/docs/docs/2.4/mod/mod_deflate.html&lt;/a&gt;'
+ </span>
+ </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="security" id="security">���� ����</a></h2>
<p>�ѹ� ������ <code class="module"><a href="../mod/mod_info.html">mod_info</a></code>�� �о���̸�, ���丮��
@@ -139,29 +162,6 @@
���þ �������� ���� �� �ִ�.</li>
</ul>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddModuleInfo" id="AddModuleInfo">AddModuleInfo</a> <a name="addmoduleinfo" id="addmoduleinfo">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>��⿡ ���� �߰� ������ server-info �ڵ鷯�� �����ֵ���
-�߰��Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>AddModuleInfo <var>module-name</var> <var>string</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_info</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">����:</a></th><td>����ġ 1.3 ����</td></tr>
-</table>
- <p><var>module-name</var> ��⿡ ���� <strong>�߰� ����</strong>��
- <var>string</var>�� ������ HTML�� �����ش�. ���� ���,</p>
-
- <div class="example"><p><code>
- AddModuleInfo mod_deflate.c 'See &lt;a \<br />
- <span class="indent">
- href="http://www.apache.org/docs/2.4/mod/mod_deflate.html"&gt;\<br />
- http://www.apache.org/docs/docs/2.4/mod/mod_deflate.html&lt;/a&gt;'
- </span>
- </code></p></div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_info.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_isapi.html.en b/docs/manual/mod/mod_isapi.html.en
index fff973ceeb..5ec80d1684 100644
--- a/docs/manual/mod/mod_isapi.html.en
+++ b/docs/manual/mod/mod_isapi.html.en
@@ -63,6 +63,109 @@
<li><img alt="" src="../images/down.gif" /> <a href="#journal">Programmer's Journal</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ISAPIAppendLogToErrors" id="ISAPIAppendLogToErrors">ISAPIAppendLogToErrors</a> <a name="isapiappendlogtoerrors" id="isapiappendlogtoerrors">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
+ISAPI extensions to the error log</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPIAppendLogToErrors on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ISAPIAppendLogToErrors off</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#Override">Override:</a></th><td>FileInfo</td></tr>
+<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_isapi</td></tr>
+</table>
+ <p>Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from ISAPI
+ extensions to the server error log.</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="ISAPIAppendLogToQuery" id="ISAPIAppendLogToQuery">ISAPIAppendLogToQuery</a> <a name="isapiappendlogtoquery" id="isapiappendlogtoquery">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
+ISAPI extensions to the query field</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPIAppendLogToQuery on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ISAPIAppendLogToQuery on</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#Override">Override:</a></th><td>FileInfo</td></tr>
+<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_isapi</td></tr>
+</table>
+ <p>Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from ISAPI
+ extensions to the query field (appended to the <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> <code>%q</code>
+ component).</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="ISAPICacheFile" id="ISAPICacheFile">ISAPICacheFile</a> <a name="isapicachefile" id="isapicachefile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>ISAPI .dll files to be loaded at startup</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPICacheFile <var>file-path</var> [<var>file-path</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<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_isapi</td></tr>
+</table>
+ <p>Specifies a space-separated list of file names to be loaded
+ when the Apache server is launched, and remain loaded until the
+ server is shut down. This directive may be repeated for every
+ ISAPI .dll file desired. The full path name of each file should
+ be specified. If the path name is not absolute, it will be treated
+ relative to <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</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="ISAPIFakeAsync" id="ISAPIFakeAsync">ISAPIFakeAsync</a> <a name="isapifakeasync" id="isapifakeasync">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fake asynchronous support for ISAPI callbacks</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPIFakeAsync on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ISAPIFakeAsync off</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#Override">Override:</a></th><td>FileInfo</td></tr>
+<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_isapi</td></tr>
+</table>
+ <p>While set to on, asynchronous support for ISAPI callbacks is
+ simulated.</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="ISAPILogNotSupported" id="ISAPILogNotSupported">ISAPILogNotSupported</a> <a name="isapilognotsupported" id="isapilognotsupported">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Log unsupported feature requests from ISAPI
+extensions</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPILogNotSupported on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ISAPILogNotSupported off</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#Override">Override:</a></th><td>FileInfo</td></tr>
+<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_isapi</td></tr>
+</table>
+ <p>Logs all requests for unsupported features from ISAPI
+ extensions in the server error log. This may help administrators
+ to track down problems. Once set to on and all desired ISAPI modules
+ are functioning, it should be set back to off.</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="ISAPIReadAheadBuffer" id="ISAPIReadAheadBuffer">ISAPIReadAheadBuffer</a> <a name="isapireadaheadbuffer" id="isapireadaheadbuffer">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Size of the Read Ahead Buffer sent to ISAPI
+extensions</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPIReadAheadBuffer <var>size</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ISAPIReadAheadBuffer 49152</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#Override">Override:</a></th><td>FileInfo</td></tr>
+<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_isapi</td></tr>
+</table>
+ <p>Defines the maximum size of the Read Ahead Buffer sent to
+ ISAPI extensions when they are initially invoked. All remaining
+ data must be retrieved using the <code>ReadClient</code> callback; some
+ ISAPI extensions may not support the <code>ReadClient</code> function.
+ Refer questions to the ISAPI extension's author.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="usage" id="usage">Usage</a></h2>
@@ -232,109 +335,6 @@
<code>TransmitFile</code> semantics. Apache httpd also supports preloading
ISAPI .dlls for performance.</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="ISAPIAppendLogToErrors" id="ISAPIAppendLogToErrors">ISAPIAppendLogToErrors</a> <a name="isapiappendlogtoerrors" id="isapiappendlogtoerrors">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
-ISAPI extensions to the error log</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPIAppendLogToErrors on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ISAPIAppendLogToErrors off</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#Override">Override:</a></th><td>FileInfo</td></tr>
-<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_isapi</td></tr>
-</table>
- <p>Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from ISAPI
- extensions to the server error log.</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="ISAPIAppendLogToQuery" id="ISAPIAppendLogToQuery">ISAPIAppendLogToQuery</a> <a name="isapiappendlogtoquery" id="isapiappendlogtoquery">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
-ISAPI extensions to the query field</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPIAppendLogToQuery on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ISAPIAppendLogToQuery on</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#Override">Override:</a></th><td>FileInfo</td></tr>
-<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_isapi</td></tr>
-</table>
- <p>Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from ISAPI
- extensions to the query field (appended to the <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> <code>%q</code>
- component).</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="ISAPICacheFile" id="ISAPICacheFile">ISAPICacheFile</a> <a name="isapicachefile" id="isapicachefile">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>ISAPI .dll files to be loaded at startup</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPICacheFile <var>file-path</var> [<var>file-path</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<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_isapi</td></tr>
-</table>
- <p>Specifies a space-separated list of file names to be loaded
- when the Apache server is launched, and remain loaded until the
- server is shut down. This directive may be repeated for every
- ISAPI .dll file desired. The full path name of each file should
- be specified. If the path name is not absolute, it will be treated
- relative to <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</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="ISAPIFakeAsync" id="ISAPIFakeAsync">ISAPIFakeAsync</a> <a name="isapifakeasync" id="isapifakeasync">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fake asynchronous support for ISAPI callbacks</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPIFakeAsync on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ISAPIFakeAsync off</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#Override">Override:</a></th><td>FileInfo</td></tr>
-<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_isapi</td></tr>
-</table>
- <p>While set to on, asynchronous support for ISAPI callbacks is
- simulated.</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="ISAPILogNotSupported" id="ISAPILogNotSupported">ISAPILogNotSupported</a> <a name="isapilognotsupported" id="isapilognotsupported">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Log unsupported feature requests from ISAPI
-extensions</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPILogNotSupported on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ISAPILogNotSupported off</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#Override">Override:</a></th><td>FileInfo</td></tr>
-<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_isapi</td></tr>
-</table>
- <p>Logs all requests for unsupported features from ISAPI
- extensions in the server error log. This may help administrators
- to track down problems. Once set to on and all desired ISAPI modules
- are functioning, it should be set back to off.</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="ISAPIReadAheadBuffer" id="ISAPIReadAheadBuffer">ISAPIReadAheadBuffer</a> <a name="isapireadaheadbuffer" id="isapireadaheadbuffer">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Size of the Read Ahead Buffer sent to ISAPI
-extensions</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ISAPIReadAheadBuffer <var>size</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ISAPIReadAheadBuffer 49152</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#Override">Override:</a></th><td>FileInfo</td></tr>
-<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_isapi</td></tr>
-</table>
- <p>Defines the maximum size of the Read Ahead Buffer sent to
- ISAPI extensions when they are initially invoked. All remaining
- data must be retrieved using the <code>ReadClient</code> callback; some
- ISAPI extensions may not support the <code>ReadClient</code> function.
- Refer questions to the ISAPI extension's author.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_isapi.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_isapi.html.fr b/docs/manual/mod/mod_isapi.html.fr
index 34665e78d1..b31bf1759e 100644
--- a/docs/manual/mod/mod_isapi.html.fr
+++ b/docs/manual/mod/mod_isapi.html.fr
@@ -64,6 +64,120 @@
<li><img alt="" src="../images/down.gif" /> <a href="#journal">Journal du programmeur</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="isapiappendlogtoerrors" id="isapiappendlogtoerrors">Directive</a> <a name="ISAPIAppendLogToErrors" id="ISAPIAppendLogToErrors">ISAPIAppendLogToErrors</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enregistrement des requ�tes
+<code>HSE_APPEND_LOG_PARAMETER</code> de la part des extensions ISAPI
+dans le journal des erreurs</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPIAppendLogToErrors on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ISAPIAppendLogToErrors off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_isapi</td></tr>
+</table>
+ <p>Cette directive permet d'enregistrer les requ�tes
+ <code>HSE_APPEND_LOG_PARAMETER</code> de la part des extensions
+ ISAPI dans le journal des erreurs.</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="isapiappendlogtoquery" id="isapiappendlogtoquery">Directive</a> <a name="ISAPIAppendLogToQuery" id="ISAPIAppendLogToQuery">ISAPIAppendLogToQuery</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enregistre les requ�tes
+<code>HSE_APPEND_LOG_PARAMETER</code> de la part des extensions ISAPI
+dans la partie arguments de la requ�te</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPIAppendLogToQuery on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ISAPIAppendLogToQuery on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_isapi</td></tr>
+</table>
+ <p>Cette directive permet d'enregistrer les requ�tes
+ <code>HSE_APPEND_LOG_PARAMETER</code> de la part des extensions
+ ISAPI dans la partie arguments de la requ�te (ajout� au composant
+ <code>%q</code> de la directive <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code>).</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="isapicachefile" id="isapicachefile">Directive</a> <a name="ISAPICacheFile" id="ISAPICacheFile">ISAPICacheFile</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fichiers .dll ISAPI devant �tre charg�s au
+d�marrage</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPICacheFile <var>chemin-fichier</var>
+[<var>chemin-fichier</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_isapi</td></tr>
+</table>
+ <p>Cette directive permet de sp�cifier une liste, s�par�s par des
+ espaces, de noms de fichiers devant �tre charg�s au d�marrage
+ du serveur Apache, et rester en m�moire jusqu'� l'arr�t du serveur.
+ Cette directive peut �tre r�p�t�e pour chaque fichier .dll ISAPI
+ souhait�. Le chemin complet du fichier doit �tre sp�cifi�. Si le
+ chemin n'est pas absolu, il sera consid�r� comme relatif au
+ r�pertoire d�fini par la directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</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="isapifakeasync" id="isapifakeasync">Directive</a> <a name="ISAPIFakeAsync" id="ISAPIFakeAsync">ISAPIFakeAsync</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Emulation du support des entr�es/sorties asynchrones pour
+les appels ISAPI</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPIFakeAsync on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ISAPIFakeAsync off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_isapi</td></tr>
+</table>
+ <p>Lorsquelle est d�finie � "on", cette directive permet d'�muler le
+ support des entr�es/sorties asynchrones pour les appels ISAPI.</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="isapilognotsupported" id="isapilognotsupported">Directive</a> <a name="ISAPILogNotSupported" id="ISAPILogNotSupported">ISAPILogNotSupported</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Journalisation des demandes de fonctionnalit�s non
+support�es de la part des extensions ISAPI</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPILogNotSupported on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ISAPILogNotSupported off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_isapi</td></tr>
+</table>
+ <p>Cette directive permet d'enregistrer dans le journal des erreurs
+ toutes les demandes de fonctionnalit�s non support�es de la part des
+ extensions ISAPI. Ceci peut aider les administrateurs � d�cortiquer
+ certains probl�mes. Lorsqu'elle a �t� d�finie � "on" et si tous les
+ modules ISAPI fonctionnent, elle peut �tre red�finie � "off".</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="isapireadaheadbuffer" id="isapireadaheadbuffer">Directive</a> <a name="ISAPIReadAheadBuffer" id="ISAPIReadAheadBuffer">ISAPIReadAheadBuffer</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Taille du tampon de lecture anticip�e envoy� aux extensions
+ISAPI</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPIReadAheadBuffer <var>taille</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ISAPIReadAheadBuffer 49152</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_isapi</td></tr>
+</table>
+ <p>Cette directive permet de d�finir la taille maximale du tampon de
+ lecture anticip�e envoy� aux extensions ISAPI lorsqu'elles sont
+ initialement invoqu�es. Toute donn�e restante doit �tre extraite en
+ faisant appel � <code>ReadClient</code> ; certaines extensions ISAPI
+ peuvent ne pas supporter la fonction <code>ReadClient</code>.
+ Pour plus de d�tails, veuillez vous adresser � l'auteur de
+ l'extension ISAPI.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="usage" id="usage">Utilisation</a></h2>
@@ -243,120 +357,6 @@
<code>TransmitFile</code>. Apache httpd supporte aussi le pr�chargement
des .dlls ISAPI � des fins de performances.</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="isapiappendlogtoerrors" id="isapiappendlogtoerrors">Directive</a> <a name="ISAPIAppendLogToErrors" id="ISAPIAppendLogToErrors">ISAPIAppendLogToErrors</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enregistrement des requ�tes
-<code>HSE_APPEND_LOG_PARAMETER</code> de la part des extensions ISAPI
-dans le journal des erreurs</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPIAppendLogToErrors on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ISAPIAppendLogToErrors off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_isapi</td></tr>
-</table>
- <p>Cette directive permet d'enregistrer les requ�tes
- <code>HSE_APPEND_LOG_PARAMETER</code> de la part des extensions
- ISAPI dans le journal des erreurs.</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="isapiappendlogtoquery" id="isapiappendlogtoquery">Directive</a> <a name="ISAPIAppendLogToQuery" id="ISAPIAppendLogToQuery">ISAPIAppendLogToQuery</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enregistre les requ�tes
-<code>HSE_APPEND_LOG_PARAMETER</code> de la part des extensions ISAPI
-dans la partie arguments de la requ�te</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPIAppendLogToQuery on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ISAPIAppendLogToQuery on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_isapi</td></tr>
-</table>
- <p>Cette directive permet d'enregistrer les requ�tes
- <code>HSE_APPEND_LOG_PARAMETER</code> de la part des extensions
- ISAPI dans la partie arguments de la requ�te (ajout� au composant
- <code>%q</code> de la directive <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code>).</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="isapicachefile" id="isapicachefile">Directive</a> <a name="ISAPICacheFile" id="ISAPICacheFile">ISAPICacheFile</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fichiers .dll ISAPI devant �tre charg�s au
-d�marrage</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPICacheFile <var>chemin-fichier</var>
-[<var>chemin-fichier</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_isapi</td></tr>
-</table>
- <p>Cette directive permet de sp�cifier une liste, s�par�s par des
- espaces, de noms de fichiers devant �tre charg�s au d�marrage
- du serveur Apache, et rester en m�moire jusqu'� l'arr�t du serveur.
- Cette directive peut �tre r�p�t�e pour chaque fichier .dll ISAPI
- souhait�. Le chemin complet du fichier doit �tre sp�cifi�. Si le
- chemin n'est pas absolu, il sera consid�r� comme relatif au
- r�pertoire d�fini par la directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</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="isapifakeasync" id="isapifakeasync">Directive</a> <a name="ISAPIFakeAsync" id="ISAPIFakeAsync">ISAPIFakeAsync</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Emulation du support des entr�es/sorties asynchrones pour
-les appels ISAPI</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPIFakeAsync on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ISAPIFakeAsync off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_isapi</td></tr>
-</table>
- <p>Lorsquelle est d�finie � "on", cette directive permet d'�muler le
- support des entr�es/sorties asynchrones pour les appels ISAPI.</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="isapilognotsupported" id="isapilognotsupported">Directive</a> <a name="ISAPILogNotSupported" id="ISAPILogNotSupported">ISAPILogNotSupported</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Journalisation des demandes de fonctionnalit�s non
-support�es de la part des extensions ISAPI</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPILogNotSupported on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ISAPILogNotSupported off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_isapi</td></tr>
-</table>
- <p>Cette directive permet d'enregistrer dans le journal des erreurs
- toutes les demandes de fonctionnalit�s non support�es de la part des
- extensions ISAPI. Ceci peut aider les administrateurs � d�cortiquer
- certains probl�mes. Lorsqu'elle a �t� d�finie � "on" et si tous les
- modules ISAPI fonctionnent, elle peut �tre red�finie � "off".</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="isapireadaheadbuffer" id="isapireadaheadbuffer">Directive</a> <a name="ISAPIReadAheadBuffer" id="ISAPIReadAheadBuffer">ISAPIReadAheadBuffer</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Taille du tampon de lecture anticip�e envoy� aux extensions
-ISAPI</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ISAPIReadAheadBuffer <var>taille</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ISAPIReadAheadBuffer 49152</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_isapi</td></tr>
-</table>
- <p>Cette directive permet de d�finir la taille maximale du tampon de
- lecture anticip�e envoy� aux extensions ISAPI lorsqu'elles sont
- initialement invoqu�es. Toute donn�e restante doit �tre extraite en
- faisant appel � <code>ReadClient</code> ; certaines extensions ISAPI
- peuvent ne pas supporter la fonction <code>ReadClient</code>.
- Pour plus de d�tails, veuillez vous adresser � l'auteur de
- l'extension ISAPI.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_isapi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_isapi.html.ko.euc-kr b/docs/manual/mod/mod_isapi.html.ko.euc-kr
index c83a2573df..d69353641b 100644
--- a/docs/manual/mod/mod_isapi.html.ko.euc-kr
+++ b/docs/manual/mod/mod_isapi.html.ko.euc-kr
@@ -63,6 +63,106 @@
<li><img alt="" src="../images/down.gif" /> <a href="#journal">������ ����</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ISAPIAppendLogToErrors" id="ISAPIAppendLogToErrors">ISAPIAppendLogToErrors</a> <a name="isapiappendlogtoerrors" id="isapiappendlogtoerrors">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>ISAPI exntension�� <code>HSE_APPEND_LOG_PARAMETER</code>
+��û�� ���� �α׿� ����Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPIAppendLogToErrors on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ISAPIAppendLogToErrors off</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#Override">Override �ɼ�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
+</table>
+ <p>ISAPI exntension�� <code>HSE_APPEND_LOG_PARAMETER</code>
+ ��û�� ���� �α׿� ����Ѵ�.</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="ISAPIAppendLogToQuery" id="ISAPIAppendLogToQuery">ISAPIAppendLogToQuery</a> <a name="isapiappendlogtoquery" id="isapiappendlogtoquery">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>ISAPI exntension�� <code>HSE_APPEND_LOG_PARAMETER</code>
+��û�� ���ǹ��ڿ��� ����Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPIAppendLogToQuery on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ISAPIAppendLogToQuery on</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#Override">Override �ɼ�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
+</table>
+ <p>ISAPI exntension�� <code>HSE_APPEND_LOG_PARAMETER</code>
+ ��û�� ���ǹ��ڿ��� ����Ѵ� (<code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> <code>%q</code>
+ �׸� �����δ�).</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="ISAPICacheFile" id="ISAPICacheFile">ISAPICacheFile</a> <a name="isapicachefile" id="isapicachefile">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>������ �����Ҷ� �޸𸮷� �о���� ISAPI .dll ���ϵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPICacheFile <var>file-path</var> [<var>file-path</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
+</table>
+ <p>����ġ ������ �����Ҷ� �޸𸮷� �о�鿩�� ������ �����Ҷ�����
+ �޸𸮿� �������� ���ϸ��� �������� �����Ͽ� �����Ѵ�. ��
+ ���þ�� ISAPI .dll ���Ϻ��� ������ ����� �� �ִ�. ������
+ ��ü ��θ� ���´�. ���� ��ΰ� �ƴϸ� <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>�� ��� ��η� �޾Ƶ��δ�.</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="ISAPIFakeAsync" id="ISAPIFakeAsync">ISAPIFakeAsync</a> <a name="isapifakeasync" id="isapifakeasync">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�񵿱� ISAPI �ݹ��� �����ϴ� ô�Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPIFakeAsync on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ISAPIFakeAsync off</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#Override">Override �ɼ�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
+</table>
+ <p>on���� �����ϸ� �񵿱� ISAPI �ݹ� ������ �䳻����.</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="ISAPILogNotSupported" id="ISAPILogNotSupported">ISAPILogNotSupported</a> <a name="isapilognotsupported" id="isapilognotsupported">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>ISAPI extension�� �������� �ʴ� ����� ��û�ϸ�
+�α׿� ����Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPILogNotSupported on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ISAPILogNotSupported off</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#Override">Override �ɼ�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
+</table>
+ <p>ISAPI extension�� �������� �ʴ� ����� ��û�ϸ� ����
+ ���� �α׿� ����Ѵ�. ���߿� �����ڰ� ������ �����ϴµ�
+ ������ �ȴ�. ���ϴ� ��� ISAPI ����� ���������� �����ϸ�
+ �ٽ� off�� �ǵ����� �Ѵ�.</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="ISAPIReadAheadBuffer" id="ISAPIReadAheadBuffer">ISAPIReadAheadBuffer</a> <a name="isapireadaheadbuffer" id="isapireadaheadbuffer">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>ISAPI extension�� �̸��б����(read ahead buffer)
+ũ��</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPIReadAheadBuffer <var>size</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ISAPIReadAheadBuffer 49152</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#Override">Override �ɼ�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
+</table>
+ <p>ISAPI extension�� ó�� ȣ���Ҷ� �̸��б������ �ִ� ũ�⸦
+ �����Ѵ�. (�� ũ�⺸�� ū) ������ �ڷ�� <code>ReadClient</code>
+ �ݹ��� ����Ͽ� �о�� �Ѵ�. � ISAPI extension��
+ <code>ReadClient</code> ����� �������� �ʴ´�. �� ���
+ ISAPI extension �����ڿ��� �����϶�.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="usage" id="usage">����</a></h2>
@@ -213,106 +313,6 @@
.dll�� �̸� �о�鿩�� ������ ���̴� ����ġ 1.3
<code>mod_isapi</code>���� ���� ����� �����Ѵ�.</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="ISAPIAppendLogToErrors" id="ISAPIAppendLogToErrors">ISAPIAppendLogToErrors</a> <a name="isapiappendlogtoerrors" id="isapiappendlogtoerrors">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>ISAPI exntension�� <code>HSE_APPEND_LOG_PARAMETER</code>
-��û�� ���� �α׿� ����Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPIAppendLogToErrors on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ISAPIAppendLogToErrors off</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#Override">Override �ɼ�:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
-</table>
- <p>ISAPI exntension�� <code>HSE_APPEND_LOG_PARAMETER</code>
- ��û�� ���� �α׿� ����Ѵ�.</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="ISAPIAppendLogToQuery" id="ISAPIAppendLogToQuery">ISAPIAppendLogToQuery</a> <a name="isapiappendlogtoquery" id="isapiappendlogtoquery">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>ISAPI exntension�� <code>HSE_APPEND_LOG_PARAMETER</code>
-��û�� ���ǹ��ڿ��� ����Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPIAppendLogToQuery on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ISAPIAppendLogToQuery on</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#Override">Override �ɼ�:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
-</table>
- <p>ISAPI exntension�� <code>HSE_APPEND_LOG_PARAMETER</code>
- ��û�� ���ǹ��ڿ��� ����Ѵ� (<code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> <code>%q</code>
- �׸� �����δ�).</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="ISAPICacheFile" id="ISAPICacheFile">ISAPICacheFile</a> <a name="isapicachefile" id="isapicachefile">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>������ �����Ҷ� �޸𸮷� �о���� ISAPI .dll ���ϵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPICacheFile <var>file-path</var> [<var>file-path</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
-</table>
- <p>����ġ ������ �����Ҷ� �޸𸮷� �о�鿩�� ������ �����Ҷ�����
- �޸𸮿� �������� ���ϸ��� �������� �����Ͽ� �����Ѵ�. ��
- ���þ�� ISAPI .dll ���Ϻ��� ������ ����� �� �ִ�. ������
- ��ü ��θ� ���´�. ���� ��ΰ� �ƴϸ� <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>�� ��� ��η� �޾Ƶ��δ�.</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="ISAPIFakeAsync" id="ISAPIFakeAsync">ISAPIFakeAsync</a> <a name="isapifakeasync" id="isapifakeasync">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�񵿱� ISAPI �ݹ��� �����ϴ� ô�Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPIFakeAsync on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ISAPIFakeAsync off</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#Override">Override �ɼ�:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
-</table>
- <p>on���� �����ϸ� �񵿱� ISAPI �ݹ� ������ �䳻����.</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="ISAPILogNotSupported" id="ISAPILogNotSupported">ISAPILogNotSupported</a> <a name="isapilognotsupported" id="isapilognotsupported">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>ISAPI extension�� �������� �ʴ� ����� ��û�ϸ�
-�α׿� ����Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPILogNotSupported on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ISAPILogNotSupported off</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#Override">Override �ɼ�:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
-</table>
- <p>ISAPI extension�� �������� �ʴ� ����� ��û�ϸ� ����
- ���� �α׿� ����Ѵ�. ���߿� �����ڰ� ������ �����ϴµ�
- ������ �ȴ�. ���ϴ� ��� ISAPI ����� ���������� �����ϸ�
- �ٽ� off�� �ǵ����� �Ѵ�.</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="ISAPIReadAheadBuffer" id="ISAPIReadAheadBuffer">ISAPIReadAheadBuffer</a> <a name="isapireadaheadbuffer" id="isapireadaheadbuffer">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>ISAPI extension�� �̸��б����(read ahead buffer)
-ũ��</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>ISAPIReadAheadBuffer <var>size</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>ISAPIReadAheadBuffer 49152</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#Override">Override �ɼ�:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_isapi</td></tr>
-</table>
- <p>ISAPI extension�� ó�� ȣ���Ҷ� �̸��б������ �ִ� ũ�⸦
- �����Ѵ�. (�� ũ�⺸�� ū) ������ �ڷ�� <code>ReadClient</code>
- �ݹ��� ����Ͽ� �о�� �Ѵ�. � ISAPI extension��
- <code>ReadClient</code> ����� �������� �ʴ´�. �� ���
- ISAPI extension �����ڿ��� �����϶�.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_isapi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_lbmethod_heartbeat.html.en b/docs/manual/mod/mod_lbmethod_heartbeat.html.en
index 83c839e4c1..80ec10490e 100644
--- a/docs/manual/mod/mod_lbmethod_heartbeat.html.en
+++ b/docs/manual/mod/mod_lbmethod_heartbeat.html.en
@@ -53,7 +53,6 @@ assumption that they are not fully initialized.</p>
<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><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="HeartbeatStorage" id="HeartbeatStorage">HeartbeatStorage</a> <a name="heartbeatstorage" id="heartbeatstorage">Directive</a></h2>
<table class="directive">
@@ -69,6 +68,7 @@ assumption that they are not fully initialized.</p>
<code class="module"><a href="../mod/mod_slotmem_shm.html">mod_slotmem_shm</a></code> is not loaded.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_lbmethod_heartbeat.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_lbmethod_heartbeat.html.fr b/docs/manual/mod/mod_lbmethod_heartbeat.html.fr
index e48ad1df5e..5225d278af 100644
--- a/docs/manual/mod/mod_lbmethod_heartbeat.html.fr
+++ b/docs/manual/mod/mod_lbmethod_heartbeat.html.fr
@@ -58,7 +58,6 @@ comme non enti�rement initialis�s.</p>
<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><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="heartbeatstorage" id="heartbeatstorage">Directive</a> <a name="HeartbeatStorage" id="HeartbeatStorage">HeartbeatStorage</a></h2>
<table class="directive">
@@ -76,6 +75,7 @@ heartbeat</td></tr>
n'est pas charg�.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_lbmethod_heartbeat.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en
index 9092d58f57..8136f64d27 100644
--- a/docs/manual/mod/mod_ldap.html.en
+++ b/docs/manual/mod/mod_ldap.html.en
@@ -85,345 +85,6 @@ by other LDAP modules</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#settingcerts">SSL/TLS Certificates</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="exampleconfig" id="exampleconfig">Example Configuration</a></h2>
- <p>The following is an example configuration that uses
- <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> to increase the performance of HTTP Basic
- authentication provided by <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>.</p>
-
- <pre class="prettyprint lang-config"># Enable the LDAP connection pool and shared
-# memory cache. Enable the LDAP cache status
-# handler. Requires that mod_ldap and mod_authnz_ldap
-# be loaded. Change the "yourdomain.example.com" to
-# match your domain.
-
-LDAPSharedCacheSize 500000
-LDAPCacheEntries 1024
-LDAPCacheTTL 600
-LDAPOpCacheEntries 1024
-LDAPOpCacheTTL 600
-
-&lt;Location "/ldap-status"&gt;
- SetHandler ldap-status
-
- Require host yourdomain.example.com
-
- Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL "ldap://127.0.0.1/dc=example,dc=com?uid?one"
- Require valid-user
-&lt;/Location&gt;</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="pool" id="pool">LDAP Connection Pool</a></h2>
-
- <p>LDAP connections are pooled from request to request. This
- allows the LDAP server to remain connected and bound ready for
- the next request, without the need to unbind/connect/rebind.
- The performance advantages are similar to the effect of HTTP
- keepalives.</p>
-
- <p>On a busy server it is possible that many requests will try
- and access the same LDAP server connection simultaneously.
- Where an LDAP connection is in use, Apache will create a new
- connection alongside the original one. This ensures that the
- connection pool does not become a bottleneck.</p>
-
- <p>There is no need to manually enable connection pooling in
- the Apache configuration. Any module using this module for
- access to LDAP services will share the connection pool.</p>
-
- <p>LDAP connections can keep track of the ldap client
- credentials used when binding to an LDAP server. These
- credentials can be provided to LDAP servers that do not
- allow anonymous binds during referral chasing. To control
- this feature, see the
- <code class="directive"><a href="#ldapreferrals">LDAPReferrals</a></code> and
- <code class="directive"><a href="#ldapreferralhoplimit">LDAPReferralHopLimit</a></code>
- directives. By default, this feature is enabled.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="cache" id="cache">LDAP Cache</a></h2>
-
- <p>For improved performance, <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> uses an aggressive
- caching strategy to minimize the number of times that the LDAP
- server must be contacted. Caching can easily double or triple
- the throughput of Apache when it is serving pages protected
- with mod_authnz_ldap. In addition, the load on the LDAP server
- will be significantly decreased.</p>
-
- <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> supports two types of LDAP caching during
- the search/bind phase with a <em>search/bind cache</em> and
- during the compare phase with two <em>operation
- caches</em>. Each LDAP URL that is used by the server has
- its own set of these three caches.</p>
-
- <h3><a name="search-bind" id="search-bind">The Search/Bind Cache</a></h3>
- <p>The process of doing a search and then a bind is the
- most time-consuming aspect of LDAP operation, especially if
- the directory is large. The search/bind cache is used to
- cache all searches that resulted in successful binds.
- Negative results (<em>i.e.</em>, unsuccessful searches, or searches
- that did not result in a successful bind) are not cached.
- The rationale behind this decision is that connections with
- invalid credentials are only a tiny percentage of the total
- number of connections, so by not caching invalid
- credentials, the size of the cache is reduced.</p>
-
- <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> stores the username, the DN
- retrieved, the password used to bind, and the time of the bind
- in the cache. Whenever a new connection is initiated with the
- same username, <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> compares the password
- of the new connection with the password in the cache. If the
- passwords match, and if the cached entry is not too old,
- <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> bypasses the search/bind phase.</p>
-
- <p>The search and bind cache is controlled with the <code class="directive"><a href="#ldapcacheentries">LDAPCacheEntries</a></code> and <code class="directive"><a href="#ldapcachettl">LDAPCacheTTL</a></code> directives.</p>
-
-
- <h3><a name="opcaches" id="opcaches">Operation Caches</a></h3>
- <p>During attribute and distinguished name comparison
- functions, <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> uses two operation caches
- to cache the compare operations. The first compare cache is
- used to cache the results of compares done to test for LDAP
- group membership. The second compare cache is used to cache
- the results of comparisons done between distinguished
- names.</p>
-
- <p>Note that, when group membership is being checked, any sub-group
- comparison results are cached to speed future sub-group comparisons.</p>
-
- <p>The behavior of both of these caches is controlled with
- the <code class="directive"><a href="#ldapopcacheentries">LDAPOpCacheEntries</a></code>
- and <code class="directive"><a href="#ldapopcachettl">LDAPOpCacheTTL</a></code>
- directives.</p>
-
-
- <h3><a name="monitoring" id="monitoring">Monitoring the Cache</a></h3>
- <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> has a content handler that allows
- administrators to monitor the cache performance. The name of
- the content handler is <code>ldap-status</code>, so the
- following directives could be used to access the
- <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> cache information:</p>
-
- <pre class="prettyprint lang-config">&lt;Location "/server/cache-info"&gt;
- SetHandler ldap-status
-&lt;/Location&gt;</pre>
-
-
- <p>By fetching the URL <code>http://servername/cache-info</code>,
- the administrator can get a status report of every cache that is used
- by <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> cache. Note that if Apache does not
- support shared memory, then each <code class="program"><a href="../programs/httpd.html">httpd</a></code> instance has its
- own cache, so reloading the URL will result in different
- information each time, depending on which <code class="program"><a href="../programs/httpd.html">httpd</a></code>
- instance processes the request.</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="usingssltls" id="usingssltls">Using SSL/TLS</a></h2>
-
- <p>The ability to create an SSL and TLS connections to an LDAP server
- is defined by the directives
- <code class="directive"><a href="#ldaptrustedglobalcert">LDAPTrustedGlobalCert</a></code>,
- <code class="directive"><a href="#ldaptrustedclientcert">LDAPTrustedClientCert</a></code>
- and <code class="directive"><a href="#ldaptrustedmode">LDAPTrustedMode</a></code>.
- These directives specify the CA and optional client certificates to be used,
- as well as the type of encryption to be used on the connection (none, SSL or
- TLS/STARTTLS).</p>
-
- <pre class="prettyprint lang-config"># Establish an SSL LDAP connection on port 636. Requires that
-# mod_ldap and mod_authnz_ldap be loaded. Change the
-# "yourdomain.example.com" to match your domain.
-
-LDAPTrustedGlobalCert CA_DER "/certs/certfile.der"
-
-&lt;Location "/ldap-status"&gt;
- SetHandler ldap-status
-
- Require host yourdomain.example.com
-
- Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL "ldaps://127.0.0.1/dc=example,dc=com?uid?one"
- Require valid-user
-&lt;/Location&gt;</pre>
-
-
- <pre class="prettyprint lang-config"># Establish a TLS LDAP connection on port 389. Requires that
-# mod_ldap and mod_authnz_ldap be loaded. Change the
-# "yourdomain.example.com" to match your domain.
-
-LDAPTrustedGlobalCert CA_DER "/certs/certfile.der:
-
-&lt;Location "/ldap-status"&gt;
- SetHandler ldap-status
-
- Require host yourdomain.example.com
-
- Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL "ldap://127.0.0.1/dc=example,dc=com?uid?one" TLS
- Require valid-user
-&lt;/Location&gt;</pre>
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="settingcerts" id="settingcerts">SSL/TLS Certificates</a></h2>
-
- <p>The different LDAP SDKs have widely different methods of setting
- and handling both CA and client side certificates.</p>
-
- <p>If you intend to use SSL or TLS, read this section CAREFULLY so as to
- understand the differences between configurations on the different LDAP
- toolkits supported.</p>
-
- <h3><a name="settingcerts-netscape" id="settingcerts-netscape">Netscape/Mozilla/iPlanet SDK</a></h3>
- <p>CA certificates are specified within a file called cert7.db.
- The SDK will not talk to any LDAP server whose certificate was
- not signed by a CA specified in this file. If
- client certificates are required, an optional key3.db file may
- be specified with an optional password. The secmod file can be
- specified if required. These files are in the same format as
- used by the Netscape Communicator or Mozilla web browsers. The easiest
- way to obtain these files is to grab them from your browser
- installation.</p>
-
- <p>Client certificates are specified per connection using the
- LDAPTrustedClientCert directive by referring
- to the certificate "nickname". An optional password may be
- specified to unlock the certificate's private key.</p>
-
- <p>The SDK supports SSL only. An attempt to use STARTTLS will cause
- an error when an attempt is made to contact the LDAP server at
- runtime.</p>
-
- <pre class="prettyprint lang-config"># Specify a Netscape CA certificate file
-LDAPTrustedGlobalCert CA_CERT7_DB "/certs/cert7.db"
-# Specify an optional key3.db file for client certificate support
-LDAPTrustedGlobalCert CERT_KEY3_DB "/certs/key3.db"
-# Specify the secmod file if required
-LDAPTrustedGlobalCert CA_SECMOD "/certs/secmod"
-&lt;Location "/ldap-status"&gt;
- SetHandler ldap-status
-
- Require host yourdomain.example.com
-
- Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- LDAPTrustedClientCert CERT_NICKNAME &lt;nickname&gt; [password]
- AuthLDAPURL "ldaps://127.0.0.1/dc=example,dc=com?uid?one"
- Require valid-user
-&lt;/Location&gt;</pre>
-
-
-
-
- <h3><a name="settingcerts-novell" id="settingcerts-novell">Novell SDK</a></h3>
-
- <p>One or more CA certificates must be specified for the Novell
- SDK to work correctly. These certificates can be specified as
- binary DER or Base64 (PEM) encoded files.</p>
-
- <p>Note: Client certificates are specified globally rather than per
- connection, and so must be specified with the LDAPTrustedGlobalCert
- directive as below. Trying to set client certificates via the
- LDAPTrustedClientCert directive will cause an error to be logged
- when an attempt is made to connect to the LDAP server..</p>
-
- <p>The SDK supports both SSL and STARTTLS, set using the
- LDAPTrustedMode parameter. If an ldaps:// URL is specified,
- SSL mode is forced, override this directive.</p>
-
- <pre class="prettyprint lang-config"># Specify two CA certificate files
-LDAPTrustedGlobalCert CA_DER "/certs/cacert1.der"
-LDAPTrustedGlobalCert CA_BASE64 "/certs/cacert2.pem"
-# Specify a client certificate file and key
-LDAPTrustedGlobalCert CERT_BASE64 "/certs/cert1.pem"
-LDAPTrustedGlobalCert KEY_BASE64 "/certs/key1.pem" [password]
-# Do not use this directive, as it will throw an error
-#LDAPTrustedClientCert CERT_BASE64 "/certs/cert1.pem"</pre>
-
-
-
-
- <h3><a name="settingcerts-openldap" id="settingcerts-openldap">OpenLDAP SDK</a></h3>
-
- <p>One or more CA certificates must be specified for the OpenLDAP
- SDK to work correctly. These certificates can be specified as
- binary DER or Base64 (PEM) encoded files.</p>
-
- <p>Both CA and client certificates may be specified globally
- (LDAPTrustedGlobalCert) or per-connection (LDAPTrustedClientCert).
- When any settings are specified per-connection, the global
- settings are superceded.</p>
-
- <p>The documentation for the SDK claims to support both SSL and
- STARTTLS, however STARTTLS does not seem to work on all versions
- of the SDK. The SSL/TLS mode can be set using the
- LDAPTrustedMode parameter. If an ldaps:// URL is specified,
- SSL mode is forced. The OpenLDAP documentation notes that SSL
- (ldaps://) support has been deprecated to be replaced with TLS,
- although the SSL functionality still works.</p>
-
- <pre class="prettyprint lang-config"># Specify two CA certificate files
-LDAPTrustedGlobalCert CA_DER "/certs/cacert1.der"
-LDAPTrustedGlobalCert CA_BASE64 "/certs/cacert2.pem"
-&lt;Location "/ldap-status"&gt;
- SetHandler ldap-status
-
- Require host yourdomain.example.com
-
- LDAPTrustedClientCert CERT_BASE64 "/certs/cert1.pem"
- LDAPTrustedClientCert KEY_BASE64 "/certs/key1.pem"
- # CA certs respecified due to per-directory client certs
- LDAPTrustedClientCert CA_DER "/certs/cacert1.der"
- LDAPTrustedClientCert CA_BASE64 "/certs/cacert2.pem"
- Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL "ldaps://127.0.0.1/dc=example,dc=com?uid?one"
- Require valid-user
-&lt;/Location&gt;</pre>
-
-
-
-
- <h3><a name="settingcerts-solaris" id="settingcerts-solaris">Solaris SDK</a></h3>
-
- <p>SSL/TLS for the native Solaris LDAP libraries is not yet
- supported. If required, install and use the OpenLDAP libraries
- instead.</p>
-
-
-
- <h3><a name="settingcerts-microsoft" id="settingcerts-microsoft">Microsoft SDK</a></h3>
-
- <p>SSL/TLS certificate configuration for the native Microsoft
- LDAP libraries is done inside the system registry, and no
- configuration directives are required.</p>
-
- <p>Both SSL and TLS are supported by using the ldaps:// URL
- format, or by using the LDAPTrustedMode directive accordingly.</p>
-
- <p>Note: The status of support for client certificates is not yet known
- for this toolkit.</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="LDAPCacheEntries" id="LDAPCacheEntries">LDAPCacheEntries</a> <a name="ldapcacheentries" id="ldapcacheentries">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum number of entries in the primary LDAP cache</td></tr>
@@ -838,6 +499,345 @@ Certificate Authority or global client certificates</td></tr>
LDAP server.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="exampleconfig" id="exampleconfig">Example Configuration</a></h2>
+ <p>The following is an example configuration that uses
+ <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> to increase the performance of HTTP Basic
+ authentication provided by <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>.</p>
+
+ <pre class="prettyprint lang-config"># Enable the LDAP connection pool and shared
+# memory cache. Enable the LDAP cache status
+# handler. Requires that mod_ldap and mod_authnz_ldap
+# be loaded. Change the "yourdomain.example.com" to
+# match your domain.
+
+LDAPSharedCacheSize 500000
+LDAPCacheEntries 1024
+LDAPCacheTTL 600
+LDAPOpCacheEntries 1024
+LDAPOpCacheTTL 600
+
+&lt;Location "/ldap-status"&gt;
+ SetHandler ldap-status
+
+ Require host yourdomain.example.com
+
+ Satisfy any
+ AuthType Basic
+ AuthName "LDAP Protected"
+ AuthBasicProvider ldap
+ AuthLDAPURL "ldap://127.0.0.1/dc=example,dc=com?uid?one"
+ Require valid-user
+&lt;/Location&gt;</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="pool" id="pool">LDAP Connection Pool</a></h2>
+
+ <p>LDAP connections are pooled from request to request. This
+ allows the LDAP server to remain connected and bound ready for
+ the next request, without the need to unbind/connect/rebind.
+ The performance advantages are similar to the effect of HTTP
+ keepalives.</p>
+
+ <p>On a busy server it is possible that many requests will try
+ and access the same LDAP server connection simultaneously.
+ Where an LDAP connection is in use, Apache will create a new
+ connection alongside the original one. This ensures that the
+ connection pool does not become a bottleneck.</p>
+
+ <p>There is no need to manually enable connection pooling in
+ the Apache configuration. Any module using this module for
+ access to LDAP services will share the connection pool.</p>
+
+ <p>LDAP connections can keep track of the ldap client
+ credentials used when binding to an LDAP server. These
+ credentials can be provided to LDAP servers that do not
+ allow anonymous binds during referral chasing. To control
+ this feature, see the
+ <code class="directive"><a href="#ldapreferrals">LDAPReferrals</a></code> and
+ <code class="directive"><a href="#ldapreferralhoplimit">LDAPReferralHopLimit</a></code>
+ directives. By default, this feature is enabled.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cache" id="cache">LDAP Cache</a></h2>
+
+ <p>For improved performance, <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> uses an aggressive
+ caching strategy to minimize the number of times that the LDAP
+ server must be contacted. Caching can easily double or triple
+ the throughput of Apache when it is serving pages protected
+ with mod_authnz_ldap. In addition, the load on the LDAP server
+ will be significantly decreased.</p>
+
+ <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> supports two types of LDAP caching during
+ the search/bind phase with a <em>search/bind cache</em> and
+ during the compare phase with two <em>operation
+ caches</em>. Each LDAP URL that is used by the server has
+ its own set of these three caches.</p>
+
+ <h3><a name="search-bind" id="search-bind">The Search/Bind Cache</a></h3>
+ <p>The process of doing a search and then a bind is the
+ most time-consuming aspect of LDAP operation, especially if
+ the directory is large. The search/bind cache is used to
+ cache all searches that resulted in successful binds.
+ Negative results (<em>i.e.</em>, unsuccessful searches, or searches
+ that did not result in a successful bind) are not cached.
+ The rationale behind this decision is that connections with
+ invalid credentials are only a tiny percentage of the total
+ number of connections, so by not caching invalid
+ credentials, the size of the cache is reduced.</p>
+
+ <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> stores the username, the DN
+ retrieved, the password used to bind, and the time of the bind
+ in the cache. Whenever a new connection is initiated with the
+ same username, <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> compares the password
+ of the new connection with the password in the cache. If the
+ passwords match, and if the cached entry is not too old,
+ <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> bypasses the search/bind phase.</p>
+
+ <p>The search and bind cache is controlled with the <code class="directive"><a href="#ldapcacheentries">LDAPCacheEntries</a></code> and <code class="directive"><a href="#ldapcachettl">LDAPCacheTTL</a></code> directives.</p>
+
+
+ <h3><a name="opcaches" id="opcaches">Operation Caches</a></h3>
+ <p>During attribute and distinguished name comparison
+ functions, <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> uses two operation caches
+ to cache the compare operations. The first compare cache is
+ used to cache the results of compares done to test for LDAP
+ group membership. The second compare cache is used to cache
+ the results of comparisons done between distinguished
+ names.</p>
+
+ <p>Note that, when group membership is being checked, any sub-group
+ comparison results are cached to speed future sub-group comparisons.</p>
+
+ <p>The behavior of both of these caches is controlled with
+ the <code class="directive"><a href="#ldapopcacheentries">LDAPOpCacheEntries</a></code>
+ and <code class="directive"><a href="#ldapopcachettl">LDAPOpCacheTTL</a></code>
+ directives.</p>
+
+
+ <h3><a name="monitoring" id="monitoring">Monitoring the Cache</a></h3>
+ <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> has a content handler that allows
+ administrators to monitor the cache performance. The name of
+ the content handler is <code>ldap-status</code>, so the
+ following directives could be used to access the
+ <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> cache information:</p>
+
+ <pre class="prettyprint lang-config">&lt;Location "/server/cache-info"&gt;
+ SetHandler ldap-status
+&lt;/Location&gt;</pre>
+
+
+ <p>By fetching the URL <code>http://servername/cache-info</code>,
+ the administrator can get a status report of every cache that is used
+ by <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> cache. Note that if Apache does not
+ support shared memory, then each <code class="program"><a href="../programs/httpd.html">httpd</a></code> instance has its
+ own cache, so reloading the URL will result in different
+ information each time, depending on which <code class="program"><a href="../programs/httpd.html">httpd</a></code>
+ instance processes the request.</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="usingssltls" id="usingssltls">Using SSL/TLS</a></h2>
+
+ <p>The ability to create an SSL and TLS connections to an LDAP server
+ is defined by the directives
+ <code class="directive"><a href="#ldaptrustedglobalcert">LDAPTrustedGlobalCert</a></code>,
+ <code class="directive"><a href="#ldaptrustedclientcert">LDAPTrustedClientCert</a></code>
+ and <code class="directive"><a href="#ldaptrustedmode">LDAPTrustedMode</a></code>.
+ These directives specify the CA and optional client certificates to be used,
+ as well as the type of encryption to be used on the connection (none, SSL or
+ TLS/STARTTLS).</p>
+
+ <pre class="prettyprint lang-config"># Establish an SSL LDAP connection on port 636. Requires that
+# mod_ldap and mod_authnz_ldap be loaded. Change the
+# "yourdomain.example.com" to match your domain.
+
+LDAPTrustedGlobalCert CA_DER "/certs/certfile.der"
+
+&lt;Location "/ldap-status"&gt;
+ SetHandler ldap-status
+
+ Require host yourdomain.example.com
+
+ Satisfy any
+ AuthType Basic
+ AuthName "LDAP Protected"
+ AuthBasicProvider ldap
+ AuthLDAPURL "ldaps://127.0.0.1/dc=example,dc=com?uid?one"
+ Require valid-user
+&lt;/Location&gt;</pre>
+
+
+ <pre class="prettyprint lang-config"># Establish a TLS LDAP connection on port 389. Requires that
+# mod_ldap and mod_authnz_ldap be loaded. Change the
+# "yourdomain.example.com" to match your domain.
+
+LDAPTrustedGlobalCert CA_DER "/certs/certfile.der:
+
+&lt;Location "/ldap-status"&gt;
+ SetHandler ldap-status
+
+ Require host yourdomain.example.com
+
+ Satisfy any
+ AuthType Basic
+ AuthName "LDAP Protected"
+ AuthBasicProvider ldap
+ AuthLDAPURL "ldap://127.0.0.1/dc=example,dc=com?uid?one" TLS
+ Require valid-user
+&lt;/Location&gt;</pre>
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="settingcerts" id="settingcerts">SSL/TLS Certificates</a></h2>
+
+ <p>The different LDAP SDKs have widely different methods of setting
+ and handling both CA and client side certificates.</p>
+
+ <p>If you intend to use SSL or TLS, read this section CAREFULLY so as to
+ understand the differences between configurations on the different LDAP
+ toolkits supported.</p>
+
+ <h3><a name="settingcerts-netscape" id="settingcerts-netscape">Netscape/Mozilla/iPlanet SDK</a></h3>
+ <p>CA certificates are specified within a file called cert7.db.
+ The SDK will not talk to any LDAP server whose certificate was
+ not signed by a CA specified in this file. If
+ client certificates are required, an optional key3.db file may
+ be specified with an optional password. The secmod file can be
+ specified if required. These files are in the same format as
+ used by the Netscape Communicator or Mozilla web browsers. The easiest
+ way to obtain these files is to grab them from your browser
+ installation.</p>
+
+ <p>Client certificates are specified per connection using the
+ LDAPTrustedClientCert directive by referring
+ to the certificate "nickname". An optional password may be
+ specified to unlock the certificate's private key.</p>
+
+ <p>The SDK supports SSL only. An attempt to use STARTTLS will cause
+ an error when an attempt is made to contact the LDAP server at
+ runtime.</p>
+
+ <pre class="prettyprint lang-config"># Specify a Netscape CA certificate file
+LDAPTrustedGlobalCert CA_CERT7_DB "/certs/cert7.db"
+# Specify an optional key3.db file for client certificate support
+LDAPTrustedGlobalCert CERT_KEY3_DB "/certs/key3.db"
+# Specify the secmod file if required
+LDAPTrustedGlobalCert CA_SECMOD "/certs/secmod"
+&lt;Location "/ldap-status"&gt;
+ SetHandler ldap-status
+
+ Require host yourdomain.example.com
+
+ Satisfy any
+ AuthType Basic
+ AuthName "LDAP Protected"
+ AuthBasicProvider ldap
+ LDAPTrustedClientCert CERT_NICKNAME &lt;nickname&gt; [password]
+ AuthLDAPURL "ldaps://127.0.0.1/dc=example,dc=com?uid?one"
+ Require valid-user
+&lt;/Location&gt;</pre>
+
+
+
+
+ <h3><a name="settingcerts-novell" id="settingcerts-novell">Novell SDK</a></h3>
+
+ <p>One or more CA certificates must be specified for the Novell
+ SDK to work correctly. These certificates can be specified as
+ binary DER or Base64 (PEM) encoded files.</p>
+
+ <p>Note: Client certificates are specified globally rather than per
+ connection, and so must be specified with the LDAPTrustedGlobalCert
+ directive as below. Trying to set client certificates via the
+ LDAPTrustedClientCert directive will cause an error to be logged
+ when an attempt is made to connect to the LDAP server..</p>
+
+ <p>The SDK supports both SSL and STARTTLS, set using the
+ LDAPTrustedMode parameter. If an ldaps:// URL is specified,
+ SSL mode is forced, override this directive.</p>
+
+ <pre class="prettyprint lang-config"># Specify two CA certificate files
+LDAPTrustedGlobalCert CA_DER "/certs/cacert1.der"
+LDAPTrustedGlobalCert CA_BASE64 "/certs/cacert2.pem"
+# Specify a client certificate file and key
+LDAPTrustedGlobalCert CERT_BASE64 "/certs/cert1.pem"
+LDAPTrustedGlobalCert KEY_BASE64 "/certs/key1.pem" [password]
+# Do not use this directive, as it will throw an error
+#LDAPTrustedClientCert CERT_BASE64 "/certs/cert1.pem"</pre>
+
+
+
+
+ <h3><a name="settingcerts-openldap" id="settingcerts-openldap">OpenLDAP SDK</a></h3>
+
+ <p>One or more CA certificates must be specified for the OpenLDAP
+ SDK to work correctly. These certificates can be specified as
+ binary DER or Base64 (PEM) encoded files.</p>
+
+ <p>Both CA and client certificates may be specified globally
+ (LDAPTrustedGlobalCert) or per-connection (LDAPTrustedClientCert).
+ When any settings are specified per-connection, the global
+ settings are superceded.</p>
+
+ <p>The documentation for the SDK claims to support both SSL and
+ STARTTLS, however STARTTLS does not seem to work on all versions
+ of the SDK. The SSL/TLS mode can be set using the
+ LDAPTrustedMode parameter. If an ldaps:// URL is specified,
+ SSL mode is forced. The OpenLDAP documentation notes that SSL
+ (ldaps://) support has been deprecated to be replaced with TLS,
+ although the SSL functionality still works.</p>
+
+ <pre class="prettyprint lang-config"># Specify two CA certificate files
+LDAPTrustedGlobalCert CA_DER "/certs/cacert1.der"
+LDAPTrustedGlobalCert CA_BASE64 "/certs/cacert2.pem"
+&lt;Location "/ldap-status"&gt;
+ SetHandler ldap-status
+
+ Require host yourdomain.example.com
+
+ LDAPTrustedClientCert CERT_BASE64 "/certs/cert1.pem"
+ LDAPTrustedClientCert KEY_BASE64 "/certs/key1.pem"
+ # CA certs respecified due to per-directory client certs
+ LDAPTrustedClientCert CA_DER "/certs/cacert1.der"
+ LDAPTrustedClientCert CA_BASE64 "/certs/cacert2.pem"
+ Satisfy any
+ AuthType Basic
+ AuthName "LDAP Protected"
+ AuthBasicProvider ldap
+ AuthLDAPURL "ldaps://127.0.0.1/dc=example,dc=com?uid?one"
+ Require valid-user
+&lt;/Location&gt;</pre>
+
+
+
+
+ <h3><a name="settingcerts-solaris" id="settingcerts-solaris">Solaris SDK</a></h3>
+
+ <p>SSL/TLS for the native Solaris LDAP libraries is not yet
+ supported. If required, install and use the OpenLDAP libraries
+ instead.</p>
+
+
+
+ <h3><a name="settingcerts-microsoft" id="settingcerts-microsoft">Microsoft SDK</a></h3>
+
+ <p>SSL/TLS certificate configuration for the native Microsoft
+ LDAP libraries is done inside the system registry, and no
+ configuration directives are required.</p>
+
+ <p>Both SSL and TLS are supported by using the ldaps:// URL
+ format, or by using the LDAPTrustedMode directive accordingly.</p>
+
+ <p>Note: The status of support for client certificates is not yet known
+ for this toolkit.</p>
+
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_ldap.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ldap.html.fr b/docs/manual/mod/mod_ldap.html.fr
index 36d930f1f9..3406c35210 100644
--- a/docs/manual/mod/mod_ldap.html.fr
+++ b/docs/manual/mod/mod_ldap.html.fr
@@ -86,370 +86,6 @@ cache du r�sultat � destination des autres modules LDAP</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#settingcerts">Certificats SSL/TLS</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="exampleconfig" id="exampleconfig">Exemple de configuration</a></h2>
- <p>Ce qui suit est un exemple de configuration qui utilise
- <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> pour am�liorer les performances de
- l'authentification HTTP de base fournie par
- <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>.</p>
-
- <pre class="prettyprint lang-config"># Active la conservation des connexions LDAP et le cache partag� en
-# m�moire. Active le gestionnaire de statut du cache LDAP.
-# N�cessite le chargement de mod_ldap et de mod_authnz_ldap.
-# Remplacez "votre-domaine.example.com" par le nom de votre
-# domaine.
-
-LDAPSharedCacheSize 500000
-LDAPCacheEntries 1024
-LDAPCacheTTL 600
-LDAPOpCacheEntries 1024
-LDAPOpCacheTTL 600
-
-&lt;Location /ldap-status&gt;
- SetHandler ldap-status
-
- Require host yourdomain.example.com
-
- Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one
- Require valid-user
-&lt;/Location&gt;</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="pool" id="pool">Conservation des connexions LDAP</a></h2>
-
- <p>Les connexions LDAP sont conserv�es de requ�te en requ�te. Ceci
- permet de rester connect� et identifi� au serveur LDAP, ce dernier
- �tant ainsi pr�t pour la prochaine requ�te, sans avoir � se
- d�connecter, reconnecter et r�identifier. Le gain en performances
- est similaire � celui des connexions persistantes (keepalives)
- HTTP.</p>
-
- <p>Sur un serveur tr�s sollicit�, il est possible que de nombreuses
- requ�tes tentent d'acc�der simultan�ment � la m�me connexion au
- serveur LDAP. Lorsqu'une connexion LDAP est utilis�e, Apache en cr�e
- une deuxi�me en parall�le � la premi�re, ce qui permet d'�viter que
- le syst�me de conservation des connexions ne devienne un goulot
- d'�tranglement.</p>
-
- <p>Il n'est pas n�cessaire d'activer explicitement la conservation
- des connexions dans la configuration d'Apache. Tout module utilisant
- le module ldap pour acc�der aux services LDAP partagera le jeu de
- connexions.</p>
-
- <p>Les connexions LDAP peuvent garder la trace des donn�es
- d'identification du client ldap utilis�es pour l'identification
- aupr�s du serveur LDAP. Ces donn�es peuvent �tre fournies aux
- serveurs LDAP qui ne permettent pas les connexions anonymes au cours
- lors des tentatives de sauts vers des serveurs alternatifs. Pour
- contr�ler cette fonctionnalit�, voir les directives <code class="directive"><a href="#ldapreferrals">LDAPReferrals</a></code> et <code class="directive"><a href="#ldapreferralhoplimit">LDAPReferralHopLimit</a></code>. Cette
- fonctionnalit� est activ�e par d�faut.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="cache" id="cache">Cache LDAP</a></h2>
-
- <p>Pour am�liorer les performances, <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> met en
- oeuvre une strat�gie de mise en cache agressive visant � minimiser
- le nombre de fois que le serveur LDAP doit �tre contact�. La mise en
- cache peut facilement doubler et m�me tripler le d�bit d'Apache
- lorsqu'il sert des pages prot�g�es par mod_authnz_ldap. De plus, le
- serveur LDAP verra lui-m�me sa charge sensiblement diminu�e.</p>
-
- <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> supporte deux types de mise en cache
- LDAP : un <em>cache recherche/identification</em> durant la phase
- de recherche/identification et deux <em>caches d'op�rations</em>
- durant la phase de comparaison. Chaque URL LDAP utilis�e par le
- serveur a son propre jeu d'instances dans ces trois caches.</p>
-
- <h3><a name="search-bind" id="search-bind">Le cache
- recherche/identification</a></h3>
- <p>Les processus de recherche et d'identification sont les
- op�rations LDAP les plus consommatrices en temps, en particulier
- si l'annuaire est de grande taille. Le cache de
- recherche/identification met en cache toutes les recherches qui
- ont abouti � une identification positive. Les r�sultats n�gatifs
- (c'est � dire les recherches sans succ�s, ou les recherches qui
- n'ont pas abouti � une identification positive) ne sont pas mis en
- cache. La raison de cette d�cision r�side dans le fait que les
- connexions avec des donn�es d'identification invalides ne
- repr�sentent qu'un faible pourcentage du nombre total de
- connexions, et ainsi, le fait de ne pas mettre en cache les
- donn�es d'identification invalides r�duira d'autant la taille du
- cache.</p>
-
- <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> met en cache le nom d'utilisateur, le
- DN extrait, le mot de passe utilis� pour l'identification, ainsi
- que l'heure de l'identification. Chaque fois qu'une nouvelle
- connexion est initialis�e avec le m�me nom d'utilisateur,
- <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> compare le mot de passe de la nouvelle
- connexion avec le mot de passe enregistr� dans le cache. Si les
- mots de passe correspondent, et si l'entr�e du cache n'est pas
- trop ancienne, <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> court-circuite la phase
- de recherche/identification.</p>
-
- <p>Le cache de recherche/identification est contr�l� par les
- directives <code class="directive"><a href="#ldapcacheentries">LDAPCacheEntries</a></code> et <code class="directive"><a href="#ldapcachettl">LDAPCacheTTL</a></code>.</p>
-
-
- <h3><a name="opcaches" id="opcaches">Les caches d'op�rations</a></h3>
- <p>Au cours des op�rations de comparaison d'attributs et de noms
- distinctifs (DN), <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> utilise deux caches
- d'op�rations pour mettre en cache les op�rations de comparaison.
- Le premier cache de comparaison sert � mettre en cache les
- r�sultats de comparaisons effectu�es pour v�rifier l'appartenance
- � un groupe LDAP. Le second cache de comparaison sert � mettre en
- cache les r�sultats de comparaisons entre DNs.</p>
-
- <p>Notez que, lorsque l'appartenance � un groupe est v�rifi�e,
- toute comparaison de sous-groupes est mise en cache afin
- d'acc�l�rer les comparaisons de sous-groupes ult�rieures.</p>
-
- <p>Le comportement de ces deux caches est contr�l� par les
- directives <code class="directive"><a href="#ldapopcacheentries">LDAPOpCacheEntries</a></code> et <code class="directive"><a href="#ldapopcachettl">LDAPOpCacheTTL</a></code>.</p>
-
-
- <h3><a name="monitoring" id="monitoring">Superviser le cache</a></h3>
- <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> poss�de un gestionnaire de contenu
- qui permet aux administrateurs de superviser les performances du
- cache. Le nom du gestionnaire de contenu est
- <code>ldap-status</code>, et on peut utiliser les directives
- suivantes pour acc�der aux informations du cache de
- <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> :</p>
-
- <pre class="prettyprint lang-config">&lt;Location /server/cache-info&gt;
- SetHandler ldap-status
-&lt;/Location&gt;</pre>
-
-
- <p>En se connectant � l'URL
- <code>http://nom-serveur/infos-cache</code>, l'administrateur peut
- obtenir un rapport sur le statut de chaque cache qu'utilise
- <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code>. Notez que si Apache ne supporte pas la
- m�moire partag�e, chaque instance de <code class="program"><a href="../programs/httpd.html">httpd</a></code>
- poss�dera son propre cache, et chaque fois que l'URL sera
- recharg�e, un r�sultat diff�rent pourra �tre affich�, en fonction
- de l'instance de <code class="program"><a href="../programs/httpd.html">httpd</a></code> qui traitera la
- requ�te.</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="usingssltls" id="usingssltls">Utiliser SSL/TLS</a></h2>
-
- <p>La possibilit� de cr�er des connexions SSL et TLS avec un serveur
- LDAP est d�finie par les directives <code class="directive"><a href="#ldaptrustedglobalcert">
- LDAPTrustedGlobalCert</a></code>, <code class="directive"><a href="#ldaptrustedclientcert">
- LDAPTrustedClientCert</a></code> et <code class="directive"><a href="#ldaptrustedmode">
- LDAPTrustedMode</a></code>. Ces directives permettent de sp�cifier
- l'autorit� de certification (CA), les certificats clients �ventuels,
- ainsi que le type de chiffrement � utiliser pour la connexion (none,
- SSL ou TLS/STARTTLS).</p>
-
- <pre class="prettyprint lang-config"># Etablissement d'une connexion SSL LDAP sur le port 636.
-# N�cessite le chargement de mod_ldap et mod_authnz_ldap.
-# Remplacez "votre-domaine.example.com" par le nom de votre
-# domaine.
-
-LDAPTrustedGlobalCert CA_DER /certs/certfile.der
-
-&lt;Location /ldap-status&gt;
- SetHandler ldap-status
-
- Require host yourdomain.example.com
-
- Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
- Require valid-user
-&lt;/Location&gt;</pre>
-
-
- <pre class="prettyprint lang-config"># Etablissement d'une connexion TLS LDAP sur le port 389.
-# N�cessite le chargement de mod_ldap et mod_authnz_ldap.
-# Remplacez "votre-domaine.example.com" par le nom de votre
-# domaine.
-
-LDAPTrustedGlobalCert CA_DER /certs/certfile.der
-
-&lt;Location /ldap-status&gt;
- SetHandler ldap-status
-
- Require host yourdomain.example.com
-
- Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one TLS
- Require valid-user
-&lt;/Location&gt;</pre>
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="settingcerts" id="settingcerts">Certificats SSL/TLS</a></h2>
-
- <p>Les diff�rents SDKs LDAP disposent de nombreuses m�thodes pour
- d�finir et g�rer les certificats des clients et des autorit�s de
- certification (CA).</p>
-
- <p>Si vous avez l'intention d'utiliser SSL ou TLS, lisez cette
- section ATTENTIVEMENT de fa�on � bien comprendre les diff�rences de
- configurations entre les diff�rents SDKs LDAP support�s.</p>
-
- <h3><a name="settingcerts-netscape" id="settingcerts-netscape">SDK Netscape/Mozilla/iPlanet</a></h3>
- <p>Les certificat de CA sont enregistr�s dans un fichier nomm�
- cert7.db. Le SDK ne dialoguera avec aucun serveur LDAP dont le
- certificat n'a pas �t� sign� par une CA sp�cifi�e dans ce
- fichier. Si des certificats clients sont requis, un fichier
- key3.db ainsi qu'un mot de passe optionnels peuvent �tre
- sp�cifi�s. On peut aussi sp�cifier le fichier secmod si
- n�cessaire. Ces fichiers sont du m�me format que celui utilis�
- par les navigateurs web Netscape Communicator ou Mozilla. Le
- moyen le plus simple pour obtenir ces fichiers consiste � les
- extraire de l'installation de votre navigateur.</p>
-
- <p>Les certificats clients sont sp�cifi�s pour chaque connexion
- en utilisant la directive LDAPTrustedClientCert et en se
- r�f�rant au certificat "nickname". On peut �ventuellement
- sp�cifier un mot de passe pour d�verrouiller la cl� priv�e du
- certificat.</p>
-
- <p>Le SDK supporte seulement SSL. Toute tentative d'utilisation
- de STARTTLS engendrera une erreur lors des tentatives de
- contacter le serveur LDAP pendant l'ex�cution.</p>
-
- <pre class="prettyprint lang-config"># Sp�cifie un fichier de certificats de CA Netscape
-LDAPTrustedGlobalCert CA_CERT7_DB /certs/cert7.db
-# Sp�cifie un fichier key3db optionnel pour le support des
-# certificats clients
-LDAPTrustedGlobalCert CERT_KEY3_DB /certs/key3.db
-# Sp�cifie le fichier secmod si n�cessaire
-LDAPTrustedGlobalCert CA_SECMOD /certs/secmod
-&lt;Location /ldap-status&gt;
- SetHandler ldap-status
-
- Require host yourdomain.example.com
-
- Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- LDAPTrustedClientCert CERT_NICKNAME &lt;nickname&gt; [password]
- AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
- Require valid-user
-&lt;/Location&gt;</pre>
-
-
-
-
- <h3><a name="settingcerts-novell" id="settingcerts-novell">SDK Novell</a></h3>
-
- <p>Un ou plusieurs certificats de CA doivent �tre sp�cifi�s pour
- que le SDK Novell fonctionne correctement. Ces certificats
- peuvent �tre sp�cifi�s sous forme de fichiers au format binaire
- DER ou cod�s en Base64 (PEM).</p>
-
- <p>Note: Les certificats clients sont sp�cifi�s globalement
- plut�t qu'� chaque connexion, et doivent �tre sp�cifi�s � l'aide
- de la directive LDAPTrustedGlobalCert comme ci-dessous. D�finir
- des certificats clients via la directive LDAPTrustedClientCert
- engendrera une erreur qui sera journalis�e, au moment de la
- tentative de connexion avec le serveur LDAP.</p>
-
- <p>Le SDK supporte SSL et STARTTLS, le choix �tant d�fini par le
- param�tre de la directive LDAPTrustedMode. Si une URL de type
- ldaps:// est sp�cifi�e, le mode SSL est forc�, et l'emporte sur
- cette directive.</p>
-
- <pre class="prettyprint lang-config"># Sp�cifie deux fichiers contenant des certificats de CA
-LDAPTrustedGlobalCert CA_DER /certs/cacert1.der
-LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem
-# Sp�cifie un fichier contenant des certificats clients
-# ainsi qu'une cl�
-LDAPTrustedGlobalCert CERT_BASE64 /certs/cert1.pem
-LDAPTrustedGlobalCert KEY_BASE64 /certs/key1.pem [password]
-# N'utilisez pas cette directive, sous peine de provoquer
-# une erreur
-#LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem</pre>
-
-
-
-
- <h3><a name="settingcerts-openldap" id="settingcerts-openldap">SDK OpenLDAP</a></h3>
-
- <p>Un ou plusieurs certificats de CA doivent �tre sp�cifi�s pour
- que le SDK OpenLDAP fonctionne correctement. Ces certificats
- peuvent �tre sp�cifi�s sous forme de fichiers au format binaire
- DER ou cod�s en Base64 (PEM).</p>
-
- <p>Les certificats clients sont sp�cifi�s pour chaque connexion
- � l'aide de la directive LDAPTrustedClientCert.</p>
-
- <p>La documentation du SDK pr�tend que SSL et STARTTLS sont
- support�s ; cependant, STARTTLS semble ne pas fonctionner avec
- toutes les versions du SDK. Le mode SSL/TLS peut �tre d�fini en
- utilisant le param�tre de la directive LDAPTrustedMode. Si une
- URL de type
- ldaps:// est sp�cifi�e, le mode SSL est forc�. La documentation
- OpenLDAP indique que le support SSL (ldaps://) tend � �tre
- remplac� par TLS, bien que le mode SSL fonctionne toujours.</p>
-
- <pre class="prettyprint lang-config"># Sp�cifie deux fichiers contenant des certificats de CA
-LDAPTrustedGlobalCert CA_DER /certs/cacert1.der
-LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem
-&lt;Location /ldap-status&gt;
- SetHandler ldap-status
-
- Require host yourdomain.example.com
-
- LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem
- LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem
- # CA certs respecified due to per-directory client certs
- LDAPTrustedClientCert CA_DER /certs/cacert1.der
- LDAPTrustedClientCert CA_BASE64 /certs/cacert2.pem
- Satisfy any
- AuthType Basic
- AuthName "LDAP Protected"
- AuthBasicProvider ldap
- AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
- Require valid-user
-&lt;/Location&gt;</pre>
-
-
-
-
- <h3><a name="settingcerts-solaris" id="settingcerts-solaris">SDK Solaris</a></h3>
-
- <p>SSL/TLS pour les biblioth�ques LDAP propres � Solaris n'est
- pas encore support�. Si n�cessaire, installez et utilisez plut�t
- les biblioth�ques OpenLDAP.</p>
-
-
-
- <h3><a name="settingcerts-microsoft" id="settingcerts-microsoft">SDK Microsoft</a></h3>
-
- <p>La configuration des certificats SSL/TLS pour les
- biblioth�ques LDAP propres � Microsoft s'effectue � l'int�rieur
- du registre syst�me, et aucune directive de configuration n'est
- requise.</p>
-
- <p>SSL et TLS sont tous deux support�s en utilisant des URLs de
- type ldaps://, ou en d�finissant la directive LDAPTrustedMode �
- cet effet.</p>
-
- <p>Note: L'�tat du support des certificats clients n'est pas
- encore connu pour ce SDK.</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="ldapcacheentries" id="ldapcacheentries">Directive</a> <a name="LDAPCacheEntries" id="LDAPCacheEntries">LDAPCacheEntries</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Nombre maximum d'entr�es dans le cache LDAP
@@ -930,6 +566,370 @@ serveur</td></tr>
d'une connexion SSL avec un serveur LDAP.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="exampleconfig" id="exampleconfig">Exemple de configuration</a></h2>
+ <p>Ce qui suit est un exemple de configuration qui utilise
+ <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> pour am�liorer les performances de
+ l'authentification HTTP de base fournie par
+ <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>.</p>
+
+ <pre class="prettyprint lang-config"># Active la conservation des connexions LDAP et le cache partag� en
+# m�moire. Active le gestionnaire de statut du cache LDAP.
+# N�cessite le chargement de mod_ldap et de mod_authnz_ldap.
+# Remplacez "votre-domaine.example.com" par le nom de votre
+# domaine.
+
+LDAPSharedCacheSize 500000
+LDAPCacheEntries 1024
+LDAPCacheTTL 600
+LDAPOpCacheEntries 1024
+LDAPOpCacheTTL 600
+
+&lt;Location /ldap-status&gt;
+ SetHandler ldap-status
+
+ Require host yourdomain.example.com
+
+ Satisfy any
+ AuthType Basic
+ AuthName "LDAP Protected"
+ AuthBasicProvider ldap
+ AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one
+ Require valid-user
+&lt;/Location&gt;</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="pool" id="pool">Conservation des connexions LDAP</a></h2>
+
+ <p>Les connexions LDAP sont conserv�es de requ�te en requ�te. Ceci
+ permet de rester connect� et identifi� au serveur LDAP, ce dernier
+ �tant ainsi pr�t pour la prochaine requ�te, sans avoir � se
+ d�connecter, reconnecter et r�identifier. Le gain en performances
+ est similaire � celui des connexions persistantes (keepalives)
+ HTTP.</p>
+
+ <p>Sur un serveur tr�s sollicit�, il est possible que de nombreuses
+ requ�tes tentent d'acc�der simultan�ment � la m�me connexion au
+ serveur LDAP. Lorsqu'une connexion LDAP est utilis�e, Apache en cr�e
+ une deuxi�me en parall�le � la premi�re, ce qui permet d'�viter que
+ le syst�me de conservation des connexions ne devienne un goulot
+ d'�tranglement.</p>
+
+ <p>Il n'est pas n�cessaire d'activer explicitement la conservation
+ des connexions dans la configuration d'Apache. Tout module utilisant
+ le module ldap pour acc�der aux services LDAP partagera le jeu de
+ connexions.</p>
+
+ <p>Les connexions LDAP peuvent garder la trace des donn�es
+ d'identification du client ldap utilis�es pour l'identification
+ aupr�s du serveur LDAP. Ces donn�es peuvent �tre fournies aux
+ serveurs LDAP qui ne permettent pas les connexions anonymes au cours
+ lors des tentatives de sauts vers des serveurs alternatifs. Pour
+ contr�ler cette fonctionnalit�, voir les directives <code class="directive"><a href="#ldapreferrals">LDAPReferrals</a></code> et <code class="directive"><a href="#ldapreferralhoplimit">LDAPReferralHopLimit</a></code>. Cette
+ fonctionnalit� est activ�e par d�faut.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cache" id="cache">Cache LDAP</a></h2>
+
+ <p>Pour am�liorer les performances, <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> met en
+ oeuvre une strat�gie de mise en cache agressive visant � minimiser
+ le nombre de fois que le serveur LDAP doit �tre contact�. La mise en
+ cache peut facilement doubler et m�me tripler le d�bit d'Apache
+ lorsqu'il sert des pages prot�g�es par mod_authnz_ldap. De plus, le
+ serveur LDAP verra lui-m�me sa charge sensiblement diminu�e.</p>
+
+ <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> supporte deux types de mise en cache
+ LDAP : un <em>cache recherche/identification</em> durant la phase
+ de recherche/identification et deux <em>caches d'op�rations</em>
+ durant la phase de comparaison. Chaque URL LDAP utilis�e par le
+ serveur a son propre jeu d'instances dans ces trois caches.</p>
+
+ <h3><a name="search-bind" id="search-bind">Le cache
+ recherche/identification</a></h3>
+ <p>Les processus de recherche et d'identification sont les
+ op�rations LDAP les plus consommatrices en temps, en particulier
+ si l'annuaire est de grande taille. Le cache de
+ recherche/identification met en cache toutes les recherches qui
+ ont abouti � une identification positive. Les r�sultats n�gatifs
+ (c'est � dire les recherches sans succ�s, ou les recherches qui
+ n'ont pas abouti � une identification positive) ne sont pas mis en
+ cache. La raison de cette d�cision r�side dans le fait que les
+ connexions avec des donn�es d'identification invalides ne
+ repr�sentent qu'un faible pourcentage du nombre total de
+ connexions, et ainsi, le fait de ne pas mettre en cache les
+ donn�es d'identification invalides r�duira d'autant la taille du
+ cache.</p>
+
+ <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> met en cache le nom d'utilisateur, le
+ DN extrait, le mot de passe utilis� pour l'identification, ainsi
+ que l'heure de l'identification. Chaque fois qu'une nouvelle
+ connexion est initialis�e avec le m�me nom d'utilisateur,
+ <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> compare le mot de passe de la nouvelle
+ connexion avec le mot de passe enregistr� dans le cache. Si les
+ mots de passe correspondent, et si l'entr�e du cache n'est pas
+ trop ancienne, <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> court-circuite la phase
+ de recherche/identification.</p>
+
+ <p>Le cache de recherche/identification est contr�l� par les
+ directives <code class="directive"><a href="#ldapcacheentries">LDAPCacheEntries</a></code> et <code class="directive"><a href="#ldapcachettl">LDAPCacheTTL</a></code>.</p>
+
+
+ <h3><a name="opcaches" id="opcaches">Les caches d'op�rations</a></h3>
+ <p>Au cours des op�rations de comparaison d'attributs et de noms
+ distinctifs (DN), <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> utilise deux caches
+ d'op�rations pour mettre en cache les op�rations de comparaison.
+ Le premier cache de comparaison sert � mettre en cache les
+ r�sultats de comparaisons effectu�es pour v�rifier l'appartenance
+ � un groupe LDAP. Le second cache de comparaison sert � mettre en
+ cache les r�sultats de comparaisons entre DNs.</p>
+
+ <p>Notez que, lorsque l'appartenance � un groupe est v�rifi�e,
+ toute comparaison de sous-groupes est mise en cache afin
+ d'acc�l�rer les comparaisons de sous-groupes ult�rieures.</p>
+
+ <p>Le comportement de ces deux caches est contr�l� par les
+ directives <code class="directive"><a href="#ldapopcacheentries">LDAPOpCacheEntries</a></code> et <code class="directive"><a href="#ldapopcachettl">LDAPOpCacheTTL</a></code>.</p>
+
+
+ <h3><a name="monitoring" id="monitoring">Superviser le cache</a></h3>
+ <p><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> poss�de un gestionnaire de contenu
+ qui permet aux administrateurs de superviser les performances du
+ cache. Le nom du gestionnaire de contenu est
+ <code>ldap-status</code>, et on peut utiliser les directives
+ suivantes pour acc�der aux informations du cache de
+ <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> :</p>
+
+ <pre class="prettyprint lang-config">&lt;Location /server/cache-info&gt;
+ SetHandler ldap-status
+&lt;/Location&gt;</pre>
+
+
+ <p>En se connectant � l'URL
+ <code>http://nom-serveur/infos-cache</code>, l'administrateur peut
+ obtenir un rapport sur le statut de chaque cache qu'utilise
+ <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code>. Notez que si Apache ne supporte pas la
+ m�moire partag�e, chaque instance de <code class="program"><a href="../programs/httpd.html">httpd</a></code>
+ poss�dera son propre cache, et chaque fois que l'URL sera
+ recharg�e, un r�sultat diff�rent pourra �tre affich�, en fonction
+ de l'instance de <code class="program"><a href="../programs/httpd.html">httpd</a></code> qui traitera la
+ requ�te.</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="usingssltls" id="usingssltls">Utiliser SSL/TLS</a></h2>
+
+ <p>La possibilit� de cr�er des connexions SSL et TLS avec un serveur
+ LDAP est d�finie par les directives <code class="directive"><a href="#ldaptrustedglobalcert">
+ LDAPTrustedGlobalCert</a></code>, <code class="directive"><a href="#ldaptrustedclientcert">
+ LDAPTrustedClientCert</a></code> et <code class="directive"><a href="#ldaptrustedmode">
+ LDAPTrustedMode</a></code>. Ces directives permettent de sp�cifier
+ l'autorit� de certification (CA), les certificats clients �ventuels,
+ ainsi que le type de chiffrement � utiliser pour la connexion (none,
+ SSL ou TLS/STARTTLS).</p>
+
+ <pre class="prettyprint lang-config"># Etablissement d'une connexion SSL LDAP sur le port 636.
+# N�cessite le chargement de mod_ldap et mod_authnz_ldap.
+# Remplacez "votre-domaine.example.com" par le nom de votre
+# domaine.
+
+LDAPTrustedGlobalCert CA_DER /certs/certfile.der
+
+&lt;Location /ldap-status&gt;
+ SetHandler ldap-status
+
+ Require host yourdomain.example.com
+
+ Satisfy any
+ AuthType Basic
+ AuthName "LDAP Protected"
+ AuthBasicProvider ldap
+ AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
+ Require valid-user
+&lt;/Location&gt;</pre>
+
+
+ <pre class="prettyprint lang-config"># Etablissement d'une connexion TLS LDAP sur le port 389.
+# N�cessite le chargement de mod_ldap et mod_authnz_ldap.
+# Remplacez "votre-domaine.example.com" par le nom de votre
+# domaine.
+
+LDAPTrustedGlobalCert CA_DER /certs/certfile.der
+
+&lt;Location /ldap-status&gt;
+ SetHandler ldap-status
+
+ Require host yourdomain.example.com
+
+ Satisfy any
+ AuthType Basic
+ AuthName "LDAP Protected"
+ AuthBasicProvider ldap
+ AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one TLS
+ Require valid-user
+&lt;/Location&gt;</pre>
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="settingcerts" id="settingcerts">Certificats SSL/TLS</a></h2>
+
+ <p>Les diff�rents SDKs LDAP disposent de nombreuses m�thodes pour
+ d�finir et g�rer les certificats des clients et des autorit�s de
+ certification (CA).</p>
+
+ <p>Si vous avez l'intention d'utiliser SSL ou TLS, lisez cette
+ section ATTENTIVEMENT de fa�on � bien comprendre les diff�rences de
+ configurations entre les diff�rents SDKs LDAP support�s.</p>
+
+ <h3><a name="settingcerts-netscape" id="settingcerts-netscape">SDK Netscape/Mozilla/iPlanet</a></h3>
+ <p>Les certificat de CA sont enregistr�s dans un fichier nomm�
+ cert7.db. Le SDK ne dialoguera avec aucun serveur LDAP dont le
+ certificat n'a pas �t� sign� par une CA sp�cifi�e dans ce
+ fichier. Si des certificats clients sont requis, un fichier
+ key3.db ainsi qu'un mot de passe optionnels peuvent �tre
+ sp�cifi�s. On peut aussi sp�cifier le fichier secmod si
+ n�cessaire. Ces fichiers sont du m�me format que celui utilis�
+ par les navigateurs web Netscape Communicator ou Mozilla. Le
+ moyen le plus simple pour obtenir ces fichiers consiste � les
+ extraire de l'installation de votre navigateur.</p>
+
+ <p>Les certificats clients sont sp�cifi�s pour chaque connexion
+ en utilisant la directive LDAPTrustedClientCert et en se
+ r�f�rant au certificat "nickname". On peut �ventuellement
+ sp�cifier un mot de passe pour d�verrouiller la cl� priv�e du
+ certificat.</p>
+
+ <p>Le SDK supporte seulement SSL. Toute tentative d'utilisation
+ de STARTTLS engendrera une erreur lors des tentatives de
+ contacter le serveur LDAP pendant l'ex�cution.</p>
+
+ <pre class="prettyprint lang-config"># Sp�cifie un fichier de certificats de CA Netscape
+LDAPTrustedGlobalCert CA_CERT7_DB /certs/cert7.db
+# Sp�cifie un fichier key3db optionnel pour le support des
+# certificats clients
+LDAPTrustedGlobalCert CERT_KEY3_DB /certs/key3.db
+# Sp�cifie le fichier secmod si n�cessaire
+LDAPTrustedGlobalCert CA_SECMOD /certs/secmod
+&lt;Location /ldap-status&gt;
+ SetHandler ldap-status
+
+ Require host yourdomain.example.com
+
+ Satisfy any
+ AuthType Basic
+ AuthName "LDAP Protected"
+ AuthBasicProvider ldap
+ LDAPTrustedClientCert CERT_NICKNAME &lt;nickname&gt; [password]
+ AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
+ Require valid-user
+&lt;/Location&gt;</pre>
+
+
+
+
+ <h3><a name="settingcerts-novell" id="settingcerts-novell">SDK Novell</a></h3>
+
+ <p>Un ou plusieurs certificats de CA doivent �tre sp�cifi�s pour
+ que le SDK Novell fonctionne correctement. Ces certificats
+ peuvent �tre sp�cifi�s sous forme de fichiers au format binaire
+ DER ou cod�s en Base64 (PEM).</p>
+
+ <p>Note: Les certificats clients sont sp�cifi�s globalement
+ plut�t qu'� chaque connexion, et doivent �tre sp�cifi�s � l'aide
+ de la directive LDAPTrustedGlobalCert comme ci-dessous. D�finir
+ des certificats clients via la directive LDAPTrustedClientCert
+ engendrera une erreur qui sera journalis�e, au moment de la
+ tentative de connexion avec le serveur LDAP.</p>
+
+ <p>Le SDK supporte SSL et STARTTLS, le choix �tant d�fini par le
+ param�tre de la directive LDAPTrustedMode. Si une URL de type
+ ldaps:// est sp�cifi�e, le mode SSL est forc�, et l'emporte sur
+ cette directive.</p>
+
+ <pre class="prettyprint lang-config"># Sp�cifie deux fichiers contenant des certificats de CA
+LDAPTrustedGlobalCert CA_DER /certs/cacert1.der
+LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem
+# Sp�cifie un fichier contenant des certificats clients
+# ainsi qu'une cl�
+LDAPTrustedGlobalCert CERT_BASE64 /certs/cert1.pem
+LDAPTrustedGlobalCert KEY_BASE64 /certs/key1.pem [password]
+# N'utilisez pas cette directive, sous peine de provoquer
+# une erreur
+#LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem</pre>
+
+
+
+
+ <h3><a name="settingcerts-openldap" id="settingcerts-openldap">SDK OpenLDAP</a></h3>
+
+ <p>Un ou plusieurs certificats de CA doivent �tre sp�cifi�s pour
+ que le SDK OpenLDAP fonctionne correctement. Ces certificats
+ peuvent �tre sp�cifi�s sous forme de fichiers au format binaire
+ DER ou cod�s en Base64 (PEM).</p>
+
+ <p>Les certificats clients sont sp�cifi�s pour chaque connexion
+ � l'aide de la directive LDAPTrustedClientCert.</p>
+
+ <p>La documentation du SDK pr�tend que SSL et STARTTLS sont
+ support�s ; cependant, STARTTLS semble ne pas fonctionner avec
+ toutes les versions du SDK. Le mode SSL/TLS peut �tre d�fini en
+ utilisant le param�tre de la directive LDAPTrustedMode. Si une
+ URL de type
+ ldaps:// est sp�cifi�e, le mode SSL est forc�. La documentation
+ OpenLDAP indique que le support SSL (ldaps://) tend � �tre
+ remplac� par TLS, bien que le mode SSL fonctionne toujours.</p>
+
+ <pre class="prettyprint lang-config"># Sp�cifie deux fichiers contenant des certificats de CA
+LDAPTrustedGlobalCert CA_DER /certs/cacert1.der
+LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem
+&lt;Location /ldap-status&gt;
+ SetHandler ldap-status
+
+ Require host yourdomain.example.com
+
+ LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem
+ LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem
+ # CA certs respecified due to per-directory client certs
+ LDAPTrustedClientCert CA_DER /certs/cacert1.der
+ LDAPTrustedClientCert CA_BASE64 /certs/cacert2.pem
+ Satisfy any
+ AuthType Basic
+ AuthName "LDAP Protected"
+ AuthBasicProvider ldap
+ AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one
+ Require valid-user
+&lt;/Location&gt;</pre>
+
+
+
+
+ <h3><a name="settingcerts-solaris" id="settingcerts-solaris">SDK Solaris</a></h3>
+
+ <p>SSL/TLS pour les biblioth�ques LDAP propres � Solaris n'est
+ pas encore support�. Si n�cessaire, installez et utilisez plut�t
+ les biblioth�ques OpenLDAP.</p>
+
+
+
+ <h3><a name="settingcerts-microsoft" id="settingcerts-microsoft">SDK Microsoft</a></h3>
+
+ <p>La configuration des certificats SSL/TLS pour les
+ biblioth�ques LDAP propres � Microsoft s'effectue � l'int�rieur
+ du registre syst�me, et aucune directive de configuration n'est
+ requise.</p>
+
+ <p>SSL et TLS sont tous deux support�s en utilisant des URLs de
+ type ldaps://, ou en d�finissant la directive LDAPTrustedMode �
+ cet effet.</p>
+
+ <p>Note: L'�tat du support des certificats clients n'est pas
+ encore connu pour ce SDK.</p>
+
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_ldap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
index 53cd0cd248..f734a562dc 100644
--- a/docs/manual/mod/mod_log_config.html.en
+++ b/docs/manual/mod/mod_log_config.html.en
@@ -66,6 +66,186 @@
<li><a href="../logs.html">Apache Log Files</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="BufferedLogs" id="BufferedLogs">BufferedLogs</a> <a name="bufferedlogs" id="bufferedlogs">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Buffer log entries in memory before writing to disk</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>BufferedLogs On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>BufferedLogs Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<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_log_config</td></tr>
+</table>
+ <p>The <code class="directive">BufferedLogs</code> directive causes
+ <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> to store several log entries in
+ memory and write them together to disk, rather than writing them
+ after each request. On some systems, this may result in more
+ efficient disk access and hence higher performance. It may be
+ set only once for the entire server; it cannot be configured
+ per virtual-host.</p>
+
+ <div class="note">This directive should be used with caution as a crash might
+ cause loss of logging data.</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="CustomLog" id="CustomLog">CustomLog</a> <a name="customlog" id="customlog">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets filename and format of log file</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CustomLog <var>file</var>|<var>pipe</var>
+<var>format</var>|<var>nickname</var>
+[env=[!]<var>environment-variable</var>|
+expr=<var>expression</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<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_log_config</td></tr>
+</table>
+ <p>The <code class="directive">CustomLog</code> directive is used to
+ log requests to the server. A log format is specified, and the
+ logging can optionally be made conditional on request
+ characteristics using environment variables.</p>
+
+ <p>The first argument, which specifies the location to which
+ the logs will be written, can take one of the following two
+ types of values:</p>
+
+ <dl>
+ <dt><var>file</var></dt>
+ <dd>A filename, relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</dd>
+
+ <dt><var>pipe</var></dt>
+ <dd>The pipe character "<code>|</code>", followed by the path
+ to a program to receive the log information on its standard
+ input. See the notes on <a href="../logs.html#piped">piped logs</a>
+ for more information.
+
+ <div class="warning"><h3>Security:</h3>
+ <p>If a program is used, then it will be run as the user who
+ started <code class="program"><a href="../programs/httpd.html">httpd</a></code>. This will be root if the server was
+ started by root; be sure that the program is secure.</p>
+ </div>
+ <div class="warning"><h3>Note</h3>
+ <p>When entering a file path on non-Unix platforms, care should be taken
+ to make sure that only forward slashed are used even though the platform
+ may allow the use of back slashes. In general it is a good idea to always
+ use forward slashes throughout the configuration files.</p>
+ </div></dd>
+ </dl>
+
+ <p>The second argument specifies what will be written to the
+ log file. It can specify either a <var>nickname</var> defined by
+ a previous <code class="directive"><a href="#logformat">LogFormat</a></code>
+ directive, or it can be an explicit <var>format</var> string as
+ described in the <a href="#formats">log formats</a> section.</p>
+
+ <p>For example, the following two sets of directives have
+ exactly the same effect:</p>
+
+ <pre class="prettyprint lang-config"># CustomLog with format nickname
+LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
+CustomLog "logs/access_log" common
+
+# CustomLog with explicit format string
+CustomLog "logs/access_log" "%h %l %u %t \"%r\" %&gt;s %b"</pre>
+
+
+ <p>The third argument is optional and controls whether or
+ not to log a particular request. The condition can be the
+ presence or absence (in the case of a '<code>env=!<var>name</var></code>'
+ clause) of a particular variable in the server
+ <a href="../env.html">environment</a>. Alternatively, the condition
+ can be expressed as arbitrary boolean <a href="../expr.html">expression</a>. If the condition is not satisfied, the request
+ will not be logged. References to HTTP headers in the expression
+ will not cause the header names to be added to the Vary header.</p>
+
+ <p>Environment variables can be set on a per-request
+ basis using the <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>
+ and/or <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> modules. For
+ example, if you want to record requests for all GIF
+ images on your server in a separate logfile but not in your main
+ log, you can use:</p>
+
+ <pre class="prettyprint lang-config">SetEnvIf Request_URI \.gif$ gif-image
+CustomLog "gif-requests.log" common env=gif-image
+CustomLog "nongif-requests.log" common env=!gif-image</pre>
+
+
+ <p>Or, to reproduce the behavior of the old RefererIgnore
+ directive, you might use the following:</p>
+
+ <pre class="prettyprint lang-config">SetEnvIf Referer example\.com localreferer
+CustomLog "referer.log" referer env=!localreferer</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="LogFormat" id="LogFormat">LogFormat</a> <a name="logformat" id="logformat">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Describes a format for use in a log file</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LogFormat <var>format</var>|<var>nickname</var>
+[<var>nickname</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<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_log_config</td></tr>
+</table>
+ <p>This directive specifies the format of the access log
+ file.</p>
+
+ <p>The <code class="directive">LogFormat</code> directive can take one of two
+ forms. In the first form, where only one argument is specified,
+ this directive sets the log format which will be used by logs
+ specified in subsequent <code class="directive">TransferLog</code>
+ directives. The single argument can specify an explicit
+ <var>format</var> as discussed in the <a href="#formats">custom log
+ formats</a> section above. Alternatively, it can use a
+ <var>nickname</var> to refer to a log format defined in a
+ previous <code class="directive">LogFormat</code> directive as described
+ below.</p>
+
+ <p>The second form of the <code class="directive">LogFormat</code>
+ directive associates an explicit <var>format</var> with a
+ <var>nickname</var>. This <var>nickname</var> can then be used in
+ subsequent <code class="directive">LogFormat</code> or
+ <code class="directive"><a href="#customlog">CustomLog</a></code> directives
+ rather than repeating the entire format string. A
+ <code class="directive">LogFormat</code> directive that defines a nickname
+ <strong>does nothing else</strong> -- that is, it <em>only</em>
+ defines the nickname, it doesn't actually apply the format and make
+ it the default. Therefore, it will not affect subsequent
+ <code class="directive"><a href="#transferlog">TransferLog</a></code> directives.
+ In addition, <code class="directive">LogFormat</code> cannot use one nickname
+ to define another nickname. Note that the nickname should not contain
+ percent signs (<code>%</code>).</p>
+
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common</pre>
+</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="TransferLog" id="TransferLog">TransferLog</a> <a name="transferlog" id="transferlog">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify location of a log file</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>TransferLog <var>file</var>|<var>pipe</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<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_log_config</td></tr>
+</table>
+ <p>This directive has exactly the same arguments and effect as
+ the <code class="directive"><a href="#customlog">CustomLog</a></code>
+ directive, with the exception that it does not allow the log format
+ to be specified explicitly or for conditional logging of requests.
+ Instead, the log format is determined by the most recently specified
+ <code class="directive"><a href="#logformat">LogFormat</a></code> directive
+ which does not define a nickname. Common Log Format is used if no
+ other format has been specified.</p>
+
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""
+TransferLog logs/access_log</pre>
+</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="formats" id="formats">Custom Log Formats</a></h2>
@@ -349,186 +529,6 @@
if the directory where logfiles are stored is writable by
anyone other than the user that starts the server.</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="BufferedLogs" id="BufferedLogs">BufferedLogs</a> <a name="bufferedlogs" id="bufferedlogs">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Buffer log entries in memory before writing to disk</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>BufferedLogs On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>BufferedLogs Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
-<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_log_config</td></tr>
-</table>
- <p>The <code class="directive">BufferedLogs</code> directive causes
- <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> to store several log entries in
- memory and write them together to disk, rather than writing them
- after each request. On some systems, this may result in more
- efficient disk access and hence higher performance. It may be
- set only once for the entire server; it cannot be configured
- per virtual-host.</p>
-
- <div class="note">This directive should be used with caution as a crash might
- cause loss of logging data.</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="CustomLog" id="CustomLog">CustomLog</a> <a name="customlog" id="customlog">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets filename and format of log file</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CustomLog <var>file</var>|<var>pipe</var>
-<var>format</var>|<var>nickname</var>
-[env=[!]<var>environment-variable</var>|
-expr=<var>expression</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<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_log_config</td></tr>
-</table>
- <p>The <code class="directive">CustomLog</code> directive is used to
- log requests to the server. A log format is specified, and the
- logging can optionally be made conditional on request
- characteristics using environment variables.</p>
-
- <p>The first argument, which specifies the location to which
- the logs will be written, can take one of the following two
- types of values:</p>
-
- <dl>
- <dt><var>file</var></dt>
- <dd>A filename, relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</dd>
-
- <dt><var>pipe</var></dt>
- <dd>The pipe character "<code>|</code>", followed by the path
- to a program to receive the log information on its standard
- input. See the notes on <a href="../logs.html#piped">piped logs</a>
- for more information.
-
- <div class="warning"><h3>Security:</h3>
- <p>If a program is used, then it will be run as the user who
- started <code class="program"><a href="../programs/httpd.html">httpd</a></code>. This will be root if the server was
- started by root; be sure that the program is secure.</p>
- </div>
- <div class="warning"><h3>Note</h3>
- <p>When entering a file path on non-Unix platforms, care should be taken
- to make sure that only forward slashed are used even though the platform
- may allow the use of back slashes. In general it is a good idea to always
- use forward slashes throughout the configuration files.</p>
- </div></dd>
- </dl>
-
- <p>The second argument specifies what will be written to the
- log file. It can specify either a <var>nickname</var> defined by
- a previous <code class="directive"><a href="#logformat">LogFormat</a></code>
- directive, or it can be an explicit <var>format</var> string as
- described in the <a href="#formats">log formats</a> section.</p>
-
- <p>For example, the following two sets of directives have
- exactly the same effect:</p>
-
- <pre class="prettyprint lang-config"># CustomLog with format nickname
-LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
-CustomLog "logs/access_log" common
-
-# CustomLog with explicit format string
-CustomLog "logs/access_log" "%h %l %u %t \"%r\" %&gt;s %b"</pre>
-
-
- <p>The third argument is optional and controls whether or
- not to log a particular request. The condition can be the
- presence or absence (in the case of a '<code>env=!<var>name</var></code>'
- clause) of a particular variable in the server
- <a href="../env.html">environment</a>. Alternatively, the condition
- can be expressed as arbitrary boolean <a href="../expr.html">expression</a>. If the condition is not satisfied, the request
- will not be logged. References to HTTP headers in the expression
- will not cause the header names to be added to the Vary header.</p>
-
- <p>Environment variables can be set on a per-request
- basis using the <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>
- and/or <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> modules. For
- example, if you want to record requests for all GIF
- images on your server in a separate logfile but not in your main
- log, you can use:</p>
-
- <pre class="prettyprint lang-config">SetEnvIf Request_URI \.gif$ gif-image
-CustomLog "gif-requests.log" common env=gif-image
-CustomLog "nongif-requests.log" common env=!gif-image</pre>
-
-
- <p>Or, to reproduce the behavior of the old RefererIgnore
- directive, you might use the following:</p>
-
- <pre class="prettyprint lang-config">SetEnvIf Referer example\.com localreferer
-CustomLog "referer.log" referer env=!localreferer</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="LogFormat" id="LogFormat">LogFormat</a> <a name="logformat" id="logformat">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Describes a format for use in a log file</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LogFormat <var>format</var>|<var>nickname</var>
-[<var>nickname</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<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_log_config</td></tr>
-</table>
- <p>This directive specifies the format of the access log
- file.</p>
-
- <p>The <code class="directive">LogFormat</code> directive can take one of two
- forms. In the first form, where only one argument is specified,
- this directive sets the log format which will be used by logs
- specified in subsequent <code class="directive">TransferLog</code>
- directives. The single argument can specify an explicit
- <var>format</var> as discussed in the <a href="#formats">custom log
- formats</a> section above. Alternatively, it can use a
- <var>nickname</var> to refer to a log format defined in a
- previous <code class="directive">LogFormat</code> directive as described
- below.</p>
-
- <p>The second form of the <code class="directive">LogFormat</code>
- directive associates an explicit <var>format</var> with a
- <var>nickname</var>. This <var>nickname</var> can then be used in
- subsequent <code class="directive">LogFormat</code> or
- <code class="directive"><a href="#customlog">CustomLog</a></code> directives
- rather than repeating the entire format string. A
- <code class="directive">LogFormat</code> directive that defines a nickname
- <strong>does nothing else</strong> -- that is, it <em>only</em>
- defines the nickname, it doesn't actually apply the format and make
- it the default. Therefore, it will not affect subsequent
- <code class="directive"><a href="#transferlog">TransferLog</a></code> directives.
- In addition, <code class="directive">LogFormat</code> cannot use one nickname
- to define another nickname. Note that the nickname should not contain
- percent signs (<code>%</code>).</p>
-
- <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common</pre>
-</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="TransferLog" id="TransferLog">TransferLog</a> <a name="transferlog" id="transferlog">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify location of a log file</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>TransferLog <var>file</var>|<var>pipe</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<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_log_config</td></tr>
-</table>
- <p>This directive has exactly the same arguments and effect as
- the <code class="directive"><a href="#customlog">CustomLog</a></code>
- directive, with the exception that it does not allow the log format
- to be specified explicitly or for conditional logging of requests.
- Instead, the log format is determined by the most recently specified
- <code class="directive"><a href="#logformat">LogFormat</a></code> directive
- which does not define a nickname. Common Log Format is used if no
- other format has been specified.</p>
-
- <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""
-TransferLog logs/access_log</pre>
-</div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_log_config.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_log_config.html.fr b/docs/manual/mod/mod_log_config.html.fr
index 24b655ee02..6a5ed7e3d0 100644
--- a/docs/manual/mod/mod_log_config.html.fr
+++ b/docs/manual/mod/mod_log_config.html.fr
@@ -73,6 +73,198 @@ s�curit�</a></li>
d'Apache</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="bufferedlogs" id="bufferedlogs">Directive</a> <a name="BufferedLogs" id="BufferedLogs">BufferedLogs</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enregistre les entr�es du journal dans un tampon en m�moire
+avant de les �crire sur disque</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>BufferedLogs On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>BufferedLogs Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</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_log_config</td></tr>
+</table>
+ <p>Lorsque la directive <code class="directive">BufferedLogs</code> est �
+ "on", <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> stocke de nombreuses entr�es
+ du journal en m�moire, et les �crit d'un seul bloc sur disque,
+ plut�t que de les �crire apr�s chaque requ�te. Sur certains
+ syst�mes, ceci peut am�liorer l'efficacit� des acc�s disque, et par
+ cons�quent les performances. La directive ne peut �tre d�finie
+ qu'une seule fois pour l'ensemble du serveur ; elle ne peut pas �tre
+ d�finie au niveau d'un serveur virtuel.</p>
+
+ <div class="note">Cette directive doit �tre utilis�e avec
+ pr�cautions car un crash peut provoquer la perte de donn�es de
+ journalisation.</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="customlog" id="customlog">Directive</a> <a name="CustomLog" id="CustomLog">CustomLog</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit le nom et le format du fichier
+journal</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>CustomLog <var>fichier</var>|<var>pipe</var>
+<var>format</var>|<var>alias</var>
+[env=[!]<var>variable-environnement</var>|
+expr=<var>expression</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_log_config</td></tr>
+</table>
+ <p>La directive <code class="directive">CustomLog</code> permet de contr�ler
+ la journalisation des requ�tes destin�es au serveur. Un format de
+ journal est sp�cifi�, et la journalisation peut s'effectuer de
+ mani�re conditionnelle en fonction des caract�ristiques de la
+ requ�te en utilisant des variables d'environnement.</p>
+
+ <p>Le premier argument, qui sp�cifie l'emplacement o� les journaux
+ seront �crits, accepte deux types de valeurs :</p>
+
+ <dl>
+ <dt><var>fichier</var></dt>
+ <dd>Un nom de fichier, relatif au r�pertoire d�fini par la
+ directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</dd>
+
+ <dt><var>pipe</var></dt>
+ <dd>Le caract�re pipe "<code>|</code>", suivi du chemin vers un
+ programme qui recevra les informations de la journalisation sur
+ son entr�e standard. Voir les notes � propos de la <a href="../logs.html#piped">journalisation redirig�e</a> pour plus
+ d'informations.
+
+ <div class="warning"><h3>S�curit� :</h3>
+ <p>Si les journaux sont redirig�s vers un programme, ce dernier
+ s'ex�cutera sous l'utilisateur qui a d�marr�
+ <code class="program"><a href="../programs/httpd.html">httpd</a></code>. Ce sera l'utilisateur root si le serveur
+ a �t� d�marr� par root ; v�rifiez que le programme est
+ s�curis�.</p>
+ </div>
+ <div class="warning"><h3>Note</h3>
+ <p>Lors de la sp�cification d'un chemin de fichier sur les
+ plate-formes non-Unix, il faut prendre soin de ne pas oublier
+ que seuls les slashes directs doivent �tre utilis�s, m�me si la
+ plate-forme autorise l'emploi d'anti-slashes. D'une mani�re
+ g�n�rale, c'est une bonne id�e que de n'utiliser que des slashes
+ directs dans les fichiers de configuration.</p>
+ </div></dd>
+ </dl>
+
+ <p>Le second argument permet de d�finir ce qui va �tre �crit dans le
+ fichier journal. Il peut contenir soit un <var>alias</var> pr�d�fini
+ par une directive <code class="directive"><a href="#logformat">LogFormat</a></code>, soit une cha�ne de
+ <var>format</var> explicite comme d�crit dans la section <a href="#formats">formats de journaux</a>.</p>
+
+ <p>Par exemple, les deux blocs de directives suivants produisent le
+ m�me effet :</p>
+
+ <pre class="prettyprint lang-config"># Journal personnalis� avec alias de format
+LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
+CustomLog logs/access_log common
+
+# Journal personnalis� avec cha�ne de format explicite
+CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"</pre>
+
+
+ <p>Le troisi�me argument est optionnel et permet de contr�ler si une
+ requ�te doit �tre ou non journalis�e. Dans le cas d'une clause
+ '<code>env=!<var>nom</var></code>', la condition peut �tre la
+ pr�sence ou l'absence d'une variable particuli�re dans
+ l'<a href="../env.html">environnement du serveur</a>. Dans le cas
+ d'une clause 'expr=<var>expression</var>', la condition consiste
+ en une <a href="../expr.html">expression</a> bool�enne
+ quelconque. Si la condition n'est pas v�rifi�e, la requ�te ne sera
+ pas journalis�e. D'�ventuelles r�f�rences � des en-t�tes HTTP dans
+ l'expression rationnelle n'entra�neront pas l'ajout des noms
+ d'en-t�te correspondants � l'en-t�te Vary.</p>
+
+ <p>Les variables d'environnement peuvent �tre d�finies au niveau de
+ chaque requ�te en utilisant les modules
+ <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> et/ou <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.
+ Par exemple, si vous voulez enregistrer les requ�tes pour toutes les
+ images GIF sur votre serveur dans un fichier journal s�par�, et pas
+ dans votre journal principal, vous pouvez utiliser :</p>
+
+ <pre class="prettyprint lang-config">SetEnvIf Request_URI \.gif$ gif-image
+CustomLog gif-requests.log common env=gif-image
+CustomLog nongif-requests.log common env=!gif-image</pre>
+
+
+ <p>Ou, pour reproduire le comportement de l'ancienne directive
+ RefererIgnore, vous pouvez utiliser :</p>
+
+ <pre class="prettyprint lang-config">SetEnvIf Referer example\.com localreferer
+CustomLog referer.log referer env=!localreferer</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="logformat" id="logformat">Directive</a> <a name="LogFormat" id="LogFormat">LogFormat</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�crit un format utilisable dans un fichier
+journal</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LogFormat <var>format</var>|<var>alias</var>
+[<var>alias</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_log_config</td></tr>
+</table>
+ <p>Cette directive permet de sp�cifier le format du fichier journal
+ des acc�s.</p>
+
+ <p>La directive <code class="directive">LogFormat</code> se pr�sente sous
+ deux formes. Sous la premi�re forme, qui ne poss�de qu'un seul
+ argument, la directive d�finit le format qui sera utilis� dans les
+ journaux sp�cifi�s par les directives
+ <code class="directive">TransferLog</code> ult�rieures. L'argument unique
+ peut contenir un <var>format</var> explicite comme d�crit dans la
+ section <a href="#formats">formats de journaux personnalis�s</a>
+ ci-dessus. Il peut aussi contenir un <var>alias</var> faisant
+ r�f�rence � un format de journal pr�d�fini par une directive
+ <code class="directive">LogFormat</code> comme d�crit plus loin.</p>
+
+ <p>Sous sa seconde forme, la directive
+ <code class="directive">LogFormat</code> associe un <var>format</var>
+ explicite � un <var>alias</var>. Cet <var>alias</var> peut
+ ensuite s'utiliser dans les directives
+ <code class="directive">LogFormat</code> ou <code class="directive"><a href="#customlog">CustomLog</a></code> ult�rieures, ce qui
+ �vite d'avoir � r�p�ter l'ensemble de la cha�ne de format. Une
+ directive <code class="directive">LogFormat</code> qui d�finit un alias
+ <strong>ne fait rien d'autre</strong> -- c'est � dire qu'<em>elle ne
+ fait que</em> d�finir l'alias, elle n'applique pas le format et n'en
+ fait pas le format par d�faut. Par cons�quent, elle n'affecte pas
+ les directives <code class="directive"><a href="#transferlog">TransferLog</a></code> ult�rieures. En
+ outre, la directive <code class="directive">LogFormat</code> ne peut pas
+ utiliser un alias pour en d�finir un autre. Notez que l'alias ne
+ doit pas contenir de caract�re pourcent (<code>%</code>).</p>
+
+ <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" serveur_virtuel_commun</pre>
+</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="transferlog" id="transferlog">Directive</a> <a name="TransferLog" id="TransferLog">TransferLog</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie l'emplacement d'un fichier journal</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>TransferLog <var>fichier</var>|<var>pipe</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_log_config</td></tr>
+</table>
+ <p>Cette directive poss�de exactement les m�mes arguments et produit
+ les m�mes effets que la directive <code class="directive"><a href="#customlog">CustomLog</a></code>, � l'exception qu'elle
+ ne permet pas de sp�cifier un format de journal explicite ou la
+ journalisation conditionnelle des requ�tes. En l'occurrence, le
+ format de journal est d�termin� par la derni�re d�finition d'une
+ directive <code class="directive"><a href="#logformat">LogFormat</a></code>
+ qui ne d�finit pas d'alias. Si aucun format particulier n'a �t�
+ sp�cifi�, c'est le Common Log Format qui sera utilis�.</p>
+
+ <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""
+TransferLog logs/access_log</pre>
+</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="formats" id="formats">Formats de journaux personnalis�s</a></h2>
@@ -375,198 +567,6 @@ s�curit�</a></h2>
stock�s les fichiers journaux sont inscriptibles par tout autre
utilisateur que celui qui d�marre le serveur.</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="bufferedlogs" id="bufferedlogs">Directive</a> <a name="BufferedLogs" id="BufferedLogs">BufferedLogs</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enregistre les entr�es du journal dans un tampon en m�moire
-avant de les �crire sur disque</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>BufferedLogs On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>BufferedLogs Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</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_log_config</td></tr>
-</table>
- <p>Lorsque la directive <code class="directive">BufferedLogs</code> est �
- "on", <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> stocke de nombreuses entr�es
- du journal en m�moire, et les �crit d'un seul bloc sur disque,
- plut�t que de les �crire apr�s chaque requ�te. Sur certains
- syst�mes, ceci peut am�liorer l'efficacit� des acc�s disque, et par
- cons�quent les performances. La directive ne peut �tre d�finie
- qu'une seule fois pour l'ensemble du serveur ; elle ne peut pas �tre
- d�finie au niveau d'un serveur virtuel.</p>
-
- <div class="note">Cette directive doit �tre utilis�e avec
- pr�cautions car un crash peut provoquer la perte de donn�es de
- journalisation.</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="customlog" id="customlog">Directive</a> <a name="CustomLog" id="CustomLog">CustomLog</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit le nom et le format du fichier
-journal</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>CustomLog <var>fichier</var>|<var>pipe</var>
-<var>format</var>|<var>alias</var>
-[env=[!]<var>variable-environnement</var>|
-expr=<var>expression</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_log_config</td></tr>
-</table>
- <p>La directive <code class="directive">CustomLog</code> permet de contr�ler
- la journalisation des requ�tes destin�es au serveur. Un format de
- journal est sp�cifi�, et la journalisation peut s'effectuer de
- mani�re conditionnelle en fonction des caract�ristiques de la
- requ�te en utilisant des variables d'environnement.</p>
-
- <p>Le premier argument, qui sp�cifie l'emplacement o� les journaux
- seront �crits, accepte deux types de valeurs :</p>
-
- <dl>
- <dt><var>fichier</var></dt>
- <dd>Un nom de fichier, relatif au r�pertoire d�fini par la
- directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</dd>
-
- <dt><var>pipe</var></dt>
- <dd>Le caract�re pipe "<code>|</code>", suivi du chemin vers un
- programme qui recevra les informations de la journalisation sur
- son entr�e standard. Voir les notes � propos de la <a href="../logs.html#piped">journalisation redirig�e</a> pour plus
- d'informations.
-
- <div class="warning"><h3>S�curit� :</h3>
- <p>Si les journaux sont redirig�s vers un programme, ce dernier
- s'ex�cutera sous l'utilisateur qui a d�marr�
- <code class="program"><a href="../programs/httpd.html">httpd</a></code>. Ce sera l'utilisateur root si le serveur
- a �t� d�marr� par root ; v�rifiez que le programme est
- s�curis�.</p>
- </div>
- <div class="warning"><h3>Note</h3>
- <p>Lors de la sp�cification d'un chemin de fichier sur les
- plate-formes non-Unix, il faut prendre soin de ne pas oublier
- que seuls les slashes directs doivent �tre utilis�s, m�me si la
- plate-forme autorise l'emploi d'anti-slashes. D'une mani�re
- g�n�rale, c'est une bonne id�e que de n'utiliser que des slashes
- directs dans les fichiers de configuration.</p>
- </div></dd>
- </dl>
-
- <p>Le second argument permet de d�finir ce qui va �tre �crit dans le
- fichier journal. Il peut contenir soit un <var>alias</var> pr�d�fini
- par une directive <code class="directive"><a href="#logformat">LogFormat</a></code>, soit une cha�ne de
- <var>format</var> explicite comme d�crit dans la section <a href="#formats">formats de journaux</a>.</p>
-
- <p>Par exemple, les deux blocs de directives suivants produisent le
- m�me effet :</p>
-
- <pre class="prettyprint lang-config"># Journal personnalis� avec alias de format
-LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
-CustomLog logs/access_log common
-
-# Journal personnalis� avec cha�ne de format explicite
-CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"</pre>
-
-
- <p>Le troisi�me argument est optionnel et permet de contr�ler si une
- requ�te doit �tre ou non journalis�e. Dans le cas d'une clause
- '<code>env=!<var>nom</var></code>', la condition peut �tre la
- pr�sence ou l'absence d'une variable particuli�re dans
- l'<a href="../env.html">environnement du serveur</a>. Dans le cas
- d'une clause 'expr=<var>expression</var>', la condition consiste
- en une <a href="../expr.html">expression</a> bool�enne
- quelconque. Si la condition n'est pas v�rifi�e, la requ�te ne sera
- pas journalis�e. D'�ventuelles r�f�rences � des en-t�tes HTTP dans
- l'expression rationnelle n'entra�neront pas l'ajout des noms
- d'en-t�te correspondants � l'en-t�te Vary.</p>
-
- <p>Les variables d'environnement peuvent �tre d�finies au niveau de
- chaque requ�te en utilisant les modules
- <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> et/ou <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.
- Par exemple, si vous voulez enregistrer les requ�tes pour toutes les
- images GIF sur votre serveur dans un fichier journal s�par�, et pas
- dans votre journal principal, vous pouvez utiliser :</p>
-
- <pre class="prettyprint lang-config">SetEnvIf Request_URI \.gif$ gif-image
-CustomLog gif-requests.log common env=gif-image
-CustomLog nongif-requests.log common env=!gif-image</pre>
-
-
- <p>Ou, pour reproduire le comportement de l'ancienne directive
- RefererIgnore, vous pouvez utiliser :</p>
-
- <pre class="prettyprint lang-config">SetEnvIf Referer example\.com localreferer
-CustomLog referer.log referer env=!localreferer</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="logformat" id="logformat">Directive</a> <a name="LogFormat" id="LogFormat">LogFormat</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�crit un format utilisable dans un fichier
-journal</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LogFormat <var>format</var>|<var>alias</var>
-[<var>alias</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_log_config</td></tr>
-</table>
- <p>Cette directive permet de sp�cifier le format du fichier journal
- des acc�s.</p>
-
- <p>La directive <code class="directive">LogFormat</code> se pr�sente sous
- deux formes. Sous la premi�re forme, qui ne poss�de qu'un seul
- argument, la directive d�finit le format qui sera utilis� dans les
- journaux sp�cifi�s par les directives
- <code class="directive">TransferLog</code> ult�rieures. L'argument unique
- peut contenir un <var>format</var> explicite comme d�crit dans la
- section <a href="#formats">formats de journaux personnalis�s</a>
- ci-dessus. Il peut aussi contenir un <var>alias</var> faisant
- r�f�rence � un format de journal pr�d�fini par une directive
- <code class="directive">LogFormat</code> comme d�crit plus loin.</p>
-
- <p>Sous sa seconde forme, la directive
- <code class="directive">LogFormat</code> associe un <var>format</var>
- explicite � un <var>alias</var>. Cet <var>alias</var> peut
- ensuite s'utiliser dans les directives
- <code class="directive">LogFormat</code> ou <code class="directive"><a href="#customlog">CustomLog</a></code> ult�rieures, ce qui
- �vite d'avoir � r�p�ter l'ensemble de la cha�ne de format. Une
- directive <code class="directive">LogFormat</code> qui d�finit un alias
- <strong>ne fait rien d'autre</strong> -- c'est � dire qu'<em>elle ne
- fait que</em> d�finir l'alias, elle n'applique pas le format et n'en
- fait pas le format par d�faut. Par cons�quent, elle n'affecte pas
- les directives <code class="directive"><a href="#transferlog">TransferLog</a></code> ult�rieures. En
- outre, la directive <code class="directive">LogFormat</code> ne peut pas
- utiliser un alias pour en d�finir un autre. Notez que l'alias ne
- doit pas contenir de caract�re pourcent (<code>%</code>).</p>
-
- <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" serveur_virtuel_commun</pre>
-</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="transferlog" id="transferlog">Directive</a> <a name="TransferLog" id="TransferLog">TransferLog</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie l'emplacement d'un fichier journal</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>TransferLog <var>fichier</var>|<var>pipe</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_log_config</td></tr>
-</table>
- <p>Cette directive poss�de exactement les m�mes arguments et produit
- les m�mes effets que la directive <code class="directive"><a href="#customlog">CustomLog</a></code>, � l'exception qu'elle
- ne permet pas de sp�cifier un format de journal explicite ou la
- journalisation conditionnelle des requ�tes. En l'occurrence, le
- format de journal est d�termin� par la derni�re d�finition d'une
- directive <code class="directive"><a href="#logformat">LogFormat</a></code>
- qui ne d�finit pas d'alias. Si aucun format particulier n'a �t�
- sp�cifi�, c'est le Common Log Format qui sera utilis�.</p>
-
- <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""
-TransferLog logs/access_log</pre>
-</div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_log_config.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_log_config.html.ja.utf8 b/docs/manual/mod/mod_log_config.html.ja.utf8
index 1da183293f..952334ba76 100644
--- a/docs/manual/mod/mod_log_config.html.ja.utf8
+++ b/docs/manual/mod/mod_log_config.html.ja.utf8
@@ -72,6 +72,185 @@
<li><a href="../logs.html">Apache ログファイル</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="BufferedLogs" id="BufferedLogs">BufferedLogs</a> <a name="bufferedlogs" id="bufferedlogs">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ディスクに書き出す前にメモリにログエントリをバッファする</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>BufferedLogs On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>BufferedLogs Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.0.41 以降</td></tr>
+</table>
+ <p><code class="directive">BufferedLogs</code> ディレクティブを使うと
+ <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> の挙動が変化して、
+ 複数のログを書き出す際に、それぞれのリクエスト処理後毎に
+ 書き出すのではなく、いったんメモリに蓄えてから、
+ まとめてディスクに書き出すようになります。
+ この結果ディスクアクセスがより効率的になり、
+ 高いパフォーマンスの得られるシステムもあるでしょう。
+ このディレクティブはサーバ全体で一度だけ設定できます;
+ バーチャルホストごとに設定することはできません。</p>
+
+ <div class="note">このディレクティブは実験的なものですので、
+ 使用する際は注意してください。</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="CustomLog" id="CustomLog">CustomLog</a> <a name="customlog" id="customlog">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ログファイルの名前と書式を設定する</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CustomLog <var>file</var>|<var>pipe</var>
+<var>format</var>|<var>nickname</var>
+[env=[!]<var>environment-variable</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
+</table>
+ <p><code class="directive">CustomLog</code> ディレクティブはサーバへのリクエストを
+ ログ収集するために使われます。ログの書式が指定され、
+ 環境変数を使ってロギングが条件に応じて行なわれるようにすることもできます。</p>
+
+ <p>ログが書かれる場所を指定する最初の引数は以下の二つの形式の値を
+ とることができます:</p>
+
+ <dl>
+ <dt><var>file</var></dt>
+ <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
+ からの相対パスで表されるファイル名。</dd>
+
+ <dt><var>pipe</var></dt>
+ <dd>パイプ文字 "<code>|</code>" と、その後に標準入力からログの
+ 情報を受けとるプログラムへのパスが続いたもの。
+
+ <div class="warning"><h3>セキュリティ</h3>
+ <p>もしプログラムが使用された場合、
+ <code class="program"><a href="../programs/httpd.html">httpd</a></code> が起動されたユーザとして実行されます。これはサーバが
+ root によって起動された場合は root になります。プログラムが
+ 安全であるように留意してください。</p>
+ </div>
+ <div class="warning"><h3>注</h3>
+ <p>Unix でないプラットフォームでファイルのパスを入力しているときは、
+ 使用しているプラットフォームがバックスラッシュの使用を許可していた
+ として、通常のスラッシュだけを使うように気をつけてください。
+ 一般的に、設定ファイル中では常に普通のスラッシュのみを使うようにする
+ 方が良いです。</p>
+ </div></dd>
+ </dl>
+
+ <p>二つめの引数はログファイルに何が書かれるかを指定します。
+ 前にある <code class="directive"><a href="#logformat">LogFormat</a></code> ディレクティブにより
+ 定義された <var>nickname</var> か、<a href="#formats">ログの書式</a>
+ のところで説明されている、明示的な <var>format</var> 文字列の
+ どちらかを指定することができます。</p>
+
+ <p>例えば、以下の二つのディレクティブ群は全く同じ効果をもたらします:</p>
+
+ <div class="example"><p><code>
+ # CustomLog with format nickname<br />
+ LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common<br />
+ CustomLog logs/access_log common<br />
+ <br />
+ # CustomLog with explicit format string<br />
+ CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"
+ </code></p></div>
+
+ <p>三つ目の引数は省略可能で、サーバの環境にある変数があるかないかに
+ 応じてリクエストをログ収集するかどうかを制御するために使うことができます。
+ 指定された<a href="../env.html">環境変数</a>がリクエストに対して
+ 設定されていた場合 ('<code>env=!<var>name</var></code>' 文が使われたときは
+ 設定されていない場合)、リクエストがログ収集されます。</p>
+
+ <p>環境変数は <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> モジュールと
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> モジュールの両方もしくは
+ 片方を用いてリクエストごとに設定することができます。
+ 例えば、サーバにあるすべての GIF 画像へのリクエストを別のログファイル
+ には記録したいけれど、メインログには記録したくない、というときは
+ 以下のものを使うことができます:</p>
+
+ <div class="example"><p><code>
+ SetEnvIf Request_URI \.gif$ gif-image<br />
+ CustomLog gif-requests.log common env=gif-image<br />
+ CustomLog nongif-requests.log common env=!gif-image
+ </code></p></div>
+
+ <p>古い RefererIgnore ディレクティブと同じ挙動をさせたい場合は、
+ 次のようにします:</p>
+
+ <div class="example"><p><code>
+ SetEnvIf Referer example\.com localreferer<br />
+ CustomLog referer.log referer env=!localreferer
+ </code></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="LogFormat" id="LogFormat">LogFormat</a> <a name="logformat" id="logformat">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ログファイルで使用する書式を設定する</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LogFormat <var>format</var>|<var>nickname</var>
+[<var>nickname</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
+</table>
+ <p>このディレクティブはアクセスログファイルの書式を指定します。</p>
+
+ <p><code class="directive">LogFormat</code> ディレクティブは二つの形式のどちらかを
+ とることができます。最初の形式では一つの引数のみが指定され、
+ 続く <code class="directive">TransferLog</code>
+ で指定されたログで使われるログの書式を設定します。この単独の引数では
+ 上の<a href="#formats">カスタムログ書式</a>で説明されているように
+ <var>format</var> を明示的に指定することができます。
+ もしくは、下で説明されているように前に <code class="directive">LogFormat</code>
+ ディレクティブで定義されたログの書式を <var>nickname</var>を使って
+ 参照することもできます。</p>
+
+ <p><code class="directive">LogFormat</code> ディレクティブの二つめの形式は
+ <var>format</var> に <var>nickname</var> を与えます。
+ フォーマット文字列全体を再び書くかわりに、
+ この <var>nickname</var> を続きの <code class="directive">LogFormat</code> ディレクティブや
+ <code class="directive">CustomLog</code> ディレクティブで使うことができます。
+ Nickname を定義する <code class="directive">LogFormat</code> ディレクティブは
+ <strong>他には何もしません</strong> -- すなわち、ニックネームを定義
+ する<em>だけ</em>で、実際に書式を適用してデフォルトにするということは行ないません。
+ ですから、これは続く <code class="directive"><a href="#transferlog">TransferLog</a></code>
+ ディレクティブには影響を与えません。
+ さらに、<code class="directive">LogFormat</code> ディレクティブは既存の nickname を
+ 使って別の nickname を定義することはできません。Nickname には
+ パーセント記号 (<code>%</code>) が含まれていてはいけないことにも注意
+ してください。</p>
+
+ <div class="example"><h3>例</h3><p><code>
+ LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common
+ </code></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="TransferLog" id="TransferLog">TransferLog</a> <a name="transferlog" id="transferlog">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ログファイルの位置を指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>TransferLog <var>file</var>|<var>pipe</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
+</table>
+ <p>このディレクティブは、ログ書式を直接指定できないことと、
+ 条件付きロギングが無いことを除くと、<code class="directive"><a href="#customlog">CustomLog</a></code> と全く同じ引数と効果があります。
+ 直接ログ書式を指定する代わりに、ログの書式はそこまでで一番最後に指定された
+ ニックネームを定義しない
+ <code class="directive"><a href="#logformat">LogFormat</a></code> ディレクティブ
+ で定義されたものを使います。
+ もし他の書式が全く指定されていないときは Common Log Format
+ が使われます。</p>
+
+ <div class="example"><h3>例</h3><p><code>
+ LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""<br />
+ TransferLog logs/access_log
+ </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="formats" id="formats">カスタムログ書式</a></h2>
@@ -279,185 +458,6 @@
書き込み可能なときにセキュリティの問題が発生する理由の詳細は<a href="../misc/security_tips.html#serverroot">セキュリティのこつ</a>
を参照してください。</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="BufferedLogs" id="BufferedLogs">BufferedLogs</a> <a name="bufferedlogs" id="bufferedlogs">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ディスクに書き出す前にメモリにログエントリをバッファする</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>BufferedLogs On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>BufferedLogs Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>2.0.41 以降</td></tr>
-</table>
- <p><code class="directive">BufferedLogs</code> ディレクティブを使うと
- <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> の挙動が変化して、
- 複数のログを書き出す際に、それぞれのリクエスト処理後毎に
- 書き出すのではなく、いったんメモリに蓄えてから、
- まとめてディスクに書き出すようになります。
- この結果ディスクアクセスがより効率的になり、
- 高いパフォーマンスの得られるシステムもあるでしょう。
- このディレクティブはサーバ全体で一度だけ設定できます;
- バーチャルホストごとに設定することはできません。</p>
-
- <div class="note">このディレクティブは実験的なものですので、
- 使用する際は注意してください。</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="CustomLog" id="CustomLog">CustomLog</a> <a name="customlog" id="customlog">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ログファイルの名前と書式を設定する</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CustomLog <var>file</var>|<var>pipe</var>
-<var>format</var>|<var>nickname</var>
-[env=[!]<var>environment-variable</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
-</table>
- <p><code class="directive">CustomLog</code> ディレクティブはサーバへのリクエストを
- ログ収集するために使われます。ログの書式が指定され、
- 環境変数を使ってロギングが条件に応じて行なわれるようにすることもできます。</p>
-
- <p>ログが書かれる場所を指定する最初の引数は以下の二つの形式の値を
- とることができます:</p>
-
- <dl>
- <dt><var>file</var></dt>
- <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
- からの相対パスで表されるファイル名。</dd>
-
- <dt><var>pipe</var></dt>
- <dd>パイプ文字 "<code>|</code>" と、その後に標準入力からログの
- 情報を受けとるプログラムへのパスが続いたもの。
-
- <div class="warning"><h3>セキュリティ</h3>
- <p>もしプログラムが使用された場合、
- <code class="program"><a href="../programs/httpd.html">httpd</a></code> が起動されたユーザとして実行されます。これはサーバが
- root によって起動された場合は root になります。プログラムが
- 安全であるように留意してください。</p>
- </div>
- <div class="warning"><h3>注</h3>
- <p>Unix でないプラットフォームでファイルのパスを入力しているときは、
- 使用しているプラットフォームがバックスラッシュの使用を許可していた
- として、通常のスラッシュだけを使うように気をつけてください。
- 一般的に、設定ファイル中では常に普通のスラッシュのみを使うようにする
- 方が良いです。</p>
- </div></dd>
- </dl>
-
- <p>二つめの引数はログファイルに何が書かれるかを指定します。
- 前にある <code class="directive"><a href="#logformat">LogFormat</a></code> ディレクティブにより
- 定義された <var>nickname</var> か、<a href="#formats">ログの書式</a>
- のところで説明されている、明示的な <var>format</var> 文字列の
- どちらかを指定することができます。</p>
-
- <p>例えば、以下の二つのディレクティブ群は全く同じ効果をもたらします:</p>
-
- <div class="example"><p><code>
- # CustomLog with format nickname<br />
- LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common<br />
- CustomLog logs/access_log common<br />
- <br />
- # CustomLog with explicit format string<br />
- CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"
- </code></p></div>
-
- <p>三つ目の引数は省略可能で、サーバの環境にある変数があるかないかに
- 応じてリクエストをログ収集するかどうかを制御するために使うことができます。
- 指定された<a href="../env.html">環境変数</a>がリクエストに対して
- 設定されていた場合 ('<code>env=!<var>name</var></code>' 文が使われたときは
- 設定されていない場合)、リクエストがログ収集されます。</p>
-
- <p>環境変数は <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> モジュールと
- <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> モジュールの両方もしくは
- 片方を用いてリクエストごとに設定することができます。
- 例えば、サーバにあるすべての GIF 画像へのリクエストを別のログファイル
- には記録したいけれど、メインログには記録したくない、というときは
- 以下のものを使うことができます:</p>
-
- <div class="example"><p><code>
- SetEnvIf Request_URI \.gif$ gif-image<br />
- CustomLog gif-requests.log common env=gif-image<br />
- CustomLog nongif-requests.log common env=!gif-image
- </code></p></div>
-
- <p>古い RefererIgnore ディレクティブと同じ挙動をさせたい場合は、
- 次のようにします:</p>
-
- <div class="example"><p><code>
- SetEnvIf Referer example\.com localreferer<br />
- CustomLog referer.log referer env=!localreferer
- </code></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="LogFormat" id="LogFormat">LogFormat</a> <a name="logformat" id="logformat">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ログファイルで使用する書式を設定する</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LogFormat <var>format</var>|<var>nickname</var>
-[<var>nickname</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
-</table>
- <p>このディレクティブはアクセスログファイルの書式を指定します。</p>
-
- <p><code class="directive">LogFormat</code> ディレクティブは二つの形式のどちらかを
- とることができます。最初の形式では一つの引数のみが指定され、
- 続く <code class="directive">TransferLog</code>
- で指定されたログで使われるログの書式を設定します。この単独の引数では
- 上の<a href="#formats">カスタムログ書式</a>で説明されているように
- <var>format</var> を明示的に指定することができます。
- もしくは、下で説明されているように前に <code class="directive">LogFormat</code>
- ディレクティブで定義されたログの書式を <var>nickname</var>を使って
- 参照することもできます。</p>
-
- <p><code class="directive">LogFormat</code> ディレクティブの二つめの形式は
- <var>format</var> に <var>nickname</var> を与えます。
- フォーマット文字列全体を再び書くかわりに、
- この <var>nickname</var> を続きの <code class="directive">LogFormat</code> ディレクティブや
- <code class="directive">CustomLog</code> ディレクティブで使うことができます。
- Nickname を定義する <code class="directive">LogFormat</code> ディレクティブは
- <strong>他には何もしません</strong> -- すなわち、ニックネームを定義
- する<em>だけ</em>で、実際に書式を適用してデフォルトにするということは行ないません。
- ですから、これは続く <code class="directive"><a href="#transferlog">TransferLog</a></code>
- ディレクティブには影響を与えません。
- さらに、<code class="directive">LogFormat</code> ディレクティブは既存の nickname を
- 使って別の nickname を定義することはできません。Nickname には
- パーセント記号 (<code>%</code>) が含まれていてはいけないことにも注意
- してください。</p>
-
- <div class="example"><h3>例</h3><p><code>
- LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common
- </code></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="TransferLog" id="TransferLog">TransferLog</a> <a name="transferlog" id="transferlog">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ログファイルの位置を指定</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>TransferLog <var>file</var>|<var>pipe</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
-</table>
- <p>このディレクティブは、ログ書式を直接指定できないことと、
- 条件付きロギングが無いことを除くと、<code class="directive"><a href="#customlog">CustomLog</a></code> と全く同じ引数と効果があります。
- 直接ログ書式を指定する代わりに、ログの書式はそこまでで一番最後に指定された
- ニックネームを定義しない
- <code class="directive"><a href="#logformat">LogFormat</a></code> ディレクティブ
- で定義されたものを使います。
- もし他の書式が全く指定されていないときは Common Log Format
- が使われます。</p>
-
- <div class="example"><h3>例</h3><p><code>
- LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""<br />
- TransferLog logs/access_log
- </code></p></div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_log_config.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_log_config.html.ko.euc-kr b/docs/manual/mod/mod_log_config.html.ko.euc-kr
index 18ba763fa1..3c117c64e9 100644
--- a/docs/manual/mod/mod_log_config.html.ko.euc-kr
+++ b/docs/manual/mod/mod_log_config.html.ko.euc-kr
@@ -66,6 +66,153 @@
<li><a href="../logs.html">����ġ �α�����</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="BufferedLogs" id="BufferedLogs">BufferedLogs</a> <a name="bufferedlogs" id="bufferedlogs">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>Buffer log entries in memory before writing to disk</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code /></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_log_config</td></tr>
+</table><p>Documentation not yet translated. Please see English version of document.</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="CustomLog" id="CustomLog">CustomLog</a> <a name="customlog" id="customlog">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�α����� �̸��� ������ �����Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>CustomLog <var>file</var>|<var>pipe</var>
+<var>format</var>|<var>nickname</var>
+[env=[!]<var>environment-variable</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_log_config</td></tr>
+</table>
+ <p>������ ��û�� �α׿� ���涧 <code class="directive">CustomLog</code>
+ ���þ ����Ѵ�. �α� ������ �����ϰ�, ȯ�溯���� ����Ͽ�
+ ��û�� Ư¡�� ���� ���������� �α׸� ���� ���� �ִ�.</p>
+
+ <p>�α׸� ����� ��Ҹ� �����ϴ� ù��° �ƱԸ�Ʈ���� ����
+ ���� �ϳ��� ����Ѵ�.</p>
+
+ <dl>
+ <dt><var>file</var></dt>
+ <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>��
+ ������� ���ϸ�.</dd>
+
+ <dt><var>pipe</var></dt>
+ <dd>���������� "<code>|</code>"�ڿ� �α� ������ ǥ���Է�����
+ ���� ���α׷� ��θ� ���´�.
+
+ <div class="warning"><h3>����:</h3>
+ <p>���α׷��� ����Ѵٸ� ���α׷��� �������� ������ �����
+ �������� ����ȴ�. ������ root�� �����Ѵٸ� ���α׷���
+ root�� �����ϹǷ� ���α׷��� �������� Ȯ���϶�.</p>
+ </div>
+ <div class="warning"><h3>����</h3>
+ <p>���н��� �ƴ� �÷������� ���ϰ�θ� �Է��Ҷ� �÷�����
+ �齽������ ����ϴ��� �ݵ�� �������� ����ؾ� �Ѵ�.
+ �Ϲ������� �������Ͽ����� �׻� �������� ����ϴ� ����
+ ����.</p>
+ </div></dd>
+ </dl>
+
+ <p>�ι�° �ƱԸ�Ʈ�� �α����Ͽ� ����� ������ �����Ѵ�.
+ ���� <code class="directive"><a href="#logformat">LogFormat</a></code>����
+ ������ <var>nickname</var>�� ����ϰų� ���� <a href="#formats">�α� ����</a> ������ ������ <var>format</var>
+ ���ڿ��� ����� �� �ִ�.</p>
+
+ <p>���� ���, ���� �� ���þ�� �Ȱ��� ���� �Ѵ�.</p>
+
+ <div class="example"><p><code>
+ # ���� ���� ����� CustomLog<br />
+ LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common<br />
+ CustomLog logs/access_log common<br />
+ <br />
+ # ���� ���� ���ڿ��� ����� CustomLog<br />
+ CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"
+ </code></p></div>
+
+ <p>����° �ƱԸ�Ʈ�� ��� �Ǹ�, Ư�� ���� ȯ�溯�� ������
+ ���� ��û�� �α׿� ������� ���θ� �����Ѵ�. ��û�� ������
+ <a href="../env.html">ȯ�溯��</a>�� ���ǵ��ִٸ� (Ȥ��
+ '<code>env=!<var>name</var></code>'�� ����� ��� ���ٸ�)
+ ��û�� �α׿� ����Ѵ�.</p>
+
+ <p><code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>�� <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
+ ����� ����Ͽ� ��û���� ȯ�溯���� ������ �� �ִ�. ����
+ ���, ������ GIF �׸��� ���� ��� ��û�� �ּ��� �αװ� �ƴ�
+ �ٸ� �α����Ͽ� ����Ϸ���,</p>
+
+ <div class="example"><p><code>
+ SetEnvIf Request_URI \.gif$ gif-image<br />
+ CustomLog gif-requests.log common env=gif-image<br />
+ CustomLog nongif-requests.log common env=!gif-image
+ </code></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="LogFormat" id="LogFormat">LogFormat</a> <a name="logformat" id="logformat">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�α����Ͽ� ����� ������ ����Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>LogFormat <var>format</var>|<var>nickname</var>
+[<var>nickname</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_log_config</td></tr>
+</table>
+ <p>�� ���þ�� ���� �α������� ������ �����Ѵ�.</p>
+
+ <p><code class="directive">LogFormat</code> ���þ�� �ΰ��� ��������
+ ����Ѵ�. ù��° ������ �ƱԸ�Ʈ�� �Ѱ��� ����Ͽ� ����
+ <code class="directive">TransferLog</code> ���þ���� ����� �α�
+ ������ �����Ѵ�. �� �ƱԸ�Ʈ�� ���� <a href="#formats">�α�
+ ���� �����ϱ�</a> ������ ������ <var>format</var>�� ����
+ ����ϰų�, ������ ������ <code class="directive">LogFormat</code>
+ ���þ�� �̸� ������ (�α� ������ ��Ī�ϴ�) <var>nickname</var>��
+ ����� �� �ִ�.</p>
+
+ <p><code class="directive">LogFormat</code> ���þ��� �ι�° ������
+ <var>format</var>�� <var>nickname</var>�� �����Ѵ�. �׷���
+ �ڿ��� ����ϴ� <code class="directive">LogFormat</code>�̳� <code class="directive"><a href="#customlog">CustomLog</a></code> ���þ �ݺ��ؼ�
+ ���� ���ڿ��� ��� �Է��ϴ� ��� <var>nickname</var>�� �����
+ �� �ִ�. ��Ī�� �����ϴ� <code class="directive">LogFormat</code>
+ ���þ�� <strong>�� �ܿ��� �ƹ� ����� ���� �ʴ´�</strong>.
+ ��, ��Ī<em>��</em>�� �����ϸ�, ������ ������ �����ϰų�
+ ������ �⺻������ ������ �ʴ´�. �׷��Ƿ� ������ ������
+ <code class="directive"><a href="#transferlog">TransferLog</a></code>
+ ���þ ������ ���� �ʴ´�. ��,
+ <code class="directive">LogFormat</code>�� ��Ī���� �ٸ� ��Ī��
+ ������ �� �ִ�. ��Ī �̸����� �ۼ�Ʈ ��ȣ(<code>%</code>)��
+ ����� �� ������ �����϶�.</p>
+
+ <div class="example"><h3>����</h3><p><code>
+ LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common
+ </code></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="TransferLog" id="TransferLog">TransferLog</a> <a name="transferlog" id="transferlog">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�α����� ��ġ�� �����Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>TransferLog <var>file</var>|<var>pipe</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_log_config</td></tr>
+</table>
+ <p>�� ���þ�� <code class="directive"><a href="#customlog">CustomLog</a></code> ���þ�� �ƱԸ�Ʈ��
+ ����� ���������, �α� ������ ���� �����ϰų� ��û�� ���ǿ�
+ ���� �α׿� ���� �� ����. ��� ���� �ֱ� ����� (��Ī��
+ �������� ����) <code class="directive"><a href="#logformat">LogFormat</a></code> ���þ ������
+ �α� ������ ����Ѵ�. �̸� ������ �������� �ʾҴٸ� Common
+ Log Format�� ����Ѵ�.</p>
+
+ <div class="example"><h3>����</h3><p><code>
+ LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""<br />
+ TransferLog logs/access_log
+ </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="formats" id="formats">�α� ���� �����ϱ�</a></h2>
@@ -242,153 +389,6 @@
<a href="../misc/security_tips.html#serverroot">���� ��</a>
������ �����϶�.</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="BufferedLogs" id="BufferedLogs">BufferedLogs</a> <a name="bufferedlogs" id="bufferedlogs">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>Buffer log entries in memory before writing to disk</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code /></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_log_config</td></tr>
-</table><p>Documentation not yet translated. Please see English version of document.</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="CustomLog" id="CustomLog">CustomLog</a> <a name="customlog" id="customlog">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�α����� �̸��� ������ �����Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>CustomLog <var>file</var>|<var>pipe</var>
-<var>format</var>|<var>nickname</var>
-[env=[!]<var>environment-variable</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_log_config</td></tr>
-</table>
- <p>������ ��û�� �α׿� ���涧 <code class="directive">CustomLog</code>
- ���þ ����Ѵ�. �α� ������ �����ϰ�, ȯ�溯���� ����Ͽ�
- ��û�� Ư¡�� ���� ���������� �α׸� ���� ���� �ִ�.</p>
-
- <p>�α׸� ����� ��Ҹ� �����ϴ� ù��° �ƱԸ�Ʈ���� ����
- ���� �ϳ��� ����Ѵ�.</p>
-
- <dl>
- <dt><var>file</var></dt>
- <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>��
- ������� ���ϸ�.</dd>
-
- <dt><var>pipe</var></dt>
- <dd>���������� "<code>|</code>"�ڿ� �α� ������ ǥ���Է�����
- ���� ���α׷� ��θ� ���´�.
-
- <div class="warning"><h3>����:</h3>
- <p>���α׷��� ����Ѵٸ� ���α׷��� �������� ������ �����
- �������� ����ȴ�. ������ root�� �����Ѵٸ� ���α׷���
- root�� �����ϹǷ� ���α׷��� �������� Ȯ���϶�.</p>
- </div>
- <div class="warning"><h3>����</h3>
- <p>���н��� �ƴ� �÷������� ���ϰ�θ� �Է��Ҷ� �÷�����
- �齽������ ����ϴ��� �ݵ�� �������� ����ؾ� �Ѵ�.
- �Ϲ������� �������Ͽ����� �׻� �������� ����ϴ� ����
- ����.</p>
- </div></dd>
- </dl>
-
- <p>�ι�° �ƱԸ�Ʈ�� �α����Ͽ� ����� ������ �����Ѵ�.
- ���� <code class="directive"><a href="#logformat">LogFormat</a></code>����
- ������ <var>nickname</var>�� ����ϰų� ���� <a href="#formats">�α� ����</a> ������ ������ <var>format</var>
- ���ڿ��� ����� �� �ִ�.</p>
-
- <p>���� ���, ���� �� ���þ�� �Ȱ��� ���� �Ѵ�.</p>
-
- <div class="example"><p><code>
- # ���� ���� ����� CustomLog<br />
- LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common<br />
- CustomLog logs/access_log common<br />
- <br />
- # ���� ���� ���ڿ��� ����� CustomLog<br />
- CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"
- </code></p></div>
-
- <p>����° �ƱԸ�Ʈ�� ��� �Ǹ�, Ư�� ���� ȯ�溯�� ������
- ���� ��û�� �α׿� ������� ���θ� �����Ѵ�. ��û�� ������
- <a href="../env.html">ȯ�溯��</a>�� ���ǵ��ִٸ� (Ȥ��
- '<code>env=!<var>name</var></code>'�� ����� ��� ���ٸ�)
- ��û�� �α׿� ����Ѵ�.</p>
-
- <p><code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>�� <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
- ����� ����Ͽ� ��û���� ȯ�溯���� ������ �� �ִ�. ����
- ���, ������ GIF �׸��� ���� ��� ��û�� �ּ��� �αװ� �ƴ�
- �ٸ� �α����Ͽ� ����Ϸ���,</p>
-
- <div class="example"><p><code>
- SetEnvIf Request_URI \.gif$ gif-image<br />
- CustomLog gif-requests.log common env=gif-image<br />
- CustomLog nongif-requests.log common env=!gif-image
- </code></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="LogFormat" id="LogFormat">LogFormat</a> <a name="logformat" id="logformat">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�α����Ͽ� ����� ������ ����Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>LogFormat <var>format</var>|<var>nickname</var>
-[<var>nickname</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">�⺻��:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_log_config</td></tr>
-</table>
- <p>�� ���þ�� ���� �α������� ������ �����Ѵ�.</p>
-
- <p><code class="directive">LogFormat</code> ���þ�� �ΰ��� ��������
- ����Ѵ�. ù��° ������ �ƱԸ�Ʈ�� �Ѱ��� ����Ͽ� ����
- <code class="directive">TransferLog</code> ���þ���� ����� �α�
- ������ �����Ѵ�. �� �ƱԸ�Ʈ�� ���� <a href="#formats">�α�
- ���� �����ϱ�</a> ������ ������ <var>format</var>�� ����
- ����ϰų�, ������ ������ <code class="directive">LogFormat</code>
- ���þ�� �̸� ������ (�α� ������ ��Ī�ϴ�) <var>nickname</var>��
- ����� �� �ִ�.</p>
-
- <p><code class="directive">LogFormat</code> ���þ��� �ι�° ������
- <var>format</var>�� <var>nickname</var>�� �����Ѵ�. �׷���
- �ڿ��� ����ϴ� <code class="directive">LogFormat</code>�̳� <code class="directive"><a href="#customlog">CustomLog</a></code> ���þ �ݺ��ؼ�
- ���� ���ڿ��� ��� �Է��ϴ� ��� <var>nickname</var>�� �����
- �� �ִ�. ��Ī�� �����ϴ� <code class="directive">LogFormat</code>
- ���þ�� <strong>�� �ܿ��� �ƹ� ����� ���� �ʴ´�</strong>.
- ��, ��Ī<em>��</em>�� �����ϸ�, ������ ������ �����ϰų�
- ������ �⺻������ ������ �ʴ´�. �׷��Ƿ� ������ ������
- <code class="directive"><a href="#transferlog">TransferLog</a></code>
- ���þ ������ ���� �ʴ´�. ��,
- <code class="directive">LogFormat</code>�� ��Ī���� �ٸ� ��Ī��
- ������ �� �ִ�. ��Ī �̸����� �ۼ�Ʈ ��ȣ(<code>%</code>)��
- ����� �� ������ �����϶�.</p>
-
- <div class="example"><h3>����</h3><p><code>
- LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common
- </code></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="TransferLog" id="TransferLog">TransferLog</a> <a name="transferlog" id="transferlog">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>�α����� ��ġ�� �����Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>TransferLog <var>file</var>|<var>pipe</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������, ����ȣ��Ʈ</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_log_config</td></tr>
-</table>
- <p>�� ���þ�� <code class="directive"><a href="#customlog">CustomLog</a></code> ���þ�� �ƱԸ�Ʈ��
- ����� ���������, �α� ������ ���� �����ϰų� ��û�� ���ǿ�
- ���� �α׿� ���� �� ����. ��� ���� �ֱ� ����� (��Ī��
- �������� ����) <code class="directive"><a href="#logformat">LogFormat</a></code> ���þ ������
- �α� ������ ����Ѵ�. �̸� ������ �������� �ʾҴٸ� Common
- Log Format�� ����Ѵ�.</p>
-
- <div class="example"><h3>����</h3><p><code>
- LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""<br />
- TransferLog logs/access_log
- </code></p></div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_log_config.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_log_config.html.tr.utf8 b/docs/manual/mod/mod_log_config.html.tr.utf8
index cd8ec9a319..1c77b2efd5 100644
--- a/docs/manual/mod/mod_log_config.html.tr.utf8
+++ b/docs/manual/mod/mod_log_config.html.tr.utf8
@@ -68,6 +68,176 @@
<li><a href="../logs.html">Apache Günlük Dosyaları</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="BufferedLogs" id="BufferedLogs">BufferedLogs</a> <a name="bufferedlogs" id="bufferedlogs">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Günlük girdilerini diske yazmadan önce bellekte tamponlar
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>BufferedLogs On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>BufferedLogs Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Temel</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_log_config</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>2.0.41 ve sonrasında mevcuttur.</td></tr>
+</table>
+ <p><code class="directive">BufferedLogs</code> yönergesi,
+ <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> modülünün çeşitli günlük girdilerini her
+ isteğin hemen ardından tek tek değil, bir bütün halinde diske yazılmak
+ üzere bellekte saklanmasını sağlar. Bu, bazı sistemlerde daha verimli
+ disk erişimi, dolayısıyla daha yüksek başarım sağlayabilir. Sadece
+ sunucu geneli için belirtilebilir, sanal konaklar için ayrı ayrı
+ yapılandırılamaz.</p>
+
+ <div class="note">Bir çökme günlük verisi kaybına sebep olacağından bu yönerge
+ dikkatli kullanılmalıdır.</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="CustomLog" id="CustomLog">CustomLog</a> <a name="customlog" id="customlog">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Günlük dosyasın ismini ve girdi biçemini belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>CustomLog <var>dosya</var>|<var>borulu-süreç</var>
+<var>biçem</var>|<var>takma-ad</var>
+[env=[!]<var>ortam-değişkeni</var>]|
+expr=<var>ifade</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Temel</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_log_config</td></tr>
+</table>
+ <p><code class="directive">CustomLog</code> yönergesi istekleri günlüğe kaydetmek
+ için kullanılır. Yönerge ile bir günlük biçemi belirtilebilir ve günlük
+ kaydı isteğin özelliklerine bağlı olarak ortam değişkenleri vasıtasıyla
+ şarta bağlı kılınabilir.</p>
+
+ <p>İlk argümanda günlüğün yazılacağı yer belirtilir. İki tür yer
+ belirtilebilir:</p>
+
+ <dl>
+ <dt><var>dosya</var></dt>
+ <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> yönergesinin
+ değerine göreli bir dosya ismi.</dd>
+
+ <dt><var>borulu-süreç</var></dt>
+ <dd>"<code>|</code>" boru karakteri ile öncelenmiş olarak günlük
+ bilgisini standart girdisinden kabul edecek sürecin ismi (veya komut
+ satırı) Daha fazla bilgi için <a href="../logs.html#piped">borulu
+ günlükler</a>e bakınız.
+
+ <div class="warning"><h3>Güvenlik:</h3>
+ <p>Bir borulu süreç kullanılmışsa, süreç <code class="program"><a href="../programs/httpd.html">httpd</a></code>’yi
+ başlatan kullanıcı tarafından başlatılacaktır. Sunucu root tarafından
+ başlatılıyorsa bu root olacaktır; bu bakımdan günlük kaydını alacak
+ programın güvenilir olması önemlidir.</p>
+ </div>
+ <div class="warning"><h3>Bilginize</h3>
+ <p>Dosya yolunu belirtirken tersbölü çizgisi kullanılan Unix dışı
+ platformlarda bile yapılandırma dosyasında bu amaçla normal bölü
+ çizgilerini kullanmaya özen gösterilmelidir.</p>
+ </div></dd>
+ </dl>
+
+ <p>İkinci argümanda günlüğe ne yazılacağı belirtilir. Ya evvelce
+ <code class="directive"><a href="#logformat">LogFormat</a></code> yönergesi ile
+ tanımlanmış bir <var>takma-ad</var> ya da içeriği <a href="#formats">Günlük Girdilerinin Kişiselleştirilmesi</a> bölümünde
+ açıklanmış bir <var>biçem</var> dizgesi olabilir.</p>
+
+ <p>Örneğin, aşağıdaki iki yönerge kümesi aynı etkiye sahiptir:</p>
+
+ <pre class="prettyprint lang-config"># Biçem dizgesi yerine takma ad içeren CustomLog
+LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
+CustomLog logs/access_log common
+
+# Biçem dizgesinin kendisini içeren CustomLog
+CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"</pre>
+
+
+ <p>Üçüncü argüman isteğe bağlı olup,belli bir isteğin günlüğe kaydedilip
+ kaydedilmeyeceğini belirler. Koşul, sunucu <a href="../env.html">ortamında</a> belli bir değişkenin varlığı veya
+ yokluğu olabilir (bir '<code>env=!<var>isim</var></code>' durumu).
+ İstenirse koşul keyfi bir mantıksal <a href="../expr.html">ifade</a>
+ olarak da belirtilebilir. Eğer koşul sağlanmazsa istek günlüğe
+ kaydedilmez. İfadede bulunan HTTP başlıklarına başvurular bu başlık
+ isimlerinin Vary başlığına eklenmesine sebep olmaz.</p>
+
+ <p>Ortam değişkenleri <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>
+ ve/veya <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> modülleri kullanılarak her istek
+ için ayrı ayrı atanabilir. Örneğin, GIF biçemli resimler için yapılan
+ istekleri ana günlük dosyasına değil de başka bir dosyaya kaydetmek
+ isterseniz:</p>
+
+ <pre class="prettyprint lang-config">SetEnvIf Request_URI \.gif$ gif-image
+CustomLog gif-requests.log common env=gif-image
+CustomLog nongif-requests.log common env=!gif-image</pre>
+
+
+ <p>Veya eski <code>RefererIgnore</code> yönergesinin davranışını taklit
+ etmek isterseniz:</p>
+
+ <pre class="prettyprint lang-config">SetEnvIf Referer example\.com localreferer
+CustomLog referer.log referer env=!localreferer</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="LogFormat" id="LogFormat">LogFormat</a> <a name="logformat" id="logformat">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir günlük dosyasında kullanılmak üzere girdi biçemi tanımlar.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LogFormat <var>biçem</var>|<var>takma-ad</var>
+[<var>takma-ad</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Temel</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_log_config</td></tr>
+</table>
+ <p>Bu yönerge erişim günlüğü dosyasının girdi biçemini belirler.</p>
+
+ <p><code class="directive">LogFormat</code> yönergesi iki şekilde kullanılabilir.
+ Tek argüman belirtilebilen ilkinde daha sonra
+ <code class="directive">TransferLog</code> yönergelerinde belirtilen günlüklerde
+ kullanılmak üzere günlük biçemini belirler. Bu günlük biçemi yukarıda
+ açıklanan <a href="#formats"><var>biçem</var></a> belirteçlerinden
+ oluşur. Bu tek argüman yerine aşağıda açıklandığı gibi önceki bir
+ <code class="directive">LogFormat</code> yönergesinde tanımlanmış bir günlük
+ biçemine atıf yapan bir <var>takma-ad</var> da belirtilebilir.</p>
+
+ <p><code class="directive">LogFormat</code> yönergesinin ikinci kullanım şeklinde
+ <var>biçem</var> bir <var>takma-ad</var> için tanımlanır. Bu takma ad
+ daha sonraki <code class="directive">LogFormat</code> veya <code class="directive"><a href="#customlog">CustomLog</a></code> yönergelerinde aynı biçem
+ dizgesini uzun uzadıya yazmamak için <var>takma-ad</var> olarak
+ kullanılır. Bir <code class="directive">LogFormat</code> yönergesi bir takma ad
+ tanımlamaktan <strong>başka bir şey yapmaz</strong>; yani, yaptığı iş
+ sadece bir takma ad tanımlamaktan ibarettir, biçemi uygulamaz veya
+ biçemi öntanımlı hale getirmez. Bu bakımdan sonraki <code class="directive"><a href="#transferlog">TransferLog</a></code> yönergelerini de
+ etkilemeyecektir. Ayrıca, <code class="directive">LogFormat</code> yönergesi bir
+ takma ada başka bir takma ad tanımlamakta da kullanılamaz. Bir takma
+ adın yüzde imi (<code>%</code>) içeremeyeceğine de dikkat ediniz.</p>
+
+ <pre class="prettyprint lang-config">LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common</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="TransferLog" id="TransferLog">TransferLog</a> <a name="transferlog" id="transferlog">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir günlük dosyasının yerini belirtir.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>TransferLog <var>dosya</var>|<var>borulu-süreç</var>
+[<var>takma-ad</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Temel</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_log_config</td></tr>
+</table>
+ <p>Bir günlük biçemi tanımlanmasını ve şarta bağlı günlük kaydını mümkün
+ kılmaması haricinde <code class="directive"><a href="#customlog">CustomLog</a></code> yönergesi gibidir. Günlük biçemi yerine kendinden
+ önce yer alan bir <code class="directive"><a href="#logformat">LogFormat</a></code> yönergesinde tanımlanan
+ bir takma ad kullanılır. Açıkça bir günlük biçemi takma adı
+ belirtilmedikçe Ortak Günlük Biçemi öntanımlıdır.</p>
+
+ <pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""
+TransferLog logs/access_log</pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="formats" id="formats">Günlük Girdilerinin Kişiselleştirilmesi</a></h2>
@@ -338,176 +508,6 @@
güvenliğinizden nasıl feragat etmiş olacağınız <a href="../misc/security_tips.html#serverroot">güvenlik ipuçları</a>
belgesinde açıklanmıştır.</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="BufferedLogs" id="BufferedLogs">BufferedLogs</a> <a name="bufferedlogs" id="bufferedlogs">Yönergesi</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Günlük girdilerini diske yazmadan önce bellekte tamponlar
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>BufferedLogs On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>BufferedLogs Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli</td></tr>
-<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Temel</td></tr>
-<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_log_config</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>2.0.41 ve sonrasında mevcuttur.</td></tr>
-</table>
- <p><code class="directive">BufferedLogs</code> yönergesi,
- <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> modülünün çeşitli günlük girdilerini her
- isteğin hemen ardından tek tek değil, bir bütün halinde diske yazılmak
- üzere bellekte saklanmasını sağlar. Bu, bazı sistemlerde daha verimli
- disk erişimi, dolayısıyla daha yüksek başarım sağlayabilir. Sadece
- sunucu geneli için belirtilebilir, sanal konaklar için ayrı ayrı
- yapılandırılamaz.</p>
-
- <div class="note">Bir çökme günlük verisi kaybına sebep olacağından bu yönerge
- dikkatli kullanılmalıdır.</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="CustomLog" id="CustomLog">CustomLog</a> <a name="customlog" id="customlog">Yönergesi</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Günlük dosyasın ismini ve girdi biçemini belirler.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>CustomLog <var>dosya</var>|<var>borulu-süreç</var>
-<var>biçem</var>|<var>takma-ad</var>
-[env=[!]<var>ortam-değişkeni</var>]|
-expr=<var>ifade</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
-<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Temel</td></tr>
-<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_log_config</td></tr>
-</table>
- <p><code class="directive">CustomLog</code> yönergesi istekleri günlüğe kaydetmek
- için kullanılır. Yönerge ile bir günlük biçemi belirtilebilir ve günlük
- kaydı isteğin özelliklerine bağlı olarak ortam değişkenleri vasıtasıyla
- şarta bağlı kılınabilir.</p>
-
- <p>İlk argümanda günlüğün yazılacağı yer belirtilir. İki tür yer
- belirtilebilir:</p>
-
- <dl>
- <dt><var>dosya</var></dt>
- <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> yönergesinin
- değerine göreli bir dosya ismi.</dd>
-
- <dt><var>borulu-süreç</var></dt>
- <dd>"<code>|</code>" boru karakteri ile öncelenmiş olarak günlük
- bilgisini standart girdisinden kabul edecek sürecin ismi (veya komut
- satırı) Daha fazla bilgi için <a href="../logs.html#piped">borulu
- günlükler</a>e bakınız.
-
- <div class="warning"><h3>Güvenlik:</h3>
- <p>Bir borulu süreç kullanılmışsa, süreç <code class="program"><a href="../programs/httpd.html">httpd</a></code>’yi
- başlatan kullanıcı tarafından başlatılacaktır. Sunucu root tarafından
- başlatılıyorsa bu root olacaktır; bu bakımdan günlük kaydını alacak
- programın güvenilir olması önemlidir.</p>
- </div>
- <div class="warning"><h3>Bilginize</h3>
- <p>Dosya yolunu belirtirken tersbölü çizgisi kullanılan Unix dışı
- platformlarda bile yapılandırma dosyasında bu amaçla normal bölü
- çizgilerini kullanmaya özen gösterilmelidir.</p>
- </div></dd>
- </dl>
-
- <p>İkinci argümanda günlüğe ne yazılacağı belirtilir. Ya evvelce
- <code class="directive"><a href="#logformat">LogFormat</a></code> yönergesi ile
- tanımlanmış bir <var>takma-ad</var> ya da içeriği <a href="#formats">Günlük Girdilerinin Kişiselleştirilmesi</a> bölümünde
- açıklanmış bir <var>biçem</var> dizgesi olabilir.</p>
-
- <p>Örneğin, aşağıdaki iki yönerge kümesi aynı etkiye sahiptir:</p>
-
- <pre class="prettyprint lang-config"># Biçem dizgesi yerine takma ad içeren CustomLog
-LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common
-CustomLog logs/access_log common
-
-# Biçem dizgesinin kendisini içeren CustomLog
-CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"</pre>
-
-
- <p>Üçüncü argüman isteğe bağlı olup,belli bir isteğin günlüğe kaydedilip
- kaydedilmeyeceğini belirler. Koşul, sunucu <a href="../env.html">ortamında</a> belli bir değişkenin varlığı veya
- yokluğu olabilir (bir '<code>env=!<var>isim</var></code>' durumu).
- İstenirse koşul keyfi bir mantıksal <a href="../expr.html">ifade</a>
- olarak da belirtilebilir. Eğer koşul sağlanmazsa istek günlüğe
- kaydedilmez. İfadede bulunan HTTP başlıklarına başvurular bu başlık
- isimlerinin Vary başlığına eklenmesine sebep olmaz.</p>
-
- <p>Ortam değişkenleri <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>
- ve/veya <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> modülleri kullanılarak her istek
- için ayrı ayrı atanabilir. Örneğin, GIF biçemli resimler için yapılan
- istekleri ana günlük dosyasına değil de başka bir dosyaya kaydetmek
- isterseniz:</p>
-
- <pre class="prettyprint lang-config">SetEnvIf Request_URI \.gif$ gif-image
-CustomLog gif-requests.log common env=gif-image
-CustomLog nongif-requests.log common env=!gif-image</pre>
-
-
- <p>Veya eski <code>RefererIgnore</code> yönergesinin davranışını taklit
- etmek isterseniz:</p>
-
- <pre class="prettyprint lang-config">SetEnvIf Referer example\.com localreferer
-CustomLog referer.log referer env=!localreferer</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="LogFormat" id="LogFormat">LogFormat</a> <a name="logformat" id="logformat">Yönergesi</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir günlük dosyasında kullanılmak üzere girdi biçemi tanımlar.
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LogFormat <var>biçem</var>|<var>takma-ad</var>
-[<var>takma-ad</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
-<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Temel</td></tr>
-<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_log_config</td></tr>
-</table>
- <p>Bu yönerge erişim günlüğü dosyasının girdi biçemini belirler.</p>
-
- <p><code class="directive">LogFormat</code> yönergesi iki şekilde kullanılabilir.
- Tek argüman belirtilebilen ilkinde daha sonra
- <code class="directive">TransferLog</code> yönergelerinde belirtilen günlüklerde
- kullanılmak üzere günlük biçemini belirler. Bu günlük biçemi yukarıda
- açıklanan <a href="#formats"><var>biçem</var></a> belirteçlerinden
- oluşur. Bu tek argüman yerine aşağıda açıklandığı gibi önceki bir
- <code class="directive">LogFormat</code> yönergesinde tanımlanmış bir günlük
- biçemine atıf yapan bir <var>takma-ad</var> da belirtilebilir.</p>
-
- <p><code class="directive">LogFormat</code> yönergesinin ikinci kullanım şeklinde
- <var>biçem</var> bir <var>takma-ad</var> için tanımlanır. Bu takma ad
- daha sonraki <code class="directive">LogFormat</code> veya <code class="directive"><a href="#customlog">CustomLog</a></code> yönergelerinde aynı biçem
- dizgesini uzun uzadıya yazmamak için <var>takma-ad</var> olarak
- kullanılır. Bir <code class="directive">LogFormat</code> yönergesi bir takma ad
- tanımlamaktan <strong>başka bir şey yapmaz</strong>; yani, yaptığı iş
- sadece bir takma ad tanımlamaktan ibarettir, biçemi uygulamaz veya
- biçemi öntanımlı hale getirmez. Bu bakımdan sonraki <code class="directive"><a href="#transferlog">TransferLog</a></code> yönergelerini de
- etkilemeyecektir. Ayrıca, <code class="directive">LogFormat</code> yönergesi bir
- takma ada başka bir takma ad tanımlamakta da kullanılamaz. Bir takma
- adın yüzde imi (<code>%</code>) içeremeyeceğine de dikkat ediniz.</p>
-
- <pre class="prettyprint lang-config">LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common</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="TransferLog" id="TransferLog">TransferLog</a> <a name="transferlog" id="transferlog">Yönergesi</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir günlük dosyasının yerini belirtir.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>TransferLog <var>dosya</var>|<var>borulu-süreç</var>
-[<var>takma-ad</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
-<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Temel</td></tr>
-<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_log_config</td></tr>
-</table>
- <p>Bir günlük biçemi tanımlanmasını ve şarta bağlı günlük kaydını mümkün
- kılmaması haricinde <code class="directive"><a href="#customlog">CustomLog</a></code> yönergesi gibidir. Günlük biçemi yerine kendinden
- önce yer alan bir <code class="directive"><a href="#logformat">LogFormat</a></code> yönergesinde tanımlanan
- bir takma ad kullanılır. Açıkça bir günlük biçemi takma adı
- belirtilmedikçe Ortak Günlük Biçemi öntanımlıdır.</p>
-
- <pre class="prettyprint lang-config">LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""
-TransferLog logs/access_log</pre>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_log_config.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_log_debug.html.en b/docs/manual/mod/mod_log_debug.html.en
index 8d617d30f9..2c11367454 100644
--- a/docs/manual/mod/mod_log_debug.html.en
+++ b/docs/manual/mod/mod_log_debug.html.en
@@ -42,53 +42,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Examples</a></h2>
-
- <ol>
- <li>
- Log message after request to /foo/* is processed:
-
- <pre class="prettyprint lang-config">&lt;Location "/foo/"&gt;
-��LogMessage "/foo/ has been requested"
-&lt;/Location&gt;</pre>
-
- </li>
-
- <li>
- Log message if request to /foo/* is processed in a sub-request:
- <pre class="prettyprint lang-config">&lt;Location "/foo/"&gt;
-��LogMessage "subrequest to /foo/" hook=type_checker expr=%{IS_SUBREQ}
-&lt;/Location&gt;</pre>
-
-
- The default log_transaction hook is not executed for sub-requests,
- therefore we have to use a different hook.
- </li>
-
-
- <li>
- Log message if an IPv6 client causes a request timeout:
- <pre class="prettyprint lang-config">LogMessage "IPv6 timeout from %{REMOTE_ADDR}" "expr=-T %{IPV6} &amp;&amp; %{REQUEST_STATUS} = 408"</pre>
-
- Note the placing of the double quotes for the <code>expr=</code> argument.
- </li>
-
- <li>
- Log the value of the "X-Foo" request environment variable in each
- stage of the request:
- <pre class="prettyprint lang-config">&lt;Location "/"&gt;
-��LogMessage "%{reqenv:X-Foo}" hook=all
-&lt;/Location&gt;</pre>
-
- Together with microsecond time stamps in the error log,
- <code>hook=all</code> also lets you determine the times spent
- in the different parts of the request processing.
- </li>
-
- </ol>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="LogMessage" id="LogMessage">LogMessage</a> <a name="logmessage" id="logmessage">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Log user-defined message to error log
@@ -136,6 +89,53 @@
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Examples</a></h2>
+
+ <ol>
+ <li>
+ Log message after request to /foo/* is processed:
+
+ <pre class="prettyprint lang-config">&lt;Location "/foo/"&gt;
+��LogMessage "/foo/ has been requested"
+&lt;/Location&gt;</pre>
+
+ </li>
+
+ <li>
+ Log message if request to /foo/* is processed in a sub-request:
+ <pre class="prettyprint lang-config">&lt;Location "/foo/"&gt;
+��LogMessage "subrequest to /foo/" hook=type_checker expr=%{IS_SUBREQ}
+&lt;/Location&gt;</pre>
+
+
+ The default log_transaction hook is not executed for sub-requests,
+ therefore we have to use a different hook.
+ </li>
+
+
+ <li>
+ Log message if an IPv6 client causes a request timeout:
+ <pre class="prettyprint lang-config">LogMessage "IPv6 timeout from %{REMOTE_ADDR}" "expr=-T %{IPV6} &amp;&amp; %{REQUEST_STATUS} = 408"</pre>
+
+ Note the placing of the double quotes for the <code>expr=</code> argument.
+ </li>
+
+ <li>
+ Log the value of the "X-Foo" request environment variable in each
+ stage of the request:
+ <pre class="prettyprint lang-config">&lt;Location "/"&gt;
+��LogMessage "%{reqenv:X-Foo}" hook=all
+&lt;/Location&gt;</pre>
+
+ Together with microsecond time stamps in the error log,
+ <code>hook=all</code> also lets you determine the times spent
+ in the different parts of the request processing.
+ </li>
+
+ </ol>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_log_debug.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_log_debug.html.fr b/docs/manual/mod/mod_log_debug.html.fr
index 42b7ec2a61..826448bb04 100644
--- a/docs/manual/mod/mod_log_debug.html.fr
+++ b/docs/manual/mod/mod_log_debug.html.fr
@@ -44,58 +44,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#examples">Exemples</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Exemples</a></h2>
-
- <ol>
- <li>
- Enregistre un message apr�s le traitement d'une requ�te pour
- /foo/* :
-
- <pre class="prettyprint lang-config">&lt;Location /foo/&gt;
-��LogMessage "/foo/ has been requested"
-&lt;/Location&gt;</pre>
-
- </li>
-
- <li>
- Enregistre un message si une requ�te pour /foo/* est trait�e
- dans une sous-requ�te :
- <pre class="prettyprint lang-config">&lt;Location /foo/&gt;
-��LogMessage "subrequest to /foo/" hook=type_checker expr=%{IS_SUBREQ}
-&lt;/Location&gt;</pre>
-
-
- Le branchement (hook) par d�faut log_transaction n'est pas
- ex�cut� pour les sous-requ�tes ; nous devons donc en utiliser un
- autre.
- </li>
-
-
- <li>
- Enregistre un message si un client IPv6 est � l'origine d'un
- d�passement de d�lai pour une requ�te :
- <pre class="prettyprint lang-config">LogMessage "IPv6 timeout from %{REMOTE_ADDR}" "expr=-T %{IPV6} &amp;&amp; %{REQUEST_STATUS} = 408"</pre>
-
- Notez l'emplacement des guillemets pour l'argument
- <code>expr=</code>.
- </li>
-
- <li>
- Enregistre la valeur de la variable d'environnement de requ�te
- "X-Foo" � chaque �tape du traitement :
- <pre class="prettyprint lang-config">&lt;Location /&gt;
-��LogMessage "%{reqenv:X-Foo}" hook=all
-&lt;/Location&gt;</pre>
-
- En association avec les rep�res de temps en microsecondes du journal des erreurs,
- <code>hook=all</code> permet aussi de d�terminer la dur�e d'ex�cution des
- diff�rentes phases du traitement de la requ�te.
- </li>
-
- </ol>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="logmessage" id="logmessage">Directive</a> <a name="LogMessage" id="LogMessage">LogMessage</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enregistre des messages personnalis�s dans le journal des
@@ -149,6 +97,58 @@ erreurs</td></tr>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Exemples</a></h2>
+
+ <ol>
+ <li>
+ Enregistre un message apr�s le traitement d'une requ�te pour
+ /foo/* :
+
+ <pre class="prettyprint lang-config">&lt;Location /foo/&gt;
+��LogMessage "/foo/ has been requested"
+&lt;/Location&gt;</pre>
+
+ </li>
+
+ <li>
+ Enregistre un message si une requ�te pour /foo/* est trait�e
+ dans une sous-requ�te :
+ <pre class="prettyprint lang-config">&lt;Location /foo/&gt;
+��LogMessage "subrequest to /foo/" hook=type_checker expr=%{IS_SUBREQ}
+&lt;/Location&gt;</pre>
+
+
+ Le branchement (hook) par d�faut log_transaction n'est pas
+ ex�cut� pour les sous-requ�tes ; nous devons donc en utiliser un
+ autre.
+ </li>
+
+
+ <li>
+ Enregistre un message si un client IPv6 est � l'origine d'un
+ d�passement de d�lai pour une requ�te :
+ <pre class="prettyprint lang-config">LogMessage "IPv6 timeout from %{REMOTE_ADDR}" "expr=-T %{IPV6} &amp;&amp; %{REQUEST_STATUS} = 408"</pre>
+
+ Notez l'emplacement des guillemets pour l'argument
+ <code>expr=</code>.
+ </li>
+
+ <li>
+ Enregistre la valeur de la variable d'environnement de requ�te
+ "X-Foo" � chaque �tape du traitement :
+ <pre class="prettyprint lang-config">&lt;Location /&gt;
+��LogMessage "%{reqenv:X-Foo}" hook=all
+&lt;/Location&gt;</pre>
+
+ En association avec les rep�res de temps en microsecondes du journal des erreurs,
+ <code>hook=all</code> permet aussi de d�terminer la dur�e d'ex�cution des
+ diff�rentes phases du traitement de la requ�te.
+ </li>
+
+ </ol>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_log_debug.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_log_forensic.html.en b/docs/manual/mod/mod_log_forensic.html.en
index 9c66c02526..1b8f56cce6 100644
--- a/docs/manual/mod/mod_log_forensic.html.en
+++ b/docs/manual/mod/mod_log_forensic.html.en
@@ -69,6 +69,52 @@ version 2.1</td></tr></table>
<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ForensicLog" id="ForensicLog">ForensicLog</a> <a name="forensiclog" id="forensiclog">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets filename of the forensic log</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ForensicLog <var>filename</var>|<var>pipe</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_log_forensic</td></tr>
+</table>
+ <p>The <code class="directive">ForensicLog</code> directive is used to
+ log requests to the server for forensic analysis. Each log entry
+ is assigned a unique ID which can be associated with the request
+ using the normal <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code>
+ directive. <code class="module"><a href="../mod/mod_log_forensic.html">mod_log_forensic</a></code> creates a token called
+ <code>forensic-id</code>, which can be added to the transfer log
+ using the <code>%{forensic-id}n</code> format string.</p>
+
+ <p>The argument, which specifies the location to which
+ the logs will be written, can take one of the following two
+ types of values:</p>
+
+ <dl>
+ <dt><var>filename</var></dt>
+ <dd>A filename, relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</dd>
+
+ <dt><var>pipe</var></dt>
+ <dd>The pipe character "<code>|</code>", followed by the path
+ to a program to receive the log information on its standard
+ input. The program name can be specified relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> directive.
+
+ <div class="warning"><h3>Security:</h3>
+ <p>If a program is used, then it will be run as the user who
+ started <code class="program"><a href="../programs/httpd.html">httpd</a></code>. This will be root if the server was
+ started by root; be sure that the program is secure or switches to a
+ less privileged user.</p>
+ </div>
+
+ <div class="note"><h3>Note</h3>
+ <p>When entering a file path on non-Unix platforms, care should be taken
+ to make sure that only forward slashes are used even though the platform
+ may allow the use of back slashes. In general it is a good idea to always
+ use forward slashes throughout the configuration files.</p>
+ </div></dd>
+ </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="formats" id="formats">Forensic Log Format</a></h2>
<p>Each request is logged two times. The first time is <em>before</em> it's
@@ -115,52 +161,6 @@ version 2.1</td></tr></table>
they should not be readable by anyone except the user that starts the
server.</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="ForensicLog" id="ForensicLog">ForensicLog</a> <a name="forensiclog" id="forensiclog">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets filename of the forensic log</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ForensicLog <var>filename</var>|<var>pipe</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_log_forensic</td></tr>
-</table>
- <p>The <code class="directive">ForensicLog</code> directive is used to
- log requests to the server for forensic analysis. Each log entry
- is assigned a unique ID which can be associated with the request
- using the normal <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code>
- directive. <code class="module"><a href="../mod/mod_log_forensic.html">mod_log_forensic</a></code> creates a token called
- <code>forensic-id</code>, which can be added to the transfer log
- using the <code>%{forensic-id}n</code> format string.</p>
-
- <p>The argument, which specifies the location to which
- the logs will be written, can take one of the following two
- types of values:</p>
-
- <dl>
- <dt><var>filename</var></dt>
- <dd>A filename, relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</dd>
-
- <dt><var>pipe</var></dt>
- <dd>The pipe character "<code>|</code>", followed by the path
- to a program to receive the log information on its standard
- input. The program name can be specified relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> directive.
-
- <div class="warning"><h3>Security:</h3>
- <p>If a program is used, then it will be run as the user who
- started <code class="program"><a href="../programs/httpd.html">httpd</a></code>. This will be root if the server was
- started by root; be sure that the program is secure or switches to a
- less privileged user.</p>
- </div>
-
- <div class="note"><h3>Note</h3>
- <p>When entering a file path on non-Unix platforms, care should be taken
- to make sure that only forward slashes are used even though the platform
- may allow the use of back slashes. In general it is a good idea to always
- use forward slashes throughout the configuration files.</p>
- </div></dd>
- </dl>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_log_forensic.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_log_forensic.html.fr b/docs/manual/mod/mod_log_forensic.html.fr
index 4943af2275..276d75f964 100644
--- a/docs/manual/mod/mod_log_forensic.html.fr
+++ b/docs/manual/mod/mod_log_forensic.html.fr
@@ -76,6 +76,59 @@ d'Apache</a></li>
<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="forensiclog" id="forensiclog">Directive</a> <a name="ForensicLog" id="ForensicLog">ForensicLog</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit le nom de fichier du journal l�gal</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ForensicLog <var>nom-fichier</var>|<var>pipe</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_log_forensic</td></tr>
+</table>
+ <p>La directive <code class="directive">ForensicLog</code> permet de
+ contr�ler la journalisation des requ�tes � des fins d'analyse
+ l�gale. Chaque entr�e du journal se voit assigner un identifiant
+ unique qui peut �tre associ� � la requ�te en utilisant la directive
+ <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> habituelle.
+ <code class="module"><a href="../mod/mod_log_forensic.html">mod_log_forensic</a></code> cr�e un �l�ment nomm�
+ <code>forensic-id</code>, qui peut �tre ajout� au journal standard
+ en utilisant l'�l�ment de format <code>%{forensic-id}n</code>.</p>
+
+ <p>L'argument, qui permet de sp�cifier l'emplacement vers lequel le
+ journal l�gal sera �crit, peut contenir les deux types de valeurs
+ suivants :</p>
+
+ <dl>
+ <dt><var>nom-fichier</var></dt>
+ <dd>Un nom de fichier relatif au r�pertoire d�fini par la
+ directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</dd>
+
+ <dt><var>pipe</var></dt>
+ <dd>Le caract�re pipe "<code>|</code>", suivi du chemin vers un
+ programme qui recevra les informations de la journalisation sur
+ son entr�e standard. Le nom du programme peut �tre relatif au
+ r�pertoire d�fini par la directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.
+
+ <div class="warning"><h3>S�curit� :</h3>
+ <p>Si les journaux sont redirig�s vers un programme, ce dernier
+ s'ex�cutera sous l'utilisateur qui a d�marr�
+ <code class="program"><a href="../programs/httpd.html">httpd</a></code>. Ce sera l'utilisateur root si le serveur
+ a �t� d�marr� par root ; v�rifiez que le programme est
+ s�curis� ou passe sous le contr�le d'un utilisateur poss�dant des
+ droits restreints.</p>
+ </div>
+
+ <div class="note"><h3>Note</h3>
+ <p>Lors de la sp�cification d'un chemin de fichier sur les
+ plate-formes non-Unix, il faut prendre soin de ne pas oublier
+ que seuls les slashes directs doivent �tre utilis�s, m�me si la
+ plate-forme autorise l'emploi d'anti-slashes. D'une mani�re
+ g�n�rale, c'est une bonne id�e que de n'utiliser que des slashes
+ directs dans les fichiers de configuration.</p>
+ </div></dd>
+ </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="formats" id="formats">Format du journal Forensic</a></h2>
<p>Chaque requ�te fait l'objet d'une double journalisation. La
@@ -130,59 +183,6 @@ s�curit�</a></h2>
peuvent contenir des mots de passe) ; ils ne doivent donc �tre
lisibles que par l'utilisateur qui d�marre le serveur.</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="forensiclog" id="forensiclog">Directive</a> <a name="ForensicLog" id="ForensicLog">ForensicLog</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit le nom de fichier du journal l�gal</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ForensicLog <var>nom-fichier</var>|<var>pipe</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_log_forensic</td></tr>
-</table>
- <p>La directive <code class="directive">ForensicLog</code> permet de
- contr�ler la journalisation des requ�tes � des fins d'analyse
- l�gale. Chaque entr�e du journal se voit assigner un identifiant
- unique qui peut �tre associ� � la requ�te en utilisant la directive
- <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> habituelle.
- <code class="module"><a href="../mod/mod_log_forensic.html">mod_log_forensic</a></code> cr�e un �l�ment nomm�
- <code>forensic-id</code>, qui peut �tre ajout� au journal standard
- en utilisant l'�l�ment de format <code>%{forensic-id}n</code>.</p>
-
- <p>L'argument, qui permet de sp�cifier l'emplacement vers lequel le
- journal l�gal sera �crit, peut contenir les deux types de valeurs
- suivants :</p>
-
- <dl>
- <dt><var>nom-fichier</var></dt>
- <dd>Un nom de fichier relatif au r�pertoire d�fini par la
- directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</dd>
-
- <dt><var>pipe</var></dt>
- <dd>Le caract�re pipe "<code>|</code>", suivi du chemin vers un
- programme qui recevra les informations de la journalisation sur
- son entr�e standard. Le nom du programme peut �tre relatif au
- r�pertoire d�fini par la directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.
-
- <div class="warning"><h3>S�curit� :</h3>
- <p>Si les journaux sont redirig�s vers un programme, ce dernier
- s'ex�cutera sous l'utilisateur qui a d�marr�
- <code class="program"><a href="../programs/httpd.html">httpd</a></code>. Ce sera l'utilisateur root si le serveur
- a �t� d�marr� par root ; v�rifiez que le programme est
- s�curis� ou passe sous le contr�le d'un utilisateur poss�dant des
- droits restreints.</p>
- </div>
-
- <div class="note"><h3>Note</h3>
- <p>Lors de la sp�cification d'un chemin de fichier sur les
- plate-formes non-Unix, il faut prendre soin de ne pas oublier
- que seuls les slashes directs doivent �tre utilis�s, m�me si la
- plate-forme autorise l'emploi d'anti-slashes. D'une mani�re
- g�n�rale, c'est une bonne id�e que de n'utiliser que des slashes
- directs dans les fichiers de configuration.</p>
- </div></dd>
- </dl>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_log_forensic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_log_forensic.html.ja.utf8 b/docs/manual/mod/mod_log_forensic.html.ja.utf8
index 80cecdcd87..85eb327400 100644
--- a/docs/manual/mod/mod_log_forensic.html.ja.utf8
+++ b/docs/manual/mod/mod_log_forensic.html.ja.utf8
@@ -71,50 +71,6 @@
<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="formats" id="formats">Forensic ログフォーマット</a></h2>
- <p>各リクエストは2回ログ収集されます。最初はリクエストが処理される
- <em>前</em> (つまり、ヘッダを受け取った後) です。2度目のログは
- リクエストが処理された<em>後</em>、通常のログ収集と同じときに
- 行なわれます。</p>
-
- <p>各リクエストを識別するために、リクエストには
- 一意なリクエスト ID が割り当てられます。この forensic ID は
- フォーマット文字列 <code>%{forensic-id}n</code> を使うことで
- 通常の transfer ログにログ収集することもできます。
- <code class="module"><a href="../mod/mod_unique_id.html">mod_unique_id</a></code> を使っている場合は、それが生成する
- ID が使われます。</p>
-
- <p>最初の行は forensic ID、リクエスト行と受け取ったすべてのヘッダを
- パイプ文字 (<code>|</code>) で分離してログ収集します。
- 例えば以下のようになります (実際はすべて同じ行になります):</p>
-
- <div class="example"><p><code>
- +yQtJf8CoAB4AAFNXBIEAAAAA|GET /manual/de/images/down.gif
- HTTP/1.1|Host:localhost%3a8080|User-Agent:Mozilla/5.0 (X11;
- U; Linux i686; en-US; rv%3a1.6) Gecko/20040216
- Firefox/0.8|Accept:image/png, <var>etc...</var>
- </code></p></div>
-
- <p>最初のプラス文字がこのログは最初のログであることを示します。
- 二番目の行はマイナス文字と ID のみです:</p>
-
- <div class="example"><p><code>
- -yQtJf8CoAB4AAFNXBIEAAAAA
- </code></p></div>
-
- <p><code>check_forensic</code> スクリプトは引数としてログファイルの名前を
- 取ります。<code>+</code>/<code>-</code> の ID の組を調べ、完了していない
- リクエストがある場合は警告を発します。</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="security" id="security">セキュリティの問題</a></h2>
- <p>ログファイルが保存されるディレクトリがサーバを起動したユーザ
- 以外で書き込み可能になっているときにセキュリティが破られる可能性が
- あることについての詳細は<a href="../misc/security_tips.html#serverroot">セキュリティのこつ</a>を
- 参照してください。</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="ForensicLog" id="ForensicLog">ForensicLog</a> <a name="forensiclog" id="forensiclog">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Forensic ログのファイル名を設定する</td></tr>
@@ -162,6 +118,50 @@
</dl>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="formats" id="formats">Forensic ログフォーマット</a></h2>
+ <p>各リクエストは2回ログ収集されます。最初はリクエストが処理される
+ <em>前</em> (つまり、ヘッダを受け取った後) です。2度目のログは
+ リクエストが処理された<em>後</em>、通常のログ収集と同じときに
+ 行なわれます。</p>
+
+ <p>各リクエストを識別するために、リクエストには
+ 一意なリクエスト ID が割り当てられます。この forensic ID は
+ フォーマット文字列 <code>%{forensic-id}n</code> を使うことで
+ 通常の transfer ログにログ収集することもできます。
+ <code class="module"><a href="../mod/mod_unique_id.html">mod_unique_id</a></code> を使っている場合は、それが生成する
+ ID が使われます。</p>
+
+ <p>最初の行は forensic ID、リクエスト行と受け取ったすべてのヘッダを
+ パイプ文字 (<code>|</code>) で分離してログ収集します。
+ 例えば以下のようになります (実際はすべて同じ行になります):</p>
+
+ <div class="example"><p><code>
+ +yQtJf8CoAB4AAFNXBIEAAAAA|GET /manual/de/images/down.gif
+ HTTP/1.1|Host:localhost%3a8080|User-Agent:Mozilla/5.0 (X11;
+ U; Linux i686; en-US; rv%3a1.6) Gecko/20040216
+ Firefox/0.8|Accept:image/png, <var>etc...</var>
+ </code></p></div>
+
+ <p>最初のプラス文字がこのログは最初のログであることを示します。
+ 二番目の行はマイナス文字と ID のみです:</p>
+
+ <div class="example"><p><code>
+ -yQtJf8CoAB4AAFNXBIEAAAAA
+ </code></p></div>
+
+ <p><code>check_forensic</code> スクリプトは引数としてログファイルの名前を
+ 取ります。<code>+</code>/<code>-</code> の ID の組を調べ、完了していない
+ リクエストがある場合は警告を発します。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="security" id="security">セキュリティの問題</a></h2>
+ <p>ログファイルが保存されるディレクトリがサーバを起動したユーザ
+ 以外で書き込み可能になっているときにセキュリティが破られる可能性が
+ あることについての詳細は<a href="../misc/security_tips.html#serverroot">セキュリティのこつ</a>を
+ 参照してください。</p>
+</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_log_forensic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_log_forensic.html.tr.utf8 b/docs/manual/mod/mod_log_forensic.html.tr.utf8
index 4a8e40695b..171b28cb8e 100644
--- a/docs/manual/mod/mod_log_forensic.html.tr.utf8
+++ b/docs/manual/mod/mod_log_forensic.html.tr.utf8
@@ -66,6 +66,53 @@
<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ForensicLog" id="ForensicLog">ForensicLog</a> <a name="forensiclog" id="forensiclog">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Adli günlük için dosya ismini belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ForensicLog <var>dosya-adı</var>|<var>borulu-süreç</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_log_forensic</td></tr>
+</table>
+ <p><code class="directive">ForensicLog</code> yönergesi adli inceleme için
+ sunucuya yapılan istekleri günlüğe kaydetmekte kullanılır. Her günlük
+ girdisine, normal <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> yönergesinde kullanılarak istekle
+ ilişkilendirilebilen eşsiz bir kimlik atanır.
+ <code class="module"><a href="../mod/mod_log_forensic.html">mod_log_forensic</a></code> modülü, aktarım günlüğünün biçem
+ dizgesinde <code>%{forensic-id}n</code> şeklinde kullanılmak üzere
+ <code>forensic-id</code> adı verilen bir dizgecik oluşturur.</p>
+
+ <p>Günlüğün yazılacağı yeri belirleyen argüman şu iki değerden birini
+ alabilir:</p>
+
+ <dl>
+ <dt><var>dosya-adı</var></dt>
+ <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> yönergesinin
+ değerine göreli bir dosya ismi.</dd>
+
+ <dt><var>borulu-süreç</var></dt>
+ <dd>"<code>|</code>" boru karakteri ile öncelenmiş olarak günlük
+ bilgisini standart girdisinden kabul edecek sürecin ismi (veya komut
+ satırı). Program adının <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> yönergesinin değerine göre belirtildiği
+ varsayılır.
+
+ <div class="warning"><h3>Güvenlik:</h3>
+ <p>Bir borulu süreç kullanılmışsa, süreç <code class="program"><a href="../programs/httpd.html">httpd</a></code>’yi
+ başlatan kullanıcı tarafından başlatılacaktır. Sunucu root tarafından
+ başlatılıyorsa bu root olacaktır; bu bakımdan günlük kaydını alacak
+ programın güvenilir olması veya daha az yetkili bir kullanıcıya geçiş
+ yapması önemlidir.</p>
+ </div>
+
+ <div class="warning"><h3>Bilginize</h3>
+ <p>Dosya yolunu belirtirken tersbölü çizgisi kullanılan Unix dışı
+ platformlarda bile yapılandırma dosyasında bu amaçla normal bölü
+ çizgilerini kullanmaya özen gösterilmelidir.</p>
+ </div></dd>
+ </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="formats" id="formats">Adli Günlük Biçemi</a></h2>
<p>Her istek günlüğe iki defa kaydedilir. İlki, işlemin başlangıcında
@@ -113,53 +160,6 @@
sunucuyu başlatan kullanıcıdan başkası tarafından okunamaması sağlanmış
olmalıdır.</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="ForensicLog" id="ForensicLog">ForensicLog</a> <a name="forensiclog" id="forensiclog">Yönergesi</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Adli günlük için dosya ismini belirler.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ForensicLog <var>dosya-adı</var>|<var>borulu-süreç</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
-<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
-<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_log_forensic</td></tr>
-</table>
- <p><code class="directive">ForensicLog</code> yönergesi adli inceleme için
- sunucuya yapılan istekleri günlüğe kaydetmekte kullanılır. Her günlük
- girdisine, normal <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> yönergesinde kullanılarak istekle
- ilişkilendirilebilen eşsiz bir kimlik atanır.
- <code class="module"><a href="../mod/mod_log_forensic.html">mod_log_forensic</a></code> modülü, aktarım günlüğünün biçem
- dizgesinde <code>%{forensic-id}n</code> şeklinde kullanılmak üzere
- <code>forensic-id</code> adı verilen bir dizgecik oluşturur.</p>
-
- <p>Günlüğün yazılacağı yeri belirleyen argüman şu iki değerden birini
- alabilir:</p>
-
- <dl>
- <dt><var>dosya-adı</var></dt>
- <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> yönergesinin
- değerine göreli bir dosya ismi.</dd>
-
- <dt><var>borulu-süreç</var></dt>
- <dd>"<code>|</code>" boru karakteri ile öncelenmiş olarak günlük
- bilgisini standart girdisinden kabul edecek sürecin ismi (veya komut
- satırı). Program adının <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> yönergesinin değerine göre belirtildiği
- varsayılır.
-
- <div class="warning"><h3>Güvenlik:</h3>
- <p>Bir borulu süreç kullanılmışsa, süreç <code class="program"><a href="../programs/httpd.html">httpd</a></code>’yi
- başlatan kullanıcı tarafından başlatılacaktır. Sunucu root tarafından
- başlatılıyorsa bu root olacaktır; bu bakımdan günlük kaydını alacak
- programın güvenilir olması veya daha az yetkili bir kullanıcıya geçiş
- yapması önemlidir.</p>
- </div>
-
- <div class="warning"><h3>Bilginize</h3>
- <p>Dosya yolunu belirtirken tersbölü çizgisi kullanılan Unix dışı
- platformlarda bile yapılandırma dosyasında bu amaçla normal bölü
- çizgilerini kullanmaya özen gösterilmelidir.</p>
- </div></dd>
- </dl>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_log_forensic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en
index 9f32118b28..93bc7e0f9b 100644
--- a/docs/manual/mod/mod_lua.html.en
+++ b/docs/manual/mod/mod_lua.html.en
@@ -95,6 +95,633 @@ trust, as it can be abused to change the internal workings of httpd.</p>
<li><img alt="" src="../images/down.gif" /> <a href="#databases">Database connectivity</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LuaAuthzProvider" id="LuaAuthzProvider">LuaAuthzProvider</a> <a name="luaauthzprovider" id="luaauthzprovider">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Plug an authorization provider function into <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code>
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaAuthzProvider provider_name /path/to/lua/script.lua function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.3 and later</td></tr>
+</table>
+<p>After a lua function has been registered as authorization provider, it can be used
+with the <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> directive:</p>
+
+<pre class="prettyprint lang-config">LuaRoot "/usr/local/apache2/lua"
+LuaAuthzProvider foo authz.lua authz_check_foo
+&lt;Location "/"&gt;
+ Require foo johndoe
+&lt;/Location&gt;</pre>
+
+<pre class="prettyprint lang-lua">require "apache2"
+function authz_check_foo(r, who)
+ if r.user ~= who then return apache2.AUTHZ_DENIED
+ return apache2.AUTHZ_GRANTED
+end</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="LuaCodeCache" id="LuaCodeCache">LuaCodeCache</a> <a name="luacodecache" id="luacodecache">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure the compiled code cache.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaCodeCache stat|forever|never</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LuaCodeCache stat</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table><p>
+ Specify the behavior of the in-memory code cache. The default
+ is stat, which stats the top level script (not any included
+ ones) each time that file is needed, and reloads it if the
+ modified time indicates it is newer than the one it has
+ already loaded. The other values cause it to keep the file
+ cached forever (don't stat and replace) or to never cache the
+ file.</p>
+
+ <p>In general stat or forever is good for production, and stat or never
+ for development.</p>
+
+ <div class="example"><h3>Examples:</h3><pre class="prettyprint lang-config">LuaCodeCache stat
+LuaCodeCache forever
+LuaCodeCache never</pre>
+</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="LuaHookAccessChecker" id="LuaHookAccessChecker">LuaHookAccessChecker</a> <a name="luahookaccesschecker" id="luahookaccesschecker">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the access_checker phase of request processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookAccessChecker /path/to/lua/script.lua hook_function_name [early|late]</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The optional third argument is supported in 2.3.15 and later</td></tr>
+</table>
+<p>Add your hook to the access_checker phase. An access checker
+hook function usually returns OK, DECLINED, or HTTP_FORBIDDEN.</p>
+ <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late"
+ control when this script runs relative to other modules.</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="LuaHookAuthChecker" id="LuaHookAuthChecker">LuaHookAuthChecker</a> <a name="luahookauthchecker" id="luahookauthchecker">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the auth_checker phase of request processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookAuthChecker /path/to/lua/script.lua hook_function_name [early|late]</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The optional third argument is supported in 2.3.15 and later</td></tr>
+</table>
+<p>Invoke a lua function in the auth_checker phase of processing
+a request. This can be used to implement arbitrary authentication
+and authorization checking. A very simple example:
+</p>
+<pre class="prettyprint lang-lua">require 'apache2'
+
+-- fake authcheck hook
+-- If request has no auth info, set the response header and
+-- return a 401 to ask the browser for basic auth info.
+-- If request has auth info, don't actually look at it, just
+-- pretend we got userid 'foo' and validated it.
+-- Then check if the userid is 'foo' and accept the request.
+function authcheck_hook(r)
+
+ -- look for auth info
+ auth = r.headers_in['Authorization']
+ if auth ~= nil then
+ -- fake the user
+ r.user = 'foo'
+ end
+
+ if r.user == nil then
+ r:debug("authcheck: user is nil, returning 401")
+ r.err_headers_out['WWW-Authenticate'] = 'Basic realm="WallyWorld"'
+ return 401
+ elseif r.user == "foo" then
+ r:debug('user foo: OK')
+ else
+ r:debug("authcheck: user='" .. r.user .. "'")
+ r.err_headers_out['WWW-Authenticate'] = 'Basic realm="WallyWorld"'
+ return 401
+ end
+ return apache2.OK
+end</pre>
+
+ <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late"
+ control when this script runs relative to other modules.</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="LuaHookCheckUserID" id="LuaHookCheckUserID">LuaHookCheckUserID</a> <a name="luahookcheckuserid" id="luahookcheckuserid">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the check_user_id phase of request processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookCheckUserID /path/to/lua/script.lua hook_function_name [early|late]</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The optional third argument is supported in 2.3.15 and later</td></tr>
+</table><p>...</p>
+ <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late"
+ control when this script runs relative to other modules.</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="LuaHookFixups" id="LuaHookFixups">LuaHookFixups</a> <a name="luahookfixups" id="luahookfixups">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the fixups phase of a request
+processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookFixups /path/to/lua/script.lua hook_function_name</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+<p>
+ Just like LuaHookTranslateName, but executed at the fixups phase
+</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="LuaHookInsertFilter" id="LuaHookInsertFilter">LuaHookInsertFilter</a> <a name="luahookinsertfilter" id="luahookinsertfilter">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the insert_filter phase of request processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookInsertFilter /path/to/lua/script.lua hook_function_name</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table><p>Not Yet Implemented</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="LuaHookLog" id="LuaHookLog">LuaHookLog</a> <a name="luahooklog" id="luahooklog">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the access log phase of a request
+processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookLog /path/to/lua/script.lua log_function_name</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+<p>
+ This simple logging hook allows you to run a function when httpd enters the
+ logging phase of a request. With it, you can append data to your own logs,
+ manipulate data before the regular log is written, or prevent a log entry
+ from being created. To prevent the usual logging from happening, simply return
+ <code>apache2.DONE</code> in your logging handler, otherwise return
+ <code>apache2.OK</code> to tell httpd to log as normal.
+</p>
+<p>Example:</p>
+<pre class="prettyprint lang-config">LuaHookLog "/path/to/script.lua" logger</pre>
+
+<pre class="prettyprint lang-lua">-- /path/to/script.lua --
+function logger(r)
+ -- flip a coin:
+ -- If 1, then we write to our own Lua log and tell httpd not to log
+ -- in the main log.
+ -- If 2, then we just sanitize the output a bit and tell httpd to
+ -- log the sanitized bits.
+
+ if math.random(1,2) == 1 then
+ -- Log stuff ourselves and don't log in the regular log
+ local f = io.open("/foo/secret.log", "a")
+ if f then
+ f:write("Something secret happened at " .. r.uri .. "\n")
+ f:close()
+ end
+ return apache2.DONE -- Tell httpd not to use the regular logging functions
+ else
+ r.uri = r.uri:gsub("somesecretstuff", "") -- sanitize the URI
+ return apache2.OK -- tell httpd to log it.
+ end
+end</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="LuaHookMapToStorage" id="LuaHookMapToStorage">LuaHookMapToStorage</a> <a name="luahookmaptostorage" id="luahookmaptostorage">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the map_to_storage phase of request processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookMapToStorage /path/to/lua/script.lua hook_function_name</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>Like <code class="directive">LuaHookTranslateName</code> but executed at the
+ map-to-storage phase of a request. Modules like mod_cache run at this phase,
+ which makes for an interesting example on what to do here:</p>
+ <pre class="prettyprint lang-config">LuaHookMapToStorage "/path/to/lua/script.lua" check_cache</pre>
+
+ <pre class="prettyprint lang-lua">require"apache2"
+cached_files = {}
+
+function read_file(filename)
+ local input = io.open(filename, "r")
+ if input then
+ local data = input:read("*a")
+ cached_files[filename] = data
+ file = cached_files[filename]
+ input:close()
+ end
+ return cached_files[filename]
+end
+
+function check_cache(r)
+ if r.filename:match("%.png$") then -- Only match PNG files
+ local file = cached_files[r.filename] -- Check cache entries
+ if not file then
+ file = read_file(r.filename) -- Read file into cache
+ end
+ if file then -- If file exists, write it out
+ r.status = 200
+ r:write(file)
+ r:info(("Sent %s to client from cache"):format(r.filename))
+ return apache2.DONE -- skip default handler for PNG files
+ end
+ end
+ return apache2.DECLINED -- If we had nothing to do, let others serve this.
+end</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="LuaHookTranslateName" id="LuaHookTranslateName">LuaHookTranslateName</a> <a name="luahooktranslatename" id="luahooktranslatename">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the translate name phase of request processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookTranslateName /path/to/lua/script.lua hook_function_name [early|late]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The optional third argument is supported in 2.3.15 and later</td></tr>
+</table><p>
+ Add a hook (at APR_HOOK_MIDDLE) to the translate name phase of
+ request processing. The hook function receives a single
+ argument, the request_rec, and should return a status code,
+ which is either an HTTP error code, or the constants defined
+ in the apache2 module: apache2.OK, apache2.DECLINED, or
+ apache2.DONE. </p>
+
+ <p>For those new to hooks, basically each hook will be invoked
+ until one of them returns apache2.OK. If your hook doesn't
+ want to do the translation it should just return
+ apache2.DECLINED. If the request should stop processing, then
+ return apache2.DONE.</p>
+
+ <p>Example:</p>
+
+<pre class="prettyprint lang-config"># httpd.conf
+LuaHookTranslateName "/scripts/conf/hooks.lua" silly_mapper</pre>
+
+
+<pre class="prettyprint lang-lua">-- /scripts/conf/hooks.lua --
+require "apache2"
+function silly_mapper(r)
+ if r.uri == "/" then
+ r.filename = "/var/www/home.lua"
+ return apache2.OK
+ else
+ return apache2.DECLINED
+ end
+end</pre>
+
+
+ <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, or htaccess
+ context.</p></div>
+
+ <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late"
+ control when this script runs relative to other modules.</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="LuaHookTypeChecker" id="LuaHookTypeChecker">LuaHookTypeChecker</a> <a name="luahooktypechecker" id="luahooktypechecker">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the type_checker phase of request processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookTypeChecker /path/to/lua/script.lua hook_function_name</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table><p>
+ This directive provides a hook for the type_checker phase of the request processing.
+ This phase is where requests are assigned a content type and a handler, and thus can
+ be used to modify the type and handler based on input:
+ </p>
+ <pre class="prettyprint lang-config">LuaHookTypeChecker "/path/to/lua/script.lua" type_checker</pre>
+
+ <pre class="prettyprint lang-lua"> function type_checker(r)
+ if r.uri:match("%.to_gif$") then -- match foo.png.to_gif
+ r.content_type = "image/gif" -- assign it the image/gif type
+ r.handler = "gifWizard" -- tell the gifWizard module to handle this
+ r.filename = r.uri:gsub("%.to_gif$", "") -- fix the filename requested
+ return apache2.OK
+ end
+
+ return apache2.DECLINED
+ end</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="LuaInherit" id="LuaInherit">LuaInherit</a> <a name="luainherit" id="luainherit">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls how parent configuration sections are merged into children</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaInherit none|parent-first|parent-last</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LuaInherit parent-first</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.0 and later</td></tr>
+</table><p>By default, if LuaHook* directives are used in overlapping
+ Directory or Location configuration sections, the scripts defined in the
+ more specific section are run <em>after</em> those defined in the more
+ generic section (LuaInherit parent-first). You can reverse this order, or
+ make the parent context not apply at all.</p>
+
+ <p> In previous 2.3.x releases, the default was effectively to ignore LuaHook*
+ directives from parent configuration sections.</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="LuaInputFilter" id="LuaInputFilter">LuaInputFilter</a> <a name="luainputfilter" id="luainputfilter">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a Lua function for content input filtering</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaInputFilter filter_name /path/to/lua/script.lua function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.5 and later</td></tr>
+</table>
+<p>Provides a means of adding a Lua function as an input filter.
+As with output filters, input filters work as coroutines,
+first yielding before buffers are sent, then yielding whenever
+a bucket needs to be passed down the chain, and finally (optionally)
+yielding anything that needs to be appended to the input data. The
+global variable <code>bucket</code> holds the buckets as they are passed
+onto the Lua script:
+</p>
+
+<pre class="prettyprint lang-config">LuaInputFilter myInputFilter "/www/filter.lua" input_filter
+&lt;Files "*.lua"&gt;
+ SetInputFilter myInputFilter
+&lt;/Files&gt;</pre>
+
+<pre class="prettyprint lang-lua">--[[
+ Example input filter that converts all POST data to uppercase.
+]]--
+function input_filter(r)
+ print("luaInputFilter called") -- debug print
+ coroutine.yield() -- Yield and wait for buckets
+ while bucket do -- For each bucket, do...
+ local output = string.upper(bucket) -- Convert all POST data to uppercase
+ coroutine.yield(output) -- Send converted data down the chain
+ end
+ -- No more buckets available.
+ coroutine.yield("&amp;filterSignature=1234") -- Append signature at the end
+end</pre>
+
+<p>
+The input filter supports denying/skipping a filter if it is deemed unwanted:
+</p>
+<pre class="prettyprint lang-lua">function input_filter(r)
+ if not good then
+ return -- Simply deny filtering, passing on the original content instead
+ end
+ coroutine.yield() -- wait for buckets
+ ... -- insert filter stuff here
+end</pre>
+
+<p>
+See "<a href="#modifying_buckets">Modifying contents with Lua
+filters</a>" for more information.
+</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="LuaMapHandler" id="LuaMapHandler">LuaMapHandler</a> <a name="luamaphandler" id="luamaphandler">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Map a path to a lua handler</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaMapHandler uri-pattern /path/to/lua/script.lua [function-name]</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>This directive matches a uri pattern to invoke a specific
+ handler function in a specific file. It uses PCRE regular
+ expressions to match the uri, and supports interpolating
+ match groups into both the file path and the function name.
+ Be careful writing your regular expressions to avoid security
+ issues.</p>
+ <div class="example"><h3>Examples:</h3><pre class="prettyprint lang-config">LuaMapHandler "/(\w+)/(\w+)" "/scripts/$1.lua" "handle_$2"</pre>
+</div>
+ <p>This would match uri's such as /photos/show?id=9
+ to the file /scripts/photos.lua and invoke the
+ handler function handle_show on the lua vm after
+ loading that file.</p>
+
+<pre class="prettyprint lang-config">LuaMapHandler "/bingo" "/scripts/wombat.lua"</pre>
+
+ <p>This would invoke the "handle" function, which
+ is the default if no specific function name is
+ provided.</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="LuaOutputFilter" id="LuaOutputFilter">LuaOutputFilter</a> <a name="luaoutputfilter" id="luaoutputfilter">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a Lua function for content output filtering</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaOutputFilter filter_name /path/to/lua/script.lua function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.5 and later</td></tr>
+</table>
+<p>Provides a means of adding a Lua function as an output filter.
+As with input filters, output filters work as coroutines,
+first yielding before buffers are sent, then yielding whenever
+a bucket needs to be passed down the chain, and finally (optionally)
+yielding anything that needs to be appended to the input data. The
+global variable <code>bucket</code> holds the buckets as they are passed
+onto the Lua script:
+</p>
+
+<pre class="prettyprint lang-config">LuaOutputFilter myOutputFilter "/www/filter.lua" output_filter
+&lt;Files "*.lua"&gt;
+ SetOutputFilter myOutputFilter
+&lt;/Files&gt;</pre>
+
+<pre class="prettyprint lang-lua">--[[
+ Example output filter that escapes all HTML entities in the output
+]]--
+function output_filter(r)
+ coroutine.yield("(Handled by myOutputFilter)&lt;br/&gt;\n") -- Prepend some data to the output,
+ -- yield and wait for buckets.
+ while bucket do -- For each bucket, do...
+ local output = r:escape_html(bucket) -- Escape all output
+ coroutine.yield(output) -- Send converted data down the chain
+ end
+ -- No more buckets available.
+end</pre>
+
+<p>
+As with the input filter, the output filter supports denying/skipping a filter
+if it is deemed unwanted:
+</p>
+<pre class="prettyprint lang-lua">function output_filter(r)
+ if not r.content_type:match("text/html") then
+ return -- Simply deny filtering, passing on the original content instead
+ end
+ coroutine.yield() -- wait for buckets
+ ... -- insert filter stuff here
+end</pre>
+
+<div class="note"><h3>Lua filters with <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code></h3>
+<p> When a Lua filter is used as the underlying provider via the
+<code class="directive"><a href="../mod/mod_filter.html#filterprovider">FilterProvider</a></code> directive, filtering
+will only work when the <var>filter-name</var> is identical to the <var>provider-name</var>.
+</p> </div>
+
+<p>
+See "<a href="#modifying_buckets">Modifying contents with Lua filters</a>" for more
+information.
+</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="LuaPackageCPath" id="LuaPackageCPath">LuaPackageCPath</a> <a name="luapackagecpath" id="luapackagecpath">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Add a directory to lua's package.cpath</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaPackageCPath /path/to/include/?.soa</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>Add a path to lua's shared library search path. Follows the same
+ conventions as lua. This just munges the package.cpath in the
+ lua vms.</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="LuaPackagePath" id="LuaPackagePath">LuaPackagePath</a> <a name="luapackagepath" id="luapackagepath">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Add a directory to lua's package.path</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaPackagePath /path/to/include/?.lua</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table><p>Add a path to lua's module search path. Follows the same
+ conventions as lua. This just munges the package.path in the
+ lua vms.</p>
+
+ <div class="example"><h3>Examples:</h3><pre class="prettyprint lang-config">LuaPackagePath "/scripts/lib/?.lua"
+LuaPackagePath "/scripts/lib/?/init.lua"</pre>
+</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="LuaQuickHandler" id="LuaQuickHandler">LuaQuickHandler</a> <a name="luaquickhandler" id="luaquickhandler">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the quick handler of request processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaQuickHandler /path/to/script.lua hook_function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>
+ This phase is run immediately after the request has been mapped to a virtal host,
+ and can be used to either do some request processing before the other phases kick
+ in, or to serve a request without the need to translate, map to storage et cetera.
+ As this phase is run before anything else, directives such as <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> or <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> are void in this phase, just as
+ URIs have not been properly parsed yet.
+ </p>
+ <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, or htaccess
+ context.</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="LuaRoot" id="LuaRoot">LuaRoot</a> <a name="luaroot" id="luaroot">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify the base path for resolving relative paths for mod_lua directives</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaRoot /path/to/a/directory</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>Specify the base path which will be used to evaluate all
+ relative paths within mod_lua. If not specified they
+ will be resolved relative to the current working directory,
+ which may not always work well for a server.</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="LuaScope" id="LuaScope">LuaScope</a> <a name="luascope" id="luascope">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>One of once, request, conn, thread -- default is once</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaScope once|request|conn|thread|server [min] [max]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LuaScope once</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#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>Specify the life cycle scope of the Lua interpreter which will
+ be used by handlers in this "Directory." The default is "once"</p>
+
+ <dl>
+ <dt>once:</dt> <dd>use the interpreter once and throw it away.</dd>
+
+ <dt>request:</dt> <dd>use the interpreter to handle anything based on
+ the same file within this request, which is also
+ request scoped.</dd>
+
+ <dt>conn:</dt> <dd>Same as request but attached to the connection_rec</dd>
+
+ <dt>thread:</dt> <dd>Use the interpreter for the lifetime of the thread
+ handling the request (only available with threaded MPMs).</dd>
+
+ <dt>server:</dt> <dd>This one is different than others because the
+ server scope is quite long lived, and multiple threads
+ will have the same server_rec. To accommodate this,
+ server scoped Lua states are stored in an apr
+ resource list. The <code>min</code> and <code>max</code> arguments
+ specify the minimum and maximum number of Lua states to keep in the
+ pool.</dd>
+ </dl>
+ <p>
+ Generally speaking, the <code>thread</code> and <code>server</code> scopes
+ execute roughly 2-3 times faster than the rest, because they don't have to
+ spawn new Lua states on every request (especially with the event MPM, as
+ even keepalive requests will use a new thread for each request). If you are
+ satisfied that your scripts will not have problems reusing a state, then
+ the <code>thread</code> or <code>server</code> scopes should be used for
+ maximum performance. While the <code>thread</code> scope will provide the
+ fastest responses, the <code>server</code> scope will use less memory, as
+ states are pooled, allowing f.x. 1000 threads to share only 100 Lua states,
+ thus using only 10% of the memory required by the <code>thread</code> scope.
+ </p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="basicconf" id="basicconf">Basic Configuration</a></h2>
@@ -1234,633 +1861,6 @@ collectgarbage() -- close the handle via GC</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="LuaAuthzProvider" id="LuaAuthzProvider">LuaAuthzProvider</a> <a name="luaauthzprovider" id="luaauthzprovider">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Plug an authorization provider function into <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code>
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaAuthzProvider provider_name /path/to/lua/script.lua function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.3 and later</td></tr>
-</table>
-<p>After a lua function has been registered as authorization provider, it can be used
-with the <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> directive:</p>
-
-<pre class="prettyprint lang-config">LuaRoot "/usr/local/apache2/lua"
-LuaAuthzProvider foo authz.lua authz_check_foo
-&lt;Location "/"&gt;
- Require foo johndoe
-&lt;/Location&gt;</pre>
-
-<pre class="prettyprint lang-lua">require "apache2"
-function authz_check_foo(r, who)
- if r.user ~= who then return apache2.AUTHZ_DENIED
- return apache2.AUTHZ_GRANTED
-end</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="LuaCodeCache" id="LuaCodeCache">LuaCodeCache</a> <a name="luacodecache" id="luacodecache">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure the compiled code cache.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaCodeCache stat|forever|never</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LuaCodeCache stat</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table><p>
- Specify the behavior of the in-memory code cache. The default
- is stat, which stats the top level script (not any included
- ones) each time that file is needed, and reloads it if the
- modified time indicates it is newer than the one it has
- already loaded. The other values cause it to keep the file
- cached forever (don't stat and replace) or to never cache the
- file.</p>
-
- <p>In general stat or forever is good for production, and stat or never
- for development.</p>
-
- <div class="example"><h3>Examples:</h3><pre class="prettyprint lang-config">LuaCodeCache stat
-LuaCodeCache forever
-LuaCodeCache never</pre>
-</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="LuaHookAccessChecker" id="LuaHookAccessChecker">LuaHookAccessChecker</a> <a name="luahookaccesschecker" id="luahookaccesschecker">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the access_checker phase of request processing</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookAccessChecker /path/to/lua/script.lua hook_function_name [early|late]</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The optional third argument is supported in 2.3.15 and later</td></tr>
-</table>
-<p>Add your hook to the access_checker phase. An access checker
-hook function usually returns OK, DECLINED, or HTTP_FORBIDDEN.</p>
- <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late"
- control when this script runs relative to other modules.</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="LuaHookAuthChecker" id="LuaHookAuthChecker">LuaHookAuthChecker</a> <a name="luahookauthchecker" id="luahookauthchecker">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the auth_checker phase of request processing</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookAuthChecker /path/to/lua/script.lua hook_function_name [early|late]</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The optional third argument is supported in 2.3.15 and later</td></tr>
-</table>
-<p>Invoke a lua function in the auth_checker phase of processing
-a request. This can be used to implement arbitrary authentication
-and authorization checking. A very simple example:
-</p>
-<pre class="prettyprint lang-lua">require 'apache2'
-
--- fake authcheck hook
--- If request has no auth info, set the response header and
--- return a 401 to ask the browser for basic auth info.
--- If request has auth info, don't actually look at it, just
--- pretend we got userid 'foo' and validated it.
--- Then check if the userid is 'foo' and accept the request.
-function authcheck_hook(r)
-
- -- look for auth info
- auth = r.headers_in['Authorization']
- if auth ~= nil then
- -- fake the user
- r.user = 'foo'
- end
-
- if r.user == nil then
- r:debug("authcheck: user is nil, returning 401")
- r.err_headers_out['WWW-Authenticate'] = 'Basic realm="WallyWorld"'
- return 401
- elseif r.user == "foo" then
- r:debug('user foo: OK')
- else
- r:debug("authcheck: user='" .. r.user .. "'")
- r.err_headers_out['WWW-Authenticate'] = 'Basic realm="WallyWorld"'
- return 401
- end
- return apache2.OK
-end</pre>
-
- <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late"
- control when this script runs relative to other modules.</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="LuaHookCheckUserID" id="LuaHookCheckUserID">LuaHookCheckUserID</a> <a name="luahookcheckuserid" id="luahookcheckuserid">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the check_user_id phase of request processing</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookCheckUserID /path/to/lua/script.lua hook_function_name [early|late]</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The optional third argument is supported in 2.3.15 and later</td></tr>
-</table><p>...</p>
- <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late"
- control when this script runs relative to other modules.</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="LuaHookFixups" id="LuaHookFixups">LuaHookFixups</a> <a name="luahookfixups" id="luahookfixups">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the fixups phase of a request
-processing</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookFixups /path/to/lua/script.lua hook_function_name</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
-<p>
- Just like LuaHookTranslateName, but executed at the fixups phase
-</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="LuaHookInsertFilter" id="LuaHookInsertFilter">LuaHookInsertFilter</a> <a name="luahookinsertfilter" id="luahookinsertfilter">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the insert_filter phase of request processing</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookInsertFilter /path/to/lua/script.lua hook_function_name</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table><p>Not Yet Implemented</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="LuaHookLog" id="LuaHookLog">LuaHookLog</a> <a name="luahooklog" id="luahooklog">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the access log phase of a request
-processing</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookLog /path/to/lua/script.lua log_function_name</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
-<p>
- This simple logging hook allows you to run a function when httpd enters the
- logging phase of a request. With it, you can append data to your own logs,
- manipulate data before the regular log is written, or prevent a log entry
- from being created. To prevent the usual logging from happening, simply return
- <code>apache2.DONE</code> in your logging handler, otherwise return
- <code>apache2.OK</code> to tell httpd to log as normal.
-</p>
-<p>Example:</p>
-<pre class="prettyprint lang-config">LuaHookLog "/path/to/script.lua" logger</pre>
-
-<pre class="prettyprint lang-lua">-- /path/to/script.lua --
-function logger(r)
- -- flip a coin:
- -- If 1, then we write to our own Lua log and tell httpd not to log
- -- in the main log.
- -- If 2, then we just sanitize the output a bit and tell httpd to
- -- log the sanitized bits.
-
- if math.random(1,2) == 1 then
- -- Log stuff ourselves and don't log in the regular log
- local f = io.open("/foo/secret.log", "a")
- if f then
- f:write("Something secret happened at " .. r.uri .. "\n")
- f:close()
- end
- return apache2.DONE -- Tell httpd not to use the regular logging functions
- else
- r.uri = r.uri:gsub("somesecretstuff", "") -- sanitize the URI
- return apache2.OK -- tell httpd to log it.
- end
-end</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="LuaHookMapToStorage" id="LuaHookMapToStorage">LuaHookMapToStorage</a> <a name="luahookmaptostorage" id="luahookmaptostorage">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the map_to_storage phase of request processing</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookMapToStorage /path/to/lua/script.lua hook_function_name</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>Like <code class="directive">LuaHookTranslateName</code> but executed at the
- map-to-storage phase of a request. Modules like mod_cache run at this phase,
- which makes for an interesting example on what to do here:</p>
- <pre class="prettyprint lang-config">LuaHookMapToStorage "/path/to/lua/script.lua" check_cache</pre>
-
- <pre class="prettyprint lang-lua">require"apache2"
-cached_files = {}
-
-function read_file(filename)
- local input = io.open(filename, "r")
- if input then
- local data = input:read("*a")
- cached_files[filename] = data
- file = cached_files[filename]
- input:close()
- end
- return cached_files[filename]
-end
-
-function check_cache(r)
- if r.filename:match("%.png$") then -- Only match PNG files
- local file = cached_files[r.filename] -- Check cache entries
- if not file then
- file = read_file(r.filename) -- Read file into cache
- end
- if file then -- If file exists, write it out
- r.status = 200
- r:write(file)
- r:info(("Sent %s to client from cache"):format(r.filename))
- return apache2.DONE -- skip default handler for PNG files
- end
- end
- return apache2.DECLINED -- If we had nothing to do, let others serve this.
-end</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="LuaHookTranslateName" id="LuaHookTranslateName">LuaHookTranslateName</a> <a name="luahooktranslatename" id="luahooktranslatename">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the translate name phase of request processing</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookTranslateName /path/to/lua/script.lua hook_function_name [early|late]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The optional third argument is supported in 2.3.15 and later</td></tr>
-</table><p>
- Add a hook (at APR_HOOK_MIDDLE) to the translate name phase of
- request processing. The hook function receives a single
- argument, the request_rec, and should return a status code,
- which is either an HTTP error code, or the constants defined
- in the apache2 module: apache2.OK, apache2.DECLINED, or
- apache2.DONE. </p>
-
- <p>For those new to hooks, basically each hook will be invoked
- until one of them returns apache2.OK. If your hook doesn't
- want to do the translation it should just return
- apache2.DECLINED. If the request should stop processing, then
- return apache2.DONE.</p>
-
- <p>Example:</p>
-
-<pre class="prettyprint lang-config"># httpd.conf
-LuaHookTranslateName "/scripts/conf/hooks.lua" silly_mapper</pre>
-
-
-<pre class="prettyprint lang-lua">-- /scripts/conf/hooks.lua --
-require "apache2"
-function silly_mapper(r)
- if r.uri == "/" then
- r.filename = "/var/www/home.lua"
- return apache2.OK
- else
- return apache2.DECLINED
- end
-end</pre>
-
-
- <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, or htaccess
- context.</p></div>
-
- <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late"
- control when this script runs relative to other modules.</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="LuaHookTypeChecker" id="LuaHookTypeChecker">LuaHookTypeChecker</a> <a name="luahooktypechecker" id="luahooktypechecker">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the type_checker phase of request processing</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookTypeChecker /path/to/lua/script.lua hook_function_name</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table><p>
- This directive provides a hook for the type_checker phase of the request processing.
- This phase is where requests are assigned a content type and a handler, and thus can
- be used to modify the type and handler based on input:
- </p>
- <pre class="prettyprint lang-config">LuaHookTypeChecker "/path/to/lua/script.lua" type_checker</pre>
-
- <pre class="prettyprint lang-lua"> function type_checker(r)
- if r.uri:match("%.to_gif$") then -- match foo.png.to_gif
- r.content_type = "image/gif" -- assign it the image/gif type
- r.handler = "gifWizard" -- tell the gifWizard module to handle this
- r.filename = r.uri:gsub("%.to_gif$", "") -- fix the filename requested
- return apache2.OK
- end
-
- return apache2.DECLINED
- end</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="LuaInherit" id="LuaInherit">LuaInherit</a> <a name="luainherit" id="luainherit">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls how parent configuration sections are merged into children</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaInherit none|parent-first|parent-last</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LuaInherit parent-first</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.0 and later</td></tr>
-</table><p>By default, if LuaHook* directives are used in overlapping
- Directory or Location configuration sections, the scripts defined in the
- more specific section are run <em>after</em> those defined in the more
- generic section (LuaInherit parent-first). You can reverse this order, or
- make the parent context not apply at all.</p>
-
- <p> In previous 2.3.x releases, the default was effectively to ignore LuaHook*
- directives from parent configuration sections.</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="LuaInputFilter" id="LuaInputFilter">LuaInputFilter</a> <a name="luainputfilter" id="luainputfilter">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a Lua function for content input filtering</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaInputFilter filter_name /path/to/lua/script.lua function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.5 and later</td></tr>
-</table>
-<p>Provides a means of adding a Lua function as an input filter.
-As with output filters, input filters work as coroutines,
-first yielding before buffers are sent, then yielding whenever
-a bucket needs to be passed down the chain, and finally (optionally)
-yielding anything that needs to be appended to the input data. The
-global variable <code>bucket</code> holds the buckets as they are passed
-onto the Lua script:
-</p>
-
-<pre class="prettyprint lang-config">LuaInputFilter myInputFilter "/www/filter.lua" input_filter
-&lt;Files "*.lua"&gt;
- SetInputFilter myInputFilter
-&lt;/Files&gt;</pre>
-
-<pre class="prettyprint lang-lua">--[[
- Example input filter that converts all POST data to uppercase.
-]]--
-function input_filter(r)
- print("luaInputFilter called") -- debug print
- coroutine.yield() -- Yield and wait for buckets
- while bucket do -- For each bucket, do...
- local output = string.upper(bucket) -- Convert all POST data to uppercase
- coroutine.yield(output) -- Send converted data down the chain
- end
- -- No more buckets available.
- coroutine.yield("&amp;filterSignature=1234") -- Append signature at the end
-end</pre>
-
-<p>
-The input filter supports denying/skipping a filter if it is deemed unwanted:
-</p>
-<pre class="prettyprint lang-lua">function input_filter(r)
- if not good then
- return -- Simply deny filtering, passing on the original content instead
- end
- coroutine.yield() -- wait for buckets
- ... -- insert filter stuff here
-end</pre>
-
-<p>
-See "<a href="#modifying_buckets">Modifying contents with Lua
-filters</a>" for more information.
-</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="LuaMapHandler" id="LuaMapHandler">LuaMapHandler</a> <a name="luamaphandler" id="luamaphandler">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Map a path to a lua handler</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaMapHandler uri-pattern /path/to/lua/script.lua [function-name]</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>This directive matches a uri pattern to invoke a specific
- handler function in a specific file. It uses PCRE regular
- expressions to match the uri, and supports interpolating
- match groups into both the file path and the function name.
- Be careful writing your regular expressions to avoid security
- issues.</p>
- <div class="example"><h3>Examples:</h3><pre class="prettyprint lang-config">LuaMapHandler "/(\w+)/(\w+)" "/scripts/$1.lua" "handle_$2"</pre>
-</div>
- <p>This would match uri's such as /photos/show?id=9
- to the file /scripts/photos.lua and invoke the
- handler function handle_show on the lua vm after
- loading that file.</p>
-
-<pre class="prettyprint lang-config">LuaMapHandler "/bingo" "/scripts/wombat.lua"</pre>
-
- <p>This would invoke the "handle" function, which
- is the default if no specific function name is
- provided.</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="LuaOutputFilter" id="LuaOutputFilter">LuaOutputFilter</a> <a name="luaoutputfilter" id="luaoutputfilter">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a Lua function for content output filtering</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaOutputFilter filter_name /path/to/lua/script.lua function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.5 and later</td></tr>
-</table>
-<p>Provides a means of adding a Lua function as an output filter.
-As with input filters, output filters work as coroutines,
-first yielding before buffers are sent, then yielding whenever
-a bucket needs to be passed down the chain, and finally (optionally)
-yielding anything that needs to be appended to the input data. The
-global variable <code>bucket</code> holds the buckets as they are passed
-onto the Lua script:
-</p>
-
-<pre class="prettyprint lang-config">LuaOutputFilter myOutputFilter "/www/filter.lua" output_filter
-&lt;Files "*.lua"&gt;
- SetOutputFilter myOutputFilter
-&lt;/Files&gt;</pre>
-
-<pre class="prettyprint lang-lua">--[[
- Example output filter that escapes all HTML entities in the output
-]]--
-function output_filter(r)
- coroutine.yield("(Handled by myOutputFilter)&lt;br/&gt;\n") -- Prepend some data to the output,
- -- yield and wait for buckets.
- while bucket do -- For each bucket, do...
- local output = r:escape_html(bucket) -- Escape all output
- coroutine.yield(output) -- Send converted data down the chain
- end
- -- No more buckets available.
-end</pre>
-
-<p>
-As with the input filter, the output filter supports denying/skipping a filter
-if it is deemed unwanted:
-</p>
-<pre class="prettyprint lang-lua">function output_filter(r)
- if not r.content_type:match("text/html") then
- return -- Simply deny filtering, passing on the original content instead
- end
- coroutine.yield() -- wait for buckets
- ... -- insert filter stuff here
-end</pre>
-
-<div class="note"><h3>Lua filters with <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code></h3>
-<p> When a Lua filter is used as the underlying provider via the
-<code class="directive"><a href="../mod/mod_filter.html#filterprovider">FilterProvider</a></code> directive, filtering
-will only work when the <var>filter-name</var> is identical to the <var>provider-name</var>.
-</p> </div>
-
-<p>
-See "<a href="#modifying_buckets">Modifying contents with Lua filters</a>" for more
-information.
-</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="LuaPackageCPath" id="LuaPackageCPath">LuaPackageCPath</a> <a name="luapackagecpath" id="luapackagecpath">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Add a directory to lua's package.cpath</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaPackageCPath /path/to/include/?.soa</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>Add a path to lua's shared library search path. Follows the same
- conventions as lua. This just munges the package.cpath in the
- lua vms.</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="LuaPackagePath" id="LuaPackagePath">LuaPackagePath</a> <a name="luapackagepath" id="luapackagepath">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Add a directory to lua's package.path</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaPackagePath /path/to/include/?.lua</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table><p>Add a path to lua's module search path. Follows the same
- conventions as lua. This just munges the package.path in the
- lua vms.</p>
-
- <div class="example"><h3>Examples:</h3><pre class="prettyprint lang-config">LuaPackagePath "/scripts/lib/?.lua"
-LuaPackagePath "/scripts/lib/?/init.lua"</pre>
-</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="LuaQuickHandler" id="LuaQuickHandler">LuaQuickHandler</a> <a name="luaquickhandler" id="luaquickhandler">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide a hook for the quick handler of request processing</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaQuickHandler /path/to/script.lua hook_function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>
- This phase is run immediately after the request has been mapped to a virtal host,
- and can be used to either do some request processing before the other phases kick
- in, or to serve a request without the need to translate, map to storage et cetera.
- As this phase is run before anything else, directives such as <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> or <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> are void in this phase, just as
- URIs have not been properly parsed yet.
- </p>
- <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, or htaccess
- context.</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="LuaRoot" id="LuaRoot">LuaRoot</a> <a name="luaroot" id="luaroot">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify the base path for resolving relative paths for mod_lua directives</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaRoot /path/to/a/directory</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>Specify the base path which will be used to evaluate all
- relative paths within mod_lua. If not specified they
- will be resolved relative to the current working directory,
- which may not always work well for a server.</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="LuaScope" id="LuaScope">LuaScope</a> <a name="luascope" id="luascope">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>One of once, request, conn, thread -- default is once</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaScope once|request|conn|thread|server [min] [max]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LuaScope once</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#Override">Override:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>Specify the life cycle scope of the Lua interpreter which will
- be used by handlers in this "Directory." The default is "once"</p>
-
- <dl>
- <dt>once:</dt> <dd>use the interpreter once and throw it away.</dd>
-
- <dt>request:</dt> <dd>use the interpreter to handle anything based on
- the same file within this request, which is also
- request scoped.</dd>
-
- <dt>conn:</dt> <dd>Same as request but attached to the connection_rec</dd>
-
- <dt>thread:</dt> <dd>Use the interpreter for the lifetime of the thread
- handling the request (only available with threaded MPMs).</dd>
-
- <dt>server:</dt> <dd>This one is different than others because the
- server scope is quite long lived, and multiple threads
- will have the same server_rec. To accommodate this,
- server scoped Lua states are stored in an apr
- resource list. The <code>min</code> and <code>max</code> arguments
- specify the minimum and maximum number of Lua states to keep in the
- pool.</dd>
- </dl>
- <p>
- Generally speaking, the <code>thread</code> and <code>server</code> scopes
- execute roughly 2-3 times faster than the rest, because they don't have to
- spawn new Lua states on every request (especially with the event MPM, as
- even keepalive requests will use a new thread for each request). If you are
- satisfied that your scripts will not have problems reusing a state, then
- the <code>thread</code> or <code>server</code> scopes should be used for
- maximum performance. While the <code>thread</code> scope will provide the
- fastest responses, the <code>server</code> scope will use less memory, as
- states are pooled, allowing f.x. 1000 threads to share only 100 Lua states,
- thus using only 10% of the memory required by the <code>thread</code> scope.
- </p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_lua.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_lua.html.fr b/docs/manual/mod/mod_lua.html.fr
index 168976d94f..0083ee299c 100644
--- a/docs/manual/mod/mod_lua.html.fr
+++ b/docs/manual/mod/mod_lua.html.fr
@@ -103,6 +103,670 @@ fonctionnement interne de httpd.</p>
<li><img alt="" src="../images/down.gif" /> <a href="#databases">Connectivit� aux bases de donn�es</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="luaauthzprovider" id="luaauthzprovider">Directive</a> <a name="LuaAuthzProvider" id="LuaAuthzProvider">LuaAuthzProvider</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Branche une fonction fournisseur d'autorisation dans <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code>
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaAuthzProvider provider_name /path/to/lua/script.lua function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.4.3 du serveur HTTP Apache</td></tr>
+</table>
+<p>Lorsqu'une fonction lua a �t� enregistr�e en tant que fournisseur
+d'autorisation, elle peut �tre appel�e via la directive <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> :</p>
+
+
+<pre class="prettyprint lang-config">LuaRoot /usr/local/apache2/lua
+LuaAuthzProvider foo authz.lua authz_check_foo
+&lt;Location /&gt;
+ Require foo johndoe
+&lt;/Location&gt;</pre>
+
+<pre class="prettyprint lang-lua">require "apache2"
+function authz_check_foo(r, who)
+ if r.user ~= who then return apache2.AUTHZ_DENIED
+ return apache2.AUTHZ_GRANTED
+end</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="luacodecache" id="luacodecache">Directive</a> <a name="LuaCodeCache" id="LuaCodeCache">LuaCodeCache</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure le cache de code compil�.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaCodeCache stat|forever|never</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>LuaCodeCache stat</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table><p>
+ Cette directive permet de d�finir le comportement du cache de code
+ en m�moire. La valeur par d�faut est stat ; dans ce cas, le script
+ du niveau le plus haut (et pas les scripts inclus) est v�rifi� �
+ chaque fois que ce fichier est n�cessaire, et est recharg� si la
+ date de modification est plus r�cente que celle du script d�j�
+ charg�. Les autres valeurs permettent respectivement de garder le
+ fichier en cache perp�tuellement (forever - jamais v�rifi� ni
+ remplac�), ou de ne jamais le mettre en cache (never).</p>
+
+ <p>En g�n�ral, les valeurs stat et forever sont utilis�es pour un
+ serveur en production, et les valeurs stat ou never pour un serveur
+ en d�veloppement.</p>
+
+ <div class="example"><h3>Exemples :</h3><pre class="prettyprint lang-config">LuaCodeCache stat
+LuaCodeCache forever
+LuaCodeCache never</pre>
+</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="luahookaccesschecker" id="luahookaccesschecker">Directive</a> <a name="LuaHookAccessChecker" id="LuaHookAccessChecker">LuaHookAccessChecker</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase access_checker du
+traitement de la requ�te</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookAccessChecker /chemin/vers/lua/script.lua hook_function_name [early|late]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Le troisi�me argument optionnel est disponible depuis la
+version 2.3.15 du serveur HTTP Apache.</td></tr>
+</table>
+<p>Ajoute votre fonction d'accroche � la phase access_checker. Une
+fonction d'accroche access checker renvoie en g�n�ral OK, DECLINED, ou
+HTTP_FORBIDDEN.</p>
+<div class="note"><h3>Ordonnancement</h3><p>Les arguments optionnels
+ "early" ou "late" permettent de contr�ler le moment auquel ce script
+ s'ex�cute par rapport aux autres modules.</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="luahookauthchecker" id="luahookauthchecker">Directive</a> <a name="LuaHookAuthChecker" id="LuaHookAuthChecker">LuaHookAuthChecker</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase auth_checker du
+traitement de la requ�te</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookAuthChecker /chemin/vers/lua/script.lua hook_function_name [early|late]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Le troisi�me argument optionnel est disponible depuis la
+version 2.3.15 du serveur HTTP Apache.</td></tr>
+</table>
+<p>Invoque une fonction lua au cours de la phase auth_checker du
+traitement de la requ�te. Cette directive peut s'utiliser pour
+impl�menter une v�rification arbitraire de l'authentification et de
+l'autorisation. Voici un exemple tr�s simple :
+</p>
+<pre class="prettyprint lang-lua">require 'apache2'
+
+-- fonction d'accroche authcheck fictive
+-- Si la requ�te ne contient aucune donn�e d'authentification, l'en-t�te
+-- de la r�ponse est d�fini et un code 401 est renvoy� afin de demander au
+-- navigateur d'effectuer une authentification basique. Si la requ�te
+-- comporte des donn�es d'authentification, elles ne sont pas vraiment
+-- consult�es, mais on admet la prise en compte de l'utilisateur 'foo' et
+-- on la valide. On v�rifie ensuite si l'utilisateur est bien 'foo' et on
+-- accepte la requ�te.
+function authcheck_hook(r)
+
+ -- recherche des informations d'authentification
+ auth = r.headers_in['Authorization']
+ if auth ~= nil then
+ -- d�finition d'un utilisateur par d�faut
+ r.user = 'foo'
+ end
+
+ if r.user == nil then
+ r:debug("authcheck: user is nil, returning 401")
+ r.err_headers_out['WWW-Authenticate'] = 'Basic realm="WallyWorld"'
+ return 401
+ elseif r.user == "foo" then
+ r:debug('user foo: OK')
+ else
+ r:debug("authcheck: user='" .. r.user .. "'")
+ r.err_headers_out['WWW-Authenticate'] = 'Basic realm="WallyWorld"'
+ return 401
+ end
+ return apache2.OK
+end</pre>
+
+<div class="note"><h3>Ordonnancement</h3><p>Les arguments optionnels
+ "early" ou "late" permettent de contr�ler le moment auquel ce script
+ s'ex�cute par rapport aux autres modules.</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="luahookcheckuserid" id="luahookcheckuserid">Directive</a> <a name="LuaHookCheckUserID" id="LuaHookCheckUserID">LuaHookCheckUserID</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase check_user_id du
+traitement de la requ�te</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookCheckUserID /chemin/vers/lua/script.lua hook_function_name [early|late]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Le troisi�me argument optionnel est disponible depuis la
+version 2.3.15 du serveur HTTP Apache.</td></tr>
+</table><p>...</p>
+ <div class="note"><h3>Ordonnancement</h3><p>Les arguments optionnels
+ "early" ou "late" permettent de contr�ler le moment auquel ce script
+ s'ex�cute par rapport aux autres modules.</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="luahookfixups" id="luahookfixups">Directive</a> <a name="LuaHookFixups" id="LuaHookFixups">LuaHookFixups</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase de correction du
+traitement de la requ�te</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookFixups /chemin/vers/lua/script.lua hook_function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+<p>
+ Idem LuaHookTranslateName, mais s'ex�cute durant la phase de
+ correction.
+</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="luahookinsertfilter" id="luahookinsertfilter">Directive</a> <a name="LuaHookInsertFilter" id="LuaHookInsertFilter">LuaHookInsertFilter</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase insert_filter du
+traitement de la requ�te</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookInsertFilter /chemin/vers/lua/script.lua hook_function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table><p>Non encore impl�ment�</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="luahooklog" id="luahooklog">Directive</a> <a name="LuaHookLog" id="LuaHookLog">LuaHookLog</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Permet une insertion dans la phase de journalisation du
+traitement d'une requ�te</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookLog /path/to/lua/script.lua log_function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+<p>
+ Ce dispositif d'insertion simple permet d'ex�cuter une fonction
+ lorsque httpd entre dans la phase de journalisation du traitement
+ d'une requ�te. Vous pouvez ainsi ajouter des donn�es � vos propres
+ entr�es de journalisation, manipuler les entr�es du journal standard
+ avant leur enregistrement ou emp�cher l'enregistrement d'une entr�e
+ dans le journal. Pour emp�cher l'enregistrement normal des entr�es
+ du journal, renvoyez simplement <code>apache2.DONE</code> dans votre
+ gestionnaire de journalisation, ou au contraire, renvoyez
+ <code>apache2.OK</code> pour que httpd effectue une journalisation
+ normale.
+</p>
+<p>Exemple :</p>
+<pre class="prettyprint lang-config">LuaHookLog /path/to/script.lua logger</pre>
+
+<pre class="prettyprint lang-lua">-- /path/to/script.lua --
+function logger(r)
+ -- on joue � pile ou face :
+ -- Si on obtient 1, on �crit dans notre propre journal Lua et on dit
+ -- � httpd de ne pas enregistrer d'entr�e dans le journal standard..
+ -- Si on obtient 2, on nettoie un peu les donn�es avant que httpd ne
+ -- les enregistre dans le journal standard.
+
+ if math.random(1,2) == 1 then
+ -- On effectue notre propre journalisation et le journal
+ -- standard n'est pas aliment�
+ local f = io.open("/foo/secret.log", "a")
+ if f then
+ f:write("Quelque chose de secret est arriv� � " .. r.uri .. "\n")
+ f:close()
+ end
+ return apache2.DONE -- On dit � httpd de ne rien enregistrer
+ --dans le journal standard
+ else
+ r.uri = r.uri:gsub("somesecretstuff", "") -- nettoie les donn�es
+ return apache2.OK -- et httpd doit alors les enregistrer.
+ end
+end</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="luahookmaptostorage" id="luahookmaptostorage">Directive</a> <a name="LuaHookMapToStorage" id="LuaHookMapToStorage">LuaHookMapToStorage</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase map_to_storage du
+traitement de la requ�te</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookMapToStorage /chemin/vers/lua/script.lua hook_function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>Identique � la directive
+ <code class="directive">LuaHookTranslateName</code>, mais s'ex�cute � la
+ phase map-to-storage du traitement de la requ�te. Les modules comme
+ mod_cache agissent pendant cette phase, ce qui permet de pr�senter
+ un exemple int�ressant de ce que l'on peut faire ici :</p>
+ <pre class="prettyprint lang-config">LuaHookMapToStorage /path/to/lua/script.lua check_cache</pre>
+
+ <pre class="prettyprint lang-lua">require"apache2"
+cached_files = {}
+
+function read_file(filename)
+ local input = io.open(filename, "r")
+ if input then
+ local data = input:read("*a")
+ cached_files[filename] = data
+ file = cached_files[filename]
+ input:close()
+ end
+ return cached_files[filename]
+end
+
+function check_cache(r)
+ if r.filename:match("%.png$") then -- Ne concerne que les fichiers PNG
+ local file = cached_files[r.filename] -- V�rifie les entr�es du cache
+ if not file then
+ file = read_file(r.filename) -- Lit le fichier vers le cache
+ end
+ if file then -- Si le fichier existe, on l'envoie
+ r.status = 200
+ r:write(file)
+ r:info(("%s a �t� envoy� au client depuis le cache"):format(r.filename))
+ return apache2.DONE -- cout-circuite le gestionnaire par d�faut des fichiers PNG
+ end
+ end
+ return apache2.DECLINED -- Si nous n'avons rien eu � faire, nous laissons les autres s'en charger
+end</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="luahooktranslatename" id="luahooktranslatename">Directive</a> <a name="LuaHookTranslateName" id="LuaHookTranslateName">LuaHookTranslateName</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e � la phase du nom de
+traduction du traitement de la requ�te</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookTranslateName /chemin/vers/lua/script.lua nom_fonction_hook [early|late]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Le troisi�me argument optionnel est disponible depuis la
+version 2.3.15 du serveur HTTP Apache.</td></tr>
+</table><p>
+ Cette directive permet d'ajouter un point d'entr�e (�
+ APR_HOOK_MIDDLE) � la phase du nom de traduction du traitement de la
+ requ�te. La fonction hook accepte un seul argument, le request_rec,
+ et doit renvoyer un code d'�tat qui est soit un code d'erreur HTTP,
+ ou une constante d�finie dans le module apache2 : apache2.OK,
+ apache2.DECLINED, ou apache2.DONE.</p>
+
+ <p>Pour ceux qui ne sont pas familiers avec les points d'entr�e
+ (hook), en gros, chaque hook sera invoqu� jusqu'� ce que l'un
+ d'entre eux renvoie apache2.OK. Si un hook n'effectuer pas la
+ traduction, il doit juste renvoyer apache2.DECLINED. Si le
+ traitement de la requ�te doit �tre interrompu, la valeur renvoy�e
+ doit �tre apache2.DONE.</p>
+
+ <p>Exemple :</p>
+
+<pre class="prettyprint lang-config"># httpd.conf
+LuaHookTranslateName /scripts/conf/hooks.lua silly_mapper</pre>
+
+
+<pre class="prettyprint lang-lua">-- /scripts/conf/hooks.lua --
+require "apache2"
+function silly_mapper(r)
+ if r.uri == "/" then
+ r.filename = "/var/www/home.lua"
+ return apache2.OK
+ else
+ return apache2.DECLINED
+ end
+end</pre>
+
+
+ <div class="note"><h3>Contexte</h3><p>Cette directive ne peut �tre
+ utilis�e ni � l'int�rieur d'une section <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ou <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, ni dans un fichier htaccess.</p></div>
+
+ <div class="note"><h3>Ordonnancement</h3><p>Les arguments optionnels
+ "early" ou "late" permettent de contr�ler le moment auquel ce script
+ s'ex�cute par rapport aux autres modules.</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="luahooktypechecker" id="luahooktypechecker">Directive</a> <a name="LuaHookTypeChecker" id="LuaHookTypeChecker">LuaHookTypeChecker</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase type_checker du
+traitement de la requ�te</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookTypeChecker /chemin/vers/lua/script.lua hook_function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table><p>...</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="luainherit" id="luainherit">Directive</a> <a name="LuaInherit" id="LuaInherit">LuaInherit</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Contr�le la mani�re dont les sections de configuration
+parentes sont fusionn�es dans les enfants</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaInherit none|parent-first|parent-last</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>LuaInherit parent-first</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Versions 2.4.0 et sup�rieures</td></tr>
+</table><p>Par d�faut, si des directives LuaHook* se trouvent dans
+ des sections de configuration Directory ou Location qui se
+ chevauchent, les scripts
+ d�finis dans les sections les plus sp�cifiques s'ex�cutent
+ <em>apr�s</em> ceux d�finis dans les sections plus g�n�riques
+ (LuaInherit parent-first). Vous pouvez inverser cet ordre, ou faire
+ en sorte que le contexte parent ne s'applique pas du tout.</p>
+
+ <p>Jusqu'aux versions 2.3.x, le comportement par d�faut consistait �
+ ignorer les directives LuaHook* situ�es dans les sections de
+ configuration parentes.</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="luainputfilter" id="luainputfilter">Directive</a> <a name="LuaInputFilter" id="LuaInputFilter">LuaInputFilter</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit une fonction Lua pour le filtrage en entr�e</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaInputFilter filter_name /path/to/lua/script.lua function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.4.5 du serveur HTTP
+Apache</td></tr>
+</table>
+<p>Cette directive permet d'ajouter un filtre en entr�e sous la forme
+d'une fonction Lua. A l'instar des filtres en sorties, les filtres en
+entr�e fonctionnent comme des sous-routines, intervenant dans un premier
+temps avant l'envoi du contenu des tampons, puis chaque fois qu'un
+paquet de donn�es doit �tre transmis � la cha�ne, et �ventuellement
+produisant toute donn�e � ajouter aux donn�es en entr�e. La variable
+globale <code>bucket</code> contient les paquets de donn�es tels qu'ils
+sont transmis au script Lua :
+</p>
+
+<pre class="prettyprint lang-config">LuaInputFilter myInputFilter /www/filter.lua input_filter
+&lt;Files *.lua&gt;
+ SetInputFilter myInputFilter
+&lt;/Files&gt;</pre>
+
+<pre class="prettyprint lang-lua">--[[
+ Exemple de filtre en entr�e qui convertit toutes les donn�es POST en
+ majuscules.
+]]--
+function input_filter(r)
+ print("luaInputFilter called") -- pour d�bogage
+ coroutine.yield() -- attend des paquets de donn�es
+ while bucket do -- Pour chaque paquet, faire ...
+ local output = string.upper(bucket) -- Convertit toutes les donn�es POST en majuscules
+ coroutine.yield(output) -- Envoie les donn�es trait�es � la cha�ne de filtrage
+ end
+ -- plus aucune donn�e � traiter.
+ coroutine.yield("&amp;filterSignature=1234") -- Ajoute une signature � la fin
+end</pre>
+
+<p>
+Le filtre en entr�e peut interdire ou sauter un filtre s'il est
+consid�r� comme ind�sirable :
+</p>
+<pre class="prettyprint lang-lua">function input_filter(r)
+ if not good then
+ return -- Emp�che tout simplement le filtrage et transmet le contenu original
+ end
+ coroutine.yield() -- attend des paquets de donn�es
+ ... -- insert les filtres ici
+end</pre>
+
+<p>
+Voir "<a href="#modifying_buckets">Modification de contenu avec les
+filtres Lua</a>" pour plus de d�tails.
+</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="luamaphandler" id="luamaphandler">Directive</a> <a name="LuaMapHandler" id="LuaMapHandler">LuaMapHandler</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Met en correspondance un chemin avec un gestionnaire lua</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaMapHandler modele-uri /chemin/vers/lua/script.lua
+[nom-fonction]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>Cette directive permet de faire correspondre un mod�le d'uri avec
+ une fonction de gestionnaire situ�e dans un fichier sp�cifique. Elle
+ utilise les expressions rationnelles PCRE pour mettre en
+ correspondance l'uri, et supporte les groupes de correspondance
+ d'interpolation dans le chemin du fichier et le nom de la fonction.
+ Prenez garde aux probl�mes de s�curit� en �crivant vos expressions
+ rationnelles.</p>
+ <div class="example"><h3>Exemples :</h3><pre class="prettyprint lang-config">LuaMapHandler /(\w+)/(\w+) /scripts/$1.lua handle_$2</pre>
+</div>
+ <p>Cette directive va faire correspondre des uri comme
+ /photos/show?id=9 au fichier /scripts/photos.lua, et invoquera la
+ fonction de gestionnaire handle_show au niveau de la vm lua
+ apr�s chargement de ce fichier.</p>
+
+<pre class="prettyprint lang-config">LuaMapHandler /bingo /scripts/wombat.lua</pre>
+
+ <p>Cette directive invoquera la fonction "handle" qui est la
+ valeur par d�faut si aucun nom de fonction sp�cifique n'est
+ sp�cifi�.</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="luaoutputfilter" id="luaoutputfilter">Directive</a> <a name="LuaOutputFilter" id="LuaOutputFilter">LuaOutputFilter</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit une fonction Lua pour le filtrage de contenu en
+sortie</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaOutputFilter filter_name /path/to/lua/script.lua function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.4.5 du serveur HTTP
+Apache</td></tr>
+</table>
+<p>&gt;Cette directive permet d'ajouter un filtre en sortie sous la forme
+d'une fonction Lua. A l'instar des filtres en sorties, les filtres en
+entr�e fonctionnent comme des sous-routines, intervenant dans un premier
+temps avant l'envoi du contenu des tampons, puis chaque fois qu'un
+paquet de donn�es doit �tre transmis � la cha�ne, et �ventuellement
+produisant toute donn�e � ajouter aux donn�es en sortie. La variable
+globale <code>bucket</code> contient les paquets de donn�es tels qu'ils
+sont transmis au script Lua :
+</p>
+
+<pre class="prettyprint lang-config">LuaOutputFilter myOutputFilter /www/filter.lua output_filter
+&lt;Files *.lua&gt;
+ SetOutputFilter myOutputFilter
+&lt;/Files&gt;</pre>
+
+<pre class="prettyprint lang-lua">--[[
+ Exemple de filtre en sortie qui �chappe toutes les entit�s HTML en
+ sortie
+]]--
+function output_filter(r)
+ coroutine.yield("(Handled by myOutputFilter)&lt;br/&gt;\n") -- Ajoute des donn�es au d�but de la sortie,
+ -- puis attend des paquets de donn�es � traiter
+ while bucket do -- Pour chaque paquet, faire ...
+ local output = r:escape_html(bucket) -- Echappe les donn�es en sortie
+ coroutine.yield(output) -- Envoie les donn�es trait�es � la cha�ne
+ end
+ -- plus aucune donn�e � traiter.
+end</pre>
+
+<p>
+Comme les filres en entr�e, le filtre en sortie peut interdire ou sauter un filtre s'il est
+consid�r� comme ind�sirable :
+</p>
+<pre class="prettyprint lang-lua">function output_filter(r)
+ if not r.content_type:match("text/html") then
+ return -- Emp�che tout simplement le filtrage et transmet le contenu original
+ end
+ coroutine.yield() -- attend des paquets de donn�es
+ ... -- insert les filtres ici
+end</pre>
+
+<div class="note"><h3>Les filtres Lua avec <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code></h3>
+<p>Lorsqu'on utilise un filtre Lua comme fournisseur sous-jacent via la
+directive <code class="directive"><a href="../mod/mod_filter.html#filterprovider">FilterProvider</a></code>, le
+filtrage ne fonctionnera que si <var>filter-name</var> est identique �
+<var>provider-name</var>.
+</p> </div>
+
+<p>
+Voir "<a href="#modifying_buckets">Modification de contenu avec les
+filtres Lua</a>" pour plus de d�tails.
+</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="luapackagecpath" id="luapackagecpath">Directive</a> <a name="LuaPackageCPath" id="LuaPackageCPath">LuaPackageCPath</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ajoute un r�pertoire au package.cpath de lua</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaPackageCPath /chemin/vers/include/?.soa</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>Cette directive permet d'ajouter un chemin � la liste des chemins
+ de recherche des biblioth�ques partag�es de lua. Ceci modifie le
+ package.cpath dans les vms lua.</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="luapackagepath" id="luapackagepath">Directive</a> <a name="LuaPackagePath" id="LuaPackagePath">LuaPackagePath</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ajoute un r�pertoire au package.path de lua</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaPackagePath /chemin/vers/include/?.lua</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table><p>Cette directive permet d'ajouter un chemin � la liste des
+ chemins de recherche du module lua. Elle suit les m�mes conventions
+ que lua. Ceci modifie le package.path dans les vms lua.</p>
+
+ <div class="example"><h3>Exemples :</h3><pre class="prettyprint lang-config">LuaPackagePath /scripts/lib/?.lua
+LuaPackagePath /scripts/lib/?/init.lua</pre>
+</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="luaquickhandler" id="luaquickhandler">Directive</a> <a name="LuaQuickHandler" id="LuaQuickHandler">LuaQuickHandler</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la gestion rapide du
+traitement de la requ�te</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaQuickHandler /path/to/script.lua hook_function_name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>Cette phase s'ex�cute juste apr�s l'attribution de la requ�te �
+ un serveur virtuel, et permet d'effectuer certains traitements avant
+ le d�roulement des autres phases, ou de servir une requ�te sans
+ avoir � la traduire, l'associer � un espace de stockage, etc...
+ Comme cette phase s'ex�cute avant toute autre, les directives telles
+ que <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> ou
+ <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ne
+ sont pas encore prises en compte, car Les URI n'ont pas encore �t�
+ enti�rement interpr�t�s.
+ </p>
+ <div class="note"><h3>Contexte</h3><p>Cette directive ne peut �tre
+ utilis�e ni � l'int�rieur d'une section <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ou <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, ni dans un fichier htaccess.</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="luaroot" id="luaroot">Directive</a> <a name="LuaRoot" id="LuaRoot">LuaRoot</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie le chemin de base pour la r�solution des chemins
+relatifs dans les directives de mod_lua</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaRoot /chemin/vers/un/r�pertoire</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>Cette directive permet de sp�cifier le chemin de base qui sera
+ utilis� pour �valuer tous les chemins relatifs dans mod_lua. En
+ l'absence de cette directive, les chemins relatifs sont r�solus par
+ rapport au r�pertoire de travail courant, ce qui ne sera pas
+ toujours appropri� pour un serveur.</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="luascope" id="luascope">Directive</a> <a name="LuaScope" id="LuaScope">LuaScope</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Une valeur parmi once, request, conn, thread -- la valeur par d�faut est once</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaScope once|request|conn|thread|server [min] [max]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>LuaScope once</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+ <p>Cette directive permet de sp�cifier la dur�e de vie de
+ l'interpr�teur Lua qui sera utilis� dans ce "r�pertoire". La valeur
+ par d�faut est "once".</p>
+
+ <dl>
+ <dt>once:</dt> <dd>utilise l'interpr�teur une fois.</dd>
+
+ <dt>request:</dt> <dd>utilise l'interpr�teur pour traiter tout ce
+ qui est bas� sur le m�me fichier dans la requ�te, et qui se trouve
+ aussi dans la port�e de la requ�te.</dd>
+
+ <dt>conn:</dt> <dd>idem request, mais attach� � connection_rec</dd>
+
+ <dt>thread:</dt> <dd>Utilise l'interpr�teur pendant toute la dur�e
+ de vie du thread qui traite la requ�te (disponible seulement avec
+ les MPMs thread�s).</dd>
+
+ <dt>server:</dt> <dd>Le comportement est ici diff�rent, car la
+ port�e du serveur pr�sente une dur�e de vie assez longue, et
+ plusieurs threads vont partager le m�me server_rec. Pour g�rer tout
+ ceci, les �tats lua du serveur sont stock�s dans une liste de ressources
+ apr. Les arguments <code>min</code> et <code>max</code> permettent
+ de sp�cifier les nombres minimaux et maximaux d'�tats lua � stocker
+ dans la liste.</dd>
+ </dl>
+ <p>En g�n�ral, les port�es <code>thread</code> et <code>server</code>
+ sont 2 � 3 fois plus rapides que les autres, car elles n'ont pas besoin
+ de r�g�n�rer de nouveaux �tats Lua � chaque requ�te (comme c'est le
+ cas avec le MPM event, o� m�me les connexions persistantes utilisent un
+ nouveau thread pour chaque requ�te). Si vous pensez que vos scripts
+ n'auront pas de probl�me s'il r�utilisent un �tat, alors les port�es
+ <code>thread</code> ou <code>server</code> doivent �tre utilis�es car
+ elles pr�senteront de meilleures performances. Alors que la port�e
+ <code>thread</code> fournira les r�ponses les plus rapides, la port�e
+ <code>server</code> utilisera moins de m�moire car les �tats sont
+ rassembl�s dans des jeux, permettant par exemple � 1000 threads de
+ partager 100 �tats Lua, ne n�cessitant ainsi que 10% de la m�moire
+ requise par la port�e <code>thread</code>.
+ </p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="basicconf" id="basicconf">Configuration de base</a></h2>
@@ -1329,670 +1993,6 @@ le cas des requ�tes dynamiques, utilisez <code>db:prepare</code> ou
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="luaauthzprovider" id="luaauthzprovider">Directive</a> <a name="LuaAuthzProvider" id="LuaAuthzProvider">LuaAuthzProvider</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Branche une fonction fournisseur d'autorisation dans <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code>
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaAuthzProvider provider_name /path/to/lua/script.lua function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.4.3 du serveur HTTP Apache</td></tr>
-</table>
-<p>Lorsqu'une fonction lua a �t� enregistr�e en tant que fournisseur
-d'autorisation, elle peut �tre appel�e via la directive <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> :</p>
-
-
-<pre class="prettyprint lang-config">LuaRoot /usr/local/apache2/lua
-LuaAuthzProvider foo authz.lua authz_check_foo
-&lt;Location /&gt;
- Require foo johndoe
-&lt;/Location&gt;</pre>
-
-<pre class="prettyprint lang-lua">require "apache2"
-function authz_check_foo(r, who)
- if r.user ~= who then return apache2.AUTHZ_DENIED
- return apache2.AUTHZ_GRANTED
-end</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="luacodecache" id="luacodecache">Directive</a> <a name="LuaCodeCache" id="LuaCodeCache">LuaCodeCache</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure le cache de code compil�.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaCodeCache stat|forever|never</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>LuaCodeCache stat</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table><p>
- Cette directive permet de d�finir le comportement du cache de code
- en m�moire. La valeur par d�faut est stat ; dans ce cas, le script
- du niveau le plus haut (et pas les scripts inclus) est v�rifi� �
- chaque fois que ce fichier est n�cessaire, et est recharg� si la
- date de modification est plus r�cente que celle du script d�j�
- charg�. Les autres valeurs permettent respectivement de garder le
- fichier en cache perp�tuellement (forever - jamais v�rifi� ni
- remplac�), ou de ne jamais le mettre en cache (never).</p>
-
- <p>En g�n�ral, les valeurs stat et forever sont utilis�es pour un
- serveur en production, et les valeurs stat ou never pour un serveur
- en d�veloppement.</p>
-
- <div class="example"><h3>Exemples :</h3><pre class="prettyprint lang-config">LuaCodeCache stat
-LuaCodeCache forever
-LuaCodeCache never</pre>
-</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="luahookaccesschecker" id="luahookaccesschecker">Directive</a> <a name="LuaHookAccessChecker" id="LuaHookAccessChecker">LuaHookAccessChecker</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase access_checker du
-traitement de la requ�te</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookAccessChecker /chemin/vers/lua/script.lua hook_function_name [early|late]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Le troisi�me argument optionnel est disponible depuis la
-version 2.3.15 du serveur HTTP Apache.</td></tr>
-</table>
-<p>Ajoute votre fonction d'accroche � la phase access_checker. Une
-fonction d'accroche access checker renvoie en g�n�ral OK, DECLINED, ou
-HTTP_FORBIDDEN.</p>
-<div class="note"><h3>Ordonnancement</h3><p>Les arguments optionnels
- "early" ou "late" permettent de contr�ler le moment auquel ce script
- s'ex�cute par rapport aux autres modules.</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="luahookauthchecker" id="luahookauthchecker">Directive</a> <a name="LuaHookAuthChecker" id="LuaHookAuthChecker">LuaHookAuthChecker</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase auth_checker du
-traitement de la requ�te</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookAuthChecker /chemin/vers/lua/script.lua hook_function_name [early|late]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Le troisi�me argument optionnel est disponible depuis la
-version 2.3.15 du serveur HTTP Apache.</td></tr>
-</table>
-<p>Invoque une fonction lua au cours de la phase auth_checker du
-traitement de la requ�te. Cette directive peut s'utiliser pour
-impl�menter une v�rification arbitraire de l'authentification et de
-l'autorisation. Voici un exemple tr�s simple :
-</p>
-<pre class="prettyprint lang-lua">require 'apache2'
-
--- fonction d'accroche authcheck fictive
--- Si la requ�te ne contient aucune donn�e d'authentification, l'en-t�te
--- de la r�ponse est d�fini et un code 401 est renvoy� afin de demander au
--- navigateur d'effectuer une authentification basique. Si la requ�te
--- comporte des donn�es d'authentification, elles ne sont pas vraiment
--- consult�es, mais on admet la prise en compte de l'utilisateur 'foo' et
--- on la valide. On v�rifie ensuite si l'utilisateur est bien 'foo' et on
--- accepte la requ�te.
-function authcheck_hook(r)
-
- -- recherche des informations d'authentification
- auth = r.headers_in['Authorization']
- if auth ~= nil then
- -- d�finition d'un utilisateur par d�faut
- r.user = 'foo'
- end
-
- if r.user == nil then
- r:debug("authcheck: user is nil, returning 401")
- r.err_headers_out['WWW-Authenticate'] = 'Basic realm="WallyWorld"'
- return 401
- elseif r.user == "foo" then
- r:debug('user foo: OK')
- else
- r:debug("authcheck: user='" .. r.user .. "'")
- r.err_headers_out['WWW-Authenticate'] = 'Basic realm="WallyWorld"'
- return 401
- end
- return apache2.OK
-end</pre>
-
-<div class="note"><h3>Ordonnancement</h3><p>Les arguments optionnels
- "early" ou "late" permettent de contr�ler le moment auquel ce script
- s'ex�cute par rapport aux autres modules.</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="luahookcheckuserid" id="luahookcheckuserid">Directive</a> <a name="LuaHookCheckUserID" id="LuaHookCheckUserID">LuaHookCheckUserID</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase check_user_id du
-traitement de la requ�te</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookCheckUserID /chemin/vers/lua/script.lua hook_function_name [early|late]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Le troisi�me argument optionnel est disponible depuis la
-version 2.3.15 du serveur HTTP Apache.</td></tr>
-</table><p>...</p>
- <div class="note"><h3>Ordonnancement</h3><p>Les arguments optionnels
- "early" ou "late" permettent de contr�ler le moment auquel ce script
- s'ex�cute par rapport aux autres modules.</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="luahookfixups" id="luahookfixups">Directive</a> <a name="LuaHookFixups" id="LuaHookFixups">LuaHookFixups</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase de correction du
-traitement de la requ�te</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookFixups /chemin/vers/lua/script.lua hook_function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
-<p>
- Idem LuaHookTranslateName, mais s'ex�cute durant la phase de
- correction.
-</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="luahookinsertfilter" id="luahookinsertfilter">Directive</a> <a name="LuaHookInsertFilter" id="LuaHookInsertFilter">LuaHookInsertFilter</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase insert_filter du
-traitement de la requ�te</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookInsertFilter /chemin/vers/lua/script.lua hook_function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table><p>Non encore impl�ment�</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="luahooklog" id="luahooklog">Directive</a> <a name="LuaHookLog" id="LuaHookLog">LuaHookLog</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Permet une insertion dans la phase de journalisation du
-traitement d'une requ�te</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookLog /path/to/lua/script.lua log_function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
-<p>
- Ce dispositif d'insertion simple permet d'ex�cuter une fonction
- lorsque httpd entre dans la phase de journalisation du traitement
- d'une requ�te. Vous pouvez ainsi ajouter des donn�es � vos propres
- entr�es de journalisation, manipuler les entr�es du journal standard
- avant leur enregistrement ou emp�cher l'enregistrement d'une entr�e
- dans le journal. Pour emp�cher l'enregistrement normal des entr�es
- du journal, renvoyez simplement <code>apache2.DONE</code> dans votre
- gestionnaire de journalisation, ou au contraire, renvoyez
- <code>apache2.OK</code> pour que httpd effectue une journalisation
- normale.
-</p>
-<p>Exemple :</p>
-<pre class="prettyprint lang-config">LuaHookLog /path/to/script.lua logger</pre>
-
-<pre class="prettyprint lang-lua">-- /path/to/script.lua --
-function logger(r)
- -- on joue � pile ou face :
- -- Si on obtient 1, on �crit dans notre propre journal Lua et on dit
- -- � httpd de ne pas enregistrer d'entr�e dans le journal standard..
- -- Si on obtient 2, on nettoie un peu les donn�es avant que httpd ne
- -- les enregistre dans le journal standard.
-
- if math.random(1,2) == 1 then
- -- On effectue notre propre journalisation et le journal
- -- standard n'est pas aliment�
- local f = io.open("/foo/secret.log", "a")
- if f then
- f:write("Quelque chose de secret est arriv� � " .. r.uri .. "\n")
- f:close()
- end
- return apache2.DONE -- On dit � httpd de ne rien enregistrer
- --dans le journal standard
- else
- r.uri = r.uri:gsub("somesecretstuff", "") -- nettoie les donn�es
- return apache2.OK -- et httpd doit alors les enregistrer.
- end
-end</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="luahookmaptostorage" id="luahookmaptostorage">Directive</a> <a name="LuaHookMapToStorage" id="LuaHookMapToStorage">LuaHookMapToStorage</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase map_to_storage du
-traitement de la requ�te</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookMapToStorage /chemin/vers/lua/script.lua hook_function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>Identique � la directive
- <code class="directive">LuaHookTranslateName</code>, mais s'ex�cute � la
- phase map-to-storage du traitement de la requ�te. Les modules comme
- mod_cache agissent pendant cette phase, ce qui permet de pr�senter
- un exemple int�ressant de ce que l'on peut faire ici :</p>
- <pre class="prettyprint lang-config">LuaHookMapToStorage /path/to/lua/script.lua check_cache</pre>
-
- <pre class="prettyprint lang-lua">require"apache2"
-cached_files = {}
-
-function read_file(filename)
- local input = io.open(filename, "r")
- if input then
- local data = input:read("*a")
- cached_files[filename] = data
- file = cached_files[filename]
- input:close()
- end
- return cached_files[filename]
-end
-
-function check_cache(r)
- if r.filename:match("%.png$") then -- Ne concerne que les fichiers PNG
- local file = cached_files[r.filename] -- V�rifie les entr�es du cache
- if not file then
- file = read_file(r.filename) -- Lit le fichier vers le cache
- end
- if file then -- Si le fichier existe, on l'envoie
- r.status = 200
- r:write(file)
- r:info(("%s a �t� envoy� au client depuis le cache"):format(r.filename))
- return apache2.DONE -- cout-circuite le gestionnaire par d�faut des fichiers PNG
- end
- end
- return apache2.DECLINED -- Si nous n'avons rien eu � faire, nous laissons les autres s'en charger
-end</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="luahooktranslatename" id="luahooktranslatename">Directive</a> <a name="LuaHookTranslateName" id="LuaHookTranslateName">LuaHookTranslateName</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e � la phase du nom de
-traduction du traitement de la requ�te</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookTranslateName /chemin/vers/lua/script.lua nom_fonction_hook [early|late]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Le troisi�me argument optionnel est disponible depuis la
-version 2.3.15 du serveur HTTP Apache.</td></tr>
-</table><p>
- Cette directive permet d'ajouter un point d'entr�e (�
- APR_HOOK_MIDDLE) � la phase du nom de traduction du traitement de la
- requ�te. La fonction hook accepte un seul argument, le request_rec,
- et doit renvoyer un code d'�tat qui est soit un code d'erreur HTTP,
- ou une constante d�finie dans le module apache2 : apache2.OK,
- apache2.DECLINED, ou apache2.DONE.</p>
-
- <p>Pour ceux qui ne sont pas familiers avec les points d'entr�e
- (hook), en gros, chaque hook sera invoqu� jusqu'� ce que l'un
- d'entre eux renvoie apache2.OK. Si un hook n'effectuer pas la
- traduction, il doit juste renvoyer apache2.DECLINED. Si le
- traitement de la requ�te doit �tre interrompu, la valeur renvoy�e
- doit �tre apache2.DONE.</p>
-
- <p>Exemple :</p>
-
-<pre class="prettyprint lang-config"># httpd.conf
-LuaHookTranslateName /scripts/conf/hooks.lua silly_mapper</pre>
-
-
-<pre class="prettyprint lang-lua">-- /scripts/conf/hooks.lua --
-require "apache2"
-function silly_mapper(r)
- if r.uri == "/" then
- r.filename = "/var/www/home.lua"
- return apache2.OK
- else
- return apache2.DECLINED
- end
-end</pre>
-
-
- <div class="note"><h3>Contexte</h3><p>Cette directive ne peut �tre
- utilis�e ni � l'int�rieur d'une section <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ou <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, ni dans un fichier htaccess.</p></div>
-
- <div class="note"><h3>Ordonnancement</h3><p>Les arguments optionnels
- "early" ou "late" permettent de contr�ler le moment auquel ce script
- s'ex�cute par rapport aux autres modules.</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="luahooktypechecker" id="luahooktypechecker">Directive</a> <a name="LuaHookTypeChecker" id="LuaHookTypeChecker">LuaHookTypeChecker</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la phase type_checker du
-traitement de la requ�te</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaHookTypeChecker /chemin/vers/lua/script.lua hook_function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table><p>...</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="luainherit" id="luainherit">Directive</a> <a name="LuaInherit" id="LuaInherit">LuaInherit</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Contr�le la mani�re dont les sections de configuration
-parentes sont fusionn�es dans les enfants</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaInherit none|parent-first|parent-last</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>LuaInherit parent-first</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Versions 2.4.0 et sup�rieures</td></tr>
-</table><p>Par d�faut, si des directives LuaHook* se trouvent dans
- des sections de configuration Directory ou Location qui se
- chevauchent, les scripts
- d�finis dans les sections les plus sp�cifiques s'ex�cutent
- <em>apr�s</em> ceux d�finis dans les sections plus g�n�riques
- (LuaInherit parent-first). Vous pouvez inverser cet ordre, ou faire
- en sorte que le contexte parent ne s'applique pas du tout.</p>
-
- <p>Jusqu'aux versions 2.3.x, le comportement par d�faut consistait �
- ignorer les directives LuaHook* situ�es dans les sections de
- configuration parentes.</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="luainputfilter" id="luainputfilter">Directive</a> <a name="LuaInputFilter" id="LuaInputFilter">LuaInputFilter</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit une fonction Lua pour le filtrage en entr�e</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaInputFilter filter_name /path/to/lua/script.lua function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.4.5 du serveur HTTP
-Apache</td></tr>
-</table>
-<p>Cette directive permet d'ajouter un filtre en entr�e sous la forme
-d'une fonction Lua. A l'instar des filtres en sorties, les filtres en
-entr�e fonctionnent comme des sous-routines, intervenant dans un premier
-temps avant l'envoi du contenu des tampons, puis chaque fois qu'un
-paquet de donn�es doit �tre transmis � la cha�ne, et �ventuellement
-produisant toute donn�e � ajouter aux donn�es en entr�e. La variable
-globale <code>bucket</code> contient les paquets de donn�es tels qu'ils
-sont transmis au script Lua :
-</p>
-
-<pre class="prettyprint lang-config">LuaInputFilter myInputFilter /www/filter.lua input_filter
-&lt;Files *.lua&gt;
- SetInputFilter myInputFilter
-&lt;/Files&gt;</pre>
-
-<pre class="prettyprint lang-lua">--[[
- Exemple de filtre en entr�e qui convertit toutes les donn�es POST en
- majuscules.
-]]--
-function input_filter(r)
- print("luaInputFilter called") -- pour d�bogage
- coroutine.yield() -- attend des paquets de donn�es
- while bucket do -- Pour chaque paquet, faire ...
- local output = string.upper(bucket) -- Convertit toutes les donn�es POST en majuscules
- coroutine.yield(output) -- Envoie les donn�es trait�es � la cha�ne de filtrage
- end
- -- plus aucune donn�e � traiter.
- coroutine.yield("&amp;filterSignature=1234") -- Ajoute une signature � la fin
-end</pre>
-
-<p>
-Le filtre en entr�e peut interdire ou sauter un filtre s'il est
-consid�r� comme ind�sirable :
-</p>
-<pre class="prettyprint lang-lua">function input_filter(r)
- if not good then
- return -- Emp�che tout simplement le filtrage et transmet le contenu original
- end
- coroutine.yield() -- attend des paquets de donn�es
- ... -- insert les filtres ici
-end</pre>
-
-<p>
-Voir "<a href="#modifying_buckets">Modification de contenu avec les
-filtres Lua</a>" pour plus de d�tails.
-</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="luamaphandler" id="luamaphandler">Directive</a> <a name="LuaMapHandler" id="LuaMapHandler">LuaMapHandler</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Met en correspondance un chemin avec un gestionnaire lua</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaMapHandler modele-uri /chemin/vers/lua/script.lua
-[nom-fonction]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>Cette directive permet de faire correspondre un mod�le d'uri avec
- une fonction de gestionnaire situ�e dans un fichier sp�cifique. Elle
- utilise les expressions rationnelles PCRE pour mettre en
- correspondance l'uri, et supporte les groupes de correspondance
- d'interpolation dans le chemin du fichier et le nom de la fonction.
- Prenez garde aux probl�mes de s�curit� en �crivant vos expressions
- rationnelles.</p>
- <div class="example"><h3>Exemples :</h3><pre class="prettyprint lang-config">LuaMapHandler /(\w+)/(\w+) /scripts/$1.lua handle_$2</pre>
-</div>
- <p>Cette directive va faire correspondre des uri comme
- /photos/show?id=9 au fichier /scripts/photos.lua, et invoquera la
- fonction de gestionnaire handle_show au niveau de la vm lua
- apr�s chargement de ce fichier.</p>
-
-<pre class="prettyprint lang-config">LuaMapHandler /bingo /scripts/wombat.lua</pre>
-
- <p>Cette directive invoquera la fonction "handle" qui est la
- valeur par d�faut si aucun nom de fonction sp�cifique n'est
- sp�cifi�.</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="luaoutputfilter" id="luaoutputfilter">Directive</a> <a name="LuaOutputFilter" id="LuaOutputFilter">LuaOutputFilter</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit une fonction Lua pour le filtrage de contenu en
-sortie</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaOutputFilter filter_name /path/to/lua/script.lua function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible � partir de la version 2.4.5 du serveur HTTP
-Apache</td></tr>
-</table>
-<p>&gt;Cette directive permet d'ajouter un filtre en sortie sous la forme
-d'une fonction Lua. A l'instar des filtres en sorties, les filtres en
-entr�e fonctionnent comme des sous-routines, intervenant dans un premier
-temps avant l'envoi du contenu des tampons, puis chaque fois qu'un
-paquet de donn�es doit �tre transmis � la cha�ne, et �ventuellement
-produisant toute donn�e � ajouter aux donn�es en sortie. La variable
-globale <code>bucket</code> contient les paquets de donn�es tels qu'ils
-sont transmis au script Lua :
-</p>
-
-<pre class="prettyprint lang-config">LuaOutputFilter myOutputFilter /www/filter.lua output_filter
-&lt;Files *.lua&gt;
- SetOutputFilter myOutputFilter
-&lt;/Files&gt;</pre>
-
-<pre class="prettyprint lang-lua">--[[
- Exemple de filtre en sortie qui �chappe toutes les entit�s HTML en
- sortie
-]]--
-function output_filter(r)
- coroutine.yield("(Handled by myOutputFilter)&lt;br/&gt;\n") -- Ajoute des donn�es au d�but de la sortie,
- -- puis attend des paquets de donn�es � traiter
- while bucket do -- Pour chaque paquet, faire ...
- local output = r:escape_html(bucket) -- Echappe les donn�es en sortie
- coroutine.yield(output) -- Envoie les donn�es trait�es � la cha�ne
- end
- -- plus aucune donn�e � traiter.
-end</pre>
-
-<p>
-Comme les filres en entr�e, le filtre en sortie peut interdire ou sauter un filtre s'il est
-consid�r� comme ind�sirable :
-</p>
-<pre class="prettyprint lang-lua">function output_filter(r)
- if not r.content_type:match("text/html") then
- return -- Emp�che tout simplement le filtrage et transmet le contenu original
- end
- coroutine.yield() -- attend des paquets de donn�es
- ... -- insert les filtres ici
-end</pre>
-
-<div class="note"><h3>Les filtres Lua avec <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code></h3>
-<p>Lorsqu'on utilise un filtre Lua comme fournisseur sous-jacent via la
-directive <code class="directive"><a href="../mod/mod_filter.html#filterprovider">FilterProvider</a></code>, le
-filtrage ne fonctionnera que si <var>filter-name</var> est identique �
-<var>provider-name</var>.
-</p> </div>
-
-<p>
-Voir "<a href="#modifying_buckets">Modification de contenu avec les
-filtres Lua</a>" pour plus de d�tails.
-</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="luapackagecpath" id="luapackagecpath">Directive</a> <a name="LuaPackageCPath" id="LuaPackageCPath">LuaPackageCPath</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ajoute un r�pertoire au package.cpath de lua</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaPackageCPath /chemin/vers/include/?.soa</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>Cette directive permet d'ajouter un chemin � la liste des chemins
- de recherche des biblioth�ques partag�es de lua. Ceci modifie le
- package.cpath dans les vms lua.</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="luapackagepath" id="luapackagepath">Directive</a> <a name="LuaPackagePath" id="LuaPackagePath">LuaPackagePath</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ajoute un r�pertoire au package.path de lua</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaPackagePath /chemin/vers/include/?.lua</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table><p>Cette directive permet d'ajouter un chemin � la liste des
- chemins de recherche du module lua. Elle suit les m�mes conventions
- que lua. Ceci modifie le package.path dans les vms lua.</p>
-
- <div class="example"><h3>Exemples :</h3><pre class="prettyprint lang-config">LuaPackagePath /scripts/lib/?.lua
-LuaPackagePath /scripts/lib/?/init.lua</pre>
-</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="luaquickhandler" id="luaquickhandler">Directive</a> <a name="LuaQuickHandler" id="LuaQuickHandler">LuaQuickHandler</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fournit un point d'entr�e pour la gestion rapide du
-traitement de la requ�te</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaQuickHandler /path/to/script.lua hook_function_name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>Cette phase s'ex�cute juste apr�s l'attribution de la requ�te �
- un serveur virtuel, et permet d'effectuer certains traitements avant
- le d�roulement des autres phases, ou de servir une requ�te sans
- avoir � la traduire, l'associer � un espace de stockage, etc...
- Comme cette phase s'ex�cute avant toute autre, les directives telles
- que <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> ou
- <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ne
- sont pas encore prises en compte, car Les URI n'ont pas encore �t�
- enti�rement interpr�t�s.
- </p>
- <div class="note"><h3>Contexte</h3><p>Cette directive ne peut �tre
- utilis�e ni � l'int�rieur d'une section <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ou <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, ni dans un fichier htaccess.</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="luaroot" id="luaroot">Directive</a> <a name="LuaRoot" id="LuaRoot">LuaRoot</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sp�cifie le chemin de base pour la r�solution des chemins
-relatifs dans les directives de mod_lua</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaRoot /chemin/vers/un/r�pertoire</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>Cette directive permet de sp�cifier le chemin de base qui sera
- utilis� pour �valuer tous les chemins relatifs dans mod_lua. En
- l'absence de cette directive, les chemins relatifs sont r�solus par
- rapport au r�pertoire de travail courant, ce qui ne sera pas
- toujours appropri� pour un serveur.</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="luascope" id="luascope">Directive</a> <a name="LuaScope" id="LuaScope">LuaScope</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Une valeur parmi once, request, conn, thread -- la valeur par d�faut est once</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LuaScope once|request|conn|thread|server [min] [max]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>LuaScope once</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Exp�rimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
-</table>
- <p>Cette directive permet de sp�cifier la dur�e de vie de
- l'interpr�teur Lua qui sera utilis� dans ce "r�pertoire". La valeur
- par d�faut est "once".</p>
-
- <dl>
- <dt>once:</dt> <dd>utilise l'interpr�teur une fois.</dd>
-
- <dt>request:</dt> <dd>utilise l'interpr�teur pour traiter tout ce
- qui est bas� sur le m�me fichier dans la requ�te, et qui se trouve
- aussi dans la port�e de la requ�te.</dd>
-
- <dt>conn:</dt> <dd>idem request, mais attach� � connection_rec</dd>
-
- <dt>thread:</dt> <dd>Utilise l'interpr�teur pendant toute la dur�e
- de vie du thread qui traite la requ�te (disponible seulement avec
- les MPMs thread�s).</dd>
-
- <dt>server:</dt> <dd>Le comportement est ici diff�rent, car la
- port�e du serveur pr�sente une dur�e de vie assez longue, et
- plusieurs threads vont partager le m�me server_rec. Pour g�rer tout
- ceci, les �tats lua du serveur sont stock�s dans une liste de ressources
- apr. Les arguments <code>min</code> et <code>max</code> permettent
- de sp�cifier les nombres minimaux et maximaux d'�tats lua � stocker
- dans la liste.</dd>
- </dl>
- <p>En g�n�ral, les port�es <code>thread</code> et <code>server</code>
- sont 2 � 3 fois plus rapides que les autres, car elles n'ont pas besoin
- de r�g�n�rer de nouveaux �tats Lua � chaque requ�te (comme c'est le
- cas avec le MPM event, o� m�me les connexions persistantes utilisent un
- nouveau thread pour chaque requ�te). Si vous pensez que vos scripts
- n'auront pas de probl�me s'il r�utilisent un �tat, alors les port�es
- <code>thread</code> ou <code>server</code> doivent �tre utilis�es car
- elles pr�senteront de meilleures performances. Alors que la port�e
- <code>thread</code> fournira les r�ponses les plus rapides, la port�e
- <code>server</code> utilisera moins de m�moire car les �tats sont
- rassembl�s dans des jeux, permettant par exemple � 1000 threads de
- partager 100 �tats Lua, ne n�cessitant ainsi que 10% de la m�moire
- requise par la port�e <code>thread</code>.
- </p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_lua.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_macro.html.en b/docs/manual/mod/mod_macro.html.en
index 81dab30ea9..9a5b374079 100644
--- a/docs/manual/mod/mod_macro.html.en
+++ b/docs/manual/mod/mod_macro.html.en
@@ -54,6 +54,81 @@
<li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Macro" id="Macro">&lt;Macro&gt;</a> <a name="macro" id="macro">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define a configuration file macro</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>
+&lt;Macro <var>name</var> [<var>par1</var> .. <var>parN</var>]&gt;
+... &lt;/Macro&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
+<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_macro</td></tr>
+</table>
+ <p>The <code class="directive">Macro</code> directive controls the definition of
+ a macro within the server runtime configuration files.
+ The first argument is the name of the macro.
+ Other arguments are parameters to the macro. It is good practice to prefix
+ parameter names with any of '<code>$%@</code>', and not macro names
+ with such characters.
+ </p>
+
+ <pre class="prettyprint lang-config">&lt;Macro LocalAccessPolicy&gt;
+ Require ip 10.2.16.0/24
+&lt;/Macro&gt;
+
+&lt;Macro RestrictedAccessPolicy $ipnumbers&gt;
+ Require ip $ipnumbers
+&lt;/Macro&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="UndefMacro" id="UndefMacro">UndefMacro</a> <a name="undefmacro" id="undefmacro">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Undefine a macro</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>UndefMacro <var>name</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
+<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_macro</td></tr>
+</table>
+ <p>The <code class="directive">UndefMacro</code> directive undefines a macro
+ which has been defined before hand.</p>
+
+ <pre class="prettyprint lang-config">UndefMacro LocalAccessPolicy
+UndefMacro RestrictedAccessPolicy</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="Use" id="Use">Use</a> <a name="use" id="use">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use a macro</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Use <var>name</var> [<var>value1</var> ... <var>valueN</var>]
+</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
+<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_macro</td></tr>
+</table>
+ <p>The <code class="directive">Use</code> directive controls the use of a macro.
+ The specified macro is expanded. It must be given the same number of
+ arguments as in the macro definition. The provided values are
+ associated to their corresponding initial parameters and are substituted
+ before processing.</p>
+
+ <pre class="prettyprint lang-config">Use LocalAccessPolicy
+...
+Use RestrictedAccessPolicy "192.54.172.0/24 192.54.148.0/24"</pre>
+
+
+ <p>is equivalent, with the macros defined above, to:</p>
+
+ <pre class="prettyprint lang-config">Require ip 10.2.16.0/24
+...
+Require ip 192.54.172.0/24 192.54.148.0/24</pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="usage" id="usage">Usage</a></h2>
@@ -191,81 +266,6 @@ UndefMacro DirGroup</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="Macro" id="Macro">&lt;Macro&gt;</a> <a name="macro" id="macro">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define a configuration file macro</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>
-&lt;Macro <var>name</var> [<var>par1</var> .. <var>parN</var>]&gt;
-... &lt;/Macro&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
-<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_macro</td></tr>
-</table>
- <p>The <code class="directive">Macro</code> directive controls the definition of
- a macro within the server runtime configuration files.
- The first argument is the name of the macro.
- Other arguments are parameters to the macro. It is good practice to prefix
- parameter names with any of '<code>$%@</code>', and not macro names
- with such characters.
- </p>
-
- <pre class="prettyprint lang-config">&lt;Macro LocalAccessPolicy&gt;
- Require ip 10.2.16.0/24
-&lt;/Macro&gt;
-
-&lt;Macro RestrictedAccessPolicy $ipnumbers&gt;
- Require ip $ipnumbers
-&lt;/Macro&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="UndefMacro" id="UndefMacro">UndefMacro</a> <a name="undefmacro" id="undefmacro">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Undefine a macro</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>UndefMacro <var>name</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
-<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_macro</td></tr>
-</table>
- <p>The <code class="directive">UndefMacro</code> directive undefines a macro
- which has been defined before hand.</p>
-
- <pre class="prettyprint lang-config">UndefMacro LocalAccessPolicy
-UndefMacro RestrictedAccessPolicy</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="Use" id="Use">Use</a> <a name="use" id="use">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use a macro</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Use <var>name</var> [<var>value1</var> ... <var>valueN</var>]
-</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
-<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_macro</td></tr>
-</table>
- <p>The <code class="directive">Use</code> directive controls the use of a macro.
- The specified macro is expanded. It must be given the same number of
- arguments as in the macro definition. The provided values are
- associated to their corresponding initial parameters and are substituted
- before processing.</p>
-
- <pre class="prettyprint lang-config">Use LocalAccessPolicy
-...
-Use RestrictedAccessPolicy "192.54.172.0/24 192.54.148.0/24"</pre>
-
-
- <p>is equivalent, with the macros defined above, to:</p>
-
- <pre class="prettyprint lang-config">Require ip 10.2.16.0/24
-...
-Require ip 192.54.172.0/24 192.54.148.0/24</pre>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_macro.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_macro.html.fr b/docs/manual/mod/mod_macro.html.fr
index 6d9718ea68..3440fc9c9e 100644
--- a/docs/manual/mod/mod_macro.html.fr
+++ b/docs/manual/mod/mod_macro.html.fr
@@ -58,6 +58,75 @@ de configuration Apache.</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#examples">Exemples</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="macro" id="macro">Directive</a> <a name="Macro" id="Macro">&lt;Macro&gt;</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finition d'une macro dans un fichier de configuration</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>
+&lt;Macro <var>nom</var> [<var>par1</var> .. <var>parN</var>]&gt;
+... &lt;/Macro&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, 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_macro</td></tr>
+</table>
+ <p>La directive <code class="directive">Macro</code> permet de d�finir une macro
+ dans un fichier de configuration Apache. Le premier argument est le nom
+ de la macro, et les arguments suivants sont les param�tres. Il
+ est de bon aloi de pr�fixer les noms des param�tres d'une macro
+ avec un caract�re parmi '<code>$%@</code>', et d'�viter d'en faire
+ de m�me avec les noms de macros.
+ </p>
+
+ <pre class="prettyprint lang-config">&lt;Macro LocalAccessPolicy&gt;
+ Require ip 10.2.16.0/24
+&lt;/Macro&gt;
+
+&lt;Macro RestrictedAccessPolicy $ipnumbers&gt;
+ Require ip $ipnumbers
+&lt;/Macro&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="undefmacro" id="undefmacro">Directive</a> <a name="UndefMacro" id="UndefMacro">UndefMacro</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Undefine a macro</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>UndefMacro <var>name</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, 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_macro</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="use" id="use">Directive</a> <a name="Use" id="Use">Use</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilisation d'une macro</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>Use <var>nom</var> [<var>valeur1</var> ... <var>valeurN</var>]
+</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, 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_macro</td></tr>
+</table>
+ <p> La directive <code class="directive">Use</code> permet d'utiliser une macro.
+ La macro consid�r�e est expans�e. Son nombre d'arguments doit �tre �gal au
+ nombre de param�tres pr�cis�s dans sa d�finition. Les valeurs pass�es en
+ argument sont attribu�es aux param�tres correspondants et
+ substitu�es avant l'interpr�tation du texte de la macro.</p>
+
+ <pre class="prettyprint lang-config">Use LocalAccessPolicy
+...
+Use RestrictedAccessPolicy "192.54.172.0/24 192.54.148.0/24"</pre>
+
+
+ <p>est �quivalent, avec les macros d�finies ci-dessus � :</p>
+
+ <pre class="prettyprint lang-config">Require ip 10.2.16.0/24
+...
+Require ip 192.54.172.0/24 192.54.148.0/24</pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="usage" id="usage">Utilisation</a></h2>
<p>On d�finit une macro � l'aide des blocs <code class="directive">&lt;Macro&gt;</code> qui contiennent la portion de votre
@@ -201,75 +270,6 @@ UndefMacro DirGroup</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="macro" id="macro">Directive</a> <a name="Macro" id="Macro">&lt;Macro&gt;</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finition d'une macro dans un fichier de configuration</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>
-&lt;Macro <var>nom</var> [<var>par1</var> .. <var>parN</var>]&gt;
-... &lt;/Macro&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, 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_macro</td></tr>
-</table>
- <p>La directive <code class="directive">Macro</code> permet de d�finir une macro
- dans un fichier de configuration Apache. Le premier argument est le nom
- de la macro, et les arguments suivants sont les param�tres. Il
- est de bon aloi de pr�fixer les noms des param�tres d'une macro
- avec un caract�re parmi '<code>$%@</code>', et d'�viter d'en faire
- de m�me avec les noms de macros.
- </p>
-
- <pre class="prettyprint lang-config">&lt;Macro LocalAccessPolicy&gt;
- Require ip 10.2.16.0/24
-&lt;/Macro&gt;
-
-&lt;Macro RestrictedAccessPolicy $ipnumbers&gt;
- Require ip $ipnumbers
-&lt;/Macro&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="undefmacro" id="undefmacro">Directive</a> <a name="UndefMacro" id="UndefMacro">UndefMacro</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Undefine a macro</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>UndefMacro <var>name</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, 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_macro</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="use" id="use">Directive</a> <a name="Use" id="Use">Use</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Utilisation d'une macro</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>Use <var>nom</var> [<var>valeur1</var> ... <var>valeurN</var>]
-</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, 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_macro</td></tr>
-</table>
- <p> La directive <code class="directive">Use</code> permet d'utiliser une macro.
- La macro consid�r�e est expans�e. Son nombre d'arguments doit �tre �gal au
- nombre de param�tres pr�cis�s dans sa d�finition. Les valeurs pass�es en
- argument sont attribu�es aux param�tres correspondants et
- substitu�es avant l'interpr�tation du texte de la macro.</p>
-
- <pre class="prettyprint lang-config">Use LocalAccessPolicy
-...
-Use RestrictedAccessPolicy "192.54.172.0/24 192.54.148.0/24"</pre>
-
-
- <p>est �quivalent, avec les macros d�finies ci-dessus � :</p>
-
- <pre class="prettyprint lang-config">Require ip 10.2.16.0/24
-...
-Require ip 192.54.172.0/24 192.54.148.0/24</pre>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_macro.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en
index 7837b5f645..2ae706bc27 100644
--- a/docs/manual/mod/mod_mime.html.en
+++ b/docs/manual/mod/mod_mime.html.en
@@ -114,139 +114,6 @@
<li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="multipleext" id="multipleext">Files with Multiple Extensions</a></h2>
- <p>Files can have more than one extension; the order of the
- extensions is <em>normally</em> irrelevant. For example, if the
- file <code>welcome.html.fr</code> maps onto content type
- <code>text/html</code> and language French then the file
- <code>welcome.fr.html</code> will map onto exactly the same
- information. If more than one extension is given that maps onto
- the same type of metadata, then the one to the right will
- be used, except for languages and content encodings. For example,
- if <code>.gif</code> maps to the <a class="glossarylink" href="../glossary.html#media-type" title="see glossary">media-type</a>
- <code>image/gif</code> and <code>.html</code> maps to the
- media-type <code>text/html</code>, then the file
- <code>welcome.gif.html</code> will be associated with the
- media-type <code>text/html</code>.</p>
-
- <p><a href="#charset-lang">Languages</a> and <a href="#contentencoding">content encodings</a> are treated accumulative, because one can assign
- more than one language or encoding to a particular resource. For example,
- the file <code>welcome.html.en.de</code> will be delivered with
- <code>Content-Language: en, de</code> and <code>Content-Type:
- text/html</code>.</p>
-
- <p>Care should be taken when a file with multiple extensions
- gets associated with both a <a class="glossarylink" href="../glossary.html#media-type" title="see glossary">media-type</a>
- and a handler. This will
- usually result in the request being handled by the module associated
- with the handler. For example, if the <code>.imap</code>
- extension is mapped to the handler <code>imap-file</code> (from
- <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code>) and the <code>.html</code> extension is
- mapped to the media-type <code>text/html</code>, then the file
- <code>world.imap.html</code> will be associated with both the
- <code>imap-file</code> handler and <code>text/html</code> media-type.
- When it is processed, the <code>imap-file</code> handler will be used,
- and so it will be treated as a <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code> imagemap
- file.</p>
-
- <p>If you would prefer only the last dot-separated part of the
- filename to be mapped to a particular piece of meta-data, then do
- not use the <code>Add*</code> directives. For example, if you wish
- to have the file <code>foo.html.cgi</code> processed as a CGI
- script, but not the file <code>bar.cgi.html</code>, then instead
- of using <code>AddHandler cgi-script .cgi</code>, use</p>
-
- <div class="example"><h3>Configure handler based on final extension only</h3><pre class="prettyprint lang-config">&lt;FilesMatch "\.cgi$"&gt;
- SetHandler cgi-script
-&lt;/FilesMatch&gt;</pre>
-</div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="contentencoding" id="contentencoding">Content encoding</a></h2>
- <p>A file of a particular <a class="glossarylink" href="../glossary.html#media-type" title="see glossary">media-type</a> can additionally be encoded a
- particular way to simplify transmission over the Internet.
- While this usually will refer to compression, such as
- <code>gzip</code>, it can also refer to encryption, such a
- <code>pgp</code> or to an encoding such as UUencoding, which is
- designed for transmitting a binary file in an ASCII (text)
- format.</p>
-
- <p>The <a href="http://www.ietf.org/rfc/rfc2616.txt">HTTP/1.1
- RFC</a>, section 14.11 puts it this way:</p>
-
- <blockquote cite="http://www.ietf.org/rfc/rfc2616.txt">
- <p>The Content-Encoding entity-header field is used as a modifier to
- the media-type. When present, its value indicates what additional
- content codings have been applied to the entity-body, and thus what
- decoding mechanisms must be applied in order to obtain the media-type
- referenced by the Content-Type header field. Content-Encoding is
- primarily used to allow a document to be compressed without losing
- the identity of its underlying media type.</p>
- </blockquote>
-
- <p>By using more than one file extension (see <a href="#multipleext">section above about multiple file
- extensions</a>), you can indicate that a file is of a
- particular <em>type</em>, and also has a particular
- <em>encoding</em>. </p>
-
- <p>For example, you may have a file which is a Microsoft Word
- document, which is pkzipped to reduce its size. If the
- <code>.doc</code> extension is associated with the Microsoft
- Word file type, and the <code>.zip</code> extension is
- associated with the pkzip file encoding, then the file
- <code>Resume.doc.zip</code> would be known to be a pkzip'ed Word
- document.</p>
-
- <p>Apache sends a <code>Content-encoding</code> header with the
- resource, in order to tell the client browser about the
- encoding method.</p>
-
- <pre class="prettyprint lang-config">Content-encoding: pkzip</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="charset-lang" id="charset-lang">Character sets and languages</a></h2>
- <p>In addition to file type and the file encoding,
- another important piece of information is what language a
- particular document is in, and in what character set the file
- should be displayed. For example, the document might be written
- in the Vietnamese alphabet, or in Cyrillic, and should be
- displayed as such. This information, also, is transmitted in
- HTTP headers.</p>
-
- <p>The character set, language, encoding and mime type are all
- used in the process of content negotiation (See
- <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code>) to determine
- which document to give to the client, when there are
- alternative documents in more than one character set, language,
- encoding or mime type. All filename extensions associations
- created with <code class="directive"><a href="#addcharset">AddCharset</a></code>,
- <code class="directive"><a href="#addencoding">AddEncoding</a></code>, <code class="directive"><a href="#addlanguage">AddLanguage</a></code> and <code class="directive"><a href="#addtype">AddType</a></code> directives
- (and extensions listed in the <code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code>) participate in this select process.
- Filename extensions that are only associated using the <code class="directive"><a href="#addhandler">AddHandler</a></code>, <code class="directive"><a href="#addinputfilter">AddInputFilter</a></code> or <code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code> directives may be included or excluded
- from matching by using the <code class="directive"><a href="#multiviewsmatch">MultiviewsMatch</a></code> directive.</p>
-
- <h3><a name="charset" id="charset">Charset</a></h3>
- <p>To convey this further information, Apache optionally sends
- a <code>Content-Language</code> header, to specify the language
- that the document is in, and can append additional information
- onto the <code>Content-Type</code> header to indicate the
- particular character set that should be used to correctly
- render the information.</p>
-
- <div class="example"><p><code>
-Content-Language: en, fr
-Content-Type: text/plain; charset=ISO-8859-1
- </code></p></div>
-
- <p>The language specification is the two-letter abbreviation
- for the language. The <code>charset</code> is the name of the
- particular character set which should be used.</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="AddCharset" id="AddCharset">AddCharset</a> <a name="addcharset" id="addcharset">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps the given filename extensions to the specified content
@@ -1003,6 +870,139 @@ extensions</td></tr>
<li><code class="module"><a href="../mod/mod_mime_magic.html">mod_mime_magic</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="multipleext" id="multipleext">Files with Multiple Extensions</a></h2>
+ <p>Files can have more than one extension; the order of the
+ extensions is <em>normally</em> irrelevant. For example, if the
+ file <code>welcome.html.fr</code> maps onto content type
+ <code>text/html</code> and language French then the file
+ <code>welcome.fr.html</code> will map onto exactly the same
+ information. If more than one extension is given that maps onto
+ the same type of metadata, then the one to the right will
+ be used, except for languages and content encodings. For example,
+ if <code>.gif</code> maps to the <a class="glossarylink" href="../glossary.html#media-type" title="see glossary">media-type</a>
+ <code>image/gif</code> and <code>.html</code> maps to the
+ media-type <code>text/html</code>, then the file
+ <code>welcome.gif.html</code> will be associated with the
+ media-type <code>text/html</code>.</p>
+
+ <p><a href="#charset-lang">Languages</a> and <a href="#contentencoding">content encodings</a> are treated accumulative, because one can assign
+ more than one language or encoding to a particular resource. For example,
+ the file <code>welcome.html.en.de</code> will be delivered with
+ <code>Content-Language: en, de</code> and <code>Content-Type:
+ text/html</code>.</p>
+
+ <p>Care should be taken when a file with multiple extensions
+ gets associated with both a <a class="glossarylink" href="../glossary.html#media-type" title="see glossary">media-type</a>
+ and a handler. This will
+ usually result in the request being handled by the module associated
+ with the handler. For example, if the <code>.imap</code>
+ extension is mapped to the handler <code>imap-file</code> (from
+ <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code>) and the <code>.html</code> extension is
+ mapped to the media-type <code>text/html</code>, then the file
+ <code>world.imap.html</code> will be associated with both the
+ <code>imap-file</code> handler and <code>text/html</code> media-type.
+ When it is processed, the <code>imap-file</code> handler will be used,
+ and so it will be treated as a <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code> imagemap
+ file.</p>
+
+ <p>If you would prefer only the last dot-separated part of the
+ filename to be mapped to a particular piece of meta-data, then do
+ not use the <code>Add*</code> directives. For example, if you wish
+ to have the file <code>foo.html.cgi</code> processed as a CGI
+ script, but not the file <code>bar.cgi.html</code>, then instead
+ of using <code>AddHandler cgi-script .cgi</code>, use</p>
+
+ <div class="example"><h3>Configure handler based on final extension only</h3><pre class="prettyprint lang-config">&lt;FilesMatch "\.cgi$"&gt;
+ SetHandler cgi-script
+&lt;/FilesMatch&gt;</pre>
+</div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="contentencoding" id="contentencoding">Content encoding</a></h2>
+ <p>A file of a particular <a class="glossarylink" href="../glossary.html#media-type" title="see glossary">media-type</a> can additionally be encoded a
+ particular way to simplify transmission over the Internet.
+ While this usually will refer to compression, such as
+ <code>gzip</code>, it can also refer to encryption, such a
+ <code>pgp</code> or to an encoding such as UUencoding, which is
+ designed for transmitting a binary file in an ASCII (text)
+ format.</p>
+
+ <p>The <a href="http://www.ietf.org/rfc/rfc2616.txt">HTTP/1.1
+ RFC</a>, section 14.11 puts it this way:</p>
+
+ <blockquote cite="http://www.ietf.org/rfc/rfc2616.txt">
+ <p>The Content-Encoding entity-header field is used as a modifier to
+ the media-type. When present, its value indicates what additional
+ content codings have been applied to the entity-body, and thus what
+ decoding mechanisms must be applied in order to obtain the media-type
+ referenced by the Content-Type header field. Content-Encoding is
+ primarily used to allow a document to be compressed without losing
+ the identity of its underlying media type.</p>
+ </blockquote>
+
+ <p>By using more than one file extension (see <a href="#multipleext">section above about multiple file
+ extensions</a>), you can indicate that a file is of a
+ particular <em>type</em>, and also has a particular
+ <em>encoding</em>. </p>
+
+ <p>For example, you may have a file which is a Microsoft Word
+ document, which is pkzipped to reduce its size. If the
+ <code>.doc</code> extension is associated with the Microsoft
+ Word file type, and the <code>.zip</code> extension is
+ associated with the pkzip file encoding, then the file
+ <code>Resume.doc.zip</code> would be known to be a pkzip'ed Word
+ document.</p>
+
+ <p>Apache sends a <code>Content-encoding</code> header with the
+ resource, in order to tell the client browser about the
+ encoding method.</p>
+
+ <pre class="prettyprint lang-config">Content-encoding: pkzip</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="charset-lang" id="charset-lang">Character sets and languages</a></h2>
+ <p>In addition to file type and the file encoding,
+ another important piece of information is what language a
+ particular document is in, and in what character set the file
+ should be displayed. For example, the document might be written
+ in the Vietnamese alphabet, or in Cyrillic, and should be
+ displayed as such. This information, also, is transmitted in
+ HTTP headers.</p>
+
+ <p>The character set, language, encoding and mime type are all
+ used in the process of content negotiation (See
+ <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code>) to determine
+ which document to give to the client, when there are
+ alternative documents in more than one character set, language,
+ encoding or mime type. All filename extensions associations
+ created with <code class="directive"><a href="#addcharset">AddCharset</a></code>,
+ <code class="directive"><a href="#addencoding">AddEncoding</a></code>, <code class="directive"><a href="#addlanguage">AddLanguage</a></code> and <code class="directive"><a href="#addtype">AddType</a></code> directives
+ (and extensions listed in the <code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code>) participate in this select process.
+ Filename extensions that are only associated using the <code class="directive"><a href="#addhandler">AddHandler</a></code>, <code class="directive"><a href="#addinputfilter">AddInputFilter</a></code> or <code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code> directives may be included or excluded
+ from matching by using the <code class="directive"><a href="#multiviewsmatch">MultiviewsMatch</a></code> directive.</p>
+
+ <h3><a name="charset" id="charset">Charset</a></h3>
+ <p>To convey this further information, Apache optionally sends
+ a <code>Content-Language</code> header, to specify the language
+ that the document is in, and can append additional information
+ onto the <code>Content-Type</code> header to indicate the
+ particular character set that should be used to correctly
+ render the information.</p>
+
+ <div class="example"><p><code>
+Content-Language: en, fr
+Content-Type: text/plain; charset=ISO-8859-1
+ </code></p></div>
+
+ <p>The language specification is the two-letter abbreviation
+ for the language. The <code>charset</code> is the name of the
+ particular character set which should be used.</p>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_mime.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_mime.html.fr b/docs/manual/mod/mod_mime.html.fr
index 3f295748ae..0834c7199d 100644
--- a/docs/manual/mod/mod_mime.html.fr
+++ b/docs/manual/mod/mod_mime.html.fr
@@ -123,148 +123,6 @@ multiples</a></li>
<li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="multipleext" id="multipleext">Fichiers avec extensions
-multiples</a></h2>
- <p>Les fichiers peuvent poss�der plusieurs extensions dont l'ordre
- est <em>normalement</em> sans importance. Par exemple, si
- le fichier <code>welcome.html.fr</code> est associ� au type de
- contenu <code>text/html</code> et � la langue fran�aise, le fichier
- <code>welcome.fr.html</code> poss�dera exactement les m�me
- m�tadonn�es. Si le fichier poss�de plusieurs extensions associ�es
- au m�me type de m�tadonn�e, c'est celle de ces extensions la plus �
- droite qui sera utilis�e, except� pour ce qui concerne les langues
- et les codages de contenu. Par exemple, si <code>.gif</code> est
- associ� au <a class="glossarylink" href="../glossary.html#type de m�dium" title="voir glossaire">type de m�dium</a>
- <code>image/gif</code>, et <code>.html</code> au type de m�dium
- <code>text/html</code>, le fichier <code>welcome.gif.html</code>
- sera associ� au type de m�dium <code>text/html</code>.</p>
-
- <p>Les <a href="#charset-lang">Languages</a> et les <a href="#contentencoding">codages de contenu</a> sont trait�s de
- mani�re cumulative, car il est possible d'assigner plusieurs
- langues ou codages � une ressource particuli�re. Par exemple, le
- fichier <code>welcome.html.en.de</code> sera servi avec les en-t�tes
- <code>Content-Language: en, de</code> et <code>Content-Type:
- text/html</code>.</p>
-
- <p>Des pr�cautions doivent �tre prises lorsqu'un fichier avec
- extensions multiples est associ� � la fois � un <a class="glossarylink" href="../glossary.html#type de&#10; m�dium" title="voir glossaire">type de
- m�dium</a> et � un gestionnaire. En g�n�ral, cela impliquera
- la gestion de la requ�te par le module associ� au gestionnaire. Par
- exemple, si l'extension <code>.imap</code> est associ�e au
- gestionnaire <code>imap-file</code> (du module
- <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code>), et si l'extension <code>.html</code>
- est associ�e au type de m�dium <code>text/html</code>, le fichier
- <code>world.imap.html</code> sera � la fois associ� au gestionnaire
- <code>imap-file</code> et au type de m�dium <code>text/html</code>.
- Pour son traitement, c'est le gestionnaire <code>imap-file</code>
- qui sera utilis�, et il sera donc trait� en tant que fichier
- imagemap.</p>
-
- <p>Si vous pr�f�rez que seule la derni�re partie d'un nom de fichier
- s�par�e du reste du nom par un point soit associ�e � une m�tadonn�e
- particuli�re, n'utilisez pas les directives <code>Add*</code>. Par
- exemple, si vous souhaitez que le fichier <code>foo.html.cgi</code>
- soit trait� en tant que script CGI, mais pas le fichier
- <code>bar.cgi.html</code>, alors, au lieu d'utiliser
- <code>AddHandler cgi-script .cgi</code>, utilisez plut�t :</p>
-
- <div class="example"><h3>Configuration du gestionnaire en se basant seulement
- sur la derni�re extension</h3><pre class="prettyprint lang-config">&lt;FilesMatch \.cgi$&gt;
- SetHandler cgi-script
-&lt;/FilesMatch&gt;</pre>
-</div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="contentencoding" id="contentencoding">Codage du contenu</a></h2>
- <p>Un fichier d'un <a class="glossarylink" href="../glossary.html#type de m�dium" title="voir glossaire">type de m�dium</a> particulier
- peut �tre �galement cod� d'une certaine mani�re pour simplifier sa
- transmission sur Internet. Alors que cela concerne en g�n�ral la
- compression, comme <code>gzip</code>, il peut aussi s'agir de
- chiffrement, comme <code>pgp</code> ou d'un codage comme UUencoding,
- qui est con�u pour transmettre un fichier binaire sous un format
- ASCII (texte).</p>
-
- <p>La <a href="http://www.ietf.org/rfc/rfc2616.txt">RFC
- HTTP/1.1</a>, section 14.11 stipule � ce titre :</p>
-
- <blockquote cite="http://www.ietf.org/rfc/rfc2616.txt">
- <p>Le champ d'en-t�te Content-Encoding de l'entit� est utilis� en
- tant que modificateur du type de m�dium. Lorsqu'il est pr�sent, sa
- valeur indique quels codages de contenu additionnels ont �t�
- appliqu�s au corps de l'entit�, et ainsi quels m�canismes de
- d�codage doivent �tre appliqu�s afin de retrouver le type de
- m�dium r�f�renc� par le champ d'en-t�te Content-Type. Le codage de
- contenu est principalement utilis� pour permettre la compression
- d'un document sans perdre l'information concernant le type de
- m�dium sous-jacent.</p>
- </blockquote>
-
- <p>En utilisant plusieurs extensions (voir la <a href="#multipleext">section ci-dessus � propos des extensions de
- fichiers multiples</a>), vous pouvez indiquer qu'un fichier est d'un
- <em>type</em>, particulier, et poss�de aussi un <em>codage</em>
- particulier.</p>
-
- <p>Consid�rons par exemple un fichier contenant un document
- Microsoft Word et compress� par pkzip pour r�duire sa taille. Si
- l'extension <code>.doc</code> est associ�e au type de fichier
- Microsoft Word, et si l'extension <code>.zip</code> est associ�e au
- codage de fichier pkzip, alors le fichier
- <code>Resume.doc.zip</code> sera identifi� comme document Word
- compress� par pkzip.</p>
-
- <p>Apache joint un en-t�te <code>Content-encoding</code> � la
- ressource afin d'informer le navigateur client � propos de la
- m�thode de codage.</p>
-
- <pre class="prettyprint lang-config">Content-encoding: pkzip</pre>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="charset-lang" id="charset-lang">Jeux de caract�res et langues</a></h2>
- <p>En plus du type de fichier et du codage, un autre �l�ment
- important d'information est la langue dans laquelle le document est
- �crit, et avec quel jeu de caract�res le contenu du fichier doit
- �tre affich�. Par exemple, un document peut �tre �crit en alphabet
- vietnamien ou cyrillique, et doit �tre affich� en cons�quence. Cette
- information est �galement transmise via des en-t�tes HTTP.</p>
-
- <p>Les jeu de caract�res, langue, codage et type MIME sont tous
- utilis�s au cours du processus de n�gociation de contenu (voir
- <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code>) afin de d�terminer quel document
- servir au client, lorsque plusieurs choix sont possibles en fonction
- du jeu de caract�res, de la langue, du codage ou du type MIME. Toutes
- les associations d'extensions de noms de fichiers cr��es via les
- directives <code class="directive"><a href="#addcharset">AddCharset</a></code>,
- <code class="directive"><a href="#addencoding">AddEncoding</a></code>, <code class="directive"><a href="#addlanguage">AddLanguage</a></code> et <code class="directive"><a href="#addtype">AddType</a></code> (ainsi que les associations
- d'extensions list�es dans le fichier d�fini par la directive
- <code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code>),
- participent � ce processus de s�lection. Les extensions de noms de
- fichiers qui n'ont �t� associ�s que par des directives <code class="directive"><a href="#addhandler">AddHandler</a></code>, <code class="directive"><a href="#addinputfilter">AddInputFilter</a></code> ou <code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code>, peuvent �tre incluses
- ou exclues du processus de s�lection en utilisant la directive
- <code class="directive"><a href="#multiviewsmatch">MultiviewsMatch</a></code>.</p>
-
- <h3><a name="charset" id="charset">Jeu de caract�res</a></h3>
- <p>Pour transmettre cette information suppl�mentaire, Apache peut
- ajouter un en-t�te <code>Content-Language</code>, afin de
- sp�cifier la langue dans laquelle le document est �crit, et peut
- ajouter des informations additionnelles � l'en-t�te
- <code>Content-Type</code> pour indiquer le jeu de caract�res
- particulier qui doit �tre utilis� pour restituer correctement le
- document.</p>
-
- <div class="example"><p><code>
- Content-Language: en, fr
-Content-Type: text/plain; charset=ISO-8859-1
- </code></p></div>
-
- <p>La langue est sp�cifi�e via son abr�viation en deux lettres. Le
- <code>jeu de caract�res</code> est le nom du jeu de caract�res
- particulier qui doit �tre utilis�.</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="addcharset" id="addcharset">Directive</a> <a name="AddCharset" id="AddCharset">AddCharset</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Associe les extensions de noms de fichiers sp�cifi�es au
@@ -1076,6 +934,148 @@ d'extensions de noms de fichiers</td></tr>
<li><code class="module"><a href="../mod/mod_mime_magic.html">mod_mime_magic</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="multipleext" id="multipleext">Fichiers avec extensions
+multiples</a></h2>
+ <p>Les fichiers peuvent poss�der plusieurs extensions dont l'ordre
+ est <em>normalement</em> sans importance. Par exemple, si
+ le fichier <code>welcome.html.fr</code> est associ� au type de
+ contenu <code>text/html</code> et � la langue fran�aise, le fichier
+ <code>welcome.fr.html</code> poss�dera exactement les m�me
+ m�tadonn�es. Si le fichier poss�de plusieurs extensions associ�es
+ au m�me type de m�tadonn�e, c'est celle de ces extensions la plus �
+ droite qui sera utilis�e, except� pour ce qui concerne les langues
+ et les codages de contenu. Par exemple, si <code>.gif</code> est
+ associ� au <a class="glossarylink" href="../glossary.html#type de m�dium" title="voir glossaire">type de m�dium</a>
+ <code>image/gif</code>, et <code>.html</code> au type de m�dium
+ <code>text/html</code>, le fichier <code>welcome.gif.html</code>
+ sera associ� au type de m�dium <code>text/html</code>.</p>
+
+ <p>Les <a href="#charset-lang">Languages</a> et les <a href="#contentencoding">codages de contenu</a> sont trait�s de
+ mani�re cumulative, car il est possible d'assigner plusieurs
+ langues ou codages � une ressource particuli�re. Par exemple, le
+ fichier <code>welcome.html.en.de</code> sera servi avec les en-t�tes
+ <code>Content-Language: en, de</code> et <code>Content-Type:
+ text/html</code>.</p>
+
+ <p>Des pr�cautions doivent �tre prises lorsqu'un fichier avec
+ extensions multiples est associ� � la fois � un <a class="glossarylink" href="../glossary.html#type de&#10; m�dium" title="voir glossaire">type de
+ m�dium</a> et � un gestionnaire. En g�n�ral, cela impliquera
+ la gestion de la requ�te par le module associ� au gestionnaire. Par
+ exemple, si l'extension <code>.imap</code> est associ�e au
+ gestionnaire <code>imap-file</code> (du module
+ <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code>), et si l'extension <code>.html</code>
+ est associ�e au type de m�dium <code>text/html</code>, le fichier
+ <code>world.imap.html</code> sera � la fois associ� au gestionnaire
+ <code>imap-file</code> et au type de m�dium <code>text/html</code>.
+ Pour son traitement, c'est le gestionnaire <code>imap-file</code>
+ qui sera utilis�, et il sera donc trait� en tant que fichier
+ imagemap.</p>
+
+ <p>Si vous pr�f�rez que seule la derni�re partie d'un nom de fichier
+ s�par�e du reste du nom par un point soit associ�e � une m�tadonn�e
+ particuli�re, n'utilisez pas les directives <code>Add*</code>. Par
+ exemple, si vous souhaitez que le fichier <code>foo.html.cgi</code>
+ soit trait� en tant que script CGI, mais pas le fichier
+ <code>bar.cgi.html</code>, alors, au lieu d'utiliser
+ <code>AddHandler cgi-script .cgi</code>, utilisez plut�t :</p>
+
+ <div class="example"><h3>Configuration du gestionnaire en se basant seulement
+ sur la derni�re extension</h3><pre class="prettyprint lang-config">&lt;FilesMatch \.cgi$&gt;
+ SetHandler cgi-script
+&lt;/FilesMatch&gt;</pre>
+</div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="contentencoding" id="contentencoding">Codage du contenu</a></h2>
+ <p>Un fichier d'un <a class="glossarylink" href="../glossary.html#type de m�dium" title="voir glossaire">type de m�dium</a> particulier
+ peut �tre �galement cod� d'une certaine mani�re pour simplifier sa
+ transmission sur Internet. Alors que cela concerne en g�n�ral la
+ compression, comme <code>gzip</code>, il peut aussi s'agir de
+ chiffrement, comme <code>pgp</code> ou d'un codage comme UUencoding,
+ qui est con�u pour transmettre un fichier binaire sous un format
+ ASCII (texte).</p>
+
+ <p>La <a href="http://www.ietf.org/rfc/rfc2616.txt">RFC
+ HTTP/1.1</a>, section 14.11 stipule � ce titre :</p>
+
+ <blockquote cite="http://www.ietf.org/rfc/rfc2616.txt">
+ <p>Le champ d'en-t�te Content-Encoding de l'entit� est utilis� en
+ tant que modificateur du type de m�dium. Lorsqu'il est pr�sent, sa
+ valeur indique quels codages de contenu additionnels ont �t�
+ appliqu�s au corps de l'entit�, et ainsi quels m�canismes de
+ d�codage doivent �tre appliqu�s afin de retrouver le type de
+ m�dium r�f�renc� par le champ d'en-t�te Content-Type. Le codage de
+ contenu est principalement utilis� pour permettre la compression
+ d'un document sans perdre l'information concernant le type de
+ m�dium sous-jacent.</p>
+ </blockquote>
+
+ <p>En utilisant plusieurs extensions (voir la <a href="#multipleext">section ci-dessus � propos des extensions de
+ fichiers multiples</a>), vous pouvez indiquer qu'un fichier est d'un
+ <em>type</em>, particulier, et poss�de aussi un <em>codage</em>
+ particulier.</p>
+
+ <p>Consid�rons par exemple un fichier contenant un document
+ Microsoft Word et compress� par pkzip pour r�duire sa taille. Si
+ l'extension <code>.doc</code> est associ�e au type de fichier
+ Microsoft Word, et si l'extension <code>.zip</code> est associ�e au
+ codage de fichier pkzip, alors le fichier
+ <code>Resume.doc.zip</code> sera identifi� comme document Word
+ compress� par pkzip.</p>
+
+ <p>Apache joint un en-t�te <code>Content-encoding</code> � la
+ ressource afin d'informer le navigateur client � propos de la
+ m�thode de codage.</p>
+
+ <pre class="prettyprint lang-config">Content-encoding: pkzip</pre>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="charset-lang" id="charset-lang">Jeux de caract�res et langues</a></h2>
+ <p>En plus du type de fichier et du codage, un autre �l�ment
+ important d'information est la langue dans laquelle le document est
+ �crit, et avec quel jeu de caract�res le contenu du fichier doit
+ �tre affich�. Par exemple, un document peut �tre �crit en alphabet
+ vietnamien ou cyrillique, et doit �tre affich� en cons�quence. Cette
+ information est �galement transmise via des en-t�tes HTTP.</p>
+
+ <p>Les jeu de caract�res, langue, codage et type MIME sont tous
+ utilis�s au cours du processus de n�gociation de contenu (voir
+ <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code>) afin de d�terminer quel document
+ servir au client, lorsque plusieurs choix sont possibles en fonction
+ du jeu de caract�res, de la langue, du codage ou du type MIME. Toutes
+ les associations d'extensions de noms de fichiers cr��es via les
+ directives <code class="directive"><a href="#addcharset">AddCharset</a></code>,
+ <code class="directive"><a href="#addencoding">AddEncoding</a></code>, <code class="directive"><a href="#addlanguage">AddLanguage</a></code> et <code class="directive"><a href="#addtype">AddType</a></code> (ainsi que les associations
+ d'extensions list�es dans le fichier d�fini par la directive
+ <code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code>),
+ participent � ce processus de s�lection. Les extensions de noms de
+ fichiers qui n'ont �t� associ�s que par des directives <code class="directive"><a href="#addhandler">AddHandler</a></code>, <code class="directive"><a href="#addinputfilter">AddInputFilter</a></code> ou <code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code>, peuvent �tre incluses
+ ou exclues du processus de s�lection en utilisant la directive
+ <code class="directive"><a href="#multiviewsmatch">MultiviewsMatch</a></code>.</p>
+
+ <h3><a name="charset" id="charset">Jeu de caract�res</a></h3>
+ <p>Pour transmettre cette information suppl�mentaire, Apache peut
+ ajouter un en-t�te <code>Content-Language</code>, afin de
+ sp�cifier la langue dans laquelle le document est �crit, et peut
+ ajouter des informations additionnelles � l'en-t�te
+ <code>Content-Type</code> pour indiquer le jeu de caract�res
+ particulier qui doit �tre utilis� pour restituer correctement le
+ document.</p>
+
+ <div class="example"><p><code>
+ Content-Language: en, fr
+Content-Type: text/plain; charset=ISO-8859-1
+ </code></p></div>
+
+ <p>La langue est sp�cifi�e via son abr�viation en deux lettres. Le
+ <code>jeu de caract�res</code> est le nom du jeu de caract�res
+ particulier qui doit �tre utilis�.</p>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_mime.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_mime.html.ja.utf8 b/docs/manual/mod/mod_mime.html.ja.utf8
index 787247b1a9..7e31da77be 100644
--- a/docs/manual/mod/mod_mime.html.ja.utf8
+++ b/docs/manual/mod/mod_mime.html.ja.utf8
@@ -123,135 +123,6 @@
<li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="multipleext" id="multipleext">複数の拡張子のあるファイル</a></h2>
- <p>ファイルは複数の拡張子を持つことができ、拡張子の順番は<em>通常は</em>関係ありません。例えば、ファイル <code>welcome.html.fr</code>
- がコンテントタイプは <code>text/html</code>
- に、言語はフランス語にマップされる場合、<code>welcome.fr.html</code>
- もまったく同じ情報にマップされます。
- 同じメタ情報にマップされる拡張子が複数あるときには、言語と
- コンテントエンコーディングを除いて、
- 右側にあるものが使用されます。たとえば、<code>.gif</code> が <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を参照">MIME タイプ</a> <code>image/gif</code> にマップされ、<code>.html</code>
- が MIME タイプ <code>text/html</code>
- にマップされる場合は、ファイル <code>welcome.gif.html</code> は
- MIME タイプ <code>text/html</code> に関連付けられます。</p>
-
- <p>リソースに複数の言語やエンコーディングを関連付けること
- ができるため、
- <a href="#charset-lang">言語</a>と<a href="#contentencoding">コンテントエンコーディング</a>は前のものに追加されていきます。
- たとえば、ファイル <code>welcome.html.en.de</code> は
- <code>Content-Language: en, de</code> と <code>Content-Type:
- text/html</code> として送信されます。</p>
-
- <p>複数の拡張子のあるファイルが <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を参照">MIME
- タイプ</a>とハンドラの両方に関連付けられているときは注意する必要があります。
- その場合、普通はリクエストがハンドラに関連付けられた
- モジュールによって扱われることになります。たとえば、拡張子
- <code>.imap</code> が (<code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code> の) <code>imap-file</code>
- にマップされていて、<code>.html</code> が MIME タイプ <code>text/html</code>
- にマップされているときは、ファイル <code>world.imap.html</code> は
- <code>imap-file</code> ハンドラと <code>text/html</code> MIME
- タイプに関連付けられます。ファイルが処理されるときは <code>imap-file</code>
- ハンドラが使用されますので、そのファイルは <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code>
- のイメージマップファイルとして扱われることになります。</p>
-
- <p>ファイル名のドット区切りでの最後の部分を使って、
- 特定の部分のメタデータにマッピングしたい場合は、
- <code>Add*</code> ディレクティブは使わないでください。
- たとえば <code>foo.html.cgi</code> を CGI スクリプトとして処理したいけれども、
- <code>bar.cgi.html</code> は CGI スクリプトとしては処理したくない場合、
- <code>AddHandler cgi-script .cgi</code> とする代わりに
- 次のようにしてください</p>
-
- <div class="example"><h3>Configure handler based on final extension only</h3><p><code>
- &lt;FilesMatch \.cgi$&gt;
- <span class="indent">
- SetHandler cgi-script
- </span>
- &lt;/FilesMatch&gt;
- </code></p></div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="contentencoding" id="contentencoding">コンテントエンコーディング</a></h2>
- <p>特定の <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を参照">MIME タイプ</a>
- のファイルはインターネットでの転送を簡単にするために、
- さらに符号化することができます。これは通常は <code>gzip</code> の
- ような圧縮のことを指しますが、<code>pgp</code> のような暗号化や、
- バイナリファイルを ASCII (テキスト) 形式で送るために考案された
- UUencoding のことを指すこともあります。</p>
-
- <p><a href="http://www.ietf.org/rfc/rfc2616.txt">HTTP/1.1 RFC</a>
- 14.11 節では次のように記述されています。</p>
-
- <blockquote cite="http://www.ietf.org/rfc/rfc2616.txt">
- <p>Content-Encoding エンティティヘッダフィールドはメディアタイプの
- 修飾子として使われます。それが存在していれば、値はエンティティボディに
- どの追加の符号化が適用されたかを示し、Content-Type ヘッダフィールドに
- 書かれているメディアタイプを得るためにどの復号機構を適用すべきか、も
- 示していることになります。Content-Encoding は主に、元のメディアタイプの
- 同一性を失うことなくドキュメントを圧縮することを可能にするために
- 使用されます。</p>
- </blockquote>
-
- <p>複数のファイル拡張子 (複数の拡張子については <a href="#multipleext">上の節</a> を参照) 使うことで、
- ファイルの<em>タイプ</em>や<em>エンコーディング</em>を指定することが
- できます。</p>
-
- <p>たとえば、Microsoft Word のドキュメントがあり、サイズを小さくするために
- pkzip されているとします。<code>.doc</code> 拡張子が Microsoft Word の
- ファイルタイプと関連付けられていて、<code>.zip</code> 拡張子が
- pkzip ファイルエンコーディングと関連付けられていると、ファイル
- <code>Resume.doc.zip</code> は pkzip された Word ドキュメントである
- ということがわかります。</p>
-
- <p>クライアントのブラウザにエンコーディング方法を知らせるために、
- Apache はリソースと共に <code>Content-Encoding</code> ヘッダを
- 送ります。</p>
-
- <div class="example"><p><code>Content-encoding: pkzip</code></p></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="charset-lang" id="charset-lang">文字セットと言語</a></h2>
- <p>ファイルタイプとファイルエンコーディングの他に重要な情報は
- ドキュメントの書かれている言語と、どの文字セットでファイルが表示
- されるべきか、というものです。たとえば、ドキュメントはベトナムの
- アルファベットやキリル文字で書かれていて、そのように表示される
- 必要があるかもしれません。この情報もまた、HTTP ヘッダで
- 送信されます。</p>
-
- <p>文字セット、言語、エンコーディング、mime タイプはすべて
- コンテントネゴシエーション (<code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> 参照)
- の最中に、複数の文字セット、言語、エンコーディング、MIME タイプからなる
- 代替物があるときにどのドキュメントをクライアントに送るのかを
- 決定するときに使われます。<code class="directive"><a href="#addcharset">AddCharset</a></code>,
- <code class="directive"><a href="#addencoding">AddEncoding</a></code>, <code class="directive"><a href="#addlanguage">AddLanguage</a></code>,
- <code class="directive"><a href="#addtype">AddType</a></code> の各ディレクティブで作成された
- 拡張子の関連付け (と <code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code> でリストされている
- 拡張子) がこの選択に参加します。<code class="directive"><a href="#addhandler">AddHandler</a></code>,
- <code class="directive"><a href="#addinputfilter">AddInputFilter</a></code>,
- <code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code> の
- 各ディレクティブでのみ関連付けられている拡張子は
- <code class="directive"><a href="#multiviewsmatch">MultiviewsMatch</a></code> ディレクティブを
- 使うことでマッチの
- 処理に含めることも外すこともできます。</p>
-
- <h3><a name="charset" id="charset">Charset</a></h3>
- <p>さらに情報を伝えるために、Apache は文書の言語を
- <code>Content-Language</code> ヘッダで送ることもあります。
- また、情報を正しく表示するために使用すべき文字セットを示すために
- <code>Conten-Type</code> ヘッダに情報を追加することもあります。</p>
-
- <div class="example"><p><code>
- Content-Language: en, fr<br />
- Content-Type: text/plain; charset=ISO-8859-1
- </code></p></div>
-
- <p>言語の指定は二文字の短縮形で行なわれます。<code>charset</code> が
- 使用すべき文字セットの名前です。</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="AddCharset" id="AddCharset">AddCharset</a> <a name="addcharset" id="addcharset">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル名の拡張子を指定された文字セットにマップする</td></tr>
@@ -977,6 +848,135 @@
<li><code class="module"><a href="../mod/mod_mime_magic.html">mod_mime_magic</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="multipleext" id="multipleext">複数の拡張子のあるファイル</a></h2>
+ <p>ファイルは複数の拡張子を持つことができ、拡張子の順番は<em>通常は</em>関係ありません。例えば、ファイル <code>welcome.html.fr</code>
+ がコンテントタイプは <code>text/html</code>
+ に、言語はフランス語にマップされる場合、<code>welcome.fr.html</code>
+ もまったく同じ情報にマップされます。
+ 同じメタ情報にマップされる拡張子が複数あるときには、言語と
+ コンテントエンコーディングを除いて、
+ 右側にあるものが使用されます。たとえば、<code>.gif</code> が <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を参照">MIME タイプ</a> <code>image/gif</code> にマップされ、<code>.html</code>
+ が MIME タイプ <code>text/html</code>
+ にマップされる場合は、ファイル <code>welcome.gif.html</code> は
+ MIME タイプ <code>text/html</code> に関連付けられます。</p>
+
+ <p>リソースに複数の言語やエンコーディングを関連付けること
+ ができるため、
+ <a href="#charset-lang">言語</a>と<a href="#contentencoding">コンテントエンコーディング</a>は前のものに追加されていきます。
+ たとえば、ファイル <code>welcome.html.en.de</code> は
+ <code>Content-Language: en, de</code> と <code>Content-Type:
+ text/html</code> として送信されます。</p>
+
+ <p>複数の拡張子のあるファイルが <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を参照">MIME
+ タイプ</a>とハンドラの両方に関連付けられているときは注意する必要があります。
+ その場合、普通はリクエストがハンドラに関連付けられた
+ モジュールによって扱われることになります。たとえば、拡張子
+ <code>.imap</code> が (<code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code> の) <code>imap-file</code>
+ にマップされていて、<code>.html</code> が MIME タイプ <code>text/html</code>
+ にマップされているときは、ファイル <code>world.imap.html</code> は
+ <code>imap-file</code> ハンドラと <code>text/html</code> MIME
+ タイプに関連付けられます。ファイルが処理されるときは <code>imap-file</code>
+ ハンドラが使用されますので、そのファイルは <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code>
+ のイメージマップファイルとして扱われることになります。</p>
+
+ <p>ファイル名のドット区切りでの最後の部分を使って、
+ 特定の部分のメタデータにマッピングしたい場合は、
+ <code>Add*</code> ディレクティブは使わないでください。
+ たとえば <code>foo.html.cgi</code> を CGI スクリプトとして処理したいけれども、
+ <code>bar.cgi.html</code> は CGI スクリプトとしては処理したくない場合、
+ <code>AddHandler cgi-script .cgi</code> とする代わりに
+ 次のようにしてください</p>
+
+ <div class="example"><h3>Configure handler based on final extension only</h3><p><code>
+ &lt;FilesMatch \.cgi$&gt;
+ <span class="indent">
+ SetHandler cgi-script
+ </span>
+ &lt;/FilesMatch&gt;
+ </code></p></div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="contentencoding" id="contentencoding">コンテントエンコーディング</a></h2>
+ <p>特定の <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を参照">MIME タイプ</a>
+ のファイルはインターネットでの転送を簡単にするために、
+ さらに符号化することができます。これは通常は <code>gzip</code> の
+ ような圧縮のことを指しますが、<code>pgp</code> のような暗号化や、
+ バイナリファイルを ASCII (テキスト) 形式で送るために考案された
+ UUencoding のことを指すこともあります。</p>
+
+ <p><a href="http://www.ietf.org/rfc/rfc2616.txt">HTTP/1.1 RFC</a>
+ 14.11 節では次のように記述されています。</p>
+
+ <blockquote cite="http://www.ietf.org/rfc/rfc2616.txt">
+ <p>Content-Encoding エンティティヘッダフィールドはメディアタイプの
+ 修飾子として使われます。それが存在していれば、値はエンティティボディに
+ どの追加の符号化が適用されたかを示し、Content-Type ヘッダフィールドに
+ 書かれているメディアタイプを得るためにどの復号機構を適用すべきか、も
+ 示していることになります。Content-Encoding は主に、元のメディアタイプの
+ 同一性を失うことなくドキュメントを圧縮することを可能にするために
+ 使用されます。</p>
+ </blockquote>
+
+ <p>複数のファイル拡張子 (複数の拡張子については <a href="#multipleext">上の節</a> を参照) 使うことで、
+ ファイルの<em>タイプ</em>や<em>エンコーディング</em>を指定することが
+ できます。</p>
+
+ <p>たとえば、Microsoft Word のドキュメントがあり、サイズを小さくするために
+ pkzip されているとします。<code>.doc</code> 拡張子が Microsoft Word の
+ ファイルタイプと関連付けられていて、<code>.zip</code> 拡張子が
+ pkzip ファイルエンコーディングと関連付けられていると、ファイル
+ <code>Resume.doc.zip</code> は pkzip された Word ドキュメントである
+ ということがわかります。</p>
+
+ <p>クライアントのブラウザにエンコーディング方法を知らせるために、
+ Apache はリソースと共に <code>Content-Encoding</code> ヘッダを
+ 送ります。</p>
+
+ <div class="example"><p><code>Content-encoding: pkzip</code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="charset-lang" id="charset-lang">文字セットと言語</a></h2>
+ <p>ファイルタイプとファイルエンコーディングの他に重要な情報は
+ ドキュメントの書かれている言語と、どの文字セットでファイルが表示
+ されるべきか、というものです。たとえば、ドキュメントはベトナムの
+ アルファベットやキリル文字で書かれていて、そのように表示される
+ 必要があるかもしれません。この情報もまた、HTTP ヘッダで
+ 送信されます。</p>
+
+ <p>文字セット、言語、エンコーディング、mime タイプはすべて
+ コンテントネゴシエーション (<code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> 参照)
+ の最中に、複数の文字セット、言語、エンコーディング、MIME タイプからなる
+ 代替物があるときにどのドキュメントをクライアントに送るのかを
+ 決定するときに使われます。<code class="directive"><a href="#addcharset">AddCharset</a></code>,
+ <code class="directive"><a href="#addencoding">AddEncoding</a></code>, <code class="directive"><a href="#addlanguage">AddLanguage</a></code>,
+ <code class="directive"><a href="#addtype">AddType</a></code> の各ディレクティブで作成された
+ 拡張子の関連付け (と <code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code> でリストされている
+ 拡張子) がこの選択に参加します。<code class="directive"><a href="#addhandler">AddHandler</a></code>,
+ <code class="directive"><a href="#addinputfilter">AddInputFilter</a></code>,
+ <code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code> の
+ 各ディレクティブでのみ関連付けられている拡張子は
+ <code class="directive"><a href="#multiviewsmatch">MultiviewsMatch</a></code> ディレクティブを
+ 使うことでマッチの
+ 処理に含めることも外すこともできます。</p>
+
+ <h3><a name="charset" id="charset">Charset</a></h3>
+ <p>さらに情報を伝えるために、Apache は文書の言語を
+ <code>Content-Language</code> ヘッダで送ることもあります。
+ また、情報を正しく表示するために使用すべき文字セットを示すために
+ <code>Conten-Type</code> ヘッダに情報を追加することもあります。</p>
+
+ <div class="example"><p><code>
+ Content-Language: en, fr<br />
+ Content-Type: text/plain; charset=ISO-8859-1
+ </code></p></div>
+
+ <p>言語の指定は二文字の短縮形で行なわれます。<code>charset</code> が
+ 使用すべき文字セットの名前です。</p>
+
+</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_mime.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_mime_magic.html.en b/docs/manual/mod/mod_mime_magic.html.en
index 89b612d21b..75d28c6251 100644
--- a/docs/manual/mod/mod_mime_magic.html.en
+++ b/docs/manual/mod/mod_mime_magic.html.en
@@ -57,6 +57,28 @@
<li><img alt="" src="../images/down.gif" /> <a href="#notes">Notes</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MimeMagicFile" id="MimeMagicFile">MimeMagicFile</a> <a name="mimemagicfile" id="mimemagicfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable MIME-type determination based on file contents
+using the specified magic file</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MimeMagicFile <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_mime_magic</td></tr>
+</table>
+ <p>The <code class="directive">MimeMagicFile</code> directive can be used to
+ enable this module, the default file is distributed at
+ <code>conf/magic</code>. Non-rooted paths are relative to the
+ <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. Virtual hosts will use
+ the same file as the main server unless a more specific setting is
+ used, in which case the more specific setting overrides the main
+ server's file.</p>
+
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">MimeMagicFile conf/magic</pre>
+</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="format" id="format">Format of the Magic File</a></h2>
@@ -247,28 +269,6 @@
</ul>
</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="MimeMagicFile" id="MimeMagicFile">MimeMagicFile</a> <a name="mimemagicfile" id="mimemagicfile">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable MIME-type determination based on file contents
-using the specified magic file</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MimeMagicFile <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_mime_magic</td></tr>
-</table>
- <p>The <code class="directive">MimeMagicFile</code> directive can be used to
- enable this module, the default file is distributed at
- <code>conf/magic</code>. Non-rooted paths are relative to the
- <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. Virtual hosts will use
- the same file as the main server unless a more specific setting is
- used, in which case the more specific setting overrides the main
- server's file.</p>
-
- <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">MimeMagicFile conf/magic</pre>
-</div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_mime_magic.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_mime_magic.html.fr b/docs/manual/mod/mod_mime_magic.html.fr
index 065dc3b313..f76c015e2d 100644
--- a/docs/manual/mod/mod_mime_magic.html.fr
+++ b/docs/manual/mod/mod_mime_magic.html.fr
@@ -58,6 +58,29 @@ octets de son contenu</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#notes">Notes</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="mimemagicfile" id="mimemagicfile">Directive</a> <a name="MimeMagicFile" id="MimeMagicFile">MimeMagicFile</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Active la d�termination du type MIME en se basant sur le
+contenu du fichier et en utilisant le fichier magique
+sp�cifi�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>MimeMagicFile <var>chemin-fichier</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_mime_magic</td></tr>
+</table>
+ <p>La directive <code class="directive">MimeMagicFile</code> permet
+ d'activer ce module, le fichier par d�faut fourni �tant
+ <code>conf/magic</code>. Les chemins sans slash '/' de d�but sont
+ relatifs au r�pertoire d�fini par la directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. Les serveurs virtuels
+ utilisent le m�me fichier que le serveur principal sauf si un
+ fichier sp�cifique a �t� d�fini pour ce serveur virtuel, auquel cas
+ c'est ce dernier fichier qui sera utilis�.</p>
+
+ <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">MimeMagicFile conf/magic</pre>
+</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="format" id="format">Format du fichier magique</a></h2>
@@ -254,29 +277,6 @@ octets de son contenu</td></tr>
</ul>
</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="mimemagicfile" id="mimemagicfile">Directive</a> <a name="MimeMagicFile" id="MimeMagicFile">MimeMagicFile</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Active la d�termination du type MIME en se basant sur le
-contenu du fichier et en utilisant le fichier magique
-sp�cifi�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>MimeMagicFile <var>chemin-fichier</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_mime_magic</td></tr>
-</table>
- <p>La directive <code class="directive">MimeMagicFile</code> permet
- d'activer ce module, le fichier par d�faut fourni �tant
- <code>conf/magic</code>. Les chemins sans slash '/' de d�but sont
- relatifs au r�pertoire d�fini par la directive <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. Les serveurs virtuels
- utilisent le m�me fichier que le serveur principal sauf si un
- fichier sp�cifique a �t� d�fini pour ce serveur virtuel, auquel cas
- c'est ce dernier fichier qui sera utilis�.</p>
-
- <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">MimeMagicFile conf/magic</pre>
-</div>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_mime_magic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_negotiation.html.en b/docs/manual/mod/mod_negotiation.html.en
index 6ca0fcc54a..7be5c8e17f 100644
--- a/docs/manual/mod/mod_negotiation.html.en
+++ b/docs/manual/mod/mod_negotiation.html.en
@@ -69,6 +69,118 @@ Negotiation</a></li>
<li><a href="../env.html">Environment Variables</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheNegotiatedDocs" id="CacheNegotiatedDocs">CacheNegotiatedDocs</a> <a name="cachenegotiateddocs" id="cachenegotiateddocs">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Allows content-negotiated documents to be
+cached by proxy servers</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheNegotiatedDocs On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheNegotiatedDocs Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<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_negotiation</td></tr>
+</table>
+ <p>If set, this directive allows content-negotiated documents
+ to be cached by proxy servers. This could mean that clients
+ behind those proxys could retrieve versions of the documents
+ that are not the best match for their abilities, but it will
+ make caching more efficient.</p>
+
+ <p>This directive only applies to requests which come from
+ HTTP/1.0 browsers. HTTP/1.1 provides much better control over
+ the caching of negotiated documents, and this directive has no
+ effect in responses to HTTP/1.1 requests.</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="ForceLanguagePriority" id="ForceLanguagePriority">ForceLanguagePriority</a> <a name="forcelanguagepriority" id="forcelanguagepriority">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Action to take if a single acceptable document is not
+found</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ForceLanguagePriority Prefer</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#Override">Override:</a></th><td>FileInfo</td></tr>
+<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_negotiation</td></tr>
+</table>
+ <p>The <code class="directive">ForceLanguagePriority</code> directive uses
+ the given <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> to satisfy
+ negotiation where the server could otherwise not return a single
+ matching document.</p>
+
+ <p><code>ForceLanguagePriority Prefer</code> uses
+ <code>LanguagePriority</code> to serve a one valid result, rather
+ than returning an HTTP result 300 (MULTIPLE CHOICES) when there
+ are several equally valid choices. If the directives below were
+ given, and the user's <code>Accept-Language</code> header assigned
+ <code>en</code> and <code>de</code> each as quality <code>.500</code>
+ (equally acceptable) then the first matching variant, <code>en</code>,
+ will be served.</p>
+
+ <pre class="prettyprint lang-config">LanguagePriority en fr de
+ForceLanguagePriority Prefer</pre>
+
+
+ <p><code>ForceLanguagePriority Fallback</code> uses
+ <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> to
+ serve a valid result, rather than returning an HTTP result 406
+ (NOT ACCEPTABLE). If the directives below were given, and the user's
+ <code>Accept-Language</code> only permitted an <code>es</code>
+ language response, but such a variant isn't found, then the first
+ variant from the <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> list below will be served.</p>
+
+ <pre class="prettyprint lang-config">LanguagePriority en fr de
+ForceLanguagePriority Fallback</pre>
+
+
+ <p>Both options, <code>Prefer</code> and <code>Fallback</code>, may be
+ specified, so either the first matching variant from <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> will be served if
+ more than one variant is acceptable, or first available document will
+ be served if none of the variants matched the client's acceptable list
+ of languages.</p>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LanguagePriority" id="LanguagePriority">LanguagePriority</a> <a name="languagepriority" id="languagepriority">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The precendence of language variants for cases where
+the client does not express a preference</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LanguagePriority <var>MIME-lang</var> [<var>MIME-lang</var>]
+...</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#Override">Override:</a></th><td>FileInfo</td></tr>
+<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_negotiation</td></tr>
+</table>
+ <p>The <code class="directive">LanguagePriority</code> sets the precedence
+ of language variants for the case where the client does not
+ express a preference, when handling a Multiviews request. The list
+ of <var>MIME-lang</var> are in order of decreasing preference.</p>
+
+ <pre class="prettyprint lang-config">LanguagePriority en fr de</pre>
+
+
+ <p>For a request for <code>foo.html</code>, where
+ <code>foo.html.fr</code> and <code>foo.html.de</code> both
+ existed, but the browser did not express a language preference,
+ then <code>foo.html.fr</code> would be returned.</p>
+
+ <p>Note that this directive only has an effect if a 'best'
+ language cannot be determined by any other means or the <code class="directive"><a href="#forcelanguagepriority">ForceLanguagePriority</a></code> directive
+ is not <code>None</code>. In general, the client determines the
+ language preference, not the server.</p>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="typemaps" id="typemaps">Type maps</a></h2>
<p>A type map has a format similar to RFC822 mail headers. It
@@ -226,118 +338,6 @@ Negotiation</a></li>
that do not have content negotiation meta-information assigned
to them when choosing files.</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="CacheNegotiatedDocs" id="CacheNegotiatedDocs">CacheNegotiatedDocs</a> <a name="cachenegotiateddocs" id="cachenegotiateddocs">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Allows content-negotiated documents to be
-cached by proxy servers</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheNegotiatedDocs On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheNegotiatedDocs Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
-<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_negotiation</td></tr>
-</table>
- <p>If set, this directive allows content-negotiated documents
- to be cached by proxy servers. This could mean that clients
- behind those proxys could retrieve versions of the documents
- that are not the best match for their abilities, but it will
- make caching more efficient.</p>
-
- <p>This directive only applies to requests which come from
- HTTP/1.0 browsers. HTTP/1.1 provides much better control over
- the caching of negotiated documents, and this directive has no
- effect in responses to HTTP/1.1 requests.</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="ForceLanguagePriority" id="ForceLanguagePriority">ForceLanguagePriority</a> <a name="forcelanguagepriority" id="forcelanguagepriority">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Action to take if a single acceptable document is not
-found</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ForceLanguagePriority Prefer</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#Override">Override:</a></th><td>FileInfo</td></tr>
-<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_negotiation</td></tr>
-</table>
- <p>The <code class="directive">ForceLanguagePriority</code> directive uses
- the given <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> to satisfy
- negotiation where the server could otherwise not return a single
- matching document.</p>
-
- <p><code>ForceLanguagePriority Prefer</code> uses
- <code>LanguagePriority</code> to serve a one valid result, rather
- than returning an HTTP result 300 (MULTIPLE CHOICES) when there
- are several equally valid choices. If the directives below were
- given, and the user's <code>Accept-Language</code> header assigned
- <code>en</code> and <code>de</code> each as quality <code>.500</code>
- (equally acceptable) then the first matching variant, <code>en</code>,
- will be served.</p>
-
- <pre class="prettyprint lang-config">LanguagePriority en fr de
-ForceLanguagePriority Prefer</pre>
-
-
- <p><code>ForceLanguagePriority Fallback</code> uses
- <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> to
- serve a valid result, rather than returning an HTTP result 406
- (NOT ACCEPTABLE). If the directives below were given, and the user's
- <code>Accept-Language</code> only permitted an <code>es</code>
- language response, but such a variant isn't found, then the first
- variant from the <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> list below will be served.</p>
-
- <pre class="prettyprint lang-config">LanguagePriority en fr de
-ForceLanguagePriority Fallback</pre>
-
-
- <p>Both options, <code>Prefer</code> and <code>Fallback</code>, may be
- specified, so either the first matching variant from <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> will be served if
- more than one variant is acceptable, or first available document will
- be served if none of the variants matched the client's acceptable list
- of languages.</p>
-
-<h3>See also</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LanguagePriority" id="LanguagePriority">LanguagePriority</a> <a name="languagepriority" id="languagepriority">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The precendence of language variants for cases where
-the client does not express a preference</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LanguagePriority <var>MIME-lang</var> [<var>MIME-lang</var>]
-...</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#Override">Override:</a></th><td>FileInfo</td></tr>
-<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_negotiation</td></tr>
-</table>
- <p>The <code class="directive">LanguagePriority</code> sets the precedence
- of language variants for the case where the client does not
- express a preference, when handling a Multiviews request. The list
- of <var>MIME-lang</var> are in order of decreasing preference.</p>
-
- <pre class="prettyprint lang-config">LanguagePriority en fr de</pre>
-
-
- <p>For a request for <code>foo.html</code>, where
- <code>foo.html.fr</code> and <code>foo.html.de</code> both
- existed, but the browser did not express a language preference,
- then <code>foo.html.fr</code> would be returned.</p>
-
- <p>Note that this directive only has an effect if a 'best'
- language cannot be determined by any other means or the <code class="directive"><a href="#forcelanguagepriority">ForceLanguagePriority</a></code> directive
- is not <code>None</code>. In general, the client determines the
- language preference, not the server.</p>
-
-<h3>See also</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
-</ul>
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_negotiation.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_negotiation.html.fr b/docs/manual/mod/mod_negotiation.html.fr
index 448adfb247..d17973fb96 100644
--- a/docs/manual/mod/mod_negotiation.html.fr
+++ b/docs/manual/mod/mod_negotiation.html.fr
@@ -69,6 +69,128 @@ contenu</a></li>
<li><a href="../env.html">Variables d'environnement</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="cachenegotiateddocs" id="cachenegotiateddocs">Directive</a> <a name="CacheNegotiatedDocs" id="CacheNegotiatedDocs">CacheNegotiatedDocs</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Permet la mise en cache au niveau des serveurs mandataires
+des documents dont le contenu a �t� n�goci�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>CacheNegotiatedDocs On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>CacheNegotiatedDocs Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_negotiation</td></tr>
+</table>
+ <p>Si elle est d�finie � "on", cette directive permet la mise en
+ cache au niveau des serveurs mandataires des documents dont le
+ contenu a �t� n�goci�. Le processus de mise en cache sera alors plus
+ efficace, mais des clients se trouvant derri�re le mandataire
+ seront alors susceptibles de se voir servir des versions de
+ documents qui ne correspondent pas forc�ment � leurs attentes.</p>
+
+ <p>Cette directive ne s'applique qu'aux requ�tes en provenance de
+ navigateurs HTTP/1.0. HTTP/1.1 fournit un bien meilleur contr�le de
+ la mise en cache des documents au contenu n�goci�, et cette
+ directive n'a aucun effet sur les r�ponses aux requ�tes
+ HTTP/1.1.</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="forcelanguagepriority" id="forcelanguagepriority">Directive</a> <a name="ForceLanguagePriority" id="ForceLanguagePriority">ForceLanguagePriority</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Action � entreprendre si un document acceptable unique
+n'est pas trouv�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ForceLanguagePriority Prefer</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_negotiation</td></tr>
+</table>
+ <p>La directive <code class="directive">ForceLanguagePriority</code> utilise
+ le langage d�fini par la directive <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> pour terminer
+ la n�gociation lorsque le serveur n'est pas en mesure de trouver une
+ solution satisfaisante unique.</p>
+
+ <p><code>ForceLanguagePriority Prefer</code> utilise la directive
+ <code>LanguagePriority</code> pour servir le r�sultat d'un choix
+ unique, au lieu de renvoyer un r�sultat HTTP 300 (MULTIPLE CHOICES),
+ lorsque que plusieurs choix �quivalents sont disponibles. Par
+ exemple, avec les deux directives ci-dessous, si l'en-t�te
+ <code>Accept-Language</code> de l'utilisateur assigne �
+ <code>en</code> et <code>de</code> une qualit� de <code>.500</code>
+ (les deux langages sont �galement acceptables), alors c'est la
+ premi�re variante acceptable de langue <code>en</code> qui sera
+ servie.</p>
+
+ <pre class="prettyprint lang-config">LanguagePriority en fr de
+ForceLanguagePriority Prefer</pre>
+
+
+ <p><code>ForceLanguagePriority Fallback</code> utilise la directive
+ <code class="directive"><a href="#languagepriority">LanguagePriority</a></code>
+ pour servir un r�sultat valide, au lieu de renvoyer un r�sultat HTTP
+ 406 (NOT ACCEPTABLE). Avec les deux directives ci-dessous, si
+ l'en-t�te <code>Accept-Language</code> de l'utilisateur ne mentionne
+ que les r�ponses de langage <code>es</code>, et si aucune variante
+ dans cette langue n'est trouv�e, c'est la premi�re variante de la
+ liste d�finie par la directive <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> qui sera servie.</p>
+
+ <pre class="prettyprint lang-config">LanguagePriority en fr de
+ForceLanguagePriority Fallback</pre>
+
+
+ <p>Les deux options, <code>Prefer</code> et <code>Fallback</code>,
+ peuvent �tre sp�cifi�es, de fa�on � ce que la variante servie soit
+ la premi�re variante qui convient d�finie par la directive
+ <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> si
+ plusieurs variantes sont �galement acceptables, ou le premier
+ document disponible si aucune variante ne convient � la liste de
+ langages acceptables fournie par le client.</p>
+
+<h3>Voir aussi</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="languagepriority" id="languagepriority">Directive</a> <a name="LanguagePriority" id="LanguagePriority">LanguagePriority</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>L'ordre de priorit� des variantes de langages pour les
+cas o� le client n'a pas formul� de pr�f�rences</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LanguagePriority <var>langage-MIME</var> [<var>langage-MIME</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_negotiation</td></tr>
+</table>
+ <p>La directive <code class="directive">LanguagePriority</code> permet de
+ d�finir, au cours du traitement d'une requ�te Multivues, l'ordre de
+ priorit� des variantes de langages pour les cas
+ o� le client n'a pas formul� de pr�f�rences. La liste �num�re les
+ <var>langages-MIME</var> dans un ordre de pr�f�rences
+ d�croissantes.</p>
+
+ <pre class="prettyprint lang-config">LanguagePriority en fr de</pre>
+
+
+ <p>Dans le cas d'une requ�te pour <code>foo.html</code>, si
+ <code>foo.html.fr</code> et <code>foo.html.de</code> existent, et si
+ le client n'a pas formul� de pr�f�rences, c'est le fichier
+ <code>foo.html.fr</code> qui sera renvoy�.</p>
+
+ <p>Notez que cette directive n'a d'effet que si le 'meilleur'
+ langage n'a pas pu �tre d�termin� d'une autre mani�re ou si la
+ valeur de la directive <code class="directive"><a href="#forcelanguagepriority">ForceLanguagePriority</a></code> est
+ diff�rente de <code>None</code>. En g�n�ral, c'est le client qui
+ d�termine le langage pr�f�r�, non le serveur.</p>
+
+<h3>Voir aussi</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="typemaps" id="typemaps">Tables de correspondances de types</a></h2>
<p>Une table de correspondances de types poss�de un format similaire
@@ -232,128 +354,6 @@ contenu</a></li>
prendre en compte les fichiers qui ne comportent pas de m�tadonn�es
de n�gociation de contenu lors du choix du fichier � servir.</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="cachenegotiateddocs" id="cachenegotiateddocs">Directive</a> <a name="CacheNegotiatedDocs" id="CacheNegotiatedDocs">CacheNegotiatedDocs</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Permet la mise en cache au niveau des serveurs mandataires
-des documents dont le contenu a �t� n�goci�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>CacheNegotiatedDocs On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>CacheNegotiatedDocs Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_negotiation</td></tr>
-</table>
- <p>Si elle est d�finie � "on", cette directive permet la mise en
- cache au niveau des serveurs mandataires des documents dont le
- contenu a �t� n�goci�. Le processus de mise en cache sera alors plus
- efficace, mais des clients se trouvant derri�re le mandataire
- seront alors susceptibles de se voir servir des versions de
- documents qui ne correspondent pas forc�ment � leurs attentes.</p>
-
- <p>Cette directive ne s'applique qu'aux requ�tes en provenance de
- navigateurs HTTP/1.0. HTTP/1.1 fournit un bien meilleur contr�le de
- la mise en cache des documents au contenu n�goci�, et cette
- directive n'a aucun effet sur les r�ponses aux requ�tes
- HTTP/1.1.</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="forcelanguagepriority" id="forcelanguagepriority">Directive</a> <a name="ForceLanguagePriority" id="ForceLanguagePriority">ForceLanguagePriority</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Action � entreprendre si un document acceptable unique
-n'est pas trouv�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ForceLanguagePriority Prefer</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_negotiation</td></tr>
-</table>
- <p>La directive <code class="directive">ForceLanguagePriority</code> utilise
- le langage d�fini par la directive <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> pour terminer
- la n�gociation lorsque le serveur n'est pas en mesure de trouver une
- solution satisfaisante unique.</p>
-
- <p><code>ForceLanguagePriority Prefer</code> utilise la directive
- <code>LanguagePriority</code> pour servir le r�sultat d'un choix
- unique, au lieu de renvoyer un r�sultat HTTP 300 (MULTIPLE CHOICES),
- lorsque que plusieurs choix �quivalents sont disponibles. Par
- exemple, avec les deux directives ci-dessous, si l'en-t�te
- <code>Accept-Language</code> de l'utilisateur assigne �
- <code>en</code> et <code>de</code> une qualit� de <code>.500</code>
- (les deux langages sont �galement acceptables), alors c'est la
- premi�re variante acceptable de langue <code>en</code> qui sera
- servie.</p>
-
- <pre class="prettyprint lang-config">LanguagePriority en fr de
-ForceLanguagePriority Prefer</pre>
-
-
- <p><code>ForceLanguagePriority Fallback</code> utilise la directive
- <code class="directive"><a href="#languagepriority">LanguagePriority</a></code>
- pour servir un r�sultat valide, au lieu de renvoyer un r�sultat HTTP
- 406 (NOT ACCEPTABLE). Avec les deux directives ci-dessous, si
- l'en-t�te <code>Accept-Language</code> de l'utilisateur ne mentionne
- que les r�ponses de langage <code>es</code>, et si aucune variante
- dans cette langue n'est trouv�e, c'est la premi�re variante de la
- liste d�finie par la directive <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> qui sera servie.</p>
-
- <pre class="prettyprint lang-config">LanguagePriority en fr de
-ForceLanguagePriority Fallback</pre>
-
-
- <p>Les deux options, <code>Prefer</code> et <code>Fallback</code>,
- peuvent �tre sp�cifi�es, de fa�on � ce que la variante servie soit
- la premi�re variante qui convient d�finie par la directive
- <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> si
- plusieurs variantes sont �galement acceptables, ou le premier
- document disponible si aucune variante ne convient � la liste de
- langages acceptables fournie par le client.</p>
-
-<h3>Voir aussi</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="languagepriority" id="languagepriority">Directive</a> <a name="LanguagePriority" id="LanguagePriority">LanguagePriority</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>L'ordre de priorit� des variantes de langages pour les
-cas o� le client n'a pas formul� de pr�f�rences</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LanguagePriority <var>langage-MIME</var> [<var>langage-MIME</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</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_negotiation</td></tr>
-</table>
- <p>La directive <code class="directive">LanguagePriority</code> permet de
- d�finir, au cours du traitement d'une requ�te Multivues, l'ordre de
- priorit� des variantes de langages pour les cas
- o� le client n'a pas formul� de pr�f�rences. La liste �num�re les
- <var>langages-MIME</var> dans un ordre de pr�f�rences
- d�croissantes.</p>
-
- <pre class="prettyprint lang-config">LanguagePriority en fr de</pre>
-
-
- <p>Dans le cas d'une requ�te pour <code>foo.html</code>, si
- <code>foo.html.fr</code> et <code>foo.html.de</code> existent, et si
- le client n'a pas formul� de pr�f�rences, c'est le fichier
- <code>foo.html.fr</code> qui sera renvoy�.</p>
-
- <p>Notez que cette directive n'a d'effet que si le 'meilleur'
- langage n'a pas pu �tre d�termin� d'une autre mani�re ou si la
- valeur de la directive <code class="directive"><a href="#forcelanguagepriority">ForceLanguagePriority</a></code> est
- diff�rente de <code>None</code>. En g�n�ral, c'est le client qui
- d�termine le langage pr�f�r�, non le serveur.</p>
-
-<h3>Voir aussi</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
-</ul>
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_negotiation.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_negotiation.html.ja.utf8 b/docs/manual/mod/mod_negotiation.html.ja.utf8
index abea7eb3f8..98349e6dcc 100644
--- a/docs/manual/mod/mod_negotiation.html.ja.utf8
+++ b/docs/manual/mod/mod_negotiation.html.ja.utf8
@@ -71,114 +71,6 @@
<li><a href="../env.html">環境変数</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="typemaps" id="typemaps">タイプマップ</a></h2>
- <p>タイプマップは RFC 822 のメールヘッダに類似した書式です。
- ドキュメントの記述が空行で分離されて書かれていて、ハッシュ文字
- ('#') で始まる行はコメントとして扱われます。
- ドキュメントの説明は複数のヘッダレコードから構成されます。
- レコードは、続きの行が空白で始まっていると複数の行にまたがります。
- 最初の空白が消去されて、前の行とつなげて 1 行として扱われます。
- ヘッダレコードはキーワード名の後に値が続くという形式で、
- キーワード名は常にコロンで終わります。空白はヘッダ名と値の間、
- 値のトークンの間に入れることができます。
- 使用可能なヘッダは以下のとおりです:</p>
-
- <dl>
- <dt><code>Content-Encoding:</code></dt>
- <dd>ファイルのエンコーディング。Apache は <code class="directive"><a href="../mod/mod_mime.html#addencoding">AddEncoding</a></code> ディレクティブ
- で定義されたエンコーディングだけを認識します。通常 compress
- されたファイルのための <code>x-compress</code> と gzip
- されたファイルのための <code>x-gzip</code> を含みます。
- エンコーディングの比較をするときは、接頭辞 <code>x-</code>
- は無視されます。</dd>
-
- <dt><code>Content-Language:</code></dt>
- <dd>インターネット標準の言語タグ
- (<a href="http://www.ietf.org/rfc/rfc1766.txt">RFC 1766</a>)
- で定義されている言語の種類。例えば、<code>en</code>
- は英語を表します。
- 複数の言語が格納される場合はコンマで区切られます。</dd>
-
- <dt><code>Content-Length:</code></dt>
- <dd>ファイルの長さ (バイト数)。
- このヘッダがない場合、ファイルの実際の長さが使用されます。</dd>
-
- <dt><code>Content-Type:</code></dt>
- <dd>ドキュメントの <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を参照">MIME
- メディアタイプ</a>、オプショナルなパラメータ付き。パラメータの構文は
- <code>name=value</code>
- で、メディアタイプや他のパラメータとはセミコロンで分離されます。
- 共通のパラメータは以下のとおり:
-
- <dl>
- <dt><code>level</code></dt>
- <dd>メディアタイプのバージョンを示す整数。
- <code>text/html</code> では 2 がデフォルトで、その他の場合は
- 0 がデフォルトです。</dd>
-
- <dt><code>qs</code></dt>
- <dd>クライアントの能力に関係なく、variant
- を他と比較したときの相対的な「品質」で、0.0 から 1.0
- の範囲の浮動点小数。
- 例えば、写真を表現しようとしているときは普通は JPEG
- ファイルの方が ASCII ファイルよりも高い品質になります。
- しかし、リソースが ASCII アートで表現されているときは、ASCII
- ファイルの方が JPEG
- ファイルよりも高い品質になります。このように、<code>qs</code>
- はリソース毎に特有の値を取ります。
- </dd>
- </dl>
-
- <div class="example"><h3>例</h3><p><code>
- Content-Type: image/jpeg; qs=0.8
- </code></p></div>
- </dd>
-
- <dt><code>URI:</code></dt>
- <dd>(指定のメディアタイプ、コンテントエンコーディングの) variant の
- ファイルの uri. これは、マップファイルからの相対 URL として
- 解釈されます。同じサーバに存在しなければならず、クライアントが
- 直接リクエストしたときにアクセスを許可されるものでなければなりません。</dd>
-
- <dt><code>Body:</code></dt>
- <dd>Apache 2.0 で新設されたこの Body ヘッダを使って、
- リソースの実際の内容をタイプマップファイルに書くことができます。
- このヘッダは本文の内容の区切りとなる文字列で始まる必要があります。
- タイプマップファイルの続く行は、区切り文字列が見つかるまで、
- リソースの本文になります。
-
- <div class="example"><h3>Example:</h3><p><code>
- Body:----xyz----<br />
- &lt;html&gt;<br />
- &lt;body&gt;<br />
- &lt;p&gt;Content of the page.&lt;/p&gt;<br />
- &lt;/body&gt;<br />
- &lt;/html&gt;<br />
- ----xyz----
- </code></p></div>
- </dd>
- </dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="multiviews" id="multiviews">MultiViews</a></h2>
- <p>MultiViews 探索は、<code>Multiviews</code> <code class="directive"><a href="../mod/core.html#options">Options</a></code> ディレクティブにより有効になります。
- サーバが <code>/some/dir/foo</code>
- へのリクエストを受け取り、<code>/some/dir/foo</code> が存在
- <em>しない</em>場合、サーバはディレクトリを読んで、
- <code>foo.*</code> にあてはまる全てのファイルを探し、
- 事実上それらのファイルをマップするタイプマップを作ります。
- そのとき、メディアタイプとコンテントエンコーディングは、
- そのファイル名を直接指定したときと同じものが割り当てられます。
- それからクライアントの要求に一番合うものを選び、
- そのドキュメントを返します。</p>
-
- <p>ファイルを選択する際に、関連するコンテントネゴシエーションの
- メタ情報を持たないファイルについて、判定を行うかどうかを
- <code class="directive"><a href="../mod/mod_mime.html#multiviewsmatch">MultiViewsMatch</a></code>
- ディレクティブで設定します。</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="CacheNegotiatedDocs" id="CacheNegotiatedDocs">CacheNegotiatedDocs</a> <a name="cachenegotiateddocs" id="cachenegotiateddocs">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>コンテントネゴシエーションされたドキュメントをプロキシサーバが
@@ -298,6 +190,114 @@
<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="typemaps" id="typemaps">タイプマップ</a></h2>
+ <p>タイプマップは RFC 822 のメールヘッダに類似した書式です。
+ ドキュメントの記述が空行で分離されて書かれていて、ハッシュ文字
+ ('#') で始まる行はコメントとして扱われます。
+ ドキュメントの説明は複数のヘッダレコードから構成されます。
+ レコードは、続きの行が空白で始まっていると複数の行にまたがります。
+ 最初の空白が消去されて、前の行とつなげて 1 行として扱われます。
+ ヘッダレコードはキーワード名の後に値が続くという形式で、
+ キーワード名は常にコロンで終わります。空白はヘッダ名と値の間、
+ 値のトークンの間に入れることができます。
+ 使用可能なヘッダは以下のとおりです:</p>
+
+ <dl>
+ <dt><code>Content-Encoding:</code></dt>
+ <dd>ファイルのエンコーディング。Apache は <code class="directive"><a href="../mod/mod_mime.html#addencoding">AddEncoding</a></code> ディレクティブ
+ で定義されたエンコーディングだけを認識します。通常 compress
+ されたファイルのための <code>x-compress</code> と gzip
+ されたファイルのための <code>x-gzip</code> を含みます。
+ エンコーディングの比較をするときは、接頭辞 <code>x-</code>
+ は無視されます。</dd>
+
+ <dt><code>Content-Language:</code></dt>
+ <dd>インターネット標準の言語タグ
+ (<a href="http://www.ietf.org/rfc/rfc1766.txt">RFC 1766</a>)
+ で定義されている言語の種類。例えば、<code>en</code>
+ は英語を表します。
+ 複数の言語が格納される場合はコンマで区切られます。</dd>
+
+ <dt><code>Content-Length:</code></dt>
+ <dd>ファイルの長さ (バイト数)。
+ このヘッダがない場合、ファイルの実際の長さが使用されます。</dd>
+
+ <dt><code>Content-Type:</code></dt>
+ <dd>ドキュメントの <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を参照">MIME
+ メディアタイプ</a>、オプショナルなパラメータ付き。パラメータの構文は
+ <code>name=value</code>
+ で、メディアタイプや他のパラメータとはセミコロンで分離されます。
+ 共通のパラメータは以下のとおり:
+
+ <dl>
+ <dt><code>level</code></dt>
+ <dd>メディアタイプのバージョンを示す整数。
+ <code>text/html</code> では 2 がデフォルトで、その他の場合は
+ 0 がデフォルトです。</dd>
+
+ <dt><code>qs</code></dt>
+ <dd>クライアントの能力に関係なく、variant
+ を他と比較したときの相対的な「品質」で、0.0 から 1.0
+ の範囲の浮動点小数。
+ 例えば、写真を表現しようとしているときは普通は JPEG
+ ファイルの方が ASCII ファイルよりも高い品質になります。
+ しかし、リソースが ASCII アートで表現されているときは、ASCII
+ ファイルの方が JPEG
+ ファイルよりも高い品質になります。このように、<code>qs</code>
+ はリソース毎に特有の値を取ります。
+ </dd>
+ </dl>
+
+ <div class="example"><h3>例</h3><p><code>
+ Content-Type: image/jpeg; qs=0.8
+ </code></p></div>
+ </dd>
+
+ <dt><code>URI:</code></dt>
+ <dd>(指定のメディアタイプ、コンテントエンコーディングの) variant の
+ ファイルの uri. これは、マップファイルからの相対 URL として
+ 解釈されます。同じサーバに存在しなければならず、クライアントが
+ 直接リクエストしたときにアクセスを許可されるものでなければなりません。</dd>
+
+ <dt><code>Body:</code></dt>
+ <dd>Apache 2.0 で新設されたこの Body ヘッダを使って、
+ リソースの実際の内容をタイプマップファイルに書くことができます。
+ このヘッダは本文の内容の区切りとなる文字列で始まる必要があります。
+ タイプマップファイルの続く行は、区切り文字列が見つかるまで、
+ リソースの本文になります。
+
+ <div class="example"><h3>Example:</h3><p><code>
+ Body:----xyz----<br />
+ &lt;html&gt;<br />
+ &lt;body&gt;<br />
+ &lt;p&gt;Content of the page.&lt;/p&gt;<br />
+ &lt;/body&gt;<br />
+ &lt;/html&gt;<br />
+ ----xyz----
+ </code></p></div>
+ </dd>
+ </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="multiviews" id="multiviews">MultiViews</a></h2>
+ <p>MultiViews 探索は、<code>Multiviews</code> <code class="directive"><a href="../mod/core.html#options">Options</a></code> ディレクティブにより有効になります。
+ サーバが <code>/some/dir/foo</code>
+ へのリクエストを受け取り、<code>/some/dir/foo</code> が存在
+ <em>しない</em>場合、サーバはディレクトリを読んで、
+ <code>foo.*</code> にあてはまる全てのファイルを探し、
+ 事実上それらのファイルをマップするタイプマップを作ります。
+ そのとき、メディアタイプとコンテントエンコーディングは、
+ そのファイル名を直接指定したときと同じものが割り当てられます。
+ それからクライアントの要求に一番合うものを選び、
+ そのドキュメントを返します。</p>
+
+ <p>ファイルを選択する際に、関連するコンテントネゴシエーションの
+ メタ情報を持たないファイルについて、判定を行うかどうかを
+ <code class="directive"><a href="../mod/mod_mime.html#multiviewsmatch">MultiViewsMatch</a></code>
+ ディレクティブで設定します。</p>
+</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_negotiation.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_nw_ssl.html.en b/docs/manual/mod/mod_nw_ssl.html.en
index b93bb6c103..f7067c995e 100644
--- a/docs/manual/mod/mod_nw_ssl.html.en
+++ b/docs/manual/mod/mod_nw_ssl.html.en
@@ -45,7 +45,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#securelisten">SecureListen</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="NWSSLTrustedCerts" id="NWSSLTrustedCerts">NWSSLTrustedCerts</a> <a name="nwssltrustedcerts" id="nwssltrustedcerts">Directive</a></h2>
<table class="directive">
@@ -92,6 +91,7 @@
parameter also enables mutual authentication.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_nw_ssl.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_nw_ssl.html.fr b/docs/manual/mod/mod_nw_ssl.html.fr
index 4c12fef2d6..ee14dd10c4 100644
--- a/docs/manual/mod/mod_nw_ssl.html.fr
+++ b/docs/manual/mod/mod_nw_ssl.html.fr
@@ -45,7 +45,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#securelisten">SecureListen</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="nwssltrustedcerts" id="nwssltrustedcerts">Directive</a> <a name="NWSSLTrustedCerts" id="NWSSLTrustedCerts">NWSSLTrustedCerts</a></h2>
<table class="directive">
@@ -96,6 +95,7 @@ sp�cifi�</td></tr>
d'activer l'authentification mutuelle.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_nw_ssl.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_privileges.html.en b/docs/manual/mod/mod_privileges.html.en
index 54758a8934..e4fcc747e2 100644
--- a/docs/manual/mod/mod_privileges.html.en
+++ b/docs/manual/mod/mod_privileges.html.en
@@ -77,65 +77,6 @@ separation is an issue.</p>
<li><img alt="" src="../images/down.gif" /> <a href="#security">Security Considerations</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="security" id="security">Security Considerations</a></h2>
-
-<p><code class="module"><a href="../mod/mod_privileges.html">mod_privileges</a></code> introduces new security concerns
-in situations where <strong>untrusted code</strong> may be run
-<strong>within the webserver process</strong>. This applies to
-untrusted modules, and scripts running under modules such as
-mod_php or mod_perl. Scripts running externally (e.g. as CGI
-or in an appserver behind mod_proxy or mod_jk) are NOT affected.</p>
-
-<p>The basic security concerns with mod_privileges are:</p>
-<ul><li>Running as a system user introduces the same security issues
- as mod_suexec, and near-equivalents such as cgiwrap and suphp.</li>
-<li>A privileges-aware malicious user extension (module or script)
- could escalate its privileges to anything available to the
- httpd process in any virtual host. This introduces new risks
- if (and only if) mod_privileges is compiled with the
- <var>BIG_SECURITY_HOLE</var> option.</li>
-<li>A privileges-aware malicious user extension (module or script)
- could escalate privileges to set its user ID to another system
- user (and/or group).</li>
-</ul>
-
-<p>The <code class="directive">PrivilegesMode</code> directive allows you to
-select either <var>FAST</var> or <var>SECURE</var> mode. You can
-mix modes, using <var>FAST</var> mode for trusted users and
-fully-audited code paths, while imposing SECURE mode where an
-untrusted user has scope to introduce code.</p>
-<p>Before describing the modes, we should also introduce the target
-use cases: Benign vs Hostile. In a benign situation, you want to
-separate users for their convenience, and protect them and the server
-against the risks posed by honest mistakes, but you trust your users
-are not deliberately subverting system security. In a hostile
-situation - e.g. commercial hosting - you may have users deliberately
-attacking the system or each other.</p>
-<dl>
-<dt>FAST mode</dt>
-<dd>In <var>FAST</var> mode, requests are run in-process with the
-selected uid/gid and privileges, so the overhead is negligible.
-This is suitable for benign situations, but is not secure against an
-attacker escalating privileges with an in-process module or script.</dd>
-<dt>SECURE mode</dt>
-<dd>A request in <var>SECURE</var> mode forks a subprocess, which
-then drops privileges. This is a very similar case to running CGI
-with suexec, but for the entire request cycle, and with the benefit
-of fine-grained control of privileges.</dd>
-</dl>
-<p>You can select different <code class="directive">PrivilegesMode</code>s for
-each virtual host, and even in a directory context within a virtual
-host. <var>FAST</var> mode is appropriate where the user(s) are
-trusted and/or have no privilege to load in-process code.
-<var>SECURE</var> mode is appropriate to cases where untrusted code
-might be run in-process. However, even in <var>SECURE</var> mode,
-there is no protection against a malicious user who is able to
-introduce privileges-aware code running <em>before the start of the
-request-processing cycle.</em></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="DTracePrivileges" id="DTracePrivileges">DTracePrivileges</a> <a name="dtraceprivileges" id="dtraceprivileges">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines whether the privileges required by dtrace are enabled.</td></tr>
@@ -392,6 +333,65 @@ non-threaded MPMs (<code class="module"><a href="../mod/prefork.html">prefork</a
<li><code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="security" id="security">Security Considerations</a></h2>
+
+<p><code class="module"><a href="../mod/mod_privileges.html">mod_privileges</a></code> introduces new security concerns
+in situations where <strong>untrusted code</strong> may be run
+<strong>within the webserver process</strong>. This applies to
+untrusted modules, and scripts running under modules such as
+mod_php or mod_perl. Scripts running externally (e.g. as CGI
+or in an appserver behind mod_proxy or mod_jk) are NOT affected.</p>
+
+<p>The basic security concerns with mod_privileges are:</p>
+<ul><li>Running as a system user introduces the same security issues
+ as mod_suexec, and near-equivalents such as cgiwrap and suphp.</li>
+<li>A privileges-aware malicious user extension (module or script)
+ could escalate its privileges to anything available to the
+ httpd process in any virtual host. This introduces new risks
+ if (and only if) mod_privileges is compiled with the
+ <var>BIG_SECURITY_HOLE</var> option.</li>
+<li>A privileges-aware malicious user extension (module or script)
+ could escalate privileges to set its user ID to another system
+ user (and/or group).</li>
+</ul>
+
+<p>The <code class="directive">PrivilegesMode</code> directive allows you to
+select either <var>FAST</var> or <var>SECURE</var> mode. You can
+mix modes, using <var>FAST</var> mode for trusted users and
+fully-audited code paths, while imposing SECURE mode where an
+untrusted user has scope to introduce code.</p>
+<p>Before describing the modes, we should also introduce the target
+use cases: Benign vs Hostile. In a benign situation, you want to
+separate users for their convenience, and protect them and the server
+against the risks posed by honest mistakes, but you trust your users
+are not deliberately subverting system security. In a hostile
+situation - e.g. commercial hosting - you may have users deliberately
+attacking the system or each other.</p>
+<dl>
+<dt>FAST mode</dt>
+<dd>In <var>FAST</var> mode, requests are run in-process with the
+selected uid/gid and privileges, so the overhead is negligible.
+This is suitable for benign situations, but is not secure against an
+attacker escalating privileges with an in-process module or script.</dd>
+<dt>SECURE mode</dt>
+<dd>A request in <var>SECURE</var> mode forks a subprocess, which
+then drops privileges. This is a very similar case to running CGI
+with suexec, but for the entire request cycle, and with the benefit
+of fine-grained control of privileges.</dd>
+</dl>
+<p>You can select different <code class="directive">PrivilegesMode</code>s for
+each virtual host, and even in a directory context within a virtual
+host. <var>FAST</var> mode is appropriate where the user(s) are
+trusted and/or have no privilege to load in-process code.
+<var>SECURE</var> mode is appropriate to cases where untrusted code
+might be run in-process. However, even in <var>SECURE</var> mode,
+there is no protection against a malicious user who is able to
+introduce privileges-aware code running <em>before the start of the
+request-processing cycle.</em></p>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_privileges.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_privileges.html.fr b/docs/manual/mod/mod_privileges.html.fr
index 1207d81b7f..cc77593253 100644
--- a/docs/manual/mod/mod_privileges.html.fr
+++ b/docs/manual/mod/mod_privileges.html.fr
@@ -82,79 +82,6 @@ s�paration des privil�ges constitue un probl�me.</p>
<li><img alt="" src="../images/down.gif" /> <a href="#security">Consid�rations � propos de s�curit�</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="security" id="security">Consid�rations � propos de s�curit�</a></h2>
-
-<p><code class="module"><a href="../mod/mod_privileges.html">mod_privileges</a></code> introduit de nouveaux probl�mes de
-s�curit� dans les situations o� du <strong>code non s�r</strong> peut
-s'ex�cuter <strong>� l'int�rieur du processus du serveur web</strong>.
-Ceci s'applique aux modules non s�rs, et aux scripts s'ex�cutant sous
-des modules comme mod_php ou mod_perl. Les scripts s'ex�cutant en
-externe (comme par exemple les scripts CGI ou ceux s'ex�cutant sur un
-serveur d'applications derri�re mod_proxy ou mod_jk) ne sont pas
-concern�s.</p>
-
-<p>Les principaux probl�mes de s�curit� que l'on rencontre avec
-mod_privileges sont :</p>
-
-
-<ul><li>L'ex�cution sous un utilisateur syst�me pose les m�mes probl�mes
-de s�curit� que mod_suexec, et pratiquement les m�mes que cgiwrap et
-suphp.</li>
-<li>Une extension utilisateur (module ou script) malveillante, �crite en connaissant les m�canismes
-utilis�s par <strong>mod_privileges</strong>,
-pourrait �lever ses privil�ges � tout niveau
-accessible au processus httpd dans tout serveur virtuel. Ceci introduit
-de nouveaux risques si (et seulement si) mod_privileges est compil� avec
-l'option <var>BIG_SECURITY_HOLE</var>.</li>
-<li>Une extension utilisateur (module ou script) malveillante, �crite en connaissant les m�canismes
-utilis�s par <strong>mod_privileges</strong>,
-pourrait �lever ses privil�ges pour s'attribuer
-l'identifiant utilisateur d'un autre utilisateur (et/ou groupe)
-syst�me.</li>
-</ul>
-
-<p>La directive <code class="directive">PrivilegesMode</code> vous permet de
-s�lectionner soit le mode <var>FAST</var>, soit le mode
-<var>SECURE</var>. Vous pouvez panacher les modes en utilisant par
-exemple le mode <var>FAST</var> pour les utilisateurs de confiance et
-les chemins contenant du code enti�rement audit�, tout en imposant le
-mode <var>SECURE</var> o� un utilisateur non s�r a la possibilit�
-d'introduire du code.</p>
-<p>Avant de d�crire les modes, il nous faut pr�senter les cas
-d'utilisation de la cible : "Benign" ou "Hostile". Dans une situation
-"Benign", vous voulez s�parer les utilisateurs pour leur confort, et les
-prot�ger, ainsi que le serveur, contre les risques induits par les
-erreurs involontaires. Dans une situation "Hostile" - par exemple
-l'h�bergement d'un site commercial - il se peut que des utilisateurs
-attaquent d�lib�r�ment le serveur ou s'attaquent entre eux.</p>
-<dl>
-<dt>Mode FAST</dt>
-<dd>En mode <var>FAST</var>, les requ�tes sont trait�es "in-process"
-avec les uid/gid et privil�ges s�lectionn�s, si bien que la
-surcharge est n�gligeable. Ceci convient aux situations "Benign", mais
-n'est pas s�curis� contre un attaquant augmentant ses privil�ges avec un
-module ou script "in-process".</dd>
-<dt>Mode SECURE</dt>
-<dd>Une requ�te en mode <var>SECURE</var> g�n�re un sous-processus qui
-supprime les privil�ges. Ce comportement est tr�s similaire �
-l'ex�cution d'un programme CGI avec suexec, mais il reste valable tout
-au long du cycle de traitement de la requ�te, avec en plus l'avantage
-d'un contr�le pr�cis des privil�ges.</dd>
-</dl>
-<p>Vous pouvez s�lectionner diff�rents
-<code class="directive">PrivilegesMode</code>s pour chaque serveur virtuel, et
-m�me dans un contexte de r�pertoire � l'int�rieur d'un serveur virtuel.
-Le mode <var>FAST</var> convient lorsque les utilisateurs sont s�rs
-et/ou n'ont pas le privil�ge de charger du code "in-process". Le mode
-<var>SECURE</var> convient dans les cas o� du code non s�r peut
-s'ex�cuter "in-process". Cependant, m�me en mode <var>SECURE</var>, il
-n'y a pas de protection contre un utilisateur malveillant qui a la
-possibilit� d'introduire du code supportant les privil�ges <em>avant le
-d�but du cycle de traitement de la requ�te.</em></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="dtraceprivileges" id="dtraceprivileges">Directive</a> <a name="DTracePrivileges" id="DTracePrivileges">DTracePrivileges</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�termine si les privil�ges requis par dtrace sont
@@ -445,6 +372,79 @@ personnalis�).</td></tr>
<li><code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="security" id="security">Consid�rations � propos de s�curit�</a></h2>
+
+<p><code class="module"><a href="../mod/mod_privileges.html">mod_privileges</a></code> introduit de nouveaux probl�mes de
+s�curit� dans les situations o� du <strong>code non s�r</strong> peut
+s'ex�cuter <strong>� l'int�rieur du processus du serveur web</strong>.
+Ceci s'applique aux modules non s�rs, et aux scripts s'ex�cutant sous
+des modules comme mod_php ou mod_perl. Les scripts s'ex�cutant en
+externe (comme par exemple les scripts CGI ou ceux s'ex�cutant sur un
+serveur d'applications derri�re mod_proxy ou mod_jk) ne sont pas
+concern�s.</p>
+
+<p>Les principaux probl�mes de s�curit� que l'on rencontre avec
+mod_privileges sont :</p>
+
+
+<ul><li>L'ex�cution sous un utilisateur syst�me pose les m�mes probl�mes
+de s�curit� que mod_suexec, et pratiquement les m�mes que cgiwrap et
+suphp.</li>
+<li>Une extension utilisateur (module ou script) malveillante, �crite en connaissant les m�canismes
+utilis�s par <strong>mod_privileges</strong>,
+pourrait �lever ses privil�ges � tout niveau
+accessible au processus httpd dans tout serveur virtuel. Ceci introduit
+de nouveaux risques si (et seulement si) mod_privileges est compil� avec
+l'option <var>BIG_SECURITY_HOLE</var>.</li>
+<li>Une extension utilisateur (module ou script) malveillante, �crite en connaissant les m�canismes
+utilis�s par <strong>mod_privileges</strong>,
+pourrait �lever ses privil�ges pour s'attribuer
+l'identifiant utilisateur d'un autre utilisateur (et/ou groupe)
+syst�me.</li>
+</ul>
+
+<p>La directive <code class="directive">PrivilegesMode</code> vous permet de
+s�lectionner soit le mode <var>FAST</var>, soit le mode
+<var>SECURE</var>. Vous pouvez panacher les modes en utilisant par
+exemple le mode <var>FAST</var> pour les utilisateurs de confiance et
+les chemins contenant du code enti�rement audit�, tout en imposant le
+mode <var>SECURE</var> o� un utilisateur non s�r a la possibilit�
+d'introduire du code.</p>
+<p>Avant de d�crire les modes, il nous faut pr�senter les cas
+d'utilisation de la cible : "Benign" ou "Hostile". Dans une situation
+"Benign", vous voulez s�parer les utilisateurs pour leur confort, et les
+prot�ger, ainsi que le serveur, contre les risques induits par les
+erreurs involontaires. Dans une situation "Hostile" - par exemple
+l'h�bergement d'un site commercial - il se peut que des utilisateurs
+attaquent d�lib�r�ment le serveur ou s'attaquent entre eux.</p>
+<dl>
+<dt>Mode FAST</dt>
+<dd>En mode <var>FAST</var>, les requ�tes sont trait�es "in-process"
+avec les uid/gid et privil�ges s�lectionn�s, si bien que la
+surcharge est n�gligeable. Ceci convient aux situations "Benign", mais
+n'est pas s�curis� contre un attaquant augmentant ses privil�ges avec un
+module ou script "in-process".</dd>
+<dt>Mode SECURE</dt>
+<dd>Une requ�te en mode <var>SECURE</var> g�n�re un sous-processus qui
+supprime les privil�ges. Ce comportement est tr�s similaire �
+l'ex�cution d'un programme CGI avec suexec, mais il reste valable tout
+au long du cycle de traitement de la requ�te, avec en plus l'avantage
+d'un contr�le pr�cis des privil�ges.</dd>
+</dl>
+<p>Vous pouvez s�lectionner diff�rents
+<code class="directive">PrivilegesMode</code>s pour chaque serveur virtuel, et
+m�me dans un contexte de r�pertoire � l'int�rieur d'un serveur virtuel.
+Le mode <var>FAST</var> convient lorsque les utilisateurs sont s�rs
+et/ou n'ont pas le privil�ge de charger du code "in-process". Le mode
+<var>SECURE</var> convient dans les cas o� du code non s�r peut
+s'ex�cuter "in-process". Cependant, m�me en mode <var>SECURE</var>, il
+n'y a pas de protection contre un utilisateur malveillant qui a la
+possibilit� d'introduire du code supportant les privil�ges <em>avant le
+d�but du cycle de traitement de la requ�te.</em></p>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_privileges.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 758bb382f3..0b1b8f8c7c 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -145,341 +145,6 @@
<li><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="forwardreverse" id="forwardreverse">Forward Proxies and Reverse
- Proxies/Gateways</a></h2>
- <p>Apache HTTP Server can be configured in both a <dfn>forward</dfn> and
- <dfn>reverse</dfn> proxy (also known as <dfn>gateway</dfn>) mode.</p>
-
- <p>An ordinary <dfn>forward proxy</dfn> is an intermediate
- server that sits between the client and the <em>origin
- server</em>. In order to get content from the origin server,
- the client sends a request to the proxy naming the origin server
- as the target and the proxy then requests the content from the
- origin server and returns it to the client. The client must be
- specially configured to use the forward proxy to access other
- sites.</p>
-
- <p>A typical usage of a forward proxy is to provide Internet
- access to internal clients that are otherwise restricted by a
- firewall. The forward proxy can also use caching (as provided
- by <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>) to reduce network usage.</p>
-
- <p>The forward proxy is activated using the <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> directive. Because
- forward proxies allow clients to access arbitrary sites through
- your server and to hide their true origin, it is essential that
- you <a href="#access">secure your server</a> so that only
- authorized clients can access the proxy before activating a
- forward proxy.</p>
-
- <p>A <dfn>reverse proxy</dfn> (or <dfn>gateway</dfn>), by
- contrast, appears to the client just like an ordinary web
- server. No special configuration on the client is necessary.
- The client makes ordinary requests for content in the name-space
- of the reverse proxy. The reverse proxy then decides where to
- send those requests, and returns the content as if it was itself
- the origin.</p>
-
- <p>A typical usage of a reverse proxy is to provide Internet
- users access to a server that is behind a firewall. Reverse
- proxies can also be used to balance load among several back-end
- servers, or to provide caching for a slower back-end server.
- In addition, reverse proxies can be used simply to bring
- several servers into the same URL space.</p>
-
- <p>A reverse proxy is activated using the <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive or the
- <code>[P]</code> flag to the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directive. It is
- <strong>not</strong> necessary to turn <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> on in order to
- configure a reverse proxy.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Basic Examples</a></h2>
-
- <p>The examples below are only a very basic idea to help you
- get started. Please read the documentation on the individual
- directives.</p>
-
- <p>In addition, if you wish to have caching enabled, consult
- the documentation from <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
-
- <div class="example"><h3>Reverse Proxy</h3><pre class="prettyprint lang-config">ProxyPass "/foo" "http://foo.example.com/bar"
-ProxyPassReverse "/foo" "http://foo.example.com/bar"</pre>
-</div>
-
- <div class="example"><h3>Forward Proxy</h3><pre class="prettyprint lang-config">ProxyRequests On
-ProxyVia On
-
-&lt;Proxy "*"&gt;
- Require host internal.example.com
-&lt;/Proxy&gt;</pre>
-</div>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="handler" id="handler">Access via Handler</a></h2>
-
- <p>You can also force a request to be handled as a reverse-proxy
- request, by creating a suitable Handler pass-through. The example
- configuration below will pass all requests for PHP scripts to the
- specified FastCGI server using reverse proxy:
- </p>
-
- <div class="example"><h3>Reverse Proxy PHP scripts</h3><pre class="prettyprint lang-config">&lt;FilesMatch "\.php$"&gt;
- # Unix sockets require 2.4.7 or later
- SetHandler "proxy:unix:/path/to/app.sock|fcgi://localhost/"
-&lt;/FilesMatch&gt;</pre>
-</div>
-
- <p>This feature is available in Apache HTTP Server 2.4.10 and later.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="workers" id="workers">Workers</a></h2>
- <p>The proxy manages the configuration of origin servers and their
- communication parameters in objects called <dfn>workers</dfn>.
- There are two built-in workers, the default forward proxy worker and the
- default reverse proxy worker. Additional workers can be configured
- explicitly.</p>
-
- <p>The two default workers have a fixed configuration
- and will be used if no other worker matches the request.
- They do not use HTTP Keep-Alive or connection pooling.
- The TCP connections to the origin server will instead be
- opened and closed for each request.</p>
-
- <p>Explicitly configured workers are identified by their URL.
- They are usually created and configured using
- <code class="directive"><a href="#proxypass">ProxyPass</a></code> or
- <code class="directive"><a href="#proxypassmatch">ProxyPassMatch</a></code> when used
- for a reverse proxy:</p>
-
- <pre class="prettyprint lang-config">ProxyPass "/example" "http://backend.example.com" connectiontimeout=5 timeout=30</pre>
-
-
- <p>This will create a worker associated with the origin server URL
- <code>http://backend.example.com</code> and using the given timeout
- values. When used in a forward proxy, workers are usually defined
- via the <code class="directive"><a href="#proxyset">ProxySet</a></code> directive:</p>
-
- <pre class="prettyprint lang-config">ProxySet "http://backend.example.com" connectiontimeout=5 timeout=30</pre>
-
-
- <p>or alternatively using <code class="directive"><a href="#proxy">Proxy</a></code>
- and <code class="directive"><a href="#proxyset">ProxySet</a></code>:</p>
-
- <pre class="prettyprint lang-config">&lt;Proxy "http://backend.example.com"&gt;
- ProxySet connectiontimeout=5 timeout=30
-&lt;/Proxy&gt;</pre>
-
-
- <p>Using explicitly configured workers in the forward mode is
- not very common, because forward proxies usually communicate with many
- different origin servers. Creating explicit workers for some of the
- origin servers can still be useful, if they are used very often.
- Explicitly configured workers have no concept of forward or reverse
- proxying by themselves. They encapsulate a common concept of
- communication with origin servers. A worker created by
- <code class="directive"><a href="#proxypass">ProxyPass</a></code> for use in a
- reverse proxy will be also used for forward proxy requests whenever
- the URL to the origin server matches the worker URL and vice versa.</p>
-
- <p>The URL identifying a direct worker is the URL of its
- origin server including any path components given:</p>
-
- <pre class="prettyprint lang-config">ProxyPass "/examples" "http://backend.example.com/examples"
-ProxyPass "/docs" "http://backend.example.com/docs"</pre>
-
-
- <p>This example defines two different workers, each using a separate
- connection pool and configuration.</p>
-
- <div class="warning"><h3>Worker Sharing</h3>
- <p>Worker sharing happens if the worker URLs overlap, which occurs when
- the URL of some worker is a leading substring of the URL of another
- worker defined later in the configuration file. In the following example</p>
-
- <pre class="prettyprint lang-config">ProxyPass "/apps" "http://backend.example.com/" timeout=60
-ProxyPass "/examples" "http://backend.example.com/examples" timeout=10</pre>
-
-
- <p>the second worker isn't actually created. Instead the first
- worker is used. The benefit is, that there is only one connection pool,
- so connections are more often reused. Note that all configuration attributes
- given explicitly for the later worker will be ignored. This will be logged
- as a warning. In the above example the resulting timeout value
- for the URL <code>/examples</code> will be <code>60</code> instead
- of <code>10</code>!</p>
-
- <p>If you want to avoid worker sharing, sort your worker definitions
- by URL length, starting with the longest worker URLs. If you want to maximize
- worker sharing use the reverse sort order. See also the related warning about
- ordering <code class="directive"><a href="#proxypass">ProxyPass</a></code> directives.</p>
-
- </div>
-
- <p>Explicitly configured workers come in two flavors:
- <dfn>direct workers</dfn> and <dfn>(load) balancer workers</dfn>.
- They support many important configuration attributes which are
- described below in the <code class="directive"><a href="#proxypass">ProxyPass</a></code>
- directive. The same attributes can also be set using
- <code class="directive"><a href="#proxyset">ProxySet</a></code>.</p>
-
- <p>The set of options available for a direct worker
- depends on the protocol, which is specified in the origin server URL.
- Available protocols include <code>ajp</code>, <code>fcgi</code>,
- <code>ftp</code>, <code>http</code> and <code>scgi</code>.</p>
-
- <p>Balancer workers are virtual workers that use direct workers known
- as their members to actually handle the requests. Each balancer can
- have multiple members. When it handles a request, it chooses a member
- based on the configured load balancing algorithm.</p>
-
- <p>A balancer worker is created if its worker URL uses
- <code>balancer</code> as the protocol scheme.
- The balancer URL uniquely identifies the balancer worker.
- Members are added to a balancer using
- <code class="directive"><a href="#balancermember">BalancerMember</a></code>.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="access" id="access">Controlling access to your proxy</a></h2>
- <p>You can control who can access your proxy via the <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> control block as in
- the following example:</p>
-
- <pre class="prettyprint lang-config">&lt;Proxy "*"&gt;
- Require ip 192.168.0
-&lt;/Proxy&gt;</pre>
-
-
- <p>For more information on access control directives, see
- <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>.</p>
-
- <p>Strictly limiting access is essential if you are using a
- forward proxy (using the <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> directive).
- Otherwise, your server can be used by any client to access
- arbitrary hosts while hiding his or her true identity. This is
- dangerous both for your network and for the Internet at large.
- When using a reverse proxy (using the <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive with
- <code>ProxyRequests Off</code>), access control is less
- critical because clients can only contact the hosts that you
- have specifically configured.</p>
-
- <p><strong>See Also</strong> the <a href="mod_proxy_http.html#env">Proxy-Chain-Auth</a> environment variable.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="startup" id="startup">Slow Startup</a></h2>
- <p>If you're using the <code class="directive"><a href="#proxyblock">ProxyBlock</a></code> directive, hostnames' IP addresses are looked up
- and cached during startup for later match test. This may take a few
- seconds (or more) depending on the speed with which the hostname lookups
- occur.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="intranet" id="intranet">Intranet Proxy</a></h2>
- <p>An Apache httpd proxy server situated in an intranet needs to forward
- external requests through the company's firewall (for this, configure
- the <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> directive
- to forward the respective <var>scheme</var> to the firewall proxy).
- However, when it has to
- access resources within the intranet, it can bypass the firewall when
- accessing hosts. The <code class="directive"><a href="#noproxy">NoProxy</a></code>
- directive is useful for specifying which hosts belong to the intranet and
- should be accessed directly.</p>
-
- <p>Users within an intranet tend to omit the local domain name from their
- WWW requests, thus requesting "http://somehost/" instead of
- <code>http://somehost.example.com/</code>. Some commercial proxy servers
- let them get away with this and simply serve the request, implying a
- configured local domain. When the <code class="directive"><a href="#proxydomain">ProxyDomain</a></code> directive is used and the server is <a href="#proxyrequests">configured for proxy service</a>, Apache httpd can return
- a redirect response and send the client to the correct, fully qualified,
- server address. This is the preferred method since the user's bookmark
- files will then contain fully qualified hosts.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="envsettings" id="envsettings">Protocol Adjustments</a></h2>
- <p>For circumstances where <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> is sending
- requests to an origin server that doesn't properly implement
- keepalives or HTTP/1.1, there are two <a href="../env.html">environment variables</a> that can force the
- request to use HTTP/1.0 with no keepalive. These are set via the
- <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code> directive.</p>
-
- <p>These are the <code>force-proxy-request-1.0</code> and
- <code>proxy-nokeepalive</code> notes.</p>
-
- <pre class="prettyprint lang-config">&lt;Location "/buggyappserver/"&gt;
- ProxyPass "http://buggyappserver:7001/foo/"
- SetEnv force-proxy-request-1.0 1
- SetEnv proxy-nokeepalive 1
-&lt;/Location&gt;</pre>
-
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="request-bodies" id="request-bodies">Request Bodies</a></h2>
-
- <p>Some request methods such as POST include a request body.
- The HTTP protocol requires that requests which include a body
- either use chunked transfer encoding or send a
- <code>Content-Length</code> request header. When passing these
- requests on to the origin server, <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>
- will always attempt to send the <code>Content-Length</code>. But
- if the body is large and the original request used chunked
- encoding, then chunked encoding may also be used in the upstream
- request. You can control this selection using <a href="../env.html">environment variables</a>. Setting
- <code>proxy-sendcl</code> ensures maximum compatibility with
- upstream servers by always sending the
- <code>Content-Length</code>, while setting
- <code>proxy-sendchunked</code> minimizes resource usage by using
- chunked encoding.</p>
-
- <p>Under some circumstances, the server must spool request bodies
- to disk to satisfy the requested handling of request bodies. For
- example, this spooling will occur if the original body was sent with
- chunked encoding (and is large), but the administrator has
- asked for backend requests to be sent with Content-Length or as HTTP/1.0.
- This spooling can also occur if the request body already has a
- Content-Length header, but the server is configured to filter incoming
- request bodies.</p>
-
- <p><code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code> only applies to
- request bodies that the server will spool to disk</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="x-headers" id="x-headers">Reverse Proxy Request Headers</a></h2>
-
- <p>When acting in a reverse-proxy mode (using the <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive, for example),
- <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> adds several request headers in
- order to pass information to the origin server. These headers
- are:</p>
-
- <dl>
- <dt><code>X-Forwarded-For</code></dt>
- <dd>The IP address of the client.</dd>
- <dt><code>X-Forwarded-Host</code></dt>
- <dd>The original host requested by the client in the <code>Host</code>
- HTTP request header.</dd>
- <dt><code>X-Forwarded-Server</code></dt>
- <dd>The hostname of the proxy server.</dd>
- </dl>
-
- <p>Be careful when using these headers on the origin server, since
- they will contain more than one (comma-separated) value if the
- original request already contained one of these headers. For
- example, you can use <code>%{X-Forwarded-For}i</code> in the log
- format string of the origin server to log the original clients IP
- address, but you may get more than one address if the request
- passes through several proxies.</p>
-
- <p>See also the <code class="directive"><a href="#proxypreservehost">ProxyPreserveHost</a></code> and <code class="directive"><a href="#proxyvia">ProxyVia</a></code> directives, which control
- other request headers.</p>
-
- <p>Note: If you need to specify custom request headers to be
- added to the forwarded request, use the
- <code class="directive"><a href="../mod/mod_headers.html#requestheader">RequestHeader</a></code>
- directive.</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="BalancerGrowth" id="BalancerGrowth">BalancerGrowth</a> <a name="balancergrowth" id="balancergrowth">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Number of additional Balancers that can be added Post-configuration</td></tr>
@@ -1929,6 +1594,341 @@ header for proxied requests</td></tr>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="forwardreverse" id="forwardreverse">Forward Proxies and Reverse
+ Proxies/Gateways</a></h2>
+ <p>Apache HTTP Server can be configured in both a <dfn>forward</dfn> and
+ <dfn>reverse</dfn> proxy (also known as <dfn>gateway</dfn>) mode.</p>
+
+ <p>An ordinary <dfn>forward proxy</dfn> is an intermediate
+ server that sits between the client and the <em>origin
+ server</em>. In order to get content from the origin server,
+ the client sends a request to the proxy naming the origin server
+ as the target and the proxy then requests the content from the
+ origin server and returns it to the client. The client must be
+ specially configured to use the forward proxy to access other
+ sites.</p>
+
+ <p>A typical usage of a forward proxy is to provide Internet
+ access to internal clients that are otherwise restricted by a
+ firewall. The forward proxy can also use caching (as provided
+ by <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>) to reduce network usage.</p>
+
+ <p>The forward proxy is activated using the <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> directive. Because
+ forward proxies allow clients to access arbitrary sites through
+ your server and to hide their true origin, it is essential that
+ you <a href="#access">secure your server</a> so that only
+ authorized clients can access the proxy before activating a
+ forward proxy.</p>
+
+ <p>A <dfn>reverse proxy</dfn> (or <dfn>gateway</dfn>), by
+ contrast, appears to the client just like an ordinary web
+ server. No special configuration on the client is necessary.
+ The client makes ordinary requests for content in the name-space
+ of the reverse proxy. The reverse proxy then decides where to
+ send those requests, and returns the content as if it was itself
+ the origin.</p>
+
+ <p>A typical usage of a reverse proxy is to provide Internet
+ users access to a server that is behind a firewall. Reverse
+ proxies can also be used to balance load among several back-end
+ servers, or to provide caching for a slower back-end server.
+ In addition, reverse proxies can be used simply to bring
+ several servers into the same URL space.</p>
+
+ <p>A reverse proxy is activated using the <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive or the
+ <code>[P]</code> flag to the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directive. It is
+ <strong>not</strong> necessary to turn <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> on in order to
+ configure a reverse proxy.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Basic Examples</a></h2>
+
+ <p>The examples below are only a very basic idea to help you
+ get started. Please read the documentation on the individual
+ directives.</p>
+
+ <p>In addition, if you wish to have caching enabled, consult
+ the documentation from <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
+
+ <div class="example"><h3>Reverse Proxy</h3><pre class="prettyprint lang-config">ProxyPass "/foo" "http://foo.example.com/bar"
+ProxyPassReverse "/foo" "http://foo.example.com/bar"</pre>
+</div>
+
+ <div class="example"><h3>Forward Proxy</h3><pre class="prettyprint lang-config">ProxyRequests On
+ProxyVia On
+
+&lt;Proxy "*"&gt;
+ Require host internal.example.com
+&lt;/Proxy&gt;</pre>
+</div>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="handler" id="handler">Access via Handler</a></h2>
+
+ <p>You can also force a request to be handled as a reverse-proxy
+ request, by creating a suitable Handler pass-through. The example
+ configuration below will pass all requests for PHP scripts to the
+ specified FastCGI server using reverse proxy:
+ </p>
+
+ <div class="example"><h3>Reverse Proxy PHP scripts</h3><pre class="prettyprint lang-config">&lt;FilesMatch "\.php$"&gt;
+ # Unix sockets require 2.4.7 or later
+ SetHandler "proxy:unix:/path/to/app.sock|fcgi://localhost/"
+&lt;/FilesMatch&gt;</pre>
+</div>
+
+ <p>This feature is available in Apache HTTP Server 2.4.10 and later.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="workers" id="workers">Workers</a></h2>
+ <p>The proxy manages the configuration of origin servers and their
+ communication parameters in objects called <dfn>workers</dfn>.
+ There are two built-in workers, the default forward proxy worker and the
+ default reverse proxy worker. Additional workers can be configured
+ explicitly.</p>
+
+ <p>The two default workers have a fixed configuration
+ and will be used if no other worker matches the request.
+ They do not use HTTP Keep-Alive or connection pooling.
+ The TCP connections to the origin server will instead be
+ opened and closed for each request.</p>
+
+ <p>Explicitly configured workers are identified by their URL.
+ They are usually created and configured using
+ <code class="directive"><a href="#proxypass">ProxyPass</a></code> or
+ <code class="directive"><a href="#proxypassmatch">ProxyPassMatch</a></code> when used
+ for a reverse proxy:</p>
+
+ <pre class="prettyprint lang-config">ProxyPass "/example" "http://backend.example.com" connectiontimeout=5 timeout=30</pre>
+
+
+ <p>This will create a worker associated with the origin server URL
+ <code>http://backend.example.com</code> and using the given timeout
+ values. When used in a forward proxy, workers are usually defined
+ via the <code class="directive"><a href="#proxyset">ProxySet</a></code> directive:</p>
+
+ <pre class="prettyprint lang-config">ProxySet "http://backend.example.com" connectiontimeout=5 timeout=30</pre>
+
+
+ <p>or alternatively using <code class="directive"><a href="#proxy">Proxy</a></code>
+ and <code class="directive"><a href="#proxyset">ProxySet</a></code>:</p>
+
+ <pre class="prettyprint lang-config">&lt;Proxy "http://backend.example.com"&gt;
+ ProxySet connectiontimeout=5 timeout=30
+&lt;/Proxy&gt;</pre>
+
+
+ <p>Using explicitly configured workers in the forward mode is
+ not very common, because forward proxies usually communicate with many
+ different origin servers. Creating explicit workers for some of the
+ origin servers can still be useful, if they are used very often.
+ Explicitly configured workers have no concept of forward or reverse
+ proxying by themselves. They encapsulate a common concept of
+ communication with origin servers. A worker created by
+ <code class="directive"><a href="#proxypass">ProxyPass</a></code> for use in a
+ reverse proxy will be also used for forward proxy requests whenever
+ the URL to the origin server matches the worker URL and vice versa.</p>
+
+ <p>The URL identifying a direct worker is the URL of its
+ origin server including any path components given:</p>
+
+ <pre class="prettyprint lang-config">ProxyPass "/examples" "http://backend.example.com/examples"
+ProxyPass "/docs" "http://backend.example.com/docs"</pre>
+
+
+ <p>This example defines two different workers, each using a separate
+ connection pool and configuration.</p>
+
+ <div class="warning"><h3>Worker Sharing</h3>
+ <p>Worker sharing happens if the worker URLs overlap, which occurs when
+ the URL of some worker is a leading substring of the URL of another
+ worker defined later in the configuration file. In the following example</p>
+
+ <pre class="prettyprint lang-config">ProxyPass "/apps" "http://backend.example.com/" timeout=60
+ProxyPass "/examples" "http://backend.example.com/examples" timeout=10</pre>
+
+
+ <p>the second worker isn't actually created. Instead the first
+ worker is used. The benefit is, that there is only one connection pool,
+ so connections are more often reused. Note that all configuration attributes
+ given explicitly for the later worker will be ignored. This will be logged
+ as a warning. In the above example the resulting timeout value
+ for the URL <code>/examples</code> will be <code>60</code> instead
+ of <code>10</code>!</p>
+
+ <p>If you want to avoid worker sharing, sort your worker definitions
+ by URL length, starting with the longest worker URLs. If you want to maximize
+ worker sharing use the reverse sort order. See also the related warning about
+ ordering <code class="directive"><a href="#proxypass">ProxyPass</a></code> directives.</p>
+
+ </div>
+
+ <p>Explicitly configured workers come in two flavors:
+ <dfn>direct workers</dfn> and <dfn>(load) balancer workers</dfn>.
+ They support many important configuration attributes which are
+ described below in the <code class="directive"><a href="#proxypass">ProxyPass</a></code>
+ directive. The same attributes can also be set using
+ <code class="directive"><a href="#proxyset">ProxySet</a></code>.</p>
+
+ <p>The set of options available for a direct worker
+ depends on the protocol, which is specified in the origin server URL.
+ Available protocols include <code>ajp</code>, <code>fcgi</code>,
+ <code>ftp</code>, <code>http</code> and <code>scgi</code>.</p>
+
+ <p>Balancer workers are virtual workers that use direct workers known
+ as their members to actually handle the requests. Each balancer can
+ have multiple members. When it handles a request, it chooses a member
+ based on the configured load balancing algorithm.</p>
+
+ <p>A balancer worker is created if its worker URL uses
+ <code>balancer</code> as the protocol scheme.
+ The balancer URL uniquely identifies the balancer worker.
+ Members are added to a balancer using
+ <code class="directive"><a href="#balancermember">BalancerMember</a></code>.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="access" id="access">Controlling access to your proxy</a></h2>
+ <p>You can control who can access your proxy via the <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> control block as in
+ the following example:</p>
+
+ <pre class="prettyprint lang-config">&lt;Proxy "*"&gt;
+ Require ip 192.168.0
+&lt;/Proxy&gt;</pre>
+
+
+ <p>For more information on access control directives, see
+ <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>.</p>
+
+ <p>Strictly limiting access is essential if you are using a
+ forward proxy (using the <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> directive).
+ Otherwise, your server can be used by any client to access
+ arbitrary hosts while hiding his or her true identity. This is
+ dangerous both for your network and for the Internet at large.
+ When using a reverse proxy (using the <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive with
+ <code>ProxyRequests Off</code>), access control is less
+ critical because clients can only contact the hosts that you
+ have specifically configured.</p>
+
+ <p><strong>See Also</strong> the <a href="mod_proxy_http.html#env">Proxy-Chain-Auth</a> environment variable.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="startup" id="startup">Slow Startup</a></h2>
+ <p>If you're using the <code class="directive"><a href="#proxyblock">ProxyBlock</a></code> directive, hostnames' IP addresses are looked up
+ and cached during startup for later match test. This may take a few
+ seconds (or more) depending on the speed with which the hostname lookups
+ occur.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="intranet" id="intranet">Intranet Proxy</a></h2>
+ <p>An Apache httpd proxy server situated in an intranet needs to forward
+ external requests through the company's firewall (for this, configure
+ the <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> directive
+ to forward the respective <var>scheme</var> to the firewall proxy).
+ However, when it has to
+ access resources within the intranet, it can bypass the firewall when
+ accessing hosts. The <code class="directive"><a href="#noproxy">NoProxy</a></code>
+ directive is useful for specifying which hosts belong to the intranet and
+ should be accessed directly.</p>
+
+ <p>Users within an intranet tend to omit the local domain name from their
+ WWW requests, thus requesting "http://somehost/" instead of
+ <code>http://somehost.example.com/</code>. Some commercial proxy servers
+ let them get away with this and simply serve the request, implying a
+ configured local domain. When the <code class="directive"><a href="#proxydomain">ProxyDomain</a></code> directive is used and the server is <a href="#proxyrequests">configured for proxy service</a>, Apache httpd can return
+ a redirect response and send the client to the correct, fully qualified,
+ server address. This is the preferred method since the user's bookmark
+ files will then contain fully qualified hosts.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="envsettings" id="envsettings">Protocol Adjustments</a></h2>
+ <p>For circumstances where <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> is sending
+ requests to an origin server that doesn't properly implement
+ keepalives or HTTP/1.1, there are two <a href="../env.html">environment variables</a> that can force the
+ request to use HTTP/1.0 with no keepalive. These are set via the
+ <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code> directive.</p>
+
+ <p>These are the <code>force-proxy-request-1.0</code> and
+ <code>proxy-nokeepalive</code> notes.</p>
+
+ <pre class="prettyprint lang-config">&lt;Location "/buggyappserver/"&gt;
+ ProxyPass "http://buggyappserver:7001/foo/"
+ SetEnv force-proxy-request-1.0 1
+ SetEnv proxy-nokeepalive 1
+&lt;/Location&gt;</pre>
+
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="request-bodies" id="request-bodies">Request Bodies</a></h2>
+
+ <p>Some request methods such as POST include a request body.
+ The HTTP protocol requires that requests which include a body
+ either use chunked transfer encoding or send a
+ <code>Content-Length</code> request header. When passing these
+ requests on to the origin server, <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>
+ will always attempt to send the <code>Content-Length</code>. But
+ if the body is large and the original request used chunked
+ encoding, then chunked encoding may also be used in the upstream
+ request. You can control this selection using <a href="../env.html">environment variables</a>. Setting
+ <code>proxy-sendcl</code> ensures maximum compatibility with
+ upstream servers by always sending the
+ <code>Content-Length</code>, while setting
+ <code>proxy-sendchunked</code> minimizes resource usage by using
+ chunked encoding.</p>
+
+ <p>Under some circumstances, the server must spool request bodies
+ to disk to satisfy the requested handling of request bodies. For
+ example, this spooling will occur if the original body was sent with
+ chunked encoding (and is large), but the administrator has
+ asked for backend requests to be sent with Content-Length or as HTTP/1.0.
+ This spooling can also occur if the request body already has a
+ Content-Length header, but the server is configured to filter incoming
+ request bodies.</p>
+
+ <p><code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code> only applies to
+ request bodies that the server will spool to disk</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="x-headers" id="x-headers">Reverse Proxy Request Headers</a></h2>
+
+ <p>When acting in a reverse-proxy mode (using the <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive, for example),
+ <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> adds several request headers in
+ order to pass information to the origin server. These headers
+ are:</p>
+
+ <dl>
+ <dt><code>X-Forwarded-For</code></dt>
+ <dd>The IP address of the client.</dd>
+ <dt><code>X-Forwarded-Host</code></dt>
+ <dd>The original host requested by the client in the <code>Host</code>
+ HTTP request header.</dd>
+ <dt><code>X-Forwarded-Server</code></dt>
+ <dd>The hostname of the proxy server.</dd>
+ </dl>
+
+ <p>Be careful when using these headers on the origin server, since
+ they will contain more than one (comma-separated) value if the
+ original request already contained one of these headers. For
+ example, you can use <code>%{X-Forwarded-For}i</code> in the log
+ format string of the origin server to log the original clients IP
+ address, but you may get more than one address if the request
+ passes through several proxies.</p>
+
+ <p>See also the <code class="directive"><a href="#proxypreservehost">ProxyPreserveHost</a></code> and <code class="directive"><a href="#proxyvia">ProxyVia</a></code> directives, which control
+ other request headers.</p>
+
+ <p>Note: If you need to specify custom request headers to be
+ added to the forwarded request, use the
+ <code class="directive"><a href="../mod/mod_headers.html#requestheader">RequestHeader</a></code>
+ directive.</p>
+
+ </div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_proxy.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy.html.fr b/docs/manual/mod/mod_proxy.html.fr
index f3da25edd4..ef187da79c 100644
--- a/docs/manual/mod/mod_proxy.html.fr
+++ b/docs/manual/mod/mod_proxy.html.fr
@@ -157,385 +157,6 @@
<li><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="forwardreverse" id="forwardreverse">Mandataires directs et
- mandataires/passerelles inverses</a></h2>
- <p>Le serveur HTTP Apache peut �tre configur� dans les deux modes mandataire
- <dfn>direct</dfn> et mandataire <dfn>inverse</dfn> (aussi nomm�
- mode <dfn>passerelle</dfn>).</p>
-
- <p>Un <dfn>mandataire direct</dfn> standard est un serveur
- interm�diaire qui s'intercale entre le client et le <em>serveur
- demand�</em>. Pour obtenir un contenu h�berg� par
- le serveur demand�, le client envoie une requ�te au
- mandataire en nommant le serveur demand� comme
- cible, puis le mandataire extrait le contenu depuis le
- serveur demand� et le renvoie enfin au client. Le client doit �tre
- configur� de mani�re appropri�e pour pouvoir utiliser le mandataire
- direct afin d'acc�der � d'autres sites.</p>
-
- <p>L'acc�s � Internet depuis des clients situ�s derri�re un
- pare-feu est une utilisation typique du mandataire direct. Le
- mandataire direct peut aussi utiliser la mise en cache (fournie
- par <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>) pour r�duire la charge du
- r�seau.</p>
-
- <p>La fonctionnalit� de mandataire direct est activ�e via la
- directive <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code>.
- Comme les mandataires directs permettent aux clients d'acc�der �
- des sites quelconques via votre serveur et de dissimuler leur
- v�ritable origine, il est indispensable de <a href="#access">s�curiser votre serveur</a> de fa�on � ce que seuls
- les clients autoris�s puissent acc�der � votre serveur avant
- d'activer la fonctionnalit� de mandataire direct.</p>
-
- <p>Un <dfn>mandataire inverse</dfn> (ou <dfn>passerelle</dfn>),
- quant � lui, appara�t au client comme un serveur web standard.
- Aucune configuration particuli�re du client n'est n�cessaire. Le
- client adresse ses demandes de contenus ordinaires dans l'espace
- de nommage du mandataire inverse. Ce dernier d�cide alors o�
- envoyer ces requ�tes, et renvoie le contenu au client comme s'il
- l'h�bergeait lui-m�me.</p>
-
- <p>L'acc�s d'utilisateurs depuis Internet vers un serveur situ�
- derri�re un pare-feu est une utilisation typique du mandataire
- inverse. On peut aussi utiliser les mandataires inverses pour
- mettre en oeuvre une r�partition de charge entre plusieurs
- serveurs en arri�re-plan, ou fournir un cache pour un serveur
- d'arri�re-plan plus lent. Les mandataires inverses peuvent aussi
- tout simplement servir � rassembler plusieurs serveurs dans le
- m�me espace de nommage d'URLs.</p>
-
- <p>La fonctionnalit� de mandataire inverse est activ�e via la
- directive <code class="directive"><a href="#proxypass">ProxyPass</a></code> ou
- le drapeau <code>[P]</code> de la directive <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>. Il n'est
- <strong>pas</strong> n�cessaire de d�finir <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> pour configurer
- un mandataire inverse.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Exemples simples</a></h2>
-
- <p>Les exemples ci-dessous illustrent de mani�re tr�s basique la
- mise en oeuvre de la fonctionnalit� de mandataire et ne sont l� que
- pour vous aider � d�marrer. Reportez-vous � la documentation de
- chaque directive.</p>
-
- <p>Si en outre, vous d�sirez activer la mise en cache, consultez la
- documentation de <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
-
- <div class="example"><h3>Mandataire inverse</h3><pre class="prettyprint lang-config">ProxyPass /foo http://foo.example.com/bar
-ProxyPassReverse /foo http://foo.example.com/bar</pre>
-</div>
-
- <div class="example"><h3>Mandataire direct</h3><pre class="prettyprint lang-config">ProxyRequests On
-ProxyVia On
-
-&lt;Proxy *&gt;
- Require host internal.example.com
-&lt;/Proxy&gt;</pre>
-</div>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="handler" id="handler">Acc�s via un gestionnaire</a></h2>
-
- <p>Vous pouvez aussi forcer le traitement d'une requ�te en tant que
- requ�te de mandataire inverse en cr�ant un gestionnaire de transfert
- appropri�. Dans l'exemple suivant, toutes les requ�tes pour
- des scripts PHP seront transmises au serveur FastCGI
- sp�cifi� via un mandat inverse :
- </p>
-
- <div class="example"><h3>Scripts PHP et mandataire inverse</h3><pre class="prettyprint lang-config">&lt;FilesMatch \.php$&gt;
- # Les sockets Unix n�cessitent une version 2.4.7 ou sup�rieure du
- # serveur HTTP Apache
- SetHandler "proxy:unix:/path/to/app.sock|fcgi://localhost/"
-&lt;/FilesMatch&gt;</pre>
-</div>
-
- <p>Cette fonctionnalit� est disponible � partir de la version
- 2.4.10 du serveur HTTP Apache.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="workers" id="workers">Workers</a></h2>
- <p>Le mandataire g�re la configuration et les param�tres de
- communication des serveurs originaux au sein d'objets nomm�s
- <dfn>workers</dfn>. Deux types de worker sont fournis : le worker
- par d�faut du mandataire direct et le worker par d�faut du
- mandataire inverse. Il est aussi possible de d�finir explicitement
- des workers suppl�mentaires.</p>
-
- <p>Les deux workers par d�faut poss�dent une configuration fig�e
- et seront utilis�s si aucun autre worker ne correspond � la
- requ�te. Ils n'utilisent ni les jeux de connexions (connection
- pooling), ni les
- connexions HTTP persistantes (Keep-Alive). En effet, les
- connexions TCP vers le serveur original sont ferm�es et ouvertes
- pour chaque requ�te.</p>
-
- <p>Les workers d�finis explicitement sont identifi�s par leur URL.
- Ils sont en g�n�ral d�finis via les directives <code class="directive"><a href="#proxypass">ProxyPass</a></code> ou <code class="directive"><a href="#proxypassmatch">ProxyPassMatch</a></code> lorsqu'on les
- utilise dans le cadre d'un mandataire inverse :</p>
-
- <div class="example"><pre class="prettyprint lang-config">ProxyPass /example http://backend.example.com connectiontimeout=5 timeout=30</pre>
-</div>
-
-
- <p>Cette directive va cr�er un worker associ� � l'URL du serveur
- original <code>http://backend.example.com</code>, et utilisant les
- valeurs de timeout donn�es. Lorsqu'ils sont utilis�s dans le cadre
- d'un mandataire direct, les workers sont en g�n�ral d�finis via la
- directive <code class="directive"><a href="#proxyset">ProxySet</a></code>,</p>
-
- <div class="example"><pre class="prettyprint lang-config">ProxySet http://backend.example.com connectiontimeout=5 timeout=30</pre>
-</div>
-
-
- <p>ou encore via les directives <code class="directive"><a href="#proxy">Proxy</a></code> et <code class="directive"><a href="#proxyset">ProxySet</a></code> :</p>
-
- <pre class="prettyprint lang-config">&lt;Proxy http://backend.example.com&gt;
- ProxySet connectiontimeout=5 timeout=30
-&lt;/Proxy&gt;</pre>
-
-
- <p>L'utilisation de workers d�finis explicitement dans le mode
- mandataire direct n'est pas tr�s courante, car les mandataires
- directs communiquent en g�n�ral avec de nombreux serveurs
- originaux. La cr�ation explicite de workers pour certains serveurs
- originaux peut cependant s'av�rer utile si ces serveurs sont
- tr�s souvent sollicit�s. A leur niveau, les workers explicitement
- d�finis ne poss�dent aucune notion de mandataire direct ou
- inverse. Ils encapsulent un concept de communication commun avec
- les serveurs originaux. Un worker cr�� via la directive <code class="directive"><a href="#proxypass">ProxyPass</a></code> pour �tre utilis� dans le
- cadre d'un mandataire inverse sera aussi utilis� dans le cadre
- d'un mandataire directe chaque fois que l'URL vers le serveur
- original correspondra � l'URL du worker, et vice versa.</p>
-
- <p>L'URL qui identifie un worker correspond � l'URL de son serveur
- original, y compris un �ventuel chemin donn� :</p>
-
- <pre class="prettyprint lang-config">ProxyPass /examples http://backend.example.com/examples
-ProxyPass /docs http://backend.example.com/docs</pre>
-
-
- <p>Dans cet exemple, deux workers diff�rents sont d�finis, chacun
- d'eux utilisant des configurations et jeux de connexions
- s�par�s.</p>
-
- <div class="warning"><h3>Partage de workers</h3>
- <p>Le partage de workers intervient lorsque les URLs des workers
- s'entrecoupent, ce qui arrive lorsque l'URL d'un worker
- correspond au d�but de l'URL d'un autre worker d�fini plus loin
- dans le fichier de configuration. Dans l'exemple suivant,</p>
-
- <pre class="prettyprint lang-config">ProxyPass /apps http://backend.example.com/ timeout=60
-ProxyPass /examples http://backend.example.com/examples timeout=10</pre>
-
-
- <p>le second worker n'est pas vraiment cr��. C'est le premier
- worker qui est en fait utilis�. L'avantage de ceci r�side dans
- le fait qu'il n'existe qu'un seul jeu de connexions, ces
- derni�res �tant donc r�utilis�es plus souvent. Notez que tous
- les attributs de configuration d�finis explicitement pour le
- deuxi�me worker seront ignor�s, ce qui sera journalis� en tant
- qu'avertissement. Ainsi, dans l'exemple ci-dessus, la valeur de
- timeout retenue pour l'URL <code>/exemples</code> sera
- <code>60</code>, et non <code>10</code> !</p>
-
- <p>Si vous voulez emp�cher le partage de workers, classez vos
- d�finitions de workers selon la longueur des URLs, de la plus
- longue � la plus courte. Si au contraire vous voulez favoriser
- ce partage, utilisez l'ordre de classement inverse. Voir aussi
- l'avertissement � propos de l'ordre de classement des directives
- <code class="directive"><a href="#proxypass">ProxyPass</a></code>.</p>
-
- </div>
-
- <p>Les workers d�finis explicitement sont de deux sortes :
- <dfn>workers directs</dfn> et <dfn>workers de r�partition (de
- charge)</dfn>. Ils supportent de nombreux attributs de
- configuration importants d�crits dans la directive <code class="directive"><a href="#proxypass">ProxyPass</a></code>. Ces m�mes attributs
- peuvent aussi �tre d�finis via la directive <code class="directive"><a href="#proxyset">ProxySet</a></code>.</p>
-
- <p>Le jeu d'options disponibles pour un worker direct d�pend du
- protocole sp�cifi� dans l'URL du serveur original. Les protocoles
- disponibles comprennent <code>ajp</code>, <code>fcgi</code>,
- <code>ftp</code>, <code>http</code> et <code>scgi</code>.</p>
-
- <p>Les workers de r�partition sont des workers virtuels qui
- utilisent les workers directs, connus comme faisant partie de leurs
- membres, pour le traitement effectif des requ�tes. Chaque
- r�partiteur peut comporter plusieurs membres. Lorsqu'il traite une
- requ�te, il choisit un de ses membres en fonction de l'algorithme
- de r�partition de charge d�fini.</p>
-
- <p>Un worker de r�partition est cr�� si son URL de worker comporte
- <code>balancer</code> comme indicateur de protocole. L'URL du
- r�partiteur permet d'identifier de mani�re unique le worker de
- r�partition. La directive <code class="directive"><a href="#balancermember">BalancerMember</a></code> permet d'ajouter des
- membres au r�partiteur.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="access" id="access">Contr�ler l'acc�s � votre
- mandataire</a></h2>
- <p>Vous pouvez restreindre l'acc�s � votre mandataire via le bloc
- de contr�le <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> comme dans
- l'exemple suivant :</p>
-
- <pre class="prettyprint lang-config">&lt;Proxy *&gt;
- Require ip 192.168.0
-&lt;/Proxy&gt;</pre>
-
-
- <p>Pour plus de d�tails sur les directives de contr�le d'acc�s,
- voir la documentation du module
- <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>.</p>
-
- <p>Restreindre l'acc�s de mani�re stricte est essentiel si vous
- mettez en oeuvre un mandataire direct (en d�finissant la directive
- <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> � "on").
- Dans le cas contraire, votre serveur pourrait �tre utilis� par
- n'importe quel client pour acc�der � des serveurs quelconques,
- tout en masquant sa v�ritable identit�. Ceci repr�sente un danger
- non seulement pour votre r�seau, mais aussi pour l'Internet au
- sens large. Dans le cas de la mise en oeuvre d'un mandataire
- inverse (en utilisant la directive <code class="directive"><a href="#proxypass">ProxyPass</a></code> avec <code>ProxyRequests Off</code>), le contr�le
- d'acc�s est moins critique car les clients ne peuvent contacter
- que les serveurs que vous avez sp�cifi�s.</p>
-
- <p><strong>Voir aussi</strong> la variable d'environnement <a href="mod_proxy_http.html#env">Proxy-Chain-Auth</a>.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="startup" id="startup">Ralentissement au d�marrage</a></h2>
- <p>Si vous utilisez la directive <code class="directive"><a href="#proxyblock">ProxyBlock</a></code>, les noms d'h�tes sont r�solus en adresses
- IP puis ces derni�res mises en cache au cours du d�marrage
- � des fins de tests de comparaisons ult�rieurs. Ce processus peut
- durer plusieurs secondes (ou d'avantage) en fonction de la vitesse
- � laquelle s'effectue la r�solution des noms d'h�tes.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="intranet" id="intranet">Mandataire en Intranet</a></h2>
- <p>Un serveur mandataire Apache httpd situ� � l'int�rieur d'un Intranet
- doit faire suivre les requ�tes destin�es � un serveur externe �
- travers le pare-feu de l'entreprise (pour ce faire, d�finissez la
- directive <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> de
- fa�on � ce qu'elle fasse suivre le <var>protocole</var> concern�
- vers le mandataire du pare-feu). Cependant, lorsqu'il doit acc�der
- � des ressources situ�es dans l'Intranet, il peut se passer du
- pare-feu pour acc�der aux serveurs. A cet effet, la directive
- <code class="directive"><a href="#noproxy">NoProxy</a></code> permet de
- sp�cifier quels h�tes appartiennent � l'Intranet et peuvent donc
- �tre acc�d�s directement.</p>
-
- <p>Les utilisateurs d'un Intranet ont tendance � oublier le nom du
- domaine local dans leurs requ�tes WWW, et demandent par exemple
- "http://un-serveur/" au lieu de
- <code>http://un-serveur.example.com/</code>. Certains serveurs
- mandataires commerciaux acceptent ce genre de requ�te et les
- traitent simplement en utilisant un nom de domaine local
- implicite. Lorsque la directive <code class="directive"><a href="#proxydomain">ProxyDomain</a></code> est utilis�e et si le
- serveur est <a href="#proxyrequests">configur� comme
- mandataire</a>, Apache httpd peut renvoyer une r�ponse de redirection et
- ainsi fournir au client l'adresse de serveur correcte,
- enti�rement qualifi�e. C'est la m�thode � privil�gier car le
- fichier des marque-pages de l'utilisateur contiendra alors des
- noms de serveurs enti�rement qualifi�s.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="envsettings" id="envsettings">Ajustements relatifs au
- protocole</a></h2>
- <p>Pour les cas o� <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> envoie des requ�tes
- vers un serveur qui n'impl�mente pas correctement les connexions
- persistantes ou le protocole HTTP/1.1, il existe deux variables
- d'environnement qui permettent de forcer les requ�tes � utiliser
- le protocole HTTP/1.0 avec connexions non persistantes. Elles
- peuvent �tre d�finies via la directive <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code>.</p>
-
- <p>Il s'agit des variables <code>force-proxy-request-1.0</code> et
- <code>proxy-nokeepalive</code>.</p>
-
- <pre class="prettyprint lang-config">&lt;Location /buggyappserver/&gt;
- ProxyPass http://buggyappserver:7001/foo/
- SetEnv force-proxy-request-1.0 1
- SetEnv proxy-nokeepalive 1
-&lt;/Location&gt;</pre>
-
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="request-bodies" id="request-bodies">Corps de requ�tes</a></h2>
-
- <p>Certaines m�thodes de requ�tes comme POST comportent un corps de
- requ�te. Le protocole HTTP stipule que les requ�tes qui comportent
- un corps doivent soit utiliser un codage de transmission
- fractionn�e (chunked transfer encoding), soit envoyer un en-t�te de requ�te
- <code>Content-Length</code>. Lorsqu'il fait suivre ce genre de
- requ�te vers le serveur demand�, <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>
- s'efforce toujours d'envoyer l'en-t�te <code>Content-Length</code>.
- Par contre, si la taille du corps est importante, et si la requ�te
- originale utilise un codage � fractionnement, ce dernier peut aussi
- �tre utilis� dans la requ�te montante. Ce comportement peut �tre
- contr�l� � l'aide de <a href="../env.html">variables
- d'environnement</a>. Ainsi, si elle est d�finie, la variable
- <code>proxy-sendcl</code> assure une compatibilit� maximale avec les
- serveurs demand�s en imposant l'envoi de l'en-t�te
- <code>Content-Length</code>, alors que
- <code>proxy-sendchunked</code> diminue la consommation de ressources
- en imposant l'utilisation d'un codage � fractionnement.</p>
-
- <p>Dans certaines circonstances, le serveur doit mettre en file
- d'attente sur disque les corps de requ�tes afin de satisfaire le
- traitement demand� des corps de requ�tes. Par exemple, cette mise en
- file d'attente se produira si le corps original a �t� envoy� selon un
- codage morcel� (et poss�de une taille importante), alors que
- l'administrateur a demand� que les requ�tes du serveur
- d'arri�re-plan soient envoy�es avec l'en-t�te Content-Length ou en
- HTTP/1.0. Cette mise en file d'attente se produira aussi si le corps
- de la requ�te contient d�j� un en-t�te Content-Length, alors que le
- serveur est configur� pour filtrer les corps des requ�tes entrantes.</p>
-
- <p>La directive <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code> ne s'applique qu'aux
- corps de requ�tes que le serveur met en file d'attente sur disque.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="x-headers" id="x-headers">En-t�tes de requ�te du mandataire
- inverse</a></h2>
-
- <p>Lorsqu'il est configur� en mode mandataire inverse (en utilisant
- par exemple la directive <code class="directive"><a href="#proxypass">ProxyPass</a></code>),
- <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> ajoute plusieurs en-t�tes de requ�te
- afin de transmettre des informations au serveur demand�. Ces
- en-t�tes sont les suivants :</p>
-
- <dl>
- <dt><code>X-Forwarded-For</code></dt>
- <dd>L'adresse IP du client.</dd>
- <dt><code>X-Forwarded-Host</code></dt>
- <dd>L'h�te d'origine demand� par le client dans l'en-t�te de
- requ�te HTTP <code>Host</code>.</dd>
- <dt><code>X-Forwarded-Server</code></dt>
- <dd>Le nom d'h�te du serveur mandataire.</dd>
- </dl>
-
- <p>Ces en-t�tes doivent �tre utilis�s avec pr�cautions sur le
- serveur demand�, car ils contiendront plus d'une valeur (s�par�es
- par des virgules) si la requ�te originale contenait d�j� un de ces
- en-t�tes. Par exemple, vous pouvez utiliser
- <code>%{X-Forwarded-For}i</code> dans la cha�ne de format du journal
- du serveur demand� pour enregistrer les adresses IP des clients
- originaux, mais il est possible que vous obteniez plusieurs adresses
- si la requ�te passe � travers plusieurs mandataires.</p>
-
- <p>Voir aussi les directives <code class="directive"><a href="#proxypreservehost">ProxyPreserveHost</a></code> et <code class="directive"><a href="#proxyvia">ProxyVia</a></code> directives, qui permettent
- de contr�ler d'autres en-t�tes de requ�te.</p>
-
- <p>Note : Si vous devez ajouter des en-t�tes particuliers � la
- requ�te mandat�e, utilisez la directive <code class="directive"><a href="../mod/mod_headers.html#requestheader">RequestHeader</a></code>.</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="balancergrowth" id="balancergrowth">Directive</a> <a name="BalancerGrowth" id="BalancerGrowth">BalancerGrowth</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Nombre de membres suppl�mentaires pouvant �tre ajout�s
@@ -2188,6 +1809,385 @@ mandat�es</td></tr>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="forwardreverse" id="forwardreverse">Mandataires directs et
+ mandataires/passerelles inverses</a></h2>
+ <p>Le serveur HTTP Apache peut �tre configur� dans les deux modes mandataire
+ <dfn>direct</dfn> et mandataire <dfn>inverse</dfn> (aussi nomm�
+ mode <dfn>passerelle</dfn>).</p>
+
+ <p>Un <dfn>mandataire direct</dfn> standard est un serveur
+ interm�diaire qui s'intercale entre le client et le <em>serveur
+ demand�</em>. Pour obtenir un contenu h�berg� par
+ le serveur demand�, le client envoie une requ�te au
+ mandataire en nommant le serveur demand� comme
+ cible, puis le mandataire extrait le contenu depuis le
+ serveur demand� et le renvoie enfin au client. Le client doit �tre
+ configur� de mani�re appropri�e pour pouvoir utiliser le mandataire
+ direct afin d'acc�der � d'autres sites.</p>
+
+ <p>L'acc�s � Internet depuis des clients situ�s derri�re un
+ pare-feu est une utilisation typique du mandataire direct. Le
+ mandataire direct peut aussi utiliser la mise en cache (fournie
+ par <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>) pour r�duire la charge du
+ r�seau.</p>
+
+ <p>La fonctionnalit� de mandataire direct est activ�e via la
+ directive <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code>.
+ Comme les mandataires directs permettent aux clients d'acc�der �
+ des sites quelconques via votre serveur et de dissimuler leur
+ v�ritable origine, il est indispensable de <a href="#access">s�curiser votre serveur</a> de fa�on � ce que seuls
+ les clients autoris�s puissent acc�der � votre serveur avant
+ d'activer la fonctionnalit� de mandataire direct.</p>
+
+ <p>Un <dfn>mandataire inverse</dfn> (ou <dfn>passerelle</dfn>),
+ quant � lui, appara�t au client comme un serveur web standard.
+ Aucune configuration particuli�re du client n'est n�cessaire. Le
+ client adresse ses demandes de contenus ordinaires dans l'espace
+ de nommage du mandataire inverse. Ce dernier d�cide alors o�
+ envoyer ces requ�tes, et renvoie le contenu au client comme s'il
+ l'h�bergeait lui-m�me.</p>
+
+ <p>L'acc�s d'utilisateurs depuis Internet vers un serveur situ�
+ derri�re un pare-feu est une utilisation typique du mandataire
+ inverse. On peut aussi utiliser les mandataires inverses pour
+ mettre en oeuvre une r�partition de charge entre plusieurs
+ serveurs en arri�re-plan, ou fournir un cache pour un serveur
+ d'arri�re-plan plus lent. Les mandataires inverses peuvent aussi
+ tout simplement servir � rassembler plusieurs serveurs dans le
+ m�me espace de nommage d'URLs.</p>
+
+ <p>La fonctionnalit� de mandataire inverse est activ�e via la
+ directive <code class="directive"><a href="#proxypass">ProxyPass</a></code> ou
+ le drapeau <code>[P]</code> de la directive <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>. Il n'est
+ <strong>pas</strong> n�cessaire de d�finir <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> pour configurer
+ un mandataire inverse.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Exemples simples</a></h2>
+
+ <p>Les exemples ci-dessous illustrent de mani�re tr�s basique la
+ mise en oeuvre de la fonctionnalit� de mandataire et ne sont l� que
+ pour vous aider � d�marrer. Reportez-vous � la documentation de
+ chaque directive.</p>
+
+ <p>Si en outre, vous d�sirez activer la mise en cache, consultez la
+ documentation de <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
+
+ <div class="example"><h3>Mandataire inverse</h3><pre class="prettyprint lang-config">ProxyPass /foo http://foo.example.com/bar
+ProxyPassReverse /foo http://foo.example.com/bar</pre>
+</div>
+
+ <div class="example"><h3>Mandataire direct</h3><pre class="prettyprint lang-config">ProxyRequests On
+ProxyVia On
+
+&lt;Proxy *&gt;
+ Require host internal.example.com
+&lt;/Proxy&gt;</pre>
+</div>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="handler" id="handler">Acc�s via un gestionnaire</a></h2>
+
+ <p>Vous pouvez aussi forcer le traitement d'une requ�te en tant que
+ requ�te de mandataire inverse en cr�ant un gestionnaire de transfert
+ appropri�. Dans l'exemple suivant, toutes les requ�tes pour
+ des scripts PHP seront transmises au serveur FastCGI
+ sp�cifi� via un mandat inverse :
+ </p>
+
+ <div class="example"><h3>Scripts PHP et mandataire inverse</h3><pre class="prettyprint lang-config">&lt;FilesMatch \.php$&gt;
+ # Les sockets Unix n�cessitent une version 2.4.7 ou sup�rieure du
+ # serveur HTTP Apache
+ SetHandler "proxy:unix:/path/to/app.sock|fcgi://localhost/"
+&lt;/FilesMatch&gt;</pre>
+</div>
+
+ <p>Cette fonctionnalit� est disponible � partir de la version
+ 2.4.10 du serveur HTTP Apache.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="workers" id="workers">Workers</a></h2>
+ <p>Le mandataire g�re la configuration et les param�tres de
+ communication des serveurs originaux au sein d'objets nomm�s
+ <dfn>workers</dfn>. Deux types de worker sont fournis : le worker
+ par d�faut du mandataire direct et le worker par d�faut du
+ mandataire inverse. Il est aussi possible de d�finir explicitement
+ des workers suppl�mentaires.</p>
+
+ <p>Les deux workers par d�faut poss�dent une configuration fig�e
+ et seront utilis�s si aucun autre worker ne correspond � la
+ requ�te. Ils n'utilisent ni les jeux de connexions (connection
+ pooling), ni les
+ connexions HTTP persistantes (Keep-Alive). En effet, les
+ connexions TCP vers le serveur original sont ferm�es et ouvertes
+ pour chaque requ�te.</p>
+
+ <p>Les workers d�finis explicitement sont identifi�s par leur URL.
+ Ils sont en g�n�ral d�finis via les directives <code class="directive"><a href="#proxypass">ProxyPass</a></code> ou <code class="directive"><a href="#proxypassmatch">ProxyPassMatch</a></code> lorsqu'on les
+ utilise dans le cadre d'un mandataire inverse :</p>
+
+ <div class="example"><pre class="prettyprint lang-config">ProxyPass /example http://backend.example.com connectiontimeout=5 timeout=30</pre>
+</div>
+
+
+ <p>Cette directive va cr�er un worker associ� � l'URL du serveur
+ original <code>http://backend.example.com</code>, et utilisant les
+ valeurs de timeout donn�es. Lorsqu'ils sont utilis�s dans le cadre
+ d'un mandataire direct, les workers sont en g�n�ral d�finis via la
+ directive <code class="directive"><a href="#proxyset">ProxySet</a></code>,</p>
+
+ <div class="example"><pre class="prettyprint lang-config">ProxySet http://backend.example.com connectiontimeout=5 timeout=30</pre>
+</div>
+
+
+ <p>ou encore via les directives <code class="directive"><a href="#proxy">Proxy</a></code> et <code class="directive"><a href="#proxyset">ProxySet</a></code> :</p>
+
+ <pre class="prettyprint lang-config">&lt;Proxy http://backend.example.com&gt;
+ ProxySet connectiontimeout=5 timeout=30
+&lt;/Proxy&gt;</pre>
+
+
+ <p>L'utilisation de workers d�finis explicitement dans le mode
+ mandataire direct n'est pas tr�s courante, car les mandataires
+ directs communiquent en g�n�ral avec de nombreux serveurs
+ originaux. La cr�ation explicite de workers pour certains serveurs
+ originaux peut cependant s'av�rer utile si ces serveurs sont
+ tr�s souvent sollicit�s. A leur niveau, les workers explicitement
+ d�finis ne poss�dent aucune notion de mandataire direct ou
+ inverse. Ils encapsulent un concept de communication commun avec
+ les serveurs originaux. Un worker cr�� via la directive <code class="directive"><a href="#proxypass">ProxyPass</a></code> pour �tre utilis� dans le
+ cadre d'un mandataire inverse sera aussi utilis� dans le cadre
+ d'un mandataire directe chaque fois que l'URL vers le serveur
+ original correspondra � l'URL du worker, et vice versa.</p>
+
+ <p>L'URL qui identifie un worker correspond � l'URL de son serveur
+ original, y compris un �ventuel chemin donn� :</p>
+
+ <pre class="prettyprint lang-config">ProxyPass /examples http://backend.example.com/examples
+ProxyPass /docs http://backend.example.com/docs</pre>
+
+
+ <p>Dans cet exemple, deux workers diff�rents sont d�finis, chacun
+ d'eux utilisant des configurations et jeux de connexions
+ s�par�s.</p>
+
+ <div class="warning"><h3>Partage de workers</h3>
+ <p>Le partage de workers intervient lorsque les URLs des workers
+ s'entrecoupent, ce qui arrive lorsque l'URL d'un worker
+ correspond au d�but de l'URL d'un autre worker d�fini plus loin
+ dans le fichier de configuration. Dans l'exemple suivant,</p>
+
+ <pre class="prettyprint lang-config">ProxyPass /apps http://backend.example.com/ timeout=60
+ProxyPass /examples http://backend.example.com/examples timeout=10</pre>
+
+
+ <p>le second worker n'est pas vraiment cr��. C'est le premier
+ worker qui est en fait utilis�. L'avantage de ceci r�side dans
+ le fait qu'il n'existe qu'un seul jeu de connexions, ces
+ derni�res �tant donc r�utilis�es plus souvent. Notez que tous
+ les attributs de configuration d�finis explicitement pour le
+ deuxi�me worker seront ignor�s, ce qui sera journalis� en tant
+ qu'avertissement. Ainsi, dans l'exemple ci-dessus, la valeur de
+ timeout retenue pour l'URL <code>/exemples</code> sera
+ <code>60</code>, et non <code>10</code> !</p>
+
+ <p>Si vous voulez emp�cher le partage de workers, classez vos
+ d�finitions de workers selon la longueur des URLs, de la plus
+ longue � la plus courte. Si au contraire vous voulez favoriser
+ ce partage, utilisez l'ordre de classement inverse. Voir aussi
+ l'avertissement � propos de l'ordre de classement des directives
+ <code class="directive"><a href="#proxypass">ProxyPass</a></code>.</p>
+
+ </div>
+
+ <p>Les workers d�finis explicitement sont de deux sortes :
+ <dfn>workers directs</dfn> et <dfn>workers de r�partition (de
+ charge)</dfn>. Ils supportent de nombreux attributs de
+ configuration importants d�crits dans la directive <code class="directive"><a href="#proxypass">ProxyPass</a></code>. Ces m�mes attributs
+ peuvent aussi �tre d�finis via la directive <code class="directive"><a href="#proxyset">ProxySet</a></code>.</p>
+
+ <p>Le jeu d'options disponibles pour un worker direct d�pend du
+ protocole sp�cifi� dans l'URL du serveur original. Les protocoles
+ disponibles comprennent <code>ajp</code>, <code>fcgi</code>,
+ <code>ftp</code>, <code>http</code> et <code>scgi</code>.</p>
+
+ <p>Les workers de r�partition sont des workers virtuels qui
+ utilisent les workers directs, connus comme faisant partie de leurs
+ membres, pour le traitement effectif des requ�tes. Chaque
+ r�partiteur peut comporter plusieurs membres. Lorsqu'il traite une
+ requ�te, il choisit un de ses membres en fonction de l'algorithme
+ de r�partition de charge d�fini.</p>
+
+ <p>Un worker de r�partition est cr�� si son URL de worker comporte
+ <code>balancer</code> comme indicateur de protocole. L'URL du
+ r�partiteur permet d'identifier de mani�re unique le worker de
+ r�partition. La directive <code class="directive"><a href="#balancermember">BalancerMember</a></code> permet d'ajouter des
+ membres au r�partiteur.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="access" id="access">Contr�ler l'acc�s � votre
+ mandataire</a></h2>
+ <p>Vous pouvez restreindre l'acc�s � votre mandataire via le bloc
+ de contr�le <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> comme dans
+ l'exemple suivant :</p>
+
+ <pre class="prettyprint lang-config">&lt;Proxy *&gt;
+ Require ip 192.168.0
+&lt;/Proxy&gt;</pre>
+
+
+ <p>Pour plus de d�tails sur les directives de contr�le d'acc�s,
+ voir la documentation du module
+ <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>.</p>
+
+ <p>Restreindre l'acc�s de mani�re stricte est essentiel si vous
+ mettez en oeuvre un mandataire direct (en d�finissant la directive
+ <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> � "on").
+ Dans le cas contraire, votre serveur pourrait �tre utilis� par
+ n'importe quel client pour acc�der � des serveurs quelconques,
+ tout en masquant sa v�ritable identit�. Ceci repr�sente un danger
+ non seulement pour votre r�seau, mais aussi pour l'Internet au
+ sens large. Dans le cas de la mise en oeuvre d'un mandataire
+ inverse (en utilisant la directive <code class="directive"><a href="#proxypass">ProxyPass</a></code> avec <code>ProxyRequests Off</code>), le contr�le
+ d'acc�s est moins critique car les clients ne peuvent contacter
+ que les serveurs que vous avez sp�cifi�s.</p>
+
+ <p><strong>Voir aussi</strong> la variable d'environnement <a href="mod_proxy_http.html#env">Proxy-Chain-Auth</a>.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="startup" id="startup">Ralentissement au d�marrage</a></h2>
+ <p>Si vous utilisez la directive <code class="directive"><a href="#proxyblock">ProxyBlock</a></code>, les noms d'h�tes sont r�solus en adresses
+ IP puis ces derni�res mises en cache au cours du d�marrage
+ � des fins de tests de comparaisons ult�rieurs. Ce processus peut
+ durer plusieurs secondes (ou d'avantage) en fonction de la vitesse
+ � laquelle s'effectue la r�solution des noms d'h�tes.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="intranet" id="intranet">Mandataire en Intranet</a></h2>
+ <p>Un serveur mandataire Apache httpd situ� � l'int�rieur d'un Intranet
+ doit faire suivre les requ�tes destin�es � un serveur externe �
+ travers le pare-feu de l'entreprise (pour ce faire, d�finissez la
+ directive <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> de
+ fa�on � ce qu'elle fasse suivre le <var>protocole</var> concern�
+ vers le mandataire du pare-feu). Cependant, lorsqu'il doit acc�der
+ � des ressources situ�es dans l'Intranet, il peut se passer du
+ pare-feu pour acc�der aux serveurs. A cet effet, la directive
+ <code class="directive"><a href="#noproxy">NoProxy</a></code> permet de
+ sp�cifier quels h�tes appartiennent � l'Intranet et peuvent donc
+ �tre acc�d�s directement.</p>
+
+ <p>Les utilisateurs d'un Intranet ont tendance � oublier le nom du
+ domaine local dans leurs requ�tes WWW, et demandent par exemple
+ "http://un-serveur/" au lieu de
+ <code>http://un-serveur.example.com/</code>. Certains serveurs
+ mandataires commerciaux acceptent ce genre de requ�te et les
+ traitent simplement en utilisant un nom de domaine local
+ implicite. Lorsque la directive <code class="directive"><a href="#proxydomain">ProxyDomain</a></code> est utilis�e et si le
+ serveur est <a href="#proxyrequests">configur� comme
+ mandataire</a>, Apache httpd peut renvoyer une r�ponse de redirection et
+ ainsi fournir au client l'adresse de serveur correcte,
+ enti�rement qualifi�e. C'est la m�thode � privil�gier car le
+ fichier des marque-pages de l'utilisateur contiendra alors des
+ noms de serveurs enti�rement qualifi�s.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="envsettings" id="envsettings">Ajustements relatifs au
+ protocole</a></h2>
+ <p>Pour les cas o� <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> envoie des requ�tes
+ vers un serveur qui n'impl�mente pas correctement les connexions
+ persistantes ou le protocole HTTP/1.1, il existe deux variables
+ d'environnement qui permettent de forcer les requ�tes � utiliser
+ le protocole HTTP/1.0 avec connexions non persistantes. Elles
+ peuvent �tre d�finies via la directive <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code>.</p>
+
+ <p>Il s'agit des variables <code>force-proxy-request-1.0</code> et
+ <code>proxy-nokeepalive</code>.</p>
+
+ <pre class="prettyprint lang-config">&lt;Location /buggyappserver/&gt;
+ ProxyPass http://buggyappserver:7001/foo/
+ SetEnv force-proxy-request-1.0 1
+ SetEnv proxy-nokeepalive 1
+&lt;/Location&gt;</pre>
+
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="request-bodies" id="request-bodies">Corps de requ�tes</a></h2>
+
+ <p>Certaines m�thodes de requ�tes comme POST comportent un corps de
+ requ�te. Le protocole HTTP stipule que les requ�tes qui comportent
+ un corps doivent soit utiliser un codage de transmission
+ fractionn�e (chunked transfer encoding), soit envoyer un en-t�te de requ�te
+ <code>Content-Length</code>. Lorsqu'il fait suivre ce genre de
+ requ�te vers le serveur demand�, <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>
+ s'efforce toujours d'envoyer l'en-t�te <code>Content-Length</code>.
+ Par contre, si la taille du corps est importante, et si la requ�te
+ originale utilise un codage � fractionnement, ce dernier peut aussi
+ �tre utilis� dans la requ�te montante. Ce comportement peut �tre
+ contr�l� � l'aide de <a href="../env.html">variables
+ d'environnement</a>. Ainsi, si elle est d�finie, la variable
+ <code>proxy-sendcl</code> assure une compatibilit� maximale avec les
+ serveurs demand�s en imposant l'envoi de l'en-t�te
+ <code>Content-Length</code>, alors que
+ <code>proxy-sendchunked</code> diminue la consommation de ressources
+ en imposant l'utilisation d'un codage � fractionnement.</p>
+
+ <p>Dans certaines circonstances, le serveur doit mettre en file
+ d'attente sur disque les corps de requ�tes afin de satisfaire le
+ traitement demand� des corps de requ�tes. Par exemple, cette mise en
+ file d'attente se produira si le corps original a �t� envoy� selon un
+ codage morcel� (et poss�de une taille importante), alors que
+ l'administrateur a demand� que les requ�tes du serveur
+ d'arri�re-plan soient envoy�es avec l'en-t�te Content-Length ou en
+ HTTP/1.0. Cette mise en file d'attente se produira aussi si le corps
+ de la requ�te contient d�j� un en-t�te Content-Length, alors que le
+ serveur est configur� pour filtrer les corps des requ�tes entrantes.</p>
+
+ <p>La directive <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code> ne s'applique qu'aux
+ corps de requ�tes que le serveur met en file d'attente sur disque.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="x-headers" id="x-headers">En-t�tes de requ�te du mandataire
+ inverse</a></h2>
+
+ <p>Lorsqu'il est configur� en mode mandataire inverse (en utilisant
+ par exemple la directive <code class="directive"><a href="#proxypass">ProxyPass</a></code>),
+ <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> ajoute plusieurs en-t�tes de requ�te
+ afin de transmettre des informations au serveur demand�. Ces
+ en-t�tes sont les suivants :</p>
+
+ <dl>
+ <dt><code>X-Forwarded-For</code></dt>
+ <dd>L'adresse IP du client.</dd>
+ <dt><code>X-Forwarded-Host</code></dt>
+ <dd>L'h�te d'origine demand� par le client dans l'en-t�te de
+ requ�te HTTP <code>Host</code>.</dd>
+ <dt><code>X-Forwarded-Server</code></dt>
+ <dd>Le nom d'h�te du serveur mandataire.</dd>
+ </dl>
+
+ <p>Ces en-t�tes doivent �tre utilis�s avec pr�cautions sur le
+ serveur demand�, car ils contiendront plus d'une valeur (s�par�es
+ par des virgules) si la requ�te originale contenait d�j� un de ces
+ en-t�tes. Par exemple, vous pouvez utiliser
+ <code>%{X-Forwarded-For}i</code> dans la cha�ne de format du journal
+ du serveur demand� pour enregistrer les adresses IP des clients
+ originaux, mais il est possible que vous obteniez plusieurs adresses
+ si la requ�te passe � travers plusieurs mandataires.</p>
+
+ <p>Voir aussi les directives <code class="directive"><a href="#proxypreservehost">ProxyPreserveHost</a></code> et <code class="directive"><a href="#proxyvia">ProxyVia</a></code> directives, qui permettent
+ de contr�ler d'autres en-t�tes de requ�te.</p>
+
+ <p>Note : Si vous devez ajouter des en-t�tes particuliers � la
+ requ�te mandat�e, utilisez la directive <code class="directive"><a href="../mod/mod_headers.html#requestheader">RequestHeader</a></code>.</p>
+
+ </div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_proxy.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy.html.ja.utf8 b/docs/manual/mod/mod_proxy.html.ja.utf8
index 7a1563c543..b2cbacad31 100644
--- a/docs/manual/mod/mod_proxy.html.ja.utf8
+++ b/docs/manual/mod/mod_proxy.html.ja.utf8
@@ -121,195 +121,6 @@
<li><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="forwardreverse" id="forwardreverse">フォワードプロキシとリバースプロキシ</a></h2>
- <p>Apache は<dfn>フォワード</dfn>プロキシとしても、
- <dfn>リバース</dfn>プロキシとしても設定することができます。</p>
-
- <p>通常の<dfn>フォワードプロキシ</dfn>はクライアントと
- <em>オリジンサーバ</em> <span class="transnote">(<em>訳注:</em> コンテンツ生成元のサーバ)</span>
- の間に位置する中間サーバです。
- オリジンサーバからコンテンツを取得する過程では、クライアントは
- 行き先としてオリジンサーバを指定しつつプロキシにリクエストを送り、
- プロキシはオリジンサーバからコンテンツ取得のリクエストを送り、
- コンテンツが取得できればそれをクライアントに返します。
- クライアントが他のサイトにフォワードプロクシ経由でアクセスするには、
- 特別にそれ用の設定をしなければなりません。</p>
-
- <p>フォワードプロキシの一般的な使用方法は、ファイアウォールによって
- 制限されている内部のクライアントにインターネットへのアクセスを
- 提供するものです。フォワードプロキシはネットワークの使用量を
- 減らすために (<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> で提供されている)
- キャッシュ機能を用いることもできます。</p>
-
- <p>フォワードプロキシは <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ディレクティブで
- 有効になります。フォワードプロキシでは、クライアントは本当の身元を
- 隠して任意のサイトにアクセスできるようになるため、フォワードプロキシを
- 有効にする前に、承認されたクライアントのみがプロキシにアクセスできるように
- <a href="#access">サーバを安全にする</a>ことが重要です。</p>
-
- <p>一方<dfn>リバースプロキシ</dfn>は、クライアントには普通の
- ウェブサーバのように見えます。クライアント側に特別な設定は必要ありません。
- クライアントはリバースプロキシの名前空間に対して通常のコンテンツへの
- リクエストを行ないます。プロキシはリクエストをどこに送れば良いかを判定し、
- あたかも自分自身がオリジンサーバであったかのようにクライアントに
- コンテンツを返します。</p>
-
- <p>リバースプロキシのよくある利用方法は、インターネットユーザに
- ファイアウォールの中にあるサーバにアクセスを与えるというものです。
- リバースプロキシは複数のバックエンドサーバへ負荷分散をするために
- 使ったり、遅いバックエンドエンドサーバのためにキャッシュ機能を提供したり
- するために使えます。また、リバースプロキシは複数のサーバを
- 同じ URL 空間にまとめるために使うこともできます。</p>
-
- <p>リバースプロキシは <code class="directive"><a href="#proxypass">ProxyPass</a></code> ディレクティブや
- <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> ディレクティブの
- <code>[P]</code> フラグを使うことで有効になります。リバースプロキシの
- 設定のために <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> を設定する必要は
- <em>ありません</em>。</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">基本の例</a></h2>
-
- <p>以下の例は手始めの簡単な例です。個々のディレクティブの意味は
- それぞれの説明をお読みください。</p>
-
- <p>またキャッシュ機能を有効にしたい場合は、<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>
- の説明を読んでください。</p>
-
- <div class="example"><h3>フォワードプロキシ</h3><p><code>
- ProxyRequests On<br />
- ProxyVia On<br />
- <br />
- &lt;Proxy *&gt;<br />
- <span class="indent">
- Order deny,allow<br />
- Deny from all<br />
- Allow from internal.example.com<br />
- </span>
- &lt;/Proxy&gt;
- </code></p></div>
-
- <div class="example"><h3>リバースプロキシ</h3><p><code>
- ProxyRequests Off<br />
- <br />
- &lt;Proxy *&gt;<br />
- <span class="indent">
- Order deny,allow<br />
- Allow from all<br />
- </span>
- &lt;/Proxy&gt;<br />
- <br />
- ProxyPass /foo http://foo.example.com/bar<br />
- ProxyPassReverse /foo http://foo.example.com/bar
- </code></p></div>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="access" id="access">プロキシへのアクセス制御</a></h2>
- <p>プロキシのアクセスは以下のように <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> コンテナの中に
- ディレクティブを書くことで制御できます:</p>
-
- <div class="example"><p><code>
- &lt;Proxy *&gt;<br />
- <span class="indent">
- Order Deny,Allow<br />
- Deny from all<br />
- Allow from 192.168.0<br />
- </span>
- &lt;/Proxy&gt;
- </code></p></div>
-
- <p>アクセス制御のためのディレクティブのより詳しい情報は
- <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> をお読みください。</p>
-
- <p>(<code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ディレクティブを
- 使って) フォワードプロキシを設定している場合は、厳しくアクセス
- 制限を行なうことが非常に大切です。そうしないと、任意のクライアントが
- 身元を明かすことなく任意のホストにアクセスするためにサーバを使うことが
- できてしまいます。これはあなた自身のネットワークにとっても、インターネット
- 全体にとっても危険なことです。(<code>ProxyRequests Off</code> にして
- <code class="directive"><a href="#proxypass">ProxyPass</a></code> ディレクティブを使って)
- リバースプロキシを使っている場合には、クライアントはあなたが明示的に
- 設定したホストにしかアクセスできないため、フォワードプロキシのとき
- ほどアクセス制御に力を注がなくても大丈夫です。</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="startup" id="startup">遅い起動</a></h2>
- <p><code class="directive"><a href="#proxyblock">ProxyBlock</a></code> ディレクティブを使っている場合、
- 後のテストのために起動時にホストの
- IP アドレスが調べられてキャッシュされます。ホスト名のルックアップの
- 速さによっては、数秒 (かそれ以上) かかるかもしれません。</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="intranet" id="intranet">イントラネットプロキシ</a></h2>
- <p>イントラネットにある Apache プロキシサーバは外部へのリクエストを
- 会社のファイアウォールを通して送らなければなりません。(このためには
- 個々の <var>scheme</var> についてそれぞれ、ファイアウォールの
- プロキシにフォワードされるように
- <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> ディレクティブを
- 設定してください)。しかしイントラネット内のリソースにアクセスするときは、
- ファイアウォールを通さないでもアクセスできます。
- どのホストがイントラネットに属し、直接アクセスすべきかを指定するには、
- <code class="directive"><a href="#noproxy">NoProxy</a></code> ディレクティブが
- 役に立ちます。</p>
-
- <p>イントラネット内のユーザは WWW のリクエストでローカルドメインを
- 省略することがよくあります。<code>http://somehost.example.com/</code>
- というリクエストの代わりに "http://somehost/" をリクエストしたりします。
- このようなリクエストを受け付け、サーバに設定されているローカルドメインが
- 暗黙のうちに使われていると解釈して、単純にリクエストを処理するものも
- 商用プロキシサーバの中にはあります。
- サーバが <a href="#proxyrequests">プロキシのサービス用に設定されていて</a>
- <code class="directive"><a href="#proxydomain">ProxyDomain</a></code> ディレクティブが
- 使用された場合には、Apache はクライアントにリダイレクト応答を送って、
- 正しい、完全な (<span class="transnote">(<em>訳注:</em> fully qualified)</span>)
- サーバのアドレスに送ることができます。このように
- リダイレクトすると、ユーザのブックマークが正しい完全なホスト名を含む
- ことにもなるため、より好ましい方法と言えるでしょう。</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="envsettings" id="envsettings">プロトコルの調整</a></h2>
- <p>Keepalive や HTTP/1.1 を適切に実装していないアプリケーションサーバに対して
- <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> がリクエストを送信する場合、
- HTTP/1.0 を使って keepalive を無しにしてリクエストを送るようにする
- 環境変数が二つあります。これらは <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code> ディレクティブで設定します。</p>
-
- <p><code>force-proxy-request-1.0</code> と <code>proxy-nokeepalive</code>
- がその環境変数です。</p>
-
- <div class="example"><p><code>
- &lt;Location /buggyappserver/&gt;<br />
- <span class="indent">
- ProxyPass http://buggyappserver:7001/foo/<br />
- SetEnv force-proxy-request-1.0 1<br />
- SetEnv proxy-nokeepalive 1<br />
- </span>
- &lt;/Location&gt;
- </code></p></div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="request-bodies" id="request-bodies">リクエストボディ</a></h2>
-
- <p>POST メソッドなどのリクエストには、リクエストボディがあります。
- HTTP プロトコル仕様によると、ボディのあるリクエストは chunked
- 転送を使うか、<code>Content-Length</code>
- ヘッダを送信しなければなりません。
- このようなリクエストをオリジンサーバに送信する場合、
- <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> は常に <code>Content-Length</code>
- を送ろうと試みます。しかし。ボディが大きく、オリジナルのリクエストで
- chunked 転送が使われている場合、上流へのリクエストに
- chunked 転送も使われます。
- この挙動は <a href="../env.html">環境変数</a>で制御できます。
- <code>proxy-sendcl</code> を設定すると、可能な限り常に
- <code>Content-Length</code> を付与して、
- 上流サーバに送信するようになります。
- 逆に <code>proxy-sendchunked</code> を設定すると、リソース消費を抑え、
- chnked エンコードを使って送信するようになります。</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="BalancerGrowth" id="BalancerGrowth">BalancerGrowth</a> <a name="balancergrowth" id="balancergrowth">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Number of additional Balancers that can be added Post-configuration</td></tr>
@@ -1240,6 +1051,195 @@ URL を調整する</td></tr>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="forwardreverse" id="forwardreverse">フォワードプロキシとリバースプロキシ</a></h2>
+ <p>Apache は<dfn>フォワード</dfn>プロキシとしても、
+ <dfn>リバース</dfn>プロキシとしても設定することができます。</p>
+
+ <p>通常の<dfn>フォワードプロキシ</dfn>はクライアントと
+ <em>オリジンサーバ</em> <span class="transnote">(<em>訳注:</em> コンテンツ生成元のサーバ)</span>
+ の間に位置する中間サーバです。
+ オリジンサーバからコンテンツを取得する過程では、クライアントは
+ 行き先としてオリジンサーバを指定しつつプロキシにリクエストを送り、
+ プロキシはオリジンサーバからコンテンツ取得のリクエストを送り、
+ コンテンツが取得できればそれをクライアントに返します。
+ クライアントが他のサイトにフォワードプロクシ経由でアクセスするには、
+ 特別にそれ用の設定をしなければなりません。</p>
+
+ <p>フォワードプロキシの一般的な使用方法は、ファイアウォールによって
+ 制限されている内部のクライアントにインターネットへのアクセスを
+ 提供するものです。フォワードプロキシはネットワークの使用量を
+ 減らすために (<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> で提供されている)
+ キャッシュ機能を用いることもできます。</p>
+
+ <p>フォワードプロキシは <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ディレクティブで
+ 有効になります。フォワードプロキシでは、クライアントは本当の身元を
+ 隠して任意のサイトにアクセスできるようになるため、フォワードプロキシを
+ 有効にする前に、承認されたクライアントのみがプロキシにアクセスできるように
+ <a href="#access">サーバを安全にする</a>ことが重要です。</p>
+
+ <p>一方<dfn>リバースプロキシ</dfn>は、クライアントには普通の
+ ウェブサーバのように見えます。クライアント側に特別な設定は必要ありません。
+ クライアントはリバースプロキシの名前空間に対して通常のコンテンツへの
+ リクエストを行ないます。プロキシはリクエストをどこに送れば良いかを判定し、
+ あたかも自分自身がオリジンサーバであったかのようにクライアントに
+ コンテンツを返します。</p>
+
+ <p>リバースプロキシのよくある利用方法は、インターネットユーザに
+ ファイアウォールの中にあるサーバにアクセスを与えるというものです。
+ リバースプロキシは複数のバックエンドサーバへ負荷分散をするために
+ 使ったり、遅いバックエンドエンドサーバのためにキャッシュ機能を提供したり
+ するために使えます。また、リバースプロキシは複数のサーバを
+ 同じ URL 空間にまとめるために使うこともできます。</p>
+
+ <p>リバースプロキシは <code class="directive"><a href="#proxypass">ProxyPass</a></code> ディレクティブや
+ <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> ディレクティブの
+ <code>[P]</code> フラグを使うことで有効になります。リバースプロキシの
+ 設定のために <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> を設定する必要は
+ <em>ありません</em>。</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">基本の例</a></h2>
+
+ <p>以下の例は手始めの簡単な例です。個々のディレクティブの意味は
+ それぞれの説明をお読みください。</p>
+
+ <p>またキャッシュ機能を有効にしたい場合は、<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>
+ の説明を読んでください。</p>
+
+ <div class="example"><h3>フォワードプロキシ</h3><p><code>
+ ProxyRequests On<br />
+ ProxyVia On<br />
+ <br />
+ &lt;Proxy *&gt;<br />
+ <span class="indent">
+ Order deny,allow<br />
+ Deny from all<br />
+ Allow from internal.example.com<br />
+ </span>
+ &lt;/Proxy&gt;
+ </code></p></div>
+
+ <div class="example"><h3>リバースプロキシ</h3><p><code>
+ ProxyRequests Off<br />
+ <br />
+ &lt;Proxy *&gt;<br />
+ <span class="indent">
+ Order deny,allow<br />
+ Allow from all<br />
+ </span>
+ &lt;/Proxy&gt;<br />
+ <br />
+ ProxyPass /foo http://foo.example.com/bar<br />
+ ProxyPassReverse /foo http://foo.example.com/bar
+ </code></p></div>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="access" id="access">プロキシへのアクセス制御</a></h2>
+ <p>プロキシのアクセスは以下のように <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> コンテナの中に
+ ディレクティブを書くことで制御できます:</p>
+
+ <div class="example"><p><code>
+ &lt;Proxy *&gt;<br />
+ <span class="indent">
+ Order Deny,Allow<br />
+ Deny from all<br />
+ Allow from 192.168.0<br />
+ </span>
+ &lt;/Proxy&gt;
+ </code></p></div>
+
+ <p>アクセス制御のためのディレクティブのより詳しい情報は
+ <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> をお読みください。</p>
+
+ <p>(<code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ディレクティブを
+ 使って) フォワードプロキシを設定している場合は、厳しくアクセス
+ 制限を行なうことが非常に大切です。そうしないと、任意のクライアントが
+ 身元を明かすことなく任意のホストにアクセスするためにサーバを使うことが
+ できてしまいます。これはあなた自身のネットワークにとっても、インターネット
+ 全体にとっても危険なことです。(<code>ProxyRequests Off</code> にして
+ <code class="directive"><a href="#proxypass">ProxyPass</a></code> ディレクティブを使って)
+ リバースプロキシを使っている場合には、クライアントはあなたが明示的に
+ 設定したホストにしかアクセスできないため、フォワードプロキシのとき
+ ほどアクセス制御に力を注がなくても大丈夫です。</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="startup" id="startup">遅い起動</a></h2>
+ <p><code class="directive"><a href="#proxyblock">ProxyBlock</a></code> ディレクティブを使っている場合、
+ 後のテストのために起動時にホストの
+ IP アドレスが調べられてキャッシュされます。ホスト名のルックアップの
+ 速さによっては、数秒 (かそれ以上) かかるかもしれません。</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="intranet" id="intranet">イントラネットプロキシ</a></h2>
+ <p>イントラネットにある Apache プロキシサーバは外部へのリクエストを
+ 会社のファイアウォールを通して送らなければなりません。(このためには
+ 個々の <var>scheme</var> についてそれぞれ、ファイアウォールの
+ プロキシにフォワードされるように
+ <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> ディレクティブを
+ 設定してください)。しかしイントラネット内のリソースにアクセスするときは、
+ ファイアウォールを通さないでもアクセスできます。
+ どのホストがイントラネットに属し、直接アクセスすべきかを指定するには、
+ <code class="directive"><a href="#noproxy">NoProxy</a></code> ディレクティブが
+ 役に立ちます。</p>
+
+ <p>イントラネット内のユーザは WWW のリクエストでローカルドメインを
+ 省略することがよくあります。<code>http://somehost.example.com/</code>
+ というリクエストの代わりに "http://somehost/" をリクエストしたりします。
+ このようなリクエストを受け付け、サーバに設定されているローカルドメインが
+ 暗黙のうちに使われていると解釈して、単純にリクエストを処理するものも
+ 商用プロキシサーバの中にはあります。
+ サーバが <a href="#proxyrequests">プロキシのサービス用に設定されていて</a>
+ <code class="directive"><a href="#proxydomain">ProxyDomain</a></code> ディレクティブが
+ 使用された場合には、Apache はクライアントにリダイレクト応答を送って、
+ 正しい、完全な (<span class="transnote">(<em>訳注:</em> fully qualified)</span>)
+ サーバのアドレスに送ることができます。このように
+ リダイレクトすると、ユーザのブックマークが正しい完全なホスト名を含む
+ ことにもなるため、より好ましい方法と言えるでしょう。</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="envsettings" id="envsettings">プロトコルの調整</a></h2>
+ <p>Keepalive や HTTP/1.1 を適切に実装していないアプリケーションサーバに対して
+ <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> がリクエストを送信する場合、
+ HTTP/1.0 を使って keepalive を無しにしてリクエストを送るようにする
+ 環境変数が二つあります。これらは <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code> ディレクティブで設定します。</p>
+
+ <p><code>force-proxy-request-1.0</code> と <code>proxy-nokeepalive</code>
+ がその環境変数です。</p>
+
+ <div class="example"><p><code>
+ &lt;Location /buggyappserver/&gt;<br />
+ <span class="indent">
+ ProxyPass http://buggyappserver:7001/foo/<br />
+ SetEnv force-proxy-request-1.0 1<br />
+ SetEnv proxy-nokeepalive 1<br />
+ </span>
+ &lt;/Location&gt;
+ </code></p></div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="request-bodies" id="request-bodies">リクエストボディ</a></h2>
+
+ <p>POST メソッドなどのリクエストには、リクエストボディがあります。
+ HTTP プロトコル仕様によると、ボディのあるリクエストは chunked
+ 転送を使うか、<code>Content-Length</code>
+ ヘッダを送信しなければなりません。
+ このようなリクエストをオリジンサーバに送信する場合、
+ <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> は常に <code>Content-Length</code>
+ を送ろうと試みます。しかし。ボディが大きく、オリジナルのリクエストで
+ chunked 転送が使われている場合、上流へのリクエストに
+ chunked 転送も使われます。
+ この挙動は <a href="../env.html">環境変数</a>で制御できます。
+ <code>proxy-sendcl</code> を設定すると、可能な限り常に
+ <code>Content-Length</code> を付与して、
+ 上流サーバに送信するようになります。
+ 逆に <code>proxy-sendchunked</code> を設定すると、リソース消費を抑え、
+ chnked エンコードを使って送信するようになります。</p>
+
+ </div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_proxy.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_connect.html.en b/docs/manual/mod/mod_proxy_connect.html.en
index c78488e4c8..7174cc7fa5 100644
--- a/docs/manual/mod/mod_proxy_connect.html.en
+++ b/docs/manual/mod/mod_proxy_connect.html.en
@@ -66,19 +66,6 @@
<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="notes" id="notes">Request notes</a></h2>
- <p><code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code> creates the following request notes for
- logging using the <code>%{VARNAME}n</code> format in
- <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> or
- <code class="directive"><a href="../mod/core.html#errorlogformat">ErrorLogFormat</a></code>:
- </p>
- <dl>
- <dt>proxy-source-port</dt>
- <dd>The local port used for the connection to the backend server.</dd>
- </dl>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AllowCONNECT" id="AllowCONNECT">AllowCONNECT</a> <a name="allowconnect" id="allowconnect">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ports that are allowed to <code>CONNECT</code> through the
@@ -103,6 +90,19 @@ Port ranges available since Apache 2.3.7.</td></tr>
allow connections to the listed ports only.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="notes" id="notes">Request notes</a></h2>
+ <p><code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code> creates the following request notes for
+ logging using the <code>%{VARNAME}n</code> format in
+ <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> or
+ <code class="directive"><a href="../mod/core.html#errorlogformat">ErrorLogFormat</a></code>:
+ </p>
+ <dl>
+ <dt>proxy-source-port</dt>
+ <dd>The local port used for the connection to the backend server.</dd>
+ </dl>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_connect.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_connect.html.fr b/docs/manual/mod/mod_proxy_connect.html.fr
index 6f1ef52054..974b628de3 100644
--- a/docs/manual/mod/mod_proxy_connect.html.fr
+++ b/docs/manual/mod/mod_proxy_connect.html.fr
@@ -69,19 +69,6 @@ des requ�tes <code>CONNECT</code></td></tr>
<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="notes" id="notes">Informations sur les requ�tes</a></h2>
- <p><code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code> enregistre les informations
- suivantes pour journalisation via le format <code>%{NOMVAR}n</code>
- dans les directives <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> ou <code class="directive"><a href="../mod/core.html#errorlogformat">ErrorLogFormat</a></code> :
- </p>
- <dl>
- <dt>proxy-source-port</dt>
- <dd>Le port local utilis� pour la connexion vers le serveur
- d'arri�re-plan.</dd>
- </dl>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="allowconnect" id="allowconnect">Directive</a> <a name="AllowCONNECT" id="AllowCONNECT">AllowCONNECT</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ports autoris�s � se <code>CONNECT</code>er � travers le
@@ -109,6 +96,19 @@ d'Apache 2.3.5. Plages de ports disponibles depuis Apache 2.3.7.</td></tr>
vers les ports sp�cifi�s.</p>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="notes" id="notes">Informations sur les requ�tes</a></h2>
+ <p><code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code> enregistre les informations
+ suivantes pour journalisation via le format <code>%{NOMVAR}n</code>
+ dans les directives <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> ou <code class="directive"><a href="../mod/core.html#errorlogformat">ErrorLogFormat</a></code> :
+ </p>
+ <dl>
+ <dt>proxy-source-port</dt>
+ <dd>Le port local utilis� pour la connexion vers le serveur
+ d'arri�re-plan.</dd>
+ </dl>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_proxy_connect.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_connect.html.ja.utf8 b/docs/manual/mod/mod_proxy_connect.html.ja.utf8
index afdb340c04..8b8d00c872 100644
--- a/docs/manual/mod/mod_proxy_connect.html.ja.utf8
+++ b/docs/manual/mod/mod_proxy_connect.html.ja.utf8
@@ -63,7 +63,6 @@
<li><code class="directive"><a href="../mod/mod_proxy.html#allowconnect">AllowCONNECT</a></code></li>
<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="AllowCONNECT" id="AllowCONNECT">AllowCONNECT</a> <a name="allowconnect" id="allowconnect">ディレクティブ</a></h2>
<table class="directive">
@@ -80,6 +79,7 @@ Port ranges available since Apache 2.3.7.</td></tr>
</table><p>このディレクティブの解説文書は
まだ翻訳されていません。英語版をご覧ください。
</p></div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_proxy_connect.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_express.html.en b/docs/manual/mod/mod_proxy_express.html.en
index 6eb52c1f75..3d7975e69d 100644
--- a/docs/manual/mod/mod_proxy_express.html.en
+++ b/docs/manual/mod/mod_proxy_express.html.en
@@ -87,7 +87,6 @@
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ProxyExpressDBMFile" id="ProxyExpressDBMFile">ProxyExpressDBMFile</a> <a name="proxyexpressdbmfile" id="proxyexpressdbmfile">Directive</a></h2>
<table class="directive">
@@ -171,6 +170,7 @@
controls whether the module will be active.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_express.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_express.html.fr b/docs/manual/mod/mod_proxy_express.html.fr
index de0ec83819..ee6fc7d979 100644
--- a/docs/manual/mod/mod_proxy_express.html.fr
+++ b/docs/manual/mod/mod_proxy_express.html.fr
@@ -93,7 +93,6 @@ dynamique inverse de masse</td></tr>
<ul class="seealso">
<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="proxyexpressdbmfile" id="proxyexpressdbmfile">Directive</a> <a name="ProxyExpressDBMFile" id="ProxyExpressDBMFile">ProxyExpressDBMFile</a></h2>
<table class="directive">
@@ -177,6 +176,7 @@ dynamique inverse de masse</td></tr>
d'activer/d�sactiver le module.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_proxy_express.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_ftp.html.en b/docs/manual/mod/mod_proxy_ftp.html.en
index 07711274a7..ca0d91576f 100644
--- a/docs/manual/mod/mod_proxy_ftp.html.en
+++ b/docs/manual/mod/mod_proxy_ftp.html.en
@@ -72,6 +72,63 @@
<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyFtpDirCharset" id="ProxyFtpDirCharset">ProxyFtpDirCharset</a> <a name="proxyftpdircharset" id="proxyftpdircharset">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define the character set for proxied FTP listings</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyFtpDirCharset <var>character set</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyFtpDirCharset ISO-8859-1</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_proxy_ftp</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.2.7 and later. Moved from <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> in Apache 2.3.5.</td></tr>
+</table>
+ <p>The <code class="directive">ProxyFtpDirCharset</code> directive defines the
+ character set to be set for FTP directory listings in HTML generated by
+ <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code>.</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="ProxyFtpEscapeWildcards" id="ProxyFtpEscapeWildcards">ProxyFtpEscapeWildcards</a> <a name="proxyftpescapewildcards" id="proxyftpescapewildcards">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Whether wildcards in requested filenames are escaped when sent to the FTP server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyFtpEscapeWildcards [on|off]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_proxy_ftp</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.3 and later</td></tr>
+</table>
+ <p>The <code class="directive">ProxyFtpEscapeWildcards</code> directive
+ controls whether wildcard characters ("*?[{~") in requested
+ filenames are escaped with backslash before sending them to the
+ FTP server. That is the default behavior, but many FTP servers
+ don't know about the escaping and try to serve the literal filenames
+ they were sent, including the backslashes in the names. </p>
+ <p>Set to "off" to allow downloading files with wildcards
+ in their names from FTP servers that don't understand wildcard
+ escaping.</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="ProxyFtpListOnWildcard" id="ProxyFtpListOnWildcard">ProxyFtpListOnWildcard</a> <a name="proxyftplistonwildcard" id="proxyftplistonwildcard">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Whether wildcards in requested filenames trigger a file listing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyFtpListOnWildcard [on|off]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_proxy_ftp</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.3 and later</td></tr>
+</table>
+ <p>The <code class="directive">ProxyFtpListOnWildcard</code> directive
+ controls whether wildcard characters ("*?[{~") in requested
+ filenames cause <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code> to return a listing
+ of files instead of downloading a file. By default (value on),
+ they do. Set to "off" to allow downloading files even if they
+ have wildcard characters in their names.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="mimetypes" id="mimetypes">Why doesn't file type <var>xxx</var>
download via FTP?</a></h2>
@@ -175,63 +232,6 @@
See the <code class="directive">ProxyFtpListOnWildcard</code> directive.
</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="ProxyFtpDirCharset" id="ProxyFtpDirCharset">ProxyFtpDirCharset</a> <a name="proxyftpdircharset" id="proxyftpdircharset">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define the character set for proxied FTP listings</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyFtpDirCharset <var>character set</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyFtpDirCharset ISO-8859-1</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_proxy_ftp</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.2.7 and later. Moved from <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> in Apache 2.3.5.</td></tr>
-</table>
- <p>The <code class="directive">ProxyFtpDirCharset</code> directive defines the
- character set to be set for FTP directory listings in HTML generated by
- <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code>.</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="ProxyFtpEscapeWildcards" id="ProxyFtpEscapeWildcards">ProxyFtpEscapeWildcards</a> <a name="proxyftpescapewildcards" id="proxyftpescapewildcards">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Whether wildcards in requested filenames are escaped when sent to the FTP server</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyFtpEscapeWildcards [on|off]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_proxy_ftp</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.3 and later</td></tr>
-</table>
- <p>The <code class="directive">ProxyFtpEscapeWildcards</code> directive
- controls whether wildcard characters ("*?[{~") in requested
- filenames are escaped with backslash before sending them to the
- FTP server. That is the default behavior, but many FTP servers
- don't know about the escaping and try to serve the literal filenames
- they were sent, including the backslashes in the names. </p>
- <p>Set to "off" to allow downloading files with wildcards
- in their names from FTP servers that don't understand wildcard
- escaping.</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="ProxyFtpListOnWildcard" id="ProxyFtpListOnWildcard">ProxyFtpListOnWildcard</a> <a name="proxyftplistonwildcard" id="proxyftplistonwildcard">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Whether wildcards in requested filenames trigger a file listing</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyFtpListOnWildcard [on|off]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_proxy_ftp</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.3 and later</td></tr>
-</table>
- <p>The <code class="directive">ProxyFtpListOnWildcard</code> directive
- controls whether wildcard characters ("*?[{~") in requested
- filenames cause <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code> to return a listing
- of files instead of downloading a file. By default (value on),
- they do. Set to "off" to allow downloading files even if they
- have wildcard characters in their names.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_ftp.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_ftp.html.fr b/docs/manual/mod/mod_proxy_ftp.html.fr
index 78d9450773..de04868e2b 100644
--- a/docs/manual/mod/mod_proxy_ftp.html.fr
+++ b/docs/manual/mod/mod_proxy_ftp.html.fr
@@ -76,6 +76,71 @@
<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="proxyftpdircharset" id="proxyftpdircharset">Directive</a> <a name="ProxyFtpDirCharset" id="ProxyFtpDirCharset">ProxyFtpDirCharset</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit le jeu de caract�res des listings FTP
+mandat�s</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ProxyFtpDirCharset <var>jeu-caract�res</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ProxyFtpDirCharset ISO-8859-1</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, 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_proxy_ftp</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.2.7 d'Apache. D�plac�
+depuis <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> � partir de la version 2.3.5 d'Apache</td></tr>
+</table>
+ <p>La directive <code class="directive">ProxyFtpDirCharset</code> permet de
+ d�finir le jeu de caract�res � utiliser pour les listings FTP en
+ HTML g�n�r�s par <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code>.</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="proxyftpescapewildcards" id="proxyftpescapewildcards">Directive</a> <a name="ProxyFtpEscapeWildcards" id="ProxyFtpEscapeWildcards">ProxyFtpEscapeWildcards</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Les caract�res g�n�riques dans les noms de fichiers
+doivent-ils �tre �chapp�s lorsqu'ils sont envoy�s au serveur FTP ?</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ProxyFtpEscapeWildcards [on|off]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, 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_proxy_ftp</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.3 du serveur HTTP Apache</td></tr>
+</table>
+ <p>La directive <code class="directive">ProxyFtpEscapeWildcards</code> permet
+ de d�terminer si les caract�res g�n�riques ("*?[{~") que contiennent
+ les noms de fichiers demand�s doivent �tre �chapp�s pas un slash
+ invers� avant d'�tre envoy�s au serveur FTP. Il s'agit du comportement
+ par d�faut ; cependant, de nombreux serveurs FTP n'ont aucune
+ connaissance de la notion d'�chappement, et tentent de servir le
+ fichier demand� sous sa forme litt�rale, en incluant les slashes
+ invers�s dans son nom.</p>
+ <p>D�finissez cette directive � "off" pour permettre le
+ t�l�chargement de fichiers dont les noms contiennent des caract�res
+ g�n�riques depuis des serveurs FTP qui ne connaissent pas
+ l'�chappement des caract�res g�n�riques.</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="proxyftplistonwildcard" id="proxyftplistonwildcard">Directive</a> <a name="ProxyFtpListOnWildcard" id="ProxyFtpListOnWildcard">ProxyFtpListOnWildcard</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Les caract�res g�n�riques dans les noms de fichiers
+demand�s doivent-ils d�clencher l'affichage d'un listing ?</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ProxyFtpListOnWildcard [on|off]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, 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_proxy_ftp</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.3 du serveur HTTP Apache</td></tr>
+</table>
+ <p>La directive <code class="directive">ProxyFtpListOnWildcard</code> permet
+ de d�terminer si les caract�res g�n�riques ("*?[{~") que contiennent
+ les noms de fichiers demand�s provoquent l'affichage d'un listing de
+ fichiers par <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code> au lieu de t�l�charger un
+ fichier. Il s'agit de leur comportement par d�faut (valeur on).
+ D�finissez cette directive � "off" pour permettre le t�l�chargement de
+ fichiers m�me si leur nom contient des caract�res g�n�riques.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="mimetypes" id="mimetypes">Pourquoi les fichiers du type
<var>xxx</var> ne sont-ils pas t�l�chargeables par FTP ?</a></h2>
@@ -199,71 +264,6 @@
<code class="directive">ProxyFtpListOnWildcard</code>.
</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="proxyftpdircharset" id="proxyftpdircharset">Directive</a> <a name="ProxyFtpDirCharset" id="ProxyFtpDirCharset">ProxyFtpDirCharset</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit le jeu de caract�res des listings FTP
-mandat�s</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ProxyFtpDirCharset <var>jeu-caract�res</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>ProxyFtpDirCharset ISO-8859-1</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, 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_proxy_ftp</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.2.7 d'Apache. D�plac�
-depuis <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> � partir de la version 2.3.5 d'Apache</td></tr>
-</table>
- <p>La directive <code class="directive">ProxyFtpDirCharset</code> permet de
- d�finir le jeu de caract�res � utiliser pour les listings FTP en
- HTML g�n�r�s par <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code>.</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="proxyftpescapewildcards" id="proxyftpescapewildcards">Directive</a> <a name="ProxyFtpEscapeWildcards" id="ProxyFtpEscapeWildcards">ProxyFtpEscapeWildcards</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Les caract�res g�n�riques dans les noms de fichiers
-doivent-ils �tre �chapp�s lorsqu'ils sont envoy�s au serveur FTP ?</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ProxyFtpEscapeWildcards [on|off]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, 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_proxy_ftp</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.3 du serveur HTTP Apache</td></tr>
-</table>
- <p>La directive <code class="directive">ProxyFtpEscapeWildcards</code> permet
- de d�terminer si les caract�res g�n�riques ("*?[{~") que contiennent
- les noms de fichiers demand�s doivent �tre �chapp�s pas un slash
- invers� avant d'�tre envoy�s au serveur FTP. Il s'agit du comportement
- par d�faut ; cependant, de nombreux serveurs FTP n'ont aucune
- connaissance de la notion d'�chappement, et tentent de servir le
- fichier demand� sous sa forme litt�rale, en incluant les slashes
- invers�s dans son nom.</p>
- <p>D�finissez cette directive � "off" pour permettre le
- t�l�chargement de fichiers dont les noms contiennent des caract�res
- g�n�riques depuis des serveurs FTP qui ne connaissent pas
- l'�chappement des caract�res g�n�riques.</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="proxyftplistonwildcard" id="proxyftplistonwildcard">Directive</a> <a name="ProxyFtpListOnWildcard" id="ProxyFtpListOnWildcard">ProxyFtpListOnWildcard</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Les caract�res g�n�riques dans les noms de fichiers
-demand�s doivent-ils d�clencher l'affichage d'un listing ?</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ProxyFtpListOnWildcard [on|off]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, 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_proxy_ftp</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.3.3 du serveur HTTP Apache</td></tr>
-</table>
- <p>La directive <code class="directive">ProxyFtpListOnWildcard</code> permet
- de d�terminer si les caract�res g�n�riques ("*?[{~") que contiennent
- les noms de fichiers demand�s provoquent l'affichage d'un listing de
- fichiers par <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code> au lieu de t�l�charger un
- fichier. Il s'agit de leur comportement par d�faut (valeur on).
- D�finissez cette directive � "off" pour permettre le t�l�chargement de
- fichiers m�me si leur nom contient des caract�res g�n�riques.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_proxy_ftp.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_html.html.en b/docs/manual/mod/mod_proxy_html.html.en
index 3259c46a19..975e114270 100644
--- a/docs/manual/mod/mod_proxy_html.html.en
+++ b/docs/manual/mod/mod_proxy_html.html.en
@@ -71,7 +71,6 @@ extensive <a href="http://apache.webthing.com/mod_proxy_html/">documentation</a>
<li><img alt="" src="../images/down.gif" /> <a href="#proxyhtmlurlmap">ProxyHTMLURLMap</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ProxyHTMLBufSize" id="ProxyHTMLBufSize">ProxyHTMLBufSize</a> <a name="proxyhtmlbufsize" id="proxyhtmlbufsize">Directive</a></h2>
<table class="directive">
@@ -426,6 +425,7 @@ If TRUE, or if no condition is defined, the map is applied.</p>
in mod_proxy_html 3.x for HTTPD 2.0 and 2.2 is also supported.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_html.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_html.html.fr b/docs/manual/mod/mod_proxy_html.html.fr
index 3118f0212b..43dea5d770 100644
--- a/docs/manual/mod/mod_proxy_html.html.fr
+++ b/docs/manual/mod/mod_proxy_html.html.fr
@@ -77,7 +77,6 @@ d�taill�e pourra s'av�rer utile aux utilisateurs.</p>
<li><img alt="" src="../images/down.gif" /> <a href="#proxyhtmlurlmap">ProxyHTMLURLMap</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="proxyhtmlbufsize" id="proxyhtmlbufsize">Directive</a> <a name="ProxyHTMLBufSize" id="ProxyHTMLBufSize">ProxyHTMLBufSize</a></h2>
<table class="directive">
@@ -495,6 +494,7 @@ conditions dans mod_proxy_html 3.x pour HTTPD 2.0 et 2.2 est aussi
support�e.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_proxy_html.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_scgi.html.en b/docs/manual/mod/mod_proxy_scgi.html.en
index fde6e4970c..a35c1a0d6b 100644
--- a/docs/manual/mod/mod_proxy_scgi.html.en
+++ b/docs/manual/mod/mod_proxy_scgi.html.en
@@ -63,48 +63,6 @@
<li><code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Examples</a></h2>
- <p>Remember, in order to make the following examples work, you have to
- enable <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code>.</p>
-
- <div class="example"><h3>Simple gateway</h3><pre class="prettyprint lang-config">ProxyPass /scgi-bin/ scgi://localhost:4000/</pre>
-</div>
-
- <p>The balanced gateway needs <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> and
- at least one load balancer algorithm module, such as
- <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code>, in addition to the proxy
- modules listed above. <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code> is the
- default, and will be used for this example configuration.</p>
-
- <div class="example"><h3>Balanced gateway</h3><pre class="prettyprint lang-config">ProxyPass "/scgi-bin/" "balancer://somecluster/"
-&lt;Proxy "balancer://somecluster"&gt;
- BalancerMember "scgi://localhost:4000"
- BalancerMember "scgi://localhost:4001"
-&lt;/Proxy&gt;</pre>
-</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="env" id="env">Environment Variables</a></h2>
- <p>In addition to the configuration directives that control the
- behaviour of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>, an <dfn>environment
- variable</dfn> may also control the SCGI protocol
- provider:</p>
- <dl>
- <dt>proxy-scgi-pathinfo</dt>
- <dd>By default <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code> will neither create
- nor export the <var>PATH_INFO</var> environment variable. This allows
- the backend SCGI server to correctly determine <var>SCRIPT_NAME</var>
- and <var>Script-URI</var> and be compliant with RFC 3875 section 3.3.
- If instead you need <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code> to generate
- a "best guess" for <var>PATH_INFO</var>, set this env-var. The
- variable must be set before <code class="directive"><a href="../mod/env.html#setenv">SetEnv</a></code>
- is effective. <code class="directive"><a href="../mod/setenv.html#setenvif">SetEnvIf</a></code> can be
- used instead: <code>SetEnvIf Request_URI . proxy-scgi-pathinfo</code>
- </dd>
- </dl>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ProxySCGIInternalRedirect" id="ProxySCGIInternalRedirect">ProxySCGIInternalRedirect</a> <a name="proxyscgiinternalredirect" id="proxyscgiinternalredirect">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable or disable internal redirect responses from the
@@ -172,6 +130,48 @@ ProxySCGISendfile X-Send-Static</pre>
</div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Examples</a></h2>
+ <p>Remember, in order to make the following examples work, you have to
+ enable <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code>.</p>
+
+ <div class="example"><h3>Simple gateway</h3><pre class="prettyprint lang-config">ProxyPass /scgi-bin/ scgi://localhost:4000/</pre>
+</div>
+
+ <p>The balanced gateway needs <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> and
+ at least one load balancer algorithm module, such as
+ <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code>, in addition to the proxy
+ modules listed above. <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code> is the
+ default, and will be used for this example configuration.</p>
+
+ <div class="example"><h3>Balanced gateway</h3><pre class="prettyprint lang-config">ProxyPass "/scgi-bin/" "balancer://somecluster/"
+&lt;Proxy "balancer://somecluster"&gt;
+ BalancerMember "scgi://localhost:4000"
+ BalancerMember "scgi://localhost:4001"
+&lt;/Proxy&gt;</pre>
+</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="env" id="env">Environment Variables</a></h2>
+ <p>In addition to the configuration directives that control the
+ behaviour of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>, an <dfn>environment
+ variable</dfn> may also control the SCGI protocol
+ provider:</p>
+ <dl>
+ <dt>proxy-scgi-pathinfo</dt>
+ <dd>By default <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code> will neither create
+ nor export the <var>PATH_INFO</var> environment variable. This allows
+ the backend SCGI server to correctly determine <var>SCRIPT_NAME</var>
+ and <var>Script-URI</var> and be compliant with RFC 3875 section 3.3.
+ If instead you need <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code> to generate
+ a "best guess" for <var>PATH_INFO</var>, set this env-var. The
+ variable must be set before <code class="directive"><a href="../mod/env.html#setenv">SetEnv</a></code>
+ is effective. <code class="directive"><a href="../mod/setenv.html#setenvif">SetEnvIf</a></code> can be
+ used instead: <code>SetEnvIf Request_URI . proxy-scgi-pathinfo</code>
+ </dd>
+ </dl>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_scgi.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_proxy_scgi.html.fr b/docs/manual/mod/mod_proxy_scgi.html.fr
index 442a0688a5..68c49c550c 100644
--- a/docs/manual/mod/mod_proxy_scgi.html.fr
+++ b/docs/manual/mod/mod_proxy_scgi.html.fr
@@ -67,52 +67,6 @@
<li><code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Exemples</a></h2>
- <p>Rappelez-vous, pour que les exemples suivants puissent
- fonctionner, vous devez activer <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> et
- <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code>.</p>
-
- <div class="example"><h3>Passerelle simple</h3><pre class="prettyprint lang-config">ProxyPass /scgi-bin/ scgi://localhost:4000/</pre>
-</div>
-
- <p>La passerelle � r�partition de charge n�cessite le chargement du
- module <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> et d'au moins un module
- fournissant un algorithme de r�partition de charge, comme
- <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code> en plus des modules
- d�j� cit�s. <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code> est le module
- par d�faut et sera utilis� dans cet exemple de configuration.</p>
-
- <div class="example"><h3>Passerelle � r�partition de charge</h3><pre class="prettyprint lang-config">ProxyPass /scgi-bin/ balancer://somecluster/
-&lt;Proxy balancer://somecluster&gt;
- BalancerMember scgi://localhost:4000
- BalancerMember scgi://localhost:4001
-&lt;/Proxy&gt;</pre>
-</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="env" id="env">Variables d'environnement</a></h2>
- <p>En plus des directives de configuration qui permettent de
- contr�ler le comportement de <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>, une
- <dfn>variable d'environnement</dfn> peut aussi
- contr�ler le fournisseur de protocole SCGI :</p>
- <dl>
- <dt>proxy-scgi-pathinfo</dt>
- <dd>Par d�faut, <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code> ne cr�era ni
- exportera jamais la variable d'environnement
- <var>PATH_INFO</var>. Ceci permet au serveur SCGI d'arri�re-plan
- de d�terminer correctement <var>SCRIPT_NAME</var> et
- <var>Script-URI</var>, et de rester en conformit� avec la section
- 3.3 de la RFC 3875. Si au contraire vous souhaitez que
- <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code> g�n�re une estimation la plus
- pr�cise possible de <var>PATH_INFO</var>, d�finissez cette
- variable d'environnement. La variable doit �tre d�finie avant
- que la directive <code class="directive"><a href="../mod/env.html#setenv">SetEnv</a></code> ne soit effective. Il est possible
- d'utiliser � la place la directive <code class="directive"><a href="../mod/setenv.html#setenvif">SetEnvIf</a></code> : <code>SetEnvIf Request_URI . proxy-scgi-pathinfo</code>
- </dd>
- </dl>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="proxyscgiinternalredirect" id="proxyscgiinternalredirect">Directive</a> <a name="ProxySCGIInternalRedirect" id="ProxySCGIInternalRedirect">ProxySCGIInternalRedirect</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Active ou d�sactive les r�ponses de redirection interne en
@@ -189,6 +143,52 @@ provenance du serveur cible.</td></tr>
</div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Exemples</a></h2>
+ <p>Rappelez-vous, pour que les exemples suivants puissent
+ fonctionner, vous devez activer <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> et
+ <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code>.</p>
+
+ <div class="example"><h3>Passerelle simple</h3><pre class="prettyprint lang-config">ProxyPass /scgi-bin/ scgi://localhost:4000/</pre>
+</div>
+
+ <p>La passerelle � r�partition de charge n�cessite le chargement du
+ module <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> et d'au moins un module
+ fournissant un algorithme de r�partition de charge, comme
+ <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code> en plus des modules
+ d�j� cit�s. <code class="module"><a href="../mod/mod_lbmethod_byrequests.html">mod_lbmethod_byrequests</a></code> est le module
+ par d�faut et sera utilis� dans cet exemple de configuration.</p>
+
+ <div class="example"><h3>Passerelle � r�partition de charge</h3><pre class="prettyprint lang-config">ProxyPass /scgi-bin/ balancer://somecluster/
+&lt;Proxy balancer://somecluster&gt;
+ BalancerMember scgi://localhost:4000
+ BalancerMember scgi://localhost:4001
+&lt;/Proxy&gt;</pre>
+</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="env" id="env">Variables d'environnement</a></h2>
+ <p>En plus des directives de configuration qui permettent de
+ contr�ler le comportement de <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>, une
+ <dfn>variable d'environnement</dfn> peut aussi
+ contr�ler le fournisseur de protocole SCGI :</p>
+ <dl>
+ <dt>proxy-scgi-pathinfo</dt>
+ <dd>Par d�faut, <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code> ne cr�era ni
+ exportera jamais la variable d'environnement
+ <var>PATH_INFO</var>. Ceci permet au serveur SCGI d'arri�re-plan
+ de d�terminer correctement <var>SCRIPT_NAME</var> et
+ <var>Script-URI</var>, et de rester en conformit� avec la section
+ 3.3 de la RFC 3875. Si au contraire vous souhaitez que
+ <code class="module"><a href="../mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code> g�n�re une estimation la plus
+ pr�cise possible de <var>PATH_INFO</var>, d�finissez cette
+ variable d'environnement. La variable doit �tre d�finie avant
+ que la directive <code class="directive"><a href="../mod/env.html#setenv">SetEnv</a></code> ne soit effective. Il est possible
+ d'utiliser � la place la directive <code class="directive"><a href="../mod/setenv.html#setenvif">SetEnvIf</a></code> : <code>SetEnvIf Request_URI . proxy-scgi-pathinfo</code>
+ </dd>
+ </dl>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_proxy_scgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_reflector.html.en b/docs/manual/mod/mod_reflector.html.en
index 4f988b07e7..7c09a405aa 100644
--- a/docs/manual/mod/mod_reflector.html.en
+++ b/docs/manual/mod/mod_reflector.html.en
@@ -49,6 +49,22 @@
<li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ReflectorHeader" id="ReflectorHeader">ReflectorHeader</a> <a name="reflectorheader" id="reflectorheader">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Reflect an input header to the output headers</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ReflectorHeader <var>inputheader</var> <var>[outputheader]</var></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#Override">Override:</a></th><td>Options</td></tr>
+<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_reflector</td></tr>
+</table>
+ <p>This directive controls the reflection of request headers to the response.
+ The first argument is the name of the request header to copy. If the optional
+ second argument is specified, it will be used as the name of the response
+ header, otherwise the original request header name will be used.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="examples" id="examples">Examples</a></h2>
<dl>
@@ -74,22 +90,6 @@
</dd>
</dl>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ReflectorHeader" id="ReflectorHeader">ReflectorHeader</a> <a name="reflectorheader" id="reflectorheader">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Reflect an input header to the output headers</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ReflectorHeader <var>inputheader</var> <var>[outputheader]</var></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#Override">Override:</a></th><td>Options</td></tr>
-<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_reflector</td></tr>
-</table>
- <p>This directive controls the reflection of request headers to the response.
- The first argument is the name of the request header to copy. If the optional
- second argument is specified, it will be used as the name of the response
- header, otherwise the original request header name will be used.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_reflector.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_reflector.html.fr b/docs/manual/mod/mod_reflector.html.fr
index 4728039239..6f6dd9036e 100644
--- a/docs/manual/mod/mod_reflector.html.fr
+++ b/docs/manual/mod/mod_reflector.html.fr
@@ -52,6 +52,24 @@ filtres en sortie.</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#examples">Exemples</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="reflectorheader" id="reflectorheader">Directive</a> <a name="ReflectorHeader" id="ReflectorHeader">ReflectorHeader</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>R�fl�chit un en-t�te d'entr�e dans les en-t�tes de sortie</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ReflectorHeader <var>en-t�te-entr�e</var> <var>[en-t�te-sortie]</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>Options</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_reflector</td></tr>
+</table>
+ <p>Cette directive permet de contr�ler la r�percution des en-t�tes
+ de la requ�te dans la r�ponse. Le premier argument correspond au nom
+ de l'en-t�te � copier. Si le second argument (optionnel) est
+ sp�cifi�, il d�finit le nom sous lequel l'en-t�te sera r�percut�
+ dans la r�ponse ; dans le cas contraire, c'est le nom de l'en-t�te
+ original qui sera utilis�.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="examples" id="examples">Exemples</a></h2>
<dl>
@@ -78,24 +96,6 @@ filtres en sortie.</td></tr>
</dd>
</dl>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="reflectorheader" id="reflectorheader">Directive</a> <a name="ReflectorHeader" id="ReflectorHeader">ReflectorHeader</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>R�fl�chit un en-t�te d'entr�e dans les en-t�tes de sortie</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ReflectorHeader <var>en-t�te-entr�e</var> <var>[en-t�te-sortie]</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>Options</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_reflector</td></tr>
-</table>
- <p>Cette directive permet de contr�ler la r�percution des en-t�tes
- de la requ�te dans la r�ponse. Le premier argument correspond au nom
- de l'en-t�te � copier. Si le second argument (optionnel) est
- sp�cifi�, il d�finit le nom sous lequel l'en-t�te sera r�percut�
- dans la r�ponse ; dans le cas contraire, c'est le nom de l'en-t�te
- original qui sera utilis�.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_reflector.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_remoteip.html.en b/docs/manual/mod/mod_remoteip.html.en
index bca106a4e2..7bba4f54ed 100644
--- a/docs/manual/mod/mod_remoteip.html.en
+++ b/docs/manual/mod/mod_remoteip.html.en
@@ -77,48 +77,6 @@ via the request headers.
<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="processing" id="processing">Remote IP Processing</a></h2>
-
- <p>Apache by default identifies the useragent with the connection's
- client_ip value, and the connection remote_host and remote_logname are
- derived from this value. These fields play a role in authentication,
- authorization and logging and other purposes by other loadable
- modules.</p>
-
- <p>mod_remoteip overrides the client IP of the connection with the
- advertised useragent IP as provided by a proxy or load balancer, for
- the duration of the request. A load balancer might establish a long
- lived keepalive connection with the server, and each request will
- have the correct useragent IP, even though the underlying client IP
- address of the load balancer remains unchanged.</p>
-
- <p>When multiple, comma delimited useragent IP addresses are listed in the
- header value, they are processed in Right-to-Left order. Processing
- halts when a given useragent IP address is not trusted to present the
- preceding IP address. The header field is updated to this remaining
- list of unconfirmed IP addresses, or if all IP addresses were trusted,
- this header is removed from the request altogether.</p>
-
- <p>In overriding the client IP, the module stores the list of intermediate
- hosts in a remoteip-proxy-ip-list note, which <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>
- can record using the <code>%{remoteip-proxy-ip-list}n</code> format token.
- If the administrator needs to store this as an additional header, this
- same value can also be recording as a header using the directive
- <code class="directive"><a href="#remoteipproxiesheader">RemoteIPProxiesHeader</a></code>.</p>
-
- <div class="note"><h3>IPv4-over-IPv6 Mapped Addresses</h3>
- As with httpd in general, any IPv4-over-IPv6 mapped addresses are recorded
- in their IPv4 representation.</div>
-
- <div class="note"><h3>Internal (Private) Addresses</h3>
- All internal addresses 10/8, 172.16/12, 192.168/16, 169.254/16 and 127/8
- blocks (and IPv6 addresses outside of the public 2000::/3 block) are only
- evaluated by mod_remoteip when <code class="directive"><a href="#remoteipinternalproxy">RemoteIPInternalProxy</a></code>
- internal (intranet) proxies are registered.</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="RemoteIPHeader" id="RemoteIPHeader">RemoteIPHeader</a> <a name="remoteipheader" id="remoteipheader">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Declare the header field which should be parsed for useragent IP addresses</td></tr>
@@ -265,6 +223,48 @@ RemoteIPTrustedProxyList conf/trusted-proxies.lst</pre>
</code></p></div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="processing" id="processing">Remote IP Processing</a></h2>
+
+ <p>Apache by default identifies the useragent with the connection's
+ client_ip value, and the connection remote_host and remote_logname are
+ derived from this value. These fields play a role in authentication,
+ authorization and logging and other purposes by other loadable
+ modules.</p>
+
+ <p>mod_remoteip overrides the client IP of the connection with the
+ advertised useragent IP as provided by a proxy or load balancer, for
+ the duration of the request. A load balancer might establish a long
+ lived keepalive connection with the server, and each request will
+ have the correct useragent IP, even though the underlying client IP
+ address of the load balancer remains unchanged.</p>
+
+ <p>When multiple, comma delimited useragent IP addresses are listed in the
+ header value, they are processed in Right-to-Left order. Processing
+ halts when a given useragent IP address is not trusted to present the
+ preceding IP address. The header field is updated to this remaining
+ list of unconfirmed IP addresses, or if all IP addresses were trusted,
+ this header is removed from the request altogether.</p>
+
+ <p>In overriding the client IP, the module stores the list of intermediate
+ hosts in a remoteip-proxy-ip-list note, which <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>
+ can record using the <code>%{remoteip-proxy-ip-list}n</code> format token.
+ If the administrator needs to store this as an additional header, this
+ same value can also be recording as a header using the directive
+ <code class="directive"><a href="#remoteipproxiesheader">RemoteIPProxiesHeader</a></code>.</p>
+
+ <div class="note"><h3>IPv4-over-IPv6 Mapped Addresses</h3>
+ As with httpd in general, any IPv4-over-IPv6 mapped addresses are recorded
+ in their IPv4 representation.</div>
+
+ <div class="note"><h3>Internal (Private) Addresses</h3>
+ All internal addresses 10/8, 172.16/12, 192.168/16, 169.254/16 and 127/8
+ blocks (and IPv6 addresses outside of the public 2000::/3 block) are only
+ evaluated by mod_remoteip when <code class="directive"><a href="#remoteipinternalproxy">RemoteIPInternalProxy</a></code>
+ internal (intranet) proxies are registered.</div>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_remoteip.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_remoteip.html.fr b/docs/manual/mod/mod_remoteip.html.fr
index 621bb23312..ed8dc636d8 100644
--- a/docs/manual/mod/mod_remoteip.html.fr
+++ b/docs/manual/mod/mod_remoteip.html.fr
@@ -83,53 +83,6 @@ r�partiteur de charge via les en-t�tes de la requ�te.
<li><code class="module"><a href="../mod/mod_ident.html">mod_ident</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="processing" id="processing">Traitement des adresses distantes</a></h2>
-
- <p>Apache identifie le client par la valeur remote_ip de la
- connexion, et de cette valeur d�coulent les valeurs remote_host et
- remote_logname de la connexion. Ces champs jouent un r�le
- dans l'authentification, l'autorisation et la connexion, ainsi que
- dans d'autres traitements effectu�s par d'autres modules
- chargeables.</p>
-
- <p>mod_remoteip remplace la v�ritable remote_ip par la remote_ip
- indiqu�e par exemple par un mandataire chaque fois que le serveur
- effectue une �valuation du client, et r�initialise les valeurs de
- remote_host et remote_logname afin de d�clencher une nouvelle
- requ�te dns ou ident sur l'adresse IP distante.</p>
-
- <p>Lorsque la valeur de l'en-t�te comporte plusieurs adresses IP
- distantes s�par�es par des virgules, celles-ci sont trait�es de la
- droite vers la gauche. Le traitement s'arr�te lorsque l'adresse IP
- distante courante n'est pas digne de confiance pour pr�senter
- l'adresse IP pr�c�dente. Le champ d'en-t�te est alors mis � jour de
- fa�on � ne contenir que cette liste d'adresses non confirm�es, ou
- bien, si toutes les adresses IP sont dignes de confiance, cet
- en-t�te est tout bonnement supprim� de la requ�te.</p>
-
- <p>Lors du remplacement de l'adresse IP distante, le module stocke
- la liste des h�tes interm�diaires dans un m�mo
- remoteip-proxy-ip-list, que l'on peut faire enregistrer par
- <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> en utilisant le symbole de format
- <code>%{remoteip-proxy-ip-list}n</code>. Si l'administrateur doit
- stocker ceci dans un en-t�te additionnel, la m�me valeur peut aussi
- �tre enregistr�e sous la forme d'un en-t�te en utilisant la
- directive <code class="directive"><a href="#remoteipproxiesheader">RemoteIPProxiesHeader</a></code>.</p>
-
- <div class="note"><h3>Adresses IPv4 converties au format IPv6</h3>
- Avec httpd, d'une mani�re g�n�rale, toute adresse IPv4 convertie au
- format IPv6 est enregistr�e sous sa forme IPv4.</div>
-
- <div class="note"><h3>Adresses internes (priv�es)</h3>
- Tous les blocs d'adresses internes 10/8, 172.16/12, 192.168/16,
- 169.254/16 and 127/8 (ainsi que les adresses IPv6 en dehors du bloc
- public 2000::/3 block) ne sont �valu�es par mod_remoteip que lorsque
- des mandataires internes (intranet)
- <code class="directive"><a href="#remoteipinternalproxy">RemoteIPInternalProxy</a></code> sont enregistr�s.</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="remoteipheader" id="remoteipheader">Directive</a> <a name="RemoteIPHeader" id="RemoteIPHeader">RemoteIPHeader</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit le champ d'en-t�te qui contiendra les adresses IP
@@ -306,6 +259,53 @@ RemoteIPTrustedProxyList conf/trusted-proxies.lst</pre>
</code></p></div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="processing" id="processing">Traitement des adresses distantes</a></h2>
+
+ <p>Apache identifie le client par la valeur remote_ip de la
+ connexion, et de cette valeur d�coulent les valeurs remote_host et
+ remote_logname de la connexion. Ces champs jouent un r�le
+ dans l'authentification, l'autorisation et la connexion, ainsi que
+ dans d'autres traitements effectu�s par d'autres modules
+ chargeables.</p>
+
+ <p>mod_remoteip remplace la v�ritable remote_ip par la remote_ip
+ indiqu�e par exemple par un mandataire chaque fois que le serveur
+ effectue une �valuation du client, et r�initialise les valeurs de
+ remote_host et remote_logname afin de d�clencher une nouvelle
+ requ�te dns ou ident sur l'adresse IP distante.</p>
+
+ <p>Lorsque la valeur de l'en-t�te comporte plusieurs adresses IP
+ distantes s�par�es par des virgules, celles-ci sont trait�es de la
+ droite vers la gauche. Le traitement s'arr�te lorsque l'adresse IP
+ distante courante n'est pas digne de confiance pour pr�senter
+ l'adresse IP pr�c�dente. Le champ d'en-t�te est alors mis � jour de
+ fa�on � ne contenir que cette liste d'adresses non confirm�es, ou
+ bien, si toutes les adresses IP sont dignes de confiance, cet
+ en-t�te est tout bonnement supprim� de la requ�te.</p>
+
+ <p>Lors du remplacement de l'adresse IP distante, le module stocke
+ la liste des h�tes interm�diaires dans un m�mo
+ remoteip-proxy-ip-list, que l'on peut faire enregistrer par
+ <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> en utilisant le symbole de format
+ <code>%{remoteip-proxy-ip-list}n</code>. Si l'administrateur doit
+ stocker ceci dans un en-t�te additionnel, la m�me valeur peut aussi
+ �tre enregistr�e sous la forme d'un en-t�te en utilisant la
+ directive <code class="directive"><a href="#remoteipproxiesheader">RemoteIPProxiesHeader</a></code>.</p>
+
+ <div class="note"><h3>Adresses IPv4 converties au format IPv6</h3>
+ Avec httpd, d'une mani�re g�n�rale, toute adresse IPv4 convertie au
+ format IPv6 est enregistr�e sous sa forme IPv4.</div>
+
+ <div class="note"><h3>Adresses internes (priv�es)</h3>
+ Tous les blocs d'adresses internes 10/8, 172.16/12, 192.168/16,
+ 169.254/16 and 127/8 (ainsi que les adresses IPv6 en dehors du bloc
+ public 2000::/3 block) ne sont �valu�es par mod_remoteip que lorsque
+ des mandataires internes (intranet)
+ <code class="directive"><a href="#remoteipinternalproxy">RemoteIPInternalProxy</a></code> sont enregistr�s.</div>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_remoteip.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_reqtimeout.html.en b/docs/manual/mod/mod_reqtimeout.html.en
index 1efc5ab7df..8aafa445c4 100644
--- a/docs/manual/mod/mod_reqtimeout.html.en
+++ b/docs/manual/mod/mod_reqtimeout.html.en
@@ -43,51 +43,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Examples</a></h2>
-
- <ol>
- <li>
- Allow 10 seconds to receive the request including the headers and
- 30 seconds for receiving the request body:
-
- <pre class="prettyprint lang-config">RequestReadTimeout header=10 body=30</pre>
-
- </li>
-
- <li>
- Allow at least 10 seconds to receive the request body.
- If the client sends data, increase the timeout by 1 second for every
- 1000 bytes received, with no upper limit for the timeout (except for
- the limit given indirectly by
- <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code>):
-
- <pre class="prettyprint lang-config">RequestReadTimeout body=10,MinRate=1000</pre>
-
- </li>
-
- <li>
- Allow at least 10 seconds to receive the request including the headers.
- If the client sends data, increase the timeout by 1 second for every
- 500 bytes received. But do not allow more than 30 seconds for the
- request including the headers:
-
- <pre class="prettyprint lang-config">RequestReadTimeout header=10-30,MinRate=500</pre>
-
- </li>
-
- <li>
- Usually, a server should have both header and body timeouts configured.
- If a common configuration is used for http and https virtual hosts, the
- timeouts should not be set too low:
-
- <pre class="prettyprint lang-config">RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500</pre>
-
- </li>
-
- </ol>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="RequestReadTimeout" id="RequestReadTimeout">RequestReadTimeout</a> <a name="requestreadtimeout" id="requestreadtimeout">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Set timeout values for receiving request headers and body from client.
@@ -170,6 +125,51 @@ version 2.3.14 and earlier.</td></tr>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Examples</a></h2>
+
+ <ol>
+ <li>
+ Allow 10 seconds to receive the request including the headers and
+ 30 seconds for receiving the request body:
+
+ <pre class="prettyprint lang-config">RequestReadTimeout header=10 body=30</pre>
+
+ </li>
+
+ <li>
+ Allow at least 10 seconds to receive the request body.
+ If the client sends data, increase the timeout by 1 second for every
+ 1000 bytes received, with no upper limit for the timeout (except for
+ the limit given indirectly by
+ <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code>):
+
+ <pre class="prettyprint lang-config">RequestReadTimeout body=10,MinRate=1000</pre>
+
+ </li>
+
+ <li>
+ Allow at least 10 seconds to receive the request including the headers.
+ If the client sends data, increase the timeout by 1 second for every
+ 500 bytes received. But do not allow more than 30 seconds for the
+ request including the headers:
+
+ <pre class="prettyprint lang-config">RequestReadTimeout header=10-30,MinRate=500</pre>
+
+ </li>
+
+ <li>
+ Usually, a server should have both header and body timeouts configured.
+ If a common configuration is used for http and https virtual hosts, the
+ timeouts should not be set too low:
+
+ <pre class="prettyprint lang-config">RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500</pre>
+
+ </li>
+
+ </ol>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_reqtimeout.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_reqtimeout.html.fr b/docs/manual/mod/mod_reqtimeout.html.fr
index 6e9c1d1694..3c37a0ac55 100644
--- a/docs/manual/mod/mod_reqtimeout.html.fr
+++ b/docs/manual/mod/mod_reqtimeout.html.fr
@@ -44,52 +44,6 @@ donn�es pour la r�ception des requ�tes
<li><img alt="" src="../images/down.gif" /> <a href="#examples">Exemples</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Exemples</a></h2>
-
- <ol>
- <li>
- Accorde 10 secondes pour la r�ception des en-t�tes de la requ�te
- et 30 secondes pour la r�ception du corps :
-
- <pre class="prettyprint lang-config">RequestTimeout headerinit=10 body=30</pre>
-
- </li>
-
- <li>
- Accorde au moins 10 secondes pour la r�ception du corps de
- la requ�te. Si le client envoie des donn�es, augmente ce d�lai
- d'une seconde pour chaque paquet de 1000 octets re�us, sans
- limite sup�rieure (sauf si une limite a �t�
- sp�cifi�e via la directive <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code>) :
-
- <pre class="prettyprint lang-config">RequestReadTimeout body=10,MinRate=1000</pre>
-
- </li>
-
- <li>
- Accorde au moins 10 secondes pour la r�ception de de la
- requ�te, en-t�tes inclus. Si le client envoie des donn�es, augmente ce d�lai
- d'une seconde pour chaque paquet de 500 octets re�us, mais
- n'alloue que 30 secondes pour la requ�te, en-t�tes inclus :
-
- <pre class="prettyprint lang-config">RequestReadTimeout header=10-30,MinRate=500</pre>
-
- </li>
-
- <li>
- En g�n�ral, un serveur doit avoir ses d�lais d'en-t�te et de
- corps configur�s. Si les serveurs virtuels http et https
- utilisent une configuration commune, les d�lais ne doivent pas
- �tre d�finis trop bas :
-
- <pre class="prettyprint lang-config">RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500</pre>
-
- </li>
-
- </ol>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="requestreadtimeout" id="requestreadtimeout">Directive</a> <a name="RequestReadTimeout" id="RequestReadTimeout">RequestReadTimeout</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit des d�lais maximums pour la r�ception des en-t�tes
@@ -180,6 +134,52 @@ Apache ; d�sactiv�e par d�faut depuis la version 2.3.14.</td></tr>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">Exemples</a></h2>
+
+ <ol>
+ <li>
+ Accorde 10 secondes pour la r�ception des en-t�tes de la requ�te
+ et 30 secondes pour la r�ception du corps :
+
+ <pre class="prettyprint lang-config">RequestTimeout headerinit=10 body=30</pre>
+
+ </li>
+
+ <li>
+ Accorde au moins 10 secondes pour la r�ception du corps de
+ la requ�te. Si le client envoie des donn�es, augmente ce d�lai
+ d'une seconde pour chaque paquet de 1000 octets re�us, sans
+ limite sup�rieure (sauf si une limite a �t�
+ sp�cifi�e via la directive <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code>) :
+
+ <pre class="prettyprint lang-config">RequestReadTimeout body=10,MinRate=1000</pre>
+
+ </li>
+
+ <li>
+ Accorde au moins 10 secondes pour la r�ception de de la
+ requ�te, en-t�tes inclus. Si le client envoie des donn�es, augmente ce d�lai
+ d'une seconde pour chaque paquet de 500 octets re�us, mais
+ n'alloue que 30 secondes pour la requ�te, en-t�tes inclus :
+
+ <pre class="prettyprint lang-config">RequestReadTimeout header=10-30,MinRate=500</pre>
+
+ </li>
+
+ <li>
+ En g�n�ral, un serveur doit avoir ses d�lais d'en-t�te et de
+ corps configur�s. Si les serveurs virtuels http et https
+ utilisent une configuration commune, les d�lais ne doivent pas
+ �tre d�finis trop bas :
+
+ <pre class="prettyprint lang-config">RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500</pre>
+
+ </li>
+
+ </ol>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_reqtimeout.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_request.html.en b/docs/manual/mod/mod_request.html.en
index 0456c8e7ea..f416fd51c3 100644
--- a/docs/manual/mod/mod_request.html.en
+++ b/docs/manual/mod/mod_request.html.en
@@ -39,7 +39,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#keptbodysize">KeptBodySize</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="KeptBodySize" id="KeptBodySize">KeptBodySize</a> <a name="keptbodysize" id="keptbodysize">Directive</a></h2>
<table class="directive">
@@ -96,6 +95,7 @@ mod_include.</td></tr>
<li><a href="mod_auth_form.html">mod_auth_form</a> documentation</li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_request.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_request.html.fr b/docs/manual/mod/mod_request.html.fr
index 4dd7669d74..cf67fb4c06 100644
--- a/docs/manual/mod/mod_request.html.fr
+++ b/docs/manual/mod/mod_request.html.fr
@@ -40,7 +40,6 @@ les corps de requ�tes HTTP</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#keptbodysize">KeptBodySize</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="keptbodysize" id="keptbodysize">Directive</a> <a name="KeptBodySize" id="KeptBodySize">KeptBodySize</a></h2>
<table class="directive">
@@ -102,6 +101,7 @@ comme mod_include.</td></tr>
<li>la documentation de <a href="mod_auth_form.html">mod_auth_form</a></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_request.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_request.html.tr.utf8 b/docs/manual/mod/mod_request.html.tr.utf8
index 1dd0f67dc6..88ec27bb80 100644
--- a/docs/manual/mod/mod_request.html.tr.utf8
+++ b/docs/manual/mod/mod_request.html.tr.utf8
@@ -39,7 +39,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#keptbodysize">KeptBodySize</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="KeptBodySize" id="KeptBodySize">KeptBodySize</a> <a name="keptbodysize" id="keptbodysize">Yönergesi</a></h2>
<table class="directive">
@@ -96,6 +95,7 @@ istek gövdesi iptal edilmek yerine belirtilen azami boyutta tutulur.
<li><a href="mod_auth_form.html">mod_auth_form</a> belgesi</li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_request.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index e076dee3db..83fc59430b 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -68,42 +68,6 @@ URLs on the fly</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#logging">Logging</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="logging" id="logging">Logging</a></h2>
-
- <p><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> offers detailed logging of its actions
- at the <code>trace1</code> to <code>trace8</code> log levels. The
- log level can be set specifically for <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
- using the <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> directive: Up to
- level <code>debug</code>, no actions are logged, while <code>trace8</code>
- means that practically all actions are logged.</p>
-
- <div class="note">
- Using a high trace log level for <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
- will slow down your Apache HTTP Server dramatically! Use a log
- level higher than <code>trace2</code> only for debugging!
- </div>
-
- <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">LogLevel alert rewrite:trace3</pre>
-</div>
-
- <div class="note"><h3>RewriteLog</h3>
- <p>Those familiar with earlier versions of
- <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> will no doubt be looking for the
- <code>RewriteLog</code> and <code>RewriteLogLevel</code>
- directives. This functionality has been completely replaced by the
- new per-module logging configuration mentioned above.
- </p>
-
- <p>To get just the <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>-specific log
- messages, pipe the log file through grep:</p>
- <div class="example"><p><code>
- tail -f error_log|fgrep '[rewrite:'
- </code></p></div>
- </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="RewriteBase" id="RewriteBase">RewriteBase</a> <a name="rewritebase" id="rewritebase">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the base URL for per-directory rewrites</td></tr>
@@ -1458,6 +1422,42 @@ redirection</td>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="logging" id="logging">Logging</a></h2>
+
+ <p><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> offers detailed logging of its actions
+ at the <code>trace1</code> to <code>trace8</code> log levels. The
+ log level can be set specifically for <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
+ using the <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> directive: Up to
+ level <code>debug</code>, no actions are logged, while <code>trace8</code>
+ means that practically all actions are logged.</p>
+
+ <div class="note">
+ Using a high trace log level for <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
+ will slow down your Apache HTTP Server dramatically! Use a log
+ level higher than <code>trace2</code> only for debugging!
+ </div>
+
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">LogLevel alert rewrite:trace3</pre>
+</div>
+
+ <div class="note"><h3>RewriteLog</h3>
+ <p>Those familiar with earlier versions of
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> will no doubt be looking for the
+ <code>RewriteLog</code> and <code>RewriteLogLevel</code>
+ directives. This functionality has been completely replaced by the
+ new per-module logging configuration mentioned above.
+ </p>
+
+ <p>To get just the <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>-specific log
+ messages, pipe the log file through grep:</p>
+ <div class="example"><p><code>
+ tail -f error_log|fgrep '[rewrite:'
+ </code></p></div>
+ </div>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_rewrite.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_rewrite.html.fr b/docs/manual/mod/mod_rewrite.html.fr
index 8416eeb338..0ccb68a5d3 100644
--- a/docs/manual/mod/mod_rewrite.html.fr
+++ b/docs/manual/mod/mod_rewrite.html.fr
@@ -77,46 +77,6 @@ r�gles permettant de r��crire les URLs des requ�tes
<li><img alt="" src="../images/down.gif" /> <a href="#logging">Journalisation</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="logging" id="logging">Journalisation</a></h2>
-
- <p><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> offre une journalisation d�taill�e
- de ses actions aux niveaux de journalisation <code>trace1</code> �
- <code>trace8</code>. Le niveau de journalisation peut �tre d�fini de
- mani�re sp�cifique � <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> via la directive
- <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> : jusqu'au niveau
- <code>debug</code> aucune action n'est journalis�e, alors qu'elles
- le sont pratiquement toutes au niveau <code>trace8</code>.</p>
-
- <div class="note">
- L'utilisation d'un niveau de journalisation �lev� pour
- <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> va ralentir votre serveur HTTP Apache
- de mani�re dramatique ! N'utilisez un niveau de journalisation
- sup�rieur � <code>trace2</code> qu'� des fins de d�bogage !
- </div>
-
- <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">LogLevel alert rewrite:trace3</pre>
-</div>
-
- <div class="note"><h3>RewriteLog</h3>
- <p>Ceux qui sont familiers avec les versions pr�c�dentes de
- <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> vont probablement rechercher en vain les
- directives <code>RewriteLog</code> et
- <code>RewriteLogLevel</code>. Elles ont �t� en effet remplac�es
- par une configuration de la journalisation par module, comme
- mentionn� plus haut.
- </p>
-
- <p>Pour extraire les traces sp�cifiques �
- <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>, affichez le fichier journal en
- redirigeant la sortie vers grep :</p>
- <div class="example"><p><code>
- tail -f error_log|fgrep '[rewrite:'
- </code></p></div>
- </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="rewritebase" id="rewritebase">Directive</a> <a name="RewriteBase" id="RewriteBase">RewriteBase</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit l'URL de base pour les r��critures au niveau
@@ -1570,6 +1530,46 @@ externe</td>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="logging" id="logging">Journalisation</a></h2>
+
+ <p><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> offre une journalisation d�taill�e
+ de ses actions aux niveaux de journalisation <code>trace1</code> �
+ <code>trace8</code>. Le niveau de journalisation peut �tre d�fini de
+ mani�re sp�cifique � <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> via la directive
+ <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> : jusqu'au niveau
+ <code>debug</code> aucune action n'est journalis�e, alors qu'elles
+ le sont pratiquement toutes au niveau <code>trace8</code>.</p>
+
+ <div class="note">
+ L'utilisation d'un niveau de journalisation �lev� pour
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> va ralentir votre serveur HTTP Apache
+ de mani�re dramatique ! N'utilisez un niveau de journalisation
+ sup�rieur � <code>trace2</code> qu'� des fins de d�bogage !
+ </div>
+
+ <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">LogLevel alert rewrite:trace3</pre>
+</div>
+
+ <div class="note"><h3>RewriteLog</h3>
+ <p>Ceux qui sont familiers avec les versions pr�c�dentes de
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> vont probablement rechercher en vain les
+ directives <code>RewriteLog</code> et
+ <code>RewriteLogLevel</code>. Elles ont �t� en effet remplac�es
+ par une configuration de la journalisation par module, comme
+ mentionn� plus haut.
+ </p>
+
+ <p>Pour extraire les traces sp�cifiques �
+ <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>, affichez le fichier journal en
+ redirigeant la sortie vers grep :</p>
+ <div class="example"><p><code>
+ tail -f error_log|fgrep '[rewrite:'
+ </code></p></div>
+ </div>
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_rewrite.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_sed.html.en b/docs/manual/mod/mod_sed.html.en
index 2f1380bc0e..9bc6b313ae 100644
--- a/docs/manual/mod/mod_sed.html.en
+++ b/docs/manual/mod/mod_sed.html.en
@@ -73,6 +73,34 @@ the author's blog</a>.</p>
<li><img alt="" src="../images/down.gif" /> <a href="#sed_commands">Sed Commands</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="InputSed" id="InputSed">InputSed</a> <a name="inputsed" id="inputsed">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sed command to filter request data (typically <code>POST</code> data)</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>InputSed <var>sed-command</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_sed</td></tr>
+</table>
+ <p>The <code class="directive">InputSed</code> directive specifies the <code>sed</code> command
+ to execute on the request data e.g., <code>POST</code> data.
+ </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="OutputSed" id="OutputSed">OutputSed</a> <a name="outputsed" id="outputsed">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sed command for filtering response content</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>OutputSed <var>sed-command</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_sed</td></tr>
+</table>
+ <p>The <code class="directive">OutputSed</code> directive specifies the <code>sed</code>
+ command to execute on the response.
+ </p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="sampleconf" id="sampleconf">Sample Configuration</a></h2>
<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
@@ -117,34 +145,6 @@ page</a>.
<dd>Swap the contents of the hold buffer and the current line.</dd>
</dl>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="InputSed" id="InputSed">InputSed</a> <a name="inputsed" id="inputsed">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sed command to filter request data (typically <code>POST</code> data)</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>InputSed <var>sed-command</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_sed</td></tr>
-</table>
- <p>The <code class="directive">InputSed</code> directive specifies the <code>sed</code> command
- to execute on the request data e.g., <code>POST</code> data.
- </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="OutputSed" id="OutputSed">OutputSed</a> <a name="outputsed" id="outputsed">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sed command for filtering response content</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>OutputSed <var>sed-command</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_sed</td></tr>
-</table>
- <p>The <code class="directive">OutputSed</code> directive specifies the <code>sed</code>
- command to execute on the response.
- </p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_sed.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_sed.html.fr b/docs/manual/mod/mod_sed.html.fr
index 34494ba9b8..628033a8fb 100644
--- a/docs/manual/mod/mod_sed.html.fr
+++ b/docs/manual/mod/mod_sed.html.fr
@@ -83,6 +83,38 @@ recherche/remplacement de cha�ne ou d'expression rationnelle.</p>
<li><img alt="" src="../images/down.gif" /> <a href="#sed_commands">Commandes sed</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="inputsed" id="inputsed">Directive</a> <a name="InputSed" id="InputSed">InputSed</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Commande sed � ex�cuter pour le filtrage des donn�es d'une
+requ�te (en g�n�ral des donn�es <code>POST</code>)</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>InputSed <var>commande-sed</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td /></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_sed</td></tr>
+</table>
+ <p>La directive <code class="directive">InputSed</code> permet de sp�cifier
+ la commande sed � ex�cuter pour le filtrage des donn�es (en g�n�ral
+ des donn�es <code>POST</code>) d'une requ�te.
+ </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="outputsed" id="outputsed">Directive</a> <a name="OutputSed" id="OutputSed">OutputSed</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Commande sed pour le filtrage des contenus de type
+r�ponse</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>OutputSed <var>commande-sed</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td /></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_sed</td></tr>
+</table>
+ <p>La directive <code class="directive">OutputSed</code> permet de sp�cifier
+ la commande <code>sed</code> � ex�cuter dans le cadre du traitement
+ d'une r�ponse.
+ </p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="sampleconf" id="sampleconf">Exemple de configuration</a></h2>
<div class="example"><h3>Ajout d'un filtre en sortie</h3><pre class="prettyprint lang-config"># Dans l'exemple suivant, le filtre sed va remplacer la cha�ne
@@ -127,38 +159,6 @@ recherche/remplacement de cha�ne ou d'expression rationnelle.</p>
<dd>Echange les contenus du tampon et de la ligne courante.</dd>
</dl>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="inputsed" id="inputsed">Directive</a> <a name="InputSed" id="InputSed">InputSed</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Commande sed � ex�cuter pour le filtrage des donn�es d'une
-requ�te (en g�n�ral des donn�es <code>POST</code>)</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>InputSed <var>commande-sed</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td /></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_sed</td></tr>
-</table>
- <p>La directive <code class="directive">InputSed</code> permet de sp�cifier
- la commande sed � ex�cuter pour le filtrage des donn�es (en g�n�ral
- des donn�es <code>POST</code>) d'une requ�te.
- </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="outputsed" id="outputsed">Directive</a> <a name="OutputSed" id="OutputSed">OutputSed</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Commande sed pour le filtrage des contenus de type
-r�ponse</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>OutputSed <var>commande-sed</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td /></tr>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_sed</td></tr>
-</table>
- <p>La directive <code class="directive">OutputSed</code> permet de sp�cifier
- la commande <code>sed</code> � ex�cuter dans le cadre du traitement
- d'une r�ponse.
- </p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_sed.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_session.html.en b/docs/manual/mod/mod_session.html.en
index 09efce4878..9c8214657a 100644
--- a/docs/manual/mod/mod_session.html.en
+++ b/docs/manual/mod/mod_session.html.en
@@ -88,6 +88,144 @@
<li><code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Session" id="Session">Session</a> <a name="session" id="session">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables a session for the current directory or location</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Session On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Session Off</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#Override">Override:</a></th><td>AuthConfig</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>
+</table>
+ <p>The <code class="directive">Session</code> directive enables a session for the
+ directory or location container. Further directives control where the
+ session will be stored and how privacy is maintained.</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="SessionEnv" id="SessionEnv">SessionEnv</a> <a name="sessionenv" id="sessionenv">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Control whether the contents of the session are written to the
+<var>HTTP_SESSION</var> environment variable</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionEnv On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SessionEnv Off</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#Override">Override:</a></th><td>AuthConfig</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>
+</table>
+ <p>If set to <var>On</var>, the <code class="directive">SessionEnv</code> directive
+ causes the contents of the session to be written to a CGI environment
+ variable called <var>HTTP_SESSION</var>.</p>
+
+ <p>The string is written in the URL query format, for example:</p>
+
+ <div class="example"><p><code>
+ <code>key1=foo&amp;key3=bar</code>
+ </code></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="SessionExclude" id="SessionExclude">SessionExclude</a> <a name="sessionexclude" id="sessionexclude">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define URL prefixes for which a session is ignored</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionExclude <var>path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>none</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>
+</table>
+ <p>The <code class="directive">SessionExclude</code> directive allows sessions to
+ be disabled relative to URL prefixes only. This can be used to make a
+ website more efficient, by targeting a more precise URL space for which
+ a session should be maintained. By default, all URLs within the directory
+ or location are included in the session. The
+ <code class="directive"><a href="#sessionexclude">SessionExclude</a></code> directive takes
+ precedence over the
+ <code class="directive"><a href="#sessioninclude">SessionInclude</a></code> directive.</p>
+
+ <div class="warning"><h3>Warning</h3>
+ <p>This directive has a similar purpose to the <var>path</var> attribute
+ in HTTP cookies, but should not be confused with this attribute. This
+ 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="SessionHeader" id="SessionHeader">SessionHeader</a> <a name="sessionheader" id="sessionheader">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Import session updates from a given HTTP response header</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionHeader <var>header</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>none</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#Override">Override:</a></th><td>AuthConfig</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>
+</table>
+ <p>The <code class="directive">SessionHeader</code> directive defines the name of an
+ HTTP response header which, if present, will be parsed and written to the
+ current session.</p>
+
+ <p>The header value is expected to be in the URL query format, for example:</p>
+
+ <div class="example"><p><code>
+ <code>key1=foo&amp;key2=&amp;key3=bar</code>
+ </code></p></div>
+
+ <p>Where a key is set to the empty string, that key will be removed from the
+ session.</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="SessionInclude" id="SessionInclude">SessionInclude</a> <a name="sessioninclude" id="sessioninclude">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define URL prefixes for which a session is valid</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionInclude <var>path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>all URLs</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#Override">Override:</a></th><td>AuthConfig</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>
+</table>
+ <p>The <code class="directive">SessionInclude</code> directive allows sessions to
+ be made valid for specific URL prefixes only. This can be used to make a
+ website more efficient, by targeting a more precise URL space for which
+ a session should be maintained. By default, all URLs within the directory
+ or location are included in the session.</p>
+
+ <div class="warning"><h3>Warning</h3>
+ <p>This directive has a similar purpose to the <var>path</var> attribute
+ in HTTP cookies, but should not be confused with this attribute. This
+ 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="SessionMaxAge" id="SessionMaxAge">SessionMaxAge</a> <a name="sessionmaxage" id="sessionmaxage">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define a maximum age in seconds for a session</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionMaxAge <var>maxage</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SessionMaxAge 0</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#Override">Override:</a></th><td>AuthConfig</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>
+</table>
+ <p>The <code class="directive">SessionMaxAge</code> directive defines a time limit
+ for which a session will remain valid. When a session is saved, this time
+ limit is reset and an existing session can be continued. If a session
+ becomes older than this limit without a request to the server to refresh
+ the session, the session will time out and be removed. Where a session is
+ used to stored user login details, this has the effect of logging the user
+ out automatically after the given time.</p>
+
+ <p>Setting the maxage to zero disables session expiry.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="whatisasession" id="whatisasession">What is a session?</a></h2>
<p>At the core of the session interface is a table of key and value pairs
@@ -343,144 +481,6 @@ AuthName realm
</dl>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Session" id="Session">Session</a> <a name="session" id="session">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables a session for the current directory or location</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Session On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Session Off</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#Override">Override:</a></th><td>AuthConfig</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>
-</table>
- <p>The <code class="directive">Session</code> directive enables a session for the
- directory or location container. Further directives control where the
- session will be stored and how privacy is maintained.</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="SessionEnv" id="SessionEnv">SessionEnv</a> <a name="sessionenv" id="sessionenv">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Control whether the contents of the session are written to the
-<var>HTTP_SESSION</var> environment variable</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionEnv On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SessionEnv Off</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#Override">Override:</a></th><td>AuthConfig</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>
-</table>
- <p>If set to <var>On</var>, the <code class="directive">SessionEnv</code> directive
- causes the contents of the session to be written to a CGI environment
- variable called <var>HTTP_SESSION</var>.</p>
-
- <p>The string is written in the URL query format, for example:</p>
-
- <div class="example"><p><code>
- <code>key1=foo&amp;key3=bar</code>
- </code></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="SessionExclude" id="SessionExclude">SessionExclude</a> <a name="sessionexclude" id="sessionexclude">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define URL prefixes for which a session is ignored</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionExclude <var>path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>none</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>
-</table>
- <p>The <code class="directive">SessionExclude</code> directive allows sessions to
- be disabled relative to URL prefixes only. This can be used to make a
- website more efficient, by targeting a more precise URL space for which
- a session should be maintained. By default, all URLs within the directory
- or location are included in the session. The
- <code class="directive"><a href="#sessionexclude">SessionExclude</a></code> directive takes
- precedence over the
- <code class="directive"><a href="#sessioninclude">SessionInclude</a></code> directive.</p>
-
- <div class="warning"><h3>Warning</h3>
- <p>This directive has a similar purpose to the <var>path</var> attribute
- in HTTP cookies, but should not be confused with this attribute. This
- 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="SessionHeader" id="SessionHeader">SessionHeader</a> <a name="sessionheader" id="sessionheader">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Import session updates from a given HTTP response header</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionHeader <var>header</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>none</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#Override">Override:</a></th><td>AuthConfig</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>
-</table>
- <p>The <code class="directive">SessionHeader</code> directive defines the name of an
- HTTP response header which, if present, will be parsed and written to the
- current session.</p>
-
- <p>The header value is expected to be in the URL query format, for example:</p>
-
- <div class="example"><p><code>
- <code>key1=foo&amp;key2=&amp;key3=bar</code>
- </code></p></div>
-
- <p>Where a key is set to the empty string, that key will be removed from the
- session.</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="SessionInclude" id="SessionInclude">SessionInclude</a> <a name="sessioninclude" id="sessioninclude">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define URL prefixes for which a session is valid</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionInclude <var>path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>all URLs</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#Override">Override:</a></th><td>AuthConfig</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>
-</table>
- <p>The <code class="directive">SessionInclude</code> directive allows sessions to
- be made valid for specific URL prefixes only. This can be used to make a
- website more efficient, by targeting a more precise URL space for which
- a session should be maintained. By default, all URLs within the directory
- or location are included in the session.</p>
-
- <div class="warning"><h3>Warning</h3>
- <p>This directive has a similar purpose to the <var>path</var> attribute
- in HTTP cookies, but should not be confused with this attribute. This
- 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="SessionMaxAge" id="SessionMaxAge">SessionMaxAge</a> <a name="sessionmaxage" id="sessionmaxage">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define a maximum age in seconds for a session</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionMaxAge <var>maxage</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SessionMaxAge 0</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#Override">Override:</a></th><td>AuthConfig</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>
-</table>
- <p>The <code class="directive">SessionMaxAge</code> directive defines a time limit
- for which a session will remain valid. When a session is saved, this time
- limit is reset and an existing session can be continued. If a session
- becomes older than this limit without a request to the server to refresh
- the session, the session will time out and be removed. Where a session is
- used to stored user login details, this has the effect of logging the user
- out automatically after the given time.</p>
-
- <p>Setting the maxage to zero disables session expiry.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_session.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_session.html.fr b/docs/manual/mod/mod_session.html.fr
index 8238103164..1607a27838 100644
--- a/docs/manual/mod/mod_session.html.fr
+++ b/docs/manual/mod/mod_session.html.fr
@@ -99,6 +99,158 @@
<li><code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="session" id="session">Directive</a> <a name="Session" id="Session">Session</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ouvre une session pour le contexte courant</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>Session On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>Session Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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>
+</table>
+ <p>La directive <code class="directive">Session</code> permet d'ouvrir une
+ session pour le contexte ou conteneur courant. Les directives
+ suivantes permettent de d�finir o� la session sera stock�e et
+ comment sera assur�e la confidentialit�.</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="sessionenv" id="sessionenv">Directive</a> <a name="SessionEnv" id="SessionEnv">SessionEnv</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit si le contenu de la session doit �tre enregistr�
+dans la variable d'environnement <var>HTTP_SESSION</var></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SessionEnv On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SessionEnv Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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>
+</table>
+ <p>Lorsque la directive <code class="directive">SessionEnv</code> est
+ d�finie � <var>On</var>, le contenu de la session est enregistr�
+ dans une variable d'environnement CGI nomm�e
+ <var>HTTP_SESSION</var>.</p>
+
+ <p>La cha�ne est �crite sous le m�me format que celui de la cha�ne
+ d'arguments d'une URL, comme dans l'exemple suivant :</p>
+
+ <div class="example"><p><code>
+ <code>cl�1=foo&amp;cl�3=bar</code>
+ </code></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="sessionexclude" id="sessionexclude">Directive</a> <a name="SessionExclude" id="SessionExclude">SessionExclude</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit les pr�fixes d'URLs pour lesquels une session sera
+ignor�e</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SessionExclude <var>chemin</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>configuration du serveur, 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>
+</table>
+ <p>La directive <code class="directive">SessionExclude</code> permet de
+ d�finir les pr�fixes d'URLs pour lesquels la session sera
+ d�sactiv�e. Ceci peut am�liorer l'efficacit� d'un site web, en
+ ciblant de mani�re plus pr�cise l'espace d'URL pour lequel une
+ session devra �tre maintenue. Par d�faut, toutes les URLs du
+ contexte ou du conteneur courant sont incluses dans la session. La
+ directive <code class="directive"><a href="#sessionexclude">SessionExclude</a></code>
+ l'emporte sur la directive <code class="directive"><a href="#sessioninclude">SessionInclude</a></code>.</p>
+
+ <div class="warning"><h3>Avertissement</h3>
+ <p>Cette directive a un comportement similaire � celui de l'attribut
+ <var>chemin</var> des cookies HTTP, mais ne doit pas �tre confondue
+ avec cet attribut. En effet, cette directive ne d�finit pas
+ l'attribut <var>chemin</var>, qui doit �tre configur�
+ s�par�ment.</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">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
+r�ponse HTTP sp�cifi�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SessionHeader <var>en-t�te</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>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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>
+</table>
+ <p>La directive <code class="directive">SessionHeader</code> permet de
+ d�finir le nom d'un en-t�te de r�ponse HTTP qui, s'il est pr�sent,
+ sera lu et son contenu �crit dans la session courante.</p>
+
+ <p>Le contenu de l'en-t�te doit se pr�senter sous le m�me format que
+ celui de la cha�ne d'arguments d'une URL, comme dans l'exemple
+ suivant :</p>
+
+ <div class="example"><p><code>
+ <code>cl�1=foo&amp;cl�2=&amp;cl�3=bar</code>
+ </code></p></div>
+
+ <p>Si une cl� a pour valeur la cha�ne vide, elle sera supprim�e de
+ la session.</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="sessioninclude" id="sessioninclude">Directive</a> <a name="SessionInclude" id="SessionInclude">SessionInclude</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit les pr�fixes d'URL pour lesquels une session est
+valide</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SessionInclude <var>chemin</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>toutes URLs</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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>
+</table>
+ <p>La directive <code class="directive">SessionInclude</code> permet de
+ d�finir les pr�fixes d'URL sp�cifiques pour lesquels une session
+ sera valide. Ceci peut am�liorer l'efficacit� d'un site web, en
+ ciblant de mani�re plus pr�cise l'espace d'URL pour lequel une
+ session devra �tre maintenue. Par d�faut, toutes les URLs du
+ contexte ou du conteneur courant sont incluses dans la session.</p>
+
+ <div class="warning"><h3>Avertissement</h3>
+ <p>Cette directive a un comportement similaire � celui de l'attribut
+ <var>chemin</var> des cookies HTTP, mais ne doit pas �tre confondue
+ avec cet attribut. En effet, cette directive ne d�finit pas
+ l'attribut <var>chemin</var>, qui doit �tre configur� s�par�ment.</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="sessionmaxage" id="sessionmaxage">Directive</a> <a name="SessionMaxAge" id="SessionMaxAge">SessionMaxAge</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit une dur�e de vie maximale pour la session en
+secondes</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SessionMaxAge <var>dur�e de vie maximale</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SessionMaxAge 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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>
+</table>
+ <p>La directive <code class="directive">SessionMaxAge</code> permet de
+ d�finir la dur�e maximale pendant laquelle une session restera
+ valide. Lorsqu'une session est sauvegard�e, cette dur�e est
+ r�initialis�e et la session peut continuer d'exister. Si la dur�e
+ d'une session d�passe cette limite sans qu'une requ�te au serveur ne
+ vienne la rafra�chir, la session va passer hors d�lai et sera
+ supprim�e. Lorsqu'une session est utilis�e pour stocker les
+ informations de connexion d'un utilisateur, ceci aura pour effet de
+ le d�connecter automatiquement apr�s le d�lai sp�cifi�.</p>
+
+ <p>Donner � cette directive la valeur 0 emp�che l'expiration de la
+ session.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="whatisasession" id="whatisasession">Qu'est-ce qu'une session ?</a></h2>
<p>Au coeur de l'interface de session se trouve une table de
@@ -395,158 +547,6 @@ AuthName realm
</dl>
</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="session" id="session">Directive</a> <a name="Session" id="Session">Session</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ouvre une session pour le contexte courant</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>Session On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>Session Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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>
-</table>
- <p>La directive <code class="directive">Session</code> permet d'ouvrir une
- session pour le contexte ou conteneur courant. Les directives
- suivantes permettent de d�finir o� la session sera stock�e et
- comment sera assur�e la confidentialit�.</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="sessionenv" id="sessionenv">Directive</a> <a name="SessionEnv" id="SessionEnv">SessionEnv</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit si le contenu de la session doit �tre enregistr�
-dans la variable d'environnement <var>HTTP_SESSION</var></td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SessionEnv On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SessionEnv Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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>
-</table>
- <p>Lorsque la directive <code class="directive">SessionEnv</code> est
- d�finie � <var>On</var>, le contenu de la session est enregistr�
- dans une variable d'environnement CGI nomm�e
- <var>HTTP_SESSION</var>.</p>
-
- <p>La cha�ne est �crite sous le m�me format que celui de la cha�ne
- d'arguments d'une URL, comme dans l'exemple suivant :</p>
-
- <div class="example"><p><code>
- <code>cl�1=foo&amp;cl�3=bar</code>
- </code></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="sessionexclude" id="sessionexclude">Directive</a> <a name="SessionExclude" id="SessionExclude">SessionExclude</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit les pr�fixes d'URLs pour lesquels une session sera
-ignor�e</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SessionExclude <var>chemin</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>configuration du serveur, 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>
-</table>
- <p>La directive <code class="directive">SessionExclude</code> permet de
- d�finir les pr�fixes d'URLs pour lesquels la session sera
- d�sactiv�e. Ceci peut am�liorer l'efficacit� d'un site web, en
- ciblant de mani�re plus pr�cise l'espace d'URL pour lequel une
- session devra �tre maintenue. Par d�faut, toutes les URLs du
- contexte ou du conteneur courant sont incluses dans la session. La
- directive <code class="directive"><a href="#sessionexclude">SessionExclude</a></code>
- l'emporte sur la directive <code class="directive"><a href="#sessioninclude">SessionInclude</a></code>.</p>
-
- <div class="warning"><h3>Avertissement</h3>
- <p>Cette directive a un comportement similaire � celui de l'attribut
- <var>chemin</var> des cookies HTTP, mais ne doit pas �tre confondue
- avec cet attribut. En effet, cette directive ne d�finit pas
- l'attribut <var>chemin</var>, qui doit �tre configur�
- s�par�ment.</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">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
-r�ponse HTTP sp�cifi�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SessionHeader <var>en-t�te</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>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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>
-</table>
- <p>La directive <code class="directive">SessionHeader</code> permet de
- d�finir le nom d'un en-t�te de r�ponse HTTP qui, s'il est pr�sent,
- sera lu et son contenu �crit dans la session courante.</p>
-
- <p>Le contenu de l'en-t�te doit se pr�senter sous le m�me format que
- celui de la cha�ne d'arguments d'une URL, comme dans l'exemple
- suivant :</p>
-
- <div class="example"><p><code>
- <code>cl�1=foo&amp;cl�2=&amp;cl�3=bar</code>
- </code></p></div>
-
- <p>Si une cl� a pour valeur la cha�ne vide, elle sera supprim�e de
- la session.</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="sessioninclude" id="sessioninclude">Directive</a> <a name="SessionInclude" id="SessionInclude">SessionInclude</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit les pr�fixes d'URL pour lesquels une session est
-valide</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SessionInclude <var>chemin</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>toutes URLs</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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>
-</table>
- <p>La directive <code class="directive">SessionInclude</code> permet de
- d�finir les pr�fixes d'URL sp�cifiques pour lesquels une session
- sera valide. Ceci peut am�liorer l'efficacit� d'un site web, en
- ciblant de mani�re plus pr�cise l'espace d'URL pour lequel une
- session devra �tre maintenue. Par d�faut, toutes les URLs du
- contexte ou du conteneur courant sont incluses dans la session.</p>
-
- <div class="warning"><h3>Avertissement</h3>
- <p>Cette directive a un comportement similaire � celui de l'attribut
- <var>chemin</var> des cookies HTTP, mais ne doit pas �tre confondue
- avec cet attribut. En effet, cette directive ne d�finit pas
- l'attribut <var>chemin</var>, qui doit �tre configur� s�par�ment.</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="sessionmaxage" id="sessionmaxage">Directive</a> <a name="SessionMaxAge" id="SessionMaxAge">SessionMaxAge</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit une dur�e de vie maximale pour la session en
-secondes</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>SessionMaxAge <var>dur�e de vie maximale</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>SessionMaxAge 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>AuthConfig</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>
-</table>
- <p>La directive <code class="directive">SessionMaxAge</code> permet de
- d�finir la dur�e maximale pendant laquelle une session restera
- valide. Lorsqu'une session est sauvegard�e, cette dur�e est
- r�initialis�e et la session peut continuer d'exister. Si la dur�e
- d'une session d�passe cette limite sans qu'une requ�te au serveur ne
- vienne la rafra�chir, la session va passer hors d�lai et sera
- supprim�e. Lorsqu'une session est utilis�e pour stocker les
- informations de connexion d'un utilisateur, ceci aura pour effet de
- le d�connecter automatiquement apr�s le d�lai sp�cifi�.</p>
-
- <p>Donner � cette directive la valeur 0 emp�che l'expiration de la
- session.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_session.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_session_cookie.html.en b/docs/manual/mod/mod_session_cookie.html.en
index 1b7f91ce0e..b638bff330 100644
--- a/docs/manual/mod/mod_session_cookie.html.en
+++ b/docs/manual/mod/mod_session_cookie.html.en
@@ -74,25 +74,6 @@
<li><code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="basicexamples" id="basicexamples">Basic Examples</a></h2>
-
- <p>To create a simple session and store it in a cookie called
- <var>session</var>, configure the session as follows:</p>
-
- <div class="example"><h3>Browser based session</h3><pre class="prettyprint lang-config">Session On
-SessionCookieName session path=/</pre>
-</div>
-
- <p>For more examples on how the session can be configured to be read
- from and written to by a CGI application, see the
- <code class="module"><a href="../mod/mod_session.html">mod_session</a></code> examples section.</p>
-
- <p>For documentation on how the session can be used to store username
- and password details, see the <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> module.</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="SessionCookieName" id="SessionCookieName">SessionCookieName</a> <a name="sessioncookiename" id="sessioncookiename">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Name and attributes for the RFC2109 cookie storing the session</td></tr>
@@ -164,6 +145,25 @@ SessionCookieName2 session path=/private;domain=example.com;httponly;secure;vers
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="basicexamples" id="basicexamples">Basic Examples</a></h2>
+
+ <p>To create a simple session and store it in a cookie called
+ <var>session</var>, configure the session as follows:</p>
+
+ <div class="example"><h3>Browser based session</h3><pre class="prettyprint lang-config">Session On
+SessionCookieName session path=/</pre>
+</div>
+
+ <p>For more examples on how the session can be configured to be read
+ from and written to by a CGI application, see the
+ <code class="module"><a href="../mod/mod_session.html">mod_session</a></code> examples section.</p>
+
+ <p>For documentation on how the session can be used to store username
+ and password details, see the <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> module.</p>
+
+ </div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_session_cookie.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_session_cookie.html.fr b/docs/manual/mod/mod_session_cookie.html.fr
index 7347fd700c..a8ab01406b 100644
--- a/docs/manual/mod/mod_session_cookie.html.fr
+++ b/docs/manual/mod/mod_session_cookie.html.fr
@@ -79,28 +79,6 @@
<li><code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="basicexamples" id="basicexamples">Exemples simples</a></h2>
-
- <p>Pour cr�er une session et la stocker dans un cookie nomm�
- <var>session</var>, configurez-la comme suit :</p>
-
- <div class="example"><h3>Session stock�e au niveau du navigateur</h3><pre class="prettyprint lang-config">Session On
-SessionCookieName session path=/</pre>
-</div>
-
- <p>Pour plus d'exemples sur la mani�re dont une session doit �tre
- configur�e pour qu'une application CGI puisse l'utiliser, voir la
- section exemples de la documentation du module
- <code class="module"><a href="../mod/mod_session.html">mod_session</a></code>.</p>
-
- <p>Pour des d�tails sur la mani�re dont une session peut �tre
- utilis�e pour stocker des informations de type nom
- d'utilisateur/mot de passe, voir la documentation du module
- <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>.</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="sessioncookiename" id="sessioncookiename">Directive</a> <a name="SessionCookieName" id="SessionCookieName">SessionCookieName</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Nom et attributs du cookie RFC2109 dans lequel la session
@@ -184,6 +162,28 @@ des en-t�tes HTTP entrants</td></tr>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="basicexamples" id="basicexamples">Exemples simples</a></h2>
+
+ <p>Pour cr�er une session et la stocker dans un cookie nomm�
+ <var>session</var>, configurez-la comme suit :</p>
+
+ <div class="example"><h3>Session stock�e au niveau du navigateur</h3><pre class="prettyprint lang-config">Session On
+SessionCookieName session path=/</pre>
+</div>
+
+ <p>Pour plus d'exemples sur la mani�re dont une session doit �tre
+ configur�e pour qu'une application CGI puisse l'utiliser, voir la
+ section exemples de la documentation du module
+ <code class="module"><a href="../mod/mod_session.html">mod_session</a></code>.</p>
+
+ <p>Pour des d�tails sur la mani�re dont une session peut �tre
+ utilis�e pour stocker des informations de type nom
+ d'utilisateur/mot de passe, voir la documentation du module
+ <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>.</p>
+
+ </div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_session_cookie.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_session_crypto.html.en b/docs/manual/mod/mod_session_crypto.html.en
index c6433029c8..2f46202e3c 100644
--- a/docs/manual/mod/mod_session_crypto.html.en
+++ b/docs/manual/mod/mod_session_crypto.html.en
@@ -71,29 +71,6 @@
<li><code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="basicusage" id="basicusage">Basic Usage</a></h2>
-
- <p>To create a simple encrypted session and store it in a cookie called
- <var>session</var>, configure the session as follows:</p>
-
- <div class="example"><h3>Browser based encrypted session</h3><pre class="prettyprint lang-config">Session On
-SessionCookieName session path=/
-SessionCryptoPassphrase secret</pre>
-</div>
-
- <p>The session will be encrypted with the given key. Different servers can
- be configured to share sessions by ensuring the same encryption key is used
- on each server.</p>
-
- <p>If the encryption key is changed, sessions will be invalidated
- automatically.</p>
-
- <p>For documentation on how the session can be used to store username
- and password details, see the <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> module.</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="SessionCryptoCipher" id="SessionCryptoCipher">SessionCryptoCipher</a> <a name="sessioncryptocipher" id="sessioncryptocipher">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The crypto cipher to be used to encrypt the session</td></tr>
@@ -232,6 +209,29 @@ SessionCryptoPassphrase "exec:/path/to/otherProgram argument1"</pre></div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="basicusage" id="basicusage">Basic Usage</a></h2>
+
+ <p>To create a simple encrypted session and store it in a cookie called
+ <var>session</var>, configure the session as follows:</p>
+
+ <div class="example"><h3>Browser based encrypted session</h3><pre class="prettyprint lang-config">Session On
+SessionCookieName session path=/
+SessionCryptoPassphrase secret</pre>
+</div>
+
+ <p>The session will be encrypted with the given key. Different servers can
+ be configured to share sessions by ensuring the same encryption key is used
+ on each server.</p>
+
+ <p>If the encryption key is changed, sessions will be invalidated
+ automatically.</p>
+
+ <p>For documentation on how the session can be used to store username
+ and password details, see the <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> module.</p>
+
+ </div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_session_crypto.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_session_crypto.html.fr b/docs/manual/mod/mod_session_crypto.html.fr
index a434091c14..312c2f17db 100644
--- a/docs/manual/mod/mod_session_crypto.html.fr
+++ b/docs/manual/mod/mod_session_crypto.html.fr
@@ -74,33 +74,6 @@
<li><code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="basicusage" id="basicusage">Utilisation de base</a></h2>
-
- <p>Pour cr�er une session chiffr�e et la stocker dans un cookie
- nomm� <var>session</var>, configurez la comme suit :</p>
-
- <div class="example"><h3>Session chiffr�e stock�e au niveau du
- serveur</h3><pre class="prettyprint lang-config">Session On
-SessionCookieName session path=/
-SessionCryptoPassphrase secret</pre>
-</div>
-
- <p>La session sera chiffr�e avec la cl� sp�cifi�e. Il est possible
- de configurer plusieurs serveurs pour qu'ils puissent partager des
- sessions, en s'assurant que la m�me cl� de chiffrement est
- utilis�e sur chaque serveur.</p>
-
- <p>Si la cl� de chiffrement est modifi�e, les sessions seront
- automatiquement invalid�es.</p>
-
- <p>Pour des d�tails sur la mani�re dont une session peut �tre
- utilis�e pour stocker des informations de type nom
- d'utilisateur/mot de passe, voir la documentation du module
- <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>.</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="sessioncryptocipher" id="sessioncryptocipher">Directive</a> <a name="SessionCryptoCipher" id="SessionCryptoCipher">SessionCryptoCipher</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>L'algorithme � utiliser pour le chiffrement de la session</td></tr>
@@ -258,6 +231,33 @@ session</td></tr>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="basicusage" id="basicusage">Utilisation de base</a></h2>
+
+ <p>Pour cr�er une session chiffr�e et la stocker dans un cookie
+ nomm� <var>session</var>, configurez la comme suit :</p>
+
+ <div class="example"><h3>Session chiffr�e stock�e au niveau du
+ serveur</h3><pre class="prettyprint lang-config">Session On
+SessionCookieName session path=/
+SessionCryptoPassphrase secret</pre>
+</div>
+
+ <p>La session sera chiffr�e avec la cl� sp�cifi�e. Il est possible
+ de configurer plusieurs serveurs pour qu'ils puissent partager des
+ sessions, en s'assurant que la m�me cl� de chiffrement est
+ utilis�e sur chaque serveur.</p>
+
+ <p>Si la cl� de chiffrement est modifi�e, les sessions seront
+ automatiquement invalid�es.</p>
+
+ <p>Pour des d�tails sur la mani�re dont une session peut �tre
+ utilis�e pour stocker des informations de type nom
+ d'utilisateur/mot de passe, voir la documentation du module
+ <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>.</p>
+
+ </div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_session_crypto.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_session_dbd.html.en b/docs/manual/mod/mod_session_dbd.html.en
index 95db6db97e..423112a049 100644
--- a/docs/manual/mod/mod_session_dbd.html.en
+++ b/docs/manual/mod/mod_session_dbd.html.en
@@ -86,86 +86,6 @@
<li><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="dbdconfig" id="dbdconfig">DBD Configuration</a></h2>
-
- <p>Before the <code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code> module can be configured to maintain a
- session, the <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> module must be configured to make the various database queries
- available to the server.</p>
-
- <p>There are four queries required to keep a session maintained, to select an existing session,
- to update an existing session, to insert a new session, and to delete an expired or empty
- session. These queries are configured as per the example below.</p>
-
- <div class="example"><h3>Sample DBD configuration</h3><pre class="prettyprint lang-config">DBDriver pgsql
-DBDParams "dbname=apachesession user=apache password=xxxxx host=localhost"
-DBDPrepareSQL "delete from session where key = %s" deletesession
-DBDPrepareSQL "update session set value = %s, expiry = %lld, key = %s where key = %s" updatesession
-DBDPrepareSQL "insert into session (value, expiry, key) values (%s, %lld, %s)" insertsession
-DBDPrepareSQL "select value from session where key = %s and (expiry = 0 or expiry &gt; %lld)" selectsession
-DBDPrepareSQL "delete from session where expiry != 0 and expiry &lt; %lld" cleansession</pre>
-</div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="anonymous" id="anonymous">Anonymous Sessions</a></h2>
-
- <p>Anonymous sessions are keyed against a unique UUID, and stored on the
- browser within an HTTP cookie. This method is similar to that used by most
- application servers to store session information.</p>
-
- <p>To create a simple anonymous session and store it in a postgres database
- table called <var>apachesession</var>, and save the session ID in a cookie
- called <var>session</var>, configure the session as follows:</p>
-
- <div class="example"><h3>SQL based anonymous session</h3><pre class="prettyprint lang-config">Session On
-SessionDBDCookieName session path=/</pre>
-</div>
-
- <p>For more examples on how the session can be configured to be read
- from and written to by a CGI application, see the
- <code class="module"><a href="../mod/mod_session.html">mod_session</a></code> examples section.</p>
-
- <p>For documentation on how the session can be used to store username
- and password details, see the <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> module.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="peruser" id="peruser">Per User Sessions</a></h2>
-
- <p>Per user sessions are keyed against the username of a successfully
- authenticated user. It offers the most privacy, as no external handle
- to the session exists outside of the authenticated realm.</p>
-
- <p>Per user sessions work within a correctly configured authenticated
- environment, be that using basic authentication, digest authentication
- or SSL client certificates. Due to the limitations of who came first,
- the chicken or the egg, per user sessions cannot be used to store
- authentication credentials from a module like
- <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>.</p>
-
- <p>To create a simple per user session and store it in a postgres database
- table called <var>apachesession</var>, and with the session keyed to the
- userid, configure the session as follows:</p>
-
- <div class="example"><h3>SQL based per user session</h3><pre class="prettyprint lang-config">Session On
-SessionDBDPerUser On</pre>
-</div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="housekeeping" id="housekeeping">Database Housekeeping</a></h2>
- <p>Over the course of time, the database can be expected to start accumulating
- expired sessions. At this point, the <code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code> module
- is not yet able to handle session expiry automatically.</p>
-
- <div class="warning"><h3>Warning</h3>
- <p>The administrator will need to set up an external process via cron to clean
- out expired sessions.</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="SessionDBDCookieName" id="SessionDBDCookieName">SessionDBDCookieName</a> <a name="sessiondbdcookiename" id="sessiondbdcookiename">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Name and attributes for the RFC2109 cookie storing the session ID</td></tr>
@@ -324,6 +244,86 @@ SessionDBDCookieName2 session path=/private;domain=example.com;httponly;secure;v
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="dbdconfig" id="dbdconfig">DBD Configuration</a></h2>
+
+ <p>Before the <code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code> module can be configured to maintain a
+ session, the <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> module must be configured to make the various database queries
+ available to the server.</p>
+
+ <p>There are four queries required to keep a session maintained, to select an existing session,
+ to update an existing session, to insert a new session, and to delete an expired or empty
+ session. These queries are configured as per the example below.</p>
+
+ <div class="example"><h3>Sample DBD configuration</h3><pre class="prettyprint lang-config">DBDriver pgsql
+DBDParams "dbname=apachesession user=apache password=xxxxx host=localhost"
+DBDPrepareSQL "delete from session where key = %s" deletesession
+DBDPrepareSQL "update session set value = %s, expiry = %lld, key = %s where key = %s" updatesession
+DBDPrepareSQL "insert into session (value, expiry, key) values (%s, %lld, %s)" insertsession
+DBDPrepareSQL "select value from session where key = %s and (expiry = 0 or expiry &gt; %lld)" selectsession
+DBDPrepareSQL "delete from session where expiry != 0 and expiry &lt; %lld" cleansession</pre>
+</div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="anonymous" id="anonymous">Anonymous Sessions</a></h2>
+
+ <p>Anonymous sessions are keyed against a unique UUID, and stored on the
+ browser within an HTTP cookie. This method is similar to that used by most
+ application servers to store session information.</p>
+
+ <p>To create a simple anonymous session and store it in a postgres database
+ table called <var>apachesession</var>, and save the session ID in a cookie
+ called <var>session</var>, configure the session as follows:</p>
+
+ <div class="example"><h3>SQL based anonymous session</h3><pre class="prettyprint lang-config">Session On
+SessionDBDCookieName session path=/</pre>
+</div>
+
+ <p>For more examples on how the session can be configured to be read
+ from and written to by a CGI application, see the
+ <code class="module"><a href="../mod/mod_session.html">mod_session</a></code> examples section.</p>
+
+ <p>For documentation on how the session can be used to store username
+ and password details, see the <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code> module.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="peruser" id="peruser">Per User Sessions</a></h2>
+
+ <p>Per user sessions are keyed against the username of a successfully
+ authenticated user. It offers the most privacy, as no external handle
+ to the session exists outside of the authenticated realm.</p>
+
+ <p>Per user sessions work within a correctly configured authenticated
+ environment, be that using basic authentication, digest authentication
+ or SSL client certificates. Due to the limitations of who came first,
+ the chicken or the egg, per user sessions cannot be used to store
+ authentication credentials from a module like
+ <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>.</p>
+
+ <p>To create a simple per user session and store it in a postgres database
+ table called <var>apachesession</var>, and with the session keyed to the
+ userid, configure the session as follows:</p>
+
+ <div class="example"><h3>SQL based per user session</h3><pre class="prettyprint lang-config">Session On
+SessionDBDPerUser On</pre>
+</div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="housekeeping" id="housekeeping">Database Housekeeping</a></h2>
+ <p>Over the course of time, the database can be expected to start accumulating
+ expired sessions. At this point, the <code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code> module
+ is not yet able to handle session expiry automatically.</p>
+
+ <div class="warning"><h3>Warning</h3>
+ <p>The administrator will need to set up an external process via cron to clean
+ out expired sessions.</p>
+ </div>
+
+ </div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_session_dbd.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_session_dbd.html.fr b/docs/manual/mod/mod_session_dbd.html.fr
index 2d41ba3e75..5bec52e6ec 100644
--- a/docs/manual/mod/mod_session_dbd.html.fr
+++ b/docs/manual/mod/mod_session_dbd.html.fr
@@ -92,101 +92,6 @@
<li><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="dbdconfig" id="dbdconfig">Configuration de DBD</a></h2>
-
- <p>Pour que le module <code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code> puisse �tre
- configur� et maintenir une session, il faut tout d'abord
- configurer le module <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> pour que le serveur
- puisse ex�cuter des requ�tes vers la base de donn�es.</p>
-
- <p>Quatre types de requ�tes sont n�cessaires pour maintenir une
- session, s�lectionner ou mettre � jour une session existante,
- ins�rer une nouvelle session et supprimer une session vide ou
- arriv�e � expiration. Ces requ�tes sont configur�es comme dans
- l'exemple suivant :</p>
-
- <div class="example"><h3>Exemple de configuration de DBD</h3><pre class="prettyprint lang-config">DBDriver pgsql
-DBDParams "dbname=apachesession user=apache password=xxxxx host=localhost"
-DBDPrepareSQL "delete from session where key = %s" deletesession
-DBDPrepareSQL "update session set value = %s, expiry = %lld, key = %s where key = %s" updatesession
-DBDPrepareSQL "insert into session (value, expiry, key) values (%s, %lld, %s)" insertsession
-DBDPrepareSQL "select value from session where key = %s and (expiry = 0 or expiry &gt; %lld)" selectsession
-DBDPrepareSQL "delete from session where expiry != 0 and expiry &lt; %lld" cleansession</pre>
-</div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="anonymous" id="anonymous">Sessions anonymes</a></h2>
-
- <p>Les sessions anonymes sont identifi�es par un UUID unique, et
- stock�es dans un cookie au niveau du navigateur. Cette m�thode est
- similaire � celle utilis�e par la plupart des serveurs
- d'applications pour stocker les informations de session.</p>
-
- <p>Pour cr�er une session anonyme, la stocker dans une table de
- base de donn�e postgres nomm�e <var>apachesession</var>, et
- sauvegarder l'identifiant de session dans un cookie nomm�
- <var>session</var>, configurez la session comme suit :</p>
-
- <div class="example"><h3>Session anonyme bas�e sur SQL</h3><pre class="prettyprint lang-config">Session On
-SessionDBDCookieName session path=/</pre>
-</div>
-
- <p>Pour plus d'exemples sur la mani�re dont une application CGI
- peut acc�der aux informations de session, voir la section exemples
- de la documentation du module <code class="module"><a href="../mod/mod_session.html">mod_session</a></code>.</p>
-
- <p>Pour des d�tails sur la mani�re dont une session peut �tre
- utilis�e pour stocker des informations de type nom
- d'utilisateur/mot de passe, voir la documentation du module
- <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="peruser" id="peruser">Sessions propres � un
- utilisateur</a></h2>
-
- <p>Les sessions propres � un utilisateur sont identifi�es par le
- nom de l'utilisateur authentifi� avec succ�s. Ceci permet
- d'assurer une confidentialit� optimale, car aucun traitement
- externe � la session n'existe en dehors du contexte
- authentifi�.</p>
-
- <p>Les sessions propres � un utilisateur ne fonctionnent que dans
- un environnement d'authentification correctement configur�, qu'il
- s'agisse d'une authentification de base, � base de condens�s
- (digest) ou de certificats client SSL. Suite � des limitations
- dues � des d�pendances mutuelles, les sessions propres � un
- utilisateur ne peuvent pas �tre utilis�es pour stocker les donn�es
- d'authentification en provenance d'un module comme
- <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>.</p>
-
- <p>Pour cr�er une session propre � un utilisateur, la stocker dans
- une table de base de donn�es postgres nomm�e
- <var>apachesession</var>, avec comme cl� de session l'identifiant
- utilisateur, ajoutez les lignes suivantes :</p>
-
- <div class="example"><h3>Session propre � un utilisateur bas�e sur SQL</h3><pre class="prettyprint lang-config">Session On
-SessionDBDPerUser On</pre>
-</div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="housekeeping" id="housekeeping">Nettoyage de la base de
- donn�es</a></h2>
- <p>Avec le temps, la base de donn�es va commencer � accumuler des
- sessions expir�es. Pour le moment, le module
- <code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code> n'est pas en mesure de g�rer
- automatiquement l'expiration des sessions.</p>
-
- <div class="warning"><h3>Avertissement</h3>
- <p>L'administrateur devra mettre en oeuvre un traitement externe
- via cron pour nettoyer les sessions expir�es.</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="sessiondbdcookiename" id="sessiondbdcookiename">Directive</a> <a name="SessionDBDCookieName" id="SessionDBDCookieName">SessionDBDCookieName</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Nom et attributs du cookie RFC2109 qui contient
@@ -374,6 +279,101 @@ pr�existantes dans la base de donn�es</td></tr>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="dbdconfig" id="dbdconfig">Configuration de DBD</a></h2>
+
+ <p>Pour que le module <code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code> puisse �tre
+ configur� et maintenir une session, il faut tout d'abord
+ configurer le module <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> pour que le serveur
+ puisse ex�cuter des requ�tes vers la base de donn�es.</p>
+
+ <p>Quatre types de requ�tes sont n�cessaires pour maintenir une
+ session, s�lectionner ou mettre � jour une session existante,
+ ins�rer une nouvelle session et supprimer une session vide ou
+ arriv�e � expiration. Ces requ�tes sont configur�es comme dans
+ l'exemple suivant :</p>
+
+ <div class="example"><h3>Exemple de configuration de DBD</h3><pre class="prettyprint lang-config">DBDriver pgsql
+DBDParams "dbname=apachesession user=apache password=xxxxx host=localhost"
+DBDPrepareSQL "delete from session where key = %s" deletesession
+DBDPrepareSQL "update session set value = %s, expiry = %lld, key = %s where key = %s" updatesession
+DBDPrepareSQL "insert into session (value, expiry, key) values (%s, %lld, %s)" insertsession
+DBDPrepareSQL "select value from session where key = %s and (expiry = 0 or expiry &gt; %lld)" selectsession
+DBDPrepareSQL "delete from session where expiry != 0 and expiry &lt; %lld" cleansession</pre>
+</div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="anonymous" id="anonymous">Sessions anonymes</a></h2>
+
+ <p>Les sessions anonymes sont identifi�es par un UUID unique, et
+ stock�es dans un cookie au niveau du navigateur. Cette m�thode est
+ similaire � celle utilis�e par la plupart des serveurs
+ d'applications pour stocker les informations de session.</p>
+
+ <p>Pour cr�er une session anonyme, la stocker dans une table de
+ base de donn�e postgres nomm�e <var>apachesession</var>, et
+ sauvegarder l'identifiant de session dans un cookie nomm�
+ <var>session</var>, configurez la session comme suit :</p>
+
+ <div class="example"><h3>Session anonyme bas�e sur SQL</h3><pre class="prettyprint lang-config">Session On
+SessionDBDCookieName session path=/</pre>
+</div>
+
+ <p>Pour plus d'exemples sur la mani�re dont une application CGI
+ peut acc�der aux informations de session, voir la section exemples
+ de la documentation du module <code class="module"><a href="../mod/mod_session.html">mod_session</a></code>.</p>
+
+ <p>Pour des d�tails sur la mani�re dont une session peut �tre
+ utilis�e pour stocker des informations de type nom
+ d'utilisateur/mot de passe, voir la documentation du module
+ <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="peruser" id="peruser">Sessions propres � un
+ utilisateur</a></h2>
+
+ <p>Les sessions propres � un utilisateur sont identifi�es par le
+ nom de l'utilisateur authentifi� avec succ�s. Ceci permet
+ d'assurer une confidentialit� optimale, car aucun traitement
+ externe � la session n'existe en dehors du contexte
+ authentifi�.</p>
+
+ <p>Les sessions propres � un utilisateur ne fonctionnent que dans
+ un environnement d'authentification correctement configur�, qu'il
+ s'agisse d'une authentification de base, � base de condens�s
+ (digest) ou de certificats client SSL. Suite � des limitations
+ dues � des d�pendances mutuelles, les sessions propres � un
+ utilisateur ne peuvent pas �tre utilis�es pour stocker les donn�es
+ d'authentification en provenance d'un module comme
+ <code class="module"><a href="../mod/mod_auth_form.html">mod_auth_form</a></code>.</p>
+
+ <p>Pour cr�er une session propre � un utilisateur, la stocker dans
+ une table de base de donn�es postgres nomm�e
+ <var>apachesession</var>, avec comme cl� de session l'identifiant
+ utilisateur, ajoutez les lignes suivantes :</p>
+
+ <div class="example"><h3>Session propre � un utilisateur bas�e sur SQL</h3><pre class="prettyprint lang-config">Session On
+SessionDBDPerUser On</pre>
+</div>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="housekeeping" id="housekeeping">Nettoyage de la base de
+ donn�es</a></h2>
+ <p>Avec le temps, la base de donn�es va commencer � accumuler des
+ sessions expir�es. Pour le moment, le module
+ <code class="module"><a href="../mod/mod_session_dbd.html">mod_session_dbd</a></code> n'est pas en mesure de g�rer
+ automatiquement l'expiration des sessions.</p>
+
+ <div class="warning"><h3>Avertissement</h3>
+ <p>L'administrateur devra mettre en oeuvre un traitement externe
+ via cron pour nettoyer les sessions expir�es.</p>
+ </div>
+
+ </div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_session_dbd.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en
index db944390a3..01391ea269 100644
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -77,7 +77,6 @@ BrowserMatch MSIE !netscape</pre>
<ul class="seealso">
<li><a href="../env.html">Environment Variables in Apache HTTP Server</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="BrowserMatch" id="BrowserMatch">BrowserMatch</a> <a name="browsermatch" id="browsermatch">Directive</a></h2>
<table class="directive">
@@ -322,6 +321,7 @@ without respect to case</td></tr>
combination.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_setenvif.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_setenvif.html.fr b/docs/manual/mod/mod_setenvif.html.fr
index bbb84ac53f..ff11ea3164 100644
--- a/docs/manual/mod/mod_setenvif.html.fr
+++ b/docs/manual/mod/mod_setenvif.html.fr
@@ -79,7 +79,6 @@ BrowserMatch MSIE !netscape</pre>
<li><a href="../env.html">Les variables d'environnement et le
serveur HTTP Apache</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="browsermatch" id="browsermatch">Directive</a> <a name="BrowserMatch" id="BrowserMatch">BrowserMatch</a></h2>
<table class="directive">
@@ -335,6 +334,7 @@ attributs de la requ�te sans tenir compte de la casse</td></tr>
combinaison des m�mes caract�res, sans tenir compte de la casse.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_setenvif.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_setenvif.html.ja.utf8 b/docs/manual/mod/mod_setenvif.html.ja.utf8
index 3b4068100f..3bf84aa831 100644
--- a/docs/manual/mod/mod_setenvif.html.ja.utf8
+++ b/docs/manual/mod/mod_setenvif.html.ja.utf8
@@ -69,7 +69,6 @@
<ul class="seealso">
<li><a href="../env.html">Apache の環境変数</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="BrowserMatch" id="BrowserMatch">BrowserMatch</a> <a name="browsermatch" id="browsermatch">ディレクティブ</a></h2>
<table class="directive">
@@ -304,6 +303,7 @@
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_setenvif.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_setenvif.html.ko.euc-kr b/docs/manual/mod/mod_setenvif.html.ko.euc-kr
index d5f219a481..5f430ca049 100644
--- a/docs/manual/mod/mod_setenvif.html.ko.euc-kr
+++ b/docs/manual/mod/mod_setenvif.html.ko.euc-kr
@@ -64,7 +64,6 @@
<ul class="seealso">
<li><a href="../env.html">����ġ�� ȯ�溯��</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="BrowserMatch" id="BrowserMatch">BrowserMatch</a> <a name="browsermatch" id="browsermatch">���þ�</a></h2>
<table class="directive">
@@ -261,6 +260,7 @@
<code>site</code> ȯ�溯���� "<code>apache</code>"�� �����Ѵ�.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_setenvif.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_setenvif.html.tr.utf8 b/docs/manual/mod/mod_setenvif.html.tr.utf8
index 052ad485fb..7632b20bb8 100644
--- a/docs/manual/mod/mod_setenvif.html.tr.utf8
+++ b/docs/manual/mod/mod_setenvif.html.tr.utf8
@@ -75,7 +75,6 @@ BrowserMatch MSIE !netscape</pre>
<ul class="seealso">
<li><a href="../env.html">Apache HTTP Sunucusundaki Ortam Değişkenleri</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="BrowserMatch" id="BrowserMatch">BrowserMatch</a> <a name="browsermatch" id="browsermatch">Yönergesi</a></h2>
<table class="directive">
@@ -309,6 +308,7 @@ bağlı olmaksızın yapılmış tanımlara göre atar.</td></tr>
"<code>example</code>" değeri atanmaktadır.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_setenvif.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_so.html.en b/docs/manual/mod/mod_so.html.en
index 0f81198bf1..9c2db2cf16 100644
--- a/docs/manual/mod/mod_so.html.en
+++ b/docs/manual/mod/mod_so.html.en
@@ -67,6 +67,53 @@ Windows</td></tr></table>
<li><img alt="" src="../images/down.gif" /> <a href="#windows">Creating Loadable Modules for Windows</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LoadFile" id="LoadFile">LoadFile</a> <a name="loadfile" id="loadfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Link in the named object file or library</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LoadFile <em>filename</em> [<em>filename</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_so</td></tr>
+</table>
+
+ <p>The LoadFile directive links in the named object files or
+ libraries when the server is started or restarted; this is used
+ to load additional code which may be required for some module
+ to work. <em>Filename</em> is either an absolute path or
+ relative to <a href="core.html#serverroot">ServerRoot</a>.</p>
+
+ <p>For example:</p>
+
+ <pre class="prettyprint lang-config">LoadFile libexec/libxmlparse.so</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="LoadModule" id="LoadModule">LoadModule</a> <a name="loadmodule" id="loadmodule">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Links in the object file or library, and adds to the list
+of active modules</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LoadModule <em>module filename</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_so</td></tr>
+</table>
+ <p>The LoadModule directive links in the object file or library
+ <em>filename</em> and adds the module structure named
+ <em>module</em> to the list of active modules. <em>Module</em>
+ is the name of the external variable of type
+ <code>module</code> in the file, and is listed as the <a href="module-dict.html#ModuleIdentifier">Module Identifier</a>
+ in the module documentation. Example:</p>
+
+ <pre class="prettyprint lang-config">LoadModule status_module modules/mod_status.so</pre>
+
+
+ <p>loads the named module from the modules subdirectory of the
+ ServerRoot.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="windows" id="windows">Creating Loadable Modules for Windows</a></h2>
@@ -141,53 +188,6 @@ Windows</td></tr></table>
directive to load it.</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="LoadFile" id="LoadFile">LoadFile</a> <a name="loadfile" id="loadfile">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Link in the named object file or library</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LoadFile <em>filename</em> [<em>filename</em>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_so</td></tr>
-</table>
-
- <p>The LoadFile directive links in the named object files or
- libraries when the server is started or restarted; this is used
- to load additional code which may be required for some module
- to work. <em>Filename</em> is either an absolute path or
- relative to <a href="core.html#serverroot">ServerRoot</a>.</p>
-
- <p>For example:</p>
-
- <pre class="prettyprint lang-config">LoadFile libexec/libxmlparse.so</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="LoadModule" id="LoadModule">LoadModule</a> <a name="loadmodule" id="loadmodule">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Links in the object file or library, and adds to the list
-of active modules</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LoadModule <em>module filename</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_so</td></tr>
-</table>
- <p>The LoadModule directive links in the object file or library
- <em>filename</em> and adds the module structure named
- <em>module</em> to the list of active modules. <em>Module</em>
- is the name of the external variable of type
- <code>module</code> in the file, and is listed as the <a href="module-dict.html#ModuleIdentifier">Module Identifier</a>
- in the module documentation. Example:</p>
-
- <pre class="prettyprint lang-config">LoadModule status_module modules/mod_status.so</pre>
-
-
- <p>loads the named module from the modules subdirectory of the
- ServerRoot.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_so.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_so.html.fr b/docs/manual/mod/mod_so.html.fr
index 545b6c3cc8..92e5d282bc 100644
--- a/docs/manual/mod/mod_so.html.fr
+++ b/docs/manual/mod/mod_so.html.fr
@@ -71,6 +71,56 @@ inclus)</td></tr></table>
Windows</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="loadfile" id="loadfile">Directive</a> <a name="LoadFile" id="LoadFile">LoadFile</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Liaison du fichier objet ou de la biblioth�que
+sp�cifi�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LoadFile <em>nom-fichier</em> [<em>nom-fichier</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_so</td></tr>
+</table>
+
+ <p>La directive LoadFile permet de lier le fichier objet ou la
+ biblioth�que sp�cifi� au serveur lors du d�marrage ou du red�marrage
+ de ce dernier ; ceci permet d'ajouter tout code additionnel
+ n�cessaire au fonctionnement d'un module.
+ <em>nom-fichier</em> est soit un chemin absolu, soit un chemin
+ relatif au r�pertoire d�fini par la directive <a href="core.html#serverroot">ServerRoot</a>.</p>
+
+ <p>Par exemple:</p>
+
+ <pre class="prettyprint lang-config">LoadFile libexec/libxmlparse.so</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="loadmodule" id="loadmodule">Directive</a> <a name="LoadModule" id="LoadModule">LoadModule</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Liaison avec le serveur du fichier objet ou de la
+biblioth�que sp�cifi�, et ajout de ce dernier � la liste des modules
+actifs</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LoadModule <em>module nom-fichier</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_so</td></tr>
+</table>
+ <p>La directive LoadModule permet de lier le fichier objet ou la
+ biblioth�que <em>nom-fichier</em> avec le serveur, et d'ajouter la
+ structure de module nomm�e <em>module</em> � la liste des modules
+ actifs. <em>module</em> est le nom de la variable externe de type
+ <code>module</code> dans le fichier, et est r�f�renc� comme <a href="module-dict.html#ModuleIdentifier">Identificateur de
+ module</a> dans la documentation des modules. Exemple :</p>
+
+ <pre class="prettyprint lang-config">LoadModule status_module modules/mod_status.so</pre>
+
+
+ <p>charge le module sp�cifi� depuis le sous-r�pertoire des modules
+ situ� � la racine du serveur.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="windows" id="windows">Cr�ation de modules chargeables pour
Windows</a></h2>
@@ -153,56 +203,6 @@ Windows</a></h2>
directive <code class="directive">LoadModule</code> pour la charger.</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="loadfile" id="loadfile">Directive</a> <a name="LoadFile" id="LoadFile">LoadFile</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Liaison du fichier objet ou de la biblioth�que
-sp�cifi�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LoadFile <em>nom-fichier</em> [<em>nom-fichier</em>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_so</td></tr>
-</table>
-
- <p>La directive LoadFile permet de lier le fichier objet ou la
- biblioth�que sp�cifi� au serveur lors du d�marrage ou du red�marrage
- de ce dernier ; ceci permet d'ajouter tout code additionnel
- n�cessaire au fonctionnement d'un module.
- <em>nom-fichier</em> est soit un chemin absolu, soit un chemin
- relatif au r�pertoire d�fini par la directive <a href="core.html#serverroot">ServerRoot</a>.</p>
-
- <p>Par exemple:</p>
-
- <pre class="prettyprint lang-config">LoadFile libexec/libxmlparse.so</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="loadmodule" id="loadmodule">Directive</a> <a name="LoadModule" id="LoadModule">LoadModule</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Liaison avec le serveur du fichier objet ou de la
-biblioth�que sp�cifi�, et ajout de ce dernier � la liste des modules
-actifs</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LoadModule <em>module nom-fichier</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_so</td></tr>
-</table>
- <p>La directive LoadModule permet de lier le fichier objet ou la
- biblioth�que <em>nom-fichier</em> avec le serveur, et d'ajouter la
- structure de module nomm�e <em>module</em> � la liste des modules
- actifs. <em>module</em> est le nom de la variable externe de type
- <code>module</code> dans le fichier, et est r�f�renc� comme <a href="module-dict.html#ModuleIdentifier">Identificateur de
- module</a> dans la documentation des modules. Exemple :</p>
-
- <pre class="prettyprint lang-config">LoadModule status_module modules/mod_status.so</pre>
-
-
- <p>charge le module sp�cifi� depuis le sous-r�pertoire des modules
- situ� � la racine du serveur.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_so.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_so.html.ja.utf8 b/docs/manual/mod/mod_so.html.ja.utf8
index 5f773e5276..406fcbcb0b 100644
--- a/docs/manual/mod/mod_so.html.ja.utf8
+++ b/docs/manual/mod/mod_so.html.ja.utf8
@@ -68,6 +68,53 @@
<li><img alt="" src="../images/down.gif" /> Windows 用のロード可能なモジュールを作成する</li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LoadFile" id="LoadFile">LoadFile</a> <a name="loadfile" id="loadfile">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>指定されたオブジェクトファイルやライブラリをリンクする</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LoadFile <em>filename</em> [<em>filename</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_so</td></tr>
+</table>
+
+ <p>LoadFile ディレクティブは、サーバが起動されたときや再起動されたときに、
+ 指定されたオブジェクトファイルやライブラリをリンクします。
+ これはモジュールが動作するために必要になるかもしれない追加の
+ コードを読み込むために使用されます。<em>Filename</em> は絶対パスか、<a href="core.html#serverroot">ServerRoot</a> からの相対パスです。</p>
+
+ <p>例:</p>
+
+ <pre class="prettyprint lang-config">LoadFile libexec/libxmlparse.so</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="LoadModule" id="LoadModule">LoadModule</a> <a name="loadmodule" id="loadmodule">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>オブジェクトファイルやライブラリをリンクし、使用モジュールの
+リストに追加する</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LoadModule <em>module filename</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_so</td></tr>
+</table>
+
+ <p>LoadModule ディレクティブは <em>filename</em>
+ というオブジェクトファイルおよびライブラリをリンクし、<em>module</em>
+ という名前のモジュールの構造をアクティブなモジュールのリストに追加します。
+ <em>Module</em> はファイル中の <code>module</code>
+ 型の外部変数の名前で、モジュールのドキュメントに
+ <a href="module-dict.html#moduleidentifier">モジュール識別子</a>として書かれているものです。例 :</p>
+
+ <pre class="prettyprint lang-config">LoadModule status_module modules/mod_status.so</pre>
+
+
+ <p>これは ServerRoot の modules サブディレクトリから指定された名前の
+ モジュールをロードします。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2>Windows 用のロード可能なモジュールを作成する</h2>
@@ -141,53 +188,6 @@
<code><code class="directive">LoadModule</code></code>
ディレクティブを使って読み込んでください。</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="LoadFile" id="LoadFile">LoadFile</a> <a name="loadfile" id="loadfile">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>指定されたオブジェクトファイルやライブラリをリンクする</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LoadFile <em>filename</em> [<em>filename</em>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_so</td></tr>
-</table>
-
- <p>LoadFile ディレクティブは、サーバが起動されたときや再起動されたときに、
- 指定されたオブジェクトファイルやライブラリをリンクします。
- これはモジュールが動作するために必要になるかもしれない追加の
- コードを読み込むために使用されます。<em>Filename</em> は絶対パスか、<a href="core.html#serverroot">ServerRoot</a> からの相対パスです。</p>
-
- <p>例:</p>
-
- <pre class="prettyprint lang-config">LoadFile libexec/libxmlparse.so</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="LoadModule" id="LoadModule">LoadModule</a> <a name="loadmodule" id="loadmodule">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>オブジェクトファイルやライブラリをリンクし、使用モジュールの
-リストに追加する</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LoadModule <em>module filename</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_so</td></tr>
-</table>
-
- <p>LoadModule ディレクティブは <em>filename</em>
- というオブジェクトファイルおよびライブラリをリンクし、<em>module</em>
- という名前のモジュールの構造をアクティブなモジュールのリストに追加します。
- <em>Module</em> はファイル中の <code>module</code>
- 型の外部変数の名前で、モジュールのドキュメントに
- <a href="module-dict.html#moduleidentifier">モジュール識別子</a>として書かれているものです。例 :</p>
-
- <pre class="prettyprint lang-config">LoadModule status_module modules/mod_status.so</pre>
-
-
- <p>これは ServerRoot の modules サブディレクトリから指定された名前の
- モジュールをロードします。</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_so.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_so.html.ko.euc-kr b/docs/manual/mod/mod_so.html.ko.euc-kr
index ebe668d8a9..f663cb0c94 100644
--- a/docs/manual/mod/mod_so.html.ko.euc-kr
+++ b/docs/manual/mod/mod_so.html.ko.euc-kr
@@ -65,6 +65,50 @@
<li><img alt="" src="../images/down.gif" /> <a href="#windows">��������� �о���� ��� �����</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LoadFile" id="LoadFile">LoadFile</a> <a name="loadfile" id="loadfile">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>������ ���������̳� ���̺귯���� �о���δ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>LoadFile <em>filename</em> [<em>filename</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_so</td></tr>
+</table>
+
+ <p>LoadFile ���þ�� ������ �����ϰų� ������Ҷ� ������
+ ���������̳� ���̺귯���� �о���δ�(link in). �� ���þ��
+ � ����� �����ϱ����� �ʿ��� �ڵ带 �߰��� �о���϶�
+ ����Ѵ�. <em>Filename</em>�� �������̰ų� <a href="core.html#serverroot">ServerRoot</a>�� ���� ������̴�.</p>
+
+ <p>���� ���:</p>
+
+ <div class="example"><p><code>LoadFile libexec/libxmlparse.so</code></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="LoadModule" id="LoadModule">LoadModule</a> <a name="loadmodule" id="loadmodule">���þ�</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">����:</a></th><td>���������̳� ���̺귯���� �о���̰�, ��밡����
+��� ��Ͽ� �߰��Ѵ�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>LoadModule <em>module filename</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
+<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_so</td></tr>
+</table>
+ <p>LoadModule ���þ�� �������� Ȥ�� ���̺귯�� <em>filename</em>��
+ �о���̰�, ��밡���� ��� ��Ͽ� <em>module</em>�̶��
+ ��� ����ü�� �߰��Ѵ�. <em>Module</em>�� ������
+ <code>module</code> �ڷ��� �ܺκ������̸�, ��� ������ <a href="module-dict.html#ModuleIdentifier">����</a>��
+ ���´�. ���� ���:</p>
+
+ <div class="example"><p><code>
+ LoadModule status_module modules/mod_status.so
+ </code></p></div>
+
+ <p>ServerRoot�� modules �������丮���� ������ ����� �о���δ�.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="windows" id="windows">��������� �о���� ��� �����</a></h2>
@@ -126,50 +170,6 @@
<code class="directive">LoadModule</code> ���þ ����Ͽ� �о���δ�.</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="LoadFile" id="LoadFile">LoadFile</a> <a name="loadfile" id="loadfile">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>������ ���������̳� ���̺귯���� �о���δ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>LoadFile <em>filename</em> [<em>filename</em>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_so</td></tr>
-</table>
-
- <p>LoadFile ���þ�� ������ �����ϰų� ������Ҷ� ������
- ���������̳� ���̺귯���� �о���δ�(link in). �� ���þ��
- � ����� �����ϱ����� �ʿ��� �ڵ带 �߰��� �о���϶�
- ����Ѵ�. <em>Filename</em>�� �������̰ų� <a href="core.html#serverroot">ServerRoot</a>�� ���� ������̴�.</p>
-
- <p>���� ���:</p>
-
- <div class="example"><p><code>LoadFile libexec/libxmlparse.so</code></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="LoadModule" id="LoadModule">LoadModule</a> <a name="loadmodule" id="loadmodule">���þ�</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">����:</a></th><td>���������̳� ���̺귯���� �о���̰�, ��밡����
-��� ��Ͽ� �߰��Ѵ�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">����:</a></th><td><code>LoadModule <em>module filename</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">������:</a></th><td>�ּ�������</td></tr>
-<tr><th><a href="directive-dict.html#Status">����:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">���:</a></th><td>mod_so</td></tr>
-</table>
- <p>LoadModule ���þ�� �������� Ȥ�� ���̺귯�� <em>filename</em>��
- �о���̰�, ��밡���� ��� ��Ͽ� <em>module</em>�̶��
- ��� ����ü�� �߰��Ѵ�. <em>Module</em>�� ������
- <code>module</code> �ڷ��� �ܺκ������̸�, ��� ������ <a href="module-dict.html#ModuleIdentifier">����</a>��
- ���´�. ���� ���:</p>
-
- <div class="example"><p><code>
- LoadModule status_module modules/mod_status.so
- </code></p></div>
-
- <p>ServerRoot�� modules �������丮���� ������ ����� �о���δ�.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_so.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_so.html.tr.utf8 b/docs/manual/mod/mod_so.html.tr.utf8
index b62c4fb1ff..fb228816b2 100644
--- a/docs/manual/mod/mod_so.html.tr.utf8
+++ b/docs/manual/mod/mod_so.html.tr.utf8
@@ -64,6 +64,57 @@ yeniden başlatılması sırasında yüklenmesini sağlar.</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#windows">Yüklenebilir Modüllerin Windows için Oluşturulması</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LoadFile" id="LoadFile">LoadFile</a> <a name="loadfile" id="loadfile">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Belirtilen nesne dosyasını veya kütüphaneyi sunucu ile ilintiler.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LoadFile <em>dosya-ismi</em> [<em>dosya-ismi</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_so</td></tr>
+</table>
+
+ <p><code class="directive">LoadFile</code> yönergesi ismi belirtilen kütüphaneleri
+ veya nesne dosyalarını sunucu başlatılırken veya yeniden başlatılırken
+ sunucu ile ilintiler. Yönerge, bazı modüllerin çalışması sırasında
+ gereken ek kodların yüklenmesi için kullanılır.
+ <code><em>dosya-ismi</em></code> olarak mutlak bir dosya yolu
+ belirtilebileceği gibi <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>’a
+ göreli bir dosya yolu da belirtilebilir.</p>
+
+ <p>Örnek:</p>
+
+ <pre class="prettyprint lang-config">LoadFile libexec/libxmlparse.so</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="LoadModule" id="LoadModule">LoadModule</a> <a name="loadmodule" id="loadmodule">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Belirtilen nesne dosyasını veya kütüphaneyi sunucu ile ilintiler
+ve etkin modül listesine ekler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LoadModule <em>modül dosya-ismi</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_so</td></tr>
+</table>
+ <p><code class="directive">LoadModule</code> yönergesi
+ <code><em>dosya-ismi</em></code> ile belirtilen nesne dosyasını veya
+ kütüphaneyi sunucu ile ilintiler ve etkin modül listesine belirtilen
+ <code><em>modül</em></code> ismiyle ekler. <code><em>modül</em></code>,
+ modülün kaynak dosyasında <code>module</code> türündeki tek harici
+ değişkenin ismi olup modül belgelerinde <a href="module-dict.html#ModuleIdentifier">Modül Betimleyici</a> olarak
+ geçer. Örneğin,</p>
+
+ <pre class="prettyprint lang-config">LoadModule status_module modules/mod_status.so</pre>
+
+
+ <p>satırı ile ismi belirtilen dosya <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> dizini altındaki
+ <code>modules</code> alt dizininden yüklenir.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="windows" id="windows">Yüklenebilir Modüllerin Windows için Oluşturulması</a></h2>
@@ -139,57 +190,6 @@ yeniden başlatılması sırasında yüklenmesini sağlar.</td></tr>
yükleyebilirsiniz.</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="LoadFile" id="LoadFile">LoadFile</a> <a name="loadfile" id="loadfile">Yönergesi</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Belirtilen nesne dosyasını veya kütüphaneyi sunucu ile ilintiler.
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LoadFile <em>dosya-ismi</em> [<em>dosya-ismi</em>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
-<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
-<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_so</td></tr>
-</table>
-
- <p><code class="directive">LoadFile</code> yönergesi ismi belirtilen kütüphaneleri
- veya nesne dosyalarını sunucu başlatılırken veya yeniden başlatılırken
- sunucu ile ilintiler. Yönerge, bazı modüllerin çalışması sırasında
- gereken ek kodların yüklenmesi için kullanılır.
- <code><em>dosya-ismi</em></code> olarak mutlak bir dosya yolu
- belirtilebileceği gibi <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>’a
- göreli bir dosya yolu da belirtilebilir.</p>
-
- <p>Örnek:</p>
-
- <pre class="prettyprint lang-config">LoadFile libexec/libxmlparse.so</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="LoadModule" id="LoadModule">LoadModule</a> <a name="loadmodule" id="loadmodule">Yönergesi</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Belirtilen nesne dosyasını veya kütüphaneyi sunucu ile ilintiler
-ve etkin modül listesine ekler.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LoadModule <em>modül dosya-ismi</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
-<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
-<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_so</td></tr>
-</table>
- <p><code class="directive">LoadModule</code> yönergesi
- <code><em>dosya-ismi</em></code> ile belirtilen nesne dosyasını veya
- kütüphaneyi sunucu ile ilintiler ve etkin modül listesine belirtilen
- <code><em>modül</em></code> ismiyle ekler. <code><em>modül</em></code>,
- modülün kaynak dosyasında <code>module</code> türündeki tek harici
- değişkenin ismi olup modül belgelerinde <a href="module-dict.html#ModuleIdentifier">Modül Betimleyici</a> olarak
- geçer. Örneğin,</p>
-
- <pre class="prettyprint lang-config">LoadModule status_module modules/mod_status.so</pre>
-
-
- <p>satırı ile ismi belirtilen dosya <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> dizini altındaki
- <code>modules</code> alt dizininden yüklenir.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_so.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_speling.html.en b/docs/manual/mod/mod_speling.html.en
index 8c3451b695..8b3836fc65 100644
--- a/docs/manual/mod/mod_speling.html.en
+++ b/docs/manual/mod/mod_speling.html.en
@@ -72,7 +72,6 @@ misspellings.</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#checkspelling">CheckSpelling</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CheckCaseOnly" id="CheckCaseOnly">CheckCaseOnly</a> <a name="checkcaseonly" id="checkcaseonly">Directive</a></h2>
<table class="directive">
@@ -133,6 +132,7 @@ module</td></tr>
</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_speling.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_speling.html.fr b/docs/manual/mod/mod_speling.html.fr
index ccf43e2457..93230d06e9 100644
--- a/docs/manual/mod/mod_speling.html.fr
+++ b/docs/manual/mod/mod_speling.html.fr
@@ -73,7 +73,6 @@ fautes de frappe mineures.</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#checkspelling">CheckSpelling</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="checkcaseonly" id="checkcaseonly">Directive</a> <a name="CheckCaseOnly" id="CheckCaseOnly">CheckCaseOnly</a></h2>
<table class="directive">
@@ -136,6 +135,7 @@ majuscules</td></tr>
</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_speling.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_speling.html.ja.utf8 b/docs/manual/mod/mod_speling.html.ja.utf8
index 58f335ae82..3daa38e131 100644
--- a/docs/manual/mod/mod_speling.html.ja.utf8
+++ b/docs/manual/mod/mod_speling.html.ja.utf8
@@ -76,7 +76,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#checkspelling">CheckSpelling</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CheckCaseOnly" id="CheckCaseOnly">CheckCaseOnly</a> <a name="checkcaseonly" id="checkcaseonly">ディレクティブ</a></h2>
<table class="directive">
@@ -141,6 +140,7 @@
期待とは違う挙動になるからです。</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_speling.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_speling.html.ko.euc-kr b/docs/manual/mod/mod_speling.html.ko.euc-kr
index 3b72cd9741..0eb35c26d5 100644
--- a/docs/manual/mod/mod_speling.html.ko.euc-kr
+++ b/docs/manual/mod/mod_speling.html.ko.euc-kr
@@ -67,7 +67,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#checkspelling">CheckSpelling</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CheckCaseOnly" id="CheckCaseOnly">CheckCaseOnly</a> <a name="checkcaseonly" id="checkcaseonly">���þ�</a></h2>
<table class="directive">
@@ -124,6 +123,7 @@
</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_speling.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index 58627b4dc0..36482a7c8f 100644
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -122,201 +122,6 @@ to provide the cryptography engine.</p>
<li><img alt="" src="../images/down.gif" /> <a href="#authzproviders">Authorization providers for use with Require</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="envvars" id="envvars">Environment Variables</a></h2>
-
-<p>This module can be configured to provide several items of SSL information
-as additional environment variables to the SSI and CGI namespace. This
-information is not provided by default for performance reasons. (See
-<code class="directive">SSLOptions</code> StdEnvVars, below.) The generated variables
-are listed in the table below. For backward compatibility the information can
-be made available under different names, too. Look in the <a href="../ssl/ssl_compat.html">Compatibility</a> chapter for details on the
-compatibility variables.</p>
-
-<table class="bordered">
-
-<tr>
- <th><a name="table3">Variable Name:</a></th>
- <th>Value Type:</th>
- <th>Description:</th>
-</tr>
-<tr><td><code>HTTPS</code></td> <td>flag</td> <td>HTTPS is being used.</td></tr>
-<tr><td><code>SSL_PROTOCOL</code></td> <td>string</td> <td>The SSL protocol version (SSLv3, TLSv1, TLSv1.1, TLSv1.2)</td></tr>
-<tr><td><code>SSL_SESSION_ID</code></td> <td>string</td> <td>The hex-encoded SSL session id</td></tr>
-<tr><td><code>SSL_SESSION_RESUMED</code></td> <td>string</td> <td>Initial or Resumed SSL Session. Note: multiple requests may be served over the same (Initial or Resumed) SSL session if HTTP KeepAlive is in use</td></tr>
-<tr><td><code>SSL_SECURE_RENEG</code></td> <td>string</td> <td><code>true</code> if secure renegotiation is supported, else <code>false</code></td></tr>
-<tr><td><code>SSL_CIPHER</code></td> <td>string</td> <td>The cipher specification name</td></tr>
-<tr><td><code>SSL_CIPHER_EXPORT</code></td> <td>string</td> <td><code>true</code> if cipher is an export cipher</td></tr>
-<tr><td><code>SSL_CIPHER_USEKEYSIZE</code></td> <td>number</td> <td>Number of cipher bits (actually used)</td></tr>
-<tr><td><code>SSL_CIPHER_ALGKEYSIZE</code></td> <td>number</td> <td>Number of cipher bits (possible)</td></tr>
-<tr><td><code>SSL_COMPRESS_METHOD</code></td> <td>string</td> <td>SSL compression method negotiated</td></tr>
-<tr><td><code>SSL_VERSION_INTERFACE</code></td> <td>string</td> <td>The mod_ssl program version</td></tr>
-<tr><td><code>SSL_VERSION_LIBRARY</code></td> <td>string</td> <td>The OpenSSL program version</td></tr>
-<tr><td><code>SSL_CLIENT_M_VERSION</code></td> <td>string</td> <td>The version of the client certificate</td></tr>
-<tr><td><code>SSL_CLIENT_M_SERIAL</code></td> <td>string</td> <td>The serial of the client certificate</td></tr>
-<tr><td><code>SSL_CLIENT_S_DN</code></td> <td>string</td> <td>Subject DN in client's certificate</td></tr>
-<tr><td><code>SSL_CLIENT_S_DN_</code><em>x509</em></td> <td>string</td> <td>Component of client's Subject DN</td></tr>
-<tr><td><code>SSL_CLIENT_I_DN</code></td> <td>string</td> <td>Issuer DN of client's certificate</td></tr>
-<tr><td><code>SSL_CLIENT_I_DN_</code><em>x509</em></td> <td>string</td> <td>Component of client's Issuer DN</td></tr>
-<tr><td><code>SSL_CLIENT_V_START</code></td> <td>string</td> <td>Validity of client's certificate (start time)</td></tr>
-<tr><td><code>SSL_CLIENT_V_END</code></td> <td>string</td> <td>Validity of client's certificate (end time)</td></tr>
-<tr><td><code>SSL_CLIENT_V_REMAIN</code></td> <td>string</td> <td>Number of days until client's certificate expires</td></tr>
-<tr><td><code>SSL_CLIENT_A_SIG</code></td> <td>string</td> <td>Algorithm used for the signature of client's certificate</td></tr>
-<tr><td><code>SSL_CLIENT_A_KEY</code></td> <td>string</td> <td>Algorithm used for the public key of client's certificate</td></tr>
-<tr><td><code>SSL_CLIENT_CERT</code></td> <td>string</td> <td>PEM-encoded client certificate</td></tr>
-<tr><td><code>SSL_CLIENT_CERT_CHAIN_</code><em>n</em></td> <td>string</td> <td>PEM-encoded certificates in client certificate chain</td></tr>
-<tr><td><code>SSL_CLIENT_CERT_RFC4523_CEA</code></td> <td>string</td> <td>Serial number and issuer of the certificate. The format matches that of the CertificateExactAssertion in RFC4523</td></tr>
-<tr><td><code>SSL_CLIENT_VERIFY</code></td> <td>string</td> <td><code>NONE</code>, <code>SUCCESS</code>, <code>GENEROUS</code> or <code>FAILED:</code><em>reason</em></td></tr>
-<tr><td><code>SSL_SERVER_M_VERSION</code></td> <td>string</td> <td>The version of the server certificate</td></tr>
-<tr><td><code>SSL_SERVER_M_SERIAL</code></td> <td>string</td> <td>The serial of the server certificate</td></tr>
-<tr><td><code>SSL_SERVER_S_DN</code></td> <td>string</td> <td>Subject DN in server's certificate</td></tr>
-<tr><td><code>SSL_SERVER_S_DN_</code><em>x509</em></td> <td>string</td> <td>Component of server's Subject DN</td></tr>
-<tr><td><code>SSL_SERVER_I_DN</code></td> <td>string</td> <td>Issuer DN of server's certificate</td></tr>
-<tr><td><code>SSL_SERVER_I_DN_</code><em>x509</em></td> <td>string</td> <td>Component of server's Issuer DN</td></tr>
-<tr><td><code>SSL_SERVER_V_START</code></td> <td>string</td> <td>Validity of server's certificate (start time)</td></tr>
-<tr><td><code>SSL_SERVER_V_END</code></td> <td>string</td> <td>Validity of server's certificate (end time)</td></tr>
-<tr><td><code>SSL_SERVER_A_SIG</code></td> <td>string</td> <td>Algorithm used for the signature of server's certificate</td></tr>
-<tr><td><code>SSL_SERVER_A_KEY</code></td> <td>string</td> <td>Algorithm used for the public key of server's certificate</td></tr>
-<tr><td><code>SSL_SERVER_CERT</code></td> <td>string</td> <td>PEM-encoded server certificate</td></tr>
-<tr><td><code>SSL_SRP_USER</code></td> <td>string</td> <td>SRP username</td></tr>
-<tr><td><code>SSL_SRP_USERINFO</code></td> <td>string</td> <td>SRP user info</td></tr>
-<tr><td><code>SSL_TLS_SNI</code></td> <td>string</td> <td>Contents of the SNI TLS extension (if supplied with ClientHello)</td></tr>
-</table>
-
-<p><em>x509</em> specifies a component of an X.509 DN; one of
-<code>C,ST,L,O,OU,CN,T,I,G,S,D,UID,Email</code>. In Apache 2.1 and
-later, <em>x509</em> may also include a numeric <code>_n</code>
-suffix. If the DN in question contains multiple attributes of the
-same name, this suffix is used as a zero-based index to select a
-particular attribute. For example, where the server certificate
-subject DN included two OU attributes, <code>SSL_SERVER_S_DN_OU_0</code>
-and
-<code>SSL_SERVER_S_DN_OU_1</code> could be used to reference each. A
-variable name without a <code>_n</code> suffix is equivalent to that
-name with a <code>_0</code> suffix; the first (or only) attribute.
-When the environment table is populated using
-the <code>StdEnvVars</code> option of
-the <code class="directive"><a href="#ssloptions">SSLOptions</a></code> directive, the
-first (or only) attribute of any DN is added only under a non-suffixed
-name; i.e. no <code>_0</code> suffixed entries are added.</p>
-
-<p>The format of the <em>*_DN</em> variables has changed in Apache HTTPD
-2.3.11. See the <code>LegacyDNStringFormat</code> option for
-<code class="directive"><a href="#ssloptions">SSLOptions</a></code> for details.</p>
-
-<p><code>SSL_CLIENT_V_REMAIN</code> is only available in version 2.1
-and later.</p>
-
-<p>A number of additional environment variables can also be used
-in <code class="directive">SSLRequire</code> expressions, or in custom log
-formats:</p>
-
-<div class="note"><pre>HTTP_USER_AGENT PATH_INFO AUTH_TYPE
-HTTP_REFERER QUERY_STRING SERVER_SOFTWARE
-HTTP_COOKIE REMOTE_HOST API_VERSION
-HTTP_FORWARDED REMOTE_IDENT TIME_YEAR
-HTTP_HOST IS_SUBREQ TIME_MON
-HTTP_PROXY_CONNECTION DOCUMENT_ROOT TIME_DAY
-HTTP_ACCEPT SERVER_ADMIN TIME_HOUR
-THE_REQUEST SERVER_NAME TIME_MIN
-REQUEST_FILENAME SERVER_PORT TIME_SEC
-REQUEST_METHOD SERVER_PROTOCOL TIME_WDAY
-REQUEST_SCHEME REMOTE_ADDR TIME
-REQUEST_URI REMOTE_USER</pre></div>
-
-<p>In these contexts, two special formats can also be used:</p>
-
-<dl>
- <dt><code>ENV:<em>variablename</em></code></dt>
- <dd>This will expand to the standard environment
- variable <em>variablename</em>.</dd>
-
- <dt><code>HTTP:<em>headername</em></code></dt>
- <dd>This will expand to the value of the request header with name
- <em>headername</em>.</dd>
-</dl>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="logformats" id="logformats">Custom Log Formats</a></h2>
-
-<p>When <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> is built into Apache or at least
-loaded (under DSO situation) additional functions exist for the <a href="mod_log_config.html#formats">Custom Log Format</a> of
-<code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>. First there is an
-additional ``<code>%{</code><em>varname</em><code>}x</code>''
-eXtension format function which can be used to expand any variables
-provided by any module, especially those provided by mod_ssl which can
-you find in the above table.</p>
-<p>
-For backward compatibility there is additionally a special
-``<code>%{</code><em>name</em><code>}c</code>'' cryptography format function
-provided. Information about this function is provided in the <a href="../ssl/ssl_compat.html">Compatibility</a> chapter.</p>
-<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">CustomLog "logs/ssl_request_log" "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"</pre>
-</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="notes" id="notes">Request Notes</a></h2>
-
-<p><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> sets "notes" for the request which can be
-used in logging with the <code>%{<em>name</em>}n</code> format
-string in <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>.</p>
-
-<p>The notes supported are as follows:</p>
-
-<dl>
- <dt><code>ssl-access-forbidden</code></dt>
- <dd>This note is set to the value <code>1</code> if access was
- denied due to an <code class="directive">SSLRequire</code>
- or <code class="directive">SSLRequireSSL</code> directive.</dd>
-
- <dt><code>ssl-secure-reneg</code></dt>
- <dd>If <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> is built against a version of
- OpenSSL which supports the secure renegotiation extension, this note
- is set to the value <code>1</code> if SSL is in used for the current
- connection, and the client also supports the secure renegotiation
- extension. If the client does not support the secure renegotiation
- extension, the note is set to the value <code>0</code>.
- If <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> is not built against a version of
- OpenSSL which supports secure renegotiation, or if SSL is not in use
- for the current connection, the note is not set.</dd>
-</dl>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="authzproviders" id="authzproviders">Authorization providers for use with Require</a></h2>
-
- <p><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> provides a few authentication providers for use
- with <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code>'s
- <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> directive.</p>
-
- <h3><a name="reqssl" id="reqssl">Require ssl</a></h3>
-
- <p>The <code>ssl</code> provider denies access if a connection is not
- encrypted with SSL. This is similar to the
- <code class="directive">SSLRequireSSL</code> directive.</p>
-
- <pre class="prettyprint lang-config">Require ssl</pre>
-
-
-
-
- <h3><a name="reqverifyclient" id="reqverifyclient">Require ssl-verify-client</a></h3>
-
- <p>The <code>ssl</code> provider allows access if the user is
- authenticated with a valid client certificate. This is only
- useful if <code>SSLVerifyClient optional</code> is in effect.</p>
-
- <p>The following example grants access if the user is authenticated
- either with a client certificate or by username and password.</p>
-
- <pre class="prettyprint lang-config"> Require ssl-verify-client<br />
- Require valid-user</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="SSLCACertificateFile" id="SSLCACertificateFile">SSLCACertificateFile</a> <a name="sslcacertificatefile" id="sslcacertificatefile">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File of concatenated PEM-encoded CA Certificates
@@ -2560,6 +2365,201 @@ known to the server (i.e. the CA's certificate is under
</div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="envvars" id="envvars">Environment Variables</a></h2>
+
+<p>This module can be configured to provide several items of SSL information
+as additional environment variables to the SSI and CGI namespace. This
+information is not provided by default for performance reasons. (See
+<code class="directive">SSLOptions</code> StdEnvVars, below.) The generated variables
+are listed in the table below. For backward compatibility the information can
+be made available under different names, too. Look in the <a href="../ssl/ssl_compat.html">Compatibility</a> chapter for details on the
+compatibility variables.</p>
+
+<table class="bordered">
+
+<tr>
+ <th><a name="table3">Variable Name:</a></th>
+ <th>Value Type:</th>
+ <th>Description:</th>
+</tr>
+<tr><td><code>HTTPS</code></td> <td>flag</td> <td>HTTPS is being used.</td></tr>
+<tr><td><code>SSL_PROTOCOL</code></td> <td>string</td> <td>The SSL protocol version (SSLv3, TLSv1, TLSv1.1, TLSv1.2)</td></tr>
+<tr><td><code>SSL_SESSION_ID</code></td> <td>string</td> <td>The hex-encoded SSL session id</td></tr>
+<tr><td><code>SSL_SESSION_RESUMED</code></td> <td>string</td> <td>Initial or Resumed SSL Session. Note: multiple requests may be served over the same (Initial or Resumed) SSL session if HTTP KeepAlive is in use</td></tr>
+<tr><td><code>SSL_SECURE_RENEG</code></td> <td>string</td> <td><code>true</code> if secure renegotiation is supported, else <code>false</code></td></tr>
+<tr><td><code>SSL_CIPHER</code></td> <td>string</td> <td>The cipher specification name</td></tr>
+<tr><td><code>SSL_CIPHER_EXPORT</code></td> <td>string</td> <td><code>true</code> if cipher is an export cipher</td></tr>
+<tr><td><code>SSL_CIPHER_USEKEYSIZE</code></td> <td>number</td> <td>Number of cipher bits (actually used)</td></tr>
+<tr><td><code>SSL_CIPHER_ALGKEYSIZE</code></td> <td>number</td> <td>Number of cipher bits (possible)</td></tr>
+<tr><td><code>SSL_COMPRESS_METHOD</code></td> <td>string</td> <td>SSL compression method negotiated</td></tr>
+<tr><td><code>SSL_VERSION_INTERFACE</code></td> <td>string</td> <td>The mod_ssl program version</td></tr>
+<tr><td><code>SSL_VERSION_LIBRARY</code></td> <td>string</td> <td>The OpenSSL program version</td></tr>
+<tr><td><code>SSL_CLIENT_M_VERSION</code></td> <td>string</td> <td>The version of the client certificate</td></tr>
+<tr><td><code>SSL_CLIENT_M_SERIAL</code></td> <td>string</td> <td>The serial of the client certificate</td></tr>
+<tr><td><code>SSL_CLIENT_S_DN</code></td> <td>string</td> <td>Subject DN in client's certificate</td></tr>
+<tr><td><code>SSL_CLIENT_S_DN_</code><em>x509</em></td> <td>string</td> <td>Component of client's Subject DN</td></tr>
+<tr><td><code>SSL_CLIENT_I_DN</code></td> <td>string</td> <td>Issuer DN of client's certificate</td></tr>
+<tr><td><code>SSL_CLIENT_I_DN_</code><em>x509</em></td> <td>string</td> <td>Component of client's Issuer DN</td></tr>
+<tr><td><code>SSL_CLIENT_V_START</code></td> <td>string</td> <td>Validity of client's certificate (start time)</td></tr>
+<tr><td><code>SSL_CLIENT_V_END</code></td> <td>string</td> <td>Validity of client's certificate (end time)</td></tr>
+<tr><td><code>SSL_CLIENT_V_REMAIN</code></td> <td>string</td> <td>Number of days until client's certificate expires</td></tr>
+<tr><td><code>SSL_CLIENT_A_SIG</code></td> <td>string</td> <td>Algorithm used for the signature of client's certificate</td></tr>
+<tr><td><code>SSL_CLIENT_A_KEY</code></td> <td>string</td> <td>Algorithm used for the public key of client's certificate</td></tr>
+<tr><td><code>SSL_CLIENT_CERT</code></td> <td>string</td> <td>PEM-encoded client certificate</td></tr>
+<tr><td><code>SSL_CLIENT_CERT_CHAIN_</code><em>n</em></td> <td>string</td> <td>PEM-encoded certificates in client certificate chain</td></tr>
+<tr><td><code>SSL_CLIENT_CERT_RFC4523_CEA</code></td> <td>string</td> <td>Serial number and issuer of the certificate. The format matches that of the CertificateExactAssertion in RFC4523</td></tr>
+<tr><td><code>SSL_CLIENT_VERIFY</code></td> <td>string</td> <td><code>NONE</code>, <code>SUCCESS</code>, <code>GENEROUS</code> or <code>FAILED:</code><em>reason</em></td></tr>
+<tr><td><code>SSL_SERVER_M_VERSION</code></td> <td>string</td> <td>The version of the server certificate</td></tr>
+<tr><td><code>SSL_SERVER_M_SERIAL</code></td> <td>string</td> <td>The serial of the server certificate</td></tr>
+<tr><td><code>SSL_SERVER_S_DN</code></td> <td>string</td> <td>Subject DN in server's certificate</td></tr>
+<tr><td><code>SSL_SERVER_S_DN_</code><em>x509</em></td> <td>string</td> <td>Component of server's Subject DN</td></tr>
+<tr><td><code>SSL_SERVER_I_DN</code></td> <td>string</td> <td>Issuer DN of server's certificate</td></tr>
+<tr><td><code>SSL_SERVER_I_DN_</code><em>x509</em></td> <td>string</td> <td>Component of server's Issuer DN</td></tr>
+<tr><td><code>SSL_SERVER_V_START</code></td> <td>string</td> <td>Validity of server's certificate (start time)</td></tr>
+<tr><td><code>SSL_SERVER_V_END</code></td> <td>string</td> <td>Validity of server's certificate (end time)</td></tr>
+<tr><td><code>SSL_SERVER_A_SIG</code></td> <td>string</td> <td>Algorithm used for the signature of server's certificate</td></tr>
+<tr><td><code>SSL_SERVER_A_KEY</code></td> <td>string</td> <td>Algorithm used for the public key of server's certificate</td></tr>
+<tr><td><code>SSL_SERVER_CERT</code></td> <td>string</td> <td>PEM-encoded server certificate</td></tr>
+<tr><td><code>SSL_SRP_USER</code></td> <td>string</td> <td>SRP username</td></tr>
+<tr><td><code>SSL_SRP_USERINFO</code></td> <td>string</td> <td>SRP user info</td></tr>
+<tr><td><code>SSL_TLS_SNI</code></td> <td>string</td> <td>Contents of the SNI TLS extension (if supplied with ClientHello)</td></tr>
+</table>
+
+<p><em>x509</em> specifies a component of an X.509 DN; one of
+<code>C,ST,L,O,OU,CN,T,I,G,S,D,UID,Email</code>. In Apache 2.1 and
+later, <em>x509</em> may also include a numeric <code>_n</code>
+suffix. If the DN in question contains multiple attributes of the
+same name, this suffix is used as a zero-based index to select a
+particular attribute. For example, where the server certificate
+subject DN included two OU attributes, <code>SSL_SERVER_S_DN_OU_0</code>
+and
+<code>SSL_SERVER_S_DN_OU_1</code> could be used to reference each. A
+variable name without a <code>_n</code> suffix is equivalent to that
+name with a <code>_0</code> suffix; the first (or only) attribute.
+When the environment table is populated using
+the <code>StdEnvVars</code> option of
+the <code class="directive"><a href="#ssloptions">SSLOptions</a></code> directive, the
+first (or only) attribute of any DN is added only under a non-suffixed
+name; i.e. no <code>_0</code> suffixed entries are added.</p>
+
+<p>The format of the <em>*_DN</em> variables has changed in Apache HTTPD
+2.3.11. See the <code>LegacyDNStringFormat</code> option for
+<code class="directive"><a href="#ssloptions">SSLOptions</a></code> for details.</p>
+
+<p><code>SSL_CLIENT_V_REMAIN</code> is only available in version 2.1
+and later.</p>
+
+<p>A number of additional environment variables can also be used
+in <code class="directive">SSLRequire</code> expressions, or in custom log
+formats:</p>
+
+<div class="note"><pre>HTTP_USER_AGENT PATH_INFO AUTH_TYPE
+HTTP_REFERER QUERY_STRING SERVER_SOFTWARE
+HTTP_COOKIE REMOTE_HOST API_VERSION
+HTTP_FORWARDED REMOTE_IDENT TIME_YEAR
+HTTP_HOST IS_SUBREQ TIME_MON
+HTTP_PROXY_CONNECTION DOCUMENT_ROOT TIME_DAY
+HTTP_ACCEPT SERVER_ADMIN TIME_HOUR
+THE_REQUEST SERVER_NAME TIME_MIN
+REQUEST_FILENAME SERVER_PORT TIME_SEC
+REQUEST_METHOD SERVER_PROTOCOL TIME_WDAY
+REQUEST_SCHEME REMOTE_ADDR TIME
+REQUEST_URI REMOTE_USER</pre></div>
+
+<p>In these contexts, two special formats can also be used:</p>
+
+<dl>
+ <dt><code>ENV:<em>variablename</em></code></dt>
+ <dd>This will expand to the standard environment
+ variable <em>variablename</em>.</dd>
+
+ <dt><code>HTTP:<em>headername</em></code></dt>
+ <dd>This will expand to the value of the request header with name
+ <em>headername</em>.</dd>
+</dl>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="logformats" id="logformats">Custom Log Formats</a></h2>
+
+<p>When <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> is built into Apache or at least
+loaded (under DSO situation) additional functions exist for the <a href="mod_log_config.html#formats">Custom Log Format</a> of
+<code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>. First there is an
+additional ``<code>%{</code><em>varname</em><code>}x</code>''
+eXtension format function which can be used to expand any variables
+provided by any module, especially those provided by mod_ssl which can
+you find in the above table.</p>
+<p>
+For backward compatibility there is additionally a special
+``<code>%{</code><em>name</em><code>}c</code>'' cryptography format function
+provided. Information about this function is provided in the <a href="../ssl/ssl_compat.html">Compatibility</a> chapter.</p>
+<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">CustomLog "logs/ssl_request_log" "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"</pre>
+</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="notes" id="notes">Request Notes</a></h2>
+
+<p><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> sets "notes" for the request which can be
+used in logging with the <code>%{<em>name</em>}n</code> format
+string in <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>.</p>
+
+<p>The notes supported are as follows:</p>
+
+<dl>
+ <dt><code>ssl-access-forbidden</code></dt>
+ <dd>This note is set to the value <code>1</code> if access was
+ denied due to an <code class="directive">SSLRequire</code>
+ or <code class="directive">SSLRequireSSL</code> directive.</dd>
+
+ <dt><code>ssl-secure-reneg</code></dt>
+ <dd>If <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> is built against a version of
+ OpenSSL which supports the secure renegotiation extension, this note
+ is set to the value <code>1</code> if SSL is in used for the current
+ connection, and the client also supports the secure renegotiation
+ extension. If the client does not support the secure renegotiation
+ extension, the note is set to the value <code>0</code>.
+ If <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> is not built against a version of
+ OpenSSL which supports secure renegotiation, or if SSL is not in use
+ for the current connection, the note is not set.</dd>
+</dl>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="authzproviders" id="authzproviders">Authorization providers for use with Require</a></h2>
+
+ <p><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> provides a few authentication providers for use
+ with <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code>'s
+ <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> directive.</p>
+
+ <h3><a name="reqssl" id="reqssl">Require ssl</a></h3>
+
+ <p>The <code>ssl</code> provider denies access if a connection is not
+ encrypted with SSL. This is similar to the
+ <code class="directive">SSLRequireSSL</code> directive.</p>
+
+ <pre class="prettyprint lang-config">Require ssl</pre>
+
+
+
+
+ <h3><a name="reqverifyclient" id="reqverifyclient">Require ssl-verify-client</a></h3>
+
+ <p>The <code>ssl</code> provider allows access if the user is
+ authenticated with a valid client certificate. This is only
+ useful if <code>SSLVerifyClient optional</code> is in effect.</p>
+
+ <p>The following example grants access if the user is authenticated
+ either with a client certificate or by username and password.</p>
+
+ <pre class="prettyprint lang-config"> Require ssl-verify-client<br />
+ Require valid-user</pre>
+
+
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_ssl.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_ssl.html.fr b/docs/manual/mod/mod_ssl.html.fr
index b993bfb4d3..d9b8fead49 100644
--- a/docs/manual/mod/mod_ssl.html.fr
+++ b/docs/manual/mod/mod_ssl.html.fr
@@ -125,266 +125,6 @@ personnalis�s</a></li>
disponibles avec Require</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="envvars" id="envvars">Variables d'environnement</a></h2>
-
-<p>Ce module peut �tre configur� pour fournir aux espaces de nommage SSI
-et CGI de nombreux �l�ments d'informations concernant SSL par le biais
-de variables d'environnement suppl�mentaires. Par d�faut, et pour
-des raisons de performances, ces informations ne sont pas fournies (Voir
-la directive <code class="directive">SSLOptions</code> StdEnvVars ci-dessous).
-Les variables g�n�r�es se trouvent dans la table ci-dessous.
-Ces informations peuvent �galement �tre disponible sous des noms diff�rents
-� des fins de compatibilit� ascendante. Reportez-vous au chapitre <a href="../ssl/ssl_compat.html">Compatibilit�</a> pour plus de d�tails �
-propos des variables de compatibilit�.</p>
-
-<table class="bordered">
-
-<tr>
- <th><a name="table3">Nom de la variable :</a></th>
- <th>Type de valeur :</th>
- <th>Description :</th>
-</tr>
-<tr><td><code>HTTPS</code></td> <td>drapeau</td>
-<td>HTTPS est utilis�.</td></tr>
-<tr><td><code>SSL_PROTOCOL</code></td> <td>cha�ne</td>
-<td>La version du protocole SSL (SSLv3, TLSv1, TLSv1.1, TLSv1.2)</td></tr>
-<tr><td><code>SSL_SESSION_ID</code></td> <td>cha�ne</td>
-<td>L'identifiant de session SSL cod� en hexad�cimal</td></tr>
-<tr><td><code>SSL_SESSION_RESUMED</code></td> <td>cha�ne</td>
-<td>Session SSL initiale ou reprise. Note : plusieurs requ�tes peuvent
-�tre servies dans le cadre de la m�me session SSL (initiale ou reprise)
-si les connexions persistantes (HTTP KeepAlive) sont utilis�es</td></tr>
-<tr><td><code>SSL_SECURE_RENEG</code></td> <td>cha�ne</td>
-<td><code>true</code> si la ren�gociation s�curis�e est support�e,
-<code>false</code> dans le cas contraire</td></tr>
-<tr><td><code>SSL_CIPHER</code></td> <td>cha�ne</td>
-<td>Le nom de l'algorithme de chiffrement</td></tr>
-<tr><td><code>SSL_CIPHER_EXPORT</code></td> <td>cha�ne</td>
-<td><code>true</code> si l'algorithme de chiffrement est un algorithme
-export�</td></tr>
-<tr><td><code>SSL_CIPHER_USEKEYSIZE</code></td> <td>nombre</td>
-<td>Nombre de bits de chiffrement (r�ellement utilis�s)</td></tr>
-<tr><td><code>SSL_CIPHER_ALGKEYSIZE</code></td> <td>nombre</td>
-<td>Nombre de bits de chiffrement (possible)</td></tr>
-<tr><td><code>SSL_COMPRESS_METHOD</code></td> <td>cha�ne</td>
-<td>M�thode de compression SSL n�goci�e</td></tr>
-
-<tr><td><code>SSL_VERSION_INTERFACE</code></td> <td>cha�ne</td>
-<td>La version du programme mod_ssl</td></tr>
-<tr><td><code>SSL_VERSION_LIBRARY</code></td> <td>cha�ne</td>
-<td>La version du programme OpenSSL</td></tr>
-<tr><td><code>SSL_CLIENT_M_VERSION</code></td> <td>cha�ne</td>
-<td>La version du certificat client</td></tr>
-<tr><td><code>SSL_CLIENT_M_SERIAL</code></td> <td>cha�ne</td>
-<td>Le num�ro de s�rie du certificat client</td></tr>
-<tr><td><code>SSL_CLIENT_S_DN</code></td> <td>cha�ne</td>
-<td>Le DN sujet du certificat client</td></tr>
-<tr><td><code>SSL_CLIENT_S_DN_</code><em>x509</em></td> <td>cha�ne</td>
-<td>El�ment du DN sujet du client</td></tr>
-<tr><td><code>SSL_CLIENT_I_DN</code></td> <td>cha�ne</td>
-<td>DN de l'�metteur du certificat du client</td></tr>
-<tr><td><code>SSL_CLIENT_I_DN_</code><em>x509</em></td> <td>cha�ne</td>
-<td>El�ment du DN de l'�metteur du certificat du client</td></tr>
-<tr><td><code>SSL_CLIENT_V_START</code></td> <td>cha�ne</td>
-<td>Validit� du certificat du client (date de d�but)</td></tr>
-<tr><td><code>SSL_CLIENT_V_END</code></td> <td>cha�ne</td>
-<td>Validit� du certificat du client (date de fin)</td></tr>
-<tr><td><code>SSL_CLIENT_V_REMAIN</code></td> <td>cha�ne</td>
-<td>Nombre de jours avant expiration du certificat du client</td></tr>
-<tr><td><code>SSL_CLIENT_A_SIG</code></td> <td>cha�ne</td>
-<td>Algorithme utilis� pour la signature du certificat du client</td></tr>
-<tr><td><code>SSL_CLIENT_A_KEY</code></td> <td>cha�ne</td>
-<td>Algorithme utilis� pour la cl� publique du certificat du client</td></tr>
-<tr><td><code>SSL_CLIENT_CERT</code></td> <td>cha�ne</td>
-<td>Certificat du client au format PEM</td></tr>
-<tr><td><code>SSL_CLIENT_CERT_CHAIN_</code><em>n</em></td>
-<td>cha�ne</td> <td>Certificats de la cha�ne de certification du
-client au format PEM</td></tr>
-<tr><td><code>SSL_CLIENT_CERT_RFC4523_CEA</code></td> <td>cha�ne</td>
-<td>Num�ro de s�rie et fournisseur du certificat. le format correspond �
-celui de la CertificateExactAssertion dans la RFC4523</td></tr>
-<tr><td><code>SSL_CLIENT_VERIFY</code></td> <td>cha�ne</td>
-<td><code>NONE</code>, <code>SUCCESS</code>, <code>GENEROUS</code> ou
-<code>FAILED:</code><em>raison</em></td></tr>
-<tr><td><code>SSL_SERVER_M_VERSION</code></td> <td>cha�ne</td>
-<td>La version du certificat du serveur</td></tr>
-<tr><td><code>SSL_SERVER_M_SERIAL</code></td> <td>cha�ne</td> <td>
-
-The serial of the server certificate</td></tr>
-<tr><td><code>SSL_SERVER_S_DN</code></td> <td>cha�ne</td>
-<td>DN sujet du certificat du serveur</td></tr>
-<tr><td><code>SSL_SERVER_S_DN_</code><em>x509</em></td> <td>cha�ne</td>
-<td>El�ment du DN sujet du certificat du serveur</td></tr>
-<tr><td><code>SSL_SERVER_I_DN</code></td> <td>cha�ne</td>
-<td>DN de l'�metteur du certificat du serveur</td></tr>
-<tr><td><code>SSL_SERVER_I_DN_</code><em>x509</em></td> <td>cha�ne</td>
-<td>El�ment du DN de l'�metteur du certificat du serveur</td></tr>
-<tr><td><code>SSL_SERVER_V_START</code></td> <td>cha�ne</td>
-<td>Validit� du certificat du serveur (date de d�dut)</td></tr>
-<tr><td><code>SSL_SERVER_V_END</code></td> <td>cha�ne</td>
-<td>Validit� du certificat du serveur (date de fin)</td></tr>
-<tr><td><code>SSL_SERVER_A_SIG</code></td> <td>cha�ne</td>
-<td>Algorithme utilis� pour la signature du certificat du serveur</td></tr>
-<tr><td><code>SSL_SERVER_A_KEY</code></td> <td>cha�ne</td>
-<td>Algorithme utilis� pour la cl� publique du certificat du serveur</td></tr>
-<tr><td><code>SSL_SERVER_CERT</code></td> <td>cha�ne</td>
-<td>Certificat du serveur au format PEM</td></tr>
-<tr><td><code>SSL_SRP_USER</code></td> <td>cha�ne</td>
-<td>nom d'utilisateur SRP</td></tr>
-<tr><td><code>SSL_SRP_USERINFO</code></td> <td>cha�ne</td>
-<td>informations sur l'utilisateur SRP</td></tr>
-<tr><td><code>SSL_TLS_SNI</code></td> <td>string</td>
-<td>Contenu de l'extension SNI TLS (si support� par ClientHello)</td></tr>
-</table>
-
-<p><em>x509</em> sp�cifie un �l�ment de DN X.509 parmi
-<code>C,ST,L,O,OU,CN,T,I,G,S,D,UID,Email</code>. A partir de la version
-2.1 d'Apache, <em>x509</em> peut aussi comporter un suffixe num�rique
-<code>_n</code>. Si le DN en question comporte plusieurs attributs de
-noms identiques, ce suffixe constitue un index d�butant � z�ro et
-permettant de s�lectionner un
-attribut particulier. Par exemple, si le DN sujet du certificat du
-serveur comporte deux champs OU, on peut utiliser
-<code>SSL_SERVER_S_DN_OU_0</code> et <code>SSL_SERVER_S_DN_OU_1</code>
-pour r�f�rencer chacun d'entre eux. Un nom de variable sans suffixe
-<code>_n</code> est �quivalent au m�me nom avec le suffixe
-<code>_0</code>, ce qui correspond au premier attribut (ou au seul)
-caract�risant le DN.
-Lorsque la table d'environnement est remplie en utilisant l'option
-<code>StdEnvVars</code> de la directive <code class="directive"><a href="#ssloptions">SSLOptions</a></code>, le premier attribut (ou le
-seul) caract�risant le DN est enregistr� avec un nom sans suffixe ;
-autrement dit, aucune entr�e poss�dant comme suffixe <code>_0</code>
-n'est enregistr�e.</p>
-
-<p>Le format des variables <em>*_DN</em> a chang� depuis la version
-2.3.11 d'Apache HTTPD. Voir l'option <code>LegacyDNStringFormat</code>
-de la directive <code class="directive"><a href="#ssloptions">SSLOptions</a></code> pour
-plus de d�tails.</p>
-
-<p><code>SSL_CLIENT_V_REMAIN</code> n'est disponible qu'� partir de la
-version 2.1.</p>
-
-<p>Plusieurs variables d'environnement additionnelles peuvent �tre
-utilis�es dans les expressions <code class="directive">SSLRequire</code>, ou
-dans les formats de journalisation personnalis�s :</p>
-
-<div class="note"><pre>HTTP_USER_AGENT PATH_INFO AUTH_TYPE
-HTTP_REFERER QUERY_STRING SERVER_SOFTWARE
-HTTP_COOKIE REMOTE_HOST API_VERSION
-HTTP_FORWARDED REMOTE_IDENT TIME_YEAR
-HTTP_HOST IS_SUBREQ TIME_MON
-HTTP_PROXY_CONNECTION DOCUMENT_ROOT TIME_DAY
-HTTP_ACCEPT SERVER_ADMIN TIME_HOUR
-THE_REQUEST SERVER_NAME TIME_MIN
-REQUEST_FILENAME SERVER_PORT TIME_SEC
-REQUEST_METHOD SERVER_PROTOCOL TIME_WDAY
-REQUEST_SCHEME REMOTE_ADDR TIME
-REQUEST_URI REMOTE_USER</pre></div>
-
-<p>Dans ces contextes, deux formats sp�ciaux peuvent aussi �tre utilis�s
-:</p>
-
-<dl>
- <dt><code>ENV:<em>nom_variable</em></code></dt>
- <dd>Correspond � la variable d'environnement standard
- <em>nom_variable</em>.</dd>
-
- <dt><code>HTTP:<em>nom_en-t�te</em></code></dt>
- <dd>Correspond � la valeur de l'en-t�te de requ�te dont le nom est
- <em>nom_en-t�te</em>.</dd>
-</dl>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="logformats" id="logformats">Formats de journaux
-personnalis�s</a></h2>
-
-<p>Lorsque <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> est compil� dans le serveur Apache
-ou m�me charg� (en mode DSO), des fonctions suppl�mentaires sont
-disponibles pour le <a href="mod_log_config.html#formats">Format de journal personnalis�</a> du
-module <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>. A ce titre, la fonction de
-format d'eXtension ``<code>%{</code><em>nom-var</em><code>}x</code>''
-peut �tre utilis�e pour pr�senter en extension toute variable fournie
-par tout module, et en particulier celles fournies par mod_ssl et que
-vous trouverez dans la table ci-dessus.</p>
-<p>
-A des fins de compatibilit� ascendante, il existe une fonction de format
-cryptographique suppl�mentaire
-``<code>%{</code><em>nom</em><code>}c</code>''. Vous trouverez toutes
-les informations � propos de cette fonction dans le chapitre <a href="../ssl/ssl_compat.html">Compatibilit�</a>.</p>
-<div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">CustomLog logs/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"</pre>
-</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="notes" id="notes">Information � propos de la requ�te</a></h2>
-
-<p><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> enregistre des informations � propos de la
-requ�te que l'on peut restituer dans les journaux avec la cha�ne de
-format <code>%{<em>nom</em>}n</code> via le module
-<code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>.</p>
-
-<p>Les informations enregistr�es sont les suivantes :</p>
-
-<dl>
- <dt><code>ssl-access-forbidden</code></dt>
- <dd>Cette information contient la valeur <code>1</code> si l'acc�s a
- �t� refus� suite � une directive <code class="directive">SSLRequire</code> ou
- <code class="directive">SSLRequireSSL</code>.</dd>
-
- <dt><code>ssl-secure-reneg</code></dt>
- <dd>Si <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> a �t� compil� avec une version
- d'OpenSSL qui supporte la ren�gociation s�curis�e, si SSL est utilis�
- pour la connexion courante et si le client supporte lui aussi la
- ren�gociation s�curis�e, cette information contiendra la valeur
- <code>1</code>. Si le client ne supporte pas la ren�gociation
- s�curis�e, l'information contiendra la valeur <code>0</code>. Si
- <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> n'a pas �t� compil� avec une version
- d'OpenSSL qui supporte la ren�gociation s�curis�e, ou si SSL n'est pas
- utilis� pour la connexion courante, le contenu de l'information ne
- sera pas d�fini.</dd>
-</dl>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="authzproviders" id="authzproviders">Fournisseurs d'autorisation
-disponibles avec Require</a></h2>
-
- <p><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> propose quelques fournisseurs
- d'autorisation � utiliser avec la directive <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> du module
- <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code>.</p>
-
- <h3><a name="reqssl" id="reqssl">Require ssl</a></h3>
-
- <p>Le fournisseur <code>ssl</code> refuse l'acc�s si une connexion
- n'est pas chiffr�e avec SSL. L'effet est similaire � celui de la
- directive <code class="directive">SSLRequireSSL</code>.</p>
-
-
- <pre class="prettyprint lang-config">Require ssl</pre>
-
-
-
-
-
- <h3><a name="reqverifyclient" id="reqverifyclient">Require ssl-verify-client</a></h3>
-
- <p>Le fournisseur <code>ssl</code> autorise l'acc�s si
- l'utilisateur est authentifi� via un certificat client valide. Ceci
- n'a un effet que si <code>SSLVerifyClient optional</code> est actif.</p>
-
- <p>Dans l'exemple suivant, l'acc�s est autoris� si le client est
- authentifi� via un certificat client ou par nom d'utilisateur/mot de
- passe :</p>
-
- <pre class="prettyprint lang-config"> Require ssl-verify-client<br />
- Require valid-user</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="sslcacertificatefile" id="sslcacertificatefile">Directive</a> <a name="SSLCACertificateFile" id="SSLCACertificateFile">SSLCACertificateFile</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Fichier contenant une concat�nation des certificats de CA
@@ -2841,6 +2581,266 @@ certificat de la CA doit �tre r�f�renc� par la directive <code class="directive"
</div>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="envvars" id="envvars">Variables d'environnement</a></h2>
+
+<p>Ce module peut �tre configur� pour fournir aux espaces de nommage SSI
+et CGI de nombreux �l�ments d'informations concernant SSL par le biais
+de variables d'environnement suppl�mentaires. Par d�faut, et pour
+des raisons de performances, ces informations ne sont pas fournies (Voir
+la directive <code class="directive">SSLOptions</code> StdEnvVars ci-dessous).
+Les variables g�n�r�es se trouvent dans la table ci-dessous.
+Ces informations peuvent �galement �tre disponible sous des noms diff�rents
+� des fins de compatibilit� ascendante. Reportez-vous au chapitre <a href="../ssl/ssl_compat.html">Compatibilit�</a> pour plus de d�tails �
+propos des variables de compatibilit�.</p>
+
+<table class="bordered">
+
+<tr>
+ <th><a name="table3">Nom de la variable :</a></th>
+ <th>Type de valeur :</th>
+ <th>Description :</th>
+</tr>
+<tr><td><code>HTTPS</code></td> <td>drapeau</td>
+<td>HTTPS est utilis�.</td></tr>
+<tr><td><code>SSL_PROTOCOL</code></td> <td>cha�ne</td>
+<td>La version du protocole SSL (SSLv3, TLSv1, TLSv1.1, TLSv1.2)</td></tr>
+<tr><td><code>SSL_SESSION_ID</code></td> <td>cha�ne</td>
+<td>L'identifiant de session SSL cod� en hexad�cimal</td></tr>
+<tr><td><code>SSL_SESSION_RESUMED</code></td> <td>cha�ne</td>
+<td>Session SSL initiale ou reprise. Note : plusieurs requ�tes peuvent
+�tre servies dans le cadre de la m�me session SSL (initiale ou reprise)
+si les connexions persistantes (HTTP KeepAlive) sont utilis�es</td></tr>
+<tr><td><code>SSL_SECURE_RENEG</code></td> <td>cha�ne</td>
+<td><code>true</code> si la ren�gociation s�curis�e est support�e,
+<code>false</code> dans le cas contraire</td></tr>
+<tr><td><code>SSL_CIPHER</code></td> <td>cha�ne</td>
+<td>Le nom de l'algorithme de chiffrement</td></tr>
+<tr><td><code>SSL_CIPHER_EXPORT</code></td> <td>cha�ne</td>
+<td><code>true</code> si l'algorithme de chiffrement est un algorithme
+export�</td></tr>
+<tr><td><code>SSL_CIPHER_USEKEYSIZE</code></td> <td>nombre</td>
+<td>Nombre de bits de chiffrement (r�ellement utilis�s)</td></tr>
+<tr><td><code>SSL_CIPHER_ALGKEYSIZE</code></td> <td>nombre</td>
+<td>Nombre de bits de chiffrement (possible)</td></tr>
+<tr><td><code>SSL_COMPRESS_METHOD</code></td> <td>cha�ne</td>
+<td>M�thode de compression SSL n�goci�e</td></tr>
+
+<tr><td><code>SSL_VERSION_INTERFACE</code></td> <td>cha�ne</td>
+<td>La version du programme mod_ssl</td></tr>
+<tr><td><code>SSL_VERSION_LIBRARY</code></td> <td>cha�ne</td>
+<td>La version du programme OpenSSL</td></tr>
+<tr><td><code>SSL_CLIENT_M_VERSION</code></td> <td>cha�ne</td>
+<td>La version du certificat client</td></tr>
+<tr><td><code>SSL_CLIENT_M_SERIAL</code></td> <td>cha�ne</td>
+<td>Le num�ro de s�rie du certificat client</td></tr>
+<tr><td><code>SSL_CLIENT_S_DN</code></td> <td>cha�ne</td>
+<td>Le DN sujet du certificat client</td></tr>
+<tr><td><code>SSL_CLIENT_S_DN_</code><em>x509</em></td> <td>cha�ne</td>
+<td>El�ment du DN sujet du client</td></tr>
+<tr><td><code>SSL_CLIENT_I_DN</code></td> <td>cha�ne</td>
+<td>DN de l'�metteur du certificat du client</td></tr>
+<tr><td><code>SSL_CLIENT_I_DN_</code><em>x509</em></td> <td>cha�ne</td>
+<td>El�ment du DN de l'�metteur du certificat du client</td></tr>
+<tr><td><code>SSL_CLIENT_V_START</code></td> <td>cha�ne</td>
+<td>Validit� du certificat du client (date de d�but)</td></tr>
+<tr><td><code>SSL_CLIENT_V_END</code></td> <td>cha�ne</td>
+<td>Validit� du certificat du client (date de fin)</td></tr>
+<tr><td><code>SSL_CLIENT_V_REMAIN</code></td> <td>cha�ne</td>
+<td>Nombre de jours avant expiration du certificat du client</td></tr>
+<tr><td><code>SSL_CLIENT_A_SIG</code></td> <td>cha�ne</td>
+<td>Algorithme utilis� pour la signature du certificat du client</td></tr>
+<tr><td><code>SSL_CLIENT_A_KEY</code></td> <td>cha�ne</td>
+<td>Algorithme utilis� pour la cl� publique du certificat du client</td></tr>
+<tr><td><code>SSL_CLIENT_CERT</code></td> <td>cha�ne</td>
+<td>Certificat du client au format PEM</td></tr>
+<tr><td><code>SSL_CLIENT_CERT_CHAIN_</code><em>n</em></td>
+<td>cha�ne</td> <td>Certificats de la cha�ne de certification du
+client au format PEM</td></tr>
+<tr><td><code>SSL_CLIENT_CERT_RFC4523_CEA</code></td> <td>cha�ne</td>
+<td>Num�ro de s�rie et fournisseur du certificat. le format correspond �
+celui de la CertificateExactAssertion dans la RFC4523</td></tr>
+<tr><td><code>SSL_CLIENT_VERIFY</code></td> <td>cha�ne</td>
+<td><code>NONE</code>, <code>SUCCESS</code>, <code>GENEROUS</code> ou
+<code>FAILED:</code><em>raison</em></td></tr>
+<tr><td><code>SSL_SERVER_M_VERSION</code></td> <td>cha�ne</td>
+<td>La version du certificat du serveur</td></tr>
+<tr><td><code>SSL_SERVER_M_SERIAL</code></td> <td>cha�ne</td> <td>
+
+The serial of the server certificate</td></tr>
+<tr><td><code>SSL_SERVER_S_DN</code></td> <td>cha�ne</td>
+<td>DN sujet du certificat du serveur</td></tr>
+<tr><td><code>SSL_SERVER_S_DN_</code><em>x509</em></td> <td>cha�ne</td>
+<td>El�ment du DN sujet du certificat du serveur</td></tr>
+<tr><td><code>SSL_SERVER_I_DN</code></td> <td>cha�ne</td>
+<td>DN de l'�metteur du certificat du serveur</td></tr>
+<tr><td><code>SSL_SERVER_I_DN_</code><em>x509</em></td> <td>cha�ne</td>
+<td>El�ment du DN de l'�metteur du certificat du serveur</td></tr>
+<tr><td><code>SSL_SERVER_V_START</code></td> <td>cha�ne</td>
+<td>Validit� du certificat du serveur (date de d�dut)</td></tr>
+<tr><td><code>SSL_SERVER_V_END</code></td> <td>cha�ne</td>
+<td>Validit� du certificat du serveur (date de fin)</td></tr>
+<tr><td><code>SSL_SERVER_A_SIG</code></td> <td>cha�ne</td>
+<td>Algorithme utilis� pour la signature du certificat du serveur</td></tr>
+<tr><td><code>SSL_SERVER_A_KEY</code></td> <td>cha�ne</td>
+<td>Algorithme utilis� pour la cl� publique du certificat du serveur</td></tr>
+<tr><td><code>SSL_SERVER_CERT</code></td> <td>cha�ne</td>
+<td>Certificat du serveur au format PEM</td></tr>
+<tr><td><code>SSL_SRP_USER</code></td> <td>cha�ne</td>
+<td>nom d'utilisateur SRP</td></tr>
+<tr><td><code>SSL_SRP_USERINFO</code></td> <td>cha�ne</td>
+<td>informations sur l'utilisateur SRP</td></tr>
+<tr><td><code>SSL_TLS_SNI</code></td> <td>string</td>
+<td>Contenu de l'extension SNI TLS (si support� par ClientHello)</td></tr>
+</table>
+
+<p><em>x509</em> sp�cifie un �l�ment de DN X.509 parmi
+<code>C,ST,L,O,OU,CN,T,I,G,S,D,UID,Email</code>. A partir de la version
+2.1 d'Apache, <em>x509</em> peut aussi comporter un suffixe num�rique
+<code>_n</code>. Si le DN en question comporte plusieurs attributs de
+noms identiques, ce suffixe constitue un index d�butant � z�ro et
+permettant de s�lectionner un
+attribut particulier. Par exemple, si le DN sujet du certificat du
+serveur comporte deux champs OU, on peut utiliser
+<code>SSL_SERVER_S_DN_OU_0</code> et <code>SSL_SERVER_S_DN_OU_1</code>
+pour r�f�rencer chacun d'entre eux. Un nom de variable sans suffixe
+<code>_n</code> est �quivalent au m�me nom avec le suffixe
+<code>_0</code>, ce qui correspond au premier attribut (ou au seul)
+caract�risant le DN.
+Lorsque la table d'environnement est remplie en utilisant l'option
+<code>StdEnvVars</code> de la directive <code class="directive"><a href="#ssloptions">SSLOptions</a></code>, le premier attribut (ou le
+seul) caract�risant le DN est enregistr� avec un nom sans suffixe ;
+autrement dit, aucune entr�e poss�dant comme suffixe <code>_0</code>
+n'est enregistr�e.</p>
+
+<p>Le format des variables <em>*_DN</em> a chang� depuis la version
+2.3.11 d'Apache HTTPD. Voir l'option <code>LegacyDNStringFormat</code>
+de la directive <code class="directive"><a href="#ssloptions">SSLOptions</a></code> pour
+plus de d�tails.</p>
+
+<p><code>SSL_CLIENT_V_REMAIN</code> n'est disponible qu'� partir de la
+version 2.1.</p>
+
+<p>Plusieurs variables d'environnement additionnelles peuvent �tre
+utilis�es dans les expressions <code class="directive">SSLRequire</code>, ou
+dans les formats de journalisation personnalis�s :</p>
+
+<div class="note"><pre>HTTP_USER_AGENT PATH_INFO AUTH_TYPE
+HTTP_REFERER QUERY_STRING SERVER_SOFTWARE
+HTTP_COOKIE REMOTE_HOST API_VERSION
+HTTP_FORWARDED REMOTE_IDENT TIME_YEAR
+HTTP_HOST IS_SUBREQ TIME_MON
+HTTP_PROXY_CONNECTION DOCUMENT_ROOT TIME_DAY
+HTTP_ACCEPT SERVER_ADMIN TIME_HOUR
+THE_REQUEST SERVER_NAME TIME_MIN
+REQUEST_FILENAME SERVER_PORT TIME_SEC
+REQUEST_METHOD SERVER_PROTOCOL TIME_WDAY
+REQUEST_SCHEME REMOTE_ADDR TIME
+REQUEST_URI REMOTE_USER</pre></div>
+
+<p>Dans ces contextes, deux formats sp�ciaux peuvent aussi �tre utilis�s
+:</p>
+
+<dl>
+ <dt><code>ENV:<em>nom_variable</em></code></dt>
+ <dd>Correspond � la variable d'environnement standard
+ <em>nom_variable</em>.</dd>
+
+ <dt><code>HTTP:<em>nom_en-t�te</em></code></dt>
+ <dd>Correspond � la valeur de l'en-t�te de requ�te dont le nom est
+ <em>nom_en-t�te</em>.</dd>
+</dl>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="logformats" id="logformats">Formats de journaux
+personnalis�s</a></h2>
+
+<p>Lorsque <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> est compil� dans le serveur Apache
+ou m�me charg� (en mode DSO), des fonctions suppl�mentaires sont
+disponibles pour le <a href="mod_log_config.html#formats">Format de journal personnalis�</a> du
+module <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>. A ce titre, la fonction de
+format d'eXtension ``<code>%{</code><em>nom-var</em><code>}x</code>''
+peut �tre utilis�e pour pr�senter en extension toute variable fournie
+par tout module, et en particulier celles fournies par mod_ssl et que
+vous trouverez dans la table ci-dessus.</p>
+<p>
+A des fins de compatibilit� ascendante, il existe une fonction de format
+cryptographique suppl�mentaire
+``<code>%{</code><em>nom</em><code>}c</code>''. Vous trouverez toutes
+les informations � propos de cette fonction dans le chapitre <a href="../ssl/ssl_compat.html">Compatibilit�</a>.</p>
+<div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">CustomLog logs/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"</pre>
+</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="notes" id="notes">Information � propos de la requ�te</a></h2>
+
+<p><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> enregistre des informations � propos de la
+requ�te que l'on peut restituer dans les journaux avec la cha�ne de
+format <code>%{<em>nom</em>}n</code> via le module
+<code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>.</p>
+
+<p>Les informations enregistr�es sont les suivantes :</p>
+
+<dl>
+ <dt><code>ssl-access-forbidden</code></dt>
+ <dd>Cette information contient la valeur <code>1</code> si l'acc�s a
+ �t� refus� suite � une directive <code class="directive">SSLRequire</code> ou
+ <code class="directive">SSLRequireSSL</code>.</dd>
+
+ <dt><code>ssl-secure-reneg</code></dt>
+ <dd>Si <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> a �t� compil� avec une version
+ d'OpenSSL qui supporte la ren�gociation s�curis�e, si SSL est utilis�
+ pour la connexion courante et si le client supporte lui aussi la
+ ren�gociation s�curis�e, cette information contiendra la valeur
+ <code>1</code>. Si le client ne supporte pas la ren�gociation
+ s�curis�e, l'information contiendra la valeur <code>0</code>. Si
+ <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> n'a pas �t� compil� avec une version
+ d'OpenSSL qui supporte la ren�gociation s�curis�e, ou si SSL n'est pas
+ utilis� pour la connexion courante, le contenu de l'information ne
+ sera pas d�fini.</dd>
+</dl>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="authzproviders" id="authzproviders">Fournisseurs d'autorisation
+disponibles avec Require</a></h2>
+
+ <p><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> propose quelques fournisseurs
+ d'autorisation � utiliser avec la directive <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> du module
+ <code class="module"><a href="../mod/mod_authz_core.html">mod_authz_core</a></code>.</p>
+
+ <h3><a name="reqssl" id="reqssl">Require ssl</a></h3>
+
+ <p>Le fournisseur <code>ssl</code> refuse l'acc�s si une connexion
+ n'est pas chiffr�e avec SSL. L'effet est similaire � celui de la
+ directive <code class="directive">SSLRequireSSL</code>.</p>
+
+
+ <pre class="prettyprint lang-config">Require ssl</pre>
+
+
+
+
+
+ <h3><a name="reqverifyclient" id="reqverifyclient">Require ssl-verify-client</a></h3>
+
+ <p>Le fournisseur <code>ssl</code> autorise l'acc�s si
+ l'utilisateur est authentifi� via un certificat client valide. Ceci
+ n'a un effet que si <code>SSLVerifyClient optional</code> est actif.</p>
+
+ <p>Dans l'exemple suivant, l'acc�s est autoris� si le client est
+ authentifi� via un certificat client ou par nom d'utilisateur/mot de
+ passe :</p>
+
+ <pre class="prettyprint lang-config"> Require ssl-verify-client<br />
+ Require valid-user</pre>
+
+
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_ssl.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_substitute.html.en b/docs/manual/mod/mod_substitute.html.en
index 79b4d3b7c6..ad377ed3b4 100644
--- a/docs/manual/mod/mod_substitute.html.en
+++ b/docs/manual/mod/mod_substitute.html.en
@@ -44,7 +44,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#substitutemaxlinelength">SubstituteMaxLineLength</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Substitute" id="Substitute">Substitute</a> <a name="substitute" id="substitute">Directive</a></h2>
<table class="directive">
@@ -158,6 +157,7 @@ Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i"<
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_substitute.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_substitute.html.fr b/docs/manual/mod/mod_substitute.html.fr
index cad8548941..073f639a43 100644
--- a/docs/manual/mod/mod_substitute.html.fr
+++ b/docs/manual/mod/mod_substitute.html.fr
@@ -48,7 +48,6 @@ du serveur HTTP Apache</td></tr></table>
<li><img alt="" src="../images/down.gif" /> <a href="#substitutemaxlinelength">SubstituteMaxLineLength</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="substitute" id="substitute">Directive</a> <a name="Substitute" id="Substitute">Substitute</a></h2>
<table class="directive">
@@ -175,6 +174,7 @@ Apache</td></tr>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_substitute.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_suexec.html.en b/docs/manual/mod/mod_suexec.html.en
index 1638989b76..59033112a3 100644
--- a/docs/manual/mod/mod_suexec.html.en
+++ b/docs/manual/mod/mod_suexec.html.en
@@ -48,7 +48,6 @@ and Group</td></tr>
<ul class="seealso">
<li><a href="../suexec.html">SuEXEC support</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="SuexecUserGroup" id="SuexecUserGroup">SuexecUserGroup</a> <a name="suexecusergroup" id="suexecusergroup">Directive</a></h2>
<table class="directive">
@@ -73,6 +72,7 @@ and Group</td></tr>
<li><code class="directive"><a href="../mod/mod_unixd.html#suexec">Suexec</a></code></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_suexec.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_suexec.html.fr b/docs/manual/mod/mod_suexec.html.fr
index 235cf0a5cd..7c7b635f60 100644
--- a/docs/manual/mod/mod_suexec.html.fr
+++ b/docs/manual/mod/mod_suexec.html.fr
@@ -49,7 +49,6 @@ le groupe sp�cifi�s</td></tr>
<ul class="seealso">
<li><a href="../suexec.html">Support de SuEXEC</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="suexecusergroup" id="suexecusergroup">Directive</a> <a name="SuexecUserGroup" id="SuexecUserGroup">SuexecUserGroup</a></h2>
<table class="directive">
@@ -78,6 +77,7 @@ doivent s'ex�cuter</td></tr>
<li><code class="directive"><a href="../mod/mod_unixd.html#suexec">Suexec</a></code></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_suexec.html.ja.utf8 b/docs/manual/mod/mod_suexec.html.ja.utf8
index 294347caef..a983caefec 100644
--- a/docs/manual/mod/mod_suexec.html.ja.utf8
+++ b/docs/manual/mod/mod_suexec.html.ja.utf8
@@ -53,7 +53,6 @@
<ul class="seealso">
<li><a href="../suexec.html">SuEXEC サポート</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="SuexecUserGroup" id="SuexecUserGroup">SuexecUserGroup</a> <a name="suexecusergroup" id="suexecusergroup">ディレクティブ</a></h2>
<table class="directive">
@@ -77,6 +76,7 @@
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_suexec.html.ko.euc-kr b/docs/manual/mod/mod_suexec.html.ko.euc-kr
index 4ef54cd243..f7c6212246 100644
--- a/docs/manual/mod/mod_suexec.html.ko.euc-kr
+++ b/docs/manual/mod/mod_suexec.html.ko.euc-kr
@@ -51,7 +51,6 @@
<ul class="seealso">
<li><a href="../suexec.html">SuEXEC ����</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="SuexecUserGroup" id="SuexecUserGroup">SuexecUserGroup</a> <a name="suexecusergroup" id="suexecusergroup">���þ�</a></h2>
<table class="directive">
@@ -75,6 +74,7 @@
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_suexec.html.tr.utf8 b/docs/manual/mod/mod_suexec.html.tr.utf8
index b1dfb263cc..ca3fa01984 100644
--- a/docs/manual/mod/mod_suexec.html.tr.utf8
+++ b/docs/manual/mod/mod_suexec.html.tr.utf8
@@ -49,7 +49,6 @@
<ul class="seealso">
<li><a href="../suexec.html">SuEXEC Desteği</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="SuexecUserGroup" id="SuexecUserGroup">SuexecUserGroup</a> <a name="suexecusergroup" id="suexecusergroup">Yönergesi</a></h2>
<table class="directive">
@@ -77,6 +76,7 @@
<li><code class="directive"><a href="../mod/mod_unixd.html#suexec">Suexec</a></code></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_unixd.html.en b/docs/manual/mod/mod_unixd.html.en
index ebfd44de71..c1f5d71110 100644
--- a/docs/manual/mod/mod_unixd.html.en
+++ b/docs/manual/mod/mod_unixd.html.en
@@ -44,7 +44,6 @@
<ul class="seealso">
<li><a href="../suexec.html">suEXEC support</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ChrootDir" id="ChrootDir">ChrootDir</a> <a name="chrootdir" id="chrootdir">Directive</a></h2>
<table class="directive">
@@ -177,6 +176,7 @@ requests</td></tr>
<li><code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_unixd.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_unixd.html.fr b/docs/manual/mod/mod_unixd.html.fr
index 385612e3d1..0203f25188 100644
--- a/docs/manual/mod/mod_unixd.html.fr
+++ b/docs/manual/mod/mod_unixd.html.fr
@@ -45,7 +45,6 @@ famille Unix.</td></tr>
<ul class="seealso">
<li><a href="../suexec.html">Support de suEXEC</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="chrootdir" id="chrootdir">Directive</a> <a name="ChrootDir" id="ChrootDir">ChrootDir</a></h2>
<table class="directive">
@@ -192,6 +191,7 @@ requ�tes</td></tr>
<li><code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_unixd.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_unixd.html.tr.utf8 b/docs/manual/mod/mod_unixd.html.tr.utf8
index d435097e80..c80f0703a5 100644
--- a/docs/manual/mod/mod_unixd.html.tr.utf8
+++ b/docs/manual/mod/mod_unixd.html.tr.utf8
@@ -44,7 +44,6 @@
<ul class="seealso">
<li><a href="../suexec.html">suEXEC desteği</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ChrootDir" id="ChrootDir">ChrootDir</a> <a name="chrootdir" id="chrootdir">Yönergesi</a></h2>
<table class="directive">
@@ -180,6 +179,7 @@
<li><code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_unixd.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_userdir.html.en b/docs/manual/mod/mod_userdir.html.en
index 5e1bec00ea..0650f87957 100644
--- a/docs/manual/mod/mod_userdir.html.en
+++ b/docs/manual/mod/mod_userdir.html.en
@@ -50,7 +50,6 @@ Filesystem</a></li>
<li><a href="../howto/public_html.html">public_html
tutorial</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="UserDir" id="UserDir">UserDir</a> <a name="userdir" id="userdir">Directive</a></h2>
<table class="directive">
@@ -179,6 +178,7 @@ UserDir enabled user1 user2 user3</pre>
</li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_userdir.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_userdir.html.fr b/docs/manual/mod/mod_userdir.html.fr
index ebb56d88a4..b29b522bd5 100644
--- a/docs/manual/mod/mod_userdir.html.fr
+++ b/docs/manual/mod/mod_userdir.html.fr
@@ -50,7 +50,6 @@ avec le syst�me de fichiers</a></li>
<li><a href="../howto/public_html.html">Tutoriel
public_html</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="userdir" id="userdir">Directive</a> <a name="UserDir" id="UserDir">UserDir</a></h2>
<table class="directive">
@@ -190,6 +189,7 @@ UserDir enabled user1 user2 user3</pre>
</li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_userdir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_userdir.html.ja.utf8 b/docs/manual/mod/mod_userdir.html.ja.utf8
index 94efdd1af4..efa0ccbf88 100644
--- a/docs/manual/mod/mod_userdir.html.ja.utf8
+++ b/docs/manual/mod/mod_userdir.html.ja.utf8
@@ -56,7 +56,6 @@
<li><a href="../howto/public_html.html">public_html
チュートリアル</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="UserDir" id="UserDir">UserDir</a> <a name="userdir" id="userdir">ディレクティブ</a></h2>
<table class="directive">
@@ -183,6 +182,7 @@ Apache はリダイレクトが成功するかどうかを決めることはで�
チュートリアル</a></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_userdir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_userdir.html.ko.euc-kr b/docs/manual/mod/mod_userdir.html.ko.euc-kr
index 6a76d45a74..177b97da32 100644
--- a/docs/manual/mod/mod_userdir.html.ko.euc-kr
+++ b/docs/manual/mod/mod_userdir.html.ko.euc-kr
@@ -51,7 +51,6 @@
<li><a href="../howto/public_html.html">public_html
���丮��</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="UserDir" id="UserDir">UserDir</a> <a name="userdir" id="userdir">���þ�</a></h2>
<table class="directive">
@@ -155,6 +154,7 @@ http://www.foo.com/bob/one/two.html���� �����̷����� ������.</p>
���丮��</a></li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_userdir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_userdir.html.tr.utf8 b/docs/manual/mod/mod_userdir.html.tr.utf8
index e7f72d44e1..189a2edad7 100644
--- a/docs/manual/mod/mod_userdir.html.tr.utf8
+++ b/docs/manual/mod/mod_userdir.html.tr.utf8
@@ -53,7 +53,6 @@
<a href="../howto/public_html.html">public_html eğitmeni</a>
</li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="UserDir" id="UserDir">UserDir</a> <a name="userdir" id="userdir">Yönergesi</a></h2>
<table class="directive">
@@ -176,6 +175,7 @@ UserDir enabled birey1 birey2 birey3</pre>
</li>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_userdir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_usertrack.html.en b/docs/manual/mod/mod_usertrack.html.en
index 18412fa876..b29cc71a15 100644
--- a/docs/manual/mod/mod_usertrack.html.en
+++ b/docs/manual/mod/mod_usertrack.html.en
@@ -51,19 +51,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#logging">Logging</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="logging" id="logging">Logging</a></h2>
-
-
- <p><code class="module"><a href="../mod/mod_usertrack.html">mod_usertrack</a></code> sets a cookie which can be logged
- via <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> configurable logging formats:</p>
-
- <pre class="prettyprint lang-config">LogFormat "%{Apache}n %r %t" usertrack
-CustomLog logs/clickstream.log usertrack</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="CookieDomain" id="CookieDomain">CookieDomain</a> <a name="cookiedomain" id="cookiedomain">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The domain to which the tracking cookie applies</td></tr>
@@ -208,6 +195,19 @@ CustomLog logs/clickstream.log usertrack</pre>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="logging" id="logging">Logging</a></h2>
+
+
+ <p><code class="module"><a href="../mod/mod_usertrack.html">mod_usertrack</a></code> sets a cookie which can be logged
+ via <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> configurable logging formats:</p>
+
+ <pre class="prettyprint lang-config">LogFormat "%{Apache}n %r %t" usertrack
+CustomLog logs/clickstream.log usertrack</pre>
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_usertrack.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_usertrack.html.fr b/docs/manual/mod/mod_usertrack.html.fr
index d4f3a76aef..44874bc6d9 100644
--- a/docs/manual/mod/mod_usertrack.html.fr
+++ b/docs/manual/mod/mod_usertrack.html.fr
@@ -52,21 +52,6 @@ utilisateur sur un site
<li><img alt="" src="../images/down.gif" /> <a href="#logging">Journalisation</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="logging" id="logging">Journalisation</a></h2>
-
-
- <p><code class="module"><a href="../mod/mod_usertrack.html">mod_usertrack</a></code> d�finit un cookie qui peut �tre
- journalis� via les formats configurables du module
- <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> :</p>
-
- <pre class="prettyprint lang-config">LogFormat "%{Apache}n %r %t" usertrack
-CustomLog logs/clickstream.log usertrack</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="cookiedomain" id="cookiedomain">Directive</a> <a name="CookieDomain" id="CookieDomain">CookieDomain</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Le domaine auquel le cookie traceur
@@ -216,6 +201,21 @@ s'applique</td></tr>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="logging" id="logging">Journalisation</a></h2>
+
+
+ <p><code class="module"><a href="../mod/mod_usertrack.html">mod_usertrack</a></code> d�finit un cookie qui peut �tre
+ journalis� via les formats configurables du module
+ <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> :</p>
+
+ <pre class="prettyprint lang-config">LogFormat "%{Apache}n %r %t" usertrack
+CustomLog logs/clickstream.log usertrack</pre>
+
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_usertrack.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_version.html.en b/docs/manual/mod/mod_version.html.en
index 7201574133..8b447c4f09 100644
--- a/docs/manual/mod/mod_version.html.en
+++ b/docs/manual/mod/mod_version.html.en
@@ -56,7 +56,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#ifversion">&lt;IfVersion&gt;</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="IfVersion" id="IfVersion">&lt;IfVersion&gt;</a> <a name="ifversion" id="ifversion">Directive</a></h2>
<table class="directive">
@@ -128,6 +127,7 @@
<code>=</code>.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_version.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_version.html.ja.utf8 b/docs/manual/mod/mod_version.html.ja.utf8
index 3504c24f0e..afc86d74fa 100644
--- a/docs/manual/mod/mod_version.html.ja.utf8
+++ b/docs/manual/mod/mod_version.html.ja.utf8
@@ -56,7 +56,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#ifversion">&lt;IfVersion&gt;</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="IfVersion" id="IfVersion">&lt;IfVersion&gt;</a> <a name="ifversion" id="ifversion">ディレクティブ</a></h2>
<table class="directive">
@@ -126,6 +125,7 @@
みなされます。</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../en/mod/mod_version.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_version.html.ko.euc-kr b/docs/manual/mod/mod_version.html.ko.euc-kr
index fb0f12aa2a..13229fa516 100644
--- a/docs/manual/mod/mod_version.html.ko.euc-kr
+++ b/docs/manual/mod/mod_version.html.ko.euc-kr
@@ -64,7 +64,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#ifversion">&lt;IfVersion&gt;</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="IfVersion" id="IfVersion">&lt;IfVersion&gt;</a> <a name="ifversion" id="ifversion">���þ�</a></h2>
<table class="directive">
@@ -142,6 +141,7 @@
�����Ѵ�.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>������ ���: </span><a href="../en/mod/mod_version.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_vhost_alias.html.en b/docs/manual/mod/mod_vhost_alias.html.en
index 7fb59b2f97..cb1baed83b 100644
--- a/docs/manual/mod/mod_vhost_alias.html.en
+++ b/docs/manual/mod/mod_vhost_alias.html.en
@@ -72,6 +72,96 @@ VirtualScriptAlias "/never/found/%0/cgi-bin/"</pre>
virtual hosting</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="VirtualDocumentRoot" id="VirtualDocumentRoot">VirtualDocumentRoot</a> <a name="virtualdocumentroot" id="virtualdocumentroot">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dynamically configure the location of the document root
+for a given virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>VirtualDocumentRoot <em>interpolated-directory</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>VirtualDocumentRoot none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_vhost_alias</td></tr>
+</table>
+
+ <p>The <code class="directive">VirtualDocumentRoot</code> directive allows you to
+ determine where Apache HTTP Server will find your documents based on the
+ value of the server name. The result of expanding
+ <em>interpolated-directory</em> is used as the root of the
+ document tree in a similar manner to the <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directive's argument.
+ If <em>interpolated-directory</em> is <code>none</code> then
+ <code class="directive">VirtualDocumentRoot</code> is turned off. This directive
+ cannot be used in the same context as <code class="directive"><a href="#virtualdocumentrootip">VirtualDocumentRootIP</a></code>.</p>
+
+<div class="warning"><h3>Note</h3>
+<code class="directive">VirtualDocumentRoot</code> will override any <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directives you may have put in the same
+context or child contexts. Putting a <code class="directive">VirtualDocumentRoot</code>
+in the global server scope will effectively override <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directives in any virtual hosts defined later
+on, unless you set <code class="directive">VirtualDocumentRoot</code> to <code>None</code>
+in each virtual host.
+</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="VirtualDocumentRootIP" id="VirtualDocumentRootIP">VirtualDocumentRootIP</a> <a name="virtualdocumentrootip" id="virtualdocumentrootip">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dynamically configure the location of the document root
+for a given virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>VirtualDocumentRootIP <em>interpolated-directory</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>VirtualDocumentRootIP none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_vhost_alias</td></tr>
+</table>
+
+<p>The <code class="directive">VirtualDocumentRootIP</code> directive is like the
+ <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code>
+ directive, except that it uses the IP address of the server end
+ of the connection for directory interpolation instead of the server
+ name.</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="VirtualScriptAlias" id="VirtualScriptAlias">VirtualScriptAlias</a> <a name="virtualscriptalias" id="virtualscriptalias">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dynamically configure the location of the CGI directory for
+a given virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>VirtualScriptAlias <em>interpolated-directory</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>VirtualScriptAlias none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_vhost_alias</td></tr>
+</table>
+
+ <p>The <code class="directive">VirtualScriptAlias</code> directive allows you to
+ determine where Apache httpd will find CGI scripts in a similar
+ manner to <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code> does for other documents. It matches
+ requests for URIs starting <code>/cgi-bin/</code>, much like <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
+ <code>/cgi-bin/</code> would.</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="VirtualScriptAliasIP" id="VirtualScriptAliasIP">VirtualScriptAliasIP</a> <a name="virtualscriptaliasip" id="virtualscriptaliasip">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dynamically configure the location of the CGI directory for
+a given virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>VirtualScriptAliasIP <em>interpolated-directory</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>VirtualScriptAliasIP none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_vhost_alias</td></tr>
+</table>
+
+ <p>The <code class="directive">VirtualScriptAliasIP</code> directive is like the
+ <code class="directive"><a href="#virtualscriptalias">VirtualScriptAlias</a></code>
+ directive, except that it uses the IP address of the server end
+ of the connection for directory interpolation instead of the server
+ name.</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="interpol" id="interpol">Directory Name Interpolation</a></h2>
@@ -237,96 +327,6 @@ VirtualScriptAliasIP "/usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin"</pre>
directives <code>%V</code> and <code>%A</code> are useful
in conjunction with this module.</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="VirtualDocumentRoot" id="VirtualDocumentRoot">VirtualDocumentRoot</a> <a name="virtualdocumentroot" id="virtualdocumentroot">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dynamically configure the location of the document root
-for a given virtual host</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>VirtualDocumentRoot <em>interpolated-directory</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>VirtualDocumentRoot none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_vhost_alias</td></tr>
-</table>
-
- <p>The <code class="directive">VirtualDocumentRoot</code> directive allows you to
- determine where Apache HTTP Server will find your documents based on the
- value of the server name. The result of expanding
- <em>interpolated-directory</em> is used as the root of the
- document tree in a similar manner to the <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directive's argument.
- If <em>interpolated-directory</em> is <code>none</code> then
- <code class="directive">VirtualDocumentRoot</code> is turned off. This directive
- cannot be used in the same context as <code class="directive"><a href="#virtualdocumentrootip">VirtualDocumentRootIP</a></code>.</p>
-
-<div class="warning"><h3>Note</h3>
-<code class="directive">VirtualDocumentRoot</code> will override any <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directives you may have put in the same
-context or child contexts. Putting a <code class="directive">VirtualDocumentRoot</code>
-in the global server scope will effectively override <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directives in any virtual hosts defined later
-on, unless you set <code class="directive">VirtualDocumentRoot</code> to <code>None</code>
-in each virtual host.
-</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="VirtualDocumentRootIP" id="VirtualDocumentRootIP">VirtualDocumentRootIP</a> <a name="virtualdocumentrootip" id="virtualdocumentrootip">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dynamically configure the location of the document root
-for a given virtual host</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>VirtualDocumentRootIP <em>interpolated-directory</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>VirtualDocumentRootIP none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_vhost_alias</td></tr>
-</table>
-
-<p>The <code class="directive">VirtualDocumentRootIP</code> directive is like the
- <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code>
- directive, except that it uses the IP address of the server end
- of the connection for directory interpolation instead of the server
- name.</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="VirtualScriptAlias" id="VirtualScriptAlias">VirtualScriptAlias</a> <a name="virtualscriptalias" id="virtualscriptalias">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dynamically configure the location of the CGI directory for
-a given virtual host</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>VirtualScriptAlias <em>interpolated-directory</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>VirtualScriptAlias none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_vhost_alias</td></tr>
-</table>
-
- <p>The <code class="directive">VirtualScriptAlias</code> directive allows you to
- determine where Apache httpd will find CGI scripts in a similar
- manner to <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code> does for other documents. It matches
- requests for URIs starting <code>/cgi-bin/</code>, much like <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
- <code>/cgi-bin/</code> would.</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="VirtualScriptAliasIP" id="VirtualScriptAliasIP">VirtualScriptAliasIP</a> <a name="virtualscriptaliasip" id="virtualscriptaliasip">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Dynamically configure the location of the CGI directory for
-a given virtual host</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>VirtualScriptAliasIP <em>interpolated-directory</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>VirtualScriptAliasIP none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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_vhost_alias</td></tr>
-</table>
-
- <p>The <code class="directive">VirtualScriptAliasIP</code> directive is like the
- <code class="directive"><a href="#virtualscriptalias">VirtualScriptAlias</a></code>
- directive, except that it uses the IP address of the server end
- of the connection for directory interpolation instead of the server
- name.</p>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_vhost_alias.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_vhost_alias.html.fr b/docs/manual/mod/mod_vhost_alias.html.fr
index 26a9e83987..88cb894a2f 100644
--- a/docs/manual/mod/mod_vhost_alias.html.fr
+++ b/docs/manual/mod/mod_vhost_alias.html.fr
@@ -76,6 +76,101 @@ VirtualScriptAlias /never/found/%0/cgi-bin/</pre>
l'h�bergement virtuel de masse</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="virtualdocumentroot" id="virtualdocumentroot">Directive</a> <a name="VirtualDocumentRoot" id="VirtualDocumentRoot">VirtualDocumentRoot</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Permet une configuration dynamique de la racine des
+documents d'un serveur virtuel donn�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>VirtualDocumentRoot <em>r�pertoire-interpol�</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>VirtualDocumentRoot none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_vhost_alias</td></tr>
+</table>
+
+ <p>La directive <code class="directive">VirtualDocumentRoot</code> vous
+ permet de sp�cifier o� le serveur HTTP Apache pourra trouver vos
+ documents en se basant
+ sur le nom du serveur. Le r�sultat de l'expansion du
+ <em>r�pertoire-interpol�</em> est utilis� comme racine de
+ l'arborescence des documents d'une mani�re similaire � l'argument de
+ la directive <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>. Si
+ <em>r�pertoire-interpol�</em> a pour valeur <code>none</code>, la
+ directive <code class="directive">VirtualDocumentRoot</code> est d�sactiv�e.
+ Cette directive ne peut pas �tre utilis�e dans le m�me contexte que
+ la directive <code class="directive"><a href="#virtualdocumentrootip">VirtualDocumentRootIP</a></code>.</p>
+
+<div class="warning"><h3>Note</h3>
+La directive <code class="directive">VirtualDocumentRoot</code> l'emporte sur
+toute directive <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+d�finie dans le m�me contexte ou dans des contextes enfants. Le fait de
+d�finir une directive <code class="directive">VirtualDocumentRoot</code> dans le
+contexte du serveur principal va effectivement l'emporter sur toute
+directive <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> d�finie dans
+un serveur virtuel quelconque, si vous n'avez pas d�fini
+<code class="directive">VirtualDocumentRoot</code> � <code>None</code> dans ce
+serveur virtuel.
+</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="virtualdocumentrootip" id="virtualdocumentrootip">Directive</a> <a name="VirtualDocumentRootIP" id="VirtualDocumentRootIP">VirtualDocumentRootIP</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configuration dynamique de la racine des documents pour un
+serveur virtuel donn�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>VirtualDocumentRootIP <em>r�pertoire-interpol�</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>VirtualDocumentRootIP none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_vhost_alias</td></tr>
+</table>
+
+<p>La directive <code class="directive">VirtualDocumentRootIP</code> est
+identique � la directive <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code> � l'exception
+pr�s qu'elle utilise l'adresse IP du serveur virtuel pour
+l'interpolation du r�pertoire � la place du nom du serveur.</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="virtualscriptalias" id="virtualscriptalias">Directive</a> <a name="VirtualScriptAlias" id="VirtualScriptAlias">VirtualScriptAlias</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configuration dynamique du r�pertoire des scripts CGI pour
+un serveur virtuel donn�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>VirtualScriptAlias <em>r�pertoire-interpol�</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>VirtualScriptAlias none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_vhost_alias</td></tr>
+</table>
+
+ <p>La directive <code class="directive">VirtualScriptAlias</code> vous
+ permet de sp�cifier o� Apache httpd pourra trouver les scripts CGI selon une
+ m�thode similaire � celle qu'utilise la directive <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code> pour les
+ autres documents. Elle recherche des requ�tes dont l'URI commence
+ par <code>/cgi-bin/</code>, comme le ferait la directive <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>.</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="virtualscriptaliasip" id="virtualscriptaliasip">Directive</a> <a name="VirtualScriptAliasIP" id="VirtualScriptAliasIP">VirtualScriptAliasIP</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configuration dynamique du r�pertoire des scripts CGI pour
+un serveur virtuel donn�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>VirtualScriptAliasIP <em>r�pertoire-interpol�</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>VirtualScriptAliasIP none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_vhost_alias</td></tr>
+</table>
+
+ <p>La directive <code class="directive">VirtualScriptAliasIP</code> est
+ identique � la directive <code class="directive"><a href="#virtualscriptalias">VirtualScriptAlias</a></code> �
+ l'exception pr�s qu'elle utilise l'adresse IP du serveur virtuel
+ pour l'interpolation du r�pertoire � la place du nom du serveur.</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="interpol" id="interpol">Interpolation du nom de r�pertoire</a></h2>
@@ -258,101 +353,6 @@ VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin</pre>
de la directive <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> s'av�rent tr�s utiles
lorsqu'ils sont utilis�s en conjonction avec ce module.</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="virtualdocumentroot" id="virtualdocumentroot">Directive</a> <a name="VirtualDocumentRoot" id="VirtualDocumentRoot">VirtualDocumentRoot</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Permet une configuration dynamique de la racine des
-documents d'un serveur virtuel donn�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>VirtualDocumentRoot <em>r�pertoire-interpol�</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>VirtualDocumentRoot none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_vhost_alias</td></tr>
-</table>
-
- <p>La directive <code class="directive">VirtualDocumentRoot</code> vous
- permet de sp�cifier o� le serveur HTTP Apache pourra trouver vos
- documents en se basant
- sur le nom du serveur. Le r�sultat de l'expansion du
- <em>r�pertoire-interpol�</em> est utilis� comme racine de
- l'arborescence des documents d'une mani�re similaire � l'argument de
- la directive <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>. Si
- <em>r�pertoire-interpol�</em> a pour valeur <code>none</code>, la
- directive <code class="directive">VirtualDocumentRoot</code> est d�sactiv�e.
- Cette directive ne peut pas �tre utilis�e dans le m�me contexte que
- la directive <code class="directive"><a href="#virtualdocumentrootip">VirtualDocumentRootIP</a></code>.</p>
-
-<div class="warning"><h3>Note</h3>
-La directive <code class="directive">VirtualDocumentRoot</code> l'emporte sur
-toute directive <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-d�finie dans le m�me contexte ou dans des contextes enfants. Le fait de
-d�finir une directive <code class="directive">VirtualDocumentRoot</code> dans le
-contexte du serveur principal va effectivement l'emporter sur toute
-directive <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> d�finie dans
-un serveur virtuel quelconque, si vous n'avez pas d�fini
-<code class="directive">VirtualDocumentRoot</code> � <code>None</code> dans ce
-serveur virtuel.
-</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="virtualdocumentrootip" id="virtualdocumentrootip">Directive</a> <a name="VirtualDocumentRootIP" id="VirtualDocumentRootIP">VirtualDocumentRootIP</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configuration dynamique de la racine des documents pour un
-serveur virtuel donn�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>VirtualDocumentRootIP <em>r�pertoire-interpol�</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>VirtualDocumentRootIP none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_vhost_alias</td></tr>
-</table>
-
-<p>La directive <code class="directive">VirtualDocumentRootIP</code> est
-identique � la directive <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code> � l'exception
-pr�s qu'elle utilise l'adresse IP du serveur virtuel pour
-l'interpolation du r�pertoire � la place du nom du serveur.</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="virtualscriptalias" id="virtualscriptalias">Directive</a> <a name="VirtualScriptAlias" id="VirtualScriptAlias">VirtualScriptAlias</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configuration dynamique du r�pertoire des scripts CGI pour
-un serveur virtuel donn�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>VirtualScriptAlias <em>r�pertoire-interpol�</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>VirtualScriptAlias none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_vhost_alias</td></tr>
-</table>
-
- <p>La directive <code class="directive">VirtualScriptAlias</code> vous
- permet de sp�cifier o� Apache httpd pourra trouver les scripts CGI selon une
- m�thode similaire � celle qu'utilise la directive <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code> pour les
- autres documents. Elle recherche des requ�tes dont l'URI commence
- par <code>/cgi-bin/</code>, comme le ferait la directive <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>.</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="virtualscriptaliasip" id="virtualscriptaliasip">Directive</a> <a name="VirtualScriptAliasIP" id="VirtualScriptAliasIP">VirtualScriptAliasIP</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configuration dynamique du r�pertoire des scripts CGI pour
-un serveur virtuel donn�</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>VirtualScriptAliasIP <em>r�pertoire-interpol�</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">D�faut:</a></th><td><code>VirtualScriptAliasIP none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</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_vhost_alias</td></tr>
-</table>
-
- <p>La directive <code class="directive">VirtualScriptAliasIP</code> est
- identique � la directive <code class="directive"><a href="#virtualscriptalias">VirtualScriptAlias</a></code> �
- l'exception pr�s qu'elle utilise l'adresse IP du serveur virtuel
- pour l'interpolation du r�pertoire � la place du nom du serveur.</p>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_vhost_alias.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_vhost_alias.html.tr.utf8 b/docs/manual/mod/mod_vhost_alias.html.tr.utf8
index 113dc50e21..18e651bbb3 100644
--- a/docs/manual/mod/mod_vhost_alias.html.tr.utf8
+++ b/docs/manual/mod/mod_vhost_alias.html.tr.utf8
@@ -72,6 +72,93 @@ VirtualScriptAlias /nerede/bilinmiyor/%0/cgi-bin/</pre>
Sanal Barındırma</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="VirtualDocumentRoot" id="VirtualDocumentRoot">VirtualDocumentRoot</a> <a name="virtualdocumentroot" id="virtualdocumentroot">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir sanal konağın belge kök dizinini devingen olarak yapılandırır.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>VirtualDocumentRoot <em>hesaplanan-dizin</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>VirtualDocumentRoot none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_vhost_alias</td></tr>
+</table>
+
+ <p><code class="directive">VirtualDocumentRoot</code> yönergesi sunucu ismine göre
+ belgelerin bulunacağı yeri Apache HTTP Sunucusunun saptamasını sağlar.
+ <code><em>hesaplanan-dizin</em></code>’in dönüşüm sonucu <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> yönergesinin değeriymiş gibi
+ belge ağacının kök dizini olarak kullanılır.
+ <code><em>hesaplanan-dizin</em></code> yerine <code>none</code>
+ belirtilmişse <code class="directive">VirtualDocumentRoot</code> iptal edilmiş
+ olur. Bu yönerge <code class="directive"><a href="#virtualdocumentrootip">VirtualDocumentRootIP</a></code> yönergesinin kullanıldığı bağlamda
+ yer alamaz.</p>
+
+ <div class="warning"><h3>Bilginize</h3>
+ <code class="directive">VirtualDocumentRoot</code> yönergesi aynı bağlamda veya
+ alt bağlamlarda da kullanılabilen <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> yönergelerini geçersiz kılar.
+ Genel sunucu etki alanına bir <code class="directive">VirtualDocumentRoot</code>
+ konulması, daha sonra yer alan her sanal konak tanımı içinde
+ <code class="directive">VirtualDocumentRoot</code> yönergesine <code>None</code>
+ atamadıkça bu sanal konaklarda yapılmış <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> atamalarını geçersiz kılacaktır.
+ </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="VirtualDocumentRootIP" id="VirtualDocumentRootIP">VirtualDocumentRootIP</a> <a name="virtualdocumentrootip" id="virtualdocumentrootip">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir sanal konağın belge kök dizinini devingen olarak yapılandırır.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>VirtualDocumentRootIP <em>hesaplanan-dizin</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>VirtualDocumentRootIP none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_vhost_alias</td></tr>
+</table>
+
+ <p><code class="directive">VirtualDocumentRootIP</code> yönergesi, dizinin
+ saptanmasında sunucu ismi yerine bağlantının sonlandığı sunucunun IP
+ adresini kullanması dışında <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code> gibidir.</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="VirtualScriptAlias" id="VirtualScriptAlias">VirtualScriptAlias</a> <a name="virtualscriptalias" id="virtualscriptalias">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir sanal konağın CGI dizinini devingen olarak yapılandırır.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>VirtualScriptAlias <em>hesaplanan-dizin</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>VirtualScriptAlias none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_vhost_alias</td></tr>
+</table>
+
+ <p><code class="directive">VirtualScriptAlias</code> yönergesi, CGI betiklerinin
+ bulunacağı yeri Apache httpd’nin saptamasını sağlamak bakımından
+ <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code>
+ yönergesinin yaptığını yapar. <code>/cgi-bin/</code> ile başlayan
+ istekler için ise <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
+ yönergesinin yaptığını yapar.</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="VirtualScriptAliasIP" id="VirtualScriptAliasIP">VirtualScriptAliasIP</a> <a name="virtualscriptaliasip" id="virtualscriptaliasip">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir sanal konağın CGI dizinini devingen olarak yapılandırır.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>VirtualScriptAliasIP <em>hesaplanan-dizin</em>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>VirtualScriptAliasIP none</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_vhost_alias</td></tr>
+</table>
+
+ <p><code class="directive">VirtualScriptAliasIP</code> yönergesi, dizinin
+ saptanmasında sunucu ismi yerine bağlantının sonlandığı sunucunun IP
+ adresini kullanması dışında <code class="directive"><a href="#virtualscriptalias">VirtualScriptAlias</a></code> gibidir.</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="interpol" id="interpol">Dizin İsimlerinin Elde Edilmesi</a></h2>
@@ -234,93 +321,6 @@ VirtualScriptAliasIP /usr/local/apache/sankonlar/%1/%2/%3/%4/cgi-bin</pre>
<code>%V</code> ve <code>%A</code> <a href="mod_log_config.html#formats">biçem belirteçleri</a> bu modülle
birlikte kullanıldığında çok yararlı olurlar.</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="VirtualDocumentRoot" id="VirtualDocumentRoot">VirtualDocumentRoot</a> <a name="virtualdocumentroot" id="virtualdocumentroot">Yönergesi</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir sanal konağın belge kök dizinini devingen olarak yapılandırır.
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>VirtualDocumentRoot <em>hesaplanan-dizin</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>VirtualDocumentRoot none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
-<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
-<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_vhost_alias</td></tr>
-</table>
-
- <p><code class="directive">VirtualDocumentRoot</code> yönergesi sunucu ismine göre
- belgelerin bulunacağı yeri Apache HTTP Sunucusunun saptamasını sağlar.
- <code><em>hesaplanan-dizin</em></code>’in dönüşüm sonucu <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> yönergesinin değeriymiş gibi
- belge ağacının kök dizini olarak kullanılır.
- <code><em>hesaplanan-dizin</em></code> yerine <code>none</code>
- belirtilmişse <code class="directive">VirtualDocumentRoot</code> iptal edilmiş
- olur. Bu yönerge <code class="directive"><a href="#virtualdocumentrootip">VirtualDocumentRootIP</a></code> yönergesinin kullanıldığı bağlamda
- yer alamaz.</p>
-
- <div class="warning"><h3>Bilginize</h3>
- <code class="directive">VirtualDocumentRoot</code> yönergesi aynı bağlamda veya
- alt bağlamlarda da kullanılabilen <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> yönergelerini geçersiz kılar.
- Genel sunucu etki alanına bir <code class="directive">VirtualDocumentRoot</code>
- konulması, daha sonra yer alan her sanal konak tanımı içinde
- <code class="directive">VirtualDocumentRoot</code> yönergesine <code>None</code>
- atamadıkça bu sanal konaklarda yapılmış <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> atamalarını geçersiz kılacaktır.
- </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="VirtualDocumentRootIP" id="VirtualDocumentRootIP">VirtualDocumentRootIP</a> <a name="virtualdocumentrootip" id="virtualdocumentrootip">Yönergesi</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir sanal konağın belge kök dizinini devingen olarak yapılandırır.
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>VirtualDocumentRootIP <em>hesaplanan-dizin</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>VirtualDocumentRootIP none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
-<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
-<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_vhost_alias</td></tr>
-</table>
-
- <p><code class="directive">VirtualDocumentRootIP</code> yönergesi, dizinin
- saptanmasında sunucu ismi yerine bağlantının sonlandığı sunucunun IP
- adresini kullanması dışında <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code> gibidir.</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="VirtualScriptAlias" id="VirtualScriptAlias">VirtualScriptAlias</a> <a name="virtualscriptalias" id="virtualscriptalias">Yönergesi</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir sanal konağın CGI dizinini devingen olarak yapılandırır.
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>VirtualScriptAlias <em>hesaplanan-dizin</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>VirtualScriptAlias none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
-<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
-<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_vhost_alias</td></tr>
-</table>
-
- <p><code class="directive">VirtualScriptAlias</code> yönergesi, CGI betiklerinin
- bulunacağı yeri Apache httpd’nin saptamasını sağlamak bakımından
- <code class="directive"><a href="#virtualdocumentroot">VirtualDocumentRoot</a></code>
- yönergesinin yaptığını yapar. <code>/cgi-bin/</code> ile başlayan
- istekler için ise <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
- yönergesinin yaptığını yapar.</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="VirtualScriptAliasIP" id="VirtualScriptAliasIP">VirtualScriptAliasIP</a> <a name="virtualscriptaliasip" id="virtualscriptaliasip">Yönergesi</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir sanal konağın CGI dizinini devingen olarak yapılandırır.
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>VirtualScriptAliasIP <em>hesaplanan-dizin</em>|none</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>VirtualScriptAliasIP none</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Bağlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
-<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Eklenti</td></tr>
-<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>mod_vhost_alias</td></tr>
-</table>
-
- <p><code class="directive">VirtualScriptAliasIP</code> yönergesi, dizinin
- saptanmasında sunucu ismi yerine bağlantının sonlandığı sunucunun IP
- adresini kullanması dışında <code class="directive"><a href="#virtualscriptalias">VirtualScriptAlias</a></code> gibidir.</p>
-
-
-</div>
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../en/mod/mod_vhost_alias.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_watchdog.html.en b/docs/manual/mod/mod_watchdog.html.en
index 0c5c65e07d..a273e1a305 100644
--- a/docs/manual/mod/mod_watchdog.html.en
+++ b/docs/manual/mod/mod_watchdog.html.en
@@ -53,7 +53,6 @@ core or, if a dynamic module, be loaded before the calling module.
<li><img alt="" src="../images/down.gif" /> <a href="#watchdoginterval">WatchdogInterval</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="WatchdogInterval" id="WatchdogInterval">WatchdogInterval</a> <a name="watchdoginterval" id="watchdoginterval">Directive</a></h2>
<table class="directive">
@@ -68,6 +67,7 @@ core or, if a dynamic module, be loaded before the calling module.
second.</p>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_watchdog.html" title="English">&nbsp;en&nbsp;</a></p>
diff --git a/docs/manual/mod/mod_xml2enc.html.en b/docs/manual/mod/mod_xml2enc.html.en
index 30cc39fe20..76f7c777e5 100644
--- a/docs/manual/mod/mod_xml2enc.html.en
+++ b/docs/manual/mod/mod_xml2enc.html.en
@@ -59,6 +59,58 @@ for 2.2.x versions</td></tr></table>
<li><img alt="" src="../images/down.gif" /> <a href="#alias">Unsupported Encodings</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="xml2EncAlias" id="xml2EncAlias">xml2EncAlias</a> <a name="xml2encalias" id="xml2encalias">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Recognise Aliases for encoding values</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>xml2EncAlias <var>charset alias [alias ...]</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<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_xml2enc</td></tr>
+</table>
+ <p>This server-wide directive aliases one or more encoding to another
+ encoding. This enables encodings not recognised by libxml2 to be handled
+ internally by libxml2's encoding support using the translation table for
+ a recognised encoding. This serves two purposes: to support character sets
+ (or names) not recognised either by libxml2 or iconv, and to skip
+ conversion for an encoding where it is known to be unnecessary.</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="xml2EncDefault" id="xml2EncDefault">xml2EncDefault</a> <a name="xml2encdefault" id="xml2encdefault">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets a default encoding to assume when absolutely no information
+can be <a href="#sniffing">automatically detected</a></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>xml2EncDefault <var>name</var></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>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_xml2enc</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.4.0 and later; available as a third-party
+module for earlier versions.</td></tr>
+</table>
+ <p>If you are processing data with known encoding but no encoding
+ information, you can set this default to help mod_xml2enc process
+ the data correctly. For example, to work with the default value
+ of Latin1 (<var>iso-8859-1</var> specified in HTTP/1.0, use</p>
+ <pre class="prettyprint lang-config">xml2EncDefault iso-8859-1</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="xml2StartParse" id="xml2StartParse">xml2StartParse</a> <a name="xml2startparse" id="xml2startparse">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Advise the parser to skip leading junk.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>xml2StartParse <var>element [element ...]</var></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>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_xml2enc</td></tr>
+</table>
+ <p>Specify that the markup parser should start at the first instance
+ of any of the elements specified. This can be used as a workaround
+ where a broken backend inserts leading junk that messes up the parser (<a href="http://bahumbug.wordpress.com/2006/10/12/mod_proxy_html-revisited/">example here</a>).</p>
+ <p>It should never be used for XML, nor well-formed HTML.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="usage" id="usage">Usage</a></h2>
<p>There are two usage scenarios: with modules programmed to work
@@ -134,58 +186,6 @@ the server of an unnecessary conversion.</p>
the conversion methods available on your platform, you can still alias
them to a supported encoding using <code class="directive">xml2EncAlias</code>.</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="xml2EncAlias" id="xml2EncAlias">xml2EncAlias</a> <a name="xml2encalias" id="xml2encalias">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Recognise Aliases for encoding values</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>xml2EncAlias <var>charset alias [alias ...]</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
-<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_xml2enc</td></tr>
-</table>
- <p>This server-wide directive aliases one or more encoding to another
- encoding. This enables encodings not recognised by libxml2 to be handled
- internally by libxml2's encoding support using the translation table for
- a recognised encoding. This serves two purposes: to support character sets
- (or names) not recognised either by libxml2 or iconv, and to skip
- conversion for an encoding where it is known to be unnecessary.</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="xml2EncDefault" id="xml2EncDefault">xml2EncDefault</a> <a name="xml2encdefault" id="xml2encdefault">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets a default encoding to assume when absolutely no information
-can be <a href="#sniffing">automatically detected</a></td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>xml2EncDefault <var>name</var></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>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_xml2enc</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.4.0 and later; available as a third-party
-module for earlier versions.</td></tr>
-</table>
- <p>If you are processing data with known encoding but no encoding
- information, you can set this default to help mod_xml2enc process
- the data correctly. For example, to work with the default value
- of Latin1 (<var>iso-8859-1</var> specified in HTTP/1.0, use</p>
- <pre class="prettyprint lang-config">xml2EncDefault iso-8859-1</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="xml2StartParse" id="xml2StartParse">xml2StartParse</a> <a name="xml2startparse" id="xml2startparse">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Advise the parser to skip leading junk.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>xml2StartParse <var>element [element ...]</var></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>
-<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_xml2enc</td></tr>
-</table>
- <p>Specify that the markup parser should start at the first instance
- of any of the elements specified. This can be used as a workaround
- where a broken backend inserts leading junk that messes up the parser (<a href="http://bahumbug.wordpress.com/2006/10/12/mod_proxy_html-revisited/">example here</a>).</p>
- <p>It should never be used for XML, nor well-formed HTML.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_xml2enc.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mod_xml2enc.html.fr b/docs/manual/mod/mod_xml2enc.html.fr
index e322d530bc..25f7b5eaad 100644
--- a/docs/manual/mod/mod_xml2enc.html.fr
+++ b/docs/manual/mod/mod_xml2enc.html.fr
@@ -61,6 +61,65 @@ Disponible en tant que module tiers dans les versions 2.2.x</td></tr></table>
<li><img alt="" src="../images/down.gif" /> <a href="#alias">Codages non support�s</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="xml2encalias" id="xml2encalias">Directive</a> <a name="xml2EncAlias" id="xml2EncAlias">xml2EncAlias</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit des alias pour les valeurs d'encodage</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>xml2EncAlias <var>jeu-de-caract�res alias [alias ...]</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</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_xml2enc</td></tr>
+</table>
+ <p>Cette directive de niveau serveur permet de d�finir un ou
+ plusieurs alias pour un encodage. Elle permet au support d'encodage de
+ libxml2 de traiter en interne des encodages non reconnus par libxml2
+ en utilisant la table de conversion pour un encodage reconnu. Elle
+ permet d'atteindre deux objectifs : supporter des jeux (ou noms) de
+ caract�res non reconnus par libxml2 ou iconv, et �viter une
+ conversion pour un encodage lorsque cela n'est pas n�cessaire.</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="xml2encdefault" id="xml2encdefault">Directive</a> <a name="xml2EncDefault" id="xml2EncDefault">xml2EncDefault</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit un encodage par d�faut � utiliser lorsqu'aucune
+information ne peut �tre <a href="#sniffing">automatiquement d�tect�e</a></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>xml2EncDefault <var>nom</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</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_xml2enc</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.4.0 du serveur HTTP Apache
+; disponible depuis un module tiers dans les versions ant�rieures.</td></tr>
+</table>
+ <p>Si vous traitez des donn�es dont l'encodage est connu, mais ne
+ contenant aucune information � propos de ce dernier, vous pouvez
+ d�finir une valeur par d�faut afin d'aider mod_xml2enc � traiter
+ correctement les donn�es. Par exemple, pour d�finir la valeur par
+ d�faut Latin1 (<var>iso-8859-1</var> specifi�e dans HTTP/1.0),
+ utilisez :</p>
+ <pre class="prettyprint lang-config">xml2EncDefault iso-8859-1</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="xml2startparse" id="xml2startparse">Directive</a> <a name="xml2StartParse" id="xml2StartParse">xml2StartParse</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Indique � l'interpr�teur � partir de quelle balise il doit
+commencer son traitement.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>xml2StartParse <var>�l�ment [�l�ment ...]</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</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_xml2enc</td></tr>
+</table>
+ <p>Cette directive permet de sp�cifier � partir de quelle balise,
+ parmi les �l�ments sp�cifi�s, l'interpr�teur de balise doit
+ commencer son traitement. Ccei permet de contourner le probl�me des
+ serveurs d'arri�re-plan qui ins�rent des �l�ments non conformes en
+ d�but de donn�es, ce qui a pour effet de perturber l'interpr�teur (<a href="http://bahumbug.wordpress.com/2006/10/12/mod_proxy_html-revisited/">voir un exemple ici</a>).</p>
+ <p>Elle ne doit �tre utilis�e ni pour les documents XML, ni pour les
+ documents HTML correctement format�s.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="usage" id="usage">Utilisation</a></h2>
<p>Il existe deux sc�narios d'utilisation : le cas des modules
@@ -147,65 +206,6 @@ m�thodes de conversion disponibles sur votre plateforme, vous pouvez
tout de m�me leur associer un alias vers un code support� via la
directive <code class="directive">xml2EncAlias</code>.</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="xml2encalias" id="xml2encalias">Directive</a> <a name="xml2EncAlias" id="xml2EncAlias">xml2EncAlias</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit des alias pour les valeurs d'encodage</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>xml2EncAlias <var>jeu-de-caract�res alias [alias ...]</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</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_xml2enc</td></tr>
-</table>
- <p>Cette directive de niveau serveur permet de d�finir un ou
- plusieurs alias pour un encodage. Elle permet au support d'encodage de
- libxml2 de traiter en interne des encodages non reconnus par libxml2
- en utilisant la table de conversion pour un encodage reconnu. Elle
- permet d'atteindre deux objectifs : supporter des jeux (ou noms) de
- caract�res non reconnus par libxml2 ou iconv, et �viter une
- conversion pour un encodage lorsque cela n'est pas n�cessaire.</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="xml2encdefault" id="xml2encdefault">Directive</a> <a name="xml2EncDefault" id="xml2EncDefault">xml2EncDefault</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>D�finit un encodage par d�faut � utiliser lorsqu'aucune
-information ne peut �tre <a href="#sniffing">automatiquement d�tect�e</a></td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>xml2EncDefault <var>nom</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</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_xml2enc</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibilit�:</a></th><td>Disponible depuis la version 2.4.0 du serveur HTTP Apache
-; disponible depuis un module tiers dans les versions ant�rieures.</td></tr>
-</table>
- <p>Si vous traitez des donn�es dont l'encodage est connu, mais ne
- contenant aucune information � propos de ce dernier, vous pouvez
- d�finir une valeur par d�faut afin d'aider mod_xml2enc � traiter
- correctement les donn�es. Par exemple, pour d�finir la valeur par
- d�faut Latin1 (<var>iso-8859-1</var> specifi�e dans HTTP/1.0),
- utilisez :</p>
- <pre class="prettyprint lang-config">xml2EncDefault iso-8859-1</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="xml2startparse" id="xml2startparse">Directive</a> <a name="xml2StartParse" id="xml2StartParse">xml2StartParse</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Indique � l'interpr�teur � partir de quelle balise il doit
-commencer son traitement.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>xml2StartParse <var>�l�ment [�l�ment ...]</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel, r�pertoire, .htaccess</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_xml2enc</td></tr>
-</table>
- <p>Cette directive permet de sp�cifier � partir de quelle balise,
- parmi les �l�ments sp�cifi�s, l'interpr�teur de balise doit
- commencer son traitement. Ccei permet de contourner le probl�me des
- serveurs d'arri�re-plan qui ins�rent des �l�ments non conformes en
- d�but de donn�es, ce qui a pour effet de perturber l'interpr�teur (<a href="http://bahumbug.wordpress.com/2006/10/12/mod_proxy_html-revisited/">voir un exemple ici</a>).</p>
- <p>Elle ne doit �tre utilis�e ni pour les documents XML, ni pour les
- documents HTML correctement format�s.</p>
-
-</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_xml2enc.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mpm_common.html.de b/docs/manual/mod/mpm_common.html.de
index ebdf4a5aab..7cfcff9d77 100644
--- a/docs/manual/mod/mpm_common.html.de
+++ b/docs/manual/mod/mpm_common.html.de
@@ -61,7 +61,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#threadstacksize">ThreadStackSize</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Kommentare</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CoreDumpDirectory" id="CoreDumpDirectory">CoreDumpDirectory</a>-<a name="coredumpdirectory" id="coredumpdirectory">Direktive</a></h2>
<table class="directive">
@@ -723,6 +722,7 @@ verwendet wird, die Client-Verbindungen bearbeiten.</td></tr>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>Verf�gbare Sprachen: </span><a href="../de/mod/mpm_common.html" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 8b1c87d5e9..6052f3b204 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -58,7 +58,6 @@ more than one multi-processing module (MPM)</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#threadstacksize">ThreadStackSize</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CoreDumpDirectory" id="CoreDumpDirectory">CoreDumpDirectory</a> <a name="coredumpdirectory" id="coredumpdirectory">Directive</a></h2>
<table class="directive">
@@ -751,6 +750,7 @@ client connections</td></tr>
causes crashes with some common modules.</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/mpm_common.html.fr b/docs/manual/mod/mpm_common.html.fr
index a48c62f90d..e3bc56f29a 100644
--- a/docs/manual/mod/mpm_common.html.fr
+++ b/docs/manual/mod/mpm_common.html.fr
@@ -58,7 +58,6 @@ modules multi-processus (MPM)</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#threadstacksize">ThreadStackSize</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="coredumpdirectory" id="coredumpdirectory">Directive</a> <a name="CoreDumpDirectory" id="CoreDumpDirectory">CoreDumpDirectory</a></h2>
<table class="directive">
@@ -829,6 +828,7 @@ du serveur HTTP Apache</td></tr>
basse et provoque des crashes avec certains modules courants.</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/mpm_common.html.ja.utf8 b/docs/manual/mod/mpm_common.html.ja.utf8
index 741d6b6d44..4dc96d246f 100644
--- a/docs/manual/mod/mpm_common.html.ja.utf8
+++ b/docs/manual/mod/mpm_common.html.ja.utf8
@@ -62,7 +62,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#threadstacksize">ThreadStackSize</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CoreDumpDirectory" id="CoreDumpDirectory">CoreDumpDirectory</a> <a name="coredumpdirectory" id="coredumpdirectory">ディレクティブ</a></h2>
<table class="directive">
@@ -744,6 +743,7 @@ simultaneously</td></tr>
</ul>
</div>
+
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/mpm_common.html.tr.utf8 b/docs/manual/mod/mpm_common.html.tr.utf8
index 5712a0cd60..dd7a00f9de 100644
--- a/docs/manual/mod/mpm_common.html.tr.utf8
+++ b/docs/manual/mod/mpm_common.html.tr.utf8
@@ -58,7 +58,6 @@
<li><img alt="" src="../images/down.gif" /> <a href="#threadstacksize">ThreadStackSize</a></li>
</ul>
<ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CoreDumpDirectory" id="CoreDumpDirectory">CoreDumpDirectory</a> <a name="coredumpdirectory" id="coredumpdirectory">Yönergesi</a></h2>
<table class="directive">
@@ -772,6 +771,7 @@ açıklaması</a></li>
da azaltmak bazı modüllerle çökmeye sebep olur.</div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/mpm_netware.html.en b/docs/manual/mod/mpm_netware.html.en
index d40d0bf10c..da54416178 100644
--- a/docs/manual/mod/mpm_netware.html.en
+++ b/docs/manual/mod/mpm_netware.html.en
@@ -84,7 +84,6 @@
ports Apache httpd uses</a>
</li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="MaxThreads" id="MaxThreads">MaxThreads</a> <a name="maxthreads" id="maxthreads">Directive</a></h2>
<table class="directive">
@@ -105,6 +104,7 @@
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mpm_netware.html" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/mpm_netware.html.fr b/docs/manual/mod/mpm_netware.html.fr
index 0bf021b63d..bca8fd012c 100644
--- a/docs/manual/mod/mpm_netware.html.fr
+++ b/docs/manual/mod/mpm_netware.html.fr
@@ -85,7 +85,6 @@ NetWare</td></tr>
qu'utilise Apache httpd</a>
</li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
-
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="maxthreads" id="maxthreads">Directive</a> <a name="MaxThreads" id="MaxThreads">MaxThreads</a></h2>
<table class="directive">
@@ -107,6 +106,7 @@ qu'utilise Apache httpd</a>
</code></p></div>
</div>
+
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../en/mod/mpm_netware.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
diff --git a/docs/manual/mod/prefork.html.de b/docs/manual/mod/prefork.html.de
index a189f7cb17..e6d64b6981 100644
--- a/docs/manual/mod/prefork.html.de
+++ b/docs/manual/mod/prefork.html.de
@@ -85,48 +85,6 @@
und Ports</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Kommentare</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="how-it-works" id="how-it-works">Arbeitsweise</a></h2>
- <p>Ein einzelner Steuerprozess ist f�r den Start von
- Kindprozessen verantwortlich, die auf Verbindungen warten und diese
- bedienen, sobald sie eintreffen. Der Apache versucht immer, mehrere
- <dfn>freie</dfn> oder unbesch�ftigte Serverprozesse vorzuhalten,
- die zur Bedienung eingehender Anfragen bereit stehen. Auf diese Weise
- m�ssen Clients nicht darauf warten, dass neue Kindprozesse
- geforkt werden, bevor ihre Anfrage bearbeitet werden kann.</p>
-
- <p><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>,
- <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>,
- <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code> und
- <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> regulieren,
- wie der Elternprozess Kindprozesse zur Bedienung von Anfragen erstellt.
- Im Allgemeinen ist der Apache sehr selbstregulierend, so dass die meisten
- Angebote die Voreinstellung dieser Direktiven nicht ver�ndern
- m�ssen. Systeme, die mehr als 256 gleichzeitige Anfragen bedienen
- m�ssen, k�nnen <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> erh�hen, w�hrend
- Systeme mit begrenztem Arbeitsspeicher m�glicherweise
- <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> heruntersetzen
- m�ssen, um den Server vor Flatterverhalten (Arbeitsspeicherinhalte auf
- Platte auslagern - und zur�ck) zu sch�tzen. Weitere
- Informationen zur Feinabstimmung der Prozesserstellung sind in den
- <a href="../misc/perf-tuning.html">Performance-Hinweisen</a> zu
- finden.</p>
-
- <p>W�hren der Elternprozess unter Unix normalerweise als
- <code>root</code> gestartet wird, um sich an Port 80 binden zu k�nnen,
- werden die Kindprozesse unter einem weniger privilegierten Benutzer
- gestartet. Die Direktiven <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>
- und <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> werden dazu
- verwendet, die Privilegien der Apache-Kindprozesse festzulegen. Die
- Kindprozesse m�ssen in der Lage sein, alle Inhalte zu lesen, die
- sie ausliefern sollen, sollten dar�ber hinaus jedoch so wenig wie
- m�glich Rechte besitzen.</p>
-
- <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
- bestimmt, wie h�ufig der Server Prozesse erneuert, indem er alte
- beendet und neue startet.</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="MaxSpareServers" id="MaxSpareServers">MaxSpareServers</a>-<a name="maxspareservers" id="maxspareservers">Direktive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Beschreibung:</a></th><td>Maximale Anzahl der unbesch�ftigten Kindprozesse des
@@ -186,6 +144,48 @@
<li><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="how-it-works" id="how-it-works">Arbeitsweise</a></h2>
+ <p>Ein einzelner Steuerprozess ist f�r den Start von
+ Kindprozessen verantwortlich, die auf Verbindungen warten und diese
+ bedienen, sobald sie eintreffen. Der Apache versucht immer, mehrere
+ <dfn>freie</dfn> oder unbesch�ftigte Serverprozesse vorzuhalten,
+ die zur Bedienung eingehender Anfragen bereit stehen. Auf diese Weise
+ m�ssen Clients nicht darauf warten, dass neue Kindprozesse
+ geforkt werden, bevor ihre Anfrage bearbeitet werden kann.</p>
+
+ <p><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>,
+ <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>,
+ <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code> und
+ <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> regulieren,
+ wie der Elternprozess Kindprozesse zur Bedienung von Anfragen erstellt.
+ Im Allgemeinen ist der Apache sehr selbstregulierend, so dass die meisten
+ Angebote die Voreinstellung dieser Direktiven nicht ver�ndern
+ m�ssen. Systeme, die mehr als 256 gleichzeitige Anfragen bedienen
+ m�ssen, k�nnen <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> erh�hen, w�hrend
+ Systeme mit begrenztem Arbeitsspeicher m�glicherweise
+ <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> heruntersetzen
+ m�ssen, um den Server vor Flatterverhalten (Arbeitsspeicherinhalte auf
+ Platte auslagern - und zur�ck) zu sch�tzen. Weitere
+ Informationen zur Feinabstimmung der Prozesserstellung sind in den
+ <a href="../misc/perf-tuning.html">Performance-Hinweisen</a> zu
+ finden.</p>
+
+ <p>W�hren der Elternprozess unter Unix normalerweise als
+ <code>root</code> gestartet wird, um sich an Port 80 binden zu k�nnen,
+ werden die Kindprozesse unter einem weniger privilegierten Benutzer
+ gestartet. Die Direktiven <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>
+ und <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> werden dazu
+ verwendet, die Privilegien der Apache-Kindprozesse festzulegen. Die
+ Kindprozesse m�ssen in der Lage sein, alle Inhalte zu lesen, die
+ sie ausliefern sollen, sollten dar�ber hinaus jedoch so wenig wie
+ m�glich Rechte besitzen.</p>
+
+ <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
+ bestimmt, wie h�ufig der Server Prozesse erneuert, indem er alte
+ beendet und neue startet.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Verf�gbare Sprachen: </span><a href="../de/mod/prefork.html" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/prefork.html.en b/docs/manual/mod/prefork.html.en
index 54b7457616..61606ae3fc 100644
--- a/docs/manual/mod/prefork.html.en
+++ b/docs/manual/mod/prefork.html.en
@@ -80,49 +80,6 @@
uses</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="how-it-works" id="how-it-works">How it Works</a></h2>
- <p>A single control process is responsible for launching child
- processes which listen for connections and serve them when they
- arrive. Apache httpd always tries to maintain several <dfn>spare</dfn>
- or idle server processes, which stand ready to serve incoming
- requests. In this way, clients do not need to wait for a new
- child processes to be forked before their requests can be
- served.</p>
-
- <p>The <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>,
- <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>,
- <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code>, and
- <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> regulate how
- the parent process creates children to serve requests. In general,
- Apache httpd is very self-regulating, so most sites do not need to
- adjust these directives from their default values. Sites which
- need to serve more than 256 simultaneous requests may need to
- increase <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code>,
- while sites with limited memory may need to decrease <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> to keep the server from
- thrashing (swapping memory to disk and back). More information
- about tuning process creation is provided in the <a href="../misc/perf-tuning.html">performance hints</a>
- documentation.</p>
-
- <p>While the parent process is usually started as <code>root</code>
- under Unix in order to bind to port 80, the child processes are
- launched by Apache httpd as a less-privileged user. The <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code> and <code class="directive"><a href="../mod/mod_unixd.html#group">Group</a></code> directives are used to set
- the privileges of the Apache httpd child processes. The child processes
- must be able to read all the content that will be served, but
- should have as few privileges beyond that as possible.</p>
-
- <p><code class="directive"><a href="../mod/mpm_common.html#maxconnectionsperchild">MaxConnectionsPerChild</a></code>
- controls how frequently the server recycles processes by killing
- old ones and launching new ones.</p>
-
- <p>This MPM uses the <code>mpm-accept</code> mutex to serialize
- access to incoming connections when subject to the thundering herd
- problem (generally, when there are multiple listening sockets).
- The implementation aspects of this mutex can be configured with the
- <code class="directive"><a href="../mod/core.html#mutex">Mutex</a></code> directive. The <a href="../misc/perf-tuning.html">performance hints</a>
- documentation has additional information about this mutex.</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="MaxSpareServers" id="MaxSpareServers">MaxSpareServers</a> <a name="maxspareservers" id="maxspareservers">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum number of idle child server processes</td></tr>
@@ -182,6 +139,49 @@ uses</a></li>
<li><code class="directive"><a href="../mod/mpm_common.html#minsparethreads">MinSpareThreads</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="how-it-works" id="how-it-works">How it Works</a></h2>
+ <p>A single control process is responsible for launching child
+ processes which listen for connections and serve them when they
+ arrive. Apache httpd always tries to maintain several <dfn>spare</dfn>
+ or idle server processes, which stand ready to serve incoming
+ requests. In this way, clients do not need to wait for a new
+ child processes to be forked before their requests can be
+ served.</p>
+
+ <p>The <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>,
+ <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>,
+ <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code>, and
+ <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> regulate how
+ the parent process creates children to serve requests. In general,
+ Apache httpd is very self-regulating, so most sites do not need to
+ adjust these directives from their default values. Sites which
+ need to serve more than 256 simultaneous requests may need to
+ increase <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code>,
+ while sites with limited memory may need to decrease <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> to keep the server from
+ thrashing (swapping memory to disk and back). More information
+ about tuning process creation is provided in the <a href="../misc/perf-tuning.html">performance hints</a>
+ documentation.</p>
+
+ <p>While the parent process is usually started as <code>root</code>
+ under Unix in order to bind to port 80, the child processes are
+ launched by Apache httpd as a less-privileged user. The <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code> and <code class="directive"><a href="../mod/mod_unixd.html#group">Group</a></code> directives are used to set
+ the privileges of the Apache httpd child processes. The child processes
+ must be able to read all the content that will be served, but
+ should have as few privileges beyond that as possible.</p>
+
+ <p><code class="directive"><a href="../mod/mpm_common.html#maxconnectionsperchild">MaxConnectionsPerChild</a></code>
+ controls how frequently the server recycles processes by killing
+ old ones and launching new ones.</p>
+
+ <p>This MPM uses the <code>mpm-accept</code> mutex to serialize
+ access to incoming connections when subject to the thundering herd
+ problem (generally, when there are multiple listening sockets).
+ The implementation aspects of this mutex can be configured with the
+ <code class="directive"><a href="../mod/core.html#mutex">Mutex</a></code> directive. The <a href="../misc/perf-tuning.html">performance hints</a>
+ documentation has additional information about this mutex.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../de/mod/prefork.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/prefork.html.fr b/docs/manual/mod/prefork.html.fr
index 7eb89f0298..39f79ead12 100644
--- a/docs/manual/mod/prefork.html.fr
+++ b/docs/manual/mod/prefork.html.fr
@@ -83,52 +83,6 @@ processus, sans thread</td></tr>
qu'utilise le serveur HTTP Apache</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Commentaires</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="how-it-works" id="how-it-works">Comment �a marche</a></h2>
- <p>Un processus de contr�le unique a pour t�che de lancer les
- processus enfants qui attendent les connexions et les traitent au
- fur et � mesure qu'elles arrivent. Apache httpd essaie toujours de
- maintenir plusieurs processus serveurs inactifs ou <dfn>en
- r�serve</dfn>, afin de pouvoir traiter les requ�tes entrantes. De
- cette fa�on, les clients n'ont pas besoin d'attendre le d�marrage
- d'un nouveau processus enfant pour que leurs requ�tes puissent �tre
- trait�es.</p>
-
- <p>Les directives <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>, <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>, <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code> et <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> permettent de contr�ler
- la mani�re dont le processus parent cr�e les processus enfants pour
- traiter les requ�tes. En g�n�ral, Apache httpd s'auto-contr�le de mani�re
- efficace, de sorte que la plupart des sites peuvent conserver les
- valeurs par d�faut des directives. Les sites qui doivent traiter
- plus de 256 requ�tes simultan�es doivent augmenter la valeur de
- <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code>, alors que les
- sites dont la ressource m�moire est limit�e doivent la diminuer afin
- d'�viter une hyperactivit� du serveur (utilisation excessive de la
- m�moire virtuelle sur disque). Vous trouverez plus d'informations �
- propos du contr�le de la cr�ation de processus dans le document <a href="../misc/perf-tuning.html">conseils en mati�re de
- performances</a></p>
-
- <p>Alors que le processus parent est en g�n�ral d�marr� en tant que
- <code>root</code> sous Unix afin de pouvoir se mettre � l'�coute sur le port 80, les
- processus enfants sont lanc�s par Apache httpd sous un utilisateur avec
- privil�ges restreints. On peut contr�ler les privil�ges accord�s aux
- processus enfants d'Apache httpd � l'aide des directives <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code> et <code class="directive"><a href="../mod/mod_unixd.html#group">Group</a></code>. Les processus enfants doivent
- �tre en mesure de lire tous les contenus destin�s � �tre servis,
- mais leurs privil�ges doivent �tre aussi bas que possible.</p>
-
- <p>La directive <code class="directive"><a href="../mod/mpm_common.html#maxconnectionsperchild">MaxConnectionsPerChild</a></code> permet de
- contr�ler la fr�quence � laquelle le serveur recycle ses processus
- en arr�tant les plus anciens et en en lan�ant de nouveaux.</p>
-
- <p>Ce module MPM utilise le mutex <code>mpm-accept</code> pour
- s�rialiser l'acc�s aux connexions entrantes lorsque peut se
- pr�senter un probl�me d'afflux de requ�tes (en g�n�ral quand il y a
- plusieurs sockets en �coute). Les aspects de l'impl�mentation de ce
- mutex peuvent �tre configur�s via la directive <code class="directive"><a href="../mod/core.html#mutex">Mutex</a></code>. Vous trouverez des informations
- suppl�mentaires � propos de ce mutex dans la documentation � propos
- des <a href="../misc/perf-tuning.html">conseils en mati�re de
- performances</a></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="maxspareservers" id="maxspareservers">Directive</a> <a name="MaxSpareServers" id="MaxSpareServers">MaxSpareServers</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Nombre maximum de processus serveurs enfants
@@ -197,6 +151,52 @@ inactifs</td></tr>
<li><code class="directive"><a href="../mod/mpm_common.html#minsparethreads">MinSpareThreads</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="how-it-works" id="how-it-works">Comment �a marche</a></h2>
+ <p>Un processus de contr�le unique a pour t�che de lancer les
+ processus enfants qui attendent les connexions et les traitent au
+ fur et � mesure qu'elles arrivent. Apache httpd essaie toujours de
+ maintenir plusieurs processus serveurs inactifs ou <dfn>en
+ r�serve</dfn>, afin de pouvoir traiter les requ�tes entrantes. De
+ cette fa�on, les clients n'ont pas besoin d'attendre le d�marrage
+ d'un nouveau processus enfant pour que leurs requ�tes puissent �tre
+ trait�es.</p>
+
+ <p>Les directives <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>, <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>, <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code> et <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> permettent de contr�ler
+ la mani�re dont le processus parent cr�e les processus enfants pour
+ traiter les requ�tes. En g�n�ral, Apache httpd s'auto-contr�le de mani�re
+ efficace, de sorte que la plupart des sites peuvent conserver les
+ valeurs par d�faut des directives. Les sites qui doivent traiter
+ plus de 256 requ�tes simultan�es doivent augmenter la valeur de
+ <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code>, alors que les
+ sites dont la ressource m�moire est limit�e doivent la diminuer afin
+ d'�viter une hyperactivit� du serveur (utilisation excessive de la
+ m�moire virtuelle sur disque). Vous trouverez plus d'informations �
+ propos du contr�le de la cr�ation de processus dans le document <a href="../misc/perf-tuning.html">conseils en mati�re de
+ performances</a></p>
+
+ <p>Alors que le processus parent est en g�n�ral d�marr� en tant que
+ <code>root</code> sous Unix afin de pouvoir se mettre � l'�coute sur le port 80, les
+ processus enfants sont lanc�s par Apache httpd sous un utilisateur avec
+ privil�ges restreints. On peut contr�ler les privil�ges accord�s aux
+ processus enfants d'Apache httpd � l'aide des directives <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code> et <code class="directive"><a href="../mod/mod_unixd.html#group">Group</a></code>. Les processus enfants doivent
+ �tre en mesure de lire tous les contenus destin�s � �tre servis,
+ mais leurs privil�ges doivent �tre aussi bas que possible.</p>
+
+ <p>La directive <code class="directive"><a href="../mod/mpm_common.html#maxconnectionsperchild">MaxConnectionsPerChild</a></code> permet de
+ contr�ler la fr�quence � laquelle le serveur recycle ses processus
+ en arr�tant les plus anciens et en en lan�ant de nouveaux.</p>
+
+ <p>Ce module MPM utilise le mutex <code>mpm-accept</code> pour
+ s�rialiser l'acc�s aux connexions entrantes lorsque peut se
+ pr�senter un probl�me d'afflux de requ�tes (en g�n�ral quand il y a
+ plusieurs sockets en �coute). Les aspects de l'impl�mentation de ce
+ mutex peuvent �tre configur�s via la directive <code class="directive"><a href="../mod/core.html#mutex">Mutex</a></code>. Vous trouverez des informations
+ suppl�mentaires � propos de ce mutex dans la documentation � propos
+ des <a href="../misc/perf-tuning.html">conseils en mati�re de
+ performances</a></p>
+</div>
</div>
<div class="bottomlang">
<p><span>Langues Disponibles: </span><a href="../de/mod/prefork.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/prefork.html.ja.utf8 b/docs/manual/mod/prefork.html.ja.utf8
index f3a750ef37..867ef5c05d 100644
--- a/docs/manual/mod/prefork.html.ja.utf8
+++ b/docs/manual/mod/prefork.html.ja.utf8
@@ -87,51 +87,6 @@
が使用するアドレスとポートの設定</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">コメント</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="how-it-works" id="how-it-works">動作方法</a></h2>
- <p>一つのコントロールプロセスが、
- コネクションに対して listen して、しかるべき時に応答する
- 子プロセスを起動します。Apache は常に幾つかの<dfn>スペア</dfn>
- かアイドルなサーバプロセスを維持していて、それらは入ってきた
- リクエストに応答できるように待機しています。
- このようにしてクライアントは、リクエストが応答される前に、
- 新しい子プロセスが fork されるのを待たなくてもよいように
- なっています。</p>
-
- <p>親プロセスがリクエストに応答するの子プロセスを
- どのように生成するかは、
- <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>,
- <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>,
- <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code>,
- <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
- で調整します。一般的に、Apache は非常に自律的なので、
- 大抵のサイトではこれらのディレクティブをデフォルト値から調整する
- 必要はないでしょう。
- 同時に 256 を超えるリクエストに応答しないといけないサイトでは、
- <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
- を増やす必要があるでしょう。
- 一方、メモリの限られているサイトでは、スラッシング
- (メモリとディスク間で何度もスワップ) が起こるのを防ぐために
- <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
- を減らす必要があるでしょう。プロセス生成のチューニングに関する
- 詳しい情報は、<a href="../misc/perf-tuning.html">性能に関するヒント</a>
- にあります。</p>
-
- <p>通常 Unix では親プロセスは 80 番ポートにバインドするために
- <code>root</code> で起動されますが、子プロセスやスレッドは
- もっと低い権限のユーザで Apache によって起動されます。
- <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> と
- <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code>
- ディレクティブは
- Apache の子プロセスの権限を設定するのに用いられます。
- 子プロセスはクライアントに送るコンテンツ全てを読めないといけませんが、
- 可能な限り必要最小限の権限のみを持っているようにするべきです。</p>
-
- <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
- は、古いプロセスを停止して新しいプロセスを起動することによって、
- どの程度の頻度でサーバがプロセスをリサイクルするかを制御します。</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="MaxSpareServers" id="MaxSpareServers">MaxSpareServers</a> <a name="maxspareservers" id="maxspareservers">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>アイドルな子サーバプロセスの最大個数</td></tr>
@@ -184,6 +139,51 @@
<li><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="how-it-works" id="how-it-works">動作方法</a></h2>
+ <p>一つのコントロールプロセスが、
+ コネクションに対して listen して、しかるべき時に応答する
+ 子プロセスを起動します。Apache は常に幾つかの<dfn>スペア</dfn>
+ かアイドルなサーバプロセスを維持していて、それらは入ってきた
+ リクエストに応答できるように待機しています。
+ このようにしてクライアントは、リクエストが応答される前に、
+ 新しい子プロセスが fork されるのを待たなくてもよいように
+ なっています。</p>
+
+ <p>親プロセスがリクエストに応答するの子プロセスを
+ どのように生成するかは、
+ <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>,
+ <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>,
+ <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code>,
+ <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
+ で調整します。一般的に、Apache は非常に自律的なので、
+ 大抵のサイトではこれらのディレクティブをデフォルト値から調整する
+ 必要はないでしょう。
+ 同時に 256 を超えるリクエストに応答しないといけないサイトでは、
+ <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
+ を増やす必要があるでしょう。
+ 一方、メモリの限られているサイトでは、スラッシング
+ (メモリとディスク間で何度もスワップ) が起こるのを防ぐために
+ <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
+ を減らす必要があるでしょう。プロセス生成のチューニングに関する
+ 詳しい情報は、<a href="../misc/perf-tuning.html">性能に関するヒント</a>
+ にあります。</p>
+
+ <p>通常 Unix では親プロセスは 80 番ポートにバインドするために
+ <code>root</code> で起動されますが、子プロセスやスレッドは
+ もっと低い権限のユーザで Apache によって起動されます。
+ <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> と
+ <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code>
+ ディレクティブは
+ Apache の子プロセスの権限を設定するのに用いられます。
+ 子プロセスはクライアントに送るコンテンツ全てを読めないといけませんが、
+ 可能な限り必要最小限の権限のみを持っているようにするべきです。</p>
+
+ <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
+ は、古いプロセスを停止して新しいプロセスを起動することによって、
+ どの程度の頻度でサーバがプロセスをリサイクルするかを制御します。</p>
+</div>
</div>
<div class="bottomlang">
<p><span>翻訳済み言語: </span><a href="../de/mod/prefork.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
diff --git a/docs/manual/mod/prefork.html.tr.utf8 b/docs/manual/mod/prefork.html.tr.utf8
index 1b8d6af1c9..8459c1f417 100644
--- a/docs/manual/mod/prefork.html.tr.utf8
+++ b/docs/manual/mod/prefork.html.tr.utf8
@@ -80,47 +80,6 @@
portların ayarlanması</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Yorum</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="how-it-works" id="how-it-works">Nasıl çalışır?</a></h2>
- <p>Bağlantıları dinleyip gerektiğinde onlara hizmet sunan çocuk süreçleri
- devreye almak tek bir denetim sürecinin sorumluluğundadır. Apache httpd
- daima, gelen isteklere hizmet vermeye hazır bekleyen en fazla sayıda
- sunucu sürecini <dfn>yedekte tutmaya</dfn> veya boşta bekletmeye
- çalışır. Bu suretle, istemcilere isteklerinin sunulması için yeni çocuk
- süreçlerin çatallanmasını beklemek gerekmez.</p>
-
- <p>Ana sürecin istekleri sunacak çocuk süreçleri oluşturma işlemini nasıl
- gerçekleştireceği <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>, <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>, <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code> ve <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> yönergeleri ile düzenlenir. Apache httpd
- kendiliğinden her duruma çok iyi uyum sağladığından, genelde, çoğu
- sitenin bu yönergelerin öntanımlı değerlerini değiştirmesi gerekmez.
- Aynı anda 256’dan fazla isteğe hizmet sunacak sitelerin <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> değerini arttırmaları
- gerekebilir. Ancak, fiziksel belleği yeterli olmayan sitelerin de
- sunucunun belleği diske takaslamasını önlemek için bu değeri
- azaltmaları gerekebilir. Süreç oluşturmanın ayarlanması ile ilgili daha
- fazla bilgi edinmek için <a href="../misc/perf-tuning.html">başarım
- arttırma ipuçları</a> belgesine bakınız.</p>
-
- <p>Unix altında 80. portu dinleyebilmek için ana sürecin
- <code>root</code> tarafından çalıştırılmış olması gerekirse de çocuk
- süreçler Apache httpd tarafından daha az yetkili bir kullanıcının
- aidiyetinde çalıştırılırlar. Apache httpd’nin çocuk süreçlerinin
- kullanıcı ve gruplarını ayarlamak için <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code> ve <code class="directive"><a href="../mod/mod_unixd.html#group">Group</a></code>
- yönergeleri kullanılır. Çocuk süreçlerin sunacakları içeriği okumaya
- yetkili olmaları gerekir, fakat bu yetkinin mümkün olduğunca kısıtlı
- tutulmasına çalışılmalıdır.</p>
-
- <p><code class="directive"><a href="../mod/mpm_common.html#maxconnectionsperchild">MaxConnectionsPerChild</a></code>
- yönergesi ana sunucunun eski süreçleri öldürüp yenilerini oluşturmayı
- ne kadar sıklıkla yapacağını denetler.</p>
-
- <p>Bu MPM, gürleyen sürü sorunu ortaya çıktığında (genelde çok sayıda
- dinlenen soket varlığında) gelen bağlantılara erişimi dizgileştirmek için
- <code>mpm-accept</code> muteksini kullanır. Bu muteksin gerçeklenimle
- ilgili hususları <code class="directive"><a href="../mod/core.html#mutex">Mutex</a></code> yönergesi ile
- yapılandırılabilir. Bu muteks hakkında ek bilgi için <a href="../misc/perf-tuning.html">başarımın arttırılması</a>
- belgesine bakınız.</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="MaxSpareServers" id="MaxSpareServers">MaxSpareServers</a> <a name="maxspareservers" id="maxspareservers">Yönergesi</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Boştaki çocuk süreçlerin azami sayısı</td></tr>
@@ -181,6 +140,47 @@
<li><code class="directive"><a href="../mod/mpm_common.html#minsparethreads">MinSpareThreads</a></code></li>
</ul>
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="how-it-works" id="how-it-works">Nasıl çalışır?</a></h2>
+ <p>Bağlantıları dinleyip gerektiğinde onlara hizmet sunan çocuk süreçleri
+ devreye almak tek bir denetim sürecinin sorumluluğundadır. Apache httpd
+ daima, gelen isteklere hizmet vermeye hazır bekleyen en fazla sayıda
+ sunucu sürecini <dfn>yedekte tutmaya</dfn> veya boşta bekletmeye
+ çalışır. Bu suretle, istemcilere isteklerinin sunulması için yeni çocuk
+ süreçlerin çatallanmasını beklemek gerekmez.</p>
+
+ <p>Ana sürecin istekleri sunacak çocuk süreçleri oluşturma işlemini nasıl
+ gerçekleştireceği <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>, <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>, <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code> ve <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> yönergeleri ile düzenlenir. Apache httpd
+ kendiliğinden her duruma çok iyi uyum sağladığından, genelde, çoğu
+ sitenin bu yönergelerin öntanımlı değerlerini değiştirmesi gerekmez.
+ Aynı anda 256’dan fazla isteğe hizmet sunacak sitelerin <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> değerini arttırmaları
+ gerekebilir. Ancak, fiziksel belleği yeterli olmayan sitelerin de
+ sunucunun belleği diske takaslamasını önlemek için bu değeri
+ azaltmaları gerekebilir. Süreç oluşturmanın ayarlanması ile ilgili daha
+ fazla bilgi edinmek için <a href="../misc/perf-tuning.html">başarım
+ arttırma ipuçları</a> belgesine bakınız.</p>
+
+ <p>Unix altında 80. portu dinleyebilmek için ana sürecin
+ <code>root</code> tarafından çalıştırılmış olması gerekirse de çocuk
+ süreçler Apache httpd tarafından daha az yetkili bir kullanıcının
+ aidiyetinde çalıştırılırlar. Apache httpd’nin çocuk süreçlerinin
+ kullanıcı ve gruplarını ayarlamak için <code class="directive"><a href="../mod/mod_unixd.html#user">User</a></code> ve <code class="directive"><a href="../mod/mod_unixd.html#group">Group</a></code>
+ yönergeleri kullanılır. Çocuk süreçlerin sunacakları içeriği okumaya
+ yetkili olmaları gerekir, fakat bu yetkinin mümkün olduğunca kısıtlı
+ tutulmasına çalışılmalıdır.</p>
+
+ <p><code class="directive"><a href="../mod/mpm_common.html#maxconnectionsperchild">MaxConnectionsPerChild</a></code>
+ yönergesi ana sunucunun eski süreçleri öldürüp yenilerini oluşturmayı
+ ne kadar sıklıkla yapacağını denetler.</p>
+
+ <p>Bu MPM, gürleyen sürü sorunu ortaya çıktığında (genelde çok sayıda
+ dinlenen soket varlığında) gelen bağlantılara erişimi dizgileştirmek için
+ <code>mpm-accept</code> muteksini kullanır. Bu muteksin gerçeklenimle
+ ilgili hususları <code class="directive"><a href="../mod/core.html#mutex">Mutex</a></code> yönergesi ile
+ yapılandırılabilir. Bu muteks hakkında ek bilgi için <a href="../misc/perf-tuning.html">başarımın arttırılması</a>
+ belgesine bakınız.</p>
+</div>
</div>
<div class="bottomlang">
<p><span>Mevcut Diller: </span><a href="../de/mod/prefork.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |