diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map
index 4fe3c88e72..1e03a55564 100644
--- a/docs/manual/convenience.map
+++ b/docs/manual/convenience.map
@@ -32,6 +32,7 @@ aliasmatch mod/mod_alias.html#aliasmatch
allow mod/mod_access_compat.html#allow
allowconnect mod/mod_proxy_connect.html#allowconnect
allowencodedslashes mod/core.html#allowencodedslashes
+allowmethods mod/mod_allowmethods.html#allowmethods
allowoverride mod/core.html#allowoverride
anonymous mod/mod_authn_anon.html#anonymous
anonymous_logemail mod/mod_authn_anon.html#anonymous_logemail
@@ -109,16 +110,19 @@ browsermatchnocase mod/mod_setenvif.html#browsermatchnocase
bufferedlogs mod/mod_log_config.html#bufferedlogs
buffersize mod/mod_buffer.html#buffersize
cachedefaultexpire mod/mod_cache.html#cachedefaultexpire
+cachedetailheader mod/mod_cache.html#cachedetailheader
cachedirlength mod/mod_disk_cache.html#cachedirlength
cachedirlevels mod/mod_disk_cache.html#cachedirlevels
cachedisable mod/mod_cache.html#cachedisable
cacheenable mod/mod_cache.html#cacheenable
cachefile mod/mod_file_cache.html#cachefile
+cacheheader mod/mod_cache.html#cacheheader
cacheignorecachecontrol mod/mod_cache.html#cacheignorecachecontrol
cacheignoreheaders mod/mod_cache.html#cacheignoreheaders
cacheignorenolastmod mod/mod_cache.html#cacheignorenolastmod
cacheignorequerystring mod/mod_cache.html#cacheignorequerystring
cacheignoreurlsessionidentifiers mod/mod_cache.html#cacheignoreurlsessionidentifiers
+cachekeybaseurl mod/mod_cache.html#cachekeybaseurl
cachelastmodifiedfactor mod/mod_cache.html#cachelastmodifiedfactor
cachelock mod/mod_cache.html#cachelock
cachelockmaxage mod/mod_cache.html#cachelockmaxage
@@ -129,7 +133,11 @@ cacheminexpire mod/mod_cache.html#cacheminexpire
cacheminfilesize mod/mod_disk_cache.html#cacheminfilesize
cachenegotiateddocs mod/mod_negotiation.html#cachenegotiateddocs
cachequickhandler mod/mod_cache.html#cachequickhandler
+cachereadsize mod/mod_disk_cache.html#cachereadsize
+cachereadtime mod/mod_disk_cache.html#cachereadtime
cacheroot mod/mod_disk_cache.html#cacheroot
+cachestaleonerror mod/mod_cache.html#cachestaleonerror
+cachestoreexpired mod/mod_cache.html#cachestoreexpired
cachestorenostore mod/mod_cache.html#cachestorenostore
cachestoreprivate mod/mod_cache.html#cachestoreprivate
cgimapextension mod/core.html#cgimapextension
@@ -184,6 +192,7 @@ enablemmap mod/core.html#enablemmap
enablesendfile mod/core.html#enablesendfile
errordocument mod/core.html#errordocument
errorlog mod/core.html#errorlog
+errorlogformat mod/core.html#errorlogformat
example mod/mod_example.html#example
expiresactive mod/mod_expires.html#expiresactive
expiresbytype mod/mod_expires.html#expiresbytype
@@ -285,9 +294,9 @@ luaquickhandler mod/mod_lua.html#luaquickhandler
luaroot mod/mod_lua.html#luaroot
luascope mod/mod_lua.html#luascope
maxclients mod/mpm_common.html#maxclients
+maxconnectionsperchild mod/mpm_common.html#maxconnectionsperchild
maxkeepaliverequests mod/core.html#maxkeepaliverequests
maxmemfree mod/mpm_common.html#maxmemfree
-maxrequestsperchild mod/mpm_common.html#maxrequestsperchild
maxspareservers mod/prefork.html#maxspareservers
maxsparethreads mod/mpm_common.html#maxsparethreads
maxthreads mod/mpm_netware.html#maxthreads
diff --git a/docs/manual/developer/new_api_2_4.html.en b/docs/manual/developer/new_api_2_4.html.en
index b164512488..b755ba6cfa 100644
--- a/docs/manual/developer/new_api_2_4.html.en
+++ b/docs/manual/developer/new_api_2_4.html.en
@@ -262,7 +262,7 @@
#include <http_log.h>
#ifdef APLOG_USE_MODULE
- APLOG_USE_MODULE(foo)
+ APLOG_USE_MODULE(foo);
#endif
The number of parameters of the ap_log_* functions and the
diff --git a/docs/manual/logs.html.fr b/docs/manual/logs.html.fr
index b22e1c7398..0a46b91be0 100644
--- a/docs/manual/logs.html.fr
+++ b/docs/manual/logs.html.fr
@@ -220,7 +220,7 @@
prcder d'un anti-slash (\) afin qu'elles ne soient pas
interprtes comme la fin de la chane de format. La chane de format
peut aussi contenir les caractres de contrle spciaux
- logs "\n" et "\t" pour insrer respectivement
+ "\n" et "\t" pour insrer respectivement
un passage la ligne et une tabulation.
La directive CustomLog
@@ -235,7 +235,7 @@
Common Log Format (CLF) pour "Format de journalisation standard".
Ce format standard peut tre produit par de nombreux serveurs web
diffrents et lu par de nombreux programmes d'analyse de journaux.
- Lelogss entres de fichier journal gnres selon le format CLF
+ Les entres de fichier journal gnres selon le format CLF
ressemblent ceci :
@@ -265,7 +265,7 @@
celle de la machine l'origine de la requte.
- (%l)REMOTE_USER. Si le statut de la requte (voir plus loin)
est 401, cette identifiant n'est pas fiable car l'utilisateur n'est
@@ -298,7 +298,7 @@ logs Ce m
[jour/mois/anne:heure:minutes:secondes zone]
jour = 2*chiffre
- logs mois = 3*lettre
+ mois = 3*lettre
anne = 4*chiffre
heure = 2*chiffre
minutes = 2*chiffre
@@ -312,7 +312,7 @@ logs Ce m
formats spciaux supports. Pour plus de dtails,
reportez-vous aux. chanes de format
de mod_log_config.
- logs"GET /apache_pb.gif HTTP/1.0"
(\"%r\")%r".
-logs
+
200 (%>s)2326 (%b)-". Pour indiquer l'absence de contenu
par "0", utilisez %B au lieu de
%b.
- logs LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\"
+ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\"
\"%{User-agent}i\"" combined
CustomLog log/access_log combined
Les champs supplmentaires sont :
@@ -401,7 +401,7 @@ logs en-t simplement plusieurs directivesCustomLog dans le
fichier de configuration. Par exemple, les directives suivantes vont
- crlogser trois journaux d'accs. Le premier contiendra les informations
+ crer trois journaux d'accs. Le premier contiendra les informations
de base CLF, le second les informations du Referer, et le troisime
les informations sur le navigateur. Les deux dernires directives
CustomLog montrent
@@ -416,7 +416,7 @@ logs en-t
Cet exemple montre aussi qu'il n'est pas obligatoire d'associer
- une chalogsne de format un alias au moyen de la directive
+ une chane de format un alias au moyen de la directive
LogFormat. Elle peut
tre dfinie directement dans la ligne de la directive
CustomLog.
SetEnv CACHE_MISS 1
LogFormat "%h %l %u %t "%r " %>s %b %{CACHE_MISS}e" common-cache
- CustomLog logs/alogsccess_log common-cache
+ CustomLog logs/access_log common-cache
mod_cache va s'excuter avant
@@ -494,7 +494,7 @@ logs en-t
les 10000 requtes. Il est par consquent ncessaire d'effectuer
priodiquement la rotation des journaux en dplaant ou supprimant les
fichiers correspondants. On ne peut pas le faire pendant que le serveur
- est en cours d'excution, car Apache httpd va continuer crire dans l'ancien
+ est en cours d'excution, car Apache httpd va continuer crire dans l'ancien
fichier journal aussi longtemps qu'il le maintiendra ouvert.
C'est pourquoi le serveur doit tre
redmarr aprs le dplacement ou la
@@ -575,6 +575,25 @@ logs en-t
Comme la journalisation conditionnelle, la journalisation redirige est un outil trs puissant, mais si elle existe, il est prfrable d'utiliser une solution plus simple comme le traitement posteriori hors ligne.
+ +Par dfaut, le processus de redirection du journal est lanc sans
+ invoquer un shell. Pour invoquer un shell, utilisez "|$"
+ au lieu de "|" (en gnral avec /bin/sh -c)
+ :
+ # Invocation de "rotatelogs" en utilisant un shell
+ CustomLog "|$/usr/local/apache/bin/rotatelogs
+ /var/log/access_log 86400" common
+
Il s'agissait du comportement par dfaut sous Apache 2.2. Selon
+ les spcificits du shell, ceci peut gnrer un processus shell
+ supplmentaire pour toute la dure du programme de redirection du
+ journal, et induire des problmes de gestion de signaux au cours du
+ redmarrage. La notation "||" est aussi supporte pour
+ des raisons de compatibilit avec Apache 2.2 et est quivalente
+ "|".
Apache HTTP Server Version 2.3
+
Available Languages: en
+| Description: | Easily restrict what HTTP methods can be used on the server |
|---|---|
| Status: | Experimental |
| ModuleIdentifier: | allowmethods_module |
| SourceFile: | mod_allowmethods.c |
This modules makes it easy to restrict what HTTP methods can +used on an server. The most common configuration would be:
+ +
+<Directory />
+
+ AllowMethods GET HEAD OPTIONS
+
+</Directory>
+
AllowMethods| Description: | Changes absolutely nothing |
|---|---|
| Syntax: | AllowMethods reset|HTTP-method
+[HTTP-method]... |
| Default: | AllowMethods reset |
| Context: | directory |
| Status: | Experimental |
| Module: | mod_allowmethods |
The HTTP-methods are case sensitive, and are generally as per
+RFC given in upper case. The reset keyword can be used
+turn off mod_allowmethods in a deeper nested context:
+<Location /svn>
+
+ AllowMethods reset
+
+</Location>
+
mod_allowmethods was written to replace the rather
+kludgy implementation of Limit and
+LimitExcept.
Available Languages: en
+.htaccess-Dateien
+.htaccess-Dateien
erlaubt sind.Referer request
header is presentContent-MD5
+Content-MD5
HTTP-Response-HeadernExpires
+Expires
headersExpires header configured
+Expires header configured
by MIME typemod_ext_filter optionsmod_ext_filter optionsmod_filterbase for imagemap filesbase for imagemap filesPOST data)HSE_APPEND_LOG_PARAMETER requests from
+POST data)HSE_APPEND_LOG_PARAMETER requests from
ISAPI extensions to the error logHSE_APPEND_LOG_PARAMETER requests from
+HSE_APPEND_LOG_PARAMETER requests from
ISAPI extensions to the query fieldfree()
aufzurufenmod_mime to treat path_info
+mod_mime to treat path_info
components as part of the filenameAllow and Deny are
evaluated.Via HTTP response
+Via HTTP response
header for proxied requestsServerLast-Modified headers are generated by the
+Last-Modified headers are generated by the
server.mime.types filemime.types file.htaccess filesReferer request
header is presentContent-MD5 HTTP Response
+Content-MD5 HTTP Response
headersnone. In prior versions, DefaultType
would specify a default media type to assign to response content for
which no other media type configuration could be found.
Expires
+Expires
headersExpires header configured
+Expires header configured
by MIME typemod_ext_filter optionsmod_ext_filter optionsmod_filterbase for imagemap filesbase for imagemap filesPOST data)HSE_APPEND_LOG_PARAMETER requests from
+POST data)HSE_APPEND_LOG_PARAMETER requests from
ISAPI extensions to the error logHSE_APPEND_LOG_PARAMETER requests from
+HSE_APPEND_LOG_PARAMETER requests from
ISAPI extensions to the query fieldfree()mod_mime to treat path_info
+mod_mime to treat path_info
components as part of the filenameAllow and Deny are
evaluated.Via HTTP response
+Via HTTP response
header for proxied requestsServer HTTP response
+Server HTTP response
headerLast-Modified headers are generated by the
+Last-Modified headers are generated by the
server.TRACE
+TRACE
requestsmime.types filemime.types file.htaccess filesReferer request
header is presentContent-MD5 HTTP Response
+Content-MD5 HTTP Response
headersnone. In prior versions, DefaultType
would specify a default media type to assign to response content for
which no other media type configuration could be found.
Expires
+Expires
headersExpires header configured
+Expires header configured
by MIME typemod_ext_filter optionsmod_ext_filter optionsmod_filterbase for imagemap filesbase for imagemap filesPOST data)HSE_APPEND_LOG_PARAMETER requests from
+POST data)HSE_APPEND_LOG_PARAMETER requests from
ISAPI extensions to the error logHSE_APPEND_LOG_PARAMETER requests from
+HSE_APPEND_LOG_PARAMETER requests from
ISAPI extensions to the query fieldfree()mod_mime to treat path_info
+mod_mime to treat path_info
components as part of the filenameAllow and Deny are
evaluated.Via HTTP response
+Via HTTP response
header for proxied requestsServer HTTP response
+Server HTTP response
headerLast-Modified headers are generated by the
+Last-Modified headers are generated by the
server.TRACE
+TRACE
requestsmime.types filemime.types file.htaccess で許可されるディレクティブの種類.htaccess で許可されるディレクティブの種類Referer request
header is presentContent-MD5 HTTP 応答ヘッダの生成を有効にするContent-MD5 HTTP 応答ヘッダの生成を有効にするExpires ヘッダの生成を有効にするExpires ヘッダの値mod_ext_filter のオプションを設定Expires ヘッダの生成を有効にするExpires ヘッダの値mod_ext_filter のオプションを設定mod_filterbase for imagemap filesbase for imagemap filesPOST data)HSE_APPEND_LOG_PARAMETER requests from
+POST data)HSE_APPEND_LOG_PARAMETER requests from
ISAPI extensions to the error logHSE_APPEND_LOG_PARAMETER requests from
+HSE_APPEND_LOG_PARAMETER requests from
ISAPI extensions to the query fieldfree() が呼ばれない限り、
+free() が呼ばれない限り、
主メモリアロケータが保持し続けられるメモリの最大量path_info コンポーネントをファイル名の一部として扱うように
+path_info コンポーネントをファイル名の一部として扱うように
mod_mime に通知するAllow と
+Allow と
Deny が評価される順番を制御するVia HTTP 応答ヘッダ
+Via HTTP 応答ヘッダ
により提供される情報Server HTTP 応答ヘッダを設定するServer HTTP 応答ヘッダを設定するTRACE メソッドのリクエストに対する応答方法を決める
+TRACE メソッドのリクエストに対する応答方法を決める
mime.types ファイルの位置mime.types ファイルの位置.htaccess filesReferer request
header is presentContent-MD5 HTTP Response
+Content-MD5 HTTP Response
headersnone. In prior versions, DefaultType
would specify a default media type to assign to response content for
which no other media type configuration could be found.
Expires ѴExpires ѴExpires ѴExpires Ѵmod_ext_filter ɼ Ѵmod_ext_filter ɼ Ѵmod_filterbase ⺻base ⺻POST data)HSE_APPEND_LOG_PARAMETER
+POST data)HSE_APPEND_LOG_PARAMETER
û α ѴHSE_APPEND_LOG_PARAMETER
+HSE_APPEND_LOG_PARAMETER
û ǹڿ Ѵfree()mod_mime to treat path_info
+mod_mime to treat path_info
components as part of the filenameAllow and Deny are
evaluated.Via HTTP response
+Via HTTP response
header for proxied requestsServer HTTP response
+Server HTTP response
headerLast-Modified headers are generated by the
+Last-Modified headers are generated by the
server.TRACE
+TRACE
requestsmime.types filemime.types file.htaccess dosyalarında bulunmasına izin verilen
+.htaccess dosyalarında bulunmasına izin verilen
yönerge türleri belirtilir.Referer request
header is presentContent-MD5 HTTP yanıt başlıklarının üretimini
+Content-MD5 HTTP yanıt başlıklarının üretimini
etkin kılar.core dosyasını dökümlemek üzere Apache’nin geçmeye
+core dosyasını dökümlemek üzere Apache’nin geçmeye
çalışacağı dizin.none olduğu takdirde, bu yönergenin bir
+none olduğu takdirde, bu yönergenin bir
uyarı vermekten başka bir etkisi yoktur. Önceki sürümlerde, bu yönerge,
sunucunun ortam türünü saptayamadığı durumda göndereceği öntanımlı ortam
türünü belirlerdi.Expires
+Expires
headersExpires header configured
+Expires header configured
by MIME typemod_ext_filter optionsmod_ext_filter optionsETag HTTP yanıt başlığını oluşturmakta kullanılacak
+ETag HTTP yanıt başlığını oluşturmakta kullanılacak
dosya özniteliklerini belirler.mod_filterbase for imagemap filesbase for imagemap filesPOST data)HSE_APPEND_LOG_PARAMETER requests from
+POST data)HSE_APPEND_LOG_PARAMETER requests from
ISAPI extensions to the error logHSE_APPEND_LOG_PARAMETER requests from
+HSE_APPEND_LOG_PARAMETER requests from
ISAPI extensions to the query fieldfree() çağrılmaksızın ana bellek ayırıcının
+free() çağrılmaksızın ana bellek ayırıcının
ayırmasına izin verilen azami bellek miktarını belirler.mod_mime to treat path_info
+mod_mime to treat path_info
components as part of the filenameAllow and Deny are
evaluated.Via HTTP response
+Via HTTP response
header for proxied requestsServer HTTP yanıt başlığını yapılandırır.
+Server HTTP yanıt başlığını yapılandırır.
Last-Modified headers are generated by the
+Last-Modified headers are generated by the
server.TRACE isteklerinde davranış şeklini belirler
+TRACE isteklerinde davranış şeklini belirler
mime.types filemime.types fileKeepAliveTimeout in milliseconds.
mod_cache can now insert HIT/MISS/REVALIDATE into
an X-Cache header.mod_allowmethods