This commit was manufactured by cvs2svn to create tag
'APACHE_2_0_44'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/tags/2.0.44@98327 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/Apache.dsw b/Apache.dsw
index 1bda2f0..b148f5b 100644
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -57,6 +57,9 @@
Project_Dep_Name ApacheMonitor
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name mod_access
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name mod_actions
End Project Dependency
Begin Project Dependency
@@ -66,39 +69,18 @@
Project_Dep_Name mod_asis
End Project Dependency
Begin Project Dependency
- Project_Dep_Name mod_auth_basic
+ Project_Dep_Name mod_auth
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name mod_auth_anon
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name mod_auth_dbm
End Project Dependency
Begin Project Dependency
Project_Dep_Name mod_auth_digest
End Project Dependency
Begin Project Dependency
- Project_Dep_Name mod_authn_anon
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_authn_dbm
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_authn_default
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_authn_file
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_authz_dbm
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_authz_default
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_authz_groupfile
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_authz_host
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_authz_user
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name mod_autoindex
End Project Dependency
Begin Project Dependency
@@ -147,10 +129,10 @@
Project_Dep_Name mod_isapi
End Project Dependency
Begin Project Dependency
- Project_Dep_Name mod_log_config
+ Project_Dep_Name mod_logio
End Project Dependency
Begin Project Dependency
- Project_Dep_Name mod_logio
+ Project_Dep_Name mod_log_config
End Project Dependency
Begin Project Dependency
Project_Dep_Name mod_mem_cache
@@ -218,6 +200,18 @@
Begin Project Dependency
Project_Dep_Name wintty
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libapriconv_ccs_modules
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libapriconv_ces_modules
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name mod_auth_ldap
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name util_ldap
+ End Project Dependency
}}}
###############################################################################
@@ -434,6 +428,33 @@
Begin Project Dependency
Project_Dep_Name libapr
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name apriconv ces
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libapriconv_ccs_modules"=".\srclib\apr-iconv\ccs\libapriconv_ccs_modules.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libapriconv_ces_modules"=".\srclib\apr-iconv\ces\libapriconv_ces_modules.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
}}}
###############################################################################
@@ -507,6 +528,27 @@
###############################################################################
+Project: "mod_access"=".\modules\aaa\mod_access.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libhttpd
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "mod_actions"=".\modules\mappers\mod_actions.dsp" - Package Owner=<4>
Package=<5>
@@ -570,7 +612,49 @@
###############################################################################
-Project: "mod_auth_basic"=".\modules\aaa\mod_auth_basic.dsp" - Package Owner=<4>
+Project: "mod_auth"=".\modules\aaa\mod_auth.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libhttpd
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_auth_anon"=".\modules\aaa\mod_auth_anon.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libhttpd
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "mod_auth_dbm"=".\modules\aaa\mod_auth_dbm.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -612,7 +696,7 @@
###############################################################################
-Project: "mod_authn_anon"=".\modules\aaa\mod_authn_anon.dsp" - Package Owner=<4>
+Project: "mod_auth_ldap"=".\modules\experimental\mod_auth_ldap.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -630,199 +714,7 @@
Project_Dep_Name libhttpd
End Project Dependency
Begin Project Dependency
- Project_Dep_Name mod_auth_basic
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mod_authn_dbm"=".\modules\aaa\mod_authn_dbm.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libhttpd
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_auth_basic
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mod_authn_default"=".\modules\aaa\mod_authn_default.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libhttpd
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_auth_basic
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mod_authn_file"=".\modules\aaa\mod_authn_file.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libhttpd
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_auth_basic
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mod_authz_dbm"=".\modules\aaa\mod_authz_dbm.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libhttpd
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_auth_basic
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mod_authz_default"=".\modules\aaa\mod_authz_default.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libhttpd
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_auth_basic
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mod_authz_groupfile"=".\modules\aaa\mod_authz_groupfile.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libhttpd
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_auth_basic
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mod_authz_host"=".\modules\aaa\mod_authz_host.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libhttpd
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_auth_basic
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mod_authz_user"=".\modules\aaa\mod_authz_user.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libhttpd
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name mod_auth_basic
+ Project_Dep_Name util_ldap
End Project Dependency
}}}
@@ -1086,7 +978,7 @@
###############################################################################
-Project: "mod_ext_filter"=".\modules\experimental\mod_ext_filter.dsp" - Package Owner=<4>
+Project: "mod_ext_filter"=".\modules\filters\mod_ext_filter.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -1692,6 +1584,27 @@
###############################################################################
+Project: "util_ldap"=".\modules\experimental\util_ldap.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libhttpd
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "wintty"=".\support\win32\wintty.dsp" - Package Owner=<4>
Package=<5>
diff --git a/CHANGES b/CHANGES
index 1805dca..e97b2c2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,64 @@
Changes with Apache 2.0.44
+ *) mod_autoindex: Bring forward the IndexOptions IgnoreCase option
+ from Apache 1.3. PR 14276
+ [David Shane Holden <dpejesh@yahoo.com>, William Rowe]
+
+ *) mod_mime: Workaround to prevent a segfault if r->filename=NULL
+ [Brian Pane]
+
+ *) Reorder the definitions for mod_ldap and mod_auth_ldap within
+ config.m4 to make sure the parent mod_ldap is defined first.
+ This ensures that mod_ldap comes before mod_auth_ldap in the
+ httpd.conf file, which is necessary for mod_auth_ldap to load.
+ PR 14256 [Graham Leggett]
+
+ *) Fix the building of cgi command lines when the query string
+ contains '='. PR 13914 [Ville Skyttä <ville.skytta@iki.fi>,
+ Jeff Trawick]
+
+ *) Rename CacheMaxStreamingBuffer to MCacheMaxStreamingBuffer. Move
+ implementation of MCacheMaxStreamingBuffer from mod_cache to
+ mod_mem_cache. MCacheMaxStreamingBuffer now defaults to the
+ lesser of 100,000 bytes or MCacheMaxCacheObjectSize. This should
+ eliminate the need for explicitly coding MCacheMaxStreamingBuffer
+ in most configurations. [Bill Stoddard]
+
+ *) Replace APU_HAS_LDAPSSL_CLIENT_INIT with APU_HAS_LDAP_NETSCAPE_SSL
+ as set by apr-util in util_ldap.c. This should allow mod_ldap
+ to work with the Netscape/Mozilla LDAP library. [Øyvin Sømme
+ <somme@oslo.westerngeco.slb.com>, Graham Leggett]
+
+ *) Fix critical bug in new --enable-v4-mapped configure option
+ implementation which broke IPv4 listening sockets on some
+ systems. [hiroyuki hanai <hanai@imgsrc.co.jp>]
+
+ *) mod_setenvif: Fix BrowserMatchNoCase support for non-regex
+ patterns [André Malo <nd@perlig.de>]
+
+ *) Add version string to provider API. [Justin Erenkrantz]
+
+ *) mod_negotiation: Set the appropriate mime response headers
+ (Content-Type, charset, Content-Language and Content-Encoding)
+ for negotated type-map "Body:" responses (such as the error
+ pages.) [André Malo <nd@perlig.de>]
+
+ *) mod_log_config: Allow '%%' escaping in CustomLog format
+ strings to insert a literal, single '%'.
+ [André Malo <nd@perlig.de>]
+
+ *) mod_autoindex: AddDescription directives for directories
+ now work as in Apache 1.3, where no trailing '/' is
+ specified on the directory name. Previously, the trailing
+ '/' *had* to be specified, which was incompatible with
+ Apache 1.3. PR 7990 [Jeff Trawick]
+
+ *) Fix for PR 14556. The expiry calculations in mod_cache were
+ trying to perform "now + ((date - lastmod) * factor)" where
+ date == lastmod resulting in "now + 0". The code now follows
+ the else path (using the default expiration) if date is
+ equal to lastmod. [rx@armstrike.com (Sergey), Paul J. Reder]
+
*) Use AP_DECLARE in the debug versions of ap_strXXX in case the
default calling convention is not the same as the one used by
AP_DECLARE. [Juan Rivera <Juan.Rivera@citrix.com>]
@@ -168,9 +227,6 @@
*) Add ap_register_provider/ap_lookup_provider API.
[John K. Sterling <john@sterls.com>, Justin Erenkrantz]
- *) Rewrite of aaa modules to an authn/authz model.
- [Dirk-Willem van Gulik, Justin Erenkrantz]
-
Changes with Apache 2.0.43
*) SECURITY: [CAN-2002-0840] HTML-escape the address produced by
@@ -365,6 +421,13 @@
response on the connection, set aside the file descriptor rather
than copying the file into the heap. [Brian Pane]
+ *) Modified version check on openssl so that it finds the executable
+ first and then performs a check of the version, only warning the
+ user if they chose, or we selected, an old version of OpenSSL.
+ This change also allows the code to work for non-openssl libraries
+ selected via the --with-ssl=dir option, which can override the
+ automated library check in any case. [Roy Fielding]
+
Changes with Apache 2.0.40
*) SECURITY: [CAN-2002-0661] Close a very significant security hole that
diff --git a/Makefile.win b/Makefile.win
index 1d178eb..afbcd44 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -177,6 +177,18 @@
cd srclib\apr-iconv
$(MAKE) $(MAKEOPT) -f apriconv.mak CFG="apriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f libapriconv.mak CFG="libapriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+!IF "$(CTARGET)" == "CLEAN"
+ $(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \
+ BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.
+!ELSE
+ cd ccs
+ $(MAKE) /nologo /f Makefile.win all \
+ BUILD_MODE=$(LONG) BIND_MODE=shared
+ cd ..\ces
+ $(MAKE) /nologo /f Makefile.win all \
+ BUILD_MODE=$(LONG) BIND_MODE=shared
+ cd ..
+!ENDIF
cd ..\..
cd srclib\apr-util\uri
$(MAKE) $(MAKEOPT) -f gen_uri_delims.mak CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -198,17 +210,11 @@
$(MAKE) $(MAKEOPT) -f libhttpd.mak CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f Apache.mak CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd modules\aaa
- $(MAKE) $(MAKEOPT) -f mod_auth_basic.mak CFG="mod_auth_basic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_access.mak CFG="mod_access - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_auth.mak CFG="mod_auth - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_auth_anon.mak CFG="mod_auth_anon - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_auth_dbm.mak CFG="mod_auth_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_authn_anon.mak CFG="mod_authn_anon - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_authn_dbm.mak CFG="mod_authn_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_authn_default.mak CFG="mod_authn_default - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_authn_file.mak CFG="mod_authn_file - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_authz_dbm.mak CFG="mod_authz_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_authz_default.mak CFG="mod_authz_default - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_authz_groupfile.mak CFG="mod_authz_groupfile - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_authz_host.mak CFG="mod_authz_host - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_authz_user.mak CFG="mod_authz_user - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\arch\win32
$(MAKE) $(MAKEOPT) -f mod_isapi.mak CFG="mod_isapi - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -227,12 +233,12 @@
$(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_mem_cache.mak CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_disk_cache.mak CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\filters
!IF EXIST("srclib\zlib")
$(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!ENDIF
+ $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_include.mak CFG="mod_include - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\generators
@@ -247,7 +253,6 @@
cd ..\..
cd modules\loggers
$(MAKE) $(MAKEOPT) -f mod_log_config.mak CFG="mod_log_config - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f mod_logio.mak CFG="mod_logio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\mappers
$(MAKE) $(MAKEOPT) -f mod_actions.mak CFG="mod_actions - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -328,6 +333,12 @@
@echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
@msdev Apache.dsw /USEENV /MAKE \
"BuildBin - Win32 $(LONG)" $(CTARGET)
+!IF "$(CTARGET)" == "/CLEAN"
+ @cd srclib\apr-iconv
+ @$(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \
+ BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.
+ @cd ..\..
+!ENDIF
!IF EXIST("srclib\openssl")
@msdev Apache.dsw /USEENV /MAKE \
"mod_ssl - Win32 $(LONG)" \
@@ -345,6 +356,7 @@
echo A >.A
-mkdir "$(INSTDIR)"
-mkdir "$(INSTDIR)\bin"
+ -mkdir "$(INSTDIR)\bin\iconv"
-mkdir "$(INSTDIR)\cgi-bin"
-mkdir "$(INSTDIR)\conf"
-mkdir "$(INSTDIR)\error"
@@ -365,18 +377,17 @@
copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin" <.y
copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin" <.y
copy srclib\apr-iconv\$(LONG)\libapriconv.dll "$(INSTDIR)\bin" <.y
+ cd srclib\apr-iconv
+ $(MAKE) $(MAKEOPT) /f build\modules.mk.win install \
+ BUILD_MODE=$(LONG) BIND_MODE=shared \
+ API_SOURCE=. INSTALL_DIR="$(INSTDIR)\bin\iconv"
+ cd ..\..
copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin" <.y
- copy modules\aaa\$(LONG)\mod_auth_basic.so "$(INSTDIR)\modules" <.y
+ copy modules\aaa\$(LONG)\mod_access.so "$(INSTDIR)\modules" <.y
+ copy modules\aaa\$(LONG)\mod_auth.so "$(INSTDIR)\modules" <.y
+ copy modules\aaa\$(LONG)\mod_auth_anon.so "$(INSTDIR)\modules" <.y
+ copy modules\aaa\$(LONG)\mod_auth_dbm.so "$(INSTDIR)\modules" <.y
copy modules\aaa\$(LONG)\mod_auth_digest.so "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authn_anon.so "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authn_dbm.so "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authn_default.so "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authn_file.so "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authz_dbm.so "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authz_default.so "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authz_groupfile.so "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authz_host.so "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authz_user.so "$(INSTDIR)\modules" <.y
copy modules\arch\win32\$(LONG)\mod_isapi.so "$(INSTDIR)\modules" <.y
copy modules\cache\$(LONG)\mod_file_cache.so "$(INSTDIR)\modules" <.y
copy modules\dav\fs\$(LONG)\mod_dav_fs.so "$(INSTDIR)\modules" <.y
@@ -385,7 +396,7 @@
copy modules\experimental\$(LONG)\mod_charset_lite.so "$(INSTDIR)\modules" <.y
copy modules\experimental\$(LONG)\mod_mem_cache.so "$(INSTDIR)\modules" <.y
copy modules\experimental\$(LONG)\mod_disk_cache.so "$(INSTDIR)\modules" <.y
- copy modules\experimental\$(LONG)\mod_ext_filter.so "$(INSTDIR)\modules" <.y
+ copy modules\filters\$(LONG)\mod_ext_filter.so "$(INSTDIR)\modules" <.y
copy modules\filters\$(LONG)\mod_include.so "$(INSTDIR)\modules" <.y
copy modules\generators\$(LONG)\mod_asis.so "$(INSTDIR)\modules" <.y
copy modules\generators\$(LONG)\mod_autoindex.so "$(INSTDIR)\modules" <.y
@@ -394,7 +405,6 @@
copy modules\generators\$(LONG)\mod_status.so "$(INSTDIR)\modules" <.y
copy modules\http\$(LONG)\mod_mime.so "$(INSTDIR)\modules" <.y
copy modules\loggers\$(LONG)\mod_log_config.so "$(INSTDIR)\modules" <.y
- copy modules\loggers\$(LONG)\mod_logio.so "$(INSTDIR)\modules" <.y
copy modules\mappers\$(LONG)\mod_actions.so "$(INSTDIR)\modules" <.y
copy modules\mappers\$(LONG)\mod_alias.so "$(INSTDIR)\modules" <.y
copy modules\mappers\$(LONG)\mod_dir.so "$(INSTDIR)\modules" <.y
@@ -422,17 +432,11 @@
copy srclib\apr\$(LONG)\libapr.pdb "$(INSTDIR)\bin" <.y
copy srclib\apr-iconv\$(LONG)\libapriconv.pdb "$(INSTDIR)\bin" <.y
copy srclib\apr-util\$(LONG)\libaprutil.pdb "$(INSTDIR)\bin" <.y
- copy modules\aaa\$(LONG)\mod_auth_basic.pdb "$(INSTDIR)\modules" <.y
+ copy modules\aaa\$(LONG)\mod_access.pdb "$(INSTDIR)\modules" <.y
+ copy modules\aaa\$(LONG)\mod_auth.pdb "$(INSTDIR)\modules" <.y
+ copy modules\aaa\$(LONG)\mod_auth_anon.pdb "$(INSTDIR)\modules" <.y
+ copy modules\aaa\$(LONG)\mod_auth_dbm.pdb "$(INSTDIR)\modules" <.y
copy modules\aaa\$(LONG)\mod_auth_digest.pdb "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authn_anon.pdb "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authn_dbm.pdb "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authn_default.pdb "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authn_file.pdb "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authz_dbm.pdb "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authz_default.pdb "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authz_groupfile.pdb "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authz_host.pdb "$(INSTDIR)\modules" <.y
- copy modules\aaa\$(LONG)\mod_authz_user.pdb "$(INSTDIR)\modules" <.y
copy modules\arch\win32\$(LONG)\mod_isapi.pdb "$(INSTDIR)\modules" <.y
copy modules\cache\$(LONG)\mod_file_cache.pdb "$(INSTDIR)\modules" <.y
copy modules\dav\fs\$(LONG)\mod_dav_fs.pdb "$(INSTDIR)\modules" <.y
@@ -441,7 +445,7 @@
copy modules\experimental\$(LONG)\mod_charset_lite.pdb "$(INSTDIR)\modules" <.y
copy modules\experimental\$(LONG)\mod_mem_cache.pdb "$(INSTDIR)\modules" <.y
copy modules\experimental\$(LONG)\mod_disk_cache.pdb "$(INSTDIR)\modules" <.y
- copy modules\experimental\$(LONG)\mod_ext_filter.pdb "$(INSTDIR)\modules" <.y
+ copy modules\filters\$(LONG)\mod_ext_filter.pdb "$(INSTDIR)\modules" <.y
copy modules\filters\$(LONG)\mod_include.pdb "$(INSTDIR)\modules" <.y
copy modules\generators\$(LONG)\mod_asis.pdb "$(INSTDIR)\modules" <.y
copy modules\generators\$(LONG)\mod_autoindex.pdb "$(INSTDIR)\modules" <.y
@@ -450,7 +454,6 @@
copy modules\generators\$(LONG)\mod_status.pdb "$(INSTDIR)\modules" <.y
copy modules\http\$(LONG)\mod_mime.pdb "$(INSTDIR)\modules" <.y
copy modules\loggers\$(LONG)\mod_log_config.pdb "$(INSTDIR)\modules" <.y
- copy modules\loggers\$(LONG)\mod_logio.pdb "$(INSTDIR)\modules" <.y
copy modules\mappers\$(LONG)\mod_actions.pdb "$(INSTDIR)\modules" <.y
copy modules\mappers\$(LONG)\mod_alias.pdb "$(INSTDIR)\modules" <.y
copy modules\mappers\$(LONG)\mod_dir.pdb "$(INSTDIR)\modules" <.y
diff --git a/NWGNUmakefile b/NWGNUmakefile
index 2ce651e..9035d8c 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -119,7 +119,7 @@
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION = Apache Web Server $(VERSION_STR)
+NLM_DESCRIPTION = Apache Web Server $(VERSION_STR)
#
# This is used by the '-threadname' directive. If left blank,
@@ -194,10 +194,11 @@
$(OBJDIR)/listen.o \
$(OBJDIR)/log.o \
$(OBJDIR)/main.o \
- $(OBJDIR)/mod_authz_host.o \
+ $(OBJDIR)/mod_access.o \
$(OBJDIR)/mod_actions.o \
$(OBJDIR)/mod_alias.o \
$(OBJDIR)/mod_asis.o \
+ $(OBJDIR)/mod_auth.o \
$(OBJDIR)/mod_autoindex.o \
$(OBJDIR)/mod_cgi.o \
$(OBJDIR)/mod_dir.o \
diff --git a/ROADMAP b/ROADMAP
deleted file mode 100644
index a76c20a..0000000
--- a/ROADMAP
+++ /dev/null
@@ -1,256 +0,0 @@
-APACHE 2.x ROADMAP
-==================
-Last modified at [$Date: 2002/10/28 07:37:29 $]
-
-
-WORKS IN PROGRESS
------------------
-
- * Source code should follow style guidelines.
- OK, we all agree pretty code is good. Probably best to clean this
- up by hand immediately upon branching a 2.1 tree.
- Status: Justin volunteers to hand-edit the entire source tree ;)
-
- Justin says:
- Recall when the release plan for 2.0 was written:
- Absolute Enforcement of an "Apache Style" for code.
- Watch this slip into 3.0.
-
- David says:
- The style guide needs to be reviewed before this can be done.
- http://httpd.apache.org/dev/styleguide.html
- The current file is dated April 20th 1998!
-
- OtherBill offers:
- It's survived since '98 because it's welldone :-) Suggest we
- simply follow whatever is documented in styleguide.html as we
- branch the next tree. Really sort of straightforward, if you
- dislike a bit within that doc, bring it up on the dev@httpd
- list prior to the next branch.
-
- So Bill sums up ... let's get the code cleaned up in CVS head.
- Remember, it just takes cvs diff -b (that is, --ignore-space-change)
- to see the code changes and ignore that cruft. Get editing Justin :)
-
- * revamp the input filter syntax to provide for ordering of
- filters created with the Set{Input|Output}Filter and the
- Add{Input|Output}Filter directives. A 'relative to filterx'
- syntax is definately preferable.
-
- * Platforms that do not support fork (primarily Win32 and AS/400)
- Architect start-up code that avoids initializing all the modules
- in the parent process on platforms that do not support fork.
-
- . Better yet - not only inform the startup of which phase it's in,
- but allow the parent 'process' to initialize shared memory, etc,
- and create a module-by-module stream to pass to the child, so the
- parent can actually arbitrate the important stuff.
-
- * Replace stat [deferred open] with open/fstat in directory_walk.
- Justin, Ian, OtherBill all interested in this. Implies setting up
- the apr_file_t member in request_rec, and having all modules use
- that file, and allow the cleanup to close it [if it isn't a shared,
- cached file handle.]
-
- * The Async Apache Server implemented in terms of APR.
- [Bill Stoddard's pet project.]
- Message-ID: <008301c17d42$9b446970$01000100@sashimi> (dev@apr)
-
- OtherBill notes that this can proceed in two parts...
-
- Async accept, setup, and tear-down of the request
- e.g. dealing with the incoming request headers, prior to
- dispatching the request to a thread for processing.
- This doesn't need to wait for a 2.x/3.0 bump.
-
- Async delegation of the entire request processing chain
- Too many handlers use stack storage and presume it is
- available for the life of the request, so a complete
- async implementation would need to happen 3.0 release.
-
- Brian notes that async writes will provide a bigger
- scalability win than async reads for most servers.
- We may want to try a hybrid sync-read/async-write MPM
- as a next step. This should be relatively easy to
- build: start with the current worker or leader/followers
- model, but hand off each response brigade to a "completion
- thread" that multiplexes writes on many connections, so
- that the worker thread doesn't have to wait around for
- the sendfile to complete.
-
- * Add a string "class" that combines a char* with a length
- and a reference count. This will help reduce the number
- of strlen and strdup operations during request processing.
- Including both the length and allocation will save us a ton
- of reallocation we do today, in terms of string manipulation.
-
- OtherBill asks if this is really an APR issue, not an HTTPD issue?
-
- Brian notes that the performance optimization work in 2.0
- has all but eliminated the original motiviation for this
- idea. The httpd doesn't spend that much time in strlen
- calls any more.
-
-
-MAKING APACHE REPOSITORY-AGNOSTIC
-(or: remove knowledge of the filesystem)
-
-[ 2002/10/01: discussion in progress on items below; this isn't
- planned yet ]
-
- * dav_resource concept for an HTTP resource ("ap_resource")
-
- * r->filename, r->canonical_filename, r->finfo need to
- disappear. All users need to use new APIs on the ap_resource
- object.
-
- (backwards compat: today, when this occurs with mod_dav and a
- custom backend, the above items refer to the topmost directory
- mapped by a location; e.g. docroot)
-
- Need to preserve a 'filename'-like string for mime-by-name
- sorts of operations. But this only needs to be the name itself
- and not a full path.
-
- Justin: Can we leverage the path info, or do we not trust the
- user?
-
- gstein: well, it isn't the "path info", but the actual URI of
- the resource. And of course we trust the user... that is
- the resource they requested.
-
- dav_resource->uri is the field you want. path_info might
- still exist, but that portion might be related to the
- CGI concept of "path translated" or some other further
- resolution.
-
- To continue, I would suggest that "path translated" and
- having *any* path info is Badness. It means that you did
- not fully resolve a resource for the given URI. The
- "abs_path" in a URI identifies a resource, and that
- should get fully resolved. None of this "resolve to
- <here> and then we have a magical second resolution
- (inside the CGI script)" or somesuch.
-
- Justin: Well, let's consider mod_mbox for a second. It is sort of
- a virtual filesystem in its own right - as it introduces
- it's own notion of a URI space, but it is intrinsically
- tied to the filesystem to do the lookups. But, for the
- portion that isn't resolved on the file system, it has
- its own addressing scheme. Do we need the ability to
- layer resolution?
-
- * The translate_name hook goes away
-
- Wrowe altogether disagrees. translate_name today even operates
- on URIs ... this mechansim needs to be preserved.
-
- * The doc for map_to_storage is totally opaque to me. It has
- something to do with filesystems, but it also talks about
- security and per_dir_config and other stuff. I presume something
- needs to happen there -- at least better doc.
-
- Wrowe agrees and will write it up.
-
- * The directory_walk concept disappears. All configuration is
- tagged to Locations. The "mod_filesystem" module might have some
- internal concept of the same config appearing in multiple
- places, but that is handled internally rather than by Apache
- core.
-
- Wrowe suggests this is wrong, instead it's private to filesystem
- requests, and is already invoked from map_to_storage, not the core
- handler. <Directory > and <Files > blocks are preserved as-is,
- but <Directory > sections become specific to the filesystem handler
- alone. Because alternate filesystem schemes could be loaded, this
- should be exposed, from the core, for other file-based stores to
- share. Consider an archive store where the layers become
- <Directory path> -> <Archive store> -> <File name>
-
- Justin: How do we map Directory entries to Locations?
-
- * The "Location tree" is an in-memory representation of the URL
- namespace. Nodes of the tree have configuration specific to that
- location in the namespace.
-
- Something like:
-
- typedef struct {
- const char *name; /* name of this node relative to parent */
-
- struct ap_conf_vector_t *locn_config;
-
- apr_hash_t *children; /* NULL if no child configs */
- } ap_locn_node;
-
- The following config:
-
- <Location /server-status>
- SetHandler server-status
- Order deny,allow
- Deny from all
- Allow from 127.0.0.1
- </Location>
-
- Creates a node with name=="server_status", and the node is a
- child of the "/" node. (hmm. node->name is redundant with the
- hash key; maybe drop node->name)
-
- In the config vector, mod_access has stored its Order, Deny, and
- Allow configs. mod_core has stored the SetHandler.
-
- During the Location walk, we merge the config vectors normally.
-
- Note that an Alias simply associates a filesystem path (in
- mod_filesystem) with that Location in the tree. Merging
- continues with child locations, but a merge is never done
- through filesystem locations. Config on a specific subdir needs
- to be mapped back into the corresponding point in the Location
- tree for proper merging.
-
- * Config is parsed into a tree, as we did for the 2.0 timeframe,
- but that tree is just a representation of the config (for
- multiple runs and for in-memory manipulation and usage). It is
- unrelated to the "Location tree".
-
- * Calls to apr_file_io functions generally need to be replaced
- with operations against the ap_resource. For example, rather
- than calling apr_dir_open/read/close(), a caller uses
- resource->repos->get_children() or somesuch.
-
- Note that things like mod_dir, mod_autoindex, and mod_negotation
- need to be converted to use these mechanisms so that their
- functions will work on logical repositories rather than just
- filesystems.
-
- * How do we handle CGI scripts? Especially when the resource may
- not be backed by a file? Ideally, we should be able to come up
- with some mechanism to allow CGIs to work in a
- repository-independent manner.
-
- - Writing the virtual data as a file and then executing it?
- - Can a shell be executed in a streamy manner? (Portably?)
- - Have an 'execute_resource' hook/func that allows the
- repository to choose its manner - be it exec() or whatever.
- - Won't this approach lead to duplication of code? Helper fns?
-
- gstein: PHP, Perl, and Python scripts are nominally executed by
- a filter inserted by mod_php/perl/python. I'd suggest
- that shell/batch scripts are similar.
-
- But to ask further: what if it is an executable
- *program* rather than just a script? Do we yank that out
- of the repository, drop it onto the filesystem, and run
- it? eeewwwww...
-
- I'll vote -0.9 for CGIs as a filter. Keep 'em handlers.
-
- Justin: So, do we give up executing CGIs from virtual repositories?
- That seems like a sad tradeoff to make. I'd like to have
- my CGI scripts under DAV (SVN) control.
-
- * How do we handle overlaying of Location and Directory entries?
- Right now, we have a problem when /cgi-bin/ is ScriptAlias'd and
- mod_dav has control over /. Some people believe that /cgi-bin/
- shouldn't be under DAV control, while others do believe it
- should be. What's the right strategy?
diff --git a/STATUS b/STATUS
index e345897..ad3168d 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
APACHE 2.0 STATUS: -*-text-*-
-Last modified at [$Date: 2002/11/21 17:03:40 $]
+Last modified at [$Date: 2003/01/17 18:52:44 $]
Release:
@@ -53,54 +53,82 @@
Contributors looking for a mission:
- * just do an egrep on "TODO" and see what's there
+ * just do an egrep on "TODO", "XXX" and see what's there
+PATCHES TO PORT FROM 2.1
+ * Allow RewriteEngine Off even if Options -FollowSymlinks. PR 12395.
+
+ * Use saner default config values for suexec. PR 15713.
+
+ * Rewrite how proxy sends its request to allow input bodies to
+ morph the request bodies. Previously, if an input filter
+ changed the request body, the original C-L would be sent which
+ would be incorrect.
+
+ Due to HTTP compliance, we must either send the body T-E: chunked
+ or include a C-L for the request body. Connection: Close is not
+ an option. [jerenkrantz 2002/12/08 21:37:27]
+ +1: stoddard, striker, jim
+ -1: brianp (we need a more robust solution than what's in 2.1 right now),
+ jerenkrantz (should be fixed, but I don't have time to do this)
+
+ * Fix mod_ext_filter to properly NULL-terminate an array of args
+ for some forms of ExtFilterDefine. PR 15491. This is r1.2 of
+ modules/filters/mod_ext_filter.c.
+ +1: trawick, jerenkrantz
+
+ * Use different ulimit commands in apachectl on Tru64 and AIX.
+ On both platforms, there are situations where problems with the
+ default command won't be found at configure time. The changes
+ are r1.6 and r1.7 of support/config.m4.
+ +1: trawick, jerenkrantz
CURRENT RELEASE NOTES:
+ * Backwards compatibility is expected of future Apache 2.0 releases,
+ such that no MMN major number changes will occur until 2.1.
+
+ * All commits to APACHE_2_0_BRANCH must be reflected in cvs HEAD
+ as well, if they apply. Logical progression is commit to HEAD,
+ get feedback and then commit to APACHE_2_0_BRANCH.
RELEASE SHOWSTOPPERS:
+ * The Auth module overhaul of module names and directives need to
+ be reverted to their 2.0.43 names. The new hooks remain.
CURRENT VOTES:
- * Adopt backwards compatibility for future Apache 2.0 releases
- such that MMN major number changes and eliminating non-experimental
- modules are deferred for the next minor version bump (e.g. 2.1, 2.2
- or 3.0).
- +1: wrowe, jerenkrantz, aaron, brianp, trawick, stoddard, jwoolley,
- rbowen, rederpj, jim, striker
- 0:
- -1:
+ * APACHE_2_0_BRANCH *has* to work with an official stable version
+ of APR (i.e., 1.0).
+ yes:
+ no: trawick, jerenkrantz, wrowe, stoddard
+ wrowe adds it's nice if we *can* compile against it, but as
+ a matter of a practical tarball or binary release, don't.
- * Defer the Auth module overhaul to the next minor version bump
- (e.g. 2.1, 2.2, 3.0) on the condition that forward compatibility
- resolution is adopted.
- +1: wrowe, aaron, trawick, stoddard, jwoolley, rbowen, gregames,
- rederpj, jim
- 0: jerenkrantz
- -1: striker
+ * APACHE_2_0_BRANCH uses a level of APR code branched from the
+ APACHE_2_0_43 tag.
+ yes: trawick, jerenkrantz
+ no: wrowe
+ wrowe observes that we have already finished substantial
+ bug fixing in 0.9.2-dev since APACHE_2_0_43, so branching
+ there seems arbitrary.
- * Adopt an even/odd release paradigm (see VERSIONING) such that
- even numbered releases are stable, and odd numbered releases
- are development efforts, keeping in the tradition of Linux,
- Perl, etc. In pratical terms, this implies C-T-R-T-C, where
- patches are (generally) first applied to the development branch,
- tested, and then (after vote) applied to the stable branch.
- +1: wrowe, jerenkrantz, aaron, trawick, stoddard, jwoolley, rbowen,
- gregames, rederpj, jim, striker
- 0:
- -1:
- * Branch APACHE_2_0_BRANCH today, changing the version in CVS HEAD
- to 2.1.0-dev.
- +1 [from APACHE_2_0_43]: wrowe, aaron, trawick, stoddard, jwoolley,
- gregames, rederpj, jim
- +1 [from HEAD]: striker
- 0: jerenkrantz
- -1:
+ * APACHE_2_0_BRANCH uses a level of APR code versioned 0.9.2-dev
+ or later (to 0.9.9), so long it remains binary compatible.
+ yes: wrowe
+ no:
+ wrowe suggests that when apr chooses to break compatibility,
+ httpd would continue to use that last compatible build.
- * httpd-std.conf and friends
+ * Develop in Review-Then-Commit or Commit-Then-Review mode
+ on APACHE_2_0_BRANCH (no vetoes, this is a straight vote.)
+ R-T-C: trawick, wrowe, jerenkrantz, stoddard, rederpj, striker
+ Abstain:
+ C-T-R: BrianP, aaron, jim
+
+ * httpd-std.conf and friends;
a) httpd-std.conf should be tailored by install (from src or
binbuild) even if user has existing httpd.conf
@@ -122,9 +150,9 @@
-1: Ken, wrowe, jwoolley, jim
wrowe - diff is wonderful when comparing old/new default configs,
even for customized sites that ianh mentions
- jim - ... assuming that the default configs have been updated
- with the required inline docs to explain the
- changes
+ jim - it makes sense assuming that the default configs
+ include the updated directives and inline comments
+ that explain the changes and make the 'diff' more useful.
* If the parent process dies, should the remaining child processes
"gracefully" self-terminate. Or maybe we should make it a runtime
@@ -134,7 +162,7 @@
Self-destruct: Ken, Martin
Not self-destruct: BrianP, Ian, Cliff, BillS
- Make it runtime configurable: Aaron, jim, Justin, wrowe, rederpj
+ Make it runtime configurable: Aaron, Justin, wrowe, rederpj, jim
/* The below was a concept on *how* to handle the problem */
Have 2 parents: +1: jim
@@ -143,10 +171,10 @@
something useful?)
* Make the worker MPM the default MPM for threaded Unix boxes.
- +1: Justin, Ian, Cliff, BillS, striker, wrowe
+ +1: Justin, Ian, Cliff, BillS, striker
+0: BrianP, Aaron (mutex contention is looking better with the
latest code, let's continue tuning and testing), rederpj, jim
- -0: Lars
+ -0: Lars, wrowe (let's make this defacto for the 2.2 release.)
RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
@@ -166,7 +194,7 @@
* pipes deadlock on all platforms with limited pipe buffers (e.g. both
Linux and Win32, as opposed to only Win32 on 1.3). The right solution
is either GStein's proposal for a "CGI Brigade", or OtherBill's proposal
- for "Poll Buckets" for "Polling Filter Chains".
+ for "Poll Buckets" for "Polling Filter Chains". Or perhaps both :-)
* All handlers should always send content down even if r->header_only
is set. If not, it means that the HEAD requests don't generate the
@@ -295,6 +323,12 @@
sequence causes the request to fail! This happens notably in
the ja-jis encoding.
+ OtherBill is -0.5 for even considering this until 2.2 because
+ it removes some protection we provided to third party modules
+ that would mysteriously 'evaporate', exposing potential holes
+ in security. Putting this change into 2.1 development now (with
+ strong warnings!) will give authors a chance to vet their code.
+
* FreeBSD, threads, and worker MPM. All seems to work fine
if you only have one worker process with many threads. Add
a second worker process and the accept lock seems to be
@@ -348,17 +382,6 @@
to both parent and child for writing. Then we just need to
figure out how to do graceless on non-threaded MPMs.
- * Allow the DocumentRoot directive within <Location > scopes? This
- allows the beloved (crusty) Alias /foo/ /somepath/foo/ followed
- by a <Directory /somepath/foo> to become simply
- <Location /foo/> DocumentRoot /somefile/foo (IMHO a bit more legible
- and in-your-face.) DocumentRoot unset would be accepted [and would
- not permit content to be served, only virtual resources such as
- server-info or server-status.
- This proposed change would _not_ depricate Alias.
- striker: See the thread starting with Message-ID:
- JLEGKKNELMHCJPNMOKHOGEEJFBAA.striker@apache.org.
-
* Win32: Rotatelogs sometimes is not terminated when Apache
goes down hard. FirstBill was looking at possibly tracking the
child's-child processes in the parent process.
@@ -373,12 +396,6 @@
* Combine log_child and piped_log_spawn. Clean up http_log.c.
Common logging API.
- * Document mod_file_cache.
-
- * Platforms that do not support fork (primarily Win32 and AS/400)
- Architect start-up code that avoids initializing all the modules
- in the parent process on platforms that do not support fork.
-
* Win32: Migrate the MPM over to use APR thread/process calls. This
would eliminate some code in the Win32 branch that essentially
duplicates what is in APR.
@@ -418,6 +435,10 @@
ap_sort_hooks() [to reduce the logic in main()]
* read the config tree just once, and process N times (as necessary)
+ OtherBill adds that the 'good' solution of three passes against the
+ config tree within one read is the better solution, but breaks many
+ modules. Best left for 2.2?
+ -0.5: OtherBill
* (possibly) use UUIDs in mod_unique_id and/or mod_usertrack
@@ -495,9 +516,9 @@
EXPERIMENTAL MODULES:
Experimental modules should eventually be be promoted to fully supported
- status or removed from the repository entirely (ie, the
- 'experiment' failed). This section tracks what needs to happen to
- get the modules promoted to fully supported status.
+ status or removed from the repository entirely (ie, the 'experiment'
+ failed). This section tracks what needs to happen to get the modules
+ promoted to fully supported status.
mod_cache/mod_mem_cache/mod_disk_cache:
* mod_cache: handle cache_control: no_cache "field_name" to enable
diff --git a/acinclude.m4 b/acinclude.m4
index de8f589..0b8086e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -88,7 +88,9 @@
APACHE_SUBST(INSTALL_PROG_FLAGS)
APACHE_SUBST(DSO_MODULES)
APACHE_SUBST(APR_BINDIR)
+ APACHE_SUBST(APR_INCLUDEDIR)
APACHE_SUBST(APU_BINDIR)
+ APACHE_SUBST(APU_INCLUDEDIR)
abs_srcdir="`(cd $srcdir && pwd)`"
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 16bb067..ae0cd0e 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -44,6 +44,11 @@
# LDAPSDK = C:/novell/ndk/cldapsdk
# endif
+# This is a placeholder
+# ifndef ZLIBSDK
+# ZLIBSDK = C:/novell/ndk/zlibsdk
+# endif
+
ifndef METROWERKS
METROWERKS = C:\Program Files\Metrowerks\CodeWarrior
endif
@@ -117,6 +122,9 @@
ifneq "$(LDAPSDK)" ""
INCDIRS := $(INCDIRS);$(LDAPSDK)/inc
endif
+ifneq "$(ZLIBSDK)" ""
+INCDIRS := $(INCDIRS);$(ZLIBSDK)
+endif
DEFINES = -DNETWARE
@@ -139,9 +147,9 @@
# -align 4 align on 4 byte bounderies
# -w nocmdline disable command-line driver/parser warnings
# -proc PII generate code base on Pentium II instruction set
-# -inst mmx use MMX extensions
+# -inst mmx use MMX extensions (not used)
-CFLAGS = -c -nosyspath -Cpp_exceptions off -RTTI off -align 4 -w nocmdline -proc PII -inst mmx
+CFLAGS = -c -nosyspath -Cpp_exceptions off -RTTI off -align 4 -w nocmdline -proc PII
# -g generate debugging information
# -O0 level 0 optimizations
@@ -190,11 +198,16 @@
DEFINES += -DNW_BUILD_IPV6
INCDIRS := $(NOVELLLIBC)\include\winsock\IPV6;$(INCDIRS)
-ifneq "$(IPV6)" "SET"
+ifneq "$(findstring IPV6,$(OBJDIR))" "IPV6"
OBJDIR := $(OBJDIR)_IPV6
+endif
+
+ifneq "$(findstring IPV6,$(INSTALL))" "IPV6"
INSTALL := $(INSTALL)_IPV6
+endif
+
+ifneq "$(findstring IPV6,$(INSTDIRS))" "IPV6"
INSTDIRS := $(INSTDIRS)_IPV6
-IPV6=SET
endif
endif
diff --git a/build/PrintPath b/build/PrintPath
new file mode 100755
index 0000000..68435f3
--- /dev/null
+++ b/build/PrintPath
@@ -0,0 +1,116 @@
+#!/bin/sh
+# Look for program[s] somewhere in $PATH.
+#
+# Options:
+# -s
+# Do not print out full pathname. (silent)
+# -pPATHNAME
+# Look in PATHNAME instead of $PATH
+#
+# Usage:
+# PrintPath [-s] [-pPATHNAME] program [program ...]
+#
+# Initially written by Jim Jagielski for the Apache configuration mechanism
+# (with kudos to Kernighan/Pike)
+#
+# This script falls under the Apache License.
+# See http://www.apache.org/docs/LICENSE
+
+##
+# Some "constants"
+##
+pathname=$PATH
+echo="yes"
+
+##
+# Find out what OS we are running for later on
+##
+os=`(uname) 2>/dev/null`
+
+##
+# Parse command line
+##
+for args in $*
+do
+ case $args in
+ -s ) echo="no" ;;
+ -p* ) pathname="`echo $args | sed 's/^..//'`" ;;
+ * ) programs="$programs $args" ;;
+ esac
+done
+
+##
+# Now we make the adjustments required for OS/2 and everyone
+# else :)
+#
+# First of all, all OS/2 programs have the '.exe' extension.
+# Next, we adjust PATH (or what was given to us as PATH) to
+# be whitespace seperated directories.
+# Finally, we try to determine the best flag to use for
+# test/[] to look for an executable file. OS/2 just has '-r'
+# but with other OSs, we do some funny stuff to check to see
+# if test/[] knows about -x, which is the prefered flag.
+##
+
+if [ "x$os" = "xOS/2" ]
+then
+ ext=".exe"
+ pathname=`echo -E $pathname |
+ sed 's/^;/.;/
+ s/;;/;.;/g
+ s/;$/;./
+ s/;/ /g
+ s/\\\\/\\//g' `
+ test_exec_flag="-r"
+else
+ ext="" # No default extensions
+ pathname=`echo $pathname |
+ sed 's/^:/.:/
+ s/::/:.:/g
+ s/:$/:./
+ s/:/ /g' `
+ # Here is how we test to see if test/[] can handle -x
+ testfile="pp.t.$$"
+
+ cat > $testfile <<ENDTEST
+#!/bin/sh
+if [ -x / ] || [ -x /bin ] || [ -x /bin/ls ]; then
+ exit 0
+fi
+exit 1
+ENDTEST
+
+ if `/bin/sh $testfile 2>/dev/null`; then
+ test_exec_flag="-x"
+ else
+ test_exec_flag="-r"
+ fi
+ rm -f $testfile
+fi
+
+for program in $programs
+do
+ for path in $pathname
+ do
+ if [ $test_exec_flag $path/${program}${ext} ] && \
+ [ ! -d $path/${program}${ext} ]; then
+ if [ "x$echo" = "xyes" ]; then
+ echo $path/${program}${ext}
+ fi
+ exit 0
+ fi
+
+# Next try without extension (if one was used above)
+ if [ "x$ext" != "x" ]; then
+ if [ $test_exec_flag $path/${program} ] && \
+ [ ! -d $path/${program} ]; then
+ if [ "x$echo" = "xyes" ]; then
+ echo $path/${program}
+ fi
+ exit 0
+ fi
+ fi
+ done
+done
+exit 1
+
diff --git a/build/binbuild.sh b/build/binbuild.sh
index 2e1b669..275f51a 100755
--- a/build/binbuild.sh
+++ b/build/binbuild.sh
@@ -6,17 +6,25 @@
# This script falls under the Apache License.
# See http://www.apache.org/docs/LICENSE
-OS=`./srclib/apr/build/config.guess`
-BUILD_DIR="`pwd`/bindist"
-DEFAULT_DIR="/usr/local/apache2"
-APDIR=`pwd`
-APDIR=`basename $APDIR`
+OS=`./build/config.guess`
+PRINTPATH="build/PrintPath"
APFULLDIR=`pwd`
+BUILD_DIR="$APFULLDIR/bindist"
+DEFAULT_DIR="/usr/local/apache2"
+APDIR="$APFULLDIR"
+APDIR=`basename $APDIR`
CONFIGPARAM="--enable-layout=Apache --prefix=$BUILD_DIR --enable-mods-shared=most --with-expat=$APFULLDIR/srclib/apr-util/xml/expat --enable-static-support"
-VER=`echo $APDIR |sed s/httpd-//`
-TAR="`srclib/apr/build/PrintPath tar`"
-GTAR="`srclib/apr/build/PrintPath gtar`"
-GZIP="`srclib/apr/build/PrintPath gzip`"
+VER=`echo $APDIR | sed s/httpd-//`
+TAR="`$PRINTPATH tar`"
+GZIP="`$PRINTPATH gzip`"
+COMPRESS="`$PRINTPATH compress`"
+MD5="`$PRINTPATH md5`"
+if [ x$MD5 = x ]; then
+ OPENSSL="`$PRINTPATH openssl`"
+ if [ x$OPENSSL != x ]; then
+ MD5="$OPENSSL md5"
+ fi
+fi
if [ x$1 != x ]; then
USER=$1
@@ -24,8 +32,7 @@
USER="`build/buildinfo.sh -n %u@%h%d`"
fi
-if [ ! -f ./ABOUT_APACHE ]
-then
+if [ ! -f ./ABOUT_APACHE ]; then
echo "ERROR: The current directory contains no valid Apache distribution."
echo "Please change the directory to the top level directory of a freshly"
echo "unpacked Apache 2.0 source distribution and re-execute the script"
@@ -33,8 +40,7 @@
exit 1;
fi
-if [ -d ./CVS ]
-then
+if [ -d ./CVS ]; then
echo "ERROR: The current directory is a CVS checkout of Apache."
echo "Only a standard Apache 2.0 source distribution should be used to"
echo "create a binary distribution."
@@ -60,8 +66,7 @@
echo "[EOF]" \
) 2>&1 | tee build.log
-if [ ! -f ./bindist/bin/httpd ]
-then
+if [ ! -f ./bindist/bin/httpd ]; then
echo "ERROR: Failed to build Apache. See \"build.log\" for details."
exit 1;
fi
@@ -144,41 +149,45 @@
echo "Creating distribution archive and readme file..."
-if [ ".`grep -i error build.log > /dev/null`" != . ]
-then
+if [ ".`grep -i error build.log > /dev/null`" != . ]; then
echo "ERROR: Failed to build Apache. See \"build.log\" for details."
exit 1;
else
- if [ "x$GTAR" != "x" ]
- then
- $GTAR -zcf ../httpd-$VER-$OS.tar.gz -C .. httpd-$VER
- else
- if [ "x$TAR" != "x" ]
- then
- case "x$OS" in
- x*os390*) $TAR -cfU ../httpd-$VER-$OS.tar -C .. httpd-$VER;;
- *) (cd .. && $TAR -cf httpd-$VER-$OS.tar httpd-$VER);;
- esac
- if [ "x$GZIP" != "x" ]
- then
- $GZIP ../httpd-$VER-$OS.tar
- fi
+ if [ "x$TAR" != "x" ]; then
+ case "x$OS" in
+ x*os390*) $TAR -cfU ../httpd-$VER-$OS.tar -C .. httpd-$VER;;
+ *) (cd .. && $TAR -cf httpd-$VER-$OS.tar httpd-$VER);;
+ esac
+ if [ "x$GZIP" != "x" ]; then
+ $GZIP -9 ../httpd-$VER-$OS.tar
+ ARCHIVE=../httpd-$VER-$OS.tar.gz
+ elif [ "x$COMPRESS" != "x" ]; then
+ $COMPRESS ../httpd-$VER-$OS.tar
+ ARCHIVE=../httpd-$VER-$OS.tar.Z
else
- echo "ERROR: Could not find a 'tar' program!"
- echo " Please execute the following commands manually:"
- echo " tar -cf ../httpd-$VER-$OS.tar ."
- echo " gzip ../httpd-$VER-$OS.tar"
+ echo "WARNING: Could not find a 'gzip' program!"
+ echo " tar archive is not compressed."
+ ARCHIVE=../httpd-$VER-$OS.tar
fi
+ else
+ echo "ERROR: Could not find a 'tar' program!"
+ echo " Please execute the following commands manually:"
+ echo " tar -cf ../httpd-$VER-$OS.tar ."
+ echo " gzip -9 ../httpd-$VER-$OS.tar"
fi
- if [ -f ../httpd-$VER-$OS.tar.gz ] && [ -f ../httpd-$VER-$OS.README ]
- then
+ if [ "x$MD5" != "x" ]; then
+ $MD5 $ARCHIVE > $ARCHIVE.md5
+ fi
+
+ if [ -f $ARCHIVE ] && [ -f ../httpd-$VER-$OS.README ]; then
echo "Ready."
- echo "You can find the binary archive (httpd-$VER-$OS.tar.gz)"
+ echo "You can find the binary archive ($ARCHIVE)"
echo "and the readme file (httpd-$VER-$OS.README) in the"
echo "parent directory."
exit 0;
else
+ echo "ERROR: Archive or README is missing."
exit 1;
fi
fi
diff --git a/build/config.guess b/build/config.guess
new file mode 100755
index 0000000..6cfac28
--- /dev/null
+++ b/build/config.guess
@@ -0,0 +1,1344 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002 Free Software Foundation, Inc.
+
+timestamp='2002-03-20'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+#####################################################################
+# This file contains changes for Apache, clearly marked below.
+# These changes are hereby donated to the public domain.
+#####################################################################
+
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub. If it succeeds, it prints the system name on stdout, and
+# exits with 0. Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help" >&2
+ exit 1 ;;
+ * )
+ break ;;
+ esac
+done
+
+if test $# != 0; then
+ echo "$me: too many arguments$help" >&2
+ exit 1
+fi
+
+
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int dummy(){}" > $dummy.c ;
+ for c in cc gcc c89 c99 ; do
+ ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+ if test $? = 0 ; then
+ CC_FOR_BUILD="$c"; break ;
+ fi ;
+ done ;
+ rm -f $dummy.c $dummy.o $dummy.rel ;
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found ;
+ fi
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+esac'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+ # compatibility and a consistent mechanism for selecting the
+ # object file format.
+ #
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+ sysctl="sysctl -n hw.machine_arch"
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ case "${UNAME_MACHINE_ARCH}" in
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+ # to ELF recently, or will in the future.
+ case "${UNAME_MACHINE_ARCH}" in
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep __ELF__ >/dev/null
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+ os=netbsd
+ else
+ os=netbsdelf
+ fi
+ ;;
+ *)
+ os=netbsd
+ ;;
+ esac
+ # The OS release
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ arc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ pmax:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ wgrisc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ alpha:OSF1:*:*)
+ if test $UNAME_RELEASE = "V4.0"; then
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ fi
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ cat <<EOF >$dummy.s
+ .data
+\$Lformat:
+ .byte 37,100,45,37,120,10,0 # "%d-%x\n"
+
+ .text
+ .globl main
+ .align 4
+ .ent main
+main:
+ .frame \$30,16,\$26,0
+ ldgp \$29,0(\$27)
+ .prologue 1
+ .long 0x47e03d80 # implver \$0
+ lda \$2,-1
+ .long 0x47e20c21 # amask \$2,\$1
+ lda \$16,\$Lformat
+ mov \$0,\$17
+ not \$1,\$18
+ jsr \$26,printf
+ ldgp \$29,0(\$26)
+ mov 0,\$16
+ jsr \$26,exit
+ .end main
+EOF
+ eval $set_cc_for_build
+ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ case `./$dummy` in
+ 0-0)
+ UNAME_MACHINE="alpha"
+ ;;
+ 1-0)
+ UNAME_MACHINE="alphaev5"
+ ;;
+ 1-1)
+ UNAME_MACHINE="alphaev56"
+ ;;
+ 1-101)
+ UNAME_MACHINE="alphapca56"
+ ;;
+ 2-303)
+ UNAME_MACHINE="alphaev6"
+ ;;
+ 2-307)
+ UNAME_MACHINE="alphaev67"
+ ;;
+ 2-1307)
+ UNAME_MACHINE="alphaev68"
+ ;;
+ esac
+ fi
+ rm -f $dummy.s $dummy
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit 0 ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+ exit 0 ;;
+ 21064:Windows_NT:50:3)
+ echo alpha-dec-winnt3.5
+ exit 0 ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ echo m68k-unknown-sysv4
+ exit 0;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-amigaos
+ exit 0 ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphos
+ exit 0 ;;
+#########################
+# Apache changes
+#
+# *:OS/390:*:*)
+# echo i370-ibm-openedition
+# exit 0 ;;
+ *:OS390:*:* | *:OS/390:*:*)
+ echo s390-ibm-os390
+ exit 0 ;;
+ *:OS400:*:* | *:OS/400:*:*)
+ echo as400-ibm-os400
+ exit 0 ;;
+ *:OS/2:*:*)
+ echo "i386-pc-os2_emx"
+ exit 0;;
+#
+# end Apache changes
+#########################
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit 0 ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit 0;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ echo hppa1.1-hitachi-hiuxmpp
+ exit 0;;
+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ echo pyramid-pyramid-sysv3
+ else
+ echo pyramid-pyramid-bsd
+ fi
+ exit 0 ;;
+ NILE*:*:*:dcosx)
+ echo pyramid-pyramid-svr4
+ exit 0 ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ i86pc:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:*:*)
+ case "`/usr/bin/arch -k`" in
+ Series*|S4*)
+ UNAME_RELEASE=`uname -v`
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ exit 0 ;;
+ sun3*:SunOS:*:*)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ sun*:*:4.2BSD:*)
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ case "`/bin/arch`" in
+ sun3)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ ;;
+ sun4)
+ echo sparc-sun-sunos${UNAME_RELEASE}
+ ;;
+ esac
+ exit 0 ;;
+ aushp:SunOS:*:*)
+ echo sparc-auspex-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ # The situation for MiNT is a little confusing. The machine name
+ # can be virtually everything (everything which is not
+ # "atarist" or "atariste" at least should have a processor
+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
+ # to the lowercase version "mint" (or "freemint"). Finally
+ # the system name "TOS" denotes a system which is actually not
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit 0 ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit 0 ;;
+ powerpc:machten:*:*)
+ echo powerpc-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
+ RISC*:Mach:*:*)
+ echo mips-dec-mach_bsd4.3
+ exit 0 ;;
+ RISC*:ULTRIX:*:*)
+ echo mips-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ VAX*:ULTRIX*:*:*)
+ echo vax-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ 2020:CLIX:*:* | 2430:CLIX:*:*)
+ echo clipper-intergraph-clix${UNAME_RELEASE}
+ exit 0 ;;
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+ #if defined (host_mips) && defined (MIPSEB)
+ #if defined (SYSTYPE_SYSV)
+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_SVR4)
+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ #endif
+ #endif
+ exit (-1);
+ }
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy \
+ && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo mips-mips-riscos${UNAME_RELEASE}
+ exit 0 ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
+ exit 0 ;;
+ Night_Hawk:Power_UNIX:*:*)
+ echo powerpc-harris-powerunix
+ exit 0 ;;
+ m88k:CX/UX:7*:*)
+ echo m88k-harris-cxux7
+ exit 0 ;;
+ m88k:*:4*:R4*)
+ echo m88k-motorola-sysv4
+ exit 0 ;;
+ m88k:*:3*:R3*)
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ [ ${TARGET_BINARY_INTERFACE}x = x ]
+ then
+ echo m88k-dg-dgux${UNAME_RELEASE}
+ else
+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit 0 ;;
+ M88*:*:R3*:*)
+ # Delta 88k system running SVR3
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ echo m88k-tektronix-sysv3
+ exit 0 ;;
+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ echo m68k-tektronix-bsd
+ exit 0 ;;
+ *:IRIX*:*:*)
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ exit 0 ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i*86:AIX:*:*)
+ echo i386-ibm-aix
+ exit 0 ;;
+ ia64:AIX:*:*)
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ exit 0 ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <sys/systemcfg.h>
+
+ main()
+ {
+ if (!__power_pc())
+ exit(1);
+ puts("powerpc-ibm-aix3.2.5");
+ exit(0);
+ }
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo rs6000-ibm-aix3.2.5
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+ exit 0 ;;
+ *:AIX:*:[45])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit 0 ;;
+ *:AIX:*:*)
+ echo rs6000-ibm-aix
+ exit 0 ;;
+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ echo romp-ibm-bsd4.4
+ exit 0 ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ exit 0 ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ echo rs6000-bull-bosx
+ exit 0 ;;
+ DPX/2?00:B.O.S.:*:*)
+ echo m68k-bull-sysv3
+ exit 0 ;;
+ 9000/[34]??:4.3bsd:1.*:*)
+ echo m68k-hp-bsd
+ exit 0 ;;
+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ echo m68k-hp-bsd4.4
+ exit 0 ;;
+ 9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ case "${UNAME_MACHINE}" in
+ 9000/31? ) HP_ARCH=m68000 ;;
+ 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+ esac ;;
+ esac
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
+
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
+
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
+EOF
+ (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+ if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+ rm -f $dummy.c $dummy
+ fi ;;
+ esac
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ exit 0 ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
+ exit 0 ;;
+ 3050*:HI-UX:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <unistd.h>
+ int
+ main ()
+ {
+ long cpu = sysconf (_SC_CPU_VERSION);
+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
+ results, however. */
+ if (CPU_IS_PA_RISC (cpu))
+ {
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ default: puts ("hppa-hitachi-hiuxwe2"); break;
+ }
+ }
+ else if (CPU_IS_HP_MC68K (cpu))
+ puts ("m68k-hitachi-hiuxwe2");
+ else puts ("unknown-hitachi-hiuxwe2");
+ exit (0);
+ }
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo unknown-hitachi-hiuxwe2
+ exit 0 ;;
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ echo hppa1.1-hp-bsd
+ exit 0 ;;
+ 9000/8??:4.3bsd:*:*)
+ echo hppa1.0-hp-bsd
+ exit 0 ;;
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+ exit 0 ;;
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ echo hppa1.1-hp-osf
+ exit 0 ;;
+ hp8??:OSF1:*:*)
+ echo hppa1.0-hp-osf
+ exit 0 ;;
+ i*86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+ exit 0 ;;
+ parisc*:Lites*:*:*)
+ echo hppa1.1-hp-lites
+ exit 0 ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*[A-Z]90:*:*:*)
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*TS:*:*:*)
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*T3D:*:*:*)
+ echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*T3E:*:*:*)
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*SV1:*:*:*)
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit 0 ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ sparc*:BSD/OS:*:*)
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:FreeBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit 0 ;;
+ i*:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit 0 ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit 0 ;;
+ x86:Interix*:3*)
+ echo i386-pc-interix3
+ exit 0 ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ # UNAME_MACHINE based on the output of uname instead of i386?
+ echo i386-pc-interix
+ exit 0 ;;
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit 0 ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit 0 ;;
+ prep*:SunOS:5.*:*)
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ *:GNU:*:*)
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit 0 ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit 0 ;;
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ mips:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips
+ #undef mipsel
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mipsel
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ rm -f $dummy.c
+ test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+ ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
+ exit 0 ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit 0 ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit 0 ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit 0 ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit 0 ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit 0 ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+ exit 0 ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+ # problems with other programs or directories called `ld' in the path.
+ # Set LC_ALL=C to ensure ld outputs messages in English.
+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+ | sed -ne '/supported targets:/!d
+ s/[ ][ ]*/ /g
+ s/.*supported targets: *//
+ s/ .*//
+ p'`
+ case "$ld_supported_targets" in
+ elf32-i386)
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ ;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit 0 ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit 0 ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ exit 0 ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <features.h>
+ #ifdef __ELF__
+ # ifdef __GLIBC__
+ # if __GLIBC__ >= 2
+ LIBC=gnu
+ # else
+ LIBC=gnulibc1
+ # endif
+ # else
+ LIBC=gnulibc1
+ # endif
+ #else
+ #ifdef __INTEL_COMPILER
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ rm -f $dummy.c
+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
+ echo i386-sequent-sysv4
+ exit 0 ;;
+ i*86:UNIX_SV:4.2MP:2.*)
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ exit 0 ;;
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ fi
+ exit 0 ;;
+ i*86:*:5:[78]*)
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ exit 0 ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+ && UNAME_MACHINE=i686
+ (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+ && UNAME_MACHINE=i686
+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ else
+ echo ${UNAME_MACHINE}-pc-sysv32
+ fi
+ exit 0 ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit 0 ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i386.
+ echo i386-pc-msdosdjgpp
+ exit 0 ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+ exit 0 ;;
+ paragon:*:*:*)
+ echo i860-intel-osf1
+ exit 0 ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+ exit 0 ;;
+ mini*:CTIX:SYS*5:*)
+ # "miniframe"
+ echo m68010-convergent-sysv
+ exit 0 ;;
+ M68*:*:R3V[567]*:*)
+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4 && exit 0 ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+ exit 0 ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ TSUNAMI:LynxOS:2.*:*)
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ SM[BE]S:UNIX_SV:*:*)
+ echo mips-dde-sysv${UNAME_RELEASE}
+ exit 0 ;;
+ RM*:ReliantUNIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
+ RM*:SINIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ echo ${UNAME_MACHINE}-sni-sysv4
+ else
+ echo ns32k-sni-sysv
+ fi
+ exit 0 ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit 0 ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes@openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+ echo hppa1.1-stratus-sysv4
+ exit 0 ;;
+ *:*:*:FTX*)
+ # From seanf@swdc.stratus.com.
+ echo i860-stratus-sysv4
+ exit 0 ;;
+ *:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ echo hppa1.1-stratus-vos
+ exit 0 ;;
+ mc68*:A/UX:*:*)
+ echo m68k-apple-aux${UNAME_RELEASE}
+ exit 0 ;;
+ news*:NEWS-OS:6*:*)
+ echo mips-sony-newsos6
+ exit 0 ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit 0 ;;
+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+ echo powerpc-apple-beos
+ exit 0 ;;
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit 0 ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ SX-5:SUPER-UX:*:*)
+ echo sx5-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Rhapsody:*:*)
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Darwin:*:*)
+ echo `uname -p`-apple-darwin${UNAME_RELEASE}
+ exit 0 ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
+ UNAME_PROCESSOR=i386
+ UNAME_MACHINE=pc
+ fi
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ exit 0 ;;
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit 0 ;;
+ NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
+ *:NonStop-UX:*:*)
+ echo mips-compaq-nonstopux
+ exit 0 ;;
+ BS2000:POSIX*:*:*)
+ echo bs2000-siemens-sysv
+ exit 0 ;;
+ DS/*:UNIX_System_V:*:*)
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ exit 0 ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+ # operating systems.
+ if test "$cputype" = "386"; then
+ UNAME_MACHINE=i386
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+ echo ${UNAME_MACHINE}-unknown-plan9
+ exit 0 ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit 0 ;;
+ *:TOPS-10:*:*)
+ echo pdp10-unknown-tops10
+ exit 0 ;;
+ *:TENEX:*:*)
+ echo pdp10-unknown-tenex
+ exit 0 ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+ exit 0 ;;
+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ echo pdp10-xkl-tops20
+ exit 0 ;;
+ *:TOPS-20:*:*)
+ echo pdp10-unknown-tops20
+ exit 0 ;;
+ *:ITS:*:*)
+ echo pdp10-unknown-its
+ exit 0 ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+ I don't know.... */
+ printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+ "4"
+#else
+ ""
+#endif
+ ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+ printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+ printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+ int version;
+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+ if (version < 4)
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+ else
+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+ exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+ printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+ printf ("ns32k-encore-mach\n"); exit (0);
+#else
+ printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+ printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+ printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+ printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+ struct utsname un;
+
+ uname(&un);
+
+ if (strncmp(un.version, "V2", 2) == 0) {
+ printf ("i386-sequent-ptx2\n"); exit (0);
+ }
+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ printf ("i386-sequent-ptx1\n"); exit (0);
+ }
+ printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+# include <sys/param.h>
+# if defined (BSD)
+# if BSD == 43
+ printf ("vax-dec-bsd4.3\n"); exit (0);
+# else
+# if BSD == 199006
+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# endif
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# else
+ printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+ printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+ exit (1);
+}
+EOF
+
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+ case `getsysinfo -f cpu_type` in
+ c1*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ c2*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ c34*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ c38*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ c4*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+ ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo = `(hostinfo) 2>/dev/null`
+/bin/universe = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/build/config.sub b/build/config.sub
new file mode 100755
index 0000000..043d45b
--- /dev/null
+++ b/build/config.sub
@@ -0,0 +1,1507 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002 Free Software Foundation, Inc.
+
+timestamp='2002-03-07'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine. It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+#####################################################################
+# This file contains changes for Apache, clearly marked below.
+# These changes are hereby donated to the public domain.
+#####################################################################
+
+# Please send patches to <config-patches@gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support. The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+ $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help"
+ exit 1 ;;
+
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+ exit 0;;
+
+ * )
+ break ;;
+ esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+ exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+ exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+ nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
+########################
+# changes for Apache
+#
+ tpf | os390 | vmcms)
+ os=-$maybe_os
+ basic_machine=s390;
+ ;;
+ os400)
+ os=-$maybe_os
+ basic_machine=as400;
+ ;;
+ mvs)
+ os=-mvs
+ basic_machine=i370;
+ ;;
+#
+# end Apache changes
+########################
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+ then os=`echo $1 | sed 's/.*-/-/'`
+ else os=; fi
+ ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work. We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+ -sun*os*)
+ # Prevent following clause from handling this invalid input.
+ ;;
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ -apple | -axis)
+ os=
+ basic_machine=$1
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+ ;;
+ -scout)
+ ;;
+ -wrs)
+ os=-vxworks
+ basic_machine=$1
+ ;;
+ -chorusos*)
+ os=-chorusos
+ basic_machine=$1
+ ;;
+ -chorusrdb)
+ os=-chorusrdb
+ basic_machine=$1
+ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+ -sco5)
+ os=-sco3.2v5
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco4)
+ os=-sco3.2v4
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco*)
+ os=-sco3.2v2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -udk*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -isc)
+ os=-isc2.2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -clix*)
+ basic_machine=clipper-intergraph
+ ;;
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+ -ptx*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ ;;
+ -windowsnt*)
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ ;;
+ -psos*)
+ os=-psos
+ ;;
+ -mint | -mint[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+ # Recognize the basic CPU types without company name.
+ # Some are omitted here because they have special meanings below.
+ 1750a | 580 \
+ | a29k \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | c4x | clipper \
+ | d10v | d30v | dsp16xx \
+ | fr30 \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | m32r | m68000 | m68k | m88k | mcore \
+ | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+ | mips64vr4100 | mips64vr4100el | mips64vr4300 \
+ | mips64vr4300el | mips64vr5000 | mips64vr5000el \
+ | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+ | mipsisa32 | mipsisa64 \
+ | mn10200 | mn10300 \
+ | ns16k | ns32k \
+ | openrisc | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+ | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ | strongarm \
+ | tahoe | thumb | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xscale | xstormy16 | xtensa \
+ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ ;;
+
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i*86 | x86_64)
+ basic_machine=$basic_machine-pc
+ ;;
+ # Object if more than one company name word.
+ *-*-*)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+ # Recognize the basic CPU types with company name.
+ 580-* \
+ | a29k-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armv*-* \
+ | avr-* \
+ | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c54x-* \
+ | clipper-* | cydra-* \
+ | d10v-* | d30v-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fr30-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | m32r-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | mcore-* \
+ | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+ | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+ | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+ | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+ | xtensa-* \
+ | ymp-* \
+ | z8k-*)
+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+ basic_machine=i386-unknown
+ os=-bsd
+ ;;
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ basic_machine=m68000-att
+ ;;
+ 3b*)
+ basic_machine=we32k-att
+ ;;
+ a29khif)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ os=-scout
+ ;;
+ alliant | fx80)
+ basic_machine=fx80-alliant
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ os=-bsd
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
+ ;;
+ amiga | amiga-*)
+ basic_machine=m68k-unknown
+ ;;
+ amigaos | amigados)
+ basic_machine=m68k-unknown
+ os=-amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-unknown
+ os=-sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ os=-sysv
+ ;;
+ apollo68bsd)
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=-bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=-bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=-bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=-bsd
+ ;;
+ cray | j90)
+ basic_machine=j90-cray
+ os=-unicos
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
+ da30 | da30-*)
+ basic_machine=m68k-da30
+ ;;
+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ ;;
+ decsystem10* | dec10*)
+ basic_machine=pdp10-dec
+ os=-tops10
+ ;;
+ decsystem20* | dec20*)
+ basic_machine=pdp10-dec
+ os=-tops20
+ ;;
+ delta | 3300 | motorola-3300 | motorola-delta \
+ | 3300-motorola | delta-motorola)
+ basic_machine=m68k-motorola
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+ ;;
+ dpx2* | dpx2*-bull)
+ basic_machine=m68k-bull
+ os=-sysv3
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ os=-ebmon
+ ;;
+ elxsi)
+ basic_machine=elxsi-elxsi
+ os=-bsd
+ ;;
+ encore | umax | mmax)
+ basic_machine=ns32k-encore
+ ;;
+ es1800 | OSE68k | ose68k | ose | OSE)
+ basic_machine=m68k-ericsson
+ os=-ose
+ ;;
+ fx2800)
+ basic_machine=i860-alliant
+ ;;
+ genix)
+ basic_machine=ns32k-ns
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ os=-sysv
+ ;;
+ go32)
+ basic_machine=i386-pc
+ os=-go32
+ ;;
+ h3050r* | hiux*)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ os=-hms
+ ;;
+ h8300xray)
+ basic_machine=h8300-hitachi
+ os=-xray
+ ;;
+ h8500hms)
+ basic_machine=h8500-hitachi
+ os=-hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ os=-sysv3
+ ;;
+ hp300-*)
+ basic_machine=m68k-hp
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ os=-bsd
+ ;;
+ hp300hpux)
+ basic_machine=m68k-hp
+ os=-hpux
+ ;;
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k2[0-9][0-9] | hp9k31[0-9])
+ basic_machine=m68000-hp
+ ;;
+ hp9k3[2-9][0-9])
+ basic_machine=m68k-hp
+ ;;
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k78[0-9] | hp78[0-9])
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][13679] | hp8[0-9][13679])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hppa-next)
+ os=-nextstep3
+ ;;
+ hppaosf)
+ basic_machine=hppa1.1-hp
+ os=-osf
+ ;;
+ hppro)
+ basic_machine=hppa1.1-hp
+ os=-proelf
+ ;;
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+ ;;
+ i*86v4*)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv4
+ ;;
+ i*86v)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv
+ ;;
+ i*86sol2)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-solaris2
+ ;;
+ i386mach)
+ basic_machine=i386-mach
+ os=-mach
+ ;;
+ i386-vsta | vsta)
+ basic_machine=i386-unknown
+ os=-vsta
+ ;;
+ iris | iris4d)
+ basic_machine=mips-sgi
+ case $os in
+ -irix*)
+ ;;
+ *)
+ os=-irix4
+ ;;
+ esac
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ os=-sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+ mips3*-*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ ;;
+ mips3*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ ;;
+ mmix*)
+ basic_machine=mmix-knuth
+ os=-mmixware
+ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
+ msdos)
+ basic_machine=i386-pc
+ os=-msdos
+ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+ ;;
+ netbsd386)
+ basic_machine=i386-unknown
+ os=-netbsd
+ ;;
+ netwinder)
+ basic_machine=armv4l-rebel
+ os=-linux
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ os=-newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ os=-newsos
+ ;;
+ news-3600 | risc-news)
+ basic_machine=mips-sony
+ os=-newsos
+ ;;
+ necv70)
+ basic_machine=v70-nec
+ os=-sysv
+ ;;
+ next | m*-next )
+ basic_machine=m68k-next
+ case $os in
+ -nextstep* )
+ ;;
+ -ns2*)
+ os=-nextstep2
+ ;;
+ *)
+ os=-nextstep3
+ ;;
+ esac
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ os=-cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ os=-cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ os=-nindy
+ ;;
+ mon960)
+ basic_machine=i960-intel
+ os=-mon960
+ ;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=-nonstopux
+ ;;
+ np1)
+ basic_machine=np1-gould
+ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+ op50n-* | op60c-*)
+ basic_machine=hppa1.1-oki
+ os=-proelf
+ ;;
+ or32 | or32-*)
+ basic_machine=or32-unknown
+ os=-coff
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+ os=-ose
+ ;;
+ os68k)
+ basic_machine=m68k-none
+ os=-os68k
+ ;;
+ pa-hitachi)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ os=-osf
+ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+ pbb)
+ basic_machine=m68k-tti
+ ;;
+ pc532 | pc532-*)
+ basic_machine=ns32k-pc532
+ ;;
+ pentium | p5 | k5 | k6 | nexgen | viac3)
+ basic_machine=i586-pc
+ ;;
+ pentiumpro | p6 | 6x86 | athlon)
+ basic_machine=i686-pc
+ ;;
+ pentiumii | pentium2)
+ basic_machine=i686-pc
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumii-* | pentium2-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pn)
+ basic_machine=pn-gould
+ ;;
+ power) basic_machine=power-ibm
+ ;;
+ ppc) basic_machine=powerpc-unknown
+ ;;
+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+ ;;
+ ppcle-* | powerpclittle-*)
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64) basic_machine=powerpc64-unknown
+ ;;
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ basic_machine=powerpc64le-unknown
+ ;;
+ ppc64le-* | powerpc64little-*)
+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ps2)
+ basic_machine=i386-ibm
+ ;;
+ pw32)
+ basic_machine=i586-unknown
+ os=-pw32
+ ;;
+ rom68k)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ rm[46]00)
+ basic_machine=mips-siemens
+ ;;
+ rtpc | rtpc-*)
+ basic_machine=romp-ibm
+ ;;
+ s390 | s390-*)
+ basic_machine=s390-ibm
+ ;;
+ s390x | s390x-*)
+ basic_machine=s390x-ibm
+ ;;
+ sa29200)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+########################
+# changes for Apache
+#
+ as400*)
+ basic_machine=as400-ibm
+ ;;
+#
+# end Apache changes
+########################
+ sequent)
+ basic_machine=i386-sequent
+ ;;
+ sh)
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
+ sparclite-wrs | simso-wrs)
+ basic_machine=sparclite-wrs
+ os=-vxworks
+ ;;
+ sps7)
+ basic_machine=m68k-bull
+ os=-sysv2
+ ;;
+ spur)
+ basic_machine=spur-unknown
+ ;;
+ st2000)
+ basic_machine=m68k-tandem
+ ;;
+ stratus)
+ basic_machine=i860-stratus
+ os=-sysv4
+ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+ sun2os3)
+ basic_machine=m68000-sun
+ os=-sunos3
+ ;;
+ sun2os4)
+ basic_machine=m68000-sun
+ os=-sunos4
+ ;;
+ sun3os3)
+ basic_machine=m68k-sun
+ os=-sunos3
+ ;;
+ sun3os4)
+ basic_machine=m68k-sun
+ os=-sunos4
+ ;;
+ sun4os3)
+ basic_machine=sparc-sun
+ os=-sunos3
+ ;;
+ sun4os4)
+ basic_machine=sparc-sun
+ os=-sunos4
+ ;;
+ sun4sol2)
+ basic_machine=sparc-sun
+ os=-solaris2
+ ;;
+ sun3 | sun3-*)
+ basic_machine=m68k-sun
+ ;;
+ sun4)
+ basic_machine=sparc-sun
+ ;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ ;;
+ sv1)
+ basic_machine=sv1-cray
+ os=-unicos
+ ;;
+ symmetry)
+ basic_machine=i386-sequent
+ os=-dynix
+ ;;
+ t3d)
+ basic_machine=alpha-cray
+ os=-unicos
+ ;;
+ t3e)
+ basic_machine=alphaev5-cray
+ os=-unicos
+ ;;
+ t90)
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
+ ;;
+ tx39)
+ basic_machine=mipstx39-unknown
+ ;;
+ tx39el)
+ basic_machine=mipstx39el-unknown
+ ;;
+ toad1)
+ basic_machine=pdp10-xkl
+ os=-tops20
+ ;;
+ tower | tower-32)
+ basic_machine=m68k-ncr
+ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ ultra3)
+ basic_machine=a29k-nyu
+ os=-sym1
+ ;;
+ v810 | necv810)
+ basic_machine=v810-nec
+ os=-none
+ ;;
+ vaxv)
+ basic_machine=vax-dec
+ os=-sysv
+ ;;
+ vms)
+ basic_machine=vax-dec
+ os=-vms
+ ;;
+ vpp*|vx|vx-*)
+ basic_machine=f301-fujitsu
+ ;;
+ vxworks960)
+ basic_machine=i960-wrs
+ os=-vxworks
+ ;;
+ vxworks68)
+ basic_machine=m68k-wrs
+ os=-vxworks
+ ;;
+ vxworks29k)
+ basic_machine=a29k-wrs
+ os=-vxworks
+ ;;
+ w65*)
+ basic_machine=w65-wdc
+ os=-none
+ ;;
+ w89k-*)
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
+ windows32)
+ basic_machine=i386-pc
+ os=-windows32-msvcrt
+ ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+ ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+ ;;
+ z8k-*-coff)
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+ ;;
+
+# Here we handle the default manufacturer of certain CPU types. It is in
+# some cases the only manufacturer, in others, it is the most popular.
+ w89k)
+ basic_machine=hppa1.1-winbond
+ ;;
+ op50n)
+ basic_machine=hppa1.1-oki
+ ;;
+ op60c)
+ basic_machine=hppa1.1-oki
+ ;;
+ romp)
+ basic_machine=romp-ibm
+ ;;
+ rs6000)
+ basic_machine=rs6000-ibm
+ ;;
+ vax)
+ basic_machine=vax-dec
+ ;;
+ pdp10)
+ # there are many clones, so DEC is not a safe bet
+ basic_machine=pdp10-unknown
+ ;;
+ pdp11)
+ basic_machine=pdp11-dec
+ ;;
+ we32k)
+ basic_machine=we32k-att
+ ;;
+ sh3 | sh4 | sh3eb | sh4eb)
+ basic_machine=sh-unknown
+ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+ sparc | sparcv9 | sparcv9b)
+ basic_machine=sparc-sun
+ ;;
+ cydra)
+ basic_machine=cydra-cydrome
+ ;;
+ orion)
+ basic_machine=orion-highlevel
+ ;;
+ orion105)
+ basic_machine=clipper-highlevel
+ ;;
+ mac | mpw | mac-mpw)
+ basic_machine=m68k-apple
+ ;;
+ pmac | pmac-mpw)
+ basic_machine=powerpc-apple
+ ;;
+ c4x*)
+ basic_machine=c4x-none
+ os=-coff
+ ;;
+ *-unknown)
+ # Make sure to match an already-canonicalized machine name.
+ ;;
+ *)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+ *-digital*)
+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ ;;
+ *-commodore*)
+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ ;;
+ *)
+ ;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+ -solaris)
+ os=-solaris2
+ ;;
+ -svr4*)
+ os=-sysv4
+ ;;
+ -unixware*)
+ os=-sysv4.2uw
+ ;;
+ -gnu/linux*)
+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ ;;
+########################
+# changes for Apache
+#
+ -os2_emx | -tpf* | -os390* | -vmcms* | -os400* )
+ ;;
+#
+# end Apache changes
+########################
+ # First accept the basic system types.
+ # The portable systems comes first.
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+ case $basic_machine in
+ x86-* | i*86-*)
+ ;;
+ *)
+ os=-nto$os
+ ;;
+ esac
+ ;;
+ -nto*)
+ os=-nto-qnx
+ ;;
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ ;;
+ -mac*)
+ os=`echo $os | sed -e 's|mac|macos|'`
+ ;;
+ -linux*)
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ ;;
+ -sunos5*)
+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ ;;
+ -sunos6*)
+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ ;;
+ -opened*)
+ os=-openedition
+ ;;
+ -wince*)
+ os=-wince
+ ;;
+ -osfrose*)
+ os=-osfrose
+ ;;
+ -osf*)
+ os=-osf
+ ;;
+ -utek*)
+ os=-bsd
+ ;;
+ -dynix*)
+ os=-bsd
+ ;;
+ -acis*)
+ os=-aos
+ ;;
+ -atheos*)
+ os=-atheos
+ ;;
+ -386bsd)
+ os=-bsd
+ ;;
+ -ctix* | -uts*)
+ os=-sysv
+ ;;
+ -nova*)
+ os=-rtmk-nova
+ ;;
+ -ns2 )
+ os=-nextstep2
+ ;;
+ -nsk*)
+ os=-nsk
+ ;;
+ # Preserve the version number of sinix5.
+ -sinix5.*)
+ os=`echo $os | sed -e 's|sinix|sysv|'`
+ ;;
+ -sinix*)
+ os=-sysv4
+ ;;
+ -triton*)
+ os=-sysv3
+ ;;
+ -oss*)
+ os=-sysv3
+ ;;
+ -svr4)
+ os=-sysv4
+ ;;
+ -svr3)
+ os=-sysv3
+ ;;
+ -sysvr4)
+ os=-sysv4
+ ;;
+ # This must come after -sysvr4.
+ -sysv*)
+ ;;
+ -ose*)
+ os=-ose
+ ;;
+ -es1800*)
+ os=-ose
+ ;;
+ -xenix)
+ os=-xenix
+ ;;
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ os=-mint
+ ;;
+ -none)
+ ;;
+ *)
+ # Get rid of the `-' at the beginning of $os.
+ os=`echo $os | sed 's/[^-]*-//'`
+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system. Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+ *-acorn)
+ os=-riscix1.2
+ ;;
+ arm*-rebel)
+ os=-linux
+ ;;
+ arm*-semi)
+ os=-aout
+ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+ os=-tops20
+ ;;
+ pdp11-*)
+ os=-none
+ ;;
+ *-dec | vax-*)
+ os=-ultrix4.2
+ ;;
+ m68*-apollo)
+ os=-domain
+ ;;
+ i386-sun)
+ os=-sunos4.0.2
+ ;;
+ m68000-sun)
+ os=-sunos3
+ # This also exists in the configure program, but was not the
+ # default.
+ # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+ ;;
+ mips*-cisco)
+ os=-elf
+ ;;
+ mips*-*)
+ os=-elf
+ ;;
+ or32-*)
+ os=-coff
+ ;;
+ *-tti) # must be before sparc entry or we get the wrong os.
+ os=-sysv3
+ ;;
+ sparc-* | *-sun)
+ os=-sunos4.1.1
+ ;;
+ *-be)
+ os=-beos
+ ;;
+########################
+# changes for Apache
+#
+# *-ibm)
+# os=-aix
+# ;;
+#
+ *-ibm)
+ case $basic_machine in
+ s390*)
+ os=-os390;
+ ;;
+ i370*)
+ os=-mvs;
+ ;;
+ as400*)
+ os=-os400;
+ ;;
+ *)
+ os=-aix
+ ;;
+ esac
+ ;;
+#
+# end Apache changes
+########################
+
+ *-wec)
+ os=-proelf
+ ;;
+ *-winbond)
+ os=-proelf
+ ;;
+ *-oki)
+ os=-proelf
+ ;;
+ *-hp)
+ os=-hpux
+ ;;
+ *-hitachi)
+ os=-hiux
+ ;;
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ os=-sysv
+ ;;
+ *-cbm)
+ os=-amigaos
+ ;;
+ *-dg)
+ os=-dgux
+ ;;
+ *-dolphin)
+ os=-sysv3
+ ;;
+ m68k-ccur)
+ os=-rtu
+ ;;
+ m88k-omron*)
+ os=-luna
+ ;;
+ *-next )
+ os=-nextstep
+ ;;
+ *-sequent)
+ os=-ptx
+ ;;
+ *-crds)
+ os=-unos
+ ;;
+ *-ns)
+ os=-genix
+ ;;
+ i370-*)
+ os=-mvs
+ ;;
+ *-next)
+ os=-nextstep3
+ ;;
+ *-gould)
+ os=-sysv
+ ;;
+ *-highlevel)
+ os=-bsd
+ ;;
+ *-encore)
+ os=-bsd
+ ;;
+ *-sgi)
+ os=-irix
+ ;;
+ *-siemens)
+ os=-sysv4
+ ;;
+ *-masscomp)
+ os=-rtu
+ ;;
+ f30[01]-fujitsu | f700-fujitsu)
+ os=-uxpv
+ ;;
+ *-rom68k)
+ os=-coff
+ ;;
+ *-*bug)
+ os=-coff
+ ;;
+ *-apple)
+ os=-macos
+ ;;
+ *-atari*)
+ os=-mint
+ ;;
+ *)
+ os=-none
+ ;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer. We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+ *-unknown)
+ case $os in
+ -riscix*)
+ vendor=acorn
+ ;;
+ -sunos*)
+ vendor=sun
+ ;;
+ -aix*)
+ vendor=ibm
+ ;;
+ -beos*)
+ vendor=be
+ ;;
+ -hpux*)
+ vendor=hp
+ ;;
+ -mpeix*)
+ vendor=hp
+ ;;
+ -hiux*)
+ vendor=hitachi
+ ;;
+ -unos*)
+ vendor=crds
+ ;;
+ -dgux*)
+ vendor=dg
+ ;;
+ -luna*)
+ vendor=omron
+ ;;
+ -genix*)
+ vendor=ns
+ ;;
+ -mvs* | -opened*)
+ vendor=ibm
+ ;;
+ -ptx*)
+ vendor=sequent
+ ;;
+ -vxsim* | -vxworks*)
+ vendor=wrs
+ ;;
+ -aux*)
+ vendor=apple
+ ;;
+ -hms*)
+ vendor=hitachi
+ ;;
+ -mpw* | -macos*)
+ vendor=apple
+ ;;
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ vendor=atari
+ ;;
+ -vos*)
+ vendor=stratus
+ ;;
+ esac
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ ;;
+esac
+
+echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index 73025fc..d776943 100644
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -25,20 +25,14 @@
}
/@@LoadModule@@/ {
- print "#LoadModule auth_basic_module modules/authbasc.nlm"
- print "#LoadModule auth_digest_module modules/authdigt.nlm"
- print "#LoadModule authn_anon_module modules/authnano.nlm"
- print "#LoadModule authn_dbm_module modules/authndbm.nlm"
- print "#LoadModule authn_default_module modules/authndef.nlm"
- print "#LoadModule authn_file_module modules/authnfil.nlm"
- print "#LoadModule authz_dbm_module modules/authzdbm.nlm"
- print "#LoadModule authz_default_module modules/authzdef.nlm"
- print "#LoadModule authz_groupfile_module modules/authzgrp.nlm"
- print "#LoadModule authz_user_module modules/authzusr.nlm"
+ print "#LoadModule auth_anon_module modules/authanon.nlm"
+ print "#LoadModule auth_dbm_module modules/authdbm.nlm"
+ print "#LoadModule auth_digest_module modules/digest.nlm"
print "#LoadModule cern_meta_module modules/cernmeta.nlm"
print "#LoadModule dav_module modules/mod_dav.nlm"
print "#LoadModule dav_fs_module modules/moddavfs.nlm"
print "#LoadModule expires_module modules/expires.nlm"
+ print "#LoadModule ext_filter_module modules/extfiltr.nlm"
print "#LoadModule file_cache_module modules/filecach.nlm"
print "#LoadModule headers_module modules/headers.nlm"
print "#LoadModule info_module modules/info.nlm"
diff --git a/build/nw_export.inc b/build/nw_export.inc
index 77522ee..7d2bce6 100644
--- a/build/nw_export.inc
+++ b/build/nw_export.inc
@@ -47,4 +47,3 @@
#include "util_xml.h"
#include "mod_core.h"
-#include "mod_auth.h"
diff --git a/buildconf b/buildconf
index a16aa60..7e1cc7d 100755
--- a/buildconf
+++ b/buildconf
@@ -117,6 +117,11 @@
exit 1
}
+echo copying build files
+cp srclib/apr/build/config.guess build
+cp srclib/apr/build/config.sub build
+cp srclib/apr/build/PrintPath build
+
echo rebuilding $pcre_configure
(cd srclib/pcre && ${AUTOCONF:-autoconf})
diff --git a/configure.in b/configure.in
index e8e372b..c99085e 100644
--- a/configure.in
+++ b/configure.in
@@ -14,8 +14,6 @@
dnl # Include our own M4 macros along with those for APR and libtool
dnl #
sinclude(srclib/apr/build/apr_common.m4)
-sinclude(srclib/apr/build/apr_network.m4)
-sinclude(srclib/apr/build/apr_threads.m4)
sinclude(srclib/apr/build/find_apr.m4)
sinclude(srclib/apr-util/build/find_apu.m4)
sinclude(acinclude.m4)
@@ -63,7 +61,7 @@
echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
-APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr")
+APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1)
if test "$apr_found" = "no"; then
AC_MSG_ERROR([APR not found. Please read the documentation.])
@@ -82,10 +80,11 @@
APR_ADDTO(INCLUDES, `$apr_config --includes`)
SHLIBPATH_VAR=`$apr_config --shlib-path-var`
APR_BINDIR=`$apr_config --bindir`
+APR_INCLUDEDIR=`$apr_config --includes | sed 's|^.*-I\([[^ ]]*apr[[^ ]]*\).*$|\1|'`
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
-APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util")
+APR_FIND_APU("$srcdir/srclib/apr-util", "./srclib/apr-util", 1)
if test "$apu_found" = "no"; then
AC_MSG_ERROR([APR-util not found. Please read the documentation.])
@@ -101,6 +100,7 @@
APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
APR_ADDTO(INCLUDES, `$apu_config --includes`)
APU_BINDIR=`$apu_config --bindir`
+APU_INCLUDEDIR=`$apu_config --includes | sed 's|^ *-I\([[^ ]]*apr[[^ ]]*\).*$|\1|'`
echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
diff --git a/docs/STATUS b/docs/STATUS
index b3029ea..bd7b8e5 100644
--- a/docs/STATUS
+++ b/docs/STATUS
@@ -1,195 +1,9 @@
Apache HTTP Server 2.0 Documentation Status File.
-Last modified: $Date: 2002/11/21 17:55:51 $
-
-If you are interested in helping accomplish some of the tasks on this
-list or otherwise improving the documentation, please join the
-apache-docs mailing list by mailing to docs-subscribe@httpd.apache.org
+Last modified: $Date: 2003/01/09 20:14:25 $
For more information on how to contribute to the Apache Documentation
-Project, please see http://httpd.apache.org/docs-project/, and
-http://apache-server.com/tutorials/ATdocs-project.html for an excellent
-tutorial on how to get started with making your contribution.
+Project, please see http://httpd.apache.org/docs-project/
- ------------------------------
-
-Things That Need Fixing
-=======================
-
-- XML
- - Rewriting of the remainder of the manual into xml is in
- progress. See the bottom of this file for status info.
- - add ids to non-directive sections of the module docs, so they
- get a chance to be linked in the sidebar
-
-- Windows platform docs are in desperate need of rewrites/updates for 2.0.
- - Bill Rowe and Bill Stoddard are good contacts for tech questions.
-
-- New Auth system
- (Wait on this until the code has stabalized a little)
- - With the new auth system, we have a bunch of directives that are
- duplicated in multiple modules, where one of the modules is obsolete.
- We probably need to mark the old modules as <status>obsolete</status>
- and key on that to omit them from the directive index, etc.
- - Much clean-up and enhancement of docs
- - Independent note on how to upgrade to new auth system
-
-- Figure out what to do about the 2.0 FAQ
- - Copy important stuff from 1.3?
- - Some kind of XML?
- - Something that allows dynamic contributions from users a la
- FAQ-O-Matic? (I don't think any really good software exists
- for this.)
-
-- modules docs
- - mod_suexec: very little documentation
- - mod_proxy: updates for 2.0
- - mod_status: updates for 2.0
- - mod_example: updates for 2.0
-
-- man pages
- - Convert from nroff to our xml format. See list at bottom.
- - Then if someone gets creative, they can try to find an automatic
- way to convert back to nroff.
- - An example: http://cyberelk.net/tim/data/xmlto/db2man/
- This is designed for docbook, but it could be adapted.
- I'm not sure what the license is.
-
-- MPM documentation
- - Non unix/windows MPMs still need to be completed.
- - the perchild directives in threaded/worker need docs
-
-- Individual docs will need some cleanup.
- - misc/custom_errordocs.html needs to be updated to
- essentially describe how the international error
- docs included in 2.0 work
- - misc/perf-tuning.html - needs major rewrite for 2.0
- - misc/tutorials.html - mostly not relevant to 2.0
- - misc/stopping.html
- - misc/rewriteguide.html - needs cleaning in 1.3 and 2.0
- - misc/known_client_problems.html - mostly ancient
- - platform/ebcdic.xml - needs major rework for 2.0
-
-- New build process.
- - install.html has had a first-pass rewrite, it is basically
- accurate, but very incomplete.
-
-- API documentation
- Status: Ben Laurie has written some hooks documentation
-
-- Several features in Apache require write-access to the filesystem.
- Examples: CacheRoot, DavLockDB, ScriptLog
- We should treat the things consistently in the docs, and perhaps
- suggest the use of directory like /usr/local/apache2/var/ that is
- httpd-writable.
-
-- Translations
- There are several efforts underway to translate the documentation
- into other languages. A detailed list of the currently known
- translators (and the corresponding websites) can be found at
-
- http://httpd.apache.org/docs-project/translations.html
-
-
-Documentation improvements
-==========================
-
-* New user docs: Directory Handling (mod_dir/mod_autoindex/etc)
-
-* Enhancements to the DTD/XSL:
- - <glossary> tag that links to the glossary and uses some special
- style in the css.
- - New index: directives by context, including listing which directives
- are available for each AllowOverride setting.
- - Use a tag like <var> in place of <em> for things like the
- <syntax> listing.
- - nd volunteers
- - add letter links to glossary and quickreference,
- perhaps also a term overview (sidebar)
- - cross references between the different languages,
- at least links from non-en docs to the originals.
- - Javascript?
- - post processing (s&r, XML::Parser, ...)?
- - pre processing ([kind of] type maps
- generated from sitemap entries like:
- <page><variant lang="en" href="">title</variant>)?
- - looking for other good ideas ;-)
- - remove <pre> elements. Use <br /> and <indent> elements to get
- same effect.
- - need to add new <parentdocument> element to more docs
-
-* Autogeneration of PDF
- - FOP?
-
-* Windows help file
- - David Shane Holden was working on this
-
-* Improving the "security docs"
- - More content and better organisation.
-
-* General cleaning and improving of module docs
-
-* Making the directive definitions "less terse" (i.e., adding more
- examples and details to the definitions of the directives)
-
- - We'll need to audit these and find out which ones need munging, as
- some of it looks ok. --jsl
-
-* Making site-specific enhancements easier, including a documented
- and robust way for 3P module docco to be added -- and have it
- survive a server docco upgrade
-
- - This could be something a simple and hackish as a manual/extra/
- directory (a la the 1.3 src/modules/extra/ directory) and a
- script in the support directory that scans the files there and
- updates the manual indices. (We do something like that now for
- httpd.conf file with apxs [LoadModule, etc.].)
-
-XML Conversions
-===============
-
-The following files need to be converted to XML as described at
-http://httpd.apache.org/docs-project/docsformat.html
-
-index.html.en # leave in html?
-howto/auth.html.en
-misc/custom_errordocs.html # obsolete?
-misc/descriptors.html # obsolete?
-misc/fin_wait_2.html # obsolete?
-misc/known_client_problems.html # obsolete?
-misc/tutorials.html # obsolete?
-expand.pl # delete after finishing everything
-
-# These will require manual.xsl changes
-faq/footer.html
-faq/header.html
-faq/index.html
-faq/support.html
-
-# Perhaps these should be left in html to allow the developers to
-# play with them
-developer/API.html
-developer/debugging.html
-developer/documenting.html
-developer/filters.html
-developer/footer.html
-developer/header.html
-developer/hooks.html
-developer/index.html
-developer/layeredio.html
-developer/request.html
-developer/thread_safety.html
-developer/modules.html.en
-
-# converting from nroff to xml
-programs/ab.html
-programs/apxs.html
-programs/dbmmanage.html
-programs/footer.html
-programs/header.html
-programs/htdigest.html
-programs/htpasswd.html
-programs/index.html
-programs/logresolve.html
-programs/other.html
-programs/rotatelogs.html
-programs/suexec.html
+This document contains only documentation issues related to 2.0 alone.
+For general documentation issues, or those that relate both to 2.0 and
+to future versions, please see the same file in httpd-2.0 HEAD.
diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 636ea16..768670f 100644
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -334,7 +334,7 @@
#
# Possible values for the Options directive are "None", "All",
# or any combination of:
-# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI Multiviews
+# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
#
# Note that "MultiViews" must be named *explicitly* --- "Options All"
# doesn't give it to you.
diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 2c226af..c8006f3 100644
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -131,20 +131,14 @@
# Example:
# LoadModule foo_module modules/mod_foo.so
#
+LoadModule access_module modules/mod_access.so
LoadModule actions_module modules/mod_actions.so
LoadModule alias_module modules/mod_alias.so
LoadModule asis_module modules/mod_asis.so
-LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule auth_module modules/mod_auth.so
+#LoadModule auth_anon_module modules/mod_auth_anon.so
+#LoadModule auth_dbm_module modules/mod_auth_dbm.so
#LoadModule auth_digest_module modules/mod_auth_digest.so
-#LoadModule authn_anon_module modules/mod_authn_anon.so
-#LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
-LoadModule authn_file_module modules/mod_authn_file.so
-#LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
-LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule authz_user_module modules/mod_authz_user.so
LoadModule autoindex_module modules/mod_autoindex.so
#LoadModule cern_meta_module modules/mod_cern_meta.so
LoadModule cgi_module modules/mod_cgi.so
@@ -261,7 +255,7 @@
#
# Possible values for the Options directive are "None", "All",
# or any combination of:
-# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI Multiviews
+# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
#
# Note that "MultiViews" must be named *explicitly* --- "Options All"
# doesn't give it to you.
diff --git a/docs/error/HTTP_BAD_GATEWAY.html.var b/docs/error/HTTP_BAD_GATEWAY.html.var
index 6148b98e..8536669 100644
--- a/docs/error/HTTP_BAD_GATEWAY.html.var
+++ b/docs/error/HTTP_BAD_GATEWAY.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Fehlerhaftes Gateway!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Fehlerhaftes Gateway!"
+--><!--#include virtual="include/top.html"-->
Der Proxy-Server erhielt eine fehlerhafte Antwort
eines übergeordneten Servers oder Proxies.
@@ -19,8 +19,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Bad Gateway!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Bad Gateway!"
+--><!--#include virtual="include/top.html" -->
The proxy server received an invalid
response from an upstream server.
@@ -36,9 +36,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Bad Gateway!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Bad Gateway!"
+--><!--#include virtual="include/top.html" -->
El servidor fuente recibio información
inválida por parte del servidor destino.
@@ -54,9 +54,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Gateway incorrecte!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Gateway incorrecte!"
+--><!--#include virtual="include/top.html" -->
Le serveur proxy a reçu une réponse
incorrecte de la part d'un serveur supérieur.
@@ -72,9 +72,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Verkeerde Gateway!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Verkeerde Gateway!"
+--><!--#include virtual="include/top.html" -->
De proxy server heeft een ongeldig
antwoord ontvangen van een gecontacteerde server.
@@ -90,9 +90,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Felaktig Gateway!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Felaktig Gateway!"
+--><!--#include virtual="include/top.html" -->
Proxyservern mottog ett felaktigt svar från
en tidigare server.
@@ -108,9 +108,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Gateway errato!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Gateway errato!"
+--><!--#include virtual="include/top.html" -->
Il server proxy ha ricevuto una risposta
non valida dal server precedente.
@@ -126,8 +126,9 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Gateway inválido!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Gateway inválido!"
+--><!--#include virtual="include/top.html" -->
O servidor proxy recebeu uma resposta
inválida do servidor destino.
@@ -139,3 +140,4 @@
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_BAD_REQUEST.html.var b/docs/error/HTTP_BAD_REQUEST.html.var
index 8082370..7cb7646 100644
--- a/docs/error/HTTP_BAD_REQUEST.html.var
+++ b/docs/error/HTTP_BAD_REQUEST.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Fehlerhafte Anfrage!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Fehlerhafte Anfrage!"
+--><!--#include virtual="include/top.html" -->
Ihr Browser (oder Proxy) hat eine ungültige Anfrage
gesendet, die vom Server nicht beantwortet werden kann.
@@ -14,8 +14,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Bad request!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Bad request!"
+--><!--#include virtual="include/top.html" -->
Your browser (or proxy) sent a request that
this server could not understand.
@@ -26,9 +26,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Bad request!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Bad request!"
+--><!--#include virtual="include/top.html" -->
El buscador ha solicitado una operación
que no puede ser procesada por el servidor.
@@ -39,9 +39,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Demande incorrecte!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Demande incorrecte!"
+--><!--#include virtual="include/top.html" -->
Votre navigateur (ou votre proxy) a envoyé
une demande que ce serveur n'a pas comprise.
@@ -52,9 +52,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Slechte vraag!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Slechte vraag!"
+--><!--#include virtual="include/top.html" -->
Uw browser (of proxy) stuurde een vraag die
deze server niet kon begrijpen.
@@ -65,9 +65,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Felaktig förfrågan!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Felaktig förfrågan!"
+--><!--#include virtual="include/top.html" -->
Din webbläsare eller proxy skickade en förfrågan
som denna server inte kunde förstå.
@@ -78,9 +78,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Richiesta incomprensibile!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Richiesta incomprensibile!"
+--><!--#include virtual="include/top.html" -->
Il tuo browser (o il proxy) ha inviato a
questo server una richiesta incomprensibile.
@@ -91,11 +91,13 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Requisição Inválida!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Requisição Inválida!"
+--><!--#include virtual="include/top.html" -->
Seu "browser" (ou o servidor proxy) enviou uma
requisição inválida ao servidor.
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_FORBIDDEN.html.var b/docs/error/HTTP_FORBIDDEN.html.var
index c513438..354c7ec 100644
--- a/docs/error/HTTP_FORBIDDEN.html.var
+++ b/docs/error/HTTP_FORBIDDEN.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Zugriff verweigert!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Zugriff verweigert!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_URL = /\/$/" -->
@@ -25,8 +25,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Access forbidden!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Access forbidden!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_URL = /\/$/" -->
@@ -46,9 +46,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Access forbidden!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Access forbidden!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_URL = /\/$/" -->
@@ -71,9 +71,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Accès interdit!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Accès interdit!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_URL = /\/$/" -->
@@ -95,9 +95,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Toegang verboden!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Toegang verboden!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_URL = /\/$/" -->
@@ -117,9 +117,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Åtkomst förbjuden!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Åtkomst förbjuden!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_URL = /\/$/" -->
@@ -141,9 +141,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Accesso negato!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Accesso negato!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_URL = /\/$/" -->
@@ -163,8 +163,9 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Acesso Proibido!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Acesso Proibido!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_URL = /\/$/" -->
@@ -183,3 +184,4 @@
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_GONE.html.var b/docs/error/HTTP_GONE.html.var
index 4887160..9545d2a 100644
--- a/docs/error/HTTP_GONE.html.var
+++ b/docs/error/HTTP_GONE.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Objekt nicht mehr verfügbar!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Objekt nicht mehr verfügbar!"
+--><!--#include virtual="include/top.html" -->
Der angeforderte URL existiert auf dem Server nicht mehr
und wurde dauerhaft entfernt.
@@ -12,8 +12,8 @@
<!--#if expr="$HTTP_REFERER" -->
Bitte informieren Sie den Autor der
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">verweisenden Seite</a>,
- dass der Link nicht mehr aktuell ist.
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">verweisenden
+ Seite</a>, dass der Link nicht mehr aktuell ist.
<!--#else -->
@@ -28,8 +28,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Resource is no longer available!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Resource is no longer available!"
+--><!--#include virtual="include/top.html" -->
The requested URL is no longer available on this server and there is no
forwarding address.
@@ -37,7 +37,7 @@
<!--#if expr="$HTTP_REFERER" -->
Please inform the author of the
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">referring
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">referring
page</a> that the link is outdated.
<!--#else -->
@@ -53,9 +53,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Resource is no longer available!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Resource is no longer available!"
+--><!--#include virtual="include/top.html" -->
Los recursos solicitados ya no estan disponibles en
este servidor y no existe una dirección alterna.
@@ -63,8 +63,8 @@
<!--#if expr="$HTTP_REFERER" -->
Le solicitamos que comunique al autor de la
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">página
- referida</a> que el URL esta fuera de tiempo.
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER"
+ -->">página referida</a> que el URL esta fuera de tiempo.
<!--#else -->
@@ -79,9 +79,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Cette ressource n'existe plus!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Cette ressource n'existe plus!"
+--><!--#include virtual="include/top.html" -->
L'URL demandée n'est plus accessible sur ce serveur et il
n'y a pas d'adresse de suite.
@@ -89,8 +89,8 @@
<!--#if expr="$HTTP_REFERER" -->
Nous vous prions d'informer l'auteur de
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">la
- page en question</a> que la référence n'est plus actuelle.
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">la
+ page en question</a> que la référence n'est plus actuelle.
<!--#else -->
@@ -105,9 +105,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Dit object is niet langer beschikbaar!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Dit object is niet langer beschikbaar!"
+--><!--#include virtual="include/top.html" -->
De gevraagde URL is niet langer beschikbaar op deze server en er is geen
doorverwijsadres.
@@ -115,7 +115,7 @@
<!--#if expr="$HTTP_REFERER" -->
Gelieve aan de auteur van
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">deze pagina</a>
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">deze pagina</a>
te melden dat deze link niet langer actueel is.
<!--#else -->
@@ -131,9 +131,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Resursen inte längre tillgänglig!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Resursen inte längre tillgänglig!"
+--><!--#include virtual="include/top.html" -->
Den önskade adressen är inte längre tillgänglig hos
denna server och det finns inte någon adress för vidarebefodran.
@@ -141,8 +141,8 @@
<!--#if expr="$HTTP_REFERER" -->
Vänligen informera författaren bakom
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">den aktuella sidan</a>
- att länken är inaktuell.
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">den aktuella
+ sidan</a> att länken är inaktuell.
<!--#else -->
@@ -157,9 +157,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="La risorsa non è più disponibile!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="La risorsa non è più disponibile!"
+--><!--#include virtual="include/top.html" -->
L'URL richiesto non è più disponibile su questo server
e non esistono indirizzi verso i quali sia possibile inoltrare
@@ -168,7 +168,7 @@
<!--#if expr="$HTTP_REFERER" -->
Per favore, informa l'autore della
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">pagina
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">pagina
di provenienza</a> che il link non è più valido.
<!--#else -->
@@ -184,8 +184,9 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Recurso não disponível!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Recurso não disponível!"
+--><!--#include virtual="include/top.html" -->
A URL solicitada não está disponível neste servidor
e não existe um endereço alternativo.
@@ -193,7 +194,7 @@
<!--#if expr="$HTTP_REFERER" -->
Por favor informe o autor da
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">página
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">página
referida</a> que a URL está desatualizada.
<!--#else -->
@@ -206,3 +207,4 @@
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var b/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var
index 83517f4..152945b 100644
--- a/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var
+++ b/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Serverfehler!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Serverfehler!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_ERROR_NOTES" -->
@@ -30,8 +30,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Server error!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Server error!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_ERROR_NOTES" -->
@@ -57,9 +57,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Server error!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Server error!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_ERROR_NOTES" -->
@@ -87,9 +87,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Erreur du serveur!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Erreur du serveur!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_ERROR_NOTES" -->
@@ -116,9 +116,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Server fout!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Server fout!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_ERROR_NOTES" -->
@@ -141,9 +141,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Serverfel!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Serverfel!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_ERROR_NOTES" -->
@@ -169,9 +169,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Errore del server!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Errore del server!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_ERROR_NOTES" -->
@@ -198,8 +198,9 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Erro interno do Servidor!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Erro interno do Servidor!"
+--><!--#include virtual="include/top.html" -->
<!--#if expr="$REDIRECT_ERROR_NOTES" -->
@@ -222,3 +223,4 @@
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_LENGTH_REQUIRED.html.var b/docs/error/HTTP_LENGTH_REQUIRED.html.var
index c8c6f1b..f7f65c0 100644
--- a/docs/error/HTTP_LENGTH_REQUIRED.html.var
+++ b/docs/error/HTTP_LENGTH_REQUIRED.html.var
@@ -1,12 +1,12 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Content-Length-Angabe fehlerhaft!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Content-Length-Angabe fehlerhaft!"
+--><!--#include virtual="include/top.html" -->
Die Anfrage kann nicht beantwortet werden.
- Bei Verwendung der <!--#echo var="REDIRECT_REQUEST_METHOD"-->-Methode
+ Bei Verwendung der <!--#echo var="REDIRECT_REQUEST_METHOD" -->-Methode
muß ein korrekter <code>Content-Length</code>-Header
angegeben werden.
@@ -16,10 +16,10 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Bad Content-Length!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Bad Content-Length!"
+--><!--#include virtual="include/top.html" -->
- A request with the <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ A request with the <!--#echo var="REDIRECT_REQUEST_METHOD" -->
method requires a valid <code>Content-Length</code> header.
<!--#include virtual="include/bottom.html" -->
@@ -28,12 +28,13 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Longueur du contenu illégal!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Longueur du contenu illégal!"
+--><!--#include virtual="include/top.html" -->
- Une requête utilisant la méthode <!--#echo var="REDIRECT_REQUEST_METHOD"-->
- nécessite un header valable <code>Content-Length</code> (indiquant la longueur).
+ Une requête utilisant la méthode <!--#echo
+ var="REDIRECT_REQUEST_METHOD" --> nécessite un header valable
+ <code>Content-Length</code> (indiquant la longueur).
<!--#include virtual="include/bottom.html" -->
----------fr--
@@ -41,11 +42,11 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Ongeldige lengte inhoud!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Ongeldige lengte inhoud!"
+--><!--#include virtual="include/top.html" -->
- Een vraag met het <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ Een vraag met het <!--#echo var="REDIRECT_REQUEST_METHOD" -->
type methode heeft een correcte <code>Content-Length</code> lijn nodig.
<!--#include virtual="include/bottom.html" -->
@@ -54,11 +55,11 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Felaktig Content-Length!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Felaktig Content-Length!"
+--><!--#include virtual="include/top.html" -->
- En förfrågan med <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ En förfrågan med <!--#echo var="REDIRECT_REQUEST_METHOD" -->
metoden kräver ett korrekt <code>Content-Length</code> huvud.
<!--#include virtual="include/bottom.html" -->
@@ -67,13 +68,14 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Campo Content-Length non valido!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Campo Content-Length non valido!"
+--><!--#include virtual="include/top.html" -->
Una richiesta con il metodo
- <!--#echo var="REDIRECT_REQUEST_METHOD"-->
- richiede che venga specificato un header <code>Content-Length</code> valido.
+ <!--#echo var="REDIRECT_REQUEST_METHOD" -->
+ richiede che venga specificato un header <code>Content-Length</code>
+ valido.
<!--#include virtual="include/bottom.html" -->
----------it--
@@ -81,8 +83,9 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Content-Length Inválido!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Content-Length Inválido!"
+--><!--#include virtual="include/top.html" -->
Uma requisição
do método <!--#echo var="REDIRECT_REQUEST_METHOD"-->
@@ -90,3 +93,4 @@
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_METHOD_NOT_ALLOWED.html.var b/docs/error/HTTP_METHOD_NOT_ALLOWED.html.var
index b7b124c..84a327a 100644
--- a/docs/error/HTTP_METHOD_NOT_ALLOWED.html.var
+++ b/docs/error/HTTP_METHOD_NOT_ALLOWED.html.var
@@ -1,11 +1,11 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Methode nicht erlaubt!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Methode nicht erlaubt!"
+--><!--#include virtual="include/top.html" -->
- Die <!--#echo var="REDIRECT_REQUEST_METHOD"-->-Methode
+ Die <!--#echo var="REDIRECT_REQUEST_METHOD" -->-Methode
ist für den angeforderten URL nicht erlaubt.
<!--#include virtual="include/bottom.html" -->
@@ -14,10 +14,10 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Method not allowed!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Method not allowed!"
+--><!--#include virtual="include/top.html" -->
- The <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ The <!--#echo var="REDIRECT_REQUEST_METHOD" -->
method is not allowed for the requested URL.
<!--#include virtual="include/bottom.html" -->
@@ -26,11 +26,11 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Method not allowed!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Method not allowed!"
+--><!--#include virtual="include/top.html" -->
- El <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ El <!--#echo var="REDIRECT_REQUEST_METHOD" -->
método utilizado por su solicitud no esta
permitido por el URL.
@@ -40,11 +40,11 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Méthode interdite!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Méthode interdite!"
+--><!--#include virtual="include/top.html" -->
- La méthode <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ La méthode <!--#echo var="REDIRECT_REQUEST_METHOD" -->
n'est pas utilisable pour l'URL requise.
<!--#include virtual="include/bottom.html" -->
@@ -53,11 +53,11 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Type methode niet toegelaten!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Type methode niet toegelaten!"
+--><!--#include virtual="include/top.html" -->
- Het <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ Het <!--#echo var="REDIRECT_REQUEST_METHOD" -->
type methode is niet toegelaten voor de gevraagde URL.
<!--#include virtual="include/bottom.html" -->
@@ -66,11 +66,11 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Metoden inte tillåten!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Metoden inte tillåten!"
+--><!--#include virtual="include/top.html" -->
- <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ <!--#echo var="REDIRECT_REQUEST_METHOD" -->
metoden är inte tillåten för den förfrågade
adressen.
@@ -80,11 +80,11 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Metodo non consentito!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Metodo non consentito!"
+--><!--#include virtual="include/top.html" -->
- Il metodo <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ Il metodo <!--#echo var="REDIRECT_REQUEST_METHOD" -->
non è consentito per l'URL richiesto.
<!--#include virtual="include/bottom.html" -->
@@ -93,11 +93,13 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Método não permitido!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Método não permitido!"
+--><!--#include virtual="include/top.html" -->
- O método <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ O método <!--#echo var="REDIRECT_REQUEST_METHOD" -->
não é permitido para a URL requisitada.
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_NOT_ACCEPTABLE.html.var b/docs/error/HTTP_NOT_ACCEPTABLE.html.var
index 15891e1..59a4437 100644
--- a/docs/error/HTTP_NOT_ACCEPTABLE.html.var
+++ b/docs/error/HTTP_NOT_ACCEPTABLE.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Kein passendes Objekt gefunden!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Kein passendes Objekt gefunden!"
+--><!--#include virtual="include/top.html" -->
Unter dem angeforderten URL konnte kein geeignetes Objekt
auf dem Server gefunden werden, das dem vom Browser
@@ -15,8 +15,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="No acceptable object found!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="No acceptable object found!"
+--><!--#include virtual="include/top.html" -->
An appropriate representation of the requested resource
could not be found on this server.
@@ -27,9 +27,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="No acceptable object found!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="No acceptable object found!"
+--><!--#include virtual="include/top.html" -->
Una representación apropiada de los recursos
solicitados no ha podido ser localizada en
@@ -41,9 +41,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="L'objet trouvé n'est pas acceptable!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="L'objet trouvé n'est pas acceptable!"
+--><!--#include virtual="include/top.html" -->
Une représentation appropriée de la ressource requise
n'a pu être trouvée sur ce serveur.
@@ -54,9 +54,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Geen acceptabel object gevonden!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Geen acceptabel object gevonden!"
+--><!--#include virtual="include/top.html" -->
Een toereikende representatie van het gevraagde object
kon niet gevonden worden op deze server.
@@ -67,9 +67,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Inget acceptabelt objekt hittat!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Inget acceptabelt objekt hittat!"
+--><!--#include virtual="include/top.html" -->
En lämplig representation av den efterfrågade
resursen kunde inte hittas på denna server.
@@ -80,9 +80,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Nessun oggetto accettabile!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Nessun oggetto accettabile!"
+--><!--#include virtual="include/top.html" -->
Questo server non riesce a trovare una rappresentazione
appropriata per la risorsa richiesta.
@@ -93,11 +93,13 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Objeto apropriado não encontrado!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Objeto apropriado não encontrado!"
+--><!--#include virtual="include/top.html" -->
Não existe uma representação apropriada
para o recurso requisitado neste servidor.
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_NOT_FOUND.html.var b/docs/error/HTTP_NOT_FOUND.html.var
index f54b86e..36f4744 100644
--- a/docs/error/HTTP_NOT_FOUND.html.var
+++ b/docs/error/HTTP_NOT_FOUND.html.var
@@ -1,19 +1,19 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Objekt nicht gefunden!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Objekt nicht gefunden!"
+--><!--#include virtual="include/top.html" -->
Der angeforderte URL konnte auf dem Server nicht gefunden werden.
<!--#if expr="$HTTP_REFERER" -->
Der Link auf der
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">verweisenden
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">verweisenden
Seite</a> scheint falsch oder nicht mehr aktuell zu sein.
Bitte informieren Sie den Autor
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">dieser Seite</a>
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">dieser Seite</a>
über den Fehler.
<!--#else -->
@@ -29,17 +29,17 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Object not found!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Object not found!"
+--><!--#include virtual="include/top.html" -->
The requested URL was not found on this server.
<!--#if expr="$HTTP_REFERER" -->
The link on the
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">referring
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">referring
page</a> seems to be wrong or outdated. Please inform the author of
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">that page</a>
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">that page</a>
about the error.
<!--#else -->
@@ -55,9 +55,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Object not found!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Object not found!"
+--><!--#include virtual="include/top.html" -->
El URL requerido no ha sido localizado en
este servidor.
@@ -65,10 +65,10 @@
<!--#if expr="$HTTP_REFERER" -->
El URL en la
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">página
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">página
referida</a> parece tener algun error o estar fuera de tiempo. Porfavor
comunique al autor de
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">la
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">la
página</a> acerca del error.
<!--#else -->
@@ -84,20 +84,20 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Objet non trouvé!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Objet non trouvé!"
+--><!--#include virtual="include/top.html" -->
L'URL requise n'a pu etre trouvée sur ce serveur.
<!--#if expr="$HTTP_REFERER" -->
La référence sur
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">la page
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">la page
citée</a>
semble être erronée ou perimée. Nous vous prions
d'informer l'auteur de
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">cette page</a>
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">cette page</a>
de cette erreur.
<!--#else -->
@@ -113,18 +113,18 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Object niet gevonden!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Object niet gevonden!"
+--><!--#include virtual="include/top.html" -->
De gevraagde URL was niet gevonden op deze server.
<!--#if expr="$HTTP_REFERER" -->
De link op
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">deze pagina
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">deze pagina
pagina</a> is verkeerd of achterhaald. Gelieve de auteur van
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">die pagina</a>
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">die pagina</a>
in te lichten over deze fout.
<!--#else -->
@@ -140,18 +140,18 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Objektet hittas ej!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Objektet hittas ej!"
+--><!--#include virtual="include/top.html" -->
Den efterfrågade adressen hittades inte på denna server.
<!--#if expr="$HTTP_REFERER" -->
Länken på den
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">tidigare sidan</a>
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">tidigare sidan</a>
verkar vara felaktig eller inaktuell. Vänligen informera författaren av
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">sidan</a>
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">sidan</a>
om felet.
<!--#else -->
@@ -167,19 +167,19 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Oggetto non trovato!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Oggetto non trovato!"
+--><!--#include virtual="include/top.html" -->
L'URL richiesto non esiste su questo server.
<!--#if expr="$HTTP_REFERER" -->
Il link della
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">pagina da cui
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">pagina da cui
sei arrivato</a> potrebbe essere errato o non essere più valido.
Per favore, informa dell'errore l'autore della
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">pagina</a>.
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">pagina</a>.
<!--#else -->
@@ -194,17 +194,18 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Objeto não encontrado!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Objeto não encontrado!"
+--><!--#include virtual="include/top.html" -->
A URL requisitada não foi encontrada neste servidor.
<!--#if expr="$HTTP_REFERER" -->
O link na
- <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">página
+ <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">página
referida</a> parece estar com algum erro ou desatualizado. Por favor informe o
- autor <a href="<!--#echo encoding="url" var="HTTP_REFERER"-->">desta
+ autor <a href="<!--#echo encoding="url" var="HTTP_REFERER" -->">desta
página</a> sobre o erro.
<!--#else -->
@@ -216,3 +217,4 @@
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_NOT_IMPLEMENTED.html.var b/docs/error/HTTP_NOT_IMPLEMENTED.html.var
index d669315..3de21f8 100644
--- a/docs/error/HTTP_NOT_IMPLEMENTED.html.var
+++ b/docs/error/HTTP_NOT_IMPLEMENTED.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Anfrage nicht ausführbar!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Anfrage nicht ausführbar!"
+--><!--#include virtual="include/top.html" -->
Die vom Browser angeforderte Aktion wird vom Server
nicht unterstützt.
@@ -14,8 +14,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Cannot process request!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Cannot process request!"
+--><!--#include virtual="include/top.html" -->
The server does not support the action requested by the browser.
@@ -25,9 +25,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Cannot proceed request!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Cannot proceed request!"
+--><!--#include virtual="include/top.html" -->
El buscador esta solicitando una acción
que no puede ser procesada.
@@ -38,9 +38,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="La requête ne peut être effectuée!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="La requête ne peut être effectuée!"
+--><!--#include virtual="include/top.html" -->
Le serveur n'est pas en mesure d'effectuer l'action
requise par le navigateur.
@@ -51,9 +51,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Kan vraag niet verwerken!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Kan vraag niet verwerken!"
+--><!--#include virtual="include/top.html" -->
De server ondersteunt de actie, gevraagd door de browser, niet.
@@ -63,9 +63,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Kan ej utföra förfrågan!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Kan ej utföra förfrågan!"
+--><!--#include virtual="include/top.html" -->
Servern stödjer inte den handling som önskades
av webbläsaren.
@@ -76,9 +76,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="La richiesta non può essere soddisfatta!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="La richiesta non può essere soddisfatta!"
+--><!--#include virtual="include/top.html" -->
Il server non supporta il tipo di azione richiesta dal browser.
@@ -88,11 +88,13 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="A requisição não pode ser processada!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="A requisição não pode ser processada!"
+--><!--#include virtual="include/top.html" -->
O servidor não suporta a ação requisitada pelo
seu "browser".
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_PRECONDITION_FAILED.html.var b/docs/error/HTTP_PRECONDITION_FAILED.html.var
index 4ea5a05..58b7741 100644
--- a/docs/error/HTTP_PRECONDITION_FAILED.html.var
+++ b/docs/error/HTTP_PRECONDITION_FAILED.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Vorbedingung negativ!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Vorbedingung negativ!"
+--><!--#include virtual="include/top.html" -->
Die Vorbedingung unter dem angeforderten URL wurde
negativ ausgewertet.
@@ -14,8 +14,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Precondition failed!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Precondition failed!"
+--><!--#include virtual="include/top.html" -->
The precondition on the request for the URL failed positive evaluation.
@@ -25,9 +25,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Precondition failed!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Precondition failed!"
+--><!--#include virtual="include/top.html" -->
La precondicion para que exista una
conección al URL solicitado es falsa.
@@ -38,9 +38,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Précondition négative!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Précondition négative!"
+--><!--#include virtual="include/top.html" -->
La précondition pour l'URL requise a été
évaluée négativement.
@@ -51,9 +51,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Startvoorwaarde niet voldaan!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Startvoorwaarde niet voldaan!"
+--><!--#include virtual="include/top.html" -->
Een startvoorwaarde werd niet voldaan bij verwerking van de vraag naar de URL.
@@ -63,9 +63,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Nödvändig förutsättning misslyckades!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Nödvändig förutsättning misslyckades!"
+--><!--#include virtual="include/top.html" -->
Den nödvändiga förutsättningen för
adressförfrågan passerade inte utvärderingen
@@ -77,9 +77,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Criteri di precondizione non soddisfatti!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Criteri di precondizione non soddisfatti!"
+--><!--#include virtual="include/top.html" -->
I criteri di precondizione per consentire l'invio dell'URL
richiesto non sono stati soddisfatti.
@@ -90,11 +90,13 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Falha de precondição!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Falha de precondição!"
+--><!--#include virtual="include/top.html" -->
A condição necessária para a
- requisição da URL foi avaliada como falsa.
+ requisição da URL foi avaliada como falsa.
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var b/docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
index 017d0bf..86bd652 100644
--- a/docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+++ b/docs/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
@@ -1,12 +1,12 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Übergebene Daten zu groß!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Übergebene Daten zu groß!"
+--><!--#include virtual="include/top.html" -->
Die bei der Anfrage übermittelten Daten sind für
- die <!--#echo var="REDIRECT_REQUEST_METHOD"-->-Methode
+ die <!--#echo var="REDIRECT_REQUEST_METHOD" -->-Methode
nicht erlaubt oder die Datenmenge hat das Maximum überschritten.
<!--#include virtual="include/bottom.html" -->
@@ -15,10 +15,10 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Request entity too large!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Request entity too large!"
+--><!--#include virtual="include/top.html" -->
- The <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ The <!--#echo var="REDIRECT_REQUEST_METHOD" -->
method does not allow the data transmitted, or the data volume
exceeds the capacity limit.
@@ -28,12 +28,12 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Request entity too large!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Request entity too large!"
+--><!--#include virtual="include/top.html" -->
Los recursos establecidos no permiten peticiones con
- el <!--#echo var="REDIRECT_REQUEST_METHOD"--> método
+ el <!--#echo var="REDIRECT_REQUEST_METHOD" --> método
suministrado por su solicitud, o, la cantidad de datos
provistos exceden los límites de capacidad.
@@ -43,11 +43,11 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Volume de la demande trop grand!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Volume de la demande trop grand!"
+--><!--#include virtual="include/top.html" -->
- La méthode <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ La méthode <!--#echo var="REDIRECT_REQUEST_METHOD" -->
n'autorise pas le transfert de ces données ou bien le volume
des données excède la limite de capacité.
@@ -57,12 +57,12 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Volume van gevraagde entiteit te groot!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Volume van gevraagde entiteit te groot!"
+--><!--#include virtual="include/top.html" -->
- Het <!--#echo var="REDIRECT_REQUEST_METHOD"--> type methode laat niet toe data
- te versturen of het datavolume is groter dan maximaal toegelaten.
+ Het <!--#echo var="REDIRECT_REQUEST_METHOD" --> type methode laat niet toe
+ data te versturen of het datavolume is groter dan maximaal toegelaten.
<!--#include virtual="include/bottom.html" -->
----------nl--
@@ -70,12 +70,13 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="För stor enhet vid förfrågan!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="För stor enhet vid förfrågan!"
+--><!--#include virtual="include/top.html" -->
- <!--#echo var="REDIRECT_REQUEST_METHOD"--> metoden tillåter
- inte den skickade datan eller så överskrider datavolymen kapacitetsnivån.
+ <!--#echo var="REDIRECT_REQUEST_METHOD" --> metoden tillåter
+ inte den skickade datan eller så överskrider datavolymen
+ kapacitetsnivån.
<!--#include virtual="include/bottom.html" -->
----------sv--
@@ -83,12 +84,12 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Richiesta troppo grande!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Richiesta troppo grande!"
+--><!--#include virtual="include/top.html" -->
- Il metodo <!--#echo var="REDIRECT_REQUEST_METHOD"-->
- non consente di trasferire dati, oppure la quantità di dati
+ Il metodo <!--#echo var="REDIRECT_REQUEST_METHOD" -->
+ non consente di trasferire dati, oppure la quantità di dati
richiesti è eccessiva.
<!--#include virtual="include/bottom.html" -->
@@ -97,12 +98,14 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Volume da dados muito grande!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Volume da dados muito grande!"
+--><!--#include virtual="include/top.html" -->
- O método <!--#echo var="REDIRECT_REQUEST_METHOD"-->
+ O método <!--#echo var="REDIRECT_REQUEST_METHOD" -->
não permite a transmissão dos dados,
ou o volume de dados excede a capacidade limite.
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_REQUEST_TIME_OUT.html.var b/docs/error/HTTP_REQUEST_TIME_OUT.html.var
index 858f259..f9fa02e 100644
--- a/docs/error/HTTP_REQUEST_TIME_OUT.html.var
+++ b/docs/error/HTTP_REQUEST_TIME_OUT.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Zeitlimit überschritten!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Zeitlimit überschritten!"
+--><!--#include virtual="include/top.html" -->
Der Server konnte nicht mehr länger auf die Beendigung
der Browseranfrage warten; die Netzwerkverbindung wurde
@@ -15,8 +15,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Request time-out!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Request time-out!"
+--><!--#include virtual="include/top.html" -->
The server closed the network connection because the browser
didn't finish the request within the specified time.
@@ -27,9 +27,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Request time-out!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Request time-out!"
+--><!--#include virtual="include/top.html" -->
El servidor ha cerrado la conección de red
debido a que el buscador no termino la solicitud
@@ -41,9 +41,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Requête trop longue !" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Requête trop longue !"
+--><!--#include virtual="include/top.html" -->
Le serveur a fermé la connection car le navigateur n'a pas
fini la requête dans le temps spécifié.
@@ -54,9 +54,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Tijdlimiet overschreden!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Tijdlimiet overschreden!"
+--><!--#include virtual="include/top.html" -->
De server heeft de netwerkverbinding gesloten omdat de browser
de vraag niet heeft beëindigd binnen een gestelde tijd.
@@ -67,9 +67,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Request time-out!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Request time-out!"
+--><!--#include virtual="include/top.html" -->
Servern stängde förbindelsen därför att
webbläsaren inte avslutade förfrågan inom
@@ -81,9 +81,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Time-out della richiesta!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Time-out della richiesta!"
+--><!--#include virtual="include/top.html" -->
Il server ha chiuso la connessione in quanto è stato
superato il limite di tempo entro il quale il browser avrebbe
@@ -95,8 +95,9 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Tempo excedido!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Tempo excedido!"
+--><!--#include virtual="include/top.html" -->
O servidor encerrou a conexão porque o "browser"
não finalizou a requisição dentro
@@ -104,3 +105,4 @@
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var b/docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
index 219ef8d..26c6f6d 100644
--- a/docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+++ b/docs/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Übergebener URI zu groß!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Übergebener URI zu groß!"
+--><!--#include virtual="include/top.html" -->
Der bei der Anfrage übermittelte URI überschreitet
die maximale Länge.
@@ -15,8 +15,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Submitted URI too large!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Submitted URI too large!"
+--><!--#include virtual="include/top.html" -->
The length of the requested URL exceeds the capacity limit for
this server. The request cannot be processed.
@@ -27,9 +27,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Submitted URI too large!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Submitted URI too large!"
+--><!--#include virtual="include/top.html" -->
Su solicitud no puede procesarse debido a que la
longitud del URL excede la capacidad limite del
@@ -41,9 +41,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="L'URI demandee est trop longue!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="L'URI demandee est trop longue!"
+--><!--#include virtual="include/top.html" -->
La longueur de l'URL demandée excède la limite de
capacitè pour ce serveur. Nous ne pouvons donner suite
@@ -55,9 +55,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Aangeboden URI te groot!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Aangeboden URI te groot!"
+--><!--#include virtual="include/top.html" -->
De lengte van de aangeboden URL overschreidt het maximum
voor deze server. De vraag kan niet verwerkt worden.
@@ -68,9 +68,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Efterfrågad URI för stor!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Efterfrågad URI för stor!"
+--><!--#include virtual="include/top.html" -->
Längden på adressen som efterfrågas överskrider
kapacitetsgränsen för denna server. Förfrågan kan
@@ -82,9 +82,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="URI troppo lungo!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="URI troppo lungo!"
+--><!--#include virtual="include/top.html" -->
La lunghezza dell'indirizzo (URL) trasmesso supera il
limite massimo imposto da questo server.
@@ -96,8 +96,9 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="URL excede limite!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="URL excede limite!"
+--><!--#include virtual="include/top.html" -->
O tamanho do endereço (URL) excede a capacidade limite
desse servidor. A requisição não pode ser
@@ -105,3 +106,4 @@
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_SERVICE_UNAVAILABLE.html.var b/docs/error/HTTP_SERVICE_UNAVAILABLE.html.var
index eb0fadd..016d250 100644
--- a/docs/error/HTTP_SERVICE_UNAVAILABLE.html.var
+++ b/docs/error/HTTP_SERVICE_UNAVAILABLE.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Zugriff nicht möglich!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Zugriff nicht möglich!"
+--><!--#include virtual="include/top.html" -->
Der Server ist derzeit nicht in der Lage die Anfrage
zu bearbeiten. Entweder ist der Server derzeit überlastet
@@ -16,8 +16,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Service unavailable!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Service unavailable!"
+--><!--#include virtual="include/top.html" -->
The server is temporarily unable to service your
request due to maintenance downtime or capacity
@@ -29,9 +29,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Service unavailable!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Service unavailable!"
+--><!--#include virtual="include/top.html" -->
El servidor no puede atender su solicitud por
el momento debido a problemas de mantenimiento
@@ -46,9 +46,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Service inaccessible!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Service inaccessible!"
+--><!--#include virtual="include/top.html" -->
En raison de travaux de maintenance ou de problèmes
de capacité le serveur n'est pas en mesure de répondre
@@ -61,9 +61,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Dienst niet beschikbaar!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Dienst niet beschikbaar!"
+--><!--#include virtual="include/top.html" -->
De server kan tijdelijk uw vraag niet verwerken
door onderhoud of problemen met de capaciteit van de server.
@@ -75,9 +75,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Tjänsten ej tillgänglig!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Tjänsten ej tillgänglig!"
+--><!--#include virtual="include/top.html" -->
Servern är för tillfället oförmögen att
utföra din förfrågan på grund av underhåll
@@ -90,9 +90,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Servizio non disponibile!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Servizio non disponibile!"
+--><!--#include virtual="include/top.html" -->
Il server in questo momento non è in grado di
soddisfare la richiesta per motivi di manutenzione
@@ -105,8 +105,9 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Serviço indisponível!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Serviço indisponível!"
+--><!--#include virtual="include/top.html" -->
O servidor está temporariamente fora de serviço
para manutanção ou devido a problemas de capacidade.
@@ -114,3 +115,4 @@
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_UNAUTHORIZED.html.var b/docs/error/HTTP_UNAUTHORIZED.html.var
index 921f98a..9476276 100644
--- a/docs/error/HTTP_UNAUTHORIZED.html.var
+++ b/docs/error/HTTP_UNAUTHORIZED.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Authentisierung fehlgeschlagen!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Authentisierung fehlgeschlagen!"
+--><!--#include virtual="include/top.html" -->
Der Server konnte nicht verifizieren, ob Sie autorisiert sind,
auf den URL "<!--#echo encoding="url" var="REDIRECT_URL"-->" zuzugreifen.
@@ -14,8 +14,8 @@
<!--#include virtual="include/spacer.html" -->
Sofern Sie für den Zugriff berechtigt sind, überprüfen
- Sie bitte die eingegebene User-ID und das Passwort und versuchen Sie
- es erneut.
+ Sie bitte die eingegebene User-ID und das Passwort und versuchen Sie
+ es erneut.
<!--#include virtual="include/bottom.html" -->
----------de--
@@ -23,8 +23,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Authentication required!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Authentication required!"
+--><!--#include virtual="include/top.html" -->
This server could not verify that you are authorized to access
the URL "<!--#echo encoding="url" var="REDIRECT_URL" -->".
@@ -42,9 +42,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Authentication required!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Authentication required!"
+--><!--#include virtual="include/top.html" -->
El servidor no puede certificar que usted este autorizado
para accesar el URL "<!--#echo encoding="url" var="REDIRECT_URL" -->".
@@ -65,9 +65,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Autorisation requise!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Autorisation requise!"
+--><!--#include virtual="include/top.html" -->
Ce server n'a pas été en mesure de vérifier que
vous êtes autorisé à accéder à cette
@@ -89,9 +89,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Authenticatie nodig!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Authenticatie nodig!"
+--><!--#include virtual="include/top.html" -->
De server kon niet controleren of u gemachtigd bent om toegang te krijgen
tot de URL "<!--#echo encoding="url" var="REDIRECT_URL" -->".
@@ -109,9 +109,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Autentisering krävs!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Autentisering krävs!"
+--><!--#include virtual="include/top.html" -->
Servern kunde inte verifiera att du har tillåtelse att besöka
adressen "<!--#echo encoding="url" var="REDIRECT_URL" -->".
@@ -129,9 +129,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Autorizzazione necessaria!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Autorizzazione necessaria!"
+--><!--#include virtual="include/top.html" -->
Questo server non può verificare l'autorizzazione
all'accesso a "<!--#echo encoding="url" var="REDIRECT_URL" -->".
@@ -150,8 +150,9 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Autenticação Requerida!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Autenticação Requerida!"
+--><!--#include virtual="include/top.html" -->
Este servidor não pode autorizar o seu acesso à URL
"<!--#echo encoding="url" var="REDIRECT_URL" -->".
@@ -165,3 +166,4 @@
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var b/docs/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
index b187d1f..34d7fd0 100644
--- a/docs/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+++ b/docs/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Nicht unterstütztes Format!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Nicht unterstütztes Format!"
+--><!--#include virtual="include/top.html" -->
Das bei der Anfrage übermittelte Format (Media Type)
wird vom Server nicht unterstützt.
@@ -14,8 +14,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Unsupported media type!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Unsupported media type!"
+--><!--#include virtual="include/top.html" -->
The server does not support the media type transmitted in the request.
@@ -25,9 +25,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Unsupported media type!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Unsupported media type!"
+--><!--#include virtual="include/top.html" -->
Los datos de su solicitud no se encuentran en
un formato aceptado por este recurso.
@@ -38,22 +38,22 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="Type de média invalide!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="Type de média invalide!"
+--><!--#include virtual="include/top.html" -->
Le serveur ne supporte pas le type de média utilisé
dans votre requête.
-<!--#include virtual="include/bottom.html" -->
+<!--#include virtual="include/bottom.html"-->
----------fr--
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Niet ondersteund formaat!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Niet ondersteund formaat!"
+--><!--#include virtual="include/top.html" -->
De server ondersteunt het gevraagde formaat ( media type ) niet.
@@ -63,9 +63,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Mediatypen stöds ej!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Mediatypen stöds ej!"
+--><!--#include virtual="include/top.html" -->
Servern stödjer inte den mediatyp som skickats i förfrågan.
@@ -75,9 +75,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="Tipo di dato non supportato!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="Tipo di dato non supportato!"
+--><!--#include virtual="include/top.html" -->
Il server non è in grado di gestire il
tipo del formato dei dati trasmesso nella richiesta.
@@ -88,11 +88,13 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Tipo de media não suportado!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Tipo de media não suportado!"
+--><!--#include virtual="include/top.html" -->
O servidor não suporta o tipo de mídia
transmitida nesta requisição.
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/HTTP_VARIANT_ALSO_VARIES.html.var b/docs/error/HTTP_VARIANT_ALSO_VARIES.html.var
index 6dbd3b4..da12c7a 100644
--- a/docs/error/HTTP_VARIANT_ALSO_VARIES.html.var
+++ b/docs/error/HTTP_VARIANT_ALSO_VARIES.html.var
@@ -1,9 +1,9 @@
Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
-<!--#set var="CONTENT_LANGUAGE" value="de" -->
-<!--#set var="TITLE" value="Variante ebenfalls veränderlich!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="de"
+--><!--#set var="TITLE" value="Variante ebenfalls veränderlich!"
+--><!--#include virtual="include/top.html" -->
Ein Zugriff auf das angeforderte Objekt bzw. einer
Variante dieses Objektes ist nicht möglich, da es ebenfalls
@@ -15,8 +15,8 @@
Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
-<!--#set var="TITLE" value="Variant also varies!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="TITLE" value="Variant also varies!"
+--><!--#include virtual="include/top.html" -->
A variant for the requested entity
is itself a negotiable resource.
@@ -28,9 +28,9 @@
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
-<!--#set var="CONTENT_LANGUAGE" value="es" -->
-<!--#set var="TITLE" value="Variant also varies!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="es"
+--><!--#set var="TITLE" value="Variant also varies!"
+--><!--#include virtual="include/top.html" -->
No es posible tener acceso debido a que
una variante de la solicitud es por si
@@ -42,9 +42,9 @@
Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
-<!--#set var="CONTENT_LANGUAGE" value="fr" -->
-<!--#set var="TITLE" value="La variante varie elle-même!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="fr"
+--><!--#set var="TITLE" value="La variante varie elle-même!"
+--><!--#include virtual="include/top.html" -->
Une variante pour l'entité requise
est elle-même une ressource négociable.
@@ -56,9 +56,9 @@
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
-<!--#set var="CONTENT_LANGUAGE" value="nl" -->
-<!--#set var="TITLE" value="Variant varieert ook!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="nl"
+--><!--#set var="TITLE" value="Variant varieert ook!"
+--><!--#include virtual="include/top.html" -->
Een variant van het gevraagde object
is op zich ook een te onderhandelen variant.
@@ -70,9 +70,9 @@
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
-<!--#set var="CONTENT_LANGUAGE" value="sv" -->
-<!--#set var="TITLE" value="Variant also varies!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="sv"
+--><!--#set var="TITLE" value="Variant also varies!"
+--><!--#include virtual="include/top.html" -->
En variant av den förfrågade enheten är i
sig själv en giltig resurs. Åtkomst är inte
@@ -84,9 +84,9 @@
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
-<!--#set var="CONTENT_LANGUAGE" value="it" -->
-<!--#set var="TITLE" value="La versione variante varia essa stessa!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="it"
+--><!--#set var="TITLE" value="La versione variante varia essa stessa!"
+--><!--#include virtual="include/top.html" -->
Non è possibile accedere all'entità
richiesta perché ` essa stessa
@@ -98,8 +98,9 @@
Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
-<!--#set var="TITLE" value="Variante auto-negociável!" -->
-<!--#include virtual="include/top.html" -->
+<!--#set var="CONTENT_LANGUAGE" value="pt-br"
+--><!--#set var="TITLE" value="Variante auto-negociável!"
+--><!--#include virtual="include/top.html" -->
Uma variante da entidade de requisição
é por si mesma um recurso negociável.
@@ -107,3 +108,4 @@
<!--#include virtual="include/bottom.html" -->
-------pt-br--
+
diff --git a/docs/error/contact.html.var b/docs/error/contact.html.var
index a1f952d..90a95e0 100644
--- a/docs/error/contact.html.var
+++ b/docs/error/contact.html.var
@@ -3,7 +3,7 @@
Body:----------de--
Sofern Sie dies für eine Fehlfunktion des Servers halten,
informieren Sie bitte den
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->">Webmaster</a>
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">Webmaster</a>
hierüber.
----------de--
@@ -11,14 +11,14 @@
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
If you think this is a server error, please contact
-the <a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->">webmaster</a>.
+the <a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">webmaster</a>.
----------en--
Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
Favor de contactar al
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->">webmaster</a>
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">webmaster</a>
en caso de que usted crea que existe un error en el servidor.
----------es--
@@ -26,28 +26,28 @@
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
Si vous pensez qu'il s'agit d'une erreur du serveur, veuillez contacter le
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->">gestionnaire du site</a>.
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">gestionnaire du site</a>.
----------fr--
Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
Indien u van oordeel bent dat deze server in fout is, gelieve
-de <a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->">webmaster</a> te contacteren.
+de <a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">webmaster</a> te contacteren.
----------nl--
Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
Om du tror att detta beror på ett serverfel, vänligen kontakta
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->">webbansvarig</a>.
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">webbansvarig</a>.
----------sv--
Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
Se pensi che questo sia un errore del server, per favore contatta il
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->">webmaster</a>.
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">webmaster</a>.
----------it--
Content-language: pt-br
@@ -55,5 +55,6 @@
Body:-------pt-br--
Se você acredita ter encontrado um problema no servidor,
por favor entre em contato com o
-<a href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->">webmaster</a>.
+<a href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->">webmaster</a>.
-------pt-br--
+
diff --git a/docs/error/include/bottom.html b/docs/error/include/bottom.html
index ad44d9c..e8522b6 100644
--- a/docs/error/include/bottom.html
+++ b/docs/error/include/bottom.html
@@ -1,19 +1,14 @@
-</dd></dl><dl><dd>
+</p>
+<p>
<!--#include virtual="../contact.html.var" -->
-</dd></dl>
+</p>
<h2>Error <!--#echo encoding="none" var="REDIRECT_STATUS" --></h2>
-<dl>
-<dd>
<address>
- <a href="/"><!--#echo encoding="none" var="SERVER_NAME" --></a>
- <br />
+ <a href="/"><!--#echo var="SERVER_NAME" --></a><br />
<!--#config timefmt="%c" -->
- <small><!--#echo encoding="none" var="DATE_LOCAL" --></small>
- <br />
- <small><!--#echo encoding="none" var="SERVER_SOFTWARE" --></small>
+ <span><!--#echo var="DATE_LOCAL" --><br />
+ <!--#echo var="SERVER_SOFTWARE" --></span>
</address>
-</dd>
-</dl>
</body>
</html>
diff --git a/docs/error/include/spacer.html b/docs/error/include/spacer.html
index d8f5c2b..7d5e595 100644
--- a/docs/error/include/spacer.html
+++ b/docs/error/include/spacer.html
@@ -1 +1,2 @@
-</dd></dl><dl><dd>
+</p>
+<p>
diff --git a/docs/error/include/top.html b/docs/error/include/top.html
index 7f69e58..64b1170 100644
--- a/docs/error/include/top.html
+++ b/docs/error/include/top.html
@@ -1,25 +1,24 @@
-<!--#if expr="! $CONTENT_LANGUAGE" -->
-<!--#set var="CONTENT_LANGUAGE" value="en" -->
-<!--#endif -->
-<!--#if expr="! $CHARACTER_ENCODING" -->
-<!--#set var="CHARACTER_ENCODING" value="ISO-8859-1" -->
-<!--#endif -->
-<?xml version="1.0" encoding="<!--#echo encoding="none" var="CHARACTER_ENCODING" -->"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<!--#echo encoding="none" var="CONTENT_LANGUAGE" -->">
+<!--#if expr="! $CONTENT_LANGUAGE"
+--><!--#set var="CONTENT_LANGUAGE" value="en"
+--><!--#endif
+--><!--#if expr="! $CHARACTER_ENCODING"
+--><!--#set var="CHARACTER_ENCODING" value="ISO-8859-1"
+--><!--#endif
+--><?xml version="1.0" encoding="<!--#echo var="CHARACTER_ENCODING" -->"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<!--#echo var="CONTENT_LANGUAGE" -->" xml:lang="<!--#echo var="CONTENT_LANGUAGE" -->">
<head>
<title><!--#echo var="TITLE" --></title>
-<link rev="made" href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->" />
-<style type="text/css">
-<!--
-body { color: #000000; background-color: #FFFFFF; }
-a:link { color: #0000CC; }
--->
-</style>
+<link rev="made" href="mailto:<!--#echo encoding="url" var="SERVER_ADMIN" -->" />
+<style type="text/css"><!--/*--><![CDATA[/*><!--*/
+ body { color: #000000; background-color: #FFFFFF; }
+ a:link { color: #0000CC; }
+ p, address {margin-left: 3em;}
+ span {font-size: smaller;}
+/*]]>*/--></style>
</head>
<body>
<h1><!--#echo encoding="none" var="TITLE" --></h1>
-<dl>
-<dd>
+<p>
\ No newline at end of file
diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en
index ee66ae7..8f371fb 100644
--- a/docs/manual/bind.html.en
+++ b/docs/manual/bind.html.en
@@ -4,9 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Binding - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Binding</h1>
+ -->
+<title>Binding - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Binding</h1>
<p>Configuring Apache to listen on specific addresses and ports.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">Overview</a></li><li><img alt="" src="./images/down.gif" /> <a href="#ipv6">Special IPv6 Considerations</a></li><li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">How This Works With Virtual Hosts</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="vhosts/">Virtual Hosts</a></li><li><a href="dns-caveats.html">DNS Issues</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="overview" id="overview">Overview</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">Overview</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#ipv6">Special IPv6 Considerations</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">How This Works With Virtual Hosts</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="vhosts/">Virtual Hosts</a></li><li><a href="dns-caveats.html">DNS Issues</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="overview" id="overview">Overview</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/core.html">core</a></code></li><li><code class="module"><a href="./mod/mpm_common.html">mpm_common</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code></li></ul></td></tr></table>
@@ -55,7 +74,9 @@
<div class="example"><p><code>
Listen [fe80::a00:20ff:fea7:ccea]:80
</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="ipv6" id="ipv6">Special IPv6 Considerations</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ipv6" id="ipv6">Special IPv6 Considerations</a></h2>
<p>When APR supports IPv6, Apache will create IPv6-capable listening
@@ -96,7 +117,9 @@
<p>Apache does not currently detect this, so the Listen statements must
be edited manually by the administrator.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="virtualhost" id="virtualhost">How This Works With Virtual Hosts</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="virtualhost" id="virtualhost">How This Works With Virtual Hosts</a></h2>
<p>Listen does not implement Virtual Hosts. It only tells the
@@ -115,4 +138,8 @@
<code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code>
is set for an address and port that the
server is not listening to, it cannot be accessed.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/cgi_path.html.en b/docs/manual/cgi_path.html.en
index 2d4bd19..db8eab5 100644
--- a/docs/manual/cgi_path.html.en
+++ b/docs/manual/cgi_path.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>PATH_INFO Changes in the CGI Environment - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>PATH_INFO Changes in the CGI Environment</h1>
+ -->
+<title>PATH_INFO Changes in the CGI Environment - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>PATH_INFO Changes in the CGI Environment</h1>
<p>As implemented in Apache 1.1.1 and earlier versions, the
method Apache used to create PATH_INFO in the CGI environment
was counterintuitive, and could result in crashes in certain
@@ -14,7 +26,14 @@
still compatible with the CGI/1.1 specification, and CGI
scripts can be easily modified (<a href="#compat">see
below</a>).</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#prob">The Problem</a></li><li><img alt="" src="./images/down.gif" /> <a href="#solution">The Solution</a></li><li><img alt="" src="./images/down.gif" /> <a href="#compat">Compatibility with Previous Servers</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="prob" id="prob">The Problem</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#prob">The Problem</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#solution">The Solution</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#compat">Compatibility with Previous Servers</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="prob" id="prob">The Problem</a></h2>
<p>Apache 1.1.1 and earlier implemented the PATH_INFO and
SCRIPT_NAME environment variables by looking at the filename,
not the URL. While this resulted in the correct values in many
@@ -33,7 +52,9 @@
to "<code>/ralph/script</code>", and SCRIPT_NAME to
"<code>/cgi-</code>". Obviously, the latter is incorrect. In
certain cases, this could even cause the server to crash.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="solution" id="solution">The Solution</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="solution" id="solution">The Solution</a></h2>
<p>Apache 1.2 and later now determine SCRIPT_NAME and PATH_INFO
by looking directly at the URL, and determining how much of the
URL is client-modifiable, and setting PATH_INFO to it. To use
@@ -53,7 +74,9 @@
information is not a recommended method, and a script making
use of it "deserves" not to work. Apache 1.2b3 and later,
however, do provide <a href="#compat">a workaround.</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="compat" id="compat">Compatibility with Previous Servers</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="compat" id="compat">Compatibility with Previous Servers</a></h2>
<p>It may be necessary for a script that was designed for
@@ -75,4 +98,8 @@
<p>By doing this, a script can work with all servers supporting
the CGI/1.1 specification, including all versions of
Apache.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en
index 2f360ae..b382d8a 100644
--- a/docs/manual/configuring.html.en
+++ b/docs/manual/configuring.html.en
@@ -4,10 +4,31 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Configuration Files - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Configuration Files</h1>
+ -->
+<title>Configuration Files - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Configuration Files</h1>
<p>This document describes the files used to configure the Apache
HTTP server.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#main">Main Configuration Files</a></li><li><img alt="" src="./images/down.gif" /> <a href="#syntax">Syntax of the Configuration Files</a></li><li><img alt="" src="./images/down.gif" /> <a href="#modules">Modules</a></li><li><img alt="" src="./images/down.gif" /> <a href="#scope">Scope of Directives</a></li><li><img alt="" src="./images/down.gif" /> <a href="#htaccess">.htaccess Files</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="main" id="main">Main Configuration Files</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#main">Main Configuration Files</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#syntax">Syntax of the Configuration Files</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#modules">Modules</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#scope">Scope of Directives</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#htaccess">.htaccess Files</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="main" id="main">Main Configuration Files</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_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code></li><li><code class="directive"><a href="./mod/core.html#include">Include</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code></li></ul></td></tr></table>
@@ -25,7 +46,9 @@
<p>The server also reads a file containing mime document types;
the filename is set by the <code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code> directive,
and is <code>mime.types</code> by default.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="syntax" id="syntax">Syntax of the Configuration Files</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="syntax" id="syntax">Syntax of the Configuration Files</a></h2>
<p>Apache configuration files contain one directive per line.
@@ -46,7 +69,9 @@
without starting the server by using <code>apachectl
configtest</code> or the <code>-t</code> command line
option.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="modules" id="modules">Modules</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="modules" id="modules">Modules</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_so.html">mod_so</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code></li><li><code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code></li></ul></td></tr></table>
@@ -66,7 +91,9 @@
<p>To see which modules are currently compiled into the server,
you can use the <code>-l</code> command line option.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="scope" id="scope">Scope of Directives</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="scope" id="scope">Scope of Directives</a></h2>
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#directory"><Directory></a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch"><DirectoryMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#files"><Files></a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch"><FilesMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#location"><Location></a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch"><LocationMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code></li></ul></td></tr></table>
@@ -94,7 +121,9 @@
can be placed in which sections, check the <a href="mod/directive-dict.html#Context">Context</a> of the
directive. For further information, we provide details on <a href="sections.html">How Directory, Location and Files sections
work</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="htaccess" id="htaccess">.htaccess Files</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="htaccess" id="htaccess">.htaccess Files</a></h2>
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code></li></ul></td></tr></table>
@@ -119,4 +148,8 @@
<p>For more information on <code>.htaccess</code> files, see
the <a href="howto/htaccess.html">.htaccess tutorial</a>.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/configuring.html.ja.jis b/docs/manual/configuring.html.ja.jis
index 934f853..b3b9105 100644
--- a/docs/manual/configuring.html.ja.jis
+++ b/docs/manual/configuring.html.ja.jis
@@ -4,43 +4,58 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>$B@_Dj%U%!%$%k(B - Apache HTTP $B%5!<%P(B</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$B@_Dj%U%!%$%k(B</h1>
+ -->
+<title>$B@_Dj%U%!%$%k(B - Apache HTTP $B%5!<%P(B</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$B@_Dj%U%!%$%k(B</h1>
<p>$B$3$NJ8=q$G$O!"(BApache HTTP $B%5!<%P$r@_Dj$9$k$N$K;HMQ$9$k%U%!%$%k$K$D$$$F(B
-$B5-=R$7$F$$$^$9(B$B!#(B</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#main">$B%a%$%s$N@_Dj%U%!%$%k(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#syntax">$B@_Dj%U%!%$%k$N9=J8(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#modules">$B%b%8%e!<%k(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#scope">$B%G%#%l%/%F%#%V$NE,MQHO0O(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#htaccess">.htaccess $B%U%!%$%k(B</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="main" id="main">$B%a%$%s$N@_Dj%U%!%$%k(B</a></h2>
+$B5-=R$7$F$$$^$9!#(B</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#main">$B%a%$%s$N@_Dj%U%!%$%k(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#syntax">$B@_Dj%U%!%$%k$N9=J8(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#modules">$B%b%8%e!<%k(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#scope">$B%G%#%l%/%F%#%V$NE,MQHO0O(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#htaccess">.htaccess $B%U%!%$%k(B</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="main" id="main">$B%a%$%s$N@_Dj%U%!%$%k(B</a></h2>
<table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code></li><li><code class="directive"><a href="./mod/core.html#include">Include</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code></li></ul></td></tr></table>
<p>Apache $B$O(B <a href="mod/directives.html">$B%G%#%l%/%F%#%V(B</a> $B$r@_Dj%U%!%$%k$KJ?J8$G=q$/$3$H$K$h$j@_Dj$7$^$9!#(B
- $B%a%$%s$N@_Dj%U%!%$%k$O(B$BIaDL$O(B <code>httpd.conf</code> $B$H$$$&L>A0$G$9!#(B
+ $B%a%$%s$N@_Dj%U%!%$%k$OIaDL$O(B <code>httpd.conf</code> $B$H$$$&L>A0$G$9!#(B
$B$3$N%U%!%$%k$N0LCV$O%3%s%Q%$%k;~$K@_Dj$5$l$^$9$,!"%3%^%s%I%i%$%s$N(B
<code>-f</code> $B%U%i%0$K$h$j>e=q$-$G$-$^$9!#(B
- $B$=$N>e!"B>$N@_Dj%U%!%$%k$,(B <code class="directive"><a href="./mod/core.html#include">Include</a></code>
- $B%G%#%l%/%F%#%V$K$h$C$FDI2C$5(B$B$l$F$$$k$+$b$7$l$^$;$s!#(B
- $B$I$N%G%#%l%/%F%#%V$b$3$l$i$N@_Dj%U%!%$%k$N$I$l$K$G$bF~$l$i$l$^$9!#(B
+ $B$^$?!"B>$N@_Dj%U%!%$%k$r(B <code class="directive"><a href="./mod/core.html#include">Include</a></code>
+ $B%G%#%l%/%F%#%V$K$h$C$FDI2C$G$-!"%o%$%k%I%+!<%I$r;HMQ$7$FB??t$N(B
+ $B@_Dj%U%!%$%k$rDI2C$9$k$3$H$,$G$-$^$9!#(B
+ $B$I$s$J%G%#%l%/%F%#%V$b!"$3$l$i$N@_Dj%U%!%$%k$I$l$K$G$bF~$l$k$3$H$,$G$-$^$9!#(B
Apache $B$O5/F0;~$+:F5/F0;~$N$_%a%$%s@_Dj%U%!%$%k$NJQ99$rG'<1$7$^$9!#(B</p>
- <p>Apache 1.3.13 $B$N?7$7$$5!G=$H$7$F!"@_Dj%U%!%$%k(B$B$,<B:]$O%G%#%l%/%H%j$G(B
- $B$"$k$H$-$K$O$=$N%G%#%l%/%H%j$G8+$D$+$C$?$9$Y$F$N%U%!%$%k(B
- ($B$H%5%V%G%#%l%/%H%j(B) $B$r2r@O$9$k$H$$$&$b$N$,$"$j$^$9!#MxMQK!$H$7$F$O!"(B
- $B%P!<%A%c%k%[%9%H$rDI2C$9$k$H$-$K!"$=$l$>$l$N%[%9%H$KBP$7$F>.$5$J@_Dj(B
- $B%U%!%$%k$r:n$j!"@_Dj%G%#%l%/%H%j$KCV$/$H$$$&$b$N$,5s$2$i$l$^$9!#(B
- $B$3$&$9$k$H!"C1$K%U%!%$%k$NDI2C!":o=|$r$9$k$3$H$K$h$jA4$/%U%!%$%k$r(B
- $BJT=8$9$k$3$H$J$/%P!<%A%c%k%[%9%H$NDI2C!":o=|$,$G$-$^$9!#(B
- $B$3$l$O<+F02=$r$:$C$H4JC1$K$7$^$9!#(B</p>
-
<p>$B%5!<%P$O(B MIME
$B%I%-%e%a%s%H%?%$%W$r4^$s$G$$$k%U%!%$%k$bFI$_9~$_$^$9!#%U%!%$%kL>$O(B
<code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code>
$B$G@_Dj$5$l!"%G%U%)%k%H$G$O(B <code>mime.types</code>
$B$K$J$C$F$$$^$9!#(B</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="syntax" id="syntax">$B@_Dj%U%!%$%k$N9=J8(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="syntax" id="syntax">$B@_Dj%U%!%$%k$N9=J8(B</a></h2>
<p>Apache $B$N@_Dj%U%!%$%k$O(B 1 $B9T$K(B 1 $B$D$N%G%#%l%/%F%#%V$+$i$J$j$^$9!#(B
$B%P%C%/%9%i%C%7%e(B "\" $B$O%G%#%l%/%F%#%V$,<!$N9T$K7QB3$7$F$$$k$3$H$r(B
$B<($9$?$a$K9T$N:G8e$NJ8;z$H$7$F;H$o$l$F$$$k$+$b$7$l$^$;$s!#(B
- $B9T$N(B$B:G8e$H%P%C%/%9%i%C%7%e$N4V$KB>$NJ8;z$d6uGr$,$"$C$F$O$$$1$^$;$s!#(B
+ $B9T$N:G8e$H%P%C%/%9%i%C%7%e$N4V$KB>$NJ8;z$d6uGr$,$"$C$F$O$$$1$^$;$s!#(B
</p>
<p>$B@_Dj%U%!%$%k$N%G%#%l%/%F%#%V$OBgJ8;z>.J8;z$r6hJL$7$^$;$s$,!"(B
@@ -54,14 +69,16 @@
<code>apachectl configtest</code>
$B$+%3%^%s%I%i%$%s%*%W%7%g%s(B
<code>-t</code> $B$r;H$C$FD4$Y$i$l$^$9!#(B</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="modules" id="modules">$B%b%8%e!<%k(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="modules" id="modules">$B%b%8%e!<%k(B</a></h2>
<table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_so.html">mod_so</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code></li><li><code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code></li></ul></td></tr></table>
<p>Apache $B$O%b%8%e!<%k2=$5$l$?%5!<%P$G$9!#(B
$B%3%"%5!<%P$K$O:G$b4pK\E*$J5!G=$@$1$,4^$^$l$F$$$^$9!#3HD%5!G=$O(B
- Apache $B$K%m!<%I(B$B$5$l$k(B<a href="mod/">$B%b%8%e!<%k(B</a>$B$H$7$FMxMQ2DG=$G$9!#%G%U%)%k%H$G$O!"%3%s%Q%$%k;~$K%b%8%e!<%k$N(B
+ Apache $B$K%m!<%I$5$l$k(B<a href="mod/">$B%b%8%e!<%k(B</a>$B$H$7$FMxMQ2DG=$G$9!#%G%U%)%k%H$G$O!"%3%s%Q%$%k;~$K%b%8%e!<%k$N(B
<a href="mod/module-dict.html#status">Base</a> $B%;%C%H(B ($B4pK\%;%C%H(B) $B$,(B
$B%5!<%P$K4^$^$l$^$9!#%5!<%P$,(B<a href="dso.html">$BF0E*%m!<%I(B</a>$B%b%8%e!<%k$r;H$&$h$&$K%3%s%Q%$%k$5$l$F$$$k>l9g$O!"(B
$B%b%8%e!<%k$rJL$K%3%s%Q%$%k$7$F!"$$$D$G$b(B
@@ -74,7 +91,9 @@
<p>$B%3%^%s%I%i%$%s%*%W%7%g%s(B <code>-l</code> $B$r;H$C$F8=;~E@$G(B
$B$I$N%b%8%e!<%k$,%5!<%P$K%3%s%Q%$%k$5$l$F$$$k$+$rCN$k$3$H$,$G$-$^$9!#(B</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="scope" id="scope">$B%G%#%l%/%F%#%V$NE,MQHO0O(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="scope" id="scope">$B%G%#%l%/%F%#%V$NE,MQHO0O(B</a></h2>
<table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#directory"><Directory></a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch"><DirectoryMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#files"><Files></a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch"><FilesMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#location"><Location></a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch"><LocationMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code></li></ul></td></tr></table>
@@ -102,7 +121,9 @@
$B%G%#%l%/%F%#%V$N(B <a href="mod/directive-dict.html#context">$B%3%s%F%-%9%H(B</a> $B$rD4$Y$F$/$@$5$$!#>\$7$$>pJs$O!"(B
<a href="sections.html">Directory, Location, Files
$B%;%/%7%g%s$NF0:nK!(B</a>$B$K$"$j$^$9!#(B</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="htaccess" id="htaccess">.htaccess $B%U%!%$%k(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="htaccess" id="htaccess">.htaccess $B%U%!%$%k(B</a></h2>
<table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code></li></ul></td></tr></table>
@@ -127,7 +148,10 @@
$B%U%!%$%k$K=q$1$k$h$&$K$9$k$+$r@)8f$9$k$3$H$,$G$-$^$9!#(B</p>
<p><code>.htaccess</code> $B%U%!%$%k$K4X$9$k>\$7$$>pJs$O(B
- Ken Coar $B$5$s$N%A%e!<%H%j%"%k(B
- <a href="http://apache-server.com/tutorials/ATusing-htaccess.html">Using .htaccess Files with Apache</a>
+ <a href="howto/htaccess.html">.htaccess $B%A%e!<%H%j%"%k(B</a>
$B$r;2>H$7$F$/$@$5$$!#(B</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/configuring.xml.ja b/docs/manual/configuring.xml.ja
index 0b05eab..4656cac 100644
--- a/docs/manual/configuring.xml.ja
+++ b/docs/manual/configuring.xml.ja
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
<manualpage>
<relativepath href="."/>
-<!-- English revision: 1.4 -->
+<!-- English revision: 1.5 -->
<title>$B@_Dj%U%!%$%k(B</title>
@@ -30,20 +30,12 @@
$B%a%$%s$N@_Dj%U%!%$%k$OIaDL$O(B <code>httpd.conf</code> $B$H$$$&L>A0$G$9!#(B
$B$3$N%U%!%$%k$N0LCV$O%3%s%Q%$%k;~$K@_Dj$5$l$^$9$,!"%3%^%s%I%i%$%s$N(B
<code>-f</code> $B%U%i%0$K$h$j>e=q$-$G$-$^$9!#(B
- $B$=$N>e!"B>$N@_Dj%U%!%$%k$,(B <directive module="core">Include</directive>
- $B%G%#%l%/%F%#%V$K$h$C$FDI2C$5$l$F$$$k$+$b$7$l$^$;$s!#(B
- $B$I$N%G%#%l%/%F%#%V$b$3$l$i$N@_Dj%U%!%$%k$N$I$l$K$G$bF~$l$i$l$^$9!#(B
+ $B$^$?!"B>$N@_Dj%U%!%$%k$r(B <directive module="core">Include</directive>
+ $B%G%#%l%/%F%#%V$K$h$C$FDI2C$G$-!"%o%$%k%I%+!<%I$r;HMQ$7$FB??t$N(B
+ $B@_Dj%U%!%$%k$rDI2C$9$k$3$H$,$G$-$^$9!#(B
+ $B$I$s$J%G%#%l%/%F%#%V$b!"$3$l$i$N@_Dj%U%!%$%k$I$l$K$G$bF~$l$k$3$H$,$G$-$^$9!#(B
Apache $B$O5/F0;~$+:F5/F0;~$N$_%a%$%s@_Dj%U%!%$%k$NJQ99$rG'<1$7$^$9!#(B</p>
- <p>Apache 1.3.13 $B$N?7$7$$5!G=$H$7$F!"@_Dj%U%!%$%k$,<B:]$O%G%#%l%/%H%j$G(B
- $B$"$k$H$-$K$O$=$N%G%#%l%/%H%j$G8+$D$+$C$?$9$Y$F$N%U%!%$%k(B
- ($B$H%5%V%G%#%l%/%H%j(B) $B$r2r@O$9$k$H$$$&$b$N$,$"$j$^$9!#MxMQK!$H$7$F$O!"(B
- $B%P!<%A%c%k%[%9%H$rDI2C$9$k$H$-$K!"$=$l$>$l$N%[%9%H$KBP$7$F>.$5$J@_Dj(B
- $B%U%!%$%k$r:n$j!"@_Dj%G%#%l%/%H%j$KCV$/$H$$$&$b$N$,5s$2$i$l$^$9!#(B
- $B$3$&$9$k$H!"C1$K%U%!%$%k$NDI2C!":o=|$r$9$k$3$H$K$h$jA4$/%U%!%$%k$r(B
- $BJT=8$9$k$3$H$J$/%P!<%A%c%k%[%9%H$NDI2C!":o=|$,$G$-$^$9!#(B
- $B$3$l$O<+F02=$r$:$C$H4JC1$K$7$^$9!#(B</p>
-
<p>$B%5!<%P$O(B MIME
$B%I%-%e%a%s%H%?%$%W$r4^$s$G$$$k%U%!%$%k$bFI$_9~$_$^$9!#%U%!%$%kL>$O(B
<directive module="mod_mime">TypesConfig</directive>
@@ -185,9 +177,7 @@
$B%U%!%$%k$K=q$1$k$h$&$K$9$k$+$r@)8f$9$k$3$H$,$G$-$^$9!#(B</p>
<p><code>.htaccess</code> $B%U%!%$%k$K4X$9$k>\$7$$>pJs$O(B
- Ken Coar $B$5$s$N%A%e!<%H%j%"%k(B
- <a href="http://apache-server.com/tutorials/ATusing-htaccess.html"
- >Using .htaccess Files with Apache</a>
+ <a href="howto/htaccess.html">.htaccess $B%A%e!<%H%j%"%k(B</a>
$B$r;2>H$7$F$/$@$5$$!#(B</p>
</section>
</manualpage>
diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en
index 1ddb96c..7b4f60e 100644
--- a/docs/manual/content-negotiation.html.en
+++ b/docs/manual/content-negotiation.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Content Negotiation - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Content Negotiation</h1>
+ -->
+<title>Content Negotiation - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Content Negotiation</h1>
<p>Apache's supports content negotiation as described in
the HTTP/1.1 specification. It can choose the best
@@ -17,9 +29,21 @@
<p>Content negotiation is provided by the
<code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> module.
which is compiled in by default.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#about">About Content Negotiation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#negotiation">Negotiation in Apache</a></li><li><img alt="" src="./images/down.gif" /> <a href="#methods">The Negotiation Methods</a></li><li><img alt="" src="./images/down.gif" /> <a href="#better">Fiddling with Quality
- Values</a></li><li><img alt="" src="./images/down.gif" /> <a href="#extensions">Extensions to Transparent Content
-Negotiation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#naming">Note on hyperlinks and naming conventions</a></li><li><img alt="" src="./images/down.gif" /> <a href="#caching">Note on Caching</a></li><li><img alt="" src="./images/down.gif" /> <a href="#more">More Information</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="about" id="about">About Content Negotiation</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#about">About Content Negotiation</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#negotiation">Negotiation in Apache</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#methods">The Negotiation Methods</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#better">Fiddling with Quality
+ Values</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#extensions">Extensions to Transparent Content
+Negotiation</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#naming">Note on hyperlinks and naming conventions</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#caching">Note on Caching</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#more">More Information</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="about" id="about">About Content Negotiation</a></h2>
<p>A resource may be available in several different
representations. For example, it might be available in
@@ -71,7 +95,9 @@
representations is termed a <strong>variant</strong>. The ways
in which the variants for a negotiable resource vary are called
the <strong>dimensions</strong> of negotiation.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="negotiation" id="negotiation">Negotiation in Apache</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="negotiation" id="negotiation">Negotiation in Apache</a></h2>
<p>In order to negotiate a resource, the server needs to be
given information about each of the variants. This is done in
@@ -163,7 +189,7 @@
<p><code>MultiViews</code> is a per-directory option, meaning it
can be set with an <code class="directive"><a href="./mod/core.html#options">Options</a></code>
directive within a <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="./mod/core.html#location"><Location></a></code> or <code class="directive"><a href="./mod/core.html#files"><Files></a></code> section in
- <code>access.conf</code>, or (if <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> is properly set) in
+ <code>httpd.conf</code>, or (if <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> is properly set) in
<code>.htaccess</code> files. Note that <code>Options All</code>
does not set <code>MultiViews</code>; you have to ask for it by
name.</p>
@@ -195,7 +221,9 @@
directive determines whether handlers, filters, and other
extension types can participate in MultiViews negotiation.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="methods" id="methods">The Negotiation Methods</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="methods" id="methods">The Negotiation Methods</a></h2>
<p>After Apache has obtained a list of the variants for a given
resource, either from a type-map file or from the filenames in
@@ -357,7 +385,9 @@
dimensions of variance.</li>
</ol>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="better" id="better">Fiddling with Quality
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="better" id="better">Fiddling with Quality
Values</a></h2>
<p>Apache sometimes changes the quality values from what would
@@ -453,7 +483,9 @@
specification and to work effectively with properly configured
clients.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="extensions" id="extensions">Extensions to Transparent Content
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="extensions" id="extensions">Extensions to Transparent Content
Negotiation</a></h2>
<p>Apache extends the transparent content negotiation protocol (RFC
@@ -465,7 +497,9 @@
acceptable according to the Accept-Encoding request header. The
RVSA/1.0 implementation does not round computed quality factors to 5
decimal places before choosing the best variant.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="naming" id="naming">Note on hyperlinks and naming conventions</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="naming" id="naming">Note on hyperlinks and naming conventions</a></h2>
<p>If you are using language negotiation you can choose between
different naming conventions, because files can have more than
@@ -572,7 +606,9 @@
extension (including an encoding extension if there is one)
must be on the right hand side of the MIME-type extension
(<em>e.g.</em>, <code>foo.html.en</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="caching" id="caching">Note on Caching</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="caching" id="caching">Note on Caching</a></h2>
<p>When a cache stores a representation, it associates it with
the request URL. The next time that URL is requested, the cache
@@ -591,10 +627,16 @@
negotiation. This directive can be given in the server config or
virtual host, and takes no arguments. It has no effect on requests
from HTTP/1.1 clients.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="more" id="more">More Information</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="more" id="more">More Information</a></h2>
<p>For more information about content negotiation, see Alan
J. Flavell's <a href="http://ppewww.ph.gla.ac.uk/~flavell/www/lang-neg.html">Language
Negotiation Notes</a>. But note that this document may not be
updated to include changes in Apache 2.0.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml
index 9e2605d..d5f287d 100644
--- a/docs/manual/content-negotiation.xml
+++ b/docs/manual/content-negotiation.xml
@@ -171,7 +171,7 @@
type="section">Directory</directive>, <directive module="core"
type="section">Location</directive> or <directive module="core"
type="section">Files</directive> section in
- <code>access.conf</code>, or (if <directive
+ <code>httpd.conf</code>, or (if <directive
module="core">AllowOverride</directive> is properly set) in
<code>.htaccess</code> files. Note that <code>Options All</code>
does not set <code>MultiViews</code>; you have to ask for it by
diff --git a/docs/manual/custom-error.html.en b/docs/manual/custom-error.html.en
index 8f511f0..e369998 100644
--- a/docs/manual/custom-error.html.en
+++ b/docs/manual/custom-error.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Custom Error Responses - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Custom Error Responses</h1>
+ -->
+<title>Custom Error Responses - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Custom Error Responses</h1>
<p>Additional functionality allows webmasters to configure the response
of Apache to some error or problem.</p>
@@ -14,7 +26,14 @@
<p>If a script crashes and produces a "500 Server Error" response,
then this response can be replaced with either some friendlier text or by
a redirection to another URL (local or external).</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#behavior">Behavior</a></li><li><img alt="" src="./images/down.gif" /> <a href="#configuration">Configuration</a></li><li><img alt="" src="./images/down.gif" /> <a href="#custom">Custom Error Responses and Redirects</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="behavior" id="behavior">Behavior</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#behavior">Behavior</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#configuration">Configuration</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#custom">Custom Error Responses and Redirects</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="behavior" id="behavior">Behavior</a></h2>
<h3>Old Behavior</h3>
@@ -73,7 +92,9 @@
scheme name like <code>http:</code>, even if it refers to the same host
as the 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="configuration" id="configuration">Configuration</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configuration" id="configuration">Configuration</a></h2>
<p>Use of <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code> is enabled
@@ -107,7 +128,9 @@
<li>A local URL to redirect to.</li>
</ol>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="custom" id="custom">Custom Error Responses and Redirects</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="custom" id="custom">Custom Error Responses and Redirects</a></h2>
<p>Apache's behavior to redirected URLs has been modified so
@@ -156,4 +179,8 @@
condition, such as <code>404 Not Found</code>, it can
use the specific code and error text instead.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/filters.html b/docs/manual/developer/filters.html
index 9f77b17..d5ea591 100644
--- a/docs/manual/developer/filters.html
+++ b/docs/manual/developer/filters.html
@@ -16,7 +16,7 @@
<h1>How filters work in Apache 2.0</h1>
<p>Warning - this is a cut 'n paste job from an email:
- <022501c1c529$f63a9550$7f00000a@KOJ></p>
+ <022501c1c529$f63a9550$7f00000a@KOJ></p>
<pre>
There are three basic filter types (each of these is actually broken
diff --git a/docs/manual/developer/thread_safety.html b/docs/manual/developer/thread_safety.html
index 4656b58..ad6e73c 100644
--- a/docs/manual/developer/thread_safety.html
+++ b/docs/manual/developer/thread_safety.html
@@ -50,9 +50,11 @@
If one thread calls a low-level function that sets errno and then another thread checks it, we
are bleeding error numbers from one thread into another. To solve this, make sure your module
or library defines _REENTRANT or is compiled with -D_REENTRANT. This will make errno a per-thread
- variable and should hopefully be transparent to the code. It does this by doing something like this:
+ variable and should hopefully be transparent to the code. It does this by doing something like this:</p>
+
<pre>#define errno (*(__errno_location()))</pre>
- which means that accessing errno will call __errno_location() which is provided by the libc. Setting
+
+ <p>which means that accessing errno will call __errno_location() which is provided by the libc. Setting
_REENTRANT also forces redefinition of some other functions to their *_r equivalents and sometimes
changes the common getc/putc macros into safer function calls. Check your libc documentation for
specifics. Instead of, or in addition to _REENTRANT the symbols that may affect this are
diff --git a/docs/manual/dns-caveats.html.en b/docs/manual/dns-caveats.html.en
index c826a0a..0fc4121 100644
--- a/docs/manual/dns-caveats.html.en
+++ b/docs/manual/dns-caveats.html.en
@@ -4,13 +4,34 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Issues Regarding DNS and Apache - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Issues Regarding DNS and Apache</h1>
+ -->
+<title>Issues Regarding DNS and Apache - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Issues Regarding DNS and Apache</h1>
<p>This page could be summarized with the statement: don't require Apache
to use DNS for any parsing of the configuration files. If Apache has to
use DNS to parse the configuration files then your server may be subject
to reliability problems (it might not boot), or denial and theft of
service attacks (including users able to steal hits from other users).</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#example">A Simple Example</a></li><li><img alt="" src="./images/down.gif" /> <a href="#denial">Denial of Service</a></li><li><img alt="" src="./images/down.gif" /> <a href="#main">The "main server" Address</a></li><li><img alt="" src="./images/down.gif" /> <a href="#tips">Tips to Avoid These Problems</a></li><li><img alt="" src="./images/down.gif" /> <a href="#appendix">Appendix: Future Directions</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 Simple Example</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#example">A Simple Example</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#denial">Denial of Service</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#main">The "main server" Address</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#tips">Tips to Avoid These Problems</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#appendix">Appendix: Future Directions</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 Simple Example</a></h2>
<div class="example"><p><code>
@@ -61,7 +82,9 @@
DocumentRoot /www/abc <br />
</VirtualHost>
</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="denial" id="denial">Denial of Service</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="denial" id="denial">Denial of Service</a></h2>
<p>There are (at least) two forms that denial of service can
@@ -107,7 +130,9 @@
this happens requires a more in-depth discussion of how Apache
matches up incoming requests with the virtual host that will
serve it. A rough document describing this <a href="vhosts/details.html">is available</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="main" id="main">The "main server" Address</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="main" id="main">The "main server" Address</a></h2>
<p>The addition of <a href="vhosts/name-based.html">name-based
@@ -136,7 +161,9 @@
are using. It also affects CGIs unless you use
<code class="module"><a href="./mod/mod_env.html">mod_env</a></code> to control the environment. It's best
to consult the man pages or FAQs for your OS.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="tips" id="tips">Tips to Avoid These Problems</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="tips" id="tips">Tips to Avoid These Problems</a></h2>
<ul>
@@ -158,7 +185,9 @@
<li>create a <code><VirtualHost _default_:*></code>
server that has no pages to serve</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="appendix" id="appendix">Appendix: Future Directions</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="appendix" id="appendix">Appendix: Future Directions</a></h2>
<p>The situation regarding DNS is highly undesirable. For
@@ -191,4 +220,8 @@
configuration. But as of March 1997 these features have not
been deployed widely enough to be put into use on critical
webservers.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/dso.html.en b/docs/manual/dso.html.en
index fd6df8b..022e99b 100644
--- a/docs/manual/dso.html.en
+++ b/docs/manual/dso.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Dynamic Shared Object (DSO) Support - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Dynamic Shared Object (DSO) Support</h1>
+ -->
+<title>Dynamic Shared Object (DSO) Support - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Dynamic Shared Object (DSO) Support</h1>
<p>The Apache HTTP Server is a modular program where the
administrator can choose the functionality to include in the
server by selecting a set of modules. The modules can be
@@ -18,7 +30,15 @@
<p>This document describes how to use DSO modules as well as
the theory behind their use.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#implementation">Implementation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#usage">Usage Summary</a></li><li><img alt="" src="./images/down.gif" /> <a href="#background">Background</a></li><li><img alt="" src="./images/down.gif" /> <a href="#advantages">Advantages and Disadvantages</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="implementation" id="implementation">Implementation</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#implementation">Implementation</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#usage">Usage Summary</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#background">Background</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#advantages">Advantages and Disadvantages</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="implementation" id="implementation">Implementation</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_so.html">mod_so</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code></li></ul></td></tr></table>
@@ -50,7 +70,9 @@
source tree and without having to fiddle with the
platform-dependent compiler and linker flags for DSO
support.</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 Summary</a></h2>
+</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 Summary</a></h2>
<p>To give you an overview of the DSO features of Apache 2.0,
here is a short and concise summary:</p>
@@ -106,7 +128,9 @@
use a <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code>
directive in <code>httpd.conf</code> to tell Apache to activate
the 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="background" id="background">Background</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="background" id="background">Background</a></h2>
<p>On modern Unix derivatives there exists a nifty mechanism
usually called dynamic linking/loading of <em>Dynamic Shared
@@ -206,7 +230,9 @@
modules into the Apache core functionality. So, Apache is
really predestined for using DSO to load its modules at
run-time.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="advantages" id="advantages">Advantages and Disadvantages</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="advantages" id="advantages">Advantages and Disadvantages</a></h2>
<p>The above DSO based features have the following
advantages:</p>
@@ -269,4 +295,8 @@
loading the code yourself via <code>dlopen()</code>.</li>
</ul>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en
index fac2bea..6c37c2c 100644
--- a/docs/manual/env.html.en
+++ b/docs/manual/env.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Environment Variables in Apache - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Environment Variables in Apache</h1>
+ -->
+<title>Environment Variables in Apache - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Environment Variables in Apache</h1>
<p>The Apache HTTP Server provides a mechanism for storing
information in named variables that are called <em>environment
variables</em>. This information can be used to control various
@@ -24,7 +36,15 @@
server itself runs, you must use the standard environment
manipulation mechanisms provided by your operating system
shell.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#setting">Setting Environment Variables</a></li><li><img alt="" src="./images/down.gif" /> <a href="#using">Using Environment Variables</a></li><li><img alt="" src="./images/down.gif" /> <a href="#special">Special Purpose Environment Variables</a></li><li><img alt="" src="./images/down.gif" /> <a href="#examples">Examples</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="setting" id="setting">Setting Environment Variables</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#setting">Setting Environment Variables</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#using">Using Environment Variables</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#special">Special Purpose Environment Variables</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#examples">Examples</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="setting" id="setting">Setting Environment Variables</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_env.html">mod_env</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li><li><code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code></li><li><code class="module"><a href="./mod/mod_unique_id.html">mod_unique_id</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#passenv">PassEnv</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifnocase">SetEnvIfNoCase</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#unsetenv">UnsetEnv</a></code></li></ul></td></tr></table>
@@ -91,10 +111,12 @@
CGI scripts and SSI pages.</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 Environment Variables</a></h2>
+ </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 Environment Variables</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_authz_host.html">mod_authz_host</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_authz_host.html#allow">Allow</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_authz_host.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
+ <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_access.html">mod_access</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_access.html#allow">Allow</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_access.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
<h3><a name="cgi-scripts" id="cgi-scripts">CGI Scripts</a></h3>
@@ -182,7 +204,9 @@
variables. Rather, they are variables special to mod_rewrite
which cannot be accessed from other 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="special" id="special">Special Purpose Environment Variables</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="special" id="special">Special Purpose Environment Variables</a></h2>
<p>Interoperability problems have led to the introduction of
@@ -231,7 +255,7 @@
content-types other than <code>text/html</code>.</p>
- <h3><a name="nogzip" id="nogzip">nogzip</a></h3>
+ <h3><a name="no-gzip" id="no-gzip">no-gzip</a></h3>
<p>When set, the <code>DEFLATE</code> filter of
<code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code> will be turned off.</p>
@@ -276,7 +300,9 @@
- </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>
+ </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><a name="misbehaving" id="misbehaving">Changing protocol behavior with misbehaving clients</a></h3>
@@ -342,4 +368,8 @@
ApacheToday tutorial " <a href="http://apachetoday.com/news_story.php3?ltsn=2000-06-14-002-01-PS">
Keeping Your Images from Adorning Other Sites</a>".</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/env.html.ja.jis b/docs/manual/env.html.ja.jis
index 0c24d15..f7b77b5 100644
--- a/docs/manual/env.html.ja.jis
+++ b/docs/manual/env.html.ja.jis
@@ -4,15 +4,27 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache $B$N4D6-JQ?t(B - Apache HTTP $B%5!<%P(B</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache $B$N4D6-JQ?t(B</h1>
+ -->
+<title>Apache $B$N4D6-JQ?t(B - Apache HTTP $B%5!<%P(B</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache $B$N4D6-JQ?t(B</h1>
<p>Apache HTTP $B%5!<%P$O(B<em>$B4D6-JQ?t(B</em>$B$H8F$P$l$k!"L>A0$N$D$$$?(B
- $BJQ?t$K>pJs$r5-21$9$k;EAH$_$rDs6!$7$F$$$^$9!#$3$N>pJs$O%m%0<}=8(B$B$d(B
- $B%"%/%;%9@)8f$J$I$N$$$m$$$m$JA`:n$r@)8f$9$k$?$a$K;H$&(B$B$3$H$,$G$-$^$9!#(B
+ $BJQ?t$K>pJs$r5-21$9$k;EAH$_$rDs6!$7$F$$$^$9!#$3$N>pJs$O%m%0<}=8$d(B
+ $B%"%/%;%9@)8f$J$I$N$$$m$$$m$JA`:n$r@)8f$9$k$?$a$K;H$&$3$H$,$G$-$^$9!#(B
$B$3$l$i$NJQ?t$O(B CGI $B%9%/%j%W%H$J$I$N30It%W%m%0%i%`$HDL?.$9$k$?$a$K$b(B
$B;H$o$l$^$9!#$3$NJ8=q$O$=$l$i$NJQ?t$NA`:nJ}K!$H;HMQJ}K!$r$$$/$D$+(B
$B>R2p$7$^$9!#(B</p>
- <p>$B$3$l$i$NJQ?t$O(B<em>$B4D6-JQ?t(B</em>$B$H8F$P$l$F$$$^$9$,!"%*%Z%l!<(B$B%F%#%s%0(B
+ <p>$B$3$l$i$NJQ?t$O(B<em>$B4D6-JQ?t(B</em>$B$H8F$P$l$F$$$^$9$,!"%*%Z%l!<%F%#%s%0(B
$B%7%9%F%`$K$h$C$F@)8f$5$l$F$$$k4D6-JQ?t$HF1$8$G$O$"$j$^$;$s!#(B
$B<B:]$O!"$3$l$i$NJQ?t$O(B Apache $B$NFbIt9=B$$NCf$K5-21$5$l!"A`:n$5$l$F$$$^$9!#(B
$B$=$l$i$O!"(BCGI $B$d(B SSI $B%9%/%j%W%H$KEO$5$l$?$H$-$@$1!"<B:]$N(B
@@ -20,7 +32,15 @@
$B<B9T$5$l$F$$$k%*%Z%l!<%F%#%s%0%7%9%F%`$N4D6-$rA`:n$7$?$$>l9g$O!"(B
$B%*%Z%l!<%F%#%s%0%7%9%F%`$N%7%'%k$,Ds6!$7$F$$$kI8=`$N4D6-JQ?t$N(B
$BA`:nJ}K!$r;H$o$J$1$l$P$J$j$^$;$s!#(B</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#setting">$B4D6-JQ?t$N@_Dj(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#using">$B4D6-JQ?t$N;HMQ(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#special">$BFCJL$JL\E*$N4D6-JQ?t(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#examples">$BNc(B</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="setting" id="setting">$B4D6-JQ?t$N@_Dj(B</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#setting">$B4D6-JQ?t$N@_Dj(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#using">$B4D6-JQ?t$N;HMQ(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#special">$BFCJL$JL\E*$N4D6-JQ?t(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#examples">$BNc(B</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="setting" id="setting">$B4D6-JQ?t$N@_Dj(B</a></h2>
<table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_env.html">mod_env</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li><li><code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code></li><li><code class="module"><a href="./mod/mod_unique_id.html">mod_unique_id</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#passenv">PassEnv</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifnocase">SetEnvIfNoCase</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#unsetenv">UnsetEnv</a></code></li></ul></td></tr></table>
@@ -84,10 +104,12 @@
$B%Z!<%8$KEO$5$l$k$H$-$K%"%s%@!<%9%3%"$KCV49$5$l$^$9!#(B</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">$B4D6-JQ?t$N;HMQ(B</a></h2>
+ </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">$B4D6-JQ?t$N;HMQ(B</a></h2>
- <table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_authz_host.html">mod_authz_host</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_authz_host.html#allow">Allow</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_authz_host.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
+ <table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_access.html">mod_access</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_access.html#allow">Allow</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_access.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
<h3><a name="cgi-scripts" id="cgi-scripts">CGI $B%9%/%j%W%H(B</a></h3>
@@ -173,7 +195,9 @@
$B$=$l$i$OB>$N%b%8%e!<%k$+$i$O;HMQ$G$-$J$$(B mod_rewrite $BMQ$NFCJL$JJQ?t$G$9!#(B
</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="special" id="special">$BFCJL$JL\E*$N4D6-JQ?t(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="special" id="special">$BFCJL$JL\E*$N4D6-JQ?t(B</a></h2>
<p>$B8_49@-$NLdBj$r2r7h$9$k$?$a$K!"FCDj$N%/%i%$%"%s%H$HDL?.$7$F$$$k$H$-$O(B
@@ -204,8 +228,9 @@
<h3><a name="force-response" id="force-response">force-response-1.0</a></h3>
- <p>$B$3$l$,@_Dj$5$l$F$$$k$H!">o$K(B HTTP/1.0 $B$G$N1~Ez$K$J$j$^$9!#$3$N5!G=$O!"(B
- $B85!9$O(B AOL $B$N%W%m%-%7$NLdBj$N$?$a$K<BAu$5$l$^$7$?!#%/%i%$%"%s%H$NCf$K$O!"(B
+ <p>$B$3$l$,@_Dj$5$l$F$$$k$H!"(BHTTP/1.0 $B%j%/%(%9%H$rH/9T$9$k%/%i%$%"%s%H$KBP$7$F$O(B
+ $B>o$K(B HTTP/1.0 $B$G1~Ez$9$k$h$&$K$J$j$^$9!#$3$N5!G=$O!"(B
+ $B85!9$O(B AOL $B$N%W%m%-%7$NLdBj$N$?$a$K<BAu$5$l$^$7$?!#(BHTTP/1.0 $B%/%i%$%"%s%H$NCf$K$O!"(B
HTTP/1.1 $B$N1~Ez$rJV$5$l$k$H@5$7$/F0:n$7$J$$$b$N$,$"$k$+$b$7$l$^$;$s!#(B
$B$3$N5!G=$r;HMQ$9$k$3$H$G!"$=$N$h$&$J%/%i%$%"%s%H$H$N4V$N8_49@-LdBj$r2r7h$G$-$^$9!#(B</p>
@@ -218,6 +243,11 @@
$BDs6!$N(B <code>DEFLATE</code> $B=PNO%U%#%k%?$rL58z$K$7$^$9!#(B</p>
+ <h3><a name="no-gzip" id="no-gzip">no-gzip</a></h3>
+ <p>$B%;%C%H$5$l$k$H!"(B<code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code> $B$N(B
+ <code>DEFLATE</code> $B%U%#%k%?$,%*%U$K$J$j$^$9!#(B</p>
+
+
<h3><a name="nokeepalive" id="nokeepalive">nokeepalive</a></h3>
@@ -250,7 +280,7 @@
<p>$B$7$+$7$J$,$i!"%j%@%$%l%/%H@h$N%Z!<%8$,$=$l$H$O0[$J$k%-%c%i%/%?%;%C%H$r(B
$B;HMQ$7$F$$$?:]!"$"$kLdBj$N$"$k%V%i%&%6$N%P!<%8%g%s$G$O!"<B:]$N(B
($BLuCm!'%j%@%$%l%/%H@h$N%Z!<%8$N(B) $B%-%c%i%/%?%;%C%H$G$O$J$/!"(B
- $B%j%@%$%l%/%H$N%F%-%9%H$N%-%c%i%/%?%;(B$B%C%H$r;HMQ$7$^$9!#(B
+ $B%j%@%$%l%/%H$N%F%-%9%H$N%-%c%i%/%?%;%C%H$r;HMQ$7$^$9!#(B
$B$=$N7k2L!"Nc$($PJQ$JIA2h$,9T$J$o$l$?$j$7$F!"FI$a$J$/$J$j$^$9!#(B</p>
<p>$B$3$N4D6-JQ?t$r@_Dj$9$k$3$H$G!"%j%@%$%l%/%7%g%s%F%-%9%H$KBP$9$k(B
$B%-%c%i%/%?%;%C%H$N;XDj$r=|5n$7$F!"$=$l$iLdBj$N$"$k%V%i%&%6$G$b(B
@@ -258,7 +288,9 @@
- </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">$BNc(B</a></h2>
+ </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">$BNc(B</a></h2>
<h3><a name="misbehaving" id="misbehaving">$B$*$+$7$J5sF0$r$9$k%/%i%$%"%s%H$KBP$7$F%W%m%H%3%k$NF0:n$rJQ99$9$k(B</a></h3>
@@ -323,4 +355,8 @@
<p>$B$3$N<jK!$K4X$9$k>\$7$$>pJs$O(B ApacheToday $B$N%A%e!<%H%j%"%k!V(B<a href="http://apachetoday.com/news_story.php3?ltsn=2000-06-14-002-01-ps">Keeping Your Images from Adorning Other Sites</a>
$B!W$r;2>H$7$F$/$@$5$$!#(B</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/env.xml b/docs/manual/env.xml
index 339066e..ef7eb9e 100644
--- a/docs/manual/env.xml
+++ b/docs/manual/env.xml
@@ -121,7 +121,7 @@
<related>
<modulelist>
- <module>mod_authz_host</module>
+ <module>mod_access</module>
<module>mod_cgi</module>
<module>mod_ext_filter</module>
<module>mod_headers</module>
@@ -130,9 +130,9 @@
<module>mod_rewrite</module>
</modulelist>
<directivelist>
- <directive module="mod_authz_host">Allow</directive>
+ <directive module="mod_access">Allow</directive>
<directive module="mod_log_config">CustomLog</directive>
- <directive module="mod_authz_host">Deny</directive>
+ <directive module="mod_access">Deny</directive>
<directive module="mod_ext_filter">ExtFilterDefine</directive>
<directive module="mod_headers">Header</directive>
<directive module="mod_log_config">LogFormat</directive>
@@ -282,7 +282,7 @@
content-types other than <code>text/html</code>.</p>
</section>
- <section id="nogzip"><title>nogzip</title>
+ <section id="no-gzip"><title>no-gzip</title>
<p>When set, the <code>DEFLATE</code> filter of
<module>mod_deflate</module> will be turned off.</p>
@@ -398,7 +398,3 @@
</section>
</section>
</manualpage>
-
-
-
-
diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja
index cdca99c..ca02d55 100644
--- a/docs/manual/env.xml.ja
+++ b/docs/manual/env.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.5 -->
+<!-- English revision: 1.6.2.2 -->
<manualpage>
<relativepath href="."/>
@@ -116,7 +116,7 @@
<related>
<modulelist>
- <module>mod_authz_host</module>
+ <module>mod_access</module>
<module>mod_cgi</module>
<module>mod_ext_filter</module>
<module>mod_headers</module>
@@ -125,9 +125,9 @@
<module>mod_rewrite</module>
</modulelist>
<directivelist>
- <directive module="mod_authz_host">Allow</directive>
+ <directive module="mod_access">Allow</directive>
<directive module="mod_log_config">CustomLog</directive>
- <directive module="mod_authz_host">Deny</directive>
+ <directive module="mod_access">Deny</directive>
<directive module="mod_ext_filter">ExtFilterDefine</directive>
<directive module="mod_headers">Header</directive>
<directive module="mod_log_config">LogFormat</directive>
@@ -255,8 +255,9 @@
<section id="force-response">
<title>force-response-1.0</title>
- <p>$B$3$l$,@_Dj$5$l$F$$$k$H!">o$K(B HTTP/1.0 $B$G$N1~Ez$K$J$j$^$9!#$3$N5!G=$O!"(B
- $B85!9$O(B AOL $B$N%W%m%-%7$NLdBj$N$?$a$K<BAu$5$l$^$7$?!#%/%i%$%"%s%H$NCf$K$O!"(B
+ <p>$B$3$l$,@_Dj$5$l$F$$$k$H!"(BHTTP/1.0 $B%j%/%(%9%H$rH/9T$9$k%/%i%$%"%s%H$KBP$7$F$O(B
+ $B>o$K(B HTTP/1.0 $B$G1~Ez$9$k$h$&$K$J$j$^$9!#$3$N5!G=$O!"(B
+ $B85!9$O(B AOL $B$N%W%m%-%7$NLdBj$N$?$a$K<BAu$5$l$^$7$?!#(BHTTP/1.0 $B%/%i%$%"%s%H$NCf$K$O!"(B
HTTP/1.1 $B$N1~Ez$rJV$5$l$k$H@5$7$/F0:n$7$J$$$b$N$,$"$k$+$b$7$l$^$;$s!#(B
$B$3$N5!G=$r;HMQ$9$k$3$H$G!"$=$N$h$&$J%/%i%$%"%s%H$H$N4V$N8_49@-LdBj$r2r7h$G$-$^$9!#(B</p>
</section>
@@ -269,6 +270,11 @@
$BDs6!$N(B <code>DEFLATE</code> $B=PNO%U%#%k%?$rL58z$K$7$^$9!#(B</p>
</section>
+ <section id="no-gzip"><title>no-gzip</title>
+ <p>$B%;%C%H$5$l$k$H!"(B<module>mod_deflate</module> $B$N(B
+ <code>DEFLATE</code> $B%U%#%k%?$,%*%U$K$J$j$^$9!#(B</p>
+ </section>
+
<section id="nokeepalive">
<title>nokeepalive</title>
@@ -381,7 +387,3 @@
</section>
</section>
</manualpage>
-
-
-
-
diff --git a/docs/manual/filter.html.en b/docs/manual/filter.html.en
index 7d6d0f3..9fc2699 100644
--- a/docs/manual/filter.html.en
+++ b/docs/manual/filter.html.en
@@ -4,9 +4,24 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Filters - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Filters</h1>
+ -->
+<title>Filters - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Filters</h1>
<p>This document describes the use of filters in 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="filters" id="filters">Filters</a></h2>
+ </div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="filters" id="filters">Filters</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_deflate.html">mod_deflate</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_mime.html#addinputfilter">AddInputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removeinputfilter">RemoveInputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilteroptions">ExtFilterOptions</a></code></li><li><code class="directive"><a href="./mod/core.html#setinputfilter">SetInputFilter</a></code></li><li><code class="directive"><a href="./mod/core.html#setoutputfilter">SetOutputFilter</a></code></li></ul></td></tr></table>
@@ -44,4 +59,8 @@
<p>In addition, the module <code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code> allows
for external programs to be defined as filters.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/glossary.html.en b/docs/manual/glossary.html.en
index 3ee4644..e93c56e 100644
--- a/docs/manual/glossary.html.en
+++ b/docs/manual/glossary.html.en
@@ -4,11 +4,26 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Glossary - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Glossary</h1>
+ -->
+<title>Glossary - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Glossary</h1>
<p>This glossary defines some of the common terminology related to
Apache in particular, and web serving in general. More information
on each concept is provided in the links.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="definitions" id="definitions">Definitions</a></h2>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="definitions" id="definitions">Definitions</a></h2>
<dl>
<dt><a name="authentication">Authentication</a></dt> <dd>The positive
@@ -321,4 +336,8 @@
(ITU-T) which is used for SSL/TLS authentication.<br /> See: <a href="ssl/">SSL/TLS Encryption</a></dd>
</dl>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/handler.html.en b/docs/manual/handler.html.en
index a9ac3b7..033d679 100644
--- a/docs/manual/handler.html.en
+++ b/docs/manual/handler.html.en
@@ -4,9 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache's Handler Use - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache's Handler Use</h1>
+ -->
+<title>Apache's Handler Use - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache's Handler Use</h1>
<p>This document describes the use of Apache's Handlers.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#definition">What is a Handler</a></li><li><img alt="" src="./images/down.gif" /> <a href="#examples">Examples</a></li><li><img alt="" src="./images/down.gif" /> <a href="#programmer">Programmer's Note</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="definition" id="definition">What is a Handler</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#definition">What is a Handler</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#examples">Examples</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#programmer">Programmer's Note</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="definition" id="definition">What is a Handler</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_actions.html">mod_actions</a></code></li><li><code class="module"><a href="./mod/mod_asis.html">mod_asis</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_imap.html">mod_imap</a></code></li><li><code class="module"><a href="./mod/mod_info.html">mod_info</a></code></li><li><code class="module"><a href="./mod/mod_mime.html">mod_mime</a></code></li><li><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code></li><li><code class="module"><a href="./mod/mod_status.html">mod_status</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_actions.html#action">Action</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removehandler">RemoveHandler</a></code></li><li><code class="directive"><a href="./mod/core.html#sethandler">SetHandler</a></code></li></ul></td></tr></table>
@@ -53,7 +72,9 @@
<li><strong>type-map</strong>: Parse as a type map file for
content negotiation. (<code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</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="examples" id="examples">Examples</a></h2>
+ </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><a name="example1" id="example1">Modifying static content using a CGI script</a></h3>
@@ -91,7 +112,9 @@
</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="programmer" id="programmer">Programmer's Note</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="programmer" id="programmer">Programmer's Note</a></h2>
<p>In order to implement the handler features, an addition has
@@ -111,4 +134,8 @@
type. While it is not necessary, the naming convention for
handlers is to use a dash-separated word, with no slashes, so
as to not invade the media type name-space.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/cgi.html.en b/docs/manual/howto/cgi.html.en
index 57c8b42..fe3a22e 100644
--- a/docs/manual/howto/cgi.html.en
+++ b/docs/manual/howto/cgi.html.en
@@ -4,7 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache Tutorial: Dynamic Content with CGI - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">How-To / Tutorials</a></div><div id="page-content"><div id="preamble"><h1>Apache Tutorial: Dynamic Content with CGI</h1></div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#intro">Introduction</a></li><li><img alt="" src="../images/down.gif" /> <a href="#configuring">Configuring Apache to permit CGI</a></li><li><img alt="" src="../images/down.gif" /> <a href="#writing">Writing a CGI program</a></li><li><img alt="" src="../images/down.gif" /> <a href="#troubleshoot">But it's still not working!</a></li><li><img alt="" src="../images/down.gif" /> <a href="#behindscenes">What's going on behind the scenes?</a></li><li><img alt="" src="../images/down.gif" /> <a href="#libraries">CGI modules/libraries</a></li><li><img alt="" src="../images/down.gif" /> <a href="#moreinfo">For more information</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">Introduction</a></h2>
+ -->
+<title>Apache Tutorial: Dynamic Content with CGI - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">How-To / Tutorials</a></div><div id="page-content"><div id="preamble"><h1>Apache Tutorial: Dynamic Content with CGI</h1></div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#intro">Introduction</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#configuring">Configuring Apache to permit CGI</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#writing">Writing a CGI program</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#troubleshoot">But it's still not working!</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#behindscenes">What's going on behind the scenes?</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#libraries">CGI modules/libraries</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#moreinfo">For more information</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">Introduction</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_alias.html">mod_alias</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li></ul></td></tr></table>
@@ -16,7 +39,9 @@
your web site. This document will be an introduction to setting
up CGI on your Apache web server, and getting started writing
CGI programs.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="configuring" id="configuring">Configuring Apache to permit CGI</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configuring" id="configuring">Configuring Apache to permit CGI</a></h2>
<p>In order to get your CGI programs to work properly, you'll
@@ -35,32 +60,29 @@
it, when that particular resource is requested by a
client.</p>
- <p>The
- <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
-
+ <p>The <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
directive looks like:</p>
- <div class="example"><p><code>ScriptAlias /cgi-bin/ /usr/local/apache/cgi-bin/</code></p></div>
+ <div class="example"><p><code>
+ ScriptAlias /cgi-bin/ /usr/local/apache/cgi-bin/
+ </code></p></div>
- <p>The example shown is from your default
- <code>httpd.conf</code>
-
+ <p>The example shown is from your default <code>httpd.conf</code>
configuration file, if you installed Apache in the default
- location. The <code>ScriptAlias</code> directive is much like the
- <code>Alias</code> directive, which defines a URL prefix that
- is to mapped to a particular directory. <code>Alias</code>
- and <code>ScriptAlias</code> are usually used for directories
- that are outside of the <code>DocumentRoot</code> directory.
- The difference between <code>Alias</code> and
- <code>ScriptAlias</code> is that <code>ScriptAlias</code>
- has the added meaning that everything under that URL prefix
- will be considered a CGI program. So, the example above tells
- Apache that any request for a resource beginning with
- <code>/cgi-bin/</code> should be served from the directory
- <code>/usr/local/apache/cgi-bin/</code>, and should be treated
- as a CGI program.</p>
+ location. The <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
+ directive is much like the <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code> directive, which defines a URL prefix that
+ is to mapped to a particular directory. <code class="directive">Alias</code>
+ and <code class="directive">ScriptAlias</code> are usually used for
+ directories that are outside of the <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directory. The difference between
+ <code class="directive">Alias</code> and <code class="directive">ScriptAlias</code>
+ is that <code class="directive">ScriptAlias</code> has the added meaning
+ that everything under that URL prefix will be considered a CGI
+ program. So, the example above tells Apache that any request for a
+ resource beginning with <code>/cgi-bin/</code> should be served from
+ the directory <code>/usr/local/apache/cgi-bin/</code>, and should be
+ treated as a CGI program.</p>
- <p>For example, if the URL
+ <p>For example, if the URL
<code>http://www.example.com/cgi-bin/test.pl</code>
is requested, Apache will attempt to execute the file
<code>/usr/local/apache/cgi-bin/test.pl</code>
@@ -72,71 +94,78 @@
<h3><a name="nonscriptalias" id="nonscriptalias">CGI outside of ScriptAlias directories</a></h3>
- <p>CGI programs are often restricted to
- <code>ScriptAlias</code>'ed directories for security reasons.
- In this way,
- administrators can tightly control who is allowed to use CGI
- programs. However, if the proper security precautions are
+ <p>CGI programs are often restricted to <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>'ed directories for security reasons.
+ In this way, administrators can tightly control who is allowed to
+ use CGI programs. However, if the proper security precautions are
taken, there is no reason why CGI programs cannot be run from
arbitrary directories. For example, you may wish to let users
have web content in their home directories with the
- <code>UserDir</code> directive. If they want to have their own
- CGI programs, but don't have access to the main
- <code>cgi-bin</code> directory, they will need to be able to
+ <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive.
+ If they want to have their own CGI programs, but don't have access to
+ the main <code>cgi-bin</code> directory, they will need to be able to
run CGI programs elsewhere.</p>
<h3><a name="options" id="options">Explicitly using Options to permit CGI execution</a></h3>
- <p>You could explicitly use the <code>Options</code>
- directive, inside your main server configuration file, to
- specify that CGI execution was permitted in a particular
+ <p>You could explicitly use the <code class="directive"><a href="../mod/core.html#options">Options</a></code> directive, inside your main server configuration
+ file, to specify that CGI execution was permitted in a particular
directory:</p>
- <div class="example"><p><code><Directory /usr/local/apache/htdocs/somedir> <br />
- Options +ExecCGI<br />
- </Directory></code></p></div>
+ <div class="example"><p><code>
+ <Directory /usr/local/apache/htdocs/somedir><br />
+ <span class="indent">
+ Options +ExecCGI<br />
+ </span>
+ </Directory>
+ </code></p></div>
<p>The above directive tells Apache to permit the execution
of CGI files. You will also need to tell the server what
- files are CGI files. The following
- <code>AddHandler</code>
+ files are CGI files. The following <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> directive tells the server to treat all
+ files with the <code>cgi</code> or <code>pl</code> extension as CGI
+ programs:</p>
- directive tells the server to treat all files with the
- <code>cgi</code> or <code>pl</code> extension as CGI programs:</p>
-
- <div class="example"><p><code>AddHandler cgi-script cgi pl</code></p></div>
+ <div class="example"><p><code>
+ AddHandler cgi-script cgi pl
+ </code></p></div>
<h3><a name="htaccess" id="htaccess">.htaccess files</a></h3>
- <p>A <code>.htaccess</code> file is a way to set configuration
- directives on a per-directory basis. When Apache serves a
- resource, it looks in the directory from which it is serving
+ <p>A <a href="htaccess.html"><code>.htaccess</code> file</a> is a way
+ to set configuration directives on a per-directory basis. When Apache
+ serves a resource, it looks in the directory from which it is serving
a file for a file called <code>.htaccess</code>, and, if it
finds it, it will apply directives found therein.
<code>.htaccess</code> files can be permitted with the
- <code>AllowOverride</code> directive, which specifies what
- types of directives can
+ <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> directive,
+ which specifies what types of directives can
appear in these files, or if they are not allowed at all. To
permit the directive we will need for this purpose, the
following configuration will be needed in your main server
configuration:</p>
- <div class="example"><p><code>AllowOverride Options</code></p></div>
+ <div class="example"><p><code>
+ AllowOverride Options
+ </code></p></div>
<p>In the <code>.htaccess</code> file, you'll need the
following directive:</p>
- <div class="example"><p><code>Options +ExecCGI</code></p></div>
+ <div class="example"><p><code>
+ Options +ExecCGI
+ </code></p></div>
<p>which tells Apache that execution of CGI programs is
permitted in this directory.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="writing" id="writing">Writing a CGI program</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="writing" id="writing">Writing a CGI program</a></h2>
<p>There are two main differences between ``regular''
@@ -147,7 +176,9 @@
what sort of content it is receiving. Most of the time, this
will look like:</p>
- <div class="example"><p><code>Content-type: text/html</code></p></div>
+ <div class="example"><p><code>
+ Content-type: text/html
+ </code></p></div>
<p>Secondly, your output needs to be in HTML, or some other
format that a browser will be able to display. Most of the
@@ -166,9 +197,10 @@
file called <code>first.pl</code>, and put it in your
<code>cgi-bin</code> directory.</p>
- <div class="example"><p><code>#!/usr/bin/perl<br />
- print "Content-type: text/html\n\n";<br />
- print "Hello, World.";
+ <div class="example"><p><code>
+ #!/usr/bin/perl<br />
+ print "Content-type: text/html\n\n";<br />
+ print "Hello, World.";
</code></p></div>
<p>Even if you are not familiar with Perl, you should be able
@@ -180,22 +212,24 @@
talked about, followed by two carriage-return newline pairs.
This puts a blank line after the header, to indicate the end
of the HTTP headers, and the beginning of the body. The third
- line prints the string ``Hello, World.'' And that's the end
+ line prints the string "Hello, World.". And that's the end
of it.</p>
<p>If you open your favorite browser and tell it to get the
address</p>
- <div class="example"><p><code>http://www.example.com/cgi-bin/first.pl</code></p></div>
+ <div class="example"><p><code>
+ http://www.example.com/cgi-bin/first.pl
+ </code></p></div>
<p>or wherever you put your file, you will see the one line
- <code>Hello, World.</code>
-
- appear in your browser window. It's not very exciting, but
- once you get that working, you'll have a good chance of
- getting just about anything working.</p>
+ <code>Hello, World.</code> appear in your browser window.
+ It's not very exciting, but once you get that working, you'll
+ have a good chance of getting just about anything working.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="troubleshoot" id="troubleshoot">But it's still not working!</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="troubleshoot" id="troubleshoot">But it's still not working!</a></h2>
<p>There are four basic things that you may see in your browser
@@ -203,35 +237,21 @@
<dl>
<dt>The output of your CGI program</dt>
-
- <dd>Great! That means everything worked fine.
- </dd>
+ <dd>Great! That means everything worked fine.</dd>
<dt>The source code of your CGI program or a "POST Method Not
Allowed" message</dt>
-
<dd>That means that you have not properly configured Apache
to process your CGI program. Reread the section on
<a href="#configuringapachetopermitcgi">configuring
- Apache</a>
-
- and try to find what you missed.
- </dd>
+ Apache</a> and try to find what you missed.</dd>
<dt>A message starting with "Forbidden"</dt>
-
<dd>That means that there is a permissions problem. Check the
-
- <a href="#errorlogs">Apache error log</a>
-
- and the section below on
- <a href="#permissions">file permissions</a>.
-
- <br />
- </dd>
+ <a href="#errorlogs">Apache error log</a> and the section below on
+ <a href="#permissions">file permissions</a>.</dd>
<dt>A message saying "Internal Server Error"</dt>
-
<dd>If you check the
<a href="#errorlogs">Apache error log</a>, you will probably
find that it says "Premature end of
@@ -247,22 +267,23 @@
<p>Remember that the server does not run as you. That is,
when the server starts up, it is running with the permissions
- of an unprivileged user - usually ``nobody'', or ``www'' -
- and so it will need extra permissions to execute files that
- are owned by you. Usually, the way to give a file sufficient
- permissions to be executed by ``nobody'' is to give everyone
- execute permission on the file:</p>
+ of an unprivileged user - usually <code>nobody</code>, or
+ <code>www</code> - and so it will need extra permissions to
+ execute files that are owned by you. Usually, the way to give
+ a file sufficient permissions to be executed by <code>nobody</code>
+ is to give everyone execute permission on the file:</p>
- <div class="example"><p><code>chmod a+x first.pl</code></p></div>
+ <div class="example"><p><code>
+ chmod a+x first.pl
+ </code></p></div>
<p>Also, if your program reads from, or writes to, any other
files, those files will need to have the correct permissions
to permit this.</p>
<p>The exception to this is when the server is configured to
- use <a href="../suexec.html">suexec</a>.
-
- This program allows CGI programs to be run under different
+ use <a href="../suexec.html">suexec</a>. This program allows
+ CGI programs to be run under different
user permissions, depending on which virtual host or user
home directory they are located in. Suexec has very strict
permission checking, and any failure in that checking will
@@ -290,7 +311,9 @@
interpreter (often <code>perl</code>) indicated in the first
line of your CGI program, which will look something like:</p>
- <div class="example"><p><code>#!/usr/bin/perl</code></p></div>
+ <div class="example"><p><code>
+ #!/usr/bin/perl
+ </code></p></div>
<p>Make sure that this is in fact the path to the
interpreter.</p>
@@ -318,14 +341,16 @@
error logs, and you'll find that almost all of your problems
are quickly identified, and quickly solved.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="behindscenes" id="behindscenes">What's going on behind the scenes?</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="behindscenes" id="behindscenes">What's going on behind the scenes?</a></h2>
<p>As you become more advanced in CGI programming, it will
become useful to understand more about what's happening behind
the scenes. Specifically, how the browser and server
communicate with one another. Because although it's all very
- well to write a program that prints ``Hello, World.'', it's not
+ well to write a program that prints "Hello, World.", it's not
particularly useful.</p>
<h3><a name="env" id="env">Environment variables</a></h3>
@@ -348,9 +373,7 @@
<p>These variables are available to the CGI programmer, and
are half of the story of the client-server communication. The
complete list of required variables is at
- <a href="http://hoohoo.ncsa.uiuc.edu/cgi/env.html">
- http://hoohoo.ncsa.uiuc.edu/cgi/env.html</a>
- </p>
+ <a href="http://hoohoo.ncsa.uiuc.edu/cgi/env.html">http://hoohoo.ncsa.uiuc.edu/cgi/env.html</a>.</p>
<p>This simple Perl CGI program will display all of the
environment variables that are being passed around. Two
@@ -362,15 +385,17 @@
see some variables listed that were not in the official list.
In addition, Apache provides many different ways for you to
<a href="../env.html">add your own environment variables</a>
-
to the basic ones provided by default.</p>
<div class="example"><p><code>
- #!/usr/bin/perl<br />
- print "Content-type: text/html\n\n";<br />
- foreach $key (keys %ENV) {<br />
- print "$key --> $ENV{$key}<br>";<br />
- }</code></p></div>
+ #!/usr/bin/perl<br />
+ print "Content-type: text/html\n\n";<br />
+ foreach $key (keys %ENV) {<br />
+ <span class="indent">
+ print "$key --> $ENV{$key}<br>";<br />
+ </span>
+ }
+ </code></p></div>
<h3><a name="stdin" id="stdin">STDIN and STDOUT</a></h3>
@@ -389,7 +414,7 @@
The program then can process that data as though it was
coming in from the keyboard, or from a file</p>
- <p>The ``special format'' is very simple. A field name and
+ <p>The "special format" is very simple. A field name and
its value are joined together with an equals (=) sign, and
pairs of values are joined together with an ampersand
(&). Inconvenient characters like spaces, ampersands, and
@@ -398,7 +423,7 @@
something like:</p>
<div class="example"><p><code>
- name=Rich%20Bowen&city=Lexington&state=KY&sidekick=Squirrel%20Monkey
+ name=Rich%20Bowen&city=Lexington&state=KY&sidekick=Squirrel%20Monkey
</code></p></div>
<p>You'll sometimes also see this type of string appended to
@@ -414,7 +439,9 @@
and modules available to help you process this data, as well
as handle other of the aspects of your CGI program.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="libraries" id="libraries">CGI modules/libraries</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="libraries" id="libraries">CGI modules/libraries</a></h2>
<p>When you write CGI programs, you should consider using a
@@ -423,33 +450,29 @@
<p>If you're writing CGI programs in Perl, modules are
available on <a href="http://www.cpan.org/">CPAN</a>. The most
- popular module for this purpose is CGI.pm. You might
- also consider CGI::Lite, which implements a minimal set of
- functionality, which is all you need in most programs.</p>
+ popular module for this purpose is <code>CGI.pm</code>. You might
+ also consider <code>CGI::Lite</code>, which implements a minimal
+ set of functionality, which is all you need in most programs.</p>
<p>If you're writing CGI programs in C, there are a variety of
- options. One of these is the CGIC library, from
- <a href="http://www.boutell.com/cgic/">http://www.boutell.com/cgic/</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="moreinfo" id="moreinfo">For more information</a></h2>
+ options. One of these is the <code>CGIC</code> library, from
+ <a href="http://www.boutell.com/cgic/">http://www.boutell.com/cgic/</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="moreinfo" id="moreinfo">For more information</a></h2>
<p>There are a large number of CGI resources on the web. You
can discuss CGI problems with other users on the Usenet group
- comp.infosystems.www.authoring.cgi. And the -servers mailing
+ <a href="news:comp.infosystems.www.authoring.cgi">comp.infosystems.www.authoring.cgi</a>. And the -servers mailing
list from the HTML Writers Guild is a great source of answers
to your questions. You can find out more at
- <a href="http://www.hwg.org/lists/hwg-servers/">
- http://www.hwg.org/lists/hwg-servers/</a>
- </p>
+ <a href="http://www.hwg.org/lists/hwg-servers/">http://www.hwg.org/lists/hwg-servers/</a>.</p>
<p>And, of course, you should probably read the CGI
specification, which has all the details on the operation of
CGI programs. You can find the original version at the
- <a href="http://hoohoo.ncsa.uiuc.edu/cgi/interface.html">
- NCSA</a>
-
- and there is an updated draft at the
+ <a href="http://hoohoo.ncsa.uiuc.edu/cgi/interface.html">NCSA</a> and there is an updated draft at the
<a href="http://web.golux.com/coar/cgi/">Common Gateway
Interface RFC project</a>.</p>
@@ -464,4 +487,8 @@
<p>Note that questions about CGI problems should <strong>never</strong>
be posted to the Apache bug database unless you are sure you
have found a problem in the Apache source code.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/cgi.xml b/docs/manual/howto/cgi.xml
index f82b281..aebca60 100644
--- a/docs/manual/howto/cgi.xml
+++ b/docs/manual/howto/cgi.xml
@@ -13,15 +13,12 @@
<related>
<modulelist>
<module>mod_alias</module>
-
<module>mod_cgi</module>
</modulelist>
<directivelist>
<directive module="mod_mime">AddHandler</directive>
-
<directive module="core">Options</directive>
-
<directive module="mod_alias">ScriptAlias</directive>
</directivelist>
</related>
@@ -54,32 +51,31 @@
it, when that particular resource is requested by a
client.</p>
- <p>The
- <directive module="mod_alias">ScriptAlias</directive>
-
+ <p>The <directive module="mod_alias">ScriptAlias</directive>
directive looks like:</p>
- <example>ScriptAlias /cgi-bin/ /usr/local/apache/cgi-bin/</example>
+ <example>
+ ScriptAlias /cgi-bin/ /usr/local/apache/cgi-bin/
+ </example>
- <p>The example shown is from your default
- <code>httpd.conf</code>
-
+ <p>The example shown is from your default <code>httpd.conf</code>
configuration file, if you installed Apache in the default
- location. The <code>ScriptAlias</code> directive is much like the
- <code>Alias</code> directive, which defines a URL prefix that
- is to mapped to a particular directory. <code>Alias</code>
- and <code>ScriptAlias</code> are usually used for directories
- that are outside of the <code>DocumentRoot</code> directory.
- The difference between <code>Alias</code> and
- <code>ScriptAlias</code> is that <code>ScriptAlias</code>
- has the added meaning that everything under that URL prefix
- will be considered a CGI program. So, the example above tells
- Apache that any request for a resource beginning with
- <code>/cgi-bin/</code> should be served from the directory
- <code>/usr/local/apache/cgi-bin/</code>, and should be treated
- as a CGI program.</p>
+ location. The <directive module="mod_alias">ScriptAlias</directive>
+ directive is much like the <directive module="mod_alias"
+ >Alias</directive> directive, which defines a URL prefix that
+ is to mapped to a particular directory. <directive>Alias</directive>
+ and <directive>ScriptAlias</directive> are usually used for
+ directories that are outside of the <directive module="core"
+ >DocumentRoot</directive> directory. The difference between
+ <directive>Alias</directive> and <directive>ScriptAlias</directive>
+ is that <directive>ScriptAlias</directive> has the added meaning
+ that everything under that URL prefix will be considered a CGI
+ program. So, the example above tells Apache that any request for a
+ resource beginning with <code>/cgi-bin/</code> should be served from
+ the directory <code>/usr/local/apache/cgi-bin/</code>, and should be
+ treated as a CGI program.</p>
- <p>For example, if the URL
+ <p>For example, if the URL
<code>http://www.example.com/cgi-bin/test.pl</code>
is requested, Apache will attempt to execute the file
<code>/usr/local/apache/cgi-bin/test.pl</code>
@@ -91,66 +87,74 @@
<section id="nonscriptalias">
<title>CGI outside of ScriptAlias directories</title>
- <p>CGI programs are often restricted to
- <code>ScriptAlias</code>'ed directories for security reasons.
- In this way,
- administrators can tightly control who is allowed to use CGI
- programs. However, if the proper security precautions are
+ <p>CGI programs are often restricted to <directive module="mod_alias"
+ >ScriptAlias</directive>'ed directories for security reasons.
+ In this way, administrators can tightly control who is allowed to
+ use CGI programs. However, if the proper security precautions are
taken, there is no reason why CGI programs cannot be run from
arbitrary directories. For example, you may wish to let users
have web content in their home directories with the
- <code>UserDir</code> directive. If they want to have their own
- CGI programs, but don't have access to the main
- <code>cgi-bin</code> directory, they will need to be able to
+ <directive module="mod_userdir">UserDir</directive> directive.
+ If they want to have their own CGI programs, but don't have access to
+ the main <code>cgi-bin</code> directory, they will need to be able to
run CGI programs elsewhere.</p>
</section>
<section id="options">
<title>Explicitly using Options to permit CGI execution</title>
- <p>You could explicitly use the <code>Options</code>
- directive, inside your main server configuration file, to
- specify that CGI execution was permitted in a particular
+ <p>You could explicitly use the <directive module="core"
+ >Options</directive> directive, inside your main server configuration
+ file, to specify that CGI execution was permitted in a particular
directory:</p>
- <example><Directory /usr/local/apache/htdocs/somedir> <br />
- Options +ExecCGI<br />
- </Directory></example>
+ <example>
+ <Directory /usr/local/apache/htdocs/somedir><br />
+ <indent>
+ Options +ExecCGI<br />
+ </indent>
+ </Directory>
+ </example>
<p>The above directive tells Apache to permit the execution
of CGI files. You will also need to tell the server what
- files are CGI files. The following
- <code>AddHandler</code>
+ files are CGI files. The following <directive module="mod_mime"
+ >AddHandler</directive> directive tells the server to treat all
+ files with the <code>cgi</code> or <code>pl</code> extension as CGI
+ programs:</p>
- directive tells the server to treat all files with the
- <code>cgi</code> or <code>pl</code> extension as CGI programs:</p>
-
- <example>AddHandler cgi-script cgi pl</example>
+ <example>
+ AddHandler cgi-script cgi pl
+ </example>
</section>
<section id="htaccess">
<title>.htaccess files</title>
- <p>A <code>.htaccess</code> file is a way to set configuration
- directives on a per-directory basis. When Apache serves a
- resource, it looks in the directory from which it is serving
+ <p>A <a href="htaccess.html"><code>.htaccess</code> file</a> is a way
+ to set configuration directives on a per-directory basis. When Apache
+ serves a resource, it looks in the directory from which it is serving
a file for a file called <code>.htaccess</code>, and, if it
finds it, it will apply directives found therein.
<code>.htaccess</code> files can be permitted with the
- <code>AllowOverride</code> directive, which specifies what
- types of directives can
+ <directive module="core">AllowOverride</directive> directive,
+ which specifies what types of directives can
appear in these files, or if they are not allowed at all. To
permit the directive we will need for this purpose, the
following configuration will be needed in your main server
configuration:</p>
- <example>AllowOverride Options</example>
+ <example>
+ AllowOverride Options
+ </example>
<p>In the <code>.htaccess</code> file, you'll need the
following directive:</p>
- <example>Options +ExecCGI</example>
+ <example>
+ Options +ExecCGI
+ </example>
<p>which tells Apache that execution of CGI programs is
permitted in this directory.</p>
@@ -168,7 +172,9 @@
what sort of content it is receiving. Most of the time, this
will look like:</p>
- <example>Content-type: text/html</example>
+ <example>
+ Content-type: text/html
+ </example>
<p>Secondly, your output needs to be in HTML, or some other
format that a browser will be able to display. Most of the
@@ -187,9 +193,10 @@
file called <code>first.pl</code>, and put it in your
<code>cgi-bin</code> directory.</p>
- <example>#!/usr/bin/perl<br />
- print "Content-type: text/html\n\n";<br />
- print "Hello, World.";
+ <example>
+ #!/usr/bin/perl<br />
+ print "Content-type: text/html\n\n";<br />
+ print "Hello, World.";
</example>
<p>Even if you are not familiar with Perl, you should be able
@@ -201,20 +208,20 @@
talked about, followed by two carriage-return newline pairs.
This puts a blank line after the header, to indicate the end
of the HTTP headers, and the beginning of the body. The third
- line prints the string ``Hello, World.'' And that's the end
+ line prints the string "Hello, World.". And that's the end
of it.</p>
<p>If you open your favorite browser and tell it to get the
address</p>
- <example>http://www.example.com/cgi-bin/first.pl</example>
+ <example>
+ http://www.example.com/cgi-bin/first.pl
+ </example>
<p>or wherever you put your file, you will see the one line
- <code>Hello, World.</code>
-
- appear in your browser window. It's not very exciting, but
- once you get that working, you'll have a good chance of
- getting just about anything working.</p>
+ <code>Hello, World.</code> appear in your browser window.
+ It's not very exciting, but once you get that working, you'll
+ have a good chance of getting just about anything working.</p>
</section>
</section>
@@ -226,35 +233,21 @@
<dl>
<dt>The output of your CGI program</dt>
-
- <dd>Great! That means everything worked fine.
- </dd>
+ <dd>Great! That means everything worked fine.</dd>
<dt>The source code of your CGI program or a "POST Method Not
Allowed" message</dt>
-
<dd>That means that you have not properly configured Apache
to process your CGI program. Reread the section on
<a href="#configuringapachetopermitcgi">configuring
- Apache</a>
-
- and try to find what you missed.
- </dd>
+ Apache</a> and try to find what you missed.</dd>
<dt>A message starting with "Forbidden"</dt>
-
<dd>That means that there is a permissions problem. Check the
-
- <a href="#errorlogs">Apache error log</a>
-
- and the section below on
- <a href="#permissions">file permissions</a>.
-
- <br />
- </dd>
+ <a href="#errorlogs">Apache error log</a> and the section below on
+ <a href="#permissions">file permissions</a>.</dd>
<dt>A message saying "Internal Server Error"</dt>
-
<dd>If you check the
<a href="#errorlogs">Apache error log</a>, you will probably
find that it says "Premature end of
@@ -270,22 +263,23 @@
<p>Remember that the server does not run as you. That is,
when the server starts up, it is running with the permissions
- of an unprivileged user - usually ``nobody'', or ``www'' -
- and so it will need extra permissions to execute files that
- are owned by you. Usually, the way to give a file sufficient
- permissions to be executed by ``nobody'' is to give everyone
- execute permission on the file:</p>
+ of an unprivileged user - usually <code>nobody</code>, or
+ <code>www</code> - and so it will need extra permissions to
+ execute files that are owned by you. Usually, the way to give
+ a file sufficient permissions to be executed by <code>nobody</code>
+ is to give everyone execute permission on the file:</p>
- <example>chmod a+x first.pl</example>
+ <example>
+ chmod a+x first.pl
+ </example>
<p>Also, if your program reads from, or writes to, any other
files, those files will need to have the correct permissions
to permit this.</p>
<p>The exception to this is when the server is configured to
- use <a href="../suexec.html">suexec</a>.
-
- This program allows CGI programs to be run under different
+ use <a href="../suexec.html">suexec</a>. This program allows
+ CGI programs to be run under different
user permissions, depending on which virtual host or user
home directory they are located in. Suexec has very strict
permission checking, and any failure in that checking will
@@ -313,7 +307,9 @@
interpreter (often <code>perl</code>) indicated in the first
line of your CGI program, which will look something like:</p>
- <example>#!/usr/bin/perl</example>
+ <example>
+ #!/usr/bin/perl
+ </example>
<p>Make sure that this is in fact the path to the
interpreter.</p>
@@ -350,7 +346,7 @@
become useful to understand more about what's happening behind
the scenes. Specifically, how the browser and server
communicate with one another. Because although it's all very
- well to write a program that prints ``Hello, World.'', it's not
+ well to write a program that prints "Hello, World.", it's not
particularly useful.</p>
<section id="env">
@@ -373,9 +369,8 @@
<p>These variables are available to the CGI programmer, and
are half of the story of the client-server communication. The
complete list of required variables is at
- <a href="http://hoohoo.ncsa.uiuc.edu/cgi/env.html">
- http://hoohoo.ncsa.uiuc.edu/cgi/env.html</a>
- </p>
+ <a href="http://hoohoo.ncsa.uiuc.edu/cgi/env.html"
+ >http://hoohoo.ncsa.uiuc.edu/cgi/env.html</a>.</p>
<p>This simple Perl CGI program will display all of the
environment variables that are being passed around. Two
@@ -387,15 +382,17 @@
see some variables listed that were not in the official list.
In addition, Apache provides many different ways for you to
<a href="../env.html">add your own environment variables</a>
-
to the basic ones provided by default.</p>
<example>
- #!/usr/bin/perl<br />
- print "Content-type: text/html\n\n";<br />
- foreach $key (keys %ENV) {<br />
- print "$key --> $ENV{$key}<br>";<br />
- }</example>
+ #!/usr/bin/perl<br />
+ print "Content-type: text/html\n\n";<br />
+ foreach $key (keys %ENV) {<br />
+ <indent>
+ print "$key --> $ENV{$key}<br>";<br />
+ </indent>
+ }
+ </example>
</section>
<section id="stdin">
@@ -414,7 +411,7 @@
The program then can process that data as though it was
coming in from the keyboard, or from a file</p>
- <p>The ``special format'' is very simple. A field name and
+ <p>The "special format" is very simple. A field name and
its value are joined together with an equals (=) sign, and
pairs of values are joined together with an ampersand
(&). Inconvenient characters like spaces, ampersands, and
@@ -423,7 +420,7 @@
something like:</p>
<example>
- name=Rich%20Bowen&city=Lexington&state=KY&sidekick=Squirrel%20Monkey
+ name=Rich%20Bowen&city=Lexington&state=KY&sidekick=Squirrel%20Monkey
</example>
<p>You'll sometimes also see this type of string appended to
@@ -450,14 +447,14 @@
<p>If you're writing CGI programs in Perl, modules are
available on <a href="http://www.cpan.org/">CPAN</a>. The most
- popular module for this purpose is CGI.pm. You might
- also consider CGI::Lite, which implements a minimal set of
- functionality, which is all you need in most programs.</p>
+ popular module for this purpose is <code>CGI.pm</code>. You might
+ also consider <code>CGI::Lite</code>, which implements a minimal
+ set of functionality, which is all you need in most programs.</p>
<p>If you're writing CGI programs in C, there are a variety of
- options. One of these is the CGIC library, from
- <a href="http://www.boutell.com/cgic/">http://www.boutell.com/cgic/</a>
- </p>
+ options. One of these is the <code>CGIC</code> library, from
+ <a href="http://www.boutell.com/cgic/"
+ >http://www.boutell.com/cgic/</a>.</p>
</section>
<section id="moreinfo">
@@ -465,20 +462,18 @@
<p>There are a large number of CGI resources on the web. You
can discuss CGI problems with other users on the Usenet group
- comp.infosystems.www.authoring.cgi. And the -servers mailing
+ <a href="news:comp.infosystems.www.authoring.cgi"
+ >comp.infosystems.www.authoring.cgi</a>. And the -servers mailing
list from the HTML Writers Guild is a great source of answers
to your questions. You can find out more at
- <a href="http://www.hwg.org/lists/hwg-servers/">
- http://www.hwg.org/lists/hwg-servers/</a>
- </p>
+ <a href="http://www.hwg.org/lists/hwg-servers/"
+ >http://www.hwg.org/lists/hwg-servers/</a>.</p>
<p>And, of course, you should probably read the CGI
specification, which has all the details on the operation of
CGI programs. You can find the original version at the
- <a href="http://hoohoo.ncsa.uiuc.edu/cgi/interface.html">
- NCSA</a>
-
- and there is an updated draft at the
+ <a href="http://hoohoo.ncsa.uiuc.edu/cgi/interface.html"
+ >NCSA</a> and there is an updated draft at the
<a href="http://web.golux.com/coar/cgi/">Common Gateway
Interface RFC project</a>.</p>
diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en
index 8867ef6..6b85530 100644
--- a/docs/manual/howto/htaccess.html.en
+++ b/docs/manual/howto/htaccess.html.en
@@ -4,12 +4,38 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache Tutorial: .htaccess files - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">How-To / Tutorials</a></div><div id="page-content"><div id="preamble"><h1>Apache Tutorial: .htaccess files</h1>
+ -->
+<title>Apache Tutorial: .htaccess files - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">How-To / Tutorials</a></div><div id="page-content"><div id="preamble"><h1>Apache Tutorial: .htaccess files</h1>
<p><code>.htaccess</code> files provide a way to make configuration
changes on a per-directory basis.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">.htaccess files</a></li><li><img alt="" src="../images/down.gif" /> <a href="#what">What they are/How to use them</a></li><li><img alt="" src="../images/down.gif" /> <a href="#when">When (not) to use .htaccess files</a></li><li><img alt="" src="../images/down.gif" /> <a href="#how">How directives are applied</a></li><li><img alt="" src="../images/down.gif" /> <a href="#auth">Authentication example</a></li><li><img alt="" src="../images/down.gif" /> <a href="#ssi">Server side includes example</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cgi">CGI example</a></li><li><img alt="" src="../images/down.gif" /> <a href="#troubleshoot">Troubleshooting</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">.htaccess files</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/core.html">core</a></code></li><li><code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code></li><li><code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li><li><code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code></li><li><code class="directive"><a href="../mod/core.html#require">Require</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="what" id="what">What they are/How to use them</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">.htaccess files</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#what">What they are/How to use them</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#when">When (not) to use .htaccess files</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#how">How directives are applied</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#auth">Authentication example</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ssi">Server Side Includes example</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cgi">CGI example</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#troubleshoot">Troubleshooting</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">.htaccess files</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/core.html">core</a></code></li><li><code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code></li><li><code class="directive"><a href="../mod/mod_auth.html#authgroupfile">AuthGroupFile</a></code></li><li><code class="directive"><a href="../mod/core.html#require">Require</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="what" id="what">What they are/How to use them</a></h2>
<p><code>.htaccess</code> files (or "distributed configuration files")
@@ -18,17 +44,16 @@
particular document directory, and the directives apply to that
directory, and all subdirectories thereof.</p>
-<div class="note">
- <p>Note: If you want to call your <code>.htaccess</code> file something
- else, you can change the name of the file using the <code><a href="../mod/core.html#accessfilename">AccessFileName</a></code>
- directive. For example, if you would rather call the file
- <code>.config</code> then you can put the following in your server
- configuration file:</p>
+ <div class="note"><h3>Note:</h3>
+ <p>If you want to call your <code>.htaccess</code> file something
+ else, you can change the name of the file using the <code class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code> directive. For example,
+ if you would rather call the file <code>.config</code> then you
+ can put the following in your server configuration file:</p>
- <div class="example"><p><code>
- AccessFileName .config
- </code></p></div>
-</div>
+ <div class="example"><p><code>
+ AccessFileName .config
+ </code></p></div>
+ </div>
<p>What you can put in these files is determined by the <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
directive. This directive specifies, in categories, what directives
@@ -41,30 +66,28 @@
<p>For example, if you look at the documentation for the <code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code>
directive, you will find that it is permitted in <code>.htaccess</code>
files. (See the Context line in the directive summary.) The <a href="../mod/directive-dict.html#Context">Override</a> line reads
- "<code>FileInfo</code>". Thus, you must have at least
- "<code>AllowOverride FileInfo</code>" in order for this directive to be
+ <code>FileInfo</code>. Thus, you must have at least
+ <code>AllowOverride FileInfo</code> in order for this directive to be
honored in <code>.htaccess</code> files.</p>
-<div class="example"><h3>Example:</h3><table>
+ <div class="example"><h3>Example:</h3><table>
<tr>
<td><a href="../mod/directive-dict.html#Context">Context:</a></td>
-
<td>server config, virtual host, directory, .htaccess</td>
</tr>
<tr>
<td><a href="../mod/directive-dict.html#Override">Override:</a></td>
-
<td>FileInfo</td>
</tr>
</table></div>
-
<p>If you are unsure whether a particular directive is permitted in a
<code>.htaccess</code> file, look at the documentation for that
- directive, and check the Context line for ".htaccess."</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="when" id="when">When (not) to use .htaccess files</a></h2>
-
+ directive, and check the Context line for ".htaccess".</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="when" id="when">When (not) to use .htaccess files</a></h2>
<p>In general, you should never use <code>.htaccess</code> files unless
you don't have access to the main server configuration file. There is,
@@ -117,8 +140,9 @@
<p>And so, for each file access out of that directory, there are 4
additional file-system accesses, even if none of those files are
- present. (Note that this would only be the case if .htaccess files were
- enabled for /, which is not usually the case.)</p>
+ present. (Note that this would only be the case if
+ <code>.htaccess</code> files were enabled for <code>/</code>, which
+ is not usually the case.)</p>
<p>The second consideration is one of security. You are permitting
users to modify server configuration, which may result in changes over
@@ -127,13 +151,15 @@
privileges than they need will lead to additional technical support
requests. Make sure you clearly tell your users what level of
privileges you have given them. Specifying exactly what you have set
- <code>AllowOverride</code> to, and pointing them to the relevant
- documentation, will save yourself a lot of confusion later.</p>
+ <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> to, and pointing them
+ to the relevant documentation, will save yourself a lot of confusion
+ later.</p>
- <p>Note that it is completely equivalent to put a .htaccess file in a
- directory <code>/www/htdocs/example</code> containing a directive, and
- to put that same directive in a Directory section <code><Directory
- /www/htdocs/example></code> in your main server configuration:</p>
+ <p>Note that it is completely equivalent to put a <code>.htaccess</code>
+ file in a directory <code>/www/htdocs/example</code> containing a
+ directive, and to put that same directive in a Directory section
+ <code><Directory /www/htdocs/example></code> in your main server
+ configuration:</p>
<p><code>.htaccess</code> file in <code>/www/htdocs/example</code>:</p>
@@ -144,9 +170,11 @@
<div class="example"><h3>Section from your <code>httpd.conf</code>
file</h3><p><code>
- <Directory /www/htdocs/example><br />
- AddType text/example .exm<br />
- </Directory>
+ <Directory /www/htdocs/example><br />
+ <span class="indent">
+ AddType text/example .exm<br />
+ </span>
+ </Directory>
</code></p></div>
<p>However, putting this configuration in your server configuration
@@ -155,12 +183,15 @@
requested.</p>
<p>The use of <code>.htaccess</code> files can be disabled completely
- by setting the <code>AllowOverride</code> directive to "none"</p>
+ by setting the <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
+ directive to <code>none</code>:</p>
<div class="example"><p><code>
AllowOverride None
</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="how" id="how">How directives are applied</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="how" id="how">How directives are applied</a></h2>
<p>The configuration directives found in a <code>.htaccess</code> file
are applied to the directory in which the <code>.htaccess</code> file
@@ -198,17 +229,19 @@
permitted, as only <code>Options Includes</code> is in effect, which
completely overrides any earlier setting that may have been in
place.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="auth" id="auth">Authentication example</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="auth" id="auth">Authentication example</a></h2>
<p>If you jumped directly to this part of the document to find out how
to do authentication, it is important to note one thing. There is a
common misconception that you are required to use
<code>.htaccess</code> files in order to implement password
authentication. This is not the case. Putting authentication directives
- in a <code><Directory></code> section, in your main server
- configuration file, is the preferred way to implement this, and
- <code>.htaccess</code> files should be used only if you don't have
- access to the main server configuration file. See <a href="#when">above</a> for a discussion of when you should and should
+ in a <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>
+ section, in your main server configuration file, is the preferred way
+ to implement this, and <code>.htaccess</code> files should be used only
+ if you don't have access to the main server configuration file. See <a href="#when">above</a> for a discussion of when you should and should
not use <code>.htaccess</code> files.</p>
<p>Having said that, if you still think you need to use a
@@ -233,7 +266,9 @@
<p>Please see the <a href="auth.html">authentication tutorial</a> for a
more complete discussion of authentication and authorization.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="ssi" id="ssi">Server side includes example</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ssi" id="ssi">Server Side Includes example</a></h2>
<p>Another common use of <code>.htaccess</code> files is to enable
Server Side Includes for a particular directory. This may be done with
@@ -252,7 +287,9 @@
<p>Please see the <a href="ssi.html">SSI tutorial</a> for a more
complete discussion of server-side includes.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="cgi" id="cgi">CGI example</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cgi" id="cgi">CGI example</a></h2>
<p>Finally, you may wish to use a <code>.htaccess</code> file to permit
the execution of CGI programs in a particular directory. This may be
@@ -272,13 +309,16 @@
SetHandler cgi-script
</code></p></div>
- <p>Note that <code>AllowOverride Options</code> must be in effect for
- these directives to have any effect.</p>
+ <p>Note that <code>AllowOverride Options</code> and <code>AllowOverride
+ FileInfo</code> must both be in effect for these directives to have any
+ effect.</p>
<p>Please see the <a href="cgi.html">CGI tutorial</a> for a more
complete discussion of CGI programming and configuration.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="troubleshoot" id="troubleshoot">Troubleshooting</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="troubleshoot" id="troubleshoot">Troubleshooting</a></h2>
<p>When you put configuration directives in a <code>.htaccess</code>
file, and you don't get the desired effect, there are a number of
@@ -294,8 +334,12 @@
<p>If, on the other hand, you are getting server errors when trying to
access documents, check your Apache error log. It will likely tell you
- that the directive used in your .htaccess file is not permitted.
- Alternately, it may tell you that you had a syntax error, which you
- will then need to fix.</p>
+ that the directive used in your <code>.htaccess</code> file is not
+ permitted. Alternately, it may tell you that you had a syntax error,
+ which you will then need to fix.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/htaccess.xml b/docs/manual/howto/htaccess.xml
index e824e01..a6a3ae8 100755
--- a/docs/manual/howto/htaccess.xml
+++ b/docs/manual/howto/htaccess.xml
@@ -16,8 +16,7 @@
<related>
<modulelist>
<module>core</module>
- <module>mod_authn_file</module>
- <module>mod_authz_groupfile</module>
+ <module>mod_auth</module>
<module>mod_cgi</module>
<module>mod_include</module>
<module>mod_mime</module>
@@ -31,8 +30,8 @@
<directive module="core">SetHandler</directive>
<directive module="core">AuthType</directive>
<directive module="core">AuthName</directive>
- <directive module="mod_authn_file">AuthUserFile</directive>
- <directive module="mod_authz_groupfile">AuthGroupFile</directive>
+ <directive module="mod_auth">AuthUserFile</directive>
+ <directive module="mod_auth">AuthGroupFile</directive>
<directive module="core">Require</directive>
</directivelist>
@@ -48,18 +47,17 @@
particular document directory, and the directives apply to that
directory, and all subdirectories thereof.</p>
-<note>
- <p>Note: If you want to call your <code>.htaccess</code> file something
- else, you can change the name of the file using the <code><a
- href="../mod/core.html#accessfilename">AccessFileName</a></code>
- directive. For example, if you would rather call the file
- <code>.config</code> then you can put the following in your server
- configuration file:</p>
+ <note><title>Note:</title>
+ <p>If you want to call your <code>.htaccess</code> file something
+ else, you can change the name of the file using the <directive
+ module="core">AccessFileName</directive> directive. For example,
+ if you would rather call the file <code>.config</code> then you
+ can put the following in your server configuration file:</p>
- <example>
- AccessFileName .config
- </example>
-</note>
+ <example>
+ AccessFileName .config
+ </example>
+ </note>
<p>What you can put in these files is determined by the <directive
module="core">AllowOverride</directive>
@@ -76,36 +74,32 @@
directive, you will find that it is permitted in <code>.htaccess</code>
files. (See the Context line in the directive summary.) The <a
href="../mod/directive-dict.html#Context">Override</a> line reads
- "<code>FileInfo</code>". Thus, you must have at least
- "<code>AllowOverride FileInfo</code>" in order for this directive to be
+ <code>FileInfo</code>. Thus, you must have at least
+ <code>AllowOverride FileInfo</code> in order for this directive to be
honored in <code>.htaccess</code> files.</p>
-<example><title>Example:</title>
+ <example><title>Example:</title>
<table>
<tr>
<td><a
href="../mod/directive-dict.html#Context">Context:</a></td>
-
<td>server config, virtual host, directory, .htaccess</td>
</tr>
<tr>
<td><a
href="../mod/directive-dict.html#Override">Override:</a></td>
-
<td>FileInfo</td>
</tr>
</table>
-</example>
-
+ </example>
<p>If you are unsure whether a particular directive is permitted in a
<code>.htaccess</code> file, look at the documentation for that
- directive, and check the Context line for ".htaccess."</p>
+ directive, and check the Context line for ".htaccess".</p>
</section>
- <section id="when">
- <title>When (not) to use .htaccess files</title>
+ <section id="when"><title>When (not) to use .htaccess files</title>
<p>In general, you should never use <code>.htaccess</code> files unless
you don't have access to the main server configuration file. There is,
@@ -160,8 +154,9 @@
<p>And so, for each file access out of that directory, there are 4
additional file-system accesses, even if none of those files are
- present. (Note that this would only be the case if .htaccess files were
- enabled for /, which is not usually the case.)</p>
+ present. (Note that this would only be the case if
+ <code>.htaccess</code> files were enabled for <code>/</code>, which
+ is not usually the case.)</p>
<p>The second consideration is one of security. You are permitting
users to modify server configuration, which may result in changes over
@@ -170,13 +165,15 @@
privileges than they need will lead to additional technical support
requests. Make sure you clearly tell your users what level of
privileges you have given them. Specifying exactly what you have set
- <code>AllowOverride</code> to, and pointing them to the relevant
- documentation, will save yourself a lot of confusion later.</p>
+ <directive module="core">AllowOverride</directive> to, and pointing them
+ to the relevant documentation, will save yourself a lot of confusion
+ later.</p>
- <p>Note that it is completely equivalent to put a .htaccess file in a
- directory <code>/www/htdocs/example</code> containing a directive, and
- to put that same directive in a Directory section <code><Directory
- /www/htdocs/example></code> in your main server configuration:</p>
+ <p>Note that it is completely equivalent to put a <code>.htaccess</code>
+ file in a directory <code>/www/htdocs/example</code> containing a
+ directive, and to put that same directive in a Directory section
+ <code><Directory /www/htdocs/example></code> in your main server
+ configuration:</p>
<p><code>.htaccess</code> file in <code>/www/htdocs/example</code>:</p>
@@ -187,9 +184,11 @@
<example><title>Section from your <code>httpd.conf</code>
file</title>
- <Directory /www/htdocs/example><br />
- AddType text/example .exm<br />
- </Directory>
+ <Directory /www/htdocs/example><br />
+ <indent>
+ AddType text/example .exm<br />
+ </indent>
+ </Directory>
</example>
<p>However, putting this configuration in your server configuration
@@ -198,7 +197,8 @@
requested.</p>
<p>The use of <code>.htaccess</code> files can be disabled completely
- by setting the <code>AllowOverride</code> directive to "none"</p>
+ by setting the <directive module="core">AllowOverride</directive>
+ directive to <code>none</code>:</p>
<example>
AllowOverride None
@@ -253,10 +253,10 @@
common misconception that you are required to use
<code>.htaccess</code> files in order to implement password
authentication. This is not the case. Putting authentication directives
- in a <code><Directory></code> section, in your main server
- configuration file, is the preferred way to implement this, and
- <code>.htaccess</code> files should be used only if you don't have
- access to the main server configuration file. See <a
+ in a <directive module="core" type="section">Directory</directive>
+ section, in your main server configuration file, is the preferred way
+ to implement this, and <code>.htaccess</code> files should be used only
+ if you don't have access to the main server configuration file. See <a
href="#when">above</a> for a discussion of when you should and should
not use <code>.htaccess</code> files.</p>
@@ -284,7 +284,7 @@
more complete discussion of authentication and authorization.</p>
</section>
-<section id="ssi"><title>Server side includes example</title>
+<section id="ssi"><title>Server Side Includes example</title>
<p>Another common use of <code>.htaccess</code> files is to enable
Server Side Includes for a particular directory. This may be done with
@@ -325,8 +325,9 @@
SetHandler cgi-script
</example>
- <p>Note that <code>AllowOverride Options</code> must be in effect for
- these directives to have any effect.</p>
+ <p>Note that <code>AllowOverride Options</code> and <code>AllowOverride
+ FileInfo</code> must both be in effect for these directives to have any
+ effect.</p>
<p>Please see the <a href="cgi.html">CGI tutorial</a> for a more
complete discussion of CGI programming and configuration.</p>
@@ -350,10 +351,10 @@
<p>If, on the other hand, you are getting server errors when trying to
access documents, check your Apache error log. It will likely tell you
- that the directive used in your .htaccess file is not permitted.
- Alternately, it may tell you that you had a syntax error, which you
- will then need to fix.</p>
+ that the directive used in your <code>.htaccess</code> file is not
+ permitted. Alternately, it may tell you that you had a syntax error,
+ which you will then need to fix.</p>
- </section>
+</section>
</manualpage>
diff --git a/docs/manual/howto/index.html.en b/docs/manual/howto/index.html.en
index c28b750..ea60d64 100644
--- a/docs/manual/howto/index.html.en
+++ b/docs/manual/howto/index.html.en
@@ -4,7 +4,22 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>How-To / Tutorials - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="../"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>How-To / Tutorials</h1></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="howto" id="howto">How-To / Tutorials</a></h2>
+ -->
+<title>How-To / Tutorials - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="../"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>How-To / Tutorials</h1></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="howto" id="howto">How-To / Tutorials</a></h2>
@@ -73,4 +88,8 @@
</dd>
</dl>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/public_html.html.en b/docs/manual/howto/public_html.html.en
index dcabd2d..0934c33 100644
--- a/docs/manual/howto/public_html.html.en
+++ b/docs/manual/howto/public_html.html.en
@@ -4,18 +4,41 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Per-user web directories - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">How-To / Tutorials</a></div><div id="page-content"><div id="preamble"><h1>Per-user web directories</h1>
+ -->
+<title>Per-user web directories - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">How-To / Tutorials</a></div><div id="page-content"><div id="preamble"><h1>Per-user web directories</h1>
<p>On systems with multiple users, each user can be permitted to have a
web site in their home directory using the <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive. Visitors
to a URL <code>http://example.com/~username/</code> will get content
out of the home directory of the user "<code>username</code>", out of
the subdirectory specified by the <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">Per-user web directories</a></li><li><img alt="" src="../images/down.gif" /> <a href="#userdir">Setting the file path with UserDir</a></li><li><img alt="" src="../images/down.gif" /> <a href="#enable">Restricting what users are permitted to use this
- feature</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cgi">Enabling a cgi directory for each user</a></li><li><img alt="" src="../images/down.gif" /> <a href="#htaccess">Allowing users to alter configuration</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../urlmapping.html">Mapping URLs to the Filesystem</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">Per-user web directories</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">Per-user web directories</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#userdir">Setting the file path with UserDir</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enable">Restricting what users are permitted to use this
+ feature</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cgi">Enabling a cgi directory for each user</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#htaccess">Allowing users to alter configuration</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="../urlmapping.html">Mapping URLs to the Filesystem</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">Per-user web directories</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_userdir.html">mod_userdir</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code></li><li><code class="directive"><a href="../mod/core.html#directorymatch">DirectoryMatch</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</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="userdir" id="userdir">Setting the file path with UserDir</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="userdir" id="userdir">Setting the file path with UserDir</a></h2>
<p>The <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>
@@ -57,7 +80,9 @@
translated to the file path
<code>/var/www/rbowen/docs/file.html</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="enable" id="enable">Restricting what users are permitted to use this
+ </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">Restricting what users are permitted to use this
feature</a></h2>
@@ -82,7 +107,9 @@
<p>See <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>
documentation for additional examples.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="cgi" id="cgi">Enabling a cgi directory for each user</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cgi" id="cgi">Enabling a cgi directory for each user</a></h2>
<p>In order to give each user their own cgi-bin directory, you can use
@@ -97,7 +124,9 @@
</Directory>
</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="htaccess" id="htaccess">Allowing users to alter configuration</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="htaccess" id="htaccess">Allowing users to alter configuration</a></h2>
<p>If you want to allows users to modify the server configuration in
@@ -107,4 +136,8 @@
to modify. See the <a href="htaccess.html">.htaccess tutorial</a> for
additional details on how this works.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/ssi.html.en b/docs/manual/howto/ssi.html.en
index 09a1061..4fb58a4 100644
--- a/docs/manual/howto/ssi.html.en
+++ b/docs/manual/howto/ssi.html.en
@@ -4,10 +4,35 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache Tutorial: Introduction to Server Side Includes - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">How-To / Tutorials</a></div><div id="page-content"><div id="preamble"><h1>Apache Tutorial: Introduction to Server Side Includes</h1>
+ -->
+<title>Apache Tutorial: Introduction to Server Side Includes - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">How-To / Tutorials</a></div><div id="page-content"><div id="preamble"><h1>Apache Tutorial: Introduction to Server Side Includes</h1>
<p>Server-side includes provide a means to add dynamic content to
existing HTML documents.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">Introduction</a></li><li><img alt="" src="../images/down.gif" /> <a href="#what">What are SSI?</a></li><li><img alt="" src="../images/down.gif" /> <a href="#configuring">Configuring your server to permit SSI</a></li><li><img alt="" src="../images/down.gif" /> <a href="#basic">Basic SSI directives</a></li><li><img alt="" src="../images/down.gif" /> <a href="#additionalexamples">Additional examples</a></li><li><img alt="" src="../images/down.gif" /> <a href="#config">What else can I config?</a></li><li><img alt="" src="../images/down.gif" /> <a href="#exec">Executing commands</a></li><li><img alt="" src="../images/down.gif" /> <a href="#advanced">Advanced SSI techniques</a></li><li><img alt="" src="../images/down.gif" /> <a href="#conclusion">Conclusion</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">Introduction</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">Introduction</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#what">What are SSI?</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#configuring">Configuring your server to permit SSI</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#basic">Basic SSI directives</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#additionalexamples">Additional examples</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#config">What else can I config?</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#exec">Executing commands</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#advanced">Advanced SSI techniques</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#conclusion">Conclusion</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">Introduction</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_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_expires.html">mod_expires</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code></li><li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li><li><code class="directive"><a href="../mod/mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></code></li></ul></td></tr></table>
<p>This article deals with Server Side Includes, usually called
@@ -19,7 +44,9 @@
the somewhat more advanced things that can be done with SSI,
such as conditional statements in your SSI directives.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="what" id="what">What are SSI?</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="what" id="what">What are SSI?</a></h2>
<p>SSI (Server Side Includes) are directives that are placed in
HTML pages, and evaluated on the server while the pages are
@@ -35,7 +62,9 @@
But if a majority of your page is being generated at the time
that it is served, you need to look for some other
solution.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="configuring" id="configuring">Configuring your server to permit SSI</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configuring" id="configuring">Configuring your server to permit SSI</a></h2>
<p>To permit SSI on your server, you must have the following
@@ -114,7 +143,9 @@
time on your files, thereby letting browsers and proxies
know that it is acceptable to cache them.</li>
</ol>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="basic" id="basic">Basic SSI directives</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="basic" id="basic">Basic SSI directives</a></h2>
<p>SSI directives have the following syntax:</p>
<div class="example"><p><code>
@@ -175,7 +206,9 @@
</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="additionalexamples" id="additionalexamples">Additional examples</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="additionalexamples" id="additionalexamples">Additional examples</a></h2>
<p>Following are some specific examples of things you can do in
@@ -211,7 +244,7 @@
syntax is the same.</p>
-<h3><a name="footer" id="footer">Including a standard footer</a></h3>
+<h3><a name="standard-footer" id="standard-footer">Including a standard footer</a></h3>
<p>If you are managing any site that is more than a few pages,
@@ -243,7 +276,9 @@
include another file, and so on.</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">What else can I config?</a></h2>
+</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">What else can I config?</a></h2>
<p>In addition to being able to <code>config</code> the time
@@ -271,7 +306,9 @@
can specify <code>bytes</code> for a full count in bytes, or
<code>abbrev</code> for an abbreviated number in Kb or Mb, as
appropriate.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="exec" id="exec">Executing commands</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="exec" id="exec">Executing commands</a></h2>
<p>I expect that I'll have an article some time in the coming
@@ -307,7 +344,9 @@
feature disabled. You can allow SSI, but not the
<code>exec</code> feature, with the <code>IncludesNOEXEC</code>
argument to the <code>Options</code> directive.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="advanced" id="advanced">Advanced SSI techniques</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="advanced" id="advanced">Advanced SSI techniques</a></h2>
<p>In addition to spitting out content, Apache SSI gives you
@@ -423,10 +462,16 @@
this functionality can let you do some pretty involved dynamic
stuff without ever resorting to 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="conclusion" id="conclusion">Conclusion</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="conclusion" id="conclusion">Conclusion</a></h2>
<p>SSI is certainly not a replacement for CGI, or other
technologies used for generating dynamic web pages. But it is a
great way to add small amounts of dynamic content to pages,
without doing a lot of extra work.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/ssi.html.ja.jis b/docs/manual/howto/ssi.html.ja.jis
index 30ef7ba..c750029 100644
--- a/docs/manual/howto/ssi.html.ja.jis
+++ b/docs/manual/howto/ssi.html.ja.jis
@@ -4,22 +4,49 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache $B%A%e!<%H%j%"%k(B: Server Side Includes $BF~Lg(B - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%A%e!<%H%j%"%k(B: Server Side Includes $BF~Lg(B</h1>
-<p>$B%5!<%P%5%$%I%$%s%/%k!<%I$K$h$C$F!"4{(B$BB8$N(B HTML
-$B%I%-%e%a%s%H$KF0E*$J%3%s%F%s%D$rDI2C$9$k$3$H$,$G(B$B$-$^$9!#(B</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">$B$O$8$a$K(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#what">SSI $B$H$O(B ?</a></li><li><img alt="" src="../images/down.gif" /> <a href="#configuring">SSI $B$r5v2D$9$k$?$a$N%5!<%P$N@_Dj(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#basic">$B4pK\E*$J(B SSI $B%G%#%l%/%F%#%V(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#additionalexamples">$BDI2C$NNc(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#config">$BB>$K2?$,@_Dj$G$-$k$N$+(B ?</a></li><li><img alt="" src="../images/down.gif" /> <a href="#exec">$B%3%^%s%I$N<B9T(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#advanced">$B9bEY$J(B SSI $B%F%/%K%C%/(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#conclusion">$B=*$o$j$K(B</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">$B$O$8$a$K(B</a></h2>
+ -->
+<title>Apache $B%A%e!<%H%j%"%k(B: Server Side Includes $BF~Lg(B - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%A%e!<%H%j%"%k(B: Server Side Includes $BF~Lg(B</h1>
+<p>$B%5!<%P%5%$%I%$%s%/%k!<%I$K$h$C$F!"4{B8$N(B HTML
+$B%I%-%e%a%s%H$KF0E*$J%3%s%F%s%D$rDI2C$9$k$3$H$,$G$-$^$9!#(B</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">$B$O$8$a$K(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#what">SSI $B$H$O(B ?</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#configuring">SSI $B$r5v2D$9$k$?$a$N%5!<%P$N@_Dj(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#basic">$B4pK\E*$J(B SSI $B%G%#%l%/%F%#%V(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#additionalexamples">$BDI2C$NNc(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#config">$BB>$K2?$,@_Dj$G$-$k$N$+(B ?</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#exec">$B%3%^%s%I$N<B9T(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#advanced">$B9bEY$J(B SSI $B%F%/%K%C%/(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#conclusion">$B=*$o$j$K(B</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">$B$O$8$a$K(B</a></h2>
<table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_expires.html">mod_expires</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code></li><li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li><li><code class="directive"><a href="../mod/mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></code></li></ul></td></tr></table>
<p>$B$3$N5-;v$O!"DL>o$OC1$K(B SSI $B$H8F$P$l$k(B Server Side Includes
$B$r07$$$^$9!#$3$N5-;v$K$*$$$F$O!"%5!<%P$G$N(B SSI $B$r5v2D$9$k$?$a$N@_Dj$H!"(B
- $B8=:_$N(B HTML $B%Z!<%8$KF0E*$J%3%s%F%s%D$r2C$($k$?$a$N$$$/$D$+$N(B$B4pK\E*$J(B
+ $B8=:_$N(B HTML $B%Z!<%8$KF0E*$J%3%s%F%s%D$r2C$($k$?$a$N$$$/$D$+$N4pK\E*$J(B
SSI $B5;=Q$r>R2p$7$^$9!#(B</p>
<p>$B5-;v$N8eH>$G$O!"(BSSI $B%G%#%l%/%F%#%V$G(B SSI
$B$H6&$K<B9T$9$k$3$H$,$G$-$k>r7oJ8$N$h$&$J(B
$B4vJ,9bEY$J;vJA$K$D$$$F=R$Y$F$$$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="what" id="what">SSI $B$H$O(B ?</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="what" id="what">SSI $B$H$O(B ?</a></h2>
<p>SSI (Server Side Includes) $B$O!"(BHTML
$B%Z!<%8Cf$KG[CV$5$l$k%G%#%l%/%F%#%V$G$"$j!"(B
@@ -33,7 +60,9 @@
SSI $B$O8=:_;~9o$N$h$&$J>.$5$$>pJs$r2C$($k$K$O$&$C$F$D$1$NJ}K!$G$9!#(B
$B$7$+$7!"$=$N%Z!<%8$N$[$H$s$I$NItJ,$,Ds6!;~$K@8@.$5$l$k>l9g$O!"(B
$BB>$NJ}K!$rC5$9I,MW$,$"$j$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="configuring" id="configuring">SSI $B$r5v2D$9$k$?$a$N%5!<%P$N@_Dj(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configuring" id="configuring">SSI $B$r5v2D$9$k$?$a$N%5!<%P$N@_Dj(B</a></h2>
<p>$B%5!<%P$G(B SSI $B$r5v2D$9$k$K$O!"(B<code>httpd.conf</code>
@@ -43,7 +72,7 @@
Options +Includes
</code></p></div>
- <p>$B$3$N;XDj$O(B$B!"%U%!%$%k$r(B SSI
+ <p>$B$3$N;XDj$O!"%U%!%$%k$r(B SSI
$B%G%#%l%/%F%#%V$G2r@O$5$;$k$3$H$r5v2D$9$k$H$$$&$3$H$r(B Apache
$B$KEA$($^$9!#$[$H$s$I$N@_Dj$G$O$*8_$$$r>e=q$-$G$-$k!"J#?t$N(B
<code class="directive"><a href="../mod/core.html#options">Options</a></code> $B$,$"$k$3$H$K(B
@@ -87,7 +116,7 @@
<p>$B9T$J$&$Y$-$G$O$J$$$3$H$K4X$9$kC;$$%3%a%s%H!#;~!9C/$+$,!"A4$F$N(B
<code>.html</code> $B%U%!%$%k$r(B SSI $B$G2r@O$9$k$h$&(B Apache $B$KEA$($l$P!"(B
$B$o$6$o$6(B <code>.shtml</code> $B$H$$$&%U%!%$%kL>$K$9$kI,MW$,$J$$$H$$$C$F(B
- $BA&$a$k$N$r8+$k$3$H$G$7$g$&!#$3$&$$$&?M$?$A$O!"$*(B$B$=$i$/(B
+ $BA&$a$k$N$r8+$k$3$H$G$7$g$&!#$3$&$$$&?M$?$A$O!"$*$=$i$/(B
<code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>
$B$K$D$$$FJ9$$$?$3$H$,$J$$$N$G$7$g$&!#(B
$B$3$NJ}K!$K$D$$$FCm0U$9$k$3$H$O!"$?$H$((B SSI
@@ -116,7 +145,9 @@
$B%U%!%$%k$,L58z$K$J$k;~9o$rL@<($7$^$9!#$3$l$K$h$j!"(B
$B%V%i%&%6$H%W%m%-%7$K%-%c%C%7%e$,M-8z$G$"$k$3$H$rDLCN$7$^$9!#(B</li>
</ol>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="basic" id="basic">$B4pK\E*$J(B SSI $B%G%#%l%/%F%#%V(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="basic" id="basic">$B4pK\E*$J(B SSI $B%G%#%l%/%F%#%V(B</a></h2>
<p>SSI $B%G%#%l%/%F%#%V$O0J2<$NJ8K!$G5-=R$7$^$9(B:</p>
<div class="example"><p><code>
@@ -175,7 +206,9 @@
</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="additionalexamples" id="additionalexamples">$BDI2C$NNc(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="additionalexamples" id="additionalexamples">$BDI2C$NNc(B</a></h2>
<p>$B0J2<$O!"(BSSI $B$r;HMQ$7$F(B HTML
@@ -211,7 +244,7 @@
<code>strftime</code> $B$G8!:w$7$F$_$F$/$@$5$$!#J8K!$OF1$8$G$9!#(B</p>
-<h3><a name="footer" id="footer">$BI8=`$N%U%C%?$rA^F~$9$k(B</a></h3>
+<h3><a name="standard-footer" id="standard-footer">$BI8=`$N%U%C%?$rA^F~$9$k(B</a></h3>
<p>$B$b$7?t%Z!<%8$rD6$($k%Z!<%8$r;}$D%5%$%H$r4IM}$7$F$$$k$J$i$P!"(B
@@ -243,7 +276,9 @@
$BA^F~MQ$N%U%!%$%k$OB>$N%U%!%$%k$r:F5"E*$KA^F~$9$k$3$H$,$G$-$^$9!#(B</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">$BB>$K2?$,@_Dj$G$-$k$N$+(B ?</a></h2>
+</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">$BB>$K2?$,@_Dj$G$-$k$N$+(B ?</a></h2>
<p>$B;~9o=q<0$r(B <code>config</code> $B$G@_Dj$G$-$k$3$H$K2C$($F!"(B
@@ -270,7 +305,9 @@
$BJV$5$l$k%U%!%$%k%5%$%:$N=q<0$r@_Dj$9$k$3$H$,$G$-$^$9!#(B
$B%P%$%H?t$K$O(B <code>bytes</code> $B$r!"E,Ev$K(B Kb $B$d(B Mb
$B$KC;=L$5$;$k$K$O(B <code>abbrev</code> $B$r;XDj$9$k$3$H$,$G$-$^$9!#(B</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="exec" id="exec">$B%3%^%s%I$N<B9T(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="exec" id="exec">$B%3%^%s%I$N<B9T(B</a></h2>
<p>$B:#8e?t%v7n$N$&$A$K!">.$5$J(B CGI $B%W%m%0%i%`$H(B SSI
@@ -278,7 +315,7 @@
<code>exec</code> $BMWAG$K$h$C$F9T$J$&$3$H$,$G$-$k$3$H$r<($7$^$9!#(B
SSI $B$K%7%'%k(B ($B@53N$K$O(B <code>/bin/sh</code>$B!#(BWin32 $B$J$i$P(B DOS $B%7%'%k(B)
$B$r;HMQ$7$F%3%^%s%I$r<B9T$5$;$k$3$H$,$G$-$^$9!#(B
- $B2<5-(B$B$NNc$G$O!"%G%#%l%/%H%j%j%9%H=PNO$r9T$J$$$^$9!#(B</p>
+ $B2<5-$NNc$G$O!"%G%#%l%/%H%j%j%9%H=PNO$r9T$J$$$^$9!#(B</p>
<div class="example"><p><code>
<pre><br />
<!--#exec cmd="ls" --><br />
@@ -304,7 +341,9 @@
$B%G%#%l%/%F%#%V$N(B <code>IncludesNOEXEC</code> $B0z?t$r;XDj$9$k$3$H$G!"(B
SSI $B$O5v2D$9$k$1$l$I(B <code>exec</code>
$B5!G=$O5v2D$7$J$$$h$&$K$9$k$3$H$,$G$-$^$9!#(B</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="advanced" id="advanced">$B9bEY$J(B SSI $B%F%/%K%C%/(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="advanced" id="advanced">$B9bEY$J(B SSI $B%F%/%K%C%/(B</a></h2>
<p>$B%3%s%F%s%D$r=PNO$9$k$3$H$K2C$(!"(BApache SSI $B$OJQ?t$r@_Dj$7!"(B
@@ -417,10 +456,16 @@
$B$3$N5!G=$K$h$j!"(BCGI
$B$KMj$k$3$H$J$/$+$J$jJ#;($JF0E*$J$3$H$r$5$;$k$3$H$,$G$-$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="conclusion" id="conclusion">$B=*$o$j$K(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="conclusion" id="conclusion">$B=*$o$j$K(B</a></h2>
<p>SSI $B$O3N$+$K(B CGI
$B$dF0E*$J%&%'%V%Z!<%8$r@8@.$9$kB>$N5;=Q$KBe$o$k$b$N$G$O$"$j$^$;$s!#(B
$B$7$+$7!"$?$/$5$s$NM>J,$J:n6H$r$;$:$K!"(B
$B>/NL$NF0E*$J%3%s%F%s%D$r2C$($k$K$O$9$0$l$?J}K!$G$9!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/ssi.xml b/docs/manual/howto/ssi.xml
index 41c6308..d3d6557 100644
--- a/docs/manual/howto/ssi.xml
+++ b/docs/manual/howto/ssi.xml
@@ -240,7 +240,7 @@
syntax is the same.</p>
</section>
-<section id="footer">
+<section id="standard-footer">
<title>Including a standard footer</title>
<p>If you are managing any site that is more than a few pages,
diff --git a/docs/manual/howto/ssi.xml.ja b/docs/manual/howto/ssi.xml.ja
index 9cf2d45..07e3c4f 100644
--- a/docs/manual/howto/ssi.xml.ja
+++ b/docs/manual/howto/ssi.xml.ja
@@ -238,7 +238,7 @@
<code>strftime</code> $B$G8!:w$7$F$_$F$/$@$5$$!#J8K!$OF1$8$G$9!#(B</p>
</section>
-<section id="footer">
+<section id="standard-footer">
<title>$BI8=`$N%U%C%?$rA^F~$9$k(B</title>
<p>$B$b$7?t%Z!<%8$rD6$($k%Z!<%8$r;}$D%5%$%H$r4IM}$7$F$$$k$J$i$P!"(B
diff --git a/docs/manual/index.html.de b/docs/manual/index.html.de
index a27e87b..3ace69f 100644
--- a/docs/manual/index.html.de
+++ b/docs/manual/index.html.de
@@ -80,7 +80,7 @@
<tr><td><a href="invoking.html">Starten</a> </td></tr>
- <tr><td><a href="stopping.html">Stoppen und
+ <tr><td><a href="stopping.html">Beenden und
Neustarten</a> </td></tr>
<tr><td><a href="mod/directives.html">
diff --git a/docs/manual/install.html.de b/docs/manual/install.html.de
index 11001a9..0a0ffe3 100644
--- a/docs/manual/install.html.de
+++ b/docs/manual/install.html.de
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Kompilieren und Installieren - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Kompilieren und Installieren</h1>
+ -->
+<title>Kompilieren und Installieren - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Kompilieren und Installieren</h1>
<p>Dieses Dokument umfaßt nur die Kompilierung und Installation des
Apache auf Unix und Unix-ähnlichen Systemen. Für die
Kompilierung und Installation unter Windows lesen Sie bitte <a href="platform/windows.html">Den Apache unter Microsoft Windows
@@ -18,7 +30,20 @@
<code>libtool</code> und <code>autoconf</code>, um eine Umgebung zu
schaffen, die der vieler anderer Open Source Projekte ähnlich
sieht.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">Überblick für die Ungeduldigen</a></li><li><img alt="" src="./images/down.gif" /> <a href="#requirements">Anforderungen</a></li><li><img alt="" src="./images/down.gif" /> <a href="#download">Download</a></li><li><img alt="" src="./images/down.gif" /> <a href="#extract">Auspacken</a></li><li><img alt="" src="./images/down.gif" /> <a href="#configure">Den Codebaum konfigurieren</a></li><li><img alt="" src="./images/down.gif" /> <a href="#compile">Erstellen</a></li><li><img alt="" src="./images/down.gif" /> <a href="#install">Installieren</a></li><li><img alt="" src="./images/down.gif" /> <a href="#customize">Anpassen</a></li><li><img alt="" src="./images/down.gif" /> <a href="#test">Testen</a></li></ul><h3>Siehe auch</h3><ul class="seealso"><li><a href="invoking.html">Starten</a></li><li><a href="stopping.html">Stoppen oder Neustarten</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="overview" id="overview">Überblick für die Ungeduldigen</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">Überblick für die Ungeduldigen</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#requirements">Anforderungen</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#download">Download</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#extract">Auspacken</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#configure">Den Codebaum konfigurieren</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#compile">Erstellen</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#install">Installieren</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#customize">Anpassen</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#test">Testen</a></li>
+</ul><h3>Siehe auch</h3><ul class="seealso"><li><a href="invoking.html">Apache starten</a></li><li><a href="stopping.html">Beenden und Neustarten</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="overview" id="overview">Überblick für die Ungeduldigen</a></h2>
<table>
<tr>
@@ -79,7 +104,9 @@
für die Kompilierung und Installation des Apache HTTPD ist
weiter unten jeder Abschnitt des Kompilierungs- und
Installationsvorganges genauer beschrieben.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="requirements" id="requirements">Anforderungen</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requirements" id="requirements">Anforderungen</a></h2>
<p>Folgende Anforderungen gelten für die Erstellung des
Apache:</p>
@@ -131,34 +158,29 @@
sicherzustellen, dass der richtige Interpreter von
<code>./configure</code> ausgewählt wird.</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="download" id="download">Download</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="download" id="download">Download</a></h2>
- <p>Der Apache kann von der <a href="http://www.apache.org/dist/httpd/">Apache Software
- Foundation Downloadseite</a> oder von einem <a href="http://www.apache.org/dyn/closer.cgi">nahegelegenen
- Mirror</a> heruntergeladen werden.</p>
-
- <p>Versionsnummern, die auf <code>alpha</code> enden, zeigen
- frühe Entwicklungsversionen an, die möglicherweise nicht
- funktionieren. Versionsnummern, die auf <code>beta</code> enden,
- zeigen verläßlichere Ausgaben an, die jedoch noch weitere
- Tests oder Bugfixes benötigen. Wenn Sie die beste verfügbare
- Produktivversion des Apache HTTP Servers herunterladen wollen, sollten
- Sie die letzte Version wählen, die weder <code>alpha</code>,
- noch <code>beta</code> in ihrem Dateinamen enthält.</p>
+ <p>Der Apache kann von der <a href="http://httpd.apache.org/download.cgi">Apache HTTP Server
+ Downloadseite</a> heruntergeladen werden, auf der verschiedene
+ Spiegelserver angegeben sind. Sie finden hier die jeweils aktuelle
+ stabile Version.</p>
<p>Nach dem Download, insbesondere, wenn ein Mirror benutzt wurde, ist es
wichtig, zu prüfen, dass Sie eine vollständige, nicht
modifizierte Version des Apache HTTP Servers erhalten haben. Dies kann
durch Prüfen des heruntergeladenen Tarballs gegen die PGP-Signatur
erreicht werden. Dies ist wiederum ein Zweischrittverfahren. Zuerst
- müssen Sie die <code>KEYS</code>-Datei von der <a href="http://www.apache.org/dist/httpd/">Apache Distributionsseite</a>
- beziehen. (Um sicherzustellen, dass die <code>KEYS</code>-Datei selbst
- nicht verändert wurde, ist es sinnvoll, eine Datei aus einer
- früheren Distribution des Apache zu verwenden, oder den
- Schlüssel von einem öffentlichen Schlüsselserver zu
- importieren.) Die Schlüssel werden mit einem der folgenden Befehle
- (abhängig von Ihrer PGP Version) zu Ihrem persönlichen
- Schlüsselring hinzugefügt:</p>
+ müssen Sie die <a href="http://www.apache.org/dist/httpd/KEYS">
+ <code>KEYS</code></a>-Datei ebenfalls von der Apache
+ Distributionsseite beziehen. (Um sicherzustellen, dass die
+ <code>KEYS</code>-Datei selbst nicht verändert wurde, ist
+ es sinnvoll, eine Datei aus einer früheren Distribution des
+ Apache zu verwenden, oder den Schlüssel von einem öffentlichen
+ Schlüsselserver zu importieren.) Die Schlüssel werden mit einem
+ der folgenden Befehle (abhängig von Ihrer PGP Version) zu Ihrem
+ persönlichen Schlüsselring hinzugefügt:</p>
<div class="example"><p><code>$ pgp < KEYS</code></p></div>
@@ -167,11 +189,14 @@
<div class="example"><p><code>$ gpg --import KEYS</code></p></div>
<p>Der nächste Schritt ist das Testen des Tarballs gegen
- die PGP-Signatur, die immer von der <a href="http://www.apache.org/dist/httpd/">Apache Originalseite</a>
- bezogen werden sollte. Die Signaturdatei hat den gleichen Dateinamen
- wie der Tarball, aber zusätzlich die Endung <code>.asc</code>. Nun
- können Sie die Distribution mit einem der folgenden Befehle
- (wiederum abhängig von Ihrer PGP Version) prüfen:</p>
+ die PGP-Signatur, die immer von der <a href="http://httpd.apache.org/download.cgi">Apache Originalseite</a>
+ bezogen werden sollte. Den Link zur Signaturdatei finden Sie hinter
+ dem jeweiligen Download-Link oder im entsprechenden Verzeichnis auf der
+ <a href="http://www.apache.org/dist/httpd/">Apache-Distributionsseite</a>
+ Sie hat den gleichen Dateinamen wie der Tarball, aber zusätzlich die
+ Endung <code>.asc</code>. Nun können Sie die Distribution mit
+ einem der folgenden Befehle (wiederum abhängig von Ihrer PGP
+ Version) prüfen:</p>
<div class="example"><p><code>$ pgp httpd-2_0_<em>NN</em>.tar.gz.asc</code></p></div>
@@ -193,14 +218,16 @@
Solange Sie der Authentizität der <code>KEYS</code>-Datei
vertrauen, ist dies kein Problem.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="extract" id="extract">Auspacken</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="extract" id="extract">Auspacken</a></h2>
<p>Das Auspacken des Quellcodes aus dem Apache HTTPD Tarball besteht
aus einem simplen Dekomprimieren und danach "Ent-tarren":</p>
<div class="example"><p><code>
- $ gzip -d httpd-2_0_<em>NN</em>.tar.gz<br />
- $ tar xvf httpd-2_0_<em>NN</em>.tar
+ $ gzip -d httpd-2_1_<em>NN</em>.tar.gz<br />
+ $ tar xvf httpd-2_1_<em>NN</em>.tar
</code></p></div>
<p>Dies erstellt unterhalb des aktuellen Verzeichnisses ein neues
@@ -208,7 +235,9 @@
Sie sollten mit <code>cd</code> in dieses Verzeichnis wechseln,
bevor Sie mit der Kompilierung des Servers weitermachen. </p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="configure" id="configure">Den Codebaum konfigurieren</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configure" id="configure">Den Codebaum konfigurieren</a></h2>
<p>Der nächste Schritt ist die Konfiguration des
Apache-Codebaumes für Ihre spezielle Plattform und Ihre
@@ -498,7 +527,7 @@
<h3><a name="dbm" id="dbm">DBM</a></h3>
- <p>Verschiedene Apache-Features, darunter <code class="module"><a href="./mod/mod_authn_dbm.html">mod_authn_dbm</a></code>
+ <p>Verschiedene Apache-Features, darunter <code class="module"><a href="./mod/mod_auth_dbm.html">mod_auth_dbm</a></code>
und DBM <code class="directive"><a href="./mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> aus
<code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>, verwenden einfache
Schlüssel/Wert-Datenbanken für eine schnelle Suche nach
@@ -532,7 +561,9 @@
und beachten, bevor Sie dieses Feature implementieren.
</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="compile" id="compile">Erstellen</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="compile" id="compile">Erstellen</a></h2>
<p>Nun können Sie die verschiedenen Teile, die das Apache-Paket
bilden, einfach durch Ausführen des folgenden Befehls erstellen:</p>
@@ -543,7 +574,9 @@
benötigt ungefähr 3 Minuten auf einem Pentium III/Linux 2.2.
System. Dies kann aber abhängig von Ihrer Hardware und der Anzahl
der Module, die Sie aktiviert haben, sehr stark variieren.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="install" id="install">Installieren</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="install" id="install">Installieren</a></h2>
<p>Nun endlich installieren Sie das Package unter dem konfigurierten
Installations-<em>PREFIX</em> (siehe oben: Option <code>--prefix</code>
@@ -553,7 +586,9 @@
<p>Wenn Sie upgraden, wird die Installation Ihre Konfigurationsdateien
oder Dokumente nicht überschrieben.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="customize" id="customize">Anpassen</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="customize" id="customize">Anpassen</a></h2>
<p>Als nächstes können Sie Ihren Apache HTTP Server anpassen,
indem Sie die <a href="configuring.html">Konfigurationsdateien</a>
@@ -564,7 +599,9 @@
<p>Werfen Sie auch einen Blick in das Apache-Handbuch unter <a href="./">docs/manual/</a>. Die aktuellste Version dieses Handbuchs
sowie eine komplette Referenz der verfügbaren <a href="mod/directives.html">Konfigurationsanweisungen</a> finden
Sie unter <a href="http://httpd.apache.org/docs-2.0/">http://httpd.apache.org/docs-2.0/</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="test" id="test">Testen</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="test" id="test">Testen</a></h2>
<p>Sie können nun Ihren Apache HTTP Server <a href="invoking.html">starten</a>, indem Sie einfach</p>
@@ -580,4 +617,8 @@
Ausführen von:</p>
<div class="example"><p><code>$ <em>PREFIX</em>/bin/apachectl stop</code></p></div>
-</div></div><div id="footer"><p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index 31110cc..37656be 100644
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Compiling and Installing - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Compiling and Installing</h1>
+ -->
+<title>Compiling and Installing - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Compiling and Installing</h1>
<p>This document covers compilation and installation of Apache
on Unix and Unix-like systems only. For compiling and
@@ -18,8 +30,21 @@
to create an environment that looks like many other Open Source
projects.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">Overview for the
- impatient</a></li><li><img alt="" src="./images/down.gif" /> <a href="#requirements">Requirements</a></li><li><img alt="" src="./images/down.gif" /> <a href="#download">Download</a></li><li><img alt="" src="./images/down.gif" /> <a href="#extract">Extract</a></li><li><img alt="" src="./images/down.gif" /> <a href="#configure">Configuring the source tree</a></li><li><img alt="" src="./images/down.gif" /> <a href="#compile">Build</a></li><li><img alt="" src="./images/down.gif" /> <a href="#install">Install</a></li><li><img alt="" src="./images/down.gif" /> <a href="#customize">Customize</a></li><li><img alt="" src="./images/down.gif" /> <a href="#test">Test</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="invoking.html">Starting</a></li><li><a href="stopping.html">Stopping or Restarting</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="overview" id="overview">Overview for the
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">Overview for the
+ impatient</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#requirements">Requirements</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#download">Download</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#extract">Extract</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#configure">Configuring the source tree</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#compile">Build</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#install">Install</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#customize">Customize</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#test">Test</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="invoking.html">Starting Apache</a></li><li><a href="stopping.html">Stopping and Restarting</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="overview" id="overview">Overview for the
impatient</a></h2>
<table>
@@ -80,7 +105,9 @@
<p>Each section of the compilation and installation process is
described in more detail below, beginning with the requirements
for compiling and installing Apache HTTPD.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="requirements" id="requirements">Requirements</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requirements" id="requirements">Requirements</a></h2>
<p>The following requirements exist for building Apache:</p>
@@ -124,33 +151,26 @@
option (see below) to make sure the correct one is selected
by <code>./configure</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="download" id="download">Download</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="download" id="download">Download</a></h2>
- <p>Apache can be downloaded from the <a href="http://www.apache.org/dist/httpd/">Apache Software
- Foundation download site</a> or from a <a href="http://www.apache.org/dyn/closer.cgi/httpd/">nearby
- mirror</a>.</p>
-
- <p>Version numbers that end in <code>alpha</code> indicate
- early pre-test versions which may or may not work. Version
- numbers ending in <code>beta</code> indicate more reliable
- releases that still require further testing or bug fixing. If
- you wish to download the best available production release of
- the Apache HTTP Server, you should choose the latest version
- with neither <code>alpha</code> nor <code>beta</code> in its
- filename.</p>
+ <p>Apache can be downloaded from the <a href="http://httpd.apache.org/download.cgi">Apache HTTP Server
+ download site</a> which lists several mirrors. You'll find here
+ the latest stable release.</p>
<p>After downloading, especially if a mirror site is used, it
is important to verify that you have a complete and unmodified
version of the Apache HTTP Server. This can be accomplished by
testing the downloaded tarball against the PGP signature. This,
in turn, is a two step procedure. First, you must obtain the
- <code>KEYS</code> file from the <a href="http://www.apache.org/dist/httpd/">Apache distribution
- site</a>. (To assure that the <code>KEYS</code> file itself has
- not been modified, it may be a good idea to use a file from a
- previous distribution of Apache or import the keys from a
- public key server.) The keys are imported into your personal
- key ring using one of the following commands (depending on your
- pgp version):</p>
+ <a href="http://www.apache.org/dist/httpd/KEYS"><code>KEYS</code></a>
+ file from the Apache distribution site, too. (To assure that the
+ <code>KEYS</code> file itself has not been modified, it may be a good
+ idea to use a file from a previous distribution of Apache or import
+ the keys from a public key server.) The keys are imported into
+ your personal key ring using one of the following commands (depending
+ on your pgp version):</p>
<div class="example"><p><code>$ pgp < KEYS</code></p></div>
@@ -159,11 +179,14 @@
<div class="example"><p><code>$ gpg --import KEYS</code></p></div>
<p>The next step is to test the tarball against the PGP
- signature, which should always be obtained from the <a href="http://www.apache.org/dist/httpd/">main Apache
- website</a>. The signature file has a filename identical to the
- source tarball with the addition of <code>.asc</code>. Then you
- can check the distribution with one of the following commands
- (again, depending on your pgp version):</p>
+ signature, which should always be obtained from the <a href="http://httpd.apache.org/download.cgi">main Apache
+ website</a>. A link to the signature file is placed behind the
+ corresponding download link or may be found in the particular
+ directory at the <a href="http://www.apache.org/dist/httpd/">Apache
+ distribution site</a>. Its filename is identical to the source
+ tarball with the addition of <code>.asc</code>. Then you can check
+ the distribution with one of the following commands (again,
+ depending on your pgp version):</p>
<div class="example"><p><code>$ pgp httpd-2_0_<em>NN</em>.tar.gz.asc</code></p></div>
@@ -182,7 +205,9 @@
be verified. This is not a problem if you trust the
authenticity of the <code>KEYS</code> file.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="extract" id="extract">Extract</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="extract" id="extract">Extract</a></h2>
<p>Extracting the source from the Apache HTTPD tarball is a
simple matter of uncompressing, and then untarring:</p>
@@ -196,7 +221,9 @@
containing the source code for the distribution. You should
<code>cd</code> into that directory before proceeding with
compiling the 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="configure" id="configure">Configuring the source tree</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configure" id="configure">Configuring the source tree</a></h2>
<p>The next step is to configure the Apache source tree for
your particular platform and personal requirements. This is
@@ -471,7 +498,7 @@
<h3><a name="dbm" id="dbm">DBM</a></h3>
<p>Several Apache features, including
- <code class="module"><a href="./mod/mod_authn_dbm.html">mod_authn_dbm</a></code> and <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>'s
+ <code class="module"><a href="./mod/mod_auth_dbm.html">mod_auth_dbm</a></code> and <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>'s
DBM <code class="directive"><a href="./mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> use
simple key/value databases for quick lookups of information. Apache
includes SDBM with its source-code, so this database is always
@@ -502,7 +529,9 @@
carefully read and consider the <a href="suexec.html">suexec
documentation</a> before implementing this feature.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="compile" id="compile">Build</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="compile" id="compile">Build</a></h2>
<p>Now you can build the various parts which form the Apache
package by simply running the command:</p>
@@ -513,7 +542,9 @@
approximately 3 minutes to compile under a Pentium III/Linux
2.2 system, but this will vary widely depending on your
hardware and the number of modules which you have 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="install" id="install">Install</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="install" id="install">Install</a></h2>
<p>Now its time to install the package under the configured
installation <em>PREFIX</em> (see <code>--prefix</code> option
@@ -523,7 +554,9 @@
<p>If you are upgrading, the installation will not overwrite
your configuration files or documents.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="customize" id="customize">Customize</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="customize" id="customize">Customize</a></h2>
<p>Next, you can customize your Apache HTTP server by editing
the <a href="configuring.html">configuration files</a> under
@@ -533,7 +566,9 @@
<p>Have a look at the Apache manual under <a href="./">docs/manual/</a> or consult <a href="http://httpd.apache.org/docs-2.0/">http://httpd.apache.org/docs-2.0/</a> for the most recent version of
this manual and a complete reference of available <a href="mod/directives.html">configuration directives</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="test" id="test">Test</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="test" id="test">Test</a></h2>
<p>Now you can <a href="invoking.html">start</a> your Apache
HTTP server by immediately running:</p>
@@ -548,4 +583,8 @@
running:</p>
<div class="example"><p><code>$ <em>PREFIX</em>/bin/apachectl stop</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/install.html.ru.koi8-r b/docs/manual/install.html.ru.koi8-r
new file mode 100644
index 0000000..8a6c6e9
--- /dev/null
+++ b/docs/manual/install.html.ru.koi8-r
@@ -0,0 +1,564 @@
+<?xml version="1.0" encoding="KOI8-R"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ru" xml:lang="ru"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>ëÏÍÐÉÌÉÒÏ×ÁÎÉÅ É ÕÓÔÁÎÏ×ËÁ - HTTP ÓÅÒ×ÅÒ Apache</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p>
+<p class="apache">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP ÓÅÒ×ÅÒ</a> > <a href="http://httpd.apache.org/docs-project/">äÏËÕÍÅÎÔÁÃÉÑ</a> > <a href="./">÷ÅÒÓÉÑ 2.0</a></div><div id="page-content"><div id="preamble"><h1>ëÏÍÐÉÌÉÒÏ×ÁÎÉÅ É ÕÓÔÁÎÏ×ËÁ</h1>
+
+ <p>üÔÏÔ ÄÏËÕÍÅÎÔ ÏÓ×ÅÝÁÅÔ ×ÏÐÒÏÓÙ ËÏÍÐÉÌÉÒÏ×ÁÎÉÑ É ÕÓÔÁÎÏ×ËÉ ÓÅÒ×ÅÒÁ
+ Apache ÔÏÌØËÏ ÎÁ UNIX É UNIX-ÐÏÄÏÂÎÙÈ ÓÉÓÔÅÍÁÈ. åÓÌÉ ×Ù ÈÏÔÉÔÅ ÕÓÔÁÎÏ×ÉÔØ
+ ÓÅÒ×ÅÒ ÐÏÄ Windows, ÔÏ ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÐÒÏÞÅÓÔØ ÄÏËÕÍÅÎÔ <a href="platform/windows.html">"éÓÐÏÌØÚÏ×ÁÎÉÅ Apache ÐÏÄ Microsoft Windows"</a>.
+ éÎÆÏÒÍÁÃÉÑ, ËÁÓÁÀÝÁÑÓÑ ÏÓÔÁÌØÎÙÈ ÐÌÁÔÆÏÒÍ, ÓÏÄÅÒÖÉÔÓÑ × ÄÏËÕÍÅÎÔÅ
+ <a href="platform/">"ðÌÁÔÆÏÒÍÙ"</a>.</p>
+
+ <p>óÒÅÄÁ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ É ÕÓÔÁÎÏ×ËÉ ÓÅÒ×ÅÒÁ ÐÏÌÎÏÓÔØÀ ÏÔÌÉÞÁÅÔÓÑ ÏÔ ÔÏÊ, ËÏÔÏÒÁÑ ÂÙÌÁ
+ × Apache 1.3. Apache 1.3 ÉÓÐÏÌØÚÏ×ÁÌ ÏÂÙÞÎÙÊ ÎÁÂÏÒ ÓËÒÉÐÔÏ×, ÐÏÚ×ÏÌÑ×ÛÉÊ ÕÐÒÏÓÔÉÔØ
+ ÐÒÏÃÅÓÓ ÕÓÔÁÎÏ×ËÉ. Apache 2.0 ÔÅÐÅÒØ ÉÓÐÏÌØÚÕÅÔ ÓÉÓÔÅÍÙ <code>libtool</code> É
+ <code>autoconf</code>, ÞÔÏ ÄÅÌÁÅÔ ÓÅÒ×ÅÒ ÐÏÈÏÖÉÍ ÎÁ ÄÒÕÇÉÅ ÐÒÏÇÒÁÍÍÎÙÅ ÐÒÏÄÕËÔÙ
+ Ó ÏÔËÒÙÔÙÍ ÉÓÈÏÄÎÙÍ ËÏÄÏÍ (Open Source projects).</p>
+
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">ëÒÁÔËÉÊ ÏÂÚÏÒ "ÄÌÑ ÎÅÔÅÒÐÅÌÉ×ÙÈ"</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#requirements">ôÒÅÂÏ×ÁÎÉÑ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#download">úÁÇÒÕÚËÁ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#extract">òÁÓÐÁËÏ×ËÁ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#configure">ëÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÅ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ ËÏÄÏ×</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#compile">óÂÏÒËÁ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#install">õÓÔÁÎÏ×ËÁ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#customize">îÁÓÔÒÏÊËÁ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#test">ôÅÓÔÉÒÏ×ÁÎÉÅ</a></li>
+</ul><h3>óÍ. ÔÁËÖÅ</h3><ul class="seealso"><li><a href="invoking.html">úÁÐÕÓË ÓÅÒ×ÅÒÁ</a></li><li><a href="stopping.html">ïÓÔÁÎÏ×ËÁ É ÐÅÒÅÚÁÐÕÓË</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="overview" id="overview">ëÒÁÔËÉÊ ÏÂÚÏÒ "ÄÌÑ ÎÅÔÅÒÐÅÌÉ×ÙÈ"</a></h2>
+
+ <table>
+ <tr>
+ <td><a href="#download">úÁÇÒÕÚËÁ</a></td>
+
+ <td><code>$ lynx
+ http://www.apache.org/dist/httpd/httpd-2_0_<em>NN</em>.tar.gz</code>
+ </td>
+ </tr>
+
+ <tr>
+ <td><a href="#extract">òÁÓÐÁËÏ×ËÁ</a></td>
+
+ <td><code>$ gzip -d httpd-2_0_<em>NN</em>.tar.gz<br />
+ $ tar xvf httpd-2_0_<em>NN</em>.tar</code> </td>
+ </tr>
+
+ <tr>
+ <td><a href="#configure">ëÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÅ</a></td>
+
+ <td><code>$ ./configure --prefix=<em>PREFIX</em></code>
+ </td>
+ </tr>
+
+ <tr>
+ <td><a href="#compile">ëÏÍÐÉÌÉÒÏ×ÁÎÉÅ</a></td>
+
+ <td><code>$ make</code> </td>
+ </tr>
+
+ <tr>
+ <td><a href="#install">õÓÔÁÎÏ×ËÁ</a></td>
+
+ <td><code>$ make install</code> </td>
+ </tr>
+
+ <tr>
+ <td><a href="#customize">îÁÓÔÒÏÊËÁ</a></td>
+
+ <td><code>$ vi <em>PREFIX</em>/conf/httpd.conf</code> </td>
+ </tr>
+
+ <tr>
+ <td><a href="#test">ðÒÏÂÎÙÊ ÚÁÐÕÓË</a></td>
+
+ <td><code>$ <em>PREFIX</em>/bin/apachectl start</code>
+ </td>
+ </tr>
+ </table>
+
+ <p><em>NN</em> ÎÅÏÂÈÏÄÉÍÏ ÚÁÍÅÎÉÔØ ÎÁ ÔÅËÕÝÉÊ ÍÌÁÄÛÉÊ ÎÏÍÅÒ ×ÅÒÓÉÉ,
+ Á ×ÍÅÓÔÏ <em>PREFIX</em> ÎÁÄÏ ÕËÁÚÁÔØ ÐÕÔØ, ÐÏ
+ ËÏÔÏÒÏÍÕ ÄÏÌÖÅÎ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ ÓÅÒ×ÅÒ. åÓÌÉ <em>PREFIX</em> ÎÅ ÕËÁÚÁÎ,
+ ÔÏ ÕÓÔÁÎÏ×ËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ ÐÒÏÉÚ×ÏÄÉÔÓÑ × ËÁÔÁÌÏÇ
+ <code>/usr/local/apache2</code>.</p>
+
+ <p>âÏÌÅÅ ÐÏÄÒÏÂÎÏ ×ÓÅ ÜÔÁÐÙ ËÏÍÐÉÌÉÒÏ×ÁÎÉÑ É ÕÓÔÁÎÏ×ËÉ ÓÅÒ×ÅÒÁ ÒÁÓÓÍÏÔÒÅÎÙ
+ ÎÉÖÅ, ÐÒÉÞÅÍ ÎÁÞÉÎÁÅÔÓÑ ÓÌÅÄÕÀÝÉÊ ÒÁÚÄÅÌ Ó ÏÐÉÓÁÎÉÑ ÓÉÓÔÅÍÎÙÈ ÔÒÅÂÏ×ÁÎÉÊ,
+ ÎÅÏÂÈÏÄÉÍÙÈ, ÄÌÑ ÔÏÇÏ ÞÔÏÂÙ ÕÓÔÁÎÏ×ËÁ ÐÒÏÛÌÁ ÕÓÐÅÛÎÏ.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requirements" id="requirements">ôÒÅÂÏ×ÁÎÉÑ</a></h2>
+
+ <p>ôÒÅÂÏ×ÁÎÉÑ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÕÓÐÅÛÎÏÊ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ:</p>
+
+ <dl>
+ <dt>äÉÓËÏ×ÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï</dt>
+ <dd>õÂÅÄÉÔÅÓØ, ÞÔÏ ÎÁ ÄÉÓËÅ ÅÓÔØ ËÁË ÍÉÎÉÎÉÍÕÍ 50 MB
+ Ó×ÏÂÏÄÎÏÇÏ ÍÅÓÔÁ ÄÌÑ ×ÒÅÍÅÎÎÙÈ ÆÁÊÌÏ×. ðÏÓÌÅ ÕÓÔÁÎÏ×ËÉ
+ Apache ÚÁÎÉÍÁÅÔ ÐÒÉÂÌÉÚÉÔÅÌØÎÏ 10 MB. ôÏÞÎÙÊ ÒÁÚÍÅÒ ÚÁÎÉÍÁÅÍÏÇÏ
+ ÍÅÓÔÁ ÂÕÄÅÔ ÚÁ×ÉÓÅÔØ × ÏÓÎÏ×ÎÏÍ ÏÔ ×ÙÂÒÁÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ É
+ ÄÏÐÏÌÎÉÔÅÌØÎÏ ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÙÈ ÍÏÄÕÌÅÊ, ÎÅ ×ÈÏÄÑÝÉÈ × ÄÉÓÔÒÉÂÕÔÉ×
+ Apache.</dd>
+
+ <dt>ANSI-C ËÏÍÐÉÌÑÔÏÒ É ÎÅÏÂÈÏÄÉÍÁÑ ÓÒÅÄÁ ÓÂÏÒËÉ</dt>
+ <dd>õÂÅÄÉÔÅÓØ, ÞÔÏ ÎÁ ×ÁÛÅÊ ÓÉÓÔÅÍÅ ÕÓÔÁÎÏ×ÌÅÎ ANSI-C
+ ËÏÍÐÉÌÑÔÏÒ. òÅËÏÍÅÎÄÕÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÔØ <a href="http://www.gnu.org/software/gcc/gcc.html">GNU C
+ ËÏÍÐÉÌÑÔÏÒ (GCC)</a> ÏÔ <a href="http://www.gnu.org/">Free Software Foundation (FSF)</a>
+ (×ÅÒÓÉÉ 2.7.2 ×ÐÏÌÎÅ ÄÏÓÔÁÔÏÞÎÏ). åÓÌÉ Õ ×ÁÓ ÄÒÕÇÏÊ ËÏÍÐÉÌÑÔÏÒ,
+ ÔÏ ×ÙÑÓÎÉÔÅ, ÐÏÄÄÅÒÖÉ×ÁÅÔ ÌÉ ÏÎ ÓÔÁÎÄÁÒÔ ANSI. ðÒÏ×ÅÒØÔÅ ÔÁËÖÅ,
+ ÞÔÏÂÙ × ÐÅÒÅÍÅÎÎÏÊ ÏËÒÕÖÅÎÉÑ <code>PATH</code> ÂÙÌ ÕËÁÚÁÎ ËÁÔÁÌÏÇ,
+ ÓÏÄÅÒÖÁÝÉÊ ÏÓÎÏ×ÎÙÅ ÕÔÉÌÉÔÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÂÏÒËÉ (<code>make</code> É ÄÒÕÇÉÅ).</dd>
+
+ <dt>óÉÎÈÒÏÎÉÚÁÃÉÑ ×ÒÅÍÅÎÉ</dt>
+ <dd>÷ ÎÅËÏÔÏÒÙÈ ÚÁÇÏÌÏ×ËÁÈ HTTP ÐÒÏÔÏËÏÌÁ ÕËÁÚÙ×ÁÅÔÓÑ ×ÒÅÍÑ.
+ ðÏÜÔÏÍÕ ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ×ÙÑÓÎÉÔØ, ËÁË ÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ × ×ÁÛÅÊ
+ ÓÉÓÔÅÍÅ ÓÒÅÄÓÔ×Ï ÓÉÎÈÒÏÎÉÚÁÃÉÉ ×ÒÅÍÅÎÉ. ïÂÙÞÎÏ ÄÌÑ ÜÔÉÈ ÃÅÌÅÊ
+ ÉÓÐÏÌØÚÕÀÔÓÑ ÐÒÏÇÒÁÍÍÙ <code>ntpdate</code> ÉÌÉ <code>xntpd</code>,
+ ÏÓÎÏ×ÁÎÎÙÅ ÎÁ ÓÅÔÅ×ÏÍ ÐÒÏÔÏËÏÌÅ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ×ÒÅÍÅÎÉ
+ (Network Time Protocol - NTP). äÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ
+ Ï NTP É ÓÅÒ×ÅÒÁÈ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ×ÒÅÍÅÎÉ, ÏÂÒÁÔÉÔÅÓØ × ÇÒÕÐÐÕ ÎÏ×ÏÓÔÅÊ Usenet <a href="news:comp.protocols.time.ntp">comp.protocols.time.ntp</a>,
+ Á ÔÁËÖÅ ÐÏÓÅÔÉÔÅ <a href="http://www.eecis.udel.edu/~ntp/">ÄÏÍÁÛÎÀÀ ÓÔÒÁÎÉÃÕ NTP</a></dd>
+
+ <dt><a href="http://www.perl.org/">Perl 5</a>
+ [îåïâñúáôåìøîï]</dt>
+ <dd>äÌÑ ×ÙÐÏÌÎÅÎÉÑ ÎÅËÏÔÏÒÙÈ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÈ ÓËÒÉÐÔÏ×, ÔÁËÉÈ ËÁË <a href="programs/apxs.html">apxs</a> ÉÌÉ <a href="programs/dbmmanage.html">dbmmanage</a>
+ (ËÏÔÏÒÙÅ ÎÁÐÉÓÁÎÙ ÎÁ Perl), ÎÅÏÂÈÏÄÉÍ ÉÎÔÅÒÐÒÅÔÁÔÏÒ Ó ÑÚÙËÁ Perl
+ (×ÅÒÓÉÉ 5.003 ÉÌÉ ×ÙÛÅ ÄÏÓÔÁÔÏÞÎÏ). åÓÌÉ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÓËÒÉÐÔ
+ `<code>configure</code>' ÎÅ ÎÁÊÄÅÔ ÅÇÏ × ×ÁÛÅÊ ÓÉÓÔÅÍÅ, ÔÏ ×Ù ×ÓÅ ÒÁ×ÎÏ
+ ÓÍÏÖÅÔÅ ÓÏÂÒÁÔØ É ÕÓÔÁÎÏ×ÉÔØ Apache 2.0 - × ÜÔÏÍ ÓÌÕÞÁÅ ÎÅ ÂÕÄÕÔ
+ ÒÁÂÏÔÁÔØ ÔÏÌØËÏ ÐÅÒÅÞÉÓÌÅÎÎÙÅ ×ÙÛÅ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÓËÒÉÐÔÙ. åÓÌÉ × ×ÁÛÅÊ
+ ÓÉÓÔÅÍÅ ÕÓÔÁÎÏ×ÌÅÎÏ ÎÅÓËÏÌØËÏ ÉÎÔÅÒÐÒÅÔÁÔÏÒÏ× Ó ÑÚÙËÁ Perl (ÎÁÐÒÉÍÅÒ Perl 4 É Perl 5),
+ ÔÏ ÄÌÑ ÔÏÇÏ ÞÔÏÂÙ ÓËÒÉÐÔ <code>./configure</code> ×ÙÂÒÁÌ ÎÕÖÎÙÊ, ×ÙÐÏÌÎÉÔÅ
+ ÅÇÏ Ó ÏÐÃÉÅÊ <code>--with-perl</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="download" id="download">úÁÇÒÕÚËÁ</a></h2>
+
+ <p>Apache ÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ ÓÏ <a href="http://httpd.apache.org/download.cgi">ÓÔÒÁÎÉÃÙ ÚÁÇÒÕÚËÉ Apache HTTP Software
+ Foundation</a>, ÎÁ ËÏÔÏÒÏÊ ÔÁËÖÅ ÐÒÉ×ÏÄÉÔÓÑ ÓÐÉÓÏË ÎÅËÏÔÏÒÙÈ ÚÅÒËÁÌØÎÙÈ ÓÅÒ×ÅÒÏ×.
+ úÄÅÓØ ×Ù ÎÁÊÄÅÔÅ ÓÁÍÕÀ ÐÏÓÌÅÄÎÀÀ ÓÔÁÂÉÌØÎÕÀ ×ÅÒÓÉÀ ÓÅÒ×ÅÒÁ.</p>
+
+ <p>ðÏÓÌÅ ÚÁÇÒÕÚËÉ, ÏÓÏÂÅÎÎÏ ÅÓÌÉ ÏÎÁ ÐÒÏÉÓÈÏÄÉÌÁ Ó ÚÅÒËÁÌØÎÏÇÏ
+ ÓÅÒ×ÅÒÁ, ÎÅÏÂÈÏÄÉÍÏ ÕÂÅÄÉÔØÓÑ, ÞÔÏ Õ ×ÁÓ × ÒÕËÁÈ ÐÏÌÎÁÑ,
+ ÎÅÉÚÍÅÎÅÎÎÁÑ ×ÅÒÓÉÑ HTTP ÓÅÒ×ÅÒÁ Apache. üÔÏ ×ÙÐÏÌÎÑÅÔÓÑ
+ ÔÅÓÔÉÒÏ×ÁÎÉÅÍ ÁÒÈÉ×Á (tarball) ÎÁ ÓÏÏÔ×ÅÔÓÔ×ÉÅ PGP ÐÏÄÐÉÓÉ, ÞÔÏ Ñ×ÌÑÅÔÓÑ, ×
+ Ó×ÏÀ ÏÞÅÒÅÄØ, Ä×ÕÛÁÇÏ×ÏÊ ÐÒÏÃÅÄÕÒÏÊ. ÷Ï-ÐÅÒ×ÙÈ, ×Ù ÄÏÌÖÎÙ
+ ÚÁÇÒÕÚÉÔØ ÆÁÊÌ <code>KEYS</code> ÓÏ <a href="http://www.apache.org/dist/httpd/">ÓÔÒÁÎÉÃÙ ÚÁÇÒÕÚËÉ
+ Apache Software Foundation</a>. (äÌÑ ÔÏÇÏ ÞÔÏÂÙ ÂÙÔØ Õ×ÅÒÅÎÎÙÍ × ÔÏÍ,
+ ÞÔÏ ÓÁÍ ÆÁÊÌ <code>KEYS</code> ÎÅ ÂÙÌ ÉÚÍÅÎÅÎ, ÅÇÏ ÌÕÞÛÅ ×ÚÑÔØ ÉÚ
+ ÐÒÅÄÙÄÕÝÅÇÏ ÄÉÓÔÒÉÂÕÔÉ×Á Apache ÉÌÉ ×ÚÑÔØ Ó ÓÅÒ×ÅÒÁ
+ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ.) úÁÔÅÍ ËÌÀÞÉ ÍÏÖÎÏ ÉÍÐÏÒÔÉÒÏ×ÁÔØ × ×ÁÛÕ ÌÉÞÎÕÀ ÂÁÚÕ
+ ÄÁÎÎÙÈ ËÌÀÞÅÊ ÐÏÓÒÅÄÓÔ×ÏÍ ÓÌÅÄÕÀÝÉÈ ËÏÍÁÎÄ (× ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ
+ ×ÅÒÓÉÉ pgp):</p>
+
+<div class="example"><p><code>$ pgp < KEYS</code></p></div>
+
+ <p>ÉÌÉ </p>
+
+<div class="example"><p><code>$ gpg --import KEYS</code></p></div>
+
+ <p>óÌÅÄÕÀÝÉÊ ÛÁÇ ÚÁËÌÀÞÁÅÔÓÑ × ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏÊ ÐÒÏ×ÅÒËÅ
+ ÁÒÈÉ×Á (tarball) Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ PGP ÐÏÄÐÉÓÉ, ËÏÔÏÒÕÀ ×ÓÅÇÄÁ
+ ÎÁÄÏ ÂÒÁÔØ ÎÁ <a href="http://www.apache.org/dist/httpd/">ÏÓÎÏ×ÎÏÍ
+ ×ÅÂ-ÓÅÒ×ÅÒÅ Apache</a>. æÁÊÌ Ó PGP ÐÏÄÐÉÓØÀ ÉÍÅÅÔ ÔÏ ÖÅ ÉÍÑ, ÞÔÏ
+ É ÁÒÈÉ× ÄÉÓÔÒÉÂÕÔÉ×Á ÐÌÀÓ ÏËÏÎÞÁÎÉÅ <code>.asc</code>. ðÒÏ×ÅÒÉÔØ
+ ÄÉÓÔÒÉÂÕÔÉ× ÍÏÖÎÏ, ÎÁÂÒÁ× ÓÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ (ÏÐÑÔØ ÖÅ, ÜÔÏ ÚÁ×ÉÓÉÔ
+ ÏÔ ×ÅÒÓÉÉ pgp, ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ × ×ÁÛÅÊ ÓÉÓÔÅÍÅ):</p>
+
+<div class="example"><p><code>$ pgp httpd-2_0_<em>NN</em>.tar.gz.asc</code></p></div>
+
+ <p>ÉÌÉ</p>
+
+<div class="example"><p><code>$ gpg --verify httpd-2_0_<em>NN</em>.tar.gz.asc</code></p></div>
+
+ <p>÷Ù ÄÏÌÖÎÙ Õ×ÉÄÅÔØ ÞÔÏ-ÔÏ ×ÒÏÄÅ:</p>
+
+<div class="example"><p><code>Good signature from user "Martin Kraemer
+ <martin@apache.org>".</code></p></div>
+
+ <p>÷ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÄÏ×ÅÒÉÔÅÌØÎÙÈ ÏÔÎÏÛÅÎÉÊ, ÓÏÄÅÒÖÁÝÉÈÓÑ × ×ÁÛÅÊ
+ ÂÁÚÅ ÄÁÎÎÙÈ ËÌÀÞÅÊ, ×Ù ÍÏÖÅÔÅ ÔÁËÖÅ ÐÏÌÕÞÉÔØ ÓÏÏÂÝÅÎÉÅ Ï ÔÏÍ,
+ ÞÔÏ ÏÔÎÏÛÅÎÉÅ ÍÅÖÄÕ ËÌÀÞÅÍ É ÔÅÍ, ËÔÏ ÉÍ ÐÏÄÐÉÓÁÌÓÑ, ÎÅ×ÏÚÍÏÖÎÏ
+ ÕÓÔÁÎÏ×ÉÔØ. üÔÏ ÎÅ ÄÏÌÖÎÏ ×ÁÓ ÂÅÓÐÏËÏÉÔØ × ÔÏÍ ÓÌÕÞÁÅ, ÅÓÌÉ
+ ×Ù Õ×ÅÒÅÎÙ × ÐÏÄÌÉÎÎÏÓÔÉ ÆÁÊÌÁ <code>KEYS</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="extract" id="extract">òÁÓÐÁËÏ×ËÁ</a></h2>
+
+ <p>òÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÉÓÈÏÄÎÙÈ ËÏÄÏ× Apache HTTP ÓÅÒ×ÅÒÁ
+ ÚÁËÌÀÞÁÅÔÓÑ × ÅÇÏ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏÊ ÒÁÓÐÁËÏ×ËÅ É
+ ÒÁÚÁÒÈÉ×ÉÒÏ×ÁÎÉÉ (untarring):</p>
+
+<div class="example"><p><code>
+ $ gzip -d httpd-2_0_<em>NN</em>.tar.gz<br />
+ $ tar xvf httpd-2_0_<em>NN</em>.tar
+</code></p></div>
+
+ <p>ðÏÓÌÅ ×ÙÐÏÌÎÅÎÉÑ ÜÔÉÈ ËÏÍÁÎÄ ÂÕÄÅÔ ÓÏÚÄÁÎ ÎÏ×ÙÊ ËÁÔÁÌÏÇ
+ Ó ÉÓÈÏÄÎÙÍÉ ËÏÄÁÍÉ ÄÉÓÔÒÉÂÕÔÉ×Á. ÷Ù ÄÏÌÖÎÙ ÚÁÊÔÉ
+ × ÜÔÏÔ ËÁÔÁÌÏÇ, ÐÒÅÖÄÅ ÞÅÍ ÎÁÞÎÅÔÅ ËÏÍÐÉÌÉÒÏ×ÁÔØ ÓÅÒ×ÅÒ.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configure" id="configure">ëÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÅ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ ËÏÄÏ×</a></h2>
+
+ <p>óÌÅÄÕÀÝÉÊ ÛÁÇ ÚÁËÌÀÞÁÅÔÓÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ
+ ËÏÄÏ× × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÔÏÊ ÓÉÓÔÅÍÏÊ, ÎÁ ËÏÔÏÒÕÀ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ
+ ÓÅÒ×ÅÒ, É ×ÁÛÉÍÉ ÓÏÂÓÔ×ÅÎÎÙÍÉ ÎÕÖÄÁÍÉ. üÔÏ ÄÅÌÁÅÔÓÑ ÐÒÉ ÐÏÍÏÝÉ
+ ÓËÒÉÐÔÁ <code>configure</code>, ÒÁÓÐÏÌÏÖÅÎÎÏÇÏ × ËÏÒÎÅ×ÏÍ ËÁÔÁÌÏÇÅ
+ ÄÉÓÔÒÉÂÕÔÉ×Á. òÁÚÒÁÂÏÔÞÉËÉ, ÚÁÇÒÕÖÁÀÝÉÅ ÄÅÒÅ×Ï ÉÓÈÏÄÎÙÈ ËÏÄÏ× ÐÏÓÒÅÄÓÔ×ÏÍ
+ CVS, ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ × Ó×ÏÅÊ ÓÉÓÔÅÍÅ ÕÔÉÌÉÔÙ <code>autoconf</code>
+ É <code>libtool</code> É ×ÙÐÏÌÎÉÔØ ÐÒÏÇÒÁÍÍÕ <code>buildconf</code>, ÐÒÅÖÄÅ
+ ÞÅÍ ÏÎÉ ÓÍÏÇÕÔ ÐÒÏÄÏÌÖÎÉÔØ ÕÓÔÁÎÏ×ËÕ. ÷ ÏÆÉÃÉÁÌØÎÙÈ ×ÙÐÕÓËÁÈ ÓÅÒ×ÅÒÁ
+ ÜÔÏÇÏ ÄÅÌÁÔØ ÎÅ ÔÒÅÂÕÅÔÓÑ.</p>
+
+ <p>äÌÑ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ ËÏÄÏ×, Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ
+ ÚÎÁÞÅÎÉÊ ×ÓÅÈ ÏÐÃÉÊ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÐÒÏÓÔÏ ×ÙÐÏÌÎÉÔÅ ÓËÒÉÐÔ <code>./configure</code>
+ ÂÅÚ ÐÁÒÁÍÅÔÒÏ×. äÌÑ ÔÏÇÏ ÞÔÏÂÙ ÉÚÍÅÎÉÔØ ÚÎÁÞÅÎÉÑ ÏÐÃÉÊ, ÓËÒÉÐÔ <code>configure</code>
+ ÐÒÅÄÌÁÇÁÅÔ ÛÉÒÏËÉÊ ÎÁÂÏÒ ÐÅÒÅÍÅÎÎÙÈ É ÏÐÃÉÊ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ. ðÒÉ ÜÔÏÍ
+ ÐÅÒÅÍÅÎÎÙÅ ÏËÒÕÖÅÎÉÑ ÐÏÍÅÝÁÀÔÓÑ ÐÅÒÅÄ ËÏÍÁÎÄÏÊ <code>./configure</code>, × ÔÏ ×ÒÅÍÑ ËÁË
+ ÏÓÔÁÌØÎÙÅ ÏÐÃÉÉ - ÐÏÓÌÅ. îÁÉÂÏÌÅÅ ×ÁÖÎÁÑ ÏÐÃÉÑ ÚÄÅÓØ - ÜÔÏ ÐÒÅÆÉËÓ ËÁÔÁÌÏÇÁ
+ ÕÓÔÁÎÏ×ËÉ, ÔÏ ÅÓÔØ ÔÏÔ ÐÕÔØ, ÐÏ ËÏÔÏÒÏÍÕ ×ÐÏÓÌÅÄÓÔ×ÉÉ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎ Apache.
+ îÏ ÐÏÍÉÍÏ ÜÔÏÊ ÓÕÝÅÓÔ×ÕÅÔ ÅÝÅ ÂÏÌØÛÏÊ ×ÙÂÏÒ ÏÐÃÉÊ, ÎÅÏÂÈÏÄÉÍÙÈ ÄÌÑ ÔÏÎËÏÊ ÎÁÓÔÒÏÊËÉ
+ ÓÅÒ×ÅÒÁ.</p>
+
+ <p>äÌÑ ÔÏÇÏ ÞÔÏÂÙ ÐÏÌÕÞÉÔØ ÐÒÅÄÓÔÁ×ÌÅÎÉÅ Ï ÇÉÂËÏÓÔÉ ÐÒÏÃÅÓÓÁ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ Apache,
+ ÒÁÓÓÍÏÔÒÉÔÅ ÐÒÉ×ÅÄÅÎÎÙÊ ÎÉÖÅ ÔÉÐÉÞÎÙÊ ÐÒÉÍÅÒ ÚÁÐÕÓËÁ ÓËÒÉÐÔÁ <code>./configure</code>.
+ ôÁËÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ ÐÏÚ×ÏÌÑÅÔ ËÏÍÐÉÌÉÒÏ×ÁÔØ
+ ÓÅÒ×ÅÒ × ËÁÔÁÌÏÇ <code>/sw/pkg/apache</code>, ÉÓÐÏÌØÚÕÑ ÕËÁÚÁÎÎÙÊ ËÏÍÐÉÌÑÔÏÒ Ó
+ ÎÅÓËÏÌØËÉÍÉ ÐÒÅÄÎÁÚÎÁÞÅÎÎÙÍÉ ÄÌÑ ÎÅÇÏ ÏÐÃÉÑÍÉ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ, É ÕÓÔÁÎÏ×ÉÔØ
+ ÅÝÅ Ä×Á ÄÏÂÁ×ÏÞÎÙÈ ÍÏÄÕÌÑ <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code> É <code class="module"><a href="./mod/mod_speling.html">mod_speling</a></code>,
+ ËÏÔÏÒÙÅ ÍÏÖÎÏ ÂÕÄÅÔ ÐÏÔÏÍ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÏÓÒÅÄÓÔ×ÏÍ ÍÅÈÁÎÉÚÍÁ DSO.</p>
+
+<div class="example"><p><code>
+ $ CC="pgcc" CFLAGS="-O2" \<br />
+ ./configure --prefix=/sw/pkg/apache \<br />
+ --enable-rewrite=shared \<br />
+ --enable-speling=shared
+</code></p></div>
+
+ <p>ðÒÉ ×ÙÐÏÌÎÅÎÉÉ, ÓËÒÉÐÔ <code>configure</code> ÐÒÏ×ÅÒÑÅÔ, ÕÓÔÁÎÏ×ÌÅÎÏ ÌÉ × ×ÁÛÅÊ ÓÉÓÔÅÍÅ
+ ×ÓÅ ÎÅÏÂÈÏÄÉÍÏÅ, Á ÚÁÔÅÍ ÓÏÚÄÁÅÔ Make-ÆÁÊÌÙ (Makefiles), ËÏÔÏÒÙÅ ÂÕÄÕÔ ÚÁÔÅÍ ÉÓÐÏÌØÚÏ×ÁÎÙ
+ ÐÒÉ ËÏÍÐÉÌÉÒÏ×ÁÎÉÉ ÓÅÒ×ÅÒÁ.</p>
+
+ <p>îÁÉÂÏÌÅÅ ÐÒÏÓÔÏÊ ÓÐÏÓÏ ÕÚÎÁÔØ ÏÂÏ ×ÓÅÈ ÄÏÓÔÕÐÎÙÈ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÏÐÃÉÑÈ - ÜÔÏ
+ ×ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ <code>./configure --help</code>. îÁ ÜËÒÁÎ ÂÕÄÅÔ ×Ù×ÅÄÅÎÏ ËÒÁÔËÏÅ
+ ÏÐÉÓÁÎÉÅ ÐÒÁËÔÉÞÅÓËÉ ×ÓÅÈ ÄÏÓÔÕÐÎÙÈ ÏÐÃÉÊ É ÐÅÒÅÍÅÎÎÙÈ ÏËÒÕÖÅÎÉÑ.</p>
+
+<h3><a name="environment" id="environment">ðÅÒÅÍÅÎÎÙÅ ÏËÒÕÖÅÎÉÑ</a></h3>
+
+ <p>ðÒÏÇÒÁÍÍÁ <code>autoconf</code> ÉÓÐÏÌØÚÕÅÔ ÒÑÄ ÐÅÒÅÍÅÎÎÙÈ ÏËÒÕÖÅÎÉÑ ÄÌÑ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ
+ ÓÒÅÄÙ ÓÂÏÒËÉ. ÷ÏÏÂÝÅ, ÐÏÓÒÅÄÓÔ×ÏÍ ÜÔÉÈ ÐÅÒÅÍÅÎÎÙÈ ÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÌÉÛØ ÍÅÔÏÄ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ -
+ ËÏÎÔÒÏÌÉÒÏ×ÁÔØ ×ËÌÀÞÅÎÉÅ É ×ÙËÌÀÞÅÎÉÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÏÐÃÉÊ ÓÅÒ×ÅÒÁ ÜÔÉÍ ÎÅ×ÏÚÍÏÖÎÏ. üÔÉ
+ ÐÅÒÅÍÅÎÎÙÅ ÍÏÖÎÏ ×ËÌÀÞÉÔØ × ÓÒÅÄÕ ÄÏ ×ÙÚÏ×Á ÓËÒÉÐÔÁ <code>configure</code>, ÎÏ ÐÒÏÝÅ ×ÓÅÇÏ
+ ÜÔÏ ÓÄÅÌÁÔØ ÔÁË, ËÁË ÂÙÌÏ ÐÏËÁÚÁÎÏ × ÐÒÉÍÅÒÅ ×ÙÛÅ.</p>
+
+ <dl>
+ <dt><code>CC=...</code></dt>
+
+ <dd>ëÏÍÁÎÄÁ ×ÙÚÏ×Á ËÏÍÐÉÌÑÔÏÒÁ Ó ÑÚÙËÁ C</dd>
+
+ <dt><code>CPPFLAGS=...</code></dt>
+
+ <dd>äÏÐÏÌÎÉÔÅÌØÎÙÅ ÏÐÃÉÉ ÐÒÅÐÒÏÃÅÓÓÏÒÁ É ËÏÍÐÉÌÑÔÏÒÁ Ó ÑÚÙËÁ C.</dd>
+
+ <dt><code>CFLAGS=...</code></dt>
+
+ <dd>ïÐÃÉÉ ÏÔÌÁÄËÉ É ÏÐÔÉÍÉÚÁÃÉÉ ËÏÍÐÉÌÑÔÏÒÁ Ó ÑÚÙËÁ C.</dd>
+
+ <dt><code>LDFLAGS=...</code></dt>
+
+ <dd>äÏÐÏÌÎÉÔÅÌØÎÙÅ ÏÐÃÉÉ ÄÌÑ ËÏÍÐÏÎÏ×ÝÉËÁ.</dd>
+
+ <dt><code>LIBS=...</code></dt>
+
+ <dd>éÎÆÏÒÍÁÃÉÑ Ï ÒÁÓÐÏÌÏÖÅÎÉÉ ÂÉÂÌÉÏÔÅË (ÏÐÃÉÉ "<code>-L</code>" É
+ "<code>-l</code>"), ÐÅÒÅÄÁ×ÁÅÍÁÑ ËÏÍÐÏÎÏ×ÝÉËÕ.</dd>
+
+ <dt><code>INCLUDES=...</code></dt>
+
+ <dd>ðÕÔÉ, ÐÏ ËÏÔÏÒÙÍ ÉÝÕÔÓÑ ÚÁÇÏÌÏ×ÏÞÎÙÅ ÆÁÊÌÙ. ("<code>-I<em>dir</em></code>").</dd>
+
+ <dt><code>TARGET=...</code> [ðÏ ÕÍÏÌÞÁÎÉÀ: <code>apache</code>]</dt>
+
+ <dd>éÍÑ ÉÓÐÏÌÎÑÅÍÏÇÏ ÆÁÊÌÁ ÐÏÓÌÅ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ</dd>
+
+ <dt><code>NOTEST_CPPFLAGS=...</code></dt>
+
+ <dt><code>NOTEST_CFLAGS=...</code></dt>
+
+ <dt><code>NOTEST_LDFLAGS=...</code></dt>
+
+ <dt><code>NOTEST_LIBS=...</code></dt>
+
+ <dd>üÔÉ ÐÅÒÅÍÅÎÎÙÅ ÏËÒÕÖÅÎÉÑ ×ÙÐÏÌÎÑÀÔ ÔÕ ÖÅ ÒÏÌØ, ÞÔÏ É ÔÅ ÖÅ ÓÁÍÙÅ ÐÅÒÅÍÅÎÎÙÅ,
+ ÎÏ ÂÅÚ ÐÒÉÓÔÁ×ËÉ <code>NOTEST</code>. òÁÚÎÉÃÁ ÚÁËÌÀÞÁÅÔÓÑ × ÔÏÍ, ÞÔÏ ÏÎÉ ÄÏÂÁ×ÌÑÀÔÓÑ
+ × ÓÒÅÄÕ ÐÏÓÌÅ ÔÏÇÏ, ËÁË autoconf ×ÙÐÏÌÎÉÌ ÔÅÓÔÉÒÏ×ÁÎÉÅ ×ÏÚÍÏÖÎÏÓÔÅÊ ÏÐÅÒÁÃÉÏÎÎÏÊ
+ ÓÒÅÄÙ. üÔÏ ÐÏÚ×ÏÌÑÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÅ ÏÐÃÉÉ, ËÏÔÏÒÙÅ ÂÙ ×ÙÚ×ÁÌÉ ÏÛÉÂËÕ ÐÒÉ ÐÏÄÏÂÎÏÍ
+ ÔÅÓÔÉÒÏ×ÁÎÉÉ, ÎÏ ×ËÌÀÞÅÎÉÅ ËÏÔÏÒÙÈ ÏÂÑÚÁÔÅÌØÎÏ ÄÌÑ ÏËÏÎÞÁÔÅÌØÎÏÊ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ.</dd>
+
+ <dt><code>SHLIB_PATH=...</code></dt>
+
+ <dd>ïÐÃÉÉ ËÏÍÐÉÌÑÔÏÒÁ É ËÏÍÐÏÎÏ×ÝÉËÁ, ÏÐÒÅÄÅÌÑÀÝÉÅ ÐÕÔØ Ë ÒÁÚÄÅÌÑÅÍÙÍ ÂÉÂÌÉÏÔÅËÁÍ.</dd>
+ </dl>
+
+
+<h3><a name="output" id="output">ïÐÃÉÉ, ËÏÎÆÉÇÕÒÉÒÕÀÝÉÅ ×ÙÈÏÄÎÏÊ ÐÏÔÏË ÐÒÏÇÒÁÍÍÙ autoconf</a></h3>
+
+ <dl>
+ <dt><code>--help</code></dt>
+
+ <dd>÷ÙÄÁÅÔ ÉÎÓÔÒÕËÃÉÀ ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÐÒÏÇÒÁÍÍÙ, ×ËÌÀÞÁÑ ×ÓÅ ×ÏÚÍÏÖÎÙÅ ÏÐÃÉÉ, ÐÏÓÌÅ
+ ÞÅÇÏ ÓÒÁÚÕ ÖÅ ÚÁ×ÅÒÛÁÅÔ ÒÁÂÏÔÕ.</dd>
+
+ <dt><code>--quiet</code></dt>
+
+ <dd>ðÒÅÄÏÔ×ÒÁÝÁÅÔ ×Ù×ÏÄ ÓÏÏÂÝÅÎÉÊ, ÎÁÞÉÎÁÀÝÉÈÓÑ Ó "<code>checking...</code>"</dd>
+
+ <dt><code>--verbose</code></dt>
+
+ <dd>÷ÙÄÁÅÔ ÐÏÌÎÕÀ ÉÎÆÏÒÍÁÃÉÀ × ÐÒÏÃÅÓÓÅ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ, ×ËÌÀÞÁÑ ÉÍÅÎÁ
+ ÐÒÏ×ÅÒÑÅÍÙÈ ÆÁÊÌÏ×.</dd>
+ </dl>
+
+
+<h3><a name="pathnames" id="pathnames">ðÕÔÉ</a></h3>
+
+ <p>÷ ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ ÓÕÝÅÓÔ×ÕÀÔ Ä×Á ÓÐÏÓÏÂÁ ÚÁÄÁÎÉÑ ÐÕÔÅÊ, ÐÏ ËÏÔÏÒÙÍ
+ Apache ÕÓÔÁÎÏ×ÉÔ Ó×ÏÉ ÆÁÊÌÙ. ðÅÒ×ÙÊ ÓÐÏÓÏ - ÜÔÏ Ñ×ÎÏ ÕËÁÚÁÔØ Apache
+ ËÁÔÁÌÏÇ, ÐÏ ËÏÔÏÒÏÍÕ ÏÎ ÕÓÔÁÎÏ×ÉÔÓÑ.</p>
+
+ <dl>
+ <dt><code>--prefix=<em>PREFIX</em></code> [ðÏ ÕÍÏÌÞÁÎÉÀ:
+ <code>/usr/local/apache2</code>]</dt>
+
+ <dd>ïÐÒÅÄÅÌÑÅÔ ÐÕÔØ, ÐÏ ËÏÔÏÒÏÍÕ ÂÕÄÅÔ ÐÒÏÉÚ×ÅÄÅÎÁ ÕÓÔÁÎÏ×ËÁ Apache.</dd>
+ </dl>
+
+ <p>âÏÌÅÅ ÔÏÇÏ, ÓÕÝÅÓÔ×ÕÅÔ ×ÏÚÍÏÖÎÏÓÔØ ÕÓÔÁÎÏ×ÉÔØ ÁÒÈÉÔÅËÔÕÒÎÏ - ÚÁ×ÉÓÉÍÙÅ ÆÁÊÌÙ
+ × ÄÒÕÇÏÊ ÓÐÅÃÉÁÌØÎÏ ÚÁÄÁÎÎÙÊ ËÁÔÁÌÏÇ.</p>
+
+ <dl>
+ <dt><code>--exec-prefix=<em>EPREFIX</em></code> [Default:
+ <code><em>PREFIX</em></code>]</dt>
+
+ <dd>ïÐÒÅÄÅÌÑÅÔ ÐÕÔØ, ÐÏ ËÏÔÏÒÏÍÕ ÂÕÄÕÔ ÕÓÔÁÎÏ×ÌÅÎÙ ÁÒÈÉÔÅËÔÕÒÎÏ - ÚÁ×ÉÓÉÍÙÅ
+ ÆÁÊÌÙ.</dd>
+ </dl>
+
+ <p>÷ÔÏÒÏÊ ÓÐÏÓÏ Ñ×ÌÑÅÔÓÑ ÂÏÌÅÅ ÇÉÂËÉÍ. ïÎ ÚÁËÌÀÞÁÅÔÓÑ × ÉÓÐÏÌØÚÏ×ÁÎÉÉ
+ ÆÁÊÌÏ× <code>config.layout</code>. éÓÐÏÌØÚÕÑ ÜÔÏÔ ÍÅÔÏÄ, ÍÏÖÎÏ ÕËÁÚÁÔØ
+ ËÁÔÁÌÏÇ ÕÓÔÁÎÏ×ËÉ ÄÌÑ ÌÀÂÏÇÏ ÔÉÐÁ ÆÁÊÌÏ× Apache. æÁÊÌ <code>config.layout</code>
+ ÓÏÄÅÒÖÉÔ ÎÅÓËÏÌØËÏ ÐÒÉÍÅÒÏ× ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ. éÓÐÏÌØÚÕÑ ÜÔÉ ÐÒÉÍÅÒÙ, ×Ù ÍÏÖÅÔÅ
+ ÓÁÍÉ ÓÏÚÄÁ×ÁÔØ ÓÏÂÓÔ×ÅÎÎÙÅ ËÏÎÆÉÇÕÒÁÃÉÉ ÕÓÔÁÎÏ×ËÉ.
+ òÁÚÌÉÞÎÙÅ ÍÁËÅÔÙ ÕÓÔÁÎÏ×ÏË ÇÒÕÐÐÉÒÕÀÔÓÑ
+ × ÒÁÚÄÅÌØÎÙÈ ÓÅËÃÉÑÈ <code><Layout FOO>...</Layout></code>, ÐÏÓÌÅ ÞÅÇÏ
+ Ë ÎÉÍ ÍÏÖÎÏ ÏÂÒÁÝÁÔØÓÑ ÐÏÓÒÅÄÓÔ×ÏÍ ÉÍÅÎÉ <code>FOO</code>.</p>
+
+ <dl>
+ <dt><code>--enable-layout=<em>LAYOUT</em></code></dt>
+
+ <dd>éÓÐÏÌØÚÕÅÔ ÉÍÅÎÏ×ÁÎÎÙÊ ÍÁËÅÔ, ÏÐÉÓÁÎÎÙÊ × ÆÁÊÌÅ <code>config.layout</code>,
+ × ËÏÔÏÒÏÍ ÐÒÏÐÉÓÁÎÙ ×ÓÅ ÕÓÔÁÎÏ×ÏÞÎÙÅ ÐÕÔÉ.</dd>
+ </dl>
+
+
+
+<h3><a name="modules" id="modules">íÏÄÕÌÉ</a></h3>
+
+ <p>Apache - ÜÔÏ ÍÏÄÕÌØÎÙÊ ÓÅÒ×ÅÒ. ôÏÌØËÏ ÓÁÍÙÅ ÏÓÎÏ×ÎÙÅ
+ ÆÕÎËÃÉÉ ×ËÌÀÞÅÎÙ × ÑÄÒÏ ÓÅÒ×ÅÒÁ. äÏÐÏÌÎÉÔÅÌØÎÁÑ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØ
+ ÄÏÓÔÕÐÎÁ ÐÏÓÒÅÄÓÔ×ÏÍ ÍÏÄÕÌÅÊ. ÷Ï ×ÒÅÍÑ ÐÒÏÃÅÓÓÁ ËÏÎÆÉÇÕÒÁÃÉÉ
+ ×Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÔÅ ÍÏÄÕÌÉ, ËÏÔÏÒÙÅ ÂÕÄÕÔ ËÏÍÐÉÌÉÒÏ×ÁÔØÓÑ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ.
+ ïÂÏ ×ÓÅÈ ÄÏÓÔÕÐÎÙÈ ÍÏÄÕÌÑÈ ×Ù ÍÏÖÅÔÅ ÐÒÏÞÉÔÁÔØ × ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÍ
+ <a href="mod/index.html">ÓÐÉÓËÅ ÍÏÄÕÌÅÊ</a>. íÏÄÕÌÉ, <a href="mod/module-dict.html#Status">ÓÔÁÔÕÓ</a> ËÏÔÏÒÙÈ ÏÂÏÚÎÁÞÅÎ
+ ËÁË "âÁÚÏ×ÙÊ", ËÏÍÐÉÌÉÒÕÀÔÓÑ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ ÐÏ ÕÍÏÌÞÁÎÉÀ; ÅÓÌÉ ×ÁÍ
+ ÎÅ ÎÕÖÎÙ ÎÅËÏÔÏÒÙÅ ÂÁÚÏ×ÙÅ ÍÏÄÕÌÉ, ×Ù ÄÏÌÖÎÙ ÓÐÅÃÉÁÌØÎÏ ÜÔÏ ÕËÁÚÁÔØ ÐÒÉ
+ ËÏÎÆÉÇÕÒÁÃÉÉ (ÂÁÚÏ×ÙÍ ÍÏÄÕÌÅÍ, ÎÁÐÒÉÍÅÒ, Ñ×ÌÑÅÔÓÑ <code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code>).
+ íÏÄÕÌÉ Ó ÄÒÕÇÉÍ ÓÔÁÔÕÓÏÍ ÎÅ ËÏÍÐÉÌÉÒÕÀÔÓÑ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ ÐÏ ÕÍÏÌÞÁÎÉÀ, É (× ÓÌÕÞÁÅ
+ ÎÅÏÂÈÏÄÉÍÏÓÔÉ) ÄÏÌÖÎÙ ÂÙÔØ ÐÒÏÐÉÓÁÎÙ ÐÒÉ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÏÔÄÅÌØÎÏ (ÐÒÉÍÅÒÏÍ ÔÁËÏÇÏ ÍÏÄÕÌÑ
+ ÍÏÖÅÔ ÐÏÓÌÕÖÉÔØ <code class="module"><a href="./mod/mod_expires.html">mod_expires</a></code>).</p>
+
+ <p>åÓÔØ Ä×Á ÓÐÏÓÏÂÁ ÕËÁÚÁÔØ Apache ÉÓÐÏÌØÚÏ×ÁÔØ ËÁËÏÊ - ÌÉÂÏ ÍÏÄÕÌØ. íÏÄÕÌÉ
+ ÍÏÇÕÔ ÂÙÔØ ÓËÏÍÐÉÌÉÒÏ×ÁÎÙ ËÁË <em>ÓÔÁÔÉÞÅÓËÉÅ</em>, ÐÒÉ ÜÔÏÍ ÉÈ ËÏÄ ×ËÌÀÞÁÅÔÓÑ
+ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ × ÉÓÐÏÌÎÑÅÍÙÊ ËÏÄ ÓÅÒ×ÅÒÁ Apache. éÌÉ ÖÅ, ÅÓÌÉ ×ÁÛÁ ÏÐÅÒÁÃÉÏÎÎÁÑ
+ ÓÉÓÔÅÍÁ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÄÉÎÁÍÉÞÅÓËÉ ÒÁÚÄÅÌÑÅÍÙÅ ÏÂßÅËÔÙ (Dynamic Shared Objects) É
+ É <code>autoconf</code> ÍÏÖÅÔ ÏÐÒÅÄÅÌÉÔØ, ÞÔÏ ÜÔÏ ÔÁË, ÔÏ ÍÏÄÕÌÉ ÍÏÇÕÔ ÂÙÔØ
+ ÓËÏÍÐÉÌÉÒÏ×ÁÎÙ ËÁË <em>ÄÉÎÁÍÉÞÅÓËÉÅ</em>. DSO ÍÏÄÕÌÉ ÈÒÁÎÑÔÓÑ ÏÔÄÅÌØÎÏ ÏÔ ÑÄÒÁ
+ ÓÅÒ×ÅÒÁ, É ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÅÒ×ÅÒÏÍ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ
+ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÄÉÒÅËÔÉ× ×ÒÅÍÅÎÉ ×ÙÐÏÌÎÅÎÉÑ (ÔÏ ÅÓÔØ ÏÔ×ÅÞÁÀÝÉÈ ÚÁ ÒÁÂÏÔÕ
+ ÕÖÅ ÓÏÂÒÁÎÎÏÇÏ ÓÅÒ×ÅÒÁ), ÐÒÅÄÏÓÔÁ×ÌÑÅÍÙÈ ÍÏÄÕÌÅÍ <code class="module"><a href="./mod/mod_so.html">mod_so</a></code>.
+ íÏÄÕÌØ mod_so Á×ÔÏÍÁÔÉÞÅÓËÉ ×ËÌÀÞÁÅÔÓÑ × ÑÄÒÏ ÓÅÒ×ÅÒÁ, ÅÓÌÉ ÈÏÔÑ ÂÙ
+ ÏÄÉÎ ÍÏÄÕÌØ ËÏÍÐÉÌÉÒÕÅÔÓÑ ËÁË ÄÉÎÁÍÉÞÅÓËÉÊ. åÓÌÉ ÖÅ ×Ù ÎÅ ËÏÍÐÉÌÉÒÕÅÔÅ ÎÉËÁËÉÅ
+ ÄÉÎÁÍÉÞÅÓËÉÅ ÍÏÄÕÌÉ, ÎÏ ÈÏÔÉÔÅ, ÞÔÏÂÙ ×ÁÛ ÓÅÒ×ÅÒ ×ÓÅ ÖÅ ÂÙÌ ÓÐÏÓÏÂÅÎ ÒÁÂÏÔÁÔØ
+ Ó DSO ÍÏÄÕÌÑÍÉ, ÔÏ ÐÒÉ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÕËÁÖÉÔÅ ÓÌÅÄÕÀÝÕÀ ÏÐÃÉÀ: <code>--enable-so</code>.</p>
+
+ <dl>
+ <dt><code>--enable-<em>MODULE</em>[=shared]</code></dt>
+
+ <dd>ëÏÍÐÉÌÉÒÏ×ÁÔØ É ×ËÌÀÞÉÔØ × ÑÄÒÏ ÓÅÒ×ÅÒÁ ÍÏÄÕÌØ <em>MODULE</em>.
+ <em>MODULE</em> - ÜÔÏ <a href="mod/module-dict.html#ModuleIdentifier">ÉÄÅÎÔÉÆÉËÁÔÏÒ ÍÏÄÕÌÑ</a>, ËÏÔÏÒÙÊ ÍÏÖÎÏ
+ ÐÏÌÕÞÉÔØ, ÏÔÂÒÏÓÉ× ÏÔ ÉÍÅÎÉ ÍÏÄÕÌÑ, ÕËÁÚÁÎÎÏÇÏ × ÄÏËÕÍÅÎÔÁÃÉÉ, ÓÔÒÏËÕ "_string". þÔÏÂÙ
+ ËÏÍÐÉÌÉÒÏ×ÁÔØ ÍÏÄÕÌØ ËÁË DSO, ÄÏÂÁ×ØÔÅ ÏÐÃÉÀ <code>=shared</code>.</dd>
+
+ <dt><code>--disable-<em>MODULE</em></code></dt>
+
+ <dd>õÂÒÁÔØ <em>MODULE</em> ÉÚ ÓÐÉÓËÁ ËÏÍÐÉÌÉÒÕÅÍÙÈ ÍÏÄÕÌÅÊ (ÅÓÌÉ ÏÎ ÅÓÔØ × ÜÔÏÍ ÓÐÉÓËÅ).</dd>
+
+ <dt><code>--enable-modules=<em>MODULE-LIST</em></code></dt>
+
+ <dd>ëÏÍÐÉÌÉÒÏ×ÁÔØ É ×ËÌÀÞÉÔØ × ÑÄÒÏ ÓÅÒ×ÅÒÁ ÍÏÄÕÌÉ, ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ËÏÔÏÒÙÈ ÐÒÉ×ÅÄÅÎÙ ×
+ ÓÐÉÓËÅ <em>MODULE-LIST</em>. üÌÅÍÅÎÔÙ ÓÐÉÓËÁ ÏÔÄÅÌÑÀÔÓÑ ÄÒÕÇ ÏÔ ÄÒÕÇÁ ÐÒÏÂÅÌÁÍÉ.</dd>
+
+ <dt>
+ <code>--enable-mods-shared=<em>MODULE-LIST</em></code></dt>
+
+ <dd>ëÏÍÐÉÌÉÒÏ×ÁÔØ ÍÏÄÕÌÉ, ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ËÏÔÏÒÙÈ ÐÒÉ×ÅÄÅÎÙ ×
+ ÓÐÉÓËÅ <em>MODULE-LIST</em>, ËÁË ÄÉÎÁÍÉÞÅÓËÉÅ.</dd>
+ </dl>
+
+ <p>îÁÐÒÉÍÅÒ, ÞÔÏÂÙ ×ËÌÀÞÉÔØ × ÓÅÒ×ÅÒ ÍÏÄÕÌÉ <code class="module"><a href="./mod/mod_dav.html">mod_dav</a></code> É
+ <code class="module"><a href="./mod/mod_info.html">mod_info</a></code>, ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÌÉÂÏ</p>
+
+<div class="example"><p><code>./configure --enable-dav --enable-info</code></p></div>
+
+ <p>ÌÉÂÏ ÜË×É×ÁÌÅÎÔÎÕÀ ÐÒÅÄÙÄÕÝÅÊ ËÏÍÁÎÄÕ</p>
+
+<div class="example"><p><code>./configure --enable-modules="dav info"</code></p></div>
+
+ <p>÷ ÄÏÐÏÌÎÅÎÉÅ Ë ÜÔÏÍÕ ÓÕÝÅÓÔ×ÕÀÔ ÓÐÅÃÉÁÌØÎÙÅ ËÌÀÞÅ×ÙÅ ÓÌÏ×Á <code>all</code> ÉÌÉ
+ <code>most</code>, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÙ ÄÌÑ ËÏÍÐÉÌÉÒÏ×ÁÎÉÑ ×ÓÅÈ ÉÌÉ ÂÏÌØÛÉÎÓÔ×Á
+ ÍÏÄÕÌÅÊ ÓÒÁÚÕ. ÷Ù ÍÏÖÅÔÅ ÉÓËÌÀÞÉÔØ ÉÚ ÜÔÏÇÏ ÓÐÉÓËÁ ÎÅÖÅÌÁÔÅÌØÎÙÅ ÍÏÄÕÌÉ, ÐÒÉÍÅÎÑÑ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ
+ ÏÐÃÉÉ <code>--disable-<em>MODULE</em></code>. îÁÐÒÉÍÅÒ, ÄÌÑ ÔÏÇÏ ÞÔÏÂÙ ×ËÌÀÞÉÔØ × ÒÁÂÏÔÕ ÓÅÒ×ÅÒÁ ×ÓÅ
+ ÍÏÄÕÌÉ ËÁË DSO ÚÁ ÉÓËÌÀÞÅÎÉÅÍ <code class="module"><a href="./mod/mod_info.html">mod_info</a></code>, ×Ù ÍÏÖÅÔÅ ÎÁÐÉÓÁÔØ ÓÌÅÄÕÀÝÅÅ</p>
+
+<div class="example"><p><code>
+ ./configure --enable-mods-shared=all
+ --disable-info
+</code></p></div>
+
+ <p>÷ ÄÏÂÁ×ÌÅÎÉÅ Ë ÓÔÁÎÄÁÒÔÎÏÍÕ ÎÁÂÏÒÕ ÍÏÄÕÌÅÊ, Apache 2.0 ËÏÍÐÉÌÉÒÕÅÔÓÑ
+ ×ÍÅÓÔÅ Ó ÎÅËÏÔÏÒÙÍ <a href="mpm.html">ÍÕÌØÔÉ - ÐÒÏÃÅÓÓÎÙÍ ÍÏÄÕÌÅÍ</a> (MPMs).
+ ïÄÉÎ É ÔÏÌØËÏ ÏÄÉÎ íð - ÍÏÄÕÌØ ÍÏÖÅÔ ÂÙÔØ ÓËÏÍÐÉÌÉÒÏ×ÁÎ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ. óÐÉÓÏË
+ íð - ÍÏÄÕÌÅÊ, ËÏÍÐÉÌÉÒÕÅÍÙÈ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ËÁÖÄÏÊ ÐÌÁÔÆÏÒÍÙ, ÍÏÖÎÏ ÎÁÊÔÉ × ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÍ
+ <a href="mpm.html">ÒÁÚÄÅÌÅ ÄÏËÕÍÅÎÔÁÃÉÉ</a>; íð - ÍÏÄÕÌØ ÐÏ ÕÍÏÌÞÁÎÉÀ
+ ÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÓÌÅÄÕÀÝÅÊ ÏÐÃÉÅÊ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ <code>configure</code></p>
+
+ <dl>
+ <dt><code>--with-mpm=<em>NAME</em></code></dt>
+
+ <dd>ëÏÍÐÉÌÉÒÏ×ÁÔØÓÑ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ ÂÕÄÅÔ íð - ÍÏÄÕÌØ Ó ÉÍÅÎÅÍ <em>NAME</em>.</dd>
+ </dl>
+
+
+<h3><a name="dbm" id="dbm">DBM</a></h3>
+
+ <p>îÅËÏÔÏÒÙÅ ÍÏÄÕÌÉ Apache, ËÁË ÎÁÐÒÉÍÅÒ <code class="module"><a href="./mod/mod_auth_dbm.html">mod_auth_dbm</a></code> É <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>
+ (ÄÉÒÅËÔÉ×Á <code class="directive"><a href="./mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>), ÉÓÐÏÌØÚÕÀÔ × Ó×ÏÅÊ ÒÁÂÏÔÅ ÐÒÏÓÔÙÅ
+ ÂÁÚÙ ÄÁÎÎÙÈ, ÏÒÇÁÎÉÚÏ×ÁÎÎÙÅ ÐÏ ÐÒÉÎÃÉÐÕ ËÌÀÞ/ÚÎÁÞÅÎÉÅ, ÞÔÏ Õ×ÅÌÉÞÉ×ÁÅÔ ÓËÏÒÏÓÔØ ÄÏÓÔÕÐÁ Ë ÉÎÆÏÒÍÁÃÉÉ.
+ ðÏÄÄÅÒÖËÁ SDBM ÂÁÚ ÄÁÎÎÙÈ ×ËÌÀÞÅÎÁ × ÑÄÒÏ ÓÅÒ×ÅÒÁ, ÔÁË ÞÔÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÂÁÚ ÄÁÎÎÙÈ ÐÏÄÏÂÎÏÇÏ ÔÉÐÁ ×ÏÚÍÏÖÎÏ
+ ×ÓÅÇÄÁ. åÓÌÉ ×ÁÍ ÎÕÖÎÙ ÂÁÚÙ ÄÁÎÎÙÈ ÄÒÕÇÏÇÏ ÔÉÐÁ, ÔÏ ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÌÅÄÕÀÝÉÅ ÏÐÃÉÉ:</p>
+
+<dl>
+<dt><code>--with-gdbm[=<em>path</em>]</code></dt>
+<dt><code>--with-ndbm[=<em>path</em>]</code></dt>
+<dt><code>--with-berkeley-db[=<em>path</em>]</code></dt>
+
+<dd>åÓÌÉ ÎÅ ÕËÁÚÁÎÏ ÚÎÁÞÅÎÉÅ <em>path</em>, Apache ÂÕÄÅÔ ÉÓËÁÔØ ÚÁÇÏÌÏ×ÏÞÎÙÅ ÆÁÊÌÙ É ÂÉÂÌÉÏÔÅËÉ
+× ÓÔÁÎÄÁÒÔÎÙÈ ËÁÔÁÌÏÇÁÈ. ñ×ÎÏÅ ÕËÁÚÁÎÉÅ <em>path</em> ÚÁÓÔÁ×ÉÔ Apache ÐÒÏÉÚ×ÏÄÉÔØ ÐÏÉÓË ÓÏÏÔ×ÅÔÓ×ÕÀÝÉÈ
+ÆÁÊÌÏ× × ËÁÔÁÌÏÇÁÈ <em>path</em><code>/lib</code> É <em>path</em><code>/include</code>. íÏÖÎÏ ÔÁËÖÅ
+ÕËÁÚÁÔØ ÓÐÅÃÉÆÉÞÅÓËÉÅ ÐÕÔÉ ÄÌÑ ÚÁÇÏÌÏ×ÏÞÎÙÈ ÆÁÊÌÏ× É ÂÉÂÌÉÏÔÅË, ÎÁÐÉÓÁ× ÉÈ ÞÅÒÅÚ ÔÏÞËÕ Ó ÚÁÐÑÔÏÊ.</dd>
+</dl>
+
+
+
+<h3><a name="suexec" id="suexec">Suexec</a></h3>
+
+ <p>÷ÍÅÓÔÅ Ó Apache ÍÏÖÎÏ ÎÁÊÔÉ ×ÓÐÏÍÏÇÁÔÅÌØÎÕÀ ÐÒÏÇÒÁÍÍÕ <a href="suexec.html">suexec</a>, ËÏÔÏÒÁÑ ÐÏÚ×ÏÌÑÅÔ ÕÓÔÁÎÏ×ÉÔØ
+ ÂÏÌÅÅ ÖÅÓÔËÉÊ ËÏÎÔÒÏÌØ ÎÁÄ ×ÙÐÏÌÎÅÎÉÅÍ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÈ CGI
+ ÐÒÏÇÒÁÍÍ. ôÅÍ ÎÅ ÍÅÎÅÅ, ÅÓÌÉ suexec ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÔØ ÎÅÐÒÁ×ÉÌØÎÏ,
+ ÔÏ ÍÏÇÕÔ ÐÏÑ×ÉÔØÓÑ ÚÎÁÞÉÔÅÌØÎÙÅ ÂÒÅÛÉ × ÓÉÓÔÅÍÅ ÂÅÚÏÐÁÓÎÏÓÔÉ
+ ÓÅÒ×ÅÒÁ. ðÏÜÔÏÍÕ ×Ù ÄÏÌÖÎÙ ÏÞÅÎØ ×ÎÉÍÁÔÅÌØÎÏ ÐÒÏÞÉÔÁÔØ <a href="suexec.html">ÄÏËÕÍÅÎÔÁÃÉÀ
+ suexec</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="compile" id="compile">óÂÏÒËÁ</a></h2>
+
+ <p>ôÅÐÅÒØ ×Ù ÍÏÖÅÔÅ ÓËÏÍÐÉÌÉÒÏ×ÁÔØ É ÓÏÂÒÁÔØ ÓÅÒ×ÅÒ Apache,
+ ×ÙÐÏÌÎÉ× ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</p>
+
+<div class="example"><p><code>$ make</code></p></div>
+
+ <p>îÁÂÅÒÉÔÅÓØ ÔÅÒÐÅÎÉÑ - ËÏÍÐÉÌÉÒÏ×ÁÎÉÅ ÓÅÒ×ÅÒÁ Ó ÂÁÚÏ×ÏÊ ËÏÎÆÉÇÕÒÁÃÉÅÊ
+ (ËÏÎÆÉÇÕÒÁÃÉÅÊ ÐÏ ÕÍÏÌÞÁÎÉÀ) ÚÁÎÉÍÁÅÔ ÐÒÉÂÌÉÚÉÔÅÌØÎÏ ÔÒÉ ÍÉÎÕÔÙ
+ ÎÁ ÔÁËÏÊ ÓÉÓÔÅÍÅ, ËÁË Pentium III/Linux 2.2. òÅÁÌØÎÏÅ ×ÒÅÍÑ ÓÂÏÒËÉ
+ ÂÕÄÅÔ ÚÁ×ÉÓÅÔØ ÏÔ ×ÁÛÅÇÏ ÁÐÐÁÒÁÔÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ É ÏÔ ËÏÌÉÞÅÓÔ×Á
+ ÍÏÄÕÌÅÊ, ËÏÔÏÒÙÅ ×Ù ÒÅÛÉÌÉ ËÏÍÐÉÌÉÒÏ×ÁÔØ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="install" id="install">õÓÔÁÎÏ×ËÁ</a></h2>
+
+ <p>ôÅÐÅÒØ ÎÁÓÔÁÌÏ ×ÒÅÍÑ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓÅÒ×ÅÒÁ × ËÁÔÁÌÏÇ
+ <em>PREFIX</em>, ËÏÔÏÒÙÊ ÂÙÌ ÕËÁÚÁÎ ÐÒÉ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ Apache
+ (ÓÍÏÔÒÉÔÅ ×ÙÛÅ ÏÐÃÉÀ <code>--prefix</code>), ×ÙÐÏÌÎÉ×:</p>
+
+<div class="example"><p><code>$ make install</code></p></div>
+
+ <p>åÓÌÉ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ 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="customize" id="customize">îÁÓÔÒÏÊËÁ</a></h2>
+
+ <p>äÁÌÅÅ ×Ù ÍÏÖÅÔÅ ÎÁÓÔÒÏÉÔØ ×ÁÛ HTTP ÓÅÒ×ÅÒ Apache ÐÏÓÒÅÄÓÔ×ÏÍ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ
+ <a href="configuring.html">ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÆÁÊÌÏ×</a> × ËÁÔÁÌÏÇÅ
+ <code><em>PREFIX</em>/conf/</code>.</p>
+
+<div class="example"><p><code>$ vi <em>PREFIX</em>/conf/httpd.conf</code></p></div>
+
+ <p>òÕËÏ×ÏÄÓÔ×Ï ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ Apache ×Ù ÍÏÖÅÔÅ ÎÁÊÔÉ ÌÉÂÏ ÐÏ ÌÏËÁÌØÎÏÍÕ
+ ÁÄÒÅÓÕ Õ ÓÅÂÑ ÎÁ ÓÅÒ×ÅÒÅ <a href="./">docs/manual/</a>, ÌÉÂÏ ÎÁ ÏÆÉÃÉÁÌØÎÏÍ
+ ÓÁÊÔÅ Apache <a href="http://httpd.apache.org/docs-2.0/">http://httpd.apache.org/docs-2.0/</a>,
+ ÇÄÅ ÏÐÕÂÌÉËÏ×ÁÎÁ ÓÁÍÁÑ ÐÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ ÄÏËÕÍÅÎÔÁÃÉÉ É ×ÓÑ ÎÅÏÂÈÏÄÉÍÁÑ ÓÐÒÁ×ÏÞÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
+ ÐÏ ×ÓÅÍ ×ÏÚÍÏÖÎÙÍ <a href="mod/directives.html">ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÍ ÄÉÒÅËÔÉ×ÁÍ</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="test" id="test">ôÅÓÔÉÒÏ×ÁÎÉÅ</a></h2>
+
+ <p>ôÅÐÅÒØ ×Ù ÍÏÖÅÔÅ <a href="invoking.html">ÚÁÐÕÓÔÉÔØ</a> Ó×ÏÊ HTTP ÓÅÒ×ÅÒ Apache,
+ ×ÙÐÏÌÎÉ× ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</p>
+
+<div class="example"><p><code>$ <em>PREFIX</em>/bin/apachectl start</code></p></div>
+
+ <p>É ÅÓÌÉ ×ÓÅ ÐÒÏÛÌÏ ÕÓÐÅÛÎÏ, ÔÏ ×Ù ÓÍÏÖÅÔÅ ÚÁÐÒÏÓÉÔØ Ó×ÏÊ ÐÅÒ×ÙÊ ÄÏËÕÍÅÎÔ
+ ÐÏ ÁÄÒÅÓÕ <code>http://localhost/</code>. ÷Å - ÓÔÒÁÎÉÃÁ, ËÏÔÏÒÕÀ ×Ù Õ×ÉÄÅÔÅ,
+ ÎÁÈÏÄÉÔÓÑ × ËÁÔÁÌÏÇÅ <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> - ÐÏ ÕÍÏÌÞÁÎÉÀ,
+ ÜÔÏ <code><em>PREFIX</em>/htdocs/</code>. úÁÔÅÍ <a href="stopping.html">ÏÓÔÁÎÏ×ÉÔÅ</a>
+ ÓÅÒ×ÅÒ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÏÊ:</p>
+
+<div class="example"><p><code>$ <em>PREFIX</em>/bin/apachectl stop</code></p></div>
+</div></div>
+<div id="footer">
+<p class="apache">ðÏÄÄÅÒÖËÁ ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/install.xml b/docs/manual/install.xml
index 45ab74e..dbc4348 100644
--- a/docs/manual/install.xml
+++ b/docs/manual/install.xml
@@ -24,8 +24,8 @@
</summary>
-<seealso><a href="invoking.html">Starting</a></seealso>
-<seealso><a href="stopping.html">Stopping or Restarting</a></seealso>
+<seealso><a href="invoking.html">Starting Apache</a></seealso>
+<seealso><a href="stopping.html">Stopping and Restarting</a></seealso>
<section id="overview"><title>Overview for the
impatient</title>
@@ -144,33 +144,22 @@
<section id="download"><title>Download</title>
<p>Apache can be downloaded from the <a
- href="http://www.apache.org/dist/httpd/">Apache Software
- Foundation download site</a> or from a <a
- href="http://www.apache.org/dyn/closer.cgi/httpd/">nearby
- mirror</a>.</p>
-
- <p>Version numbers that end in <code>alpha</code> indicate
- early pre-test versions which may or may not work. Version
- numbers ending in <code>beta</code> indicate more reliable
- releases that still require further testing or bug fixing. If
- you wish to download the best available production release of
- the Apache HTTP Server, you should choose the latest version
- with neither <code>alpha</code> nor <code>beta</code> in its
- filename.</p>
+ href="http://httpd.apache.org/download.cgi">Apache HTTP Server
+ download site</a> which lists several mirrors. You'll find here
+ the latest stable release.</p>
<p>After downloading, especially if a mirror site is used, it
is important to verify that you have a complete and unmodified
version of the Apache HTTP Server. This can be accomplished by
testing the downloaded tarball against the PGP signature. This,
in turn, is a two step procedure. First, you must obtain the
- <code>KEYS</code> file from the <a
- href="http://www.apache.org/dist/httpd/">Apache distribution
- site</a>. (To assure that the <code>KEYS</code> file itself has
- not been modified, it may be a good idea to use a file from a
- previous distribution of Apache or import the keys from a
- public key server.) The keys are imported into your personal
- key ring using one of the following commands (depending on your
- pgp version):</p>
+ <a href="http://www.apache.org/dist/httpd/KEYS"><code>KEYS</code></a>
+ file from the Apache distribution site, too. (To assure that the
+ <code>KEYS</code> file itself has not been modified, it may be a good
+ idea to use a file from a previous distribution of Apache or import
+ the keys from a public key server.) The keys are imported into
+ your personal key ring using one of the following commands (depending
+ on your pgp version):</p>
<example>$ pgp < KEYS</example>
@@ -180,11 +169,14 @@
<p>The next step is to test the tarball against the PGP
signature, which should always be obtained from the <a
- href="http://www.apache.org/dist/httpd/">main Apache
- website</a>. The signature file has a filename identical to the
- source tarball with the addition of <code>.asc</code>. Then you
- can check the distribution with one of the following commands
- (again, depending on your pgp version):</p>
+ href="http://httpd.apache.org/download.cgi">main Apache
+ website</a>. A link to the signature file is placed behind the
+ corresponding download link or may be found in the particular
+ directory at the <a href="http://www.apache.org/dist/httpd/">Apache
+ distribution site</a>. Its filename is identical to the source
+ tarball with the addition of <code>.asc</code>. Then you can check
+ the distribution with one of the following commands (again,
+ depending on your pgp version):</p>
<example>$ pgp httpd-2_0_<em>NN</em>.tar.gz.asc</example>
@@ -499,7 +491,7 @@
<section id="dbm"><title>DBM</title>
<p>Several Apache features, including
- <module>mod_authn_dbm</module> and <module>mod_rewrite</module>'s
+ <module>mod_auth_dbm</module> and <module>mod_rewrite</module>'s
DBM <directive module="mod_rewrite">RewriteMap</directive> use
simple key/value databases for quick lookups of information. Apache
includes SDBM with its source-code, so this database is always
@@ -591,4 +583,4 @@
<example>$ <em>PREFIX</em>/bin/apachectl stop</example>
</section>
-</manualpage>
+</manualpage>
\ No newline at end of file
diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de
index 53c3439..170fb7d 100644
--- a/docs/manual/install.xml.de
+++ b/docs/manual/install.xml.de
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English revision: 1.10 -->
+<!-- English revision: 1.11.2.3 -->
<manualpage>
<relativepath href="."/>
@@ -25,8 +25,8 @@
sieht.</p>
</summary>
-<seealso><a href="invoking.html">Starten</a></seealso>
-<seealso><a href="stopping.html">Stoppen oder Neustarten</a></seealso>
+<seealso><a href="invoking.html">Apache starten</a></seealso>
+<seealso><a href="stopping.html">Beenden und Neustarten</a></seealso>
<section id="overview"><title>Überblick für die Ungeduldigen</title>
@@ -150,34 +150,25 @@
<section id="download"><title>Download</title>
<p>Der Apache kann von der <a
- href="http://www.apache.org/dist/httpd/">Apache Software
- Foundation Downloadseite</a> oder von einem <a
- href="http://www.apache.org/dyn/closer.cgi">nahegelegenen
- Mirror</a> heruntergeladen werden.</p>
-
- <p>Versionsnummern, die auf <code>alpha</code> enden, zeigen
- frühe Entwicklungsversionen an, die möglicherweise nicht
- funktionieren. Versionsnummern, die auf <code>beta</code> enden,
- zeigen verläßlichere Ausgaben an, die jedoch noch weitere
- Tests oder Bugfixes benötigen. Wenn Sie die beste verfügbare
- Produktivversion des Apache HTTP Servers herunterladen wollen, sollten
- Sie die letzte Version wählen, die weder <code>alpha</code>,
- noch <code>beta</code> in ihrem Dateinamen enthält.</p>
+ href="http://httpd.apache.org/download.cgi">Apache HTTP Server
+ Downloadseite</a> heruntergeladen werden, auf der verschiedene
+ Spiegelserver angegeben sind. Sie finden hier die jeweils aktuelle
+ stabile Version.</p>
<p>Nach dem Download, insbesondere, wenn ein Mirror benutzt wurde, ist es
wichtig, zu prüfen, dass Sie eine vollständige, nicht
modifizierte Version des Apache HTTP Servers erhalten haben. Dies kann
durch Prüfen des heruntergeladenen Tarballs gegen die PGP-Signatur
erreicht werden. Dies ist wiederum ein Zweischrittverfahren. Zuerst
- müssen Sie die <code>KEYS</code>-Datei von der <a
- href="http://www.apache.org/dist/httpd/">Apache Distributionsseite</a>
- beziehen. (Um sicherzustellen, dass die <code>KEYS</code>-Datei selbst
- nicht verändert wurde, ist es sinnvoll, eine Datei aus einer
- früheren Distribution des Apache zu verwenden, oder den
- Schlüssel von einem öffentlichen Schlüsselserver zu
- importieren.) Die Schlüssel werden mit einem der folgenden Befehle
- (abhängig von Ihrer PGP Version) zu Ihrem persönlichen
- Schlüsselring hinzugefügt:</p>
+ müssen Sie die <a href="http://www.apache.org/dist/httpd/KEYS">
+ <code>KEYS</code></a>-Datei ebenfalls von der Apache
+ Distributionsseite beziehen. (Um sicherzustellen, dass die
+ <code>KEYS</code>-Datei selbst nicht verändert wurde, ist
+ es sinnvoll, eine Datei aus einer früheren Distribution des
+ Apache zu verwenden, oder den Schlüssel von einem öffentlichen
+ Schlüsselserver zu importieren.) Die Schlüssel werden mit einem
+ der folgenden Befehle (abhängig von Ihrer PGP Version) zu Ihrem
+ persönlichen Schlüsselring hinzugefügt:</p>
<example>$ pgp < KEYS</example>
@@ -185,13 +176,16 @@
<example>$ gpg --import KEYS</example>
- <p>Der nächste Schritt ist das Testen des Tarballs gegen
+ <p>Der nächste Schritt ist das Testen des Tarballs gegen
die PGP-Signatur, die immer von der <a
- href="http://www.apache.org/dist/httpd/">Apache Originalseite</a>
- bezogen werden sollte. Die Signaturdatei hat den gleichen Dateinamen
- wie der Tarball, aber zusätzlich die Endung <code>.asc</code>. Nun
- können Sie die Distribution mit einem der folgenden Befehle
- (wiederum abhängig von Ihrer PGP Version) prüfen:</p>
+ href="http://httpd.apache.org/download.cgi">Apache Originalseite</a>
+ bezogen werden sollte. Den Link zur Signaturdatei finden Sie hinter
+ dem jeweiligen Download-Link oder im entsprechenden Verzeichnis auf der
+ <a href="http://www.apache.org/dist/httpd/">Apache-Distributionsseite</a>
+ Sie hat den gleichen Dateinamen wie der Tarball, aber zusätzlich die
+ Endung <code>.asc</code>. Nun können Sie die Distribution mit
+ einem der folgenden Befehle (wiederum abhängig von Ihrer PGP
+ Version) prüfen:</p>
<example>$ pgp httpd-2_0_<em>NN</em>.tar.gz.asc</example>
@@ -221,8 +215,8 @@
aus einem simplen Dekomprimieren und danach "Ent-tarren":</p>
<example>
- $ gzip -d httpd-2_0_<em>NN</em>.tar.gz<br />
- $ tar xvf httpd-2_0_<em>NN</em>.tar
+ $ gzip -d httpd-2_1_<em>NN</em>.tar.gz<br />
+ $ tar xvf httpd-2_1_<em>NN</em>.tar
</example>
<p>Dies erstellt unterhalb des aktuellen Verzeichnisses ein neues
@@ -524,7 +518,7 @@
<section id="dbm"><title>DBM</title>
- <p>Verschiedene Apache-Features, darunter <module>mod_authn_dbm</module>
+ <p>Verschiedene Apache-Features, darunter <module>mod_auth_dbm</module>
und DBM <directive module="mod_rewrite">RewriteMap</directive> aus
<module>mod_rewrite</module>, verwenden einfache
Schlüssel/Wert-Datenbanken für eine schnelle Suche nach
@@ -621,4 +615,4 @@
<example>$ <em>PREFIX</em>/bin/apachectl stop</example>
</section>
-</manualpage>
+</manualpage>
\ No newline at end of file
diff --git a/docs/manual/install.xml.ru b/docs/manual/install.xml.ru
new file mode 100644
index 0000000..4bc4453
--- /dev/null
+++ b/docs/manual/install.xml.ru
@@ -0,0 +1,564 @@
+<?xml version='1.0' encoding='KOI8-R' ?>
+<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
+
+<!--***************************************************-->
+<!-- English revision: 1.11.2.3 -->
+<!--***************************************************-->
+<!-- Translator: Ilia Soldis (soldis@infolio.ru) -->
+<!-- Reviewers: -->
+<!-- Ivan Shvedov (ivan@tversu.ru) -->
+<!-- Arthur Reznikov (art@altair.tversu.ru)-->
+<!--***************************************************-->
+
+<?xml-stylesheet type="text/xsl" href="./style/manual.ru.xsl"?>
+<manualpage>
+<relativepath href="."/>
+
+ <title>ëÏÍÐÉÌÉÒÏ×ÁÎÉÅ É ÕÓÔÁÎÏ×ËÁ</title>
+
+<summary>
+
+ <p>üÔÏÔ ÄÏËÕÍÅÎÔ ÏÓ×ÅÝÁÅÔ ×ÏÐÒÏÓÙ ËÏÍÐÉÌÉÒÏ×ÁÎÉÑ É ÕÓÔÁÎÏ×ËÉ ÓÅÒ×ÅÒÁ
+ Apache ÔÏÌØËÏ ÎÁ UNIX É UNIX-ÐÏÄÏÂÎÙÈ ÓÉÓÔÅÍÁÈ. åÓÌÉ ×Ù ÈÏÔÉÔÅ ÕÓÔÁÎÏ×ÉÔØ
+ ÓÅÒ×ÅÒ ÐÏÄ Windows, ÔÏ ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÐÒÏÞÅÓÔØ ÄÏËÕÍÅÎÔ <a
+ href="platform/windows.html">"éÓÐÏÌØÚÏ×ÁÎÉÅ Apache ÐÏÄ Microsoft Windows"</a>.
+ éÎÆÏÒÍÁÃÉÑ, ËÁÓÁÀÝÁÑÓÑ ÏÓÔÁÌØÎÙÈ ÐÌÁÔÆÏÒÍ, ÓÏÄÅÒÖÉÔÓÑ × ÄÏËÕÍÅÎÔÅ
+ <a href="platform/">"ðÌÁÔÆÏÒÍÙ"</a>.</p>
+
+ <p>óÒÅÄÁ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ É ÕÓÔÁÎÏ×ËÉ ÓÅÒ×ÅÒÁ ÐÏÌÎÏÓÔØÀ ÏÔÌÉÞÁÅÔÓÑ ÏÔ ÔÏÊ, ËÏÔÏÒÁÑ ÂÙÌÁ
+ × Apache 1.3. Apache 1.3 ÉÓÐÏÌØÚÏ×ÁÌ ÏÂÙÞÎÙÊ ÎÁÂÏÒ ÓËÒÉÐÔÏ×, ÐÏÚ×ÏÌÑ×ÛÉÊ ÕÐÒÏÓÔÉÔØ
+ ÐÒÏÃÅÓÓ ÕÓÔÁÎÏ×ËÉ. Apache 2.0 ÔÅÐÅÒØ ÉÓÐÏÌØÚÕÅÔ ÓÉÓÔÅÍÙ <code>libtool</code> É
+ <code>autoconf</code>, ÞÔÏ ÄÅÌÁÅÔ ÓÅÒ×ÅÒ ÐÏÈÏÖÉÍ ÎÁ ÄÒÕÇÉÅ ÐÒÏÇÒÁÍÍÎÙÅ ÐÒÏÄÕËÔÙ
+ Ó ÏÔËÒÙÔÙÍ ÉÓÈÏÄÎÙÍ ËÏÄÏÍ (Open Source projects).</p>
+
+</summary>
+
+<seealso><a href="invoking.html">úÁÐÕÓË ÓÅÒ×ÅÒÁ</a></seealso>
+<seealso><a href="stopping.html">ïÓÔÁÎÏ×ËÁ É ÐÅÒÅÚÁÐÕÓË</a></seealso>
+
+<section id="overview"><title>ëÒÁÔËÉÊ ÏÂÚÏÒ "ÄÌÑ ÎÅÔÅÒÐÅÌÉ×ÙÈ"</title>
+
+ <table>
+ <tr>
+ <td><a href="#download">úÁÇÒÕÚËÁ</a></td>
+
+ <td><code>$ lynx
+ http://www.apache.org/dist/httpd/httpd-2_0_<em>NN</em>.tar.gz</code>
+ </td>
+ </tr>
+
+ <tr>
+ <td><a href="#extract">òÁÓÐÁËÏ×ËÁ</a></td>
+
+ <td><code>$ gzip -d httpd-2_0_<em>NN</em>.tar.gz<br />
+ $ tar xvf httpd-2_0_<em>NN</em>.tar</code> </td>
+ </tr>
+
+ <tr>
+ <td><a href="#configure">ëÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÅ</a></td>
+
+ <td><code>$ ./configure --prefix=<em>PREFIX</em></code>
+ </td>
+ </tr>
+
+ <tr>
+ <td><a href="#compile">ëÏÍÐÉÌÉÒÏ×ÁÎÉÅ</a></td>
+
+ <td><code>$ make</code> </td>
+ </tr>
+
+ <tr>
+ <td><a href="#install">õÓÔÁÎÏ×ËÁ</a></td>
+
+ <td><code>$ make install</code> </td>
+ </tr>
+
+ <tr>
+ <td><a href="#customize">îÁÓÔÒÏÊËÁ</a></td>
+
+ <td><code>$ vi <em>PREFIX</em>/conf/httpd.conf</code> </td>
+ </tr>
+
+ <tr>
+ <td><a href="#test">ðÒÏÂÎÙÊ ÚÁÐÕÓË</a></td>
+
+ <td><code>$ <em>PREFIX</em>/bin/apachectl start</code>
+ </td>
+ </tr>
+ </table>
+
+ <p><em>NN</em> ÎÅÏÂÈÏÄÉÍÏ ÚÁÍÅÎÉÔØ ÎÁ ÔÅËÕÝÉÊ ÍÌÁÄÛÉÊ ÎÏÍÅÒ ×ÅÒÓÉÉ,
+ Á ×ÍÅÓÔÏ <em>PREFIX</em> ÎÁÄÏ ÕËÁÚÁÔØ ÐÕÔØ, ÐÏ
+ ËÏÔÏÒÏÍÕ ÄÏÌÖÅÎ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ ÓÅÒ×ÅÒ. åÓÌÉ <em>PREFIX</em> ÎÅ ÕËÁÚÁÎ,
+ ÔÏ ÕÓÔÁÎÏ×ËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ ÐÒÏÉÚ×ÏÄÉÔÓÑ × ËÁÔÁÌÏÇ
+ <code>/usr/local/apache2</code>.</p>
+
+ <p>âÏÌÅÅ ÐÏÄÒÏÂÎÏ ×ÓÅ ÜÔÁÐÙ ËÏÍÐÉÌÉÒÏ×ÁÎÉÑ É ÕÓÔÁÎÏ×ËÉ ÓÅÒ×ÅÒÁ ÒÁÓÓÍÏÔÒÅÎÙ
+ ÎÉÖÅ, ÐÒÉÞÅÍ ÎÁÞÉÎÁÅÔÓÑ ÓÌÅÄÕÀÝÉÊ ÒÁÚÄÅÌ Ó ÏÐÉÓÁÎÉÑ ÓÉÓÔÅÍÎÙÈ ÔÒÅÂÏ×ÁÎÉÊ,
+ ÎÅÏÂÈÏÄÉÍÙÈ, ÄÌÑ ÔÏÇÏ ÞÔÏÂÙ ÕÓÔÁÎÏ×ËÁ ÐÒÏÛÌÁ ÕÓÐÅÛÎÏ.</p>
+</section>
+
+<section id="requirements"><title>ôÒÅÂÏ×ÁÎÉÑ</title>
+
+ <p>ôÒÅÂÏ×ÁÎÉÑ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÕÓÐÅÛÎÏÊ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ:</p>
+
+ <dl>
+ <dt>äÉÓËÏ×ÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï</dt>
+ <dd>õÂÅÄÉÔÅÓØ, ÞÔÏ ÎÁ ÄÉÓËÅ ÅÓÔØ ËÁË ÍÉÎÉÎÉÍÕÍ 50 MB
+ Ó×ÏÂÏÄÎÏÇÏ ÍÅÓÔÁ ÄÌÑ ×ÒÅÍÅÎÎÙÈ ÆÁÊÌÏ×. ðÏÓÌÅ ÕÓÔÁÎÏ×ËÉ
+ Apache ÚÁÎÉÍÁÅÔ ÐÒÉÂÌÉÚÉÔÅÌØÎÏ 10 MB. ôÏÞÎÙÊ ÒÁÚÍÅÒ ÚÁÎÉÍÁÅÍÏÇÏ
+ ÍÅÓÔÁ ÂÕÄÅÔ ÚÁ×ÉÓÅÔØ × ÏÓÎÏ×ÎÏÍ ÏÔ ×ÙÂÒÁÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ É
+ ÄÏÐÏÌÎÉÔÅÌØÎÏ ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÙÈ ÍÏÄÕÌÅÊ, ÎÅ ×ÈÏÄÑÝÉÈ × ÄÉÓÔÒÉÂÕÔÉ×
+ Apache.</dd>
+
+ <dt>ANSI-C ËÏÍÐÉÌÑÔÏÒ É ÎÅÏÂÈÏÄÉÍÁÑ ÓÒÅÄÁ ÓÂÏÒËÉ</dt>
+ <dd>õÂÅÄÉÔÅÓØ, ÞÔÏ ÎÁ ×ÁÛÅÊ ÓÉÓÔÅÍÅ ÕÓÔÁÎÏ×ÌÅÎ ANSI-C
+ ËÏÍÐÉÌÑÔÏÒ. òÅËÏÍÅÎÄÕÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÔØ <a
+ href="http://www.gnu.org/software/gcc/gcc.html">GNU C
+ ËÏÍÐÉÌÑÔÏÒ (GCC)</a> ÏÔ <a
+ href="http://www.gnu.org/">Free Software Foundation (FSF)</a>
+ (×ÅÒÓÉÉ 2.7.2 ×ÐÏÌÎÅ ÄÏÓÔÁÔÏÞÎÏ). åÓÌÉ Õ ×ÁÓ ÄÒÕÇÏÊ ËÏÍÐÉÌÑÔÏÒ,
+ ÔÏ ×ÙÑÓÎÉÔÅ, ÐÏÄÄÅÒÖÉ×ÁÅÔ ÌÉ ÏÎ ÓÔÁÎÄÁÒÔ ANSI. ðÒÏ×ÅÒØÔÅ ÔÁËÖÅ,
+ ÞÔÏÂÙ × ÐÅÒÅÍÅÎÎÏÊ ÏËÒÕÖÅÎÉÑ <code>PATH</code> ÂÙÌ ÕËÁÚÁÎ ËÁÔÁÌÏÇ,
+ ÓÏÄÅÒÖÁÝÉÊ ÏÓÎÏ×ÎÙÅ ÕÔÉÌÉÔÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÂÏÒËÉ (<code>make</code> É ÄÒÕÇÉÅ).</dd>
+
+ <dt>óÉÎÈÒÏÎÉÚÁÃÉÑ ×ÒÅÍÅÎÉ</dt>
+ <dd>÷ ÎÅËÏÔÏÒÙÈ ÚÁÇÏÌÏ×ËÁÈ HTTP ÐÒÏÔÏËÏÌÁ ÕËÁÚÙ×ÁÅÔÓÑ ×ÒÅÍÑ.
+ ðÏÜÔÏÍÕ ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ×ÙÑÓÎÉÔØ, ËÁË ÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ × ×ÁÛÅÊ
+ ÓÉÓÔÅÍÅ ÓÒÅÄÓÔ×Ï ÓÉÎÈÒÏÎÉÚÁÃÉÉ ×ÒÅÍÅÎÉ. ïÂÙÞÎÏ ÄÌÑ ÜÔÉÈ ÃÅÌÅÊ
+ ÉÓÐÏÌØÚÕÀÔÓÑ ÐÒÏÇÒÁÍÍÙ <code>ntpdate</code> ÉÌÉ <code>xntpd</code>,
+ ÏÓÎÏ×ÁÎÎÙÅ ÎÁ ÓÅÔÅ×ÏÍ ÐÒÏÔÏËÏÌÅ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ×ÒÅÍÅÎÉ
+ (Network Time Protocol - NTP). äÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ
+ Ï NTP É ÓÅÒ×ÅÒÁÈ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ×ÒÅÍÅÎÉ, ÏÂÒÁÔÉÔÅÓØ × ÇÒÕÐÐÕ ÎÏ×ÏÓÔÅÊ Usenet <a
+ href="news:comp.protocols.time.ntp">comp.protocols.time.ntp</a>,
+ Á ÔÁËÖÅ ÐÏÓÅÔÉÔÅ <a href="http://www.eecis.udel.edu/~ntp/">ÄÏÍÁÛÎÀÀ ÓÔÒÁÎÉÃÕ NTP</a></dd>
+
+ <dt><a href="http://www.perl.org/">Perl 5</a>
+ [îåïâñúáôåìøîï]</dt>
+ <dd>äÌÑ ×ÙÐÏÌÎÅÎÉÑ ÎÅËÏÔÏÒÙÈ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÈ ÓËÒÉÐÔÏ×, ÔÁËÉÈ ËÁË <a
+ href="programs/apxs.html">apxs</a> ÉÌÉ <a href="programs/dbmmanage.html">dbmmanage</a>
+ (ËÏÔÏÒÙÅ ÎÁÐÉÓÁÎÙ ÎÁ Perl), ÎÅÏÂÈÏÄÉÍ ÉÎÔÅÒÐÒÅÔÁÔÏÒ Ó ÑÚÙËÁ Perl
+ (×ÅÒÓÉÉ 5.003 ÉÌÉ ×ÙÛÅ ÄÏÓÔÁÔÏÞÎÏ). åÓÌÉ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÓËÒÉÐÔ
+ `<code>configure</code>' ÎÅ ÎÁÊÄÅÔ ÅÇÏ × ×ÁÛÅÊ ÓÉÓÔÅÍÅ, ÔÏ ×Ù ×ÓÅ ÒÁ×ÎÏ
+ ÓÍÏÖÅÔÅ ÓÏÂÒÁÔØ É ÕÓÔÁÎÏ×ÉÔØ Apache 2.0 - × ÜÔÏÍ ÓÌÕÞÁÅ ÎÅ ÂÕÄÕÔ
+ ÒÁÂÏÔÁÔØ ÔÏÌØËÏ ÐÅÒÅÞÉÓÌÅÎÎÙÅ ×ÙÛÅ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÓËÒÉÐÔÙ. åÓÌÉ × ×ÁÛÅÊ
+ ÓÉÓÔÅÍÅ ÕÓÔÁÎÏ×ÌÅÎÏ ÎÅÓËÏÌØËÏ ÉÎÔÅÒÐÒÅÔÁÔÏÒÏ× Ó ÑÚÙËÁ Perl (ÎÁÐÒÉÍÅÒ Perl 4 É Perl 5),
+ ÔÏ ÄÌÑ ÔÏÇÏ ÞÔÏÂÙ ÓËÒÉÐÔ <code>./configure</code> ×ÙÂÒÁÌ ÎÕÖÎÙÊ, ×ÙÐÏÌÎÉÔÅ
+ ÅÇÏ Ó ÏÐÃÉÅÊ <code>--with-perl</code> (ÏÐÉÓÁÎÉÅ ÓÍÏÔÒÉÔÅ ÎÉÖÅ).</dd>
+ </dl>
+</section>
+
+<section id="download"><title>úÁÇÒÕÚËÁ</title>
+
+ <p>Apache ÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ ÓÏ <a
+ href="http://httpd.apache.org/download.cgi">ÓÔÒÁÎÉÃÙ ÚÁÇÒÕÚËÉ Apache HTTP Software
+ Foundation</a>, ÎÁ ËÏÔÏÒÏÊ ÔÁËÖÅ ÐÒÉ×ÏÄÉÔÓÑ ÓÐÉÓÏË ÎÅËÏÔÏÒÙÈ ÚÅÒËÁÌØÎÙÈ ÓÅÒ×ÅÒÏ×.
+ úÄÅÓØ ×Ù ÎÁÊÄÅÔÅ ÓÁÍÕÀ ÐÏÓÌÅÄÎÀÀ ÓÔÁÂÉÌØÎÕÀ ×ÅÒÓÉÀ ÓÅÒ×ÅÒÁ.</p>
+
+ <p>ðÏÓÌÅ ÚÁÇÒÕÚËÉ, ÏÓÏÂÅÎÎÏ ÅÓÌÉ ÏÎÁ ÐÒÏÉÓÈÏÄÉÌÁ Ó ÚÅÒËÁÌØÎÏÇÏ
+ ÓÅÒ×ÅÒÁ, ÎÅÏÂÈÏÄÉÍÏ ÕÂÅÄÉÔØÓÑ, ÞÔÏ Õ ×ÁÓ × ÒÕËÁÈ ÐÏÌÎÁÑ,
+ ÎÅÉÚÍÅÎÅÎÎÁÑ ×ÅÒÓÉÑ HTTP ÓÅÒ×ÅÒÁ Apache. üÔÏ ×ÙÐÏÌÎÑÅÔÓÑ
+ ÔÅÓÔÉÒÏ×ÁÎÉÅÍ ÁÒÈÉ×Á (tarball) ÎÁ ÓÏÏÔ×ÅÔÓÔ×ÉÅ PGP ÐÏÄÐÉÓÉ, ÞÔÏ Ñ×ÌÑÅÔÓÑ, ×
+ Ó×ÏÀ ÏÞÅÒÅÄØ, Ä×ÕÛÁÇÏ×ÏÊ ÐÒÏÃÅÄÕÒÏÊ. ÷Ï-ÐÅÒ×ÙÈ, ×Ù ÄÏÌÖÎÙ
+ ÚÁÇÒÕÚÉÔØ ÆÁÊÌ <code>KEYS</code> ÓÏ <a
+ href="http://www.apache.org/dist/httpd/">ÓÔÒÁÎÉÃÙ ÚÁÇÒÕÚËÉ
+ Apache Software Foundation</a>. (äÌÑ ÔÏÇÏ ÞÔÏÂÙ ÂÙÔØ Õ×ÅÒÅÎÎÙÍ × ÔÏÍ,
+ ÞÔÏ ÓÁÍ ÆÁÊÌ <code>KEYS</code> ÎÅ ÂÙÌ ÉÚÍÅÎÅÎ, ÅÇÏ ÌÕÞÛÅ ×ÚÑÔØ ÉÚ
+ ÐÒÅÄÙÄÕÝÅÇÏ ÄÉÓÔÒÉÂÕÔÉ×Á Apache ÉÌÉ ×ÚÑÔØ Ó ÓÅÒ×ÅÒÁ
+ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ.) úÁÔÅÍ ËÌÀÞÉ ÍÏÖÎÏ ÉÍÐÏÒÔÉÒÏ×ÁÔØ × ×ÁÛÕ ÌÉÞÎÕÀ ÂÁÚÕ
+ ÄÁÎÎÙÈ ËÌÀÞÅÊ ÐÏÓÒÅÄÓÔ×ÏÍ ÓÌÅÄÕÀÝÉÈ ËÏÍÁÎÄ (× ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ
+ ×ÅÒÓÉÉ pgp):</p>
+
+<example>$ pgp < KEYS</example>
+
+ <p>ÉÌÉ </p>
+
+<example>$ gpg --import KEYS</example>
+
+ <p>óÌÅÄÕÀÝÉÊ ÛÁÇ ÚÁËÌÀÞÁÅÔÓÑ × ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏÊ ÐÒÏ×ÅÒËÅ
+ ÁÒÈÉ×Á (tarball) Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ PGP ÐÏÄÐÉÓÉ, ËÏÔÏÒÕÀ ×ÓÅÇÄÁ
+ ÎÁÄÏ ÂÒÁÔØ ÎÁ <a href="http://www.apache.org/dist/httpd/">ÏÓÎÏ×ÎÏÍ
+ ×ÅÂ-ÓÅÒ×ÅÒÅ Apache</a>. æÁÊÌ Ó PGP ÐÏÄÐÉÓØÀ ÉÍÅÅÔ ÔÏ ÖÅ ÉÍÑ, ÞÔÏ
+ É ÁÒÈÉ× ÄÉÓÔÒÉÂÕÔÉ×Á ÐÌÀÓ ÏËÏÎÞÁÎÉÅ <code>.asc</code>. ðÒÏ×ÅÒÉÔØ
+ ÄÉÓÔÒÉÂÕÔÉ× ÍÏÖÎÏ, ÎÁÂÒÁ× ÓÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ (ÏÐÑÔØ ÖÅ, ÜÔÏ ÚÁ×ÉÓÉÔ
+ ÏÔ ×ÅÒÓÉÉ pgp, ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ × ×ÁÛÅÊ ÓÉÓÔÅÍÅ):</p>
+
+<example>$ pgp httpd-2_0_<em>NN</em>.tar.gz.asc</example>
+
+ <p>ÉÌÉ</p>
+
+<example>$ gpg --verify httpd-2_0_<em>NN</em>.tar.gz.asc</example>
+
+ <p>÷Ù ÄÏÌÖÎÙ Õ×ÉÄÅÔØ ÞÔÏ-ÔÏ ×ÒÏÄÅ:</p>
+
+<example>Good signature from user "Martin Kraemer
+ <martin@apache.org>".</example>
+
+ <p>÷ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÄÏ×ÅÒÉÔÅÌØÎÙÈ ÏÔÎÏÛÅÎÉÊ, ÓÏÄÅÒÖÁÝÉÈÓÑ × ×ÁÛÅÊ
+ ÂÁÚÅ ÄÁÎÎÙÈ ËÌÀÞÅÊ, ×Ù ÍÏÖÅÔÅ ÔÁËÖÅ ÐÏÌÕÞÉÔØ ÓÏÏÂÝÅÎÉÅ Ï ÔÏÍ,
+ ÞÔÏ ÏÔÎÏÛÅÎÉÅ ÍÅÖÄÕ ËÌÀÞÅÍ É ÔÅÍ, ËÔÏ ÉÍ ÐÏÄÐÉÓÁÌÓÑ, ÎÅ×ÏÚÍÏÖÎÏ
+ ÕÓÔÁÎÏ×ÉÔØ. üÔÏ ÎÅ ÄÏÌÖÎÏ ×ÁÓ ÂÅÓÐÏËÏÉÔØ × ÔÏÍ ÓÌÕÞÁÅ, ÅÓÌÉ
+ ×Ù Õ×ÅÒÅÎÙ × ÐÏÄÌÉÎÎÏÓÔÉ ÆÁÊÌÁ <code>KEYS</code>.</p>
+
+</section>
+
+<section id="extract"><title>òÁÓÐÁËÏ×ËÁ</title>
+
+ <p>òÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÉÓÈÏÄÎÙÈ ËÏÄÏ× Apache HTTP ÓÅÒ×ÅÒÁ
+ ÚÁËÌÀÞÁÅÔÓÑ × ÅÇÏ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏÊ ÒÁÓÐÁËÏ×ËÅ É
+ ÒÁÚÁÒÈÉ×ÉÒÏ×ÁÎÉÉ (untarring):</p>
+
+<example>
+ $ gzip -d httpd-2_0_<em>NN</em>.tar.gz<br />
+ $ tar xvf httpd-2_0_<em>NN</em>.tar
+</example>
+
+ <p>ðÏÓÌÅ ×ÙÐÏÌÎÅÎÉÑ ÜÔÉÈ ËÏÍÁÎÄ ÂÕÄÅÔ ÓÏÚÄÁÎ ÎÏ×ÙÊ ËÁÔÁÌÏÇ
+ Ó ÉÓÈÏÄÎÙÍÉ ËÏÄÁÍÉ ÄÉÓÔÒÉÂÕÔÉ×Á. ÷Ù ÄÏÌÖÎÙ ÚÁÊÔÉ
+ × ÜÔÏÔ ËÁÔÁÌÏÇ, ÐÒÅÖÄÅ ÞÅÍ ÎÁÞÎÅÔÅ ËÏÍÐÉÌÉÒÏ×ÁÔØ ÓÅÒ×ÅÒ.</p>
+</section>
+
+<section id="configure"><title>ëÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÅ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ ËÏÄÏ×</title>
+
+ <p>óÌÅÄÕÀÝÉÊ ÛÁÇ ÚÁËÌÀÞÁÅÔÓÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ
+ ËÏÄÏ× × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÔÏÊ ÓÉÓÔÅÍÏÊ, ÎÁ ËÏÔÏÒÕÀ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ
+ ÓÅÒ×ÅÒ, É ×ÁÛÉÍÉ ÓÏÂÓÔ×ÅÎÎÙÍÉ ÎÕÖÄÁÍÉ. üÔÏ ÄÅÌÁÅÔÓÑ ÐÒÉ ÐÏÍÏÝÉ
+ ÓËÒÉÐÔÁ <code>configure</code>, ÒÁÓÐÏÌÏÖÅÎÎÏÇÏ × ËÏÒÎÅ×ÏÍ ËÁÔÁÌÏÇÅ
+ ÄÉÓÔÒÉÂÕÔÉ×Á. òÁÚÒÁÂÏÔÞÉËÉ, ÚÁÇÒÕÖÁÀÝÉÅ ÄÅÒÅ×Ï ÉÓÈÏÄÎÙÈ ËÏÄÏ× ÐÏÓÒÅÄÓÔ×ÏÍ
+ CVS, ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ × Ó×ÏÅÊ ÓÉÓÔÅÍÅ ÕÔÉÌÉÔÙ <code>autoconf</code>
+ É <code>libtool</code> É ×ÙÐÏÌÎÉÔØ ÐÒÏÇÒÁÍÍÕ <code>buildconf</code>, ÐÒÅÖÄÅ
+ ÞÅÍ ÏÎÉ ÓÍÏÇÕÔ ÐÒÏÄÏÌÖÎÉÔØ ÕÓÔÁÎÏ×ËÕ. ÷ ÏÆÉÃÉÁÌØÎÙÈ ×ÙÐÕÓËÁÈ ÓÅÒ×ÅÒÁ
+ ÜÔÏÇÏ ÄÅÌÁÔØ ÎÅ ÔÒÅÂÕÅÔÓÑ.</p>
+
+ <p>äÌÑ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ ËÏÄÏ×, Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ
+ ÚÎÁÞÅÎÉÊ ×ÓÅÈ ÏÐÃÉÊ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÐÒÏÓÔÏ ×ÙÐÏÌÎÉÔÅ ÓËÒÉÐÔ <code>./configure</code>
+ ÂÅÚ ÐÁÒÁÍÅÔÒÏ×. äÌÑ ÔÏÇÏ ÞÔÏÂÙ ÉÚÍÅÎÉÔØ ÚÎÁÞÅÎÉÑ ÏÐÃÉÊ, ÓËÒÉÐÔ <code>configure</code>
+ ÐÒÅÄÌÁÇÁÅÔ ÛÉÒÏËÉÊ ÎÁÂÏÒ ÐÅÒÅÍÅÎÎÙÈ É ÏÐÃÉÊ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ. ðÒÉ ÜÔÏÍ
+ ÐÅÒÅÍÅÎÎÙÅ ÏËÒÕÖÅÎÉÑ ÐÏÍÅÝÁÀÔÓÑ ÐÅÒÅÄ ËÏÍÁÎÄÏÊ <code>./configure</code>, × ÔÏ ×ÒÅÍÑ ËÁË
+ ÏÓÔÁÌØÎÙÅ ÏÐÃÉÉ - ÐÏÓÌÅ. îÁÉÂÏÌÅÅ ×ÁÖÎÁÑ ÏÐÃÉÑ ÚÄÅÓØ - ÜÔÏ ÐÒÅÆÉËÓ ËÁÔÁÌÏÇÁ
+ ÕÓÔÁÎÏ×ËÉ, ÔÏ ÅÓÔØ ÔÏÔ ÐÕÔØ, ÐÏ ËÏÔÏÒÏÍÕ ×ÐÏÓÌÅÄÓÔ×ÉÉ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÌÅÎ Apache.
+ îÏ ÐÏÍÉÍÏ ÜÔÏÊ ÓÕÝÅÓÔ×ÕÅÔ ÅÝÅ ÂÏÌØÛÏÊ ×ÙÂÏÒ ÏÐÃÉÊ, ÎÅÏÂÈÏÄÉÍÙÈ ÄÌÑ ÔÏÎËÏÊ ÎÁÓÔÒÏÊËÉ
+ ÓÅÒ×ÅÒÁ.</p>
+
+ <p>äÌÑ ÔÏÇÏ ÞÔÏÂÙ ÐÏÌÕÞÉÔØ ÐÒÅÄÓÔÁ×ÌÅÎÉÅ Ï ÇÉÂËÏÓÔÉ ÐÒÏÃÅÓÓÁ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ Apache,
+ ÒÁÓÓÍÏÔÒÉÔÅ ÐÒÉ×ÅÄÅÎÎÙÊ ÎÉÖÅ ÔÉÐÉÞÎÙÊ ÐÒÉÍÅÒ ÚÁÐÕÓËÁ ÓËÒÉÐÔÁ <code>./configure</code>.
+ ôÁËÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ ÐÏÚ×ÏÌÑÅÔ ËÏÍÐÉÌÉÒÏ×ÁÔØ
+ ÓÅÒ×ÅÒ × ËÁÔÁÌÏÇ <code>/sw/pkg/apache</code>, ÉÓÐÏÌØÚÕÑ ÕËÁÚÁÎÎÙÊ ËÏÍÐÉÌÑÔÏÒ Ó
+ ÎÅÓËÏÌØËÉÍÉ ÐÒÅÄÎÁÚÎÁÞÅÎÎÙÍÉ ÄÌÑ ÎÅÇÏ ÏÐÃÉÑÍÉ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ, É ÕÓÔÁÎÏ×ÉÔØ
+ ÅÝÅ Ä×Á ÄÏÂÁ×ÏÞÎÙÈ ÍÏÄÕÌÑ <module>mod_rewrite</module> É <module>mod_speling</module>,
+ ËÏÔÏÒÙÅ ÍÏÖÎÏ ÂÕÄÅÔ ÐÏÔÏÍ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÏÓÒÅÄÓÔ×ÏÍ ÍÅÈÁÎÉÚÍÁ DSO.</p>
+
+<example>
+ $ CC="pgcc" CFLAGS="-O2" \<br />
+ ./configure --prefix=/sw/pkg/apache \<br />
+ --enable-rewrite=shared \<br />
+ --enable-speling=shared
+</example>
+
+ <p>ðÒÉ ×ÙÐÏÌÎÅÎÉÉ, ÓËÒÉÐÔ <code>configure</code> ÐÒÏ×ÅÒÑÅÔ, ÕÓÔÁÎÏ×ÌÅÎÏ ÌÉ × ×ÁÛÅÊ ÓÉÓÔÅÍÅ
+ ×ÓÅ ÎÅÏÂÈÏÄÉÍÏÅ, Á ÚÁÔÅÍ ÓÏÚÄÁÅÔ Make-ÆÁÊÌÙ (Makefiles), ËÏÔÏÒÙÅ ÂÕÄÕÔ ÚÁÔÅÍ ÉÓÐÏÌØÚÏ×ÁÎÙ
+ ÐÒÉ ËÏÍÐÉÌÉÒÏ×ÁÎÉÉ ÓÅÒ×ÅÒÁ.</p>
+
+ <p>îÁÉÂÏÌÅÅ ÐÒÏÓÔÏÊ ÓÐÏÓÏ ÕÚÎÁÔØ ÏÂÏ ×ÓÅÈ ÄÏÓÔÕÐÎÙÈ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÏÐÃÉÑÈ - ÜÔÏ
+ ×ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ <code>./configure --help</code>. îÁ ÜËÒÁÎ ÂÕÄÅÔ ×Ù×ÅÄÅÎÏ ËÒÁÔËÏÅ
+ ÏÐÉÓÁÎÉÅ ÐÒÁËÔÉÞÅÓËÉ ×ÓÅÈ ÄÏÓÔÕÐÎÙÈ ÏÐÃÉÊ É ÐÅÒÅÍÅÎÎÙÈ ÏËÒÕÖÅÎÉÑ.</p>
+
+<section id="environment"><title>ðÅÒÅÍÅÎÎÙÅ ÏËÒÕÖÅÎÉÑ</title>
+
+ <p>ðÒÏÇÒÁÍÍÁ <code>autoconf</code> ÉÓÐÏÌØÚÕÅÔ ÒÑÄ ÐÅÒÅÍÅÎÎÙÈ ÏËÒÕÖÅÎÉÑ ÄÌÑ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ
+ ÓÒÅÄÙ ÓÂÏÒËÉ. ÷ÏÏÂÝÅ, ÐÏÓÒÅÄÓÔ×ÏÍ ÜÔÉÈ ÐÅÒÅÍÅÎÎÙÈ ÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÌÉÛØ ÍÅÔÏÄ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ -
+ ËÏÎÔÒÏÌÉÒÏ×ÁÔØ ×ËÌÀÞÅÎÉÅ É ×ÙËÌÀÞÅÎÉÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÏÐÃÉÊ ÓÅÒ×ÅÒÁ ÜÔÉÍ ÎÅ×ÏÚÍÏÖÎÏ. üÔÉ
+ ÐÅÒÅÍÅÎÎÙÅ ÍÏÖÎÏ ×ËÌÀÞÉÔØ × ÓÒÅÄÕ ÄÏ ×ÙÚÏ×Á ÓËÒÉÐÔÁ <code>configure</code>, ÎÏ ÐÒÏÝÅ ×ÓÅÇÏ
+ ÜÔÏ ÓÄÅÌÁÔØ ÔÁË, ËÁË ÂÙÌÏ ÐÏËÁÚÁÎÏ × ÐÒÉÍÅÒÅ ×ÙÛÅ.</p>
+
+ <dl>
+ <dt><code>CC=...</code></dt>
+
+ <dd>ëÏÍÁÎÄÁ ×ÙÚÏ×Á ËÏÍÐÉÌÑÔÏÒÁ Ó ÑÚÙËÁ C</dd>
+
+ <dt><code>CPPFLAGS=...</code></dt>
+
+ <dd>äÏÐÏÌÎÉÔÅÌØÎÙÅ ÏÐÃÉÉ ÐÒÅÐÒÏÃÅÓÓÏÒÁ É ËÏÍÐÉÌÑÔÏÒÁ Ó ÑÚÙËÁ C.</dd>
+
+ <dt><code>CFLAGS=...</code></dt>
+
+ <dd>ïÐÃÉÉ ÏÔÌÁÄËÉ É ÏÐÔÉÍÉÚÁÃÉÉ ËÏÍÐÉÌÑÔÏÒÁ Ó ÑÚÙËÁ C.</dd>
+
+ <dt><code>LDFLAGS=...</code></dt>
+
+ <dd>äÏÐÏÌÎÉÔÅÌØÎÙÅ ÏÐÃÉÉ ÄÌÑ ËÏÍÐÏÎÏ×ÝÉËÁ.</dd>
+
+ <dt><code>LIBS=...</code></dt>
+
+ <dd>éÎÆÏÒÍÁÃÉÑ Ï ÒÁÓÐÏÌÏÖÅÎÉÉ ÂÉÂÌÉÏÔÅË (ÏÐÃÉÉ "<code>-L</code>" É
+ "<code>-l</code>"), ÐÅÒÅÄÁ×ÁÅÍÁÑ ËÏÍÐÏÎÏ×ÝÉËÕ.</dd>
+
+ <dt><code>INCLUDES=...</code></dt>
+
+ <dd>ðÕÔÉ, ÐÏ ËÏÔÏÒÙÍ ÉÝÕÔÓÑ ÚÁÇÏÌÏ×ÏÞÎÙÅ ÆÁÊÌÙ. ("<code>-I<em>dir</em></code>").</dd>
+
+ <dt><code>TARGET=...</code> [ðÏ ÕÍÏÌÞÁÎÉÀ: <code>apache</code>]</dt>
+
+ <dd>éÍÑ ÉÓÐÏÌÎÑÅÍÏÇÏ ÆÁÊÌÁ ÐÏÓÌÅ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ</dd>
+
+ <dt><code>NOTEST_CPPFLAGS=...</code></dt>
+
+ <dt><code>NOTEST_CFLAGS=...</code></dt>
+
+ <dt><code>NOTEST_LDFLAGS=...</code></dt>
+
+ <dt><code>NOTEST_LIBS=...</code></dt>
+
+ <dd>üÔÉ ÐÅÒÅÍÅÎÎÙÅ ÏËÒÕÖÅÎÉÑ ×ÙÐÏÌÎÑÀÔ ÔÕ ÖÅ ÒÏÌØ, ÞÔÏ É ÔÅ ÖÅ ÓÁÍÙÅ ÐÅÒÅÍÅÎÎÙÅ,
+ ÎÏ ÂÅÚ ÐÒÉÓÔÁ×ËÉ <code>NOTEST</code>. òÁÚÎÉÃÁ ÚÁËÌÀÞÁÅÔÓÑ × ÔÏÍ, ÞÔÏ ÏÎÉ ÄÏÂÁ×ÌÑÀÔÓÑ
+ × ÓÒÅÄÕ ÐÏÓÌÅ ÔÏÇÏ, ËÁË autoconf ×ÙÐÏÌÎÉÌ ÔÅÓÔÉÒÏ×ÁÎÉÅ ×ÏÚÍÏÖÎÏÓÔÅÊ ÏÐÅÒÁÃÉÏÎÎÏÊ
+ ÓÒÅÄÙ. üÔÏ ÐÏÚ×ÏÌÑÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÅ ÏÐÃÉÉ, ËÏÔÏÒÙÅ ÂÙ ×ÙÚ×ÁÌÉ ÏÛÉÂËÕ ÐÒÉ ÐÏÄÏÂÎÏÍ
+ ÔÅÓÔÉÒÏ×ÁÎÉÉ, ÎÏ ×ËÌÀÞÅÎÉÅ ËÏÔÏÒÙÈ ÏÂÑÚÁÔÅÌØÎÏ ÄÌÑ ÏËÏÎÞÁÔÅÌØÎÏÊ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ.</dd>
+
+ <dt><code>SHLIB_PATH=...</code></dt>
+
+ <dd>ïÐÃÉÉ ËÏÍÐÉÌÑÔÏÒÁ É ËÏÍÐÏÎÏ×ÝÉËÁ, ÏÐÒÅÄÅÌÑÀÝÉÅ ÐÕÔØ Ë ÒÁÚÄÅÌÑÅÍÙÍ ÂÉÂÌÉÏÔÅËÁÍ.</dd>
+ </dl>
+</section>
+
+<section id="output"><title>ïÐÃÉÉ, ËÏÎÆÉÇÕÒÉÒÕÀÝÉÅ ×ÙÈÏÄÎÏÊ ÐÏÔÏË ÐÒÏÇÒÁÍÍÙ autoconf</title>
+
+ <dl>
+ <dt><code>--help</code></dt>
+
+ <dd>÷ÙÄÁÅÔ ÉÎÓÔÒÕËÃÉÀ ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÐÒÏÇÒÁÍÍÙ, ×ËÌÀÞÁÑ ×ÓÅ ×ÏÚÍÏÖÎÙÅ ÏÐÃÉÉ, ÐÏÓÌÅ
+ ÞÅÇÏ ÓÒÁÚÕ ÖÅ ÚÁ×ÅÒÛÁÅÔ ÒÁÂÏÔÕ.</dd>
+
+ <dt><code>--quiet</code></dt>
+
+ <dd>ðÒÅÄÏÔ×ÒÁÝÁÅÔ ×Ù×ÏÄ ÓÏÏÂÝÅÎÉÊ, ÎÁÞÉÎÁÀÝÉÈÓÑ Ó "<code>checking...</code>"</dd>
+
+ <dt><code>--verbose</code></dt>
+
+ <dd>÷ÙÄÁÅÔ ÐÏÌÎÕÀ ÉÎÆÏÒÍÁÃÉÀ × ÐÒÏÃÅÓÓÅ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ, ×ËÌÀÞÁÑ ÉÍÅÎÁ
+ ÐÒÏ×ÅÒÑÅÍÙÈ ÆÁÊÌÏ×.</dd>
+ </dl>
+</section>
+
+<section id="pathnames"><title>ðÕÔÉ</title>
+
+ <p>÷ ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ ÓÕÝÅÓÔ×ÕÀÔ Ä×Á ÓÐÏÓÏÂÁ ÚÁÄÁÎÉÑ ÐÕÔÅÊ, ÐÏ ËÏÔÏÒÙÍ
+ Apache ÕÓÔÁÎÏ×ÉÔ Ó×ÏÉ ÆÁÊÌÙ. ðÅÒ×ÙÊ ÓÐÏÓÏ - ÜÔÏ Ñ×ÎÏ ÕËÁÚÁÔØ Apache
+ ËÁÔÁÌÏÇ, ÐÏ ËÏÔÏÒÏÍÕ ÏÎ ÕÓÔÁÎÏ×ÉÔÓÑ.</p>
+
+ <dl>
+ <dt><code>--prefix=<em>PREFIX</em></code> [ðÏ ÕÍÏÌÞÁÎÉÀ:
+ <code>/usr/local/apache2</code>]</dt>
+
+ <dd>ïÐÒÅÄÅÌÑÅÔ ÐÕÔØ, ÐÏ ËÏÔÏÒÏÍÕ ÂÕÄÅÔ ÐÒÏÉÚ×ÅÄÅÎÁ ÕÓÔÁÎÏ×ËÁ Apache.</dd>
+ </dl>
+
+ <p>âÏÌÅÅ ÔÏÇÏ, ÓÕÝÅÓÔ×ÕÅÔ ×ÏÚÍÏÖÎÏÓÔØ ÕÓÔÁÎÏ×ÉÔØ ÁÒÈÉÔÅËÔÕÒÎÏ - ÚÁ×ÉÓÉÍÙÅ ÆÁÊÌÙ
+ × ÄÒÕÇÏÊ ÓÐÅÃÉÁÌØÎÏ ÚÁÄÁÎÎÙÊ ËÁÔÁÌÏÇ.</p>
+
+ <dl>
+ <dt><code>--exec-prefix=<em>EPREFIX</em></code> [Default:
+ <code><em>PREFIX</em></code>]</dt>
+
+ <dd>ïÐÒÅÄÅÌÑÅÔ ÐÕÔØ, ÐÏ ËÏÔÏÒÏÍÕ ÂÕÄÕÔ ÕÓÔÁÎÏ×ÌÅÎÙ ÁÒÈÉÔÅËÔÕÒÎÏ - ÚÁ×ÉÓÉÍÙÅ
+ ÆÁÊÌÙ.</dd>
+ </dl>
+
+ <p>÷ÔÏÒÏÊ ÓÐÏÓÏ Ñ×ÌÑÅÔÓÑ ÂÏÌÅÅ ÇÉÂËÉÍ. ïÎ ÚÁËÌÀÞÁÅÔÓÑ × ÉÓÐÏÌØÚÏ×ÁÎÉÉ
+ ÆÁÊÌÏ× <code>config.layout</code>. éÓÐÏÌØÚÕÑ ÜÔÏÔ ÍÅÔÏÄ, ÍÏÖÎÏ ÕËÁÚÁÔØ
+ ËÁÔÁÌÏÇ ÕÓÔÁÎÏ×ËÉ ÄÌÑ ÌÀÂÏÇÏ ÔÉÐÁ ÆÁÊÌÏ× Apache. æÁÊÌ <code>config.layout</code>
+ ÓÏÄÅÒÖÉÔ ÎÅÓËÏÌØËÏ ÐÒÉÍÅÒÏ× ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ. éÓÐÏÌØÚÕÑ ÜÔÉ ÐÒÉÍÅÒÙ, ×Ù ÍÏÖÅÔÅ
+ ÓÁÍÉ ÓÏÚÄÁ×ÁÔØ ÓÏÂÓÔ×ÅÎÎÙÅ ËÏÎÆÉÇÕÒÁÃÉÉ ÕÓÔÁÎÏ×ËÉ.
+ òÁÚÌÉÞÎÙÅ ÍÁËÅÔÙ ÕÓÔÁÎÏ×ÏË ÇÒÕÐÐÉÒÕÀÔÓÑ
+ × ÒÁÚÄÅÌØÎÙÈ ÓÅËÃÉÑÈ <code><Layout FOO>...</Layout></code>, ÐÏÓÌÅ ÞÅÇÏ
+ Ë ÎÉÍ ÍÏÖÎÏ ÏÂÒÁÝÁÔØÓÑ ÐÏÓÒÅÄÓÔ×ÏÍ ÉÍÅÎÉ <code>FOO</code>.</p>
+
+ <dl>
+ <dt><code>--enable-layout=<em>LAYOUT</em></code></dt>
+
+ <dd>éÓÐÏÌØÚÕÅÔ ÉÍÅÎÏ×ÁÎÎÙÊ ÍÁËÅÔ, ÏÐÉÓÁÎÎÙÊ × ÆÁÊÌÅ <code>config.layout</code>,
+ × ËÏÔÏÒÏÍ ÐÒÏÐÉÓÁÎÙ ×ÓÅ ÕÓÔÁÎÏ×ÏÞÎÙÅ ÐÕÔÉ.</dd>
+ </dl>
+
+</section>
+
+<section id="modules"><title>íÏÄÕÌÉ</title>
+
+ <p>Apache - ÜÔÏ ÍÏÄÕÌØÎÙÊ ÓÅÒ×ÅÒ. ôÏÌØËÏ ÓÁÍÙÅ ÏÓÎÏ×ÎÙÅ
+ ÆÕÎËÃÉÉ ×ËÌÀÞÅÎÙ × ÑÄÒÏ ÓÅÒ×ÅÒÁ. äÏÐÏÌÎÉÔÅÌØÎÁÑ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØ
+ ÄÏÓÔÕÐÎÁ ÐÏÓÒÅÄÓÔ×ÏÍ ÍÏÄÕÌÅÊ. ÷Ï ×ÒÅÍÑ ÐÒÏÃÅÓÓÁ ËÏÎÆÉÇÕÒÁÃÉÉ
+ ×Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÔÅ ÍÏÄÕÌÉ, ËÏÔÏÒÙÅ ÂÕÄÕÔ ËÏÍÐÉÌÉÒÏ×ÁÔØÓÑ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ.
+ ïÂÏ ×ÓÅÈ ÄÏÓÔÕÐÎÙÈ ÍÏÄÕÌÑÈ ×Ù ÍÏÖÅÔÅ ÐÒÏÞÉÔÁÔØ × ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÍ
+ <a href="mod/index.html">ÓÐÉÓËÅ ÍÏÄÕÌÅÊ</a>. íÏÄÕÌÉ, <a
+ href="mod/module-dict.html#Status">ÓÔÁÔÕÓ</a> ËÏÔÏÒÙÈ ÏÂÏÚÎÁÞÅÎ
+ ËÁË "âÁÚÏ×ÙÊ", ËÏÍÐÉÌÉÒÕÀÔÓÑ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ ÐÏ ÕÍÏÌÞÁÎÉÀ; ÅÓÌÉ ×ÁÍ
+ ÎÅ ÎÕÖÎÙ ÎÅËÏÔÏÒÙÅ ÂÁÚÏ×ÙÅ ÍÏÄÕÌÉ, ×Ù ÄÏÌÖÎÙ ÓÐÅÃÉÁÌØÎÏ ÜÔÏ ÕËÁÚÁÔØ ÐÒÉ
+ ËÏÎÆÉÇÕÒÁÃÉÉ (ÂÁÚÏ×ÙÍ ÍÏÄÕÌÅÍ, ÎÁÐÒÉÍÅÒ, Ñ×ÌÑÅÔÓÑ <module>mod_userdir</module>).
+ íÏÄÕÌÉ Ó ÄÒÕÇÉÍ ÓÔÁÔÕÓÏÍ ÎÅ ËÏÍÐÉÌÉÒÕÀÔÓÑ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ ÐÏ ÕÍÏÌÞÁÎÉÀ, É (× ÓÌÕÞÁÅ
+ ÎÅÏÂÈÏÄÉÍÏÓÔÉ) ÄÏÌÖÎÙ ÂÙÔØ ÐÒÏÐÉÓÁÎÙ ÐÒÉ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÏÔÄÅÌØÎÏ (ÐÒÉÍÅÒÏÍ ÔÁËÏÇÏ ÍÏÄÕÌÑ
+ ÍÏÖÅÔ ÐÏÓÌÕÖÉÔØ <module>mod_expires</module>).</p>
+
+ <p>åÓÔØ Ä×Á ÓÐÏÓÏÂÁ ÕËÁÚÁÔØ Apache ÉÓÐÏÌØÚÏ×ÁÔØ ËÁËÏÊ - ÌÉÂÏ ÍÏÄÕÌØ. íÏÄÕÌÉ
+ ÍÏÇÕÔ ÂÙÔØ ÓËÏÍÐÉÌÉÒÏ×ÁÎÙ ËÁË <em>ÓÔÁÔÉÞÅÓËÉÅ</em>, ÐÒÉ ÜÔÏÍ ÉÈ ËÏÄ ×ËÌÀÞÁÅÔÓÑ
+ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ × ÉÓÐÏÌÎÑÅÍÙÊ ËÏÄ ÓÅÒ×ÅÒÁ Apache. éÌÉ ÖÅ, ÅÓÌÉ ×ÁÛÁ ÏÐÅÒÁÃÉÏÎÎÁÑ
+ ÓÉÓÔÅÍÁ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÄÉÎÁÍÉÞÅÓËÉ ÒÁÚÄÅÌÑÅÍÙÅ ÏÂßÅËÔÙ (Dynamic Shared Objects) É
+ É <code>autoconf</code> ÍÏÖÅÔ ÏÐÒÅÄÅÌÉÔØ, ÞÔÏ ÜÔÏ ÔÁË, ÔÏ ÍÏÄÕÌÉ ÍÏÇÕÔ ÂÙÔØ
+ ÓËÏÍÐÉÌÉÒÏ×ÁÎÙ ËÁË <em>ÄÉÎÁÍÉÞÅÓËÉÅ</em>. DSO ÍÏÄÕÌÉ ÈÒÁÎÑÔÓÑ ÏÔÄÅÌØÎÏ ÏÔ ÑÄÒÁ
+ ÓÅÒ×ÅÒÁ, É ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÅÒ×ÅÒÏÍ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ
+ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÄÉÒÅËÔÉ× ×ÒÅÍÅÎÉ ×ÙÐÏÌÎÅÎÉÑ (ÔÏ ÅÓÔØ ÏÔ×ÅÞÁÀÝÉÈ ÚÁ ÒÁÂÏÔÕ
+ ÕÖÅ ÓÏÂÒÁÎÎÏÇÏ ÓÅÒ×ÅÒÁ), ÐÒÅÄÏÓÔÁ×ÌÑÅÍÙÈ ÍÏÄÕÌÅÍ <module>mod_so</module>.
+ íÏÄÕÌØ mod_so Á×ÔÏÍÁÔÉÞÅÓËÉ ×ËÌÀÞÁÅÔÓÑ × ÑÄÒÏ ÓÅÒ×ÅÒÁ, ÅÓÌÉ ÈÏÔÑ ÂÙ
+ ÏÄÉÎ ÍÏÄÕÌØ ËÏÍÐÉÌÉÒÕÅÔÓÑ ËÁË ÄÉÎÁÍÉÞÅÓËÉÊ. åÓÌÉ ÖÅ ×Ù ÎÅ ËÏÍÐÉÌÉÒÕÅÔÅ ÎÉËÁËÉÅ
+ ÄÉÎÁÍÉÞÅÓËÉÅ ÍÏÄÕÌÉ, ÎÏ ÈÏÔÉÔÅ, ÞÔÏÂÙ ×ÁÛ ÓÅÒ×ÅÒ ×ÓÅ ÖÅ ÂÙÌ ÓÐÏÓÏÂÅÎ ÒÁÂÏÔÁÔØ
+ Ó DSO ÍÏÄÕÌÑÍÉ, ÔÏ ÐÒÉ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÕËÁÖÉÔÅ ÓÌÅÄÕÀÝÕÀ ÏÐÃÉÀ: <code>--enable-so</code>.</p>
+
+ <dl>
+ <dt><code>--enable-<em>MODULE</em>[=shared]</code></dt>
+
+ <dd>ëÏÍÐÉÌÉÒÏ×ÁÔØ É ×ËÌÀÞÉÔØ × ÑÄÒÏ ÓÅÒ×ÅÒÁ ÍÏÄÕÌØ <em>MODULE</em>.
+ <em>MODULE</em> - ÜÔÏ <a
+ href="mod/module-dict.html#ModuleIdentifier">ÉÄÅÎÔÉÆÉËÁÔÏÒ ÍÏÄÕÌÑ</a>, ËÏÔÏÒÙÊ ÍÏÖÎÏ
+ ÐÏÌÕÞÉÔØ, ÏÔÂÒÏÓÉ× ÏÔ ÉÍÅÎÉ ÍÏÄÕÌÑ, ÕËÁÚÁÎÎÏÇÏ × ÄÏËÕÍÅÎÔÁÃÉÉ, ÓÔÒÏËÕ "_string". þÔÏÂÙ
+ ËÏÍÐÉÌÉÒÏ×ÁÔØ ÍÏÄÕÌØ ËÁË DSO, ÄÏÂÁ×ØÔÅ ÏÐÃÉÀ <code>=shared</code>.</dd>
+
+ <dt><code>--disable-<em>MODULE</em></code></dt>
+
+ <dd>õÂÒÁÔØ <em>MODULE</em> ÉÚ ÓÐÉÓËÁ ËÏÍÐÉÌÉÒÕÅÍÙÈ ÍÏÄÕÌÅÊ (ÅÓÌÉ ÏÎ ÅÓÔØ × ÜÔÏÍ ÓÐÉÓËÅ).</dd>
+
+ <dt><code>--enable-modules=<em>MODULE-LIST</em></code></dt>
+
+ <dd>ëÏÍÐÉÌÉÒÏ×ÁÔØ É ×ËÌÀÞÉÔØ × ÑÄÒÏ ÓÅÒ×ÅÒÁ ÍÏÄÕÌÉ, ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ËÏÔÏÒÙÈ ÐÒÉ×ÅÄÅÎÙ ×
+ ÓÐÉÓËÅ <em>MODULE-LIST</em>. üÌÅÍÅÎÔÙ ÓÐÉÓËÁ ÏÔÄÅÌÑÀÔÓÑ ÄÒÕÇ ÏÔ ÄÒÕÇÁ ÐÒÏÂÅÌÁÍÉ.</dd>
+
+ <dt>
+ <code>--enable-mods-shared=<em>MODULE-LIST</em></code></dt>
+
+ <dd>ëÏÍÐÉÌÉÒÏ×ÁÔØ ÍÏÄÕÌÉ, ÉÄÅÎÔÉÆÉËÁÔÏÒÙ ËÏÔÏÒÙÈ ÐÒÉ×ÅÄÅÎÙ ×
+ ÓÐÉÓËÅ <em>MODULE-LIST</em>, ËÁË ÄÉÎÁÍÉÞÅÓËÉÅ.</dd>
+ </dl>
+
+ <p>îÁÐÒÉÍÅÒ, ÞÔÏÂÙ ×ËÌÀÞÉÔØ × ÓÅÒ×ÅÒ ÍÏÄÕÌÉ <module>mod_dav</module> É
+ <module>mod_info</module>, ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÌÉÂÏ</p>
+
+<example>./configure --enable-dav --enable-info</example>
+
+ <p>ÌÉÂÏ ÜË×É×ÁÌÅÎÔÎÕÀ ÐÒÅÄÙÄÕÝÅÊ ËÏÍÁÎÄÕ</p>
+
+<example>./configure --enable-modules="dav info"</example>
+
+ <p>÷ ÄÏÐÏÌÎÅÎÉÅ Ë ÜÔÏÍÕ ÓÕÝÅÓÔ×ÕÀÔ ÓÐÅÃÉÁÌØÎÙÅ ËÌÀÞÅ×ÙÅ ÓÌÏ×Á <code>all</code> ÉÌÉ
+ <code>most</code>, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÙ ÄÌÑ ËÏÍÐÉÌÉÒÏ×ÁÎÉÑ ×ÓÅÈ ÉÌÉ ÂÏÌØÛÉÎÓÔ×Á
+ ÍÏÄÕÌÅÊ ÓÒÁÚÕ. ÷Ù ÍÏÖÅÔÅ ÉÓËÌÀÞÉÔØ ÉÚ ÜÔÏÇÏ ÓÐÉÓËÁ ÎÅÖÅÌÁÔÅÌØÎÙÅ ÍÏÄÕÌÉ, ÐÒÉÍÅÎÑÑ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ
+ ÏÐÃÉÉ <code>--disable-<em>MODULE</em></code>. îÁÐÒÉÍÅÒ, ÄÌÑ ÔÏÇÏ ÞÔÏÂÙ ×ËÌÀÞÉÔØ × ÒÁÂÏÔÕ ÓÅÒ×ÅÒÁ ×ÓÅ
+ ÍÏÄÕÌÉ ËÁË DSO ÚÁ ÉÓËÌÀÞÅÎÉÅÍ <module>mod_info</module>, ×Ù ÍÏÖÅÔÅ ÎÁÐÉÓÁÔØ ÓÌÅÄÕÀÝÅÅ</p>
+
+<example>
+ ./configure --enable-mods-shared=all
+ --disable-info
+</example>
+
+ <p>÷ ÄÏÂÁ×ÌÅÎÉÅ Ë ÓÔÁÎÄÁÒÔÎÏÍÕ ÎÁÂÏÒÕ ÍÏÄÕÌÅÊ, Apache 2.0 ËÏÍÐÉÌÉÒÕÅÔÓÑ
+ ×ÍÅÓÔÅ Ó ÎÅËÏÔÏÒÙÍ <a href="mpm.html">ÍÕÌØÔÉ - ÐÒÏÃÅÓÓÎÙÍ ÍÏÄÕÌÅÍ</a> (MPMs).
+ ïÄÉÎ É ÔÏÌØËÏ ÏÄÉÎ íð - ÍÏÄÕÌØ ÍÏÖÅÔ ÂÙÔØ ÓËÏÍÐÉÌÉÒÏ×ÁÎ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ. óÐÉÓÏË
+ íð - ÍÏÄÕÌÅÊ, ËÏÍÐÉÌÉÒÕÅÍÙÈ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ËÁÖÄÏÊ ÐÌÁÔÆÏÒÍÙ, ÍÏÖÎÏ ÎÁÊÔÉ × ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÍ
+ <a href="mpm.html">ÒÁÚÄÅÌÅ ÄÏËÕÍÅÎÔÁÃÉÉ</a>; íð - ÍÏÄÕÌØ ÐÏ ÕÍÏÌÞÁÎÉÀ
+ ÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÓÌÅÄÕÀÝÅÊ ÏÐÃÉÅÊ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ <code>configure</code></p>
+
+ <dl>
+ <dt><code>--with-mpm=<em>NAME</em></code></dt>
+
+ <dd>ëÏÍÐÉÌÉÒÏ×ÁÔØÓÑ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ ÂÕÄÅÔ íð - ÍÏÄÕÌØ Ó ÉÍÅÎÅÍ <em>NAME</em>.</dd>
+ </dl>
+</section>
+
+<section id="dbm"><title>DBM</title>
+
+ <p>îÅËÏÔÏÒÙÅ ÍÏÄÕÌÉ Apache, ËÁË ÎÁÐÒÉÍÅÒ <module>mod_auth_dbm</module> É <module>mod_rewrite</module>
+ (ÄÉÒÅËÔÉ×Á <directive module="mod_rewrite">RewriteMap</directive>), ÉÓÐÏÌØÚÕÀÔ × Ó×ÏÅÊ ÒÁÂÏÔÅ ÐÒÏÓÔÙÅ
+ ÂÁÚÙ ÄÁÎÎÙÈ, ÏÒÇÁÎÉÚÏ×ÁÎÎÙÅ ÐÏ ÐÒÉÎÃÉÐÕ ËÌÀÞ/ÚÎÁÞÅÎÉÅ, ÞÔÏ Õ×ÅÌÉÞÉ×ÁÅÔ ÓËÏÒÏÓÔØ ÄÏÓÔÕÐÁ Ë ÉÎÆÏÒÍÁÃÉÉ.
+ ðÏÄÄÅÒÖËÁ SDBM ÂÁÚ ÄÁÎÎÙÈ ×ËÌÀÞÅÎÁ × ÑÄÒÏ ÓÅÒ×ÅÒÁ, ÔÁË ÞÔÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÂÁÚ ÄÁÎÎÙÈ ÐÏÄÏÂÎÏÇÏ ÔÉÐÁ ×ÏÚÍÏÖÎÏ
+ ×ÓÅÇÄÁ. åÓÌÉ ×ÁÍ ÎÕÖÎÙ ÂÁÚÙ ÄÁÎÎÙÈ ÄÒÕÇÏÇÏ ÔÉÐÁ, ÔÏ ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÌÅÄÕÀÝÉÅ ÏÐÃÉÉ:</p>
+
+<dl>
+<dt><code>--with-gdbm[=<em>path</em>]</code></dt>
+<dt><code>--with-ndbm[=<em>path</em>]</code></dt>
+<dt><code>--with-berkeley-db[=<em>path</em>]</code></dt>
+
+<dd>åÓÌÉ ÎÅ ÕËÁÚÁÎÏ ÚÎÁÞÅÎÉÅ <em>path</em>, Apache ÂÕÄÅÔ ÉÓËÁÔØ ÚÁÇÏÌÏ×ÏÞÎÙÅ ÆÁÊÌÙ É ÂÉÂÌÉÏÔÅËÉ
+× ÓÔÁÎÄÁÒÔÎÙÈ ËÁÔÁÌÏÇÁÈ. ñ×ÎÏÅ ÕËÁÚÁÎÉÅ <em>path</em> ÚÁÓÔÁ×ÉÔ Apache ÐÒÏÉÚ×ÏÄÉÔØ ÐÏÉÓË ÓÏÏÔ×ÅÔÓ×ÕÀÝÉÈ
+ÆÁÊÌÏ× × ËÁÔÁÌÏÇÁÈ <em>path</em><code>/lib</code> É <em>path</em><code>/include</code>. íÏÖÎÏ ÔÁËÖÅ
+ÕËÁÚÁÔØ ÓÐÅÃÉÆÉÞÅÓËÉÅ ÐÕÔÉ ÄÌÑ ÚÁÇÏÌÏ×ÏÞÎÙÈ ÆÁÊÌÏ× É ÂÉÂÌÉÏÔÅË, ÎÁÐÉÓÁ× ÉÈ ÞÅÒÅÚ ÔÏÞËÕ Ó ÚÁÐÑÔÏÊ.</dd>
+</dl>
+</section>
+
+
+<section id="suexec"><title>Suexec</title>
+
+ <p>÷ÍÅÓÔÅ Ó Apache ÍÏÖÎÏ ÎÁÊÔÉ ×ÓÐÏÍÏÇÁÔÅÌØÎÕÀ ÐÒÏÇÒÁÍÍÕ <a
+ href="suexec.html">suexec</a>, ËÏÔÏÒÁÑ ÐÏÚ×ÏÌÑÅÔ ÕÓÔÁÎÏ×ÉÔØ
+ ÂÏÌÅÅ ÖÅÓÔËÉÊ ËÏÎÔÒÏÌØ ÎÁÄ ×ÙÐÏÌÎÅÎÉÅÍ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÈ CGI
+ ÐÒÏÇÒÁÍÍ. ôÅÍ ÎÅ ÍÅÎÅÅ, ÅÓÌÉ suexec ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÔØ ÎÅÐÒÁ×ÉÌØÎÏ,
+ ÔÏ ÍÏÇÕÔ ÐÏÑ×ÉÔØÓÑ ÚÎÁÞÉÔÅÌØÎÙÅ ÂÒÅÛÉ × ÓÉÓÔÅÍÅ ÂÅÚÏÐÁÓÎÏÓÔÉ
+ ÓÅÒ×ÅÒÁ. ðÏÜÔÏÍÕ ×Ù ÄÏÌÖÎÙ ÏÞÅÎØ ×ÎÉÍÁÔÅÌØÎÏ ÐÒÏÞÉÔÁÔØ <a href="suexec.html">ÄÏËÕÍÅÎÔÁÃÉÀ
+ suexec</a>, ÅÓÌÉ ÒÅÛÉÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÜÔÕ ÐÒÏÇÒÁÍÍÕ.</p>
+</section>
+</section>
+
+<section id="compile"><title>óÂÏÒËÁ</title>
+
+ <p>ôÅÐÅÒØ ×Ù ÍÏÖÅÔÅ ÓËÏÍÐÉÌÉÒÏ×ÁÔØ É ÓÏÂÒÁÔØ ÓÅÒ×ÅÒ Apache,
+ ×ÙÐÏÌÎÉ× ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</p>
+
+<example>$ make</example>
+
+ <p>îÁÂÅÒÉÔÅÓØ ÔÅÒÐÅÎÉÑ - ËÏÍÐÉÌÉÒÏ×ÁÎÉÅ ÓÅÒ×ÅÒÁ Ó ÂÁÚÏ×ÏÊ ËÏÎÆÉÇÕÒÁÃÉÅÊ
+ (ËÏÎÆÉÇÕÒÁÃÉÅÊ ÐÏ ÕÍÏÌÞÁÎÉÀ) ÚÁÎÉÍÁÅÔ ÐÒÉÂÌÉÚÉÔÅÌØÎÏ ÔÒÉ ÍÉÎÕÔÙ
+ ÎÁ ÔÁËÏÊ ÓÉÓÔÅÍÅ, ËÁË Pentium III/Linux 2.2. òÅÁÌØÎÏÅ ×ÒÅÍÑ ÓÂÏÒËÉ
+ ÂÕÄÅÔ ÚÁ×ÉÓÅÔØ ÏÔ ×ÁÛÅÇÏ ÁÐÐÁÒÁÔÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ É ÏÔ ËÏÌÉÞÅÓÔ×Á
+ ÍÏÄÕÌÅÊ, ËÏÔÏÒÙÅ ×Ù ÒÅÛÉÌÉ ËÏÍÐÉÌÉÒÏ×ÁÔØ ×ÍÅÓÔÅ Ó ÓÅÒ×ÅÒÏÍ.</p>
+</section>
+
+<section id="install"><title>õÓÔÁÎÏ×ËÁ</title>
+
+ <p>ôÅÐÅÒØ ÎÁÓÔÁÌÏ ×ÒÅÍÑ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓÅÒ×ÅÒÁ × ËÁÔÁÌÏÇ
+ <em>PREFIX</em>, ËÏÔÏÒÙÊ ÂÙÌ ÕËÁÚÁÎ ÐÒÉ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ Apache
+ (ÓÍÏÔÒÉÔÅ ×ÙÛÅ ÏÐÃÉÀ <code>--prefix</code>), ×ÙÐÏÌÎÉ×:</p>
+
+<example>$ make install</example>
+
+ <p>åÓÌÉ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ Apache ÐÏ×ÅÒÈ ÐÒÅÄÙÄÕÝÅÊ ×ÅÒÓÉÉ ÓÅÒ×ÅÒÁ, ÔÏ
+ ÓÔÁÒÙÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ É ÄÏËÕÍÅÎÔÙ ÂÕÄÕÔ ÏÓÔÁ×ÌÅÎÙ ÂÅÚ ÉÚÍÅÎÅÎÉÊ.</p>
+</section>
+
+<section id="customize"><title>îÁÓÔÒÏÊËÁ</title>
+
+ <p>äÁÌÅÅ ×Ù ÍÏÖÅÔÅ ÎÁÓÔÒÏÉÔØ ×ÁÛ HTTP ÓÅÒ×ÅÒ Apache ÐÏÓÒÅÄÓÔ×ÏÍ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ
+ <a href="configuring.html">ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÆÁÊÌÏ×</a> × ËÁÔÁÌÏÇÅ
+ <code><em>PREFIX</em>/conf/</code>.</p>
+
+<example>$ vi <em>PREFIX</em>/conf/httpd.conf</example>
+
+ <p>òÕËÏ×ÏÄÓÔ×Ï ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ Apache ×Ù ÍÏÖÅÔÅ ÎÁÊÔÉ ÌÉÂÏ ÐÏ ÌÏËÁÌØÎÏÍÕ
+ ÁÄÒÅÓÕ Õ ÓÅÂÑ ÎÁ ÓÅÒ×ÅÒÅ <a href="./">docs/manual/</a>, ÌÉÂÏ ÎÁ ÏÆÉÃÉÁÌØÎÏÍ
+ ÓÁÊÔÅ Apache <a href="http://httpd.apache.org/docs-2.0/">http://httpd.apache.org/docs-2.0/</a>,
+ ÇÄÅ ÏÐÕÂÌÉËÏ×ÁÎÁ ÓÁÍÁÑ ÐÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ ÄÏËÕÍÅÎÔÁÃÉÉ É ×ÓÑ ÎÅÏÂÈÏÄÉÍÁÑ ÓÐÒÁ×ÏÞÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
+ ÐÏ ×ÓÅÍ ×ÏÚÍÏÖÎÙÍ <a href="mod/directives.html">ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÍ ÄÉÒÅËÔÉ×ÁÍ</a>.</p>
+</section>
+
+<section id="test"><title>ôÅÓÔÉÒÏ×ÁÎÉÅ</title>
+
+ <p>ôÅÐÅÒØ ×Ù ÍÏÖÅÔÅ <a href="invoking.html">ÚÁÐÕÓÔÉÔØ</a> Ó×ÏÊ HTTP ÓÅÒ×ÅÒ Apache,
+ ×ÙÐÏÌÎÉ× ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</p>
+
+<example>$ <em>PREFIX</em>/bin/apachectl start</example>
+
+ <p>É ÅÓÌÉ ×ÓÅ ÐÒÏÛÌÏ ÕÓÐÅÛÎÏ, ÔÏ ×Ù ÓÍÏÖÅÔÅ ÚÁÐÒÏÓÉÔØ Ó×ÏÊ ÐÅÒ×ÙÊ ÄÏËÕÍÅÎÔ
+ ÐÏ ÁÄÒÅÓÕ <code>http://localhost/</code>. ÷Å - ÓÔÒÁÎÉÃÁ, ËÏÔÏÒÕÀ ×Ù Õ×ÉÄÅÔÅ,
+ ÎÁÈÏÄÉÔÓÑ × ËÁÔÁÌÏÇÅ <directive module="core">DocumentRoot</directive> - ÐÏ ÕÍÏÌÞÁÎÉÀ,
+ ÜÔÏ <code><em>PREFIX</em>/htdocs/</code>. úÁÔÅÍ <a href="stopping.html">ÏÓÔÁÎÏ×ÉÔÅ</a>
+ ÓÅÒ×ÅÒ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÏÊ:</p>
+
+<example>$ <em>PREFIX</em>/bin/apachectl stop</example>
+</section>
+
+</manualpage>
\ No newline at end of file
diff --git a/docs/manual/invoking.html.de b/docs/manual/invoking.html.de
new file mode 100644
index 0000000..3766105
--- /dev/null
+++ b/docs/manual/invoking.html.de
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>Apache starten - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache starten</h1>
+ <p>Unter Windows läuft der Apache üblicherweise als Dienst
+ (Windows NT, 2000 und XP) oder als Konsolenanwendung (Windows 9x und
+ ME). Für Einzelheiten lesen Sie bitte <a href="platform/windows.html#winsvc">Apache als Dienst betreiben</a>
+ und <a href="platform/windows.xml#wincons">Apache als Konsolenanwendung betreiben</a>.</p>
+
+ <p>Unter Unix wird das <a href="programs/httpd.html">httpd</a>-Programm als Daemon ausgeführt,
+ der im Hintergrund fortlaufend aktiv ist, um Anfragen zu bearbeiten.
+ Dieses Dokument beschreibt, wie <code>httpd</code> aufgerufen wird.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#startup">Wie der Apache startet</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#errors">Fehler während des Hochfahrens</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#boot">Beim Bootvorgang starten</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#info">Weitere Informationen</a></li>
+</ul><h3>Siehe auch</h3><ul class="seealso"><li><a href="stopping.html">Beenden und Neustarten</a></li><li><a href="programs/httpd.html">httpd</a></li><li><a href="programs/apachectl.html">apachectl</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="startup" id="startup">Wie der Apache startet</a></h2>
+
+ <p>Wenn die in der Konfigurationsdatei angegebene <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>-Anweisung auf die Voreinstellung
+ von 80 gesetzt ist (oder einen anderen Port unterhalb von 1024), dann
+ müssen Sie root-Berechtigung besitzen, um den Apache starten
+ zu können. Nur dann kann er sich an diesen privilegierten
+ Port binden. Sobald der Server gestartet ist und einige vorbereitende
+ Aktionen wie das Öffnen seiner Log-Dateien ausgeführt hat,
+ startet er mehrere <em>Kind</em>-Prozesse, welche die Arbeit erledigen:
+ das Lauschen auf und Beantworten von Anfragen von Clients. Der
+ Haupt-<code>httpd</code>-Prozess läuft unter dem Benutzer root
+ weiter, die Kind-Prozesse jedoch werden unter weniger privilegierten
+ Benutzerkennungen ausgeführt. Dies wird von dem ausgewählten
+ <a href="mpm.html">Multi-Processing-Modul</a> gesteuert.</p>
+
+ <p>Die Verwendung des Steuerskripts <a href="programs/apachectl.html">apachectl</a> ist die empfohlene Methode,
+ das <code>httpd</code>-Programm zu starten. Dieses Skript setzt
+ verschiedene Umgebungsvariablen, die für die korrekte Funktion von
+ <code>httpd</code> unter einigen Betriebssystemen notwendig sind, und
+ startet dann das <code>httpd</code>-Programm. <code>apachectl</code>
+ reicht alle Kommandozeilenargumente durch, so dass alle
+ <code>httpd</code>-Optionen auch mit <code>apachectl</code>
+ verwendet werden können. Um den korrekten Ablageort des
+ <code>httpd</code>-Programms sowie einige Kommandozeilenargumente
+ anzugeben, die Sie <em>immer</em> verwenden möchten, können
+ Sie auch das Skript <code>apachectl</code> direkt editieren und die
+ Variable <code>HTTPD</code> am Anfang ändern.</p>
+
+ <p>Das Erste was <code>httpd</code> macht, wenn es startet, ist das
+ Suchen und Einlesen der <a href="configuring.html">Konfigurationsdatei</a> <code>httpd.conf</code>.
+ Der Ablageort dieser Datei wird zur Kompilierungszeit festgelegt. Es ist
+ aber möglich, den Ablageort zur Laufzeit anzugeben, indem die
+ Kommandozeilenoption <code>-f</code> wie folgt verwendet wird:</p>
+
+ <div class="example"><p><code>/usr/local/apache2/bin/apachectl -f
+ /usr/local/apache/conf/httpd.conf</code></p></div>
+
+ <p>Wenn während des Starts alles gutgeht, trennt sich der Server
+ vom Terminal ab und die Eingabeaufforderung erscheint gleich darauf
+ wieder. Dies zeigt an, dass der Server hochgefahren ist und läuft.
+ Sie können nun Ihren Browser benutzen, um Verbindung zum Server
+ aufzunehmen und sich die Testseite im <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>-Verzeichnis anzusehen wie auch
+ die lokale Kopie der Dokumentation, die von dieser Seite aus verlinkt
+ ist.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="errors" id="errors">Fehler während des Hochfahrens</a></h2>
+
+ <p>Wenn der Apache während des Hochfahrens einen schweren Fehler
+ feststellt, schreibt er entweder eine Nachricht, die das Problem
+ näher schildert, auf die Konsole oder ins <code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code>, bevor er sich selbst beendet.
+ Eine der häufigsten Fehlermeldungen ist "<code>Unable
+ to bind to Port ...</code>" <span class="transnote">(<em>Anm.d.Ü.:</em> "Kann nicht an Port ...
+ binden")</span>. Diese Meldung wird üblicherweise verursacht:</p>
+
+ <ul>
+ <li>entweder durch den Versuch, den Server an einem privilegierten
+ Port zu starten, während man nicht als Benutzer root angemeldet
+ ist,</li>
+
+ <li>oder durch den Versuch, den Server zu starten, wenn bereits eine
+ andere Instanz des Apache oder ein anderer Webserver an den gleichen
+ Port gebunden ist.</li>
+ </ul>
+
+ <p>Für weitere Anleitungen zur Fehlerbehebung lesen Sie bitte die
+ Apache-<a href="faq/">FAQ</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="boot" id="boot">Beim Bootvorgang starten</a></h2>
+
+ <p>Wenn Sie möchten, dass Ihr Server direkt nach einem
+ System-Neustart weiterläuft, sollten Sie einen Aufruf von
+ <code>apachectl</code> zu den Startdateien Ihres Systems hinzufügen
+ (üblicherweise <code>rc.local</code> oder eine Datei in einem
+ <code>rc.N</code>-Verzeichnis). Dies startet den Apache als root.
+ Stellen Sie zuvor jedoch sicher, dass Ihr Server hinsichtlich
+ Sicherheit und Zugriffsbeschränkungen richtig konfiguriert ist.</p>
+
+ <p>Das <code>apachectl</code>-Skript ist dafür ausgelegt, wie ein
+ Standard-SysV-init-Skript zu arbeiten. Es akzeptiert die Argumente
+ <code>start</code>, <code>restart</code> und <code>stop</code>
+ und übersetzt sie in die entsprechenden Signale für
+ <code>httpd</code>. Daher können Sie oftmals
+ einfach <code>apachectl</code> in das entsprechende init-Verzeichnis
+ linken. Überprüfen Sie bitte auf jeden Fall die genauen
+ Anforderungen Ihres Systems.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="info" id="info">Weitere Informationen</a></h2>
+
+ <p>Weitere Informationen über Kommandozeilenoptionen von <a href="programs/httpd.html">httpd</a> und <a href="programs/apachectl.html">apachectl</a> sowie anderen
+ Hilfsprogrammen, die dem Server beigefügt sind, sind auf der
+ Seite <a href="programs/">Server und Hilfsprogramme</a>
+ verfügbar. Es existiert außerdem eine Dokumentation
+ aller in der Apache-Distribution enthaltenen <a href="mod/">Module</a> und der von ihnen bereitgestellten
+ <a href="mod/directives.html">Direktiven</a>.</p>
+</div></div>
+<div id="footer">
+<p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.html.en b/docs/manual/invoking.html.en
index a7a14da..61d74c8 100644
--- a/docs/manual/invoking.html.en
+++ b/docs/manual/invoking.html.en
@@ -4,17 +4,38 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Starting Apache - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Starting Apache</h1>
+ -->
+<title>Starting Apache - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Starting Apache</h1>
<p>On Windows, Apache is normally run as a service on Windows
- NT, or as a console application on Windows 95. For details, see
- <a href="platform/windows.html#run">running Apache for
- Windows</a>.</p>
+ NT, 2000 and XP, or as a console application on Windows 9x and
+ ME. For details, see <a href="platform/windows.html#winsvc">Running Apache as a Service</a>
+ and <a href="platform/windows.xml#wincons">Running Apache as a
+ Console Application</a>.</p>
<p>On Unix, the <a href="programs/httpd.html">httpd</a> program
is run as a daemon that executes continuously in the
background to handle requests. This document describes how
to invoke <code>httpd</code>.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#startup">How Apache Starts</a></li><li><img alt="" src="./images/down.gif" /> <a href="#errors">Errors During Start-up</a></li><li><img alt="" src="./images/down.gif" /> <a href="#boot">Starting at Boot-Time</a></li><li><img alt="" src="./images/down.gif" /> <a href="#info">Additional Information</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="stopping.html">Stopping Apache</a></li><li><a href="programs/httpd.html">httpd</a></li><li><a href="programs/apachectl.html">apachectl</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="startup" id="startup">How Apache Starts</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#startup">How Apache Starts</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#errors">Errors During Start-up</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#boot">Starting at Boot-Time</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#info">Additional Information</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="stopping.html">Stopping and Restarting</a></li><li><a href="programs/httpd.html">httpd</a></li><li><a href="programs/apachectl.html">apachectl</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="startup" id="startup">How Apache Starts</a></h2>
<p>If the <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
specified in the configuration file is default of 80 (or any other
@@ -57,7 +78,9 @@
the test page in the <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> directory
and the local copy of the documentation linked from that
page.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="errors" id="errors">Errors During Start-up</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="errors" id="errors">Errors During Start-up</a></h2>
<p>If Apache suffers a fatal problem during startup, it will
write a message describing the problem either to the console or
@@ -77,7 +100,9 @@
<p>For further trouble-shooting instructions, consult the
Apache <a href="faq/">FAQ</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="boot" id="boot">Starting at Boot-Time</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="boot" id="boot">Starting at Boot-Time</a></h2>
<p>If you want your server to continue running after a system
reboot, you should add a call to <code>apachectl</code> to your
@@ -93,7 +118,9 @@
<code>httpd</code>. So you can often simply link
<code>apachectl</code> into the appropriate init directory. But be
sure to check the exact requirements of your system.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="info" id="info">Additional Information</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="info" id="info">Additional Information</a></h2>
<p>Additional information about the command-line options of <a href="programs/httpd.html">httpd</a> and <a href="programs/apachectl.html">apachectl</a> as well as other
support programs included with the server is available on the
@@ -101,4 +128,8 @@
There is also documentation on all the <a href="mod/">modules</a> included with the Apache distribution
and the <a href="mod/directives.html">directives</a> that they
provide.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.html.ja.jis b/docs/manual/invoking.html.ja.jis
index a624650..a9caa11 100644
--- a/docs/manual/invoking.html.ja.jis
+++ b/docs/manual/invoking.html.ja.jis
@@ -4,23 +4,43 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache $B$N5/F0(B - Apache HTTP $B%5!<%P(B</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache $B$N5/F0(B</h1>
- <p>Windows $B>e(B$B$G$O!"(BApache $B$ODL>o$O(B
- Windows NT $B$G$O(B$B%5!<%S%9$H$7$F!"(BWindows 95
- $B$G$O%3%s%=!<%k%"(B$B%W%j%1!<%7%g%s$H$7$F<B9T$5$l$^$9!#(B
+ -->
+<title>Apache $B$N5/F0(B - Apache HTTP $B%5!<%P(B</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache $B$N5/F0(B</h1>
+ <p>Windows $B>e$G$O!"(BApache $B$ODL>o$O(B
+ Windows NT $B$G$O%5!<%S%9$H$7$F!"(BWindows 95
+ $B$G$O%3%s%=!<%k%"%W%j%1!<%7%g%s$H$7$F<B9T$5$l$^$9!#(B
$B>\:Y$K4X$7$F$O!"!V(B<a href="platform/windows.html#run">
Windows $B$G(B Apache $B$r<B9T$9$k(B</a>$B!W$r$4Mw2<$5$$!#(B</p>
<p>Unix$B$G$O!"(B<a href="programs/httpd.html">httpd</a>
$B%W%m%0%i%`$,!"%P%C%/%0%i%&%s%I$G>o$K%j%/%(%9%H=hM}$r9T$&(B
$B%G!<%b%s$H$7$F<B9T$5$l$^$9!#$3$NJ8=q$G$O$I$N$h$&$K(B
- <code>httpd</code> $B$r(B$B5/F0$9$k$+$K$D$$$F5-=R$7$F$$$^$9!#(B</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#startup">Apache $B$N5/F0J}K!(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#errors">$B5/F0;~$N%(%i!<(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#boot">$B%V!<%H;~$N5/F0(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#info">$BDI2C>pJs(B</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="startup" id="startup">Apache $B$N5/F0J}K!(B</a></h2>
+ <code>httpd</code> $B$r5/F0$9$k$+$K$D$$$F5-=R$7$F$$$^$9!#(B</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#startup">Apache $B$N5/F0J}K!(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#errors">$B5/F0;~$N%(%i!<(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#boot">$B%V!<%H;~$N5/F0(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#info">$BDI2C>pJs(B</a></li>
+</ul><h3>$B;2>H(B</h3><ul class="seealso"><li><a href="stopping.html">$BDd;_$H:F5/F0(B</a></li><li><a href="programs/httpd.html">httpd</a></li><li><a href="programs/apachectl.html">apachectl</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="startup" id="startup">Apache $B$N5/F0J}K!(B</a></h2>
<p>$B$b$7!"@_Dj%U%!%$%kCf$G;XDj$5$l$F$$$k(B
<code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
$B$,%G%U%)%k%H$N(B 80 ($B$b$7$/$O(B 1024 $B0J2<$NB>$N%]!<%H(B)
- $B$G$"$k>l9g$O!"(BApache $B$r5/F0$9$k$?(B$B$a$K$O(B root
+ $B$G$"$k>l9g$O!"(BApache $B$r5/F0$9$k$?$a$K$O(B root
$B8"8B$,I,MW$K$J$j$^$9$,!"(B
$B$3$l$O$3$NFC8"%]!<%H$K%P%$%s%I$9$k$?$a$G$9!#(B
$B5/F0$7$F!"0lEY%m%0%U%!%$%k$r3+$/$H$$$C$?=`Hw$N$?$a$N(B
@@ -30,6 +50,19 @@
$B;R%W%m%;%9$O$b$C$HDc$$8"8B$GAv$j$^$9!#(B
$B$3$l$OA*Br$7$?(B<a href="mpm.html">$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B</a>$B$G@)8f$5$l$^$9!#(B</p>
+ <p>$B?d>)$N(B <code>httpd</code> $B<B9T%W%m%0%i%`$N5/F0J}K!$O!"(B
+ <a href="programs/apachectl.html">apachectl</a>
+ $B@)8f%9%/%j%W%H$r;HMQ$9$kJ}K!$G$9!#$3$N%9%/%j%W%H$O!"(B<code>httpd</code>
+ $B$,%*%Z%l!<%F%#%s%0%7%9%F%`>e$G@5>o$KF0:n$9$k$h$&$KI,MW$J4D6-JQ?t$r(B
+ $BE,@Z$K@_Dj$7$F!"(B<code>httpd</code> $B%P%$%J%j$r5/F0$7$^$9!#(B
+ <code>apachectl</code> $B$O$I$s$J%3%^%s%I%i%$%s0z?t$bDL2a$5$;$^$9$N$G!"(B
+ <code>httpd</code> $B$N$I$N%3%^%s%I%i%$%s%*%W%7%g%s$b(B
+ <code>apchectl</code> $B$N%*%W%7%g%s$H$7$F;HMQ$G$-$^$9!#(B
+ $B$^$?!"(B<code>apchectl</code> $B%9%/%j%W%H$rD>@\JT=8$7!"(B
+ $B%9%/%j%W%H@hF,IU6a$N(B <code>HTTPD</code> $BJQ?t$rJQ99$9$k$3$H$G!"(B
+ <code>httpd</code> $B%P%$%J%j$N@5$7$$0LCV$r;XDj$7$?$j!"(B<em>$B>o$K(B</em>
+ $BIU2C$5$;$k%3%^%s%I%i%$%s0z?t$r;XDj$7$?$j$9$k$3$H$,$G$-$^$9!#(B</p>
+
<p><code>httpd</code> $B$,5/F0$5$l$F$^$::G=i$K$9$k$3$H$O!"(B
<a href="configuring.html">$B@_Dj%U%!%$%k(B</a>
<code>httpd.conf</code> $B$N0LCV$rFCDj$7$FFI$_9~$`$3$H$G$9!#(B
@@ -37,24 +70,19 @@
<code>-f</code> $B%3%^%s%I%i%$%s%*%W%7%g%s$r;H$C$F(B
$B0LCV$r;XDj$9$k$3$H$b$G$-$^$9!#Nc$($P<!$N$h$&$K$G$9!#(B</p>
-<div class="example"><p><code>/usr/local/apache/bin/httpd -f
+<div class="example"><p><code>/usr/local/apache2/bin/apachectl -f
/usr/local/apache/conf/httpd.conf</code></p></div>
- <p><code>httpd</code> $B$N%P%$%J%j$rD>@\5/F0$9$kBe$o$j$K!"(B
- <a href="programs/apachectl.html">apachectl</a>
- $B$H$$$&%7%'%k%9%/%j%W%H$,Ds6!$5$l$F$$$^$9!#(B
- <code>apachectl start</code> $B$d(B <code>apachectl stop</code>
- $B$H$$$C$?4JC1$J%3%^%s%I$G!"(B
- $B%G!<%b%s%W%m%;%9$r@)8f$9$k$N$K;H$($^$9!#(B</p>
-
- <p>$B%9%?(B$B!<%H%"%C%W$,K|;v>e<j$/$$$C$?$i!"%5!<%P$O%?!<%_%J%k$+$i(B
+ <p>$B%9%?!<%H%"%C%W$,K|;v>e<j$/$$$C$?$i!"%5!<%P$O%?!<%_%J%k$+$i(B
$B@Z$jN%$5$l$F!"%3%^%s%I%W%m%s%W%H$,B(:B$KLa$C$F$/$k$G$7$g$&!#(B
$B$3$l$O%5!<%P$,5/F0$7$F$$$k>uBV$r<($7$F$$$^$9!#(B
$B$=$N8e$O%V%i%&%6$G%5!<%P$K@\B3$7$F!"(B
<code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
$B%G%#%l%/%H%j$N%F%9%H%Z!<%8$d$=$3$+$i%j%s%/$5$l$F$$$k(B
$B%m!<%+%k$N%I%-%e%a%s%H$r8+$k$3$H$,$G$-$k$G$7$g$&!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="errors" id="errors">$B5/F0;~$N%(%i!<(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="errors" id="errors">$B5/F0;~$N%(%i!<(B</a></h2>
<p>Apache $B$O!"5/F0;~$KCWL?E*$JLdBj$KAx6x$9$k$H!"(B
$B=*N;$9$kA0$K!"%3%s%=!<%k$+(B
@@ -70,34 +98,48 @@
<li>$BF1$8%]!<%H$K4{$K%P%$%s%I$5$l$F$$$k(B Apache
$B$,$b$&0l$D$"$k$H$-$dB>$N%&%'%V%5!<%P$,B8:_$7$F$$$k;~$K!"(B
- $B%5!<%P(B$B$r3+;O$7$h$&$H$7$?!#(B</li>
+ $B%5!<%P$r3+;O$7$h$&$H$7$?!#(B</li>
</ul>
<p>$B$h$jB?$/$NLdBj2r7h$NJ}:v$N@bL@$O!"(B
Apache <a href="faq/">FAQ</a> $B$r$4Mw2<$5$$!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="boot" id="boot">$B%V!<%H;~$N5/F0(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="boot" id="boot">$B%V!<%H;~$N5/F0(B</a></h2>
<p>$B%7%9%F%`$,%j%V!<%H$7$?8e$G$b(B
$B%5!<%P$,<B9T$5$lB3$1$k$h$&$K$7$?$$>l9g$O!"(B
- <code>httpd</code> $B$+(B <code>apachectl</code>
+ <code>apachectl</code>
$B$r8F$S=P$9$b$N$r%7%9%F%`%9%?!<%H%"%C%W%U%!%$%k(B
($BDL>o(B <code>rc.local</code> $B$d(B <code>rc.N</code>
$BFb$N%U%!%$%k(B) $B$KDI2C$7$J$1$l$P$J$j$^$;$s!#(B
$B$3$NJ}K!$G$O(B Apache $B$r(B root $B8"8B$G5/F0$7$^$9!#(B
$B$3$l$r$9$kA0$K!"%;%-%e%j%F%#$d%"%/%;%9@)8B$,(B
- $BE,@Z$K@_Dj$5$l$F$$$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#(B
- <code>apachectl</code> $B%9%/%j%W%H$ODL>o$O!"(B init
- $B%9%/%j%W%H$H$7$FD>@\%j%s%/$G$-$k$h$&$K@_7W$5$l$F$$$^$9$,!"(B
+ $BE,@Z$K@_Dj$5$l$F$$$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#(B</p>
+
+ <p><code>apachectl</code> $B%9%/%j%W%H$ODL>o$O!"I8=`E*$J(B SysV init
+ $B%9%/%j%W%H$H$7$FF0:n$9$k$h$&$K@_7W$5$l$F$$$^$9!#(B
+ <code>start</code>, <code>restart</code>, <code>stop</code>
+ $B$H$$$C$?0z?t$r$H$C$F!"(B<code>httpd</code>
+ $B$X$NE,@Z$J%7%0%J%k$KJQ49$7$^$9!#(B
+ $B$G$9$+$i!"DL>o$OC1$KE,@Z$J(B init $B%G%#%l%/%H%jFb$+$i(B
+ <code>apachectl</code> $B$X%j%s%/$9$k$3$H$,$G$-$^$9!#$7$+$7!"(B
$BG0$N$?$a%7%9%F%`$NMW5a$K9gCW$7$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="info" id="info">$BDI2C>pJs(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="info" id="info">$BDI2C>pJs(B</a></h2>
<p><a href="programs/httpd.html">httpd</a> $B$d(B
<a href="programs/apachectl.html">apachectl</a>
$B!"%5!<%P$K4^$^$l$F$$$?$=$NB>Jd=u%W%m%0%i%`$N!"(B
$B%3%^%s%I%i%$%s%*%W%7%g%s$K4X$9$kDI2C>pJs$O!"(B
- <a href="programs/">$B%5!<%P$HJd=u%W%m%0(B$B%i%`(B</a>$B%Z!<%8$K(B
+ <a href="programs/">$B%5!<%P$HJd=u%W%m%0%i%`(B</a>$B%Z!<%8$K(B
$B5-:\$5$l$F$$$^$9!#(B
Apache $BG[I[$K4^$^$l$F$$$kA4(B<a href="mod/">$B%b%8%e!<%k(B</a>$B!"(B
$B$=$l$K$h$C$FDs6!$5$l$k(B<a href="mod/directives.html">$B%G%#%l%/%F%#%V(B</a>
$B$N%I%-%e%a%s%H$b$"$j$^$9!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.xml b/docs/manual/invoking.xml
index 7a044ee..f8aa4ae 100644
--- a/docs/manual/invoking.xml
+++ b/docs/manual/invoking.xml
@@ -8,9 +8,11 @@
<summary>
<p>On Windows, Apache is normally run as a service on Windows
- NT, or as a console application on Windows 95. For details, see
- <a href="platform/windows.html#run">running Apache for
- Windows</a>.</p>
+ NT, 2000 and XP, or as a console application on Windows 9x and
+ ME. For details, see <a
+ href="platform/windows.html#winsvc">Running Apache as a Service</a>
+ and <a href="platform/windows.xml#wincons">Running Apache as a
+ Console Application</a>.</p>
<p>On Unix, the <a href="programs/httpd.html">httpd</a> program
is run as a daemon that executes continuously in the
@@ -18,7 +20,7 @@
to invoke <code>httpd</code>.</p>
</summary>
-<seealso><a href="stopping.html">Stopping Apache</a></seealso>
+<seealso><a href="stopping.html">Stopping and Restarting</a></seealso>
<seealso><a href="programs/httpd.html">httpd</a></seealso>
<seealso><a href="programs/apachectl.html">apachectl</a></seealso>
@@ -123,4 +125,4 @@
provide.</p>
</section>
-</manualpage>
\ No newline at end of file
+</manualpage>
diff --git a/docs/manual/invoking.xml.de b/docs/manual/invoking.xml.de
new file mode 100644
index 0000000..1b26067
--- /dev/null
+++ b/docs/manual/invoking.xml.de
@@ -0,0 +1,135 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
+<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
+<!-- English revision: 1.2.2.1 -->
+<manualpage>
+<relativepath href="."/>
+
+ <title>Apache starten</title>
+
+<summary>
+ <p>Unter Windows läuft der Apache üblicherweise als Dienst
+ (Windows NT, 2000 und XP) oder als Konsolenanwendung (Windows 9x und
+ ME). Für Einzelheiten lesen Sie bitte <a
+ href="platform/windows.html#winsvc">Apache als Dienst betreiben</a>
+ und <a href="platform/windows.xml#wincons"
+ >Apache als Konsolenanwendung betreiben</a>.</p>
+
+ <p>Unter Unix wird das <a
+ href="programs/httpd.html">httpd</a>-Programm als Daemon ausgeführt,
+ der im Hintergrund fortlaufend aktiv ist, um Anfragen zu bearbeiten.
+ Dieses Dokument beschreibt, wie <code>httpd</code> aufgerufen wird.</p>
+</summary>
+
+<seealso><a href="stopping.html">Beenden und Neustarten</a></seealso>
+<seealso><a href="programs/httpd.html">httpd</a></seealso>
+<seealso><a href="programs/apachectl.html">apachectl</a></seealso>
+
+<section id="startup"><title>Wie der Apache startet</title>
+
+ <p>Wenn die in der Konfigurationsdatei angegebene <directive
+ module="mpm_common">Listen</directive>-Anweisung auf die Voreinstellung
+ von 80 gesetzt ist (oder einen anderen Port unterhalb von 1024), dann
+ müssen Sie root-Berechtigung besitzen, um den Apache starten
+ zu können. Nur dann kann er sich an diesen privilegierten
+ Port binden. Sobald der Server gestartet ist und einige vorbereitende
+ Aktionen wie das Öffnen seiner Log-Dateien ausgeführt hat,
+ startet er mehrere <em>Kind</em>-Prozesse, welche die Arbeit erledigen:
+ das Lauschen auf und Beantworten von Anfragen von Clients. Der
+ Haupt-<code>httpd</code>-Prozess läuft unter dem Benutzer root
+ weiter, die Kind-Prozesse jedoch werden unter weniger privilegierten
+ Benutzerkennungen ausgeführt. Dies wird von dem ausgewählten
+ <a href="mpm.html">Multi-Processing-Modul</a> gesteuert.</p>
+
+ <p>Die Verwendung des Steuerskripts <a
+ href="programs/apachectl.html">apachectl</a> ist die empfohlene Methode,
+ das <code>httpd</code>-Programm zu starten. Dieses Skript setzt
+ verschiedene Umgebungsvariablen, die für die korrekte Funktion von
+ <code>httpd</code> unter einigen Betriebssystemen notwendig sind, und
+ startet dann das <code>httpd</code>-Programm. <code>apachectl</code>
+ reicht alle Kommandozeilenargumente durch, so dass alle
+ <code>httpd</code>-Optionen auch mit <code>apachectl</code>
+ verwendet werden können. Um den korrekten Ablageort des
+ <code>httpd</code>-Programms sowie einige Kommandozeilenargumente
+ anzugeben, die Sie <em>immer</em> verwenden möchten, können
+ Sie auch das Skript <code>apachectl</code> direkt editieren und die
+ Variable <code>HTTPD</code> am Anfang ändern.</p>
+
+ <p>Das Erste was <code>httpd</code> macht, wenn es startet, ist das
+ Suchen und Einlesen der <a
+ href="configuring.html">Konfigurationsdatei</a> <code>httpd.conf</code>.
+ Der Ablageort dieser Datei wird zur Kompilierungszeit festgelegt. Es ist
+ aber möglich, den Ablageort zur Laufzeit anzugeben, indem die
+ Kommandozeilenoption <code>-f</code> wie folgt verwendet wird:</p>
+
+ <example>/usr/local/apache2/bin/apachectl -f
+ /usr/local/apache/conf/httpd.conf</example>
+
+ <p>Wenn während des Starts alles gutgeht, trennt sich der Server
+ vom Terminal ab und die Eingabeaufforderung erscheint gleich darauf
+ wieder. Dies zeigt an, dass der Server hochgefahren ist und läuft.
+ Sie können nun Ihren Browser benutzen, um Verbindung zum Server
+ aufzunehmen und sich die Testseite im <directive
+ module="core">DocumentRoot</directive>-Verzeichnis anzusehen wie auch
+ die lokale Kopie der Dokumentation, die von dieser Seite aus verlinkt
+ ist.</p>
+</section>
+
+<section id="errors"><title>Fehler während des Hochfahrens</title>
+
+ <p>Wenn der Apache während des Hochfahrens einen schweren Fehler
+ feststellt, schreibt er entweder eine Nachricht, die das Problem
+ näher schildert, auf die Konsole oder ins <directive
+ module="core">ErrorLog</directive>, bevor er sich selbst beendet.
+ Eine der häufigsten Fehlermeldungen ist "<code>Unable
+ to bind to Port ...</code>" <transnote>"Kann nicht an Port ...
+ binden"</transnote>. Diese Meldung wird üblicherweise verursacht:</p>
+
+ <ul>
+ <li>entweder durch den Versuch, den Server an einem privilegierten
+ Port zu starten, während man nicht als Benutzer root angemeldet
+ ist,</li>
+
+ <li>oder durch den Versuch, den Server zu starten, wenn bereits eine
+ andere Instanz des Apache oder ein anderer Webserver an den gleichen
+ Port gebunden ist.</li>
+ </ul>
+
+ <p>Für weitere Anleitungen zur Fehlerbehebung lesen Sie bitte die
+ Apache-<a href="faq/">FAQ</a>.</p>
+</section>
+
+<section id="boot"><title>Beim Bootvorgang starten</title>
+
+ <p>Wenn Sie möchten, dass Ihr Server direkt nach einem
+ System-Neustart weiterläuft, sollten Sie einen Aufruf von
+ <code>apachectl</code> zu den Startdateien Ihres Systems hinzufügen
+ (üblicherweise <code>rc.local</code> oder eine Datei in einem
+ <code>rc.N</code>-Verzeichnis). Dies startet den Apache als root.
+ Stellen Sie zuvor jedoch sicher, dass Ihr Server hinsichtlich
+ Sicherheit und Zugriffsbeschränkungen richtig konfiguriert ist.</p>
+
+ <p>Das <code>apachectl</code>-Skript ist dafür ausgelegt, wie ein
+ Standard-SysV-init-Skript zu arbeiten. Es akzeptiert die Argumente
+ <code>start</code>, <code>restart</code> und <code>stop</code>
+ und übersetzt sie in die entsprechenden Signale für
+ <code>httpd</code>. Daher können Sie oftmals
+ einfach <code>apachectl</code> in das entsprechende init-Verzeichnis
+ linken. Überprüfen Sie bitte auf jeden Fall die genauen
+ Anforderungen Ihres Systems.</p>
+</section>
+
+<section id="info"><title>Weitere Informationen</title>
+
+ <p>Weitere Informationen über Kommandozeilenoptionen von <a
+ href="programs/httpd.html">httpd</a> und <a
+ href="programs/apachectl.html">apachectl</a> sowie anderen
+ Hilfsprogrammen, die dem Server beigefügt sind, sind auf der
+ Seite <a href="programs/">Server und Hilfsprogramme</a>
+ verfügbar. Es existiert außerdem eine Dokumentation
+ aller in der Apache-Distribution enthaltenen <a
+ href="mod/">Module</a> und der von ihnen bereitgestellten
+ <a href="mod/directives.html">Direktiven</a>.</p>
+</section>
+
+</manualpage>
diff --git a/docs/manual/invoking.xml.ja b/docs/manual/invoking.xml.ja
index 9d3c15b..bdeac54 100644
--- a/docs/manual/invoking.xml.ja
+++ b/docs/manual/invoking.xml.ja
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
<manualpage>
<relativepath href="."/>
-<!-- English revision: 1.1 -->
+<!-- English revision: 1.2 -->
<title>Apache $B$N5/F0(B</title>
@@ -20,6 +20,10 @@
<code>httpd</code> $B$r5/F0$9$k$+$K$D$$$F5-=R$7$F$$$^$9!#(B</p>
</summary>
+<seealso><a href="stopping.html">$BDd;_$H:F5/F0(B</a></seealso>
+<seealso><a href="programs/httpd.html">httpd</a></seealso>
+<seealso><a href="programs/apachectl.html">apachectl</a></seealso>
+
<section id="startup"><title>Apache $B$N5/F0J}K!(B</title>
<p>$B$b$7!"@_Dj%U%!%$%kCf$G;XDj$5$l$F$$$k(B
@@ -36,6 +40,19 @@
$B$3$l$OA*Br$7$?(B<a
href="mpm.html">$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B</a>$B$G@)8f$5$l$^$9!#(B</p>
+ <p>$B?d>)$N(B <code>httpd</code> $B<B9T%W%m%0%i%`$N5/F0J}K!$O!"(B
+ <a href="programs/apachectl.html">apachectl</a>
+ $B@)8f%9%/%j%W%H$r;HMQ$9$kJ}K!$G$9!#$3$N%9%/%j%W%H$O!"(B<code>httpd</code>
+ $B$,%*%Z%l!<%F%#%s%0%7%9%F%`>e$G@5>o$KF0:n$9$k$h$&$KI,MW$J4D6-JQ?t$r(B
+ $BE,@Z$K@_Dj$7$F!"(B<code>httpd</code> $B%P%$%J%j$r5/F0$7$^$9!#(B
+ <code>apachectl</code> $B$O$I$s$J%3%^%s%I%i%$%s0z?t$bDL2a$5$;$^$9$N$G!"(B
+ <code>httpd</code> $B$N$I$N%3%^%s%I%i%$%s%*%W%7%g%s$b(B
+ <code>apchectl</code> $B$N%*%W%7%g%s$H$7$F;HMQ$G$-$^$9!#(B
+ $B$^$?!"(B<code>apchectl</code> $B%9%/%j%W%H$rD>@\JT=8$7!"(B
+ $B%9%/%j%W%H@hF,IU6a$N(B <code>HTTPD</code> $BJQ?t$rJQ99$9$k$3$H$G!"(B
+ <code>httpd</code> $B%P%$%J%j$N@5$7$$0LCV$r;XDj$7$?$j!"(B<em>$B>o$K(B</em>
+ $BIU2C$5$;$k%3%^%s%I%i%$%s0z?t$r;XDj$7$?$j$9$k$3$H$,$G$-$^$9!#(B</p>
+
<p><code>httpd</code> $B$,5/F0$5$l$F$^$::G=i$K$9$k$3$H$O!"(B
<a href="configuring.html">$B@_Dj%U%!%$%k(B</a>
<code>httpd.conf</code> $B$N0LCV$rFCDj$7$FFI$_9~$`$3$H$G$9!#(B
@@ -43,16 +60,9 @@
<code>-f</code> $B%3%^%s%I%i%$%s%*%W%7%g%s$r;H$C$F(B
$B0LCV$r;XDj$9$k$3$H$b$G$-$^$9!#Nc$($P<!$N$h$&$K$G$9!#(B</p>
-<example>/usr/local/apache/bin/httpd -f
+<example>/usr/local/apache2/bin/apachectl -f
/usr/local/apache/conf/httpd.conf</example>
- <p><code>httpd</code> $B$N%P%$%J%j$rD>@\5/F0$9$kBe$o$j$K!"(B
- <a href="programs/apachectl.html">apachectl</a>
- $B$H$$$&%7%'%k%9%/%j%W%H$,Ds6!$5$l$F$$$^$9!#(B
- <code>apachectl start</code> $B$d(B <code>apachectl stop</code>
- $B$H$$$C$?4JC1$J%3%^%s%I$G!"(B
- $B%G!<%b%s%W%m%;%9$r@)8f$9$k$N$K;H$($^$9!#(B</p>
-
<p>$B%9%?!<%H%"%C%W$,K|;v>e<j$/$$$C$?$i!"%5!<%P$O%?!<%_%J%k$+$i(B
$B@Z$jN%$5$l$F!"%3%^%s%I%W%m%s%W%H$,B(:B$KLa$C$F$/$k$G$7$g$&!#(B
$B$3$l$O%5!<%P$,5/F0$7$F$$$k>uBV$r<($7$F$$$^$9!#(B
@@ -89,15 +99,21 @@
<p>$B%7%9%F%`$,%j%V!<%H$7$?8e$G$b(B
$B%5!<%P$,<B9T$5$lB3$1$k$h$&$K$7$?$$>l9g$O!"(B
- <code>httpd</code> $B$+(B <code>apachectl</code>
+ <code>apachectl</code>
$B$r8F$S=P$9$b$N$r%7%9%F%`%9%?!<%H%"%C%W%U%!%$%k(B
($BDL>o(B <code>rc.local</code> $B$d(B <code>rc.N</code>
$BFb$N%U%!%$%k(B) $B$KDI2C$7$J$1$l$P$J$j$^$;$s!#(B
$B$3$NJ}K!$G$O(B Apache $B$r(B root $B8"8B$G5/F0$7$^$9!#(B
$B$3$l$r$9$kA0$K!"%;%-%e%j%F%#$d%"%/%;%9@)8B$,(B
- $BE,@Z$K@_Dj$5$l$F$$$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#(B
- <code>apachectl</code> $B%9%/%j%W%H$ODL>o$O!"(B init
- $B%9%/%j%W%H$H$7$FD>@\%j%s%/$G$-$k$h$&$K@_7W$5$l$F$$$^$9$,!"(B
+ $BE,@Z$K@_Dj$5$l$F$$$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#(B</p>
+
+ <p><code>apachectl</code> $B%9%/%j%W%H$ODL>o$O!"I8=`E*$J(B SysV init
+ $B%9%/%j%W%H$H$7$FF0:n$9$k$h$&$K@_7W$5$l$F$$$^$9!#(B
+ <code>start</code>, <code>restart</code>, <code>stop</code>
+ $B$H$$$C$?0z?t$r$H$C$F!"(B<code>httpd</code>
+ $B$X$NE,@Z$J%7%0%J%k$KJQ49$7$^$9!#(B
+ $B$G$9$+$i!"DL>o$OC1$KE,@Z$J(B init $B%G%#%l%/%H%jFb$+$i(B
+ <code>apachectl</code> $B$X%j%s%/$9$k$3$H$,$G$-$^$9!#$7$+$7!"(B
$BG0$N$?$a%7%9%F%`$NMW5a$K9gCW$7$F$$$k$3$H$r3NG'$7$F$/$@$5$$!#(B</p>
</section>
diff --git a/docs/manual/logs.html.en b/docs/manual/logs.html.en
index 26dce4e..f15bf46 100644
--- a/docs/manual/logs.html.en
+++ b/docs/manual/logs.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Log Files - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Log Files</h1>
+ -->
+<title>Log Files - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Log Files</h1>
<p>In order to effectively manage a web server, it is necessary
to get feedback about the activity and performance of the
server as well as any problems that may be occuring. The Apache
@@ -12,7 +24,18 @@
capabilities. This document describes how to configure its
logging capabilities, and how to understand what the logs
contain.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#security">Security Warning</a></li><li><img alt="" src="./images/down.gif" /> <a href="#errorlog">Error Log</a></li><li><img alt="" src="./images/down.gif" /> <a href="#accesslog">Access Log</a></li><li><img alt="" src="./images/down.gif" /> <a href="#rotation">Log Rotation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#piped">Piped Logs</a></li><li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">Virtual Hosts</a></li><li><img alt="" src="./images/down.gif" /> <a href="#other">Other Log Files</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 Warning</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#security">Security Warning</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#errorlog">Error Log</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#accesslog">Access Log</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#rotation">Log Rotation</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#piped">Piped Logs</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">Virtual Hosts</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#other">Other Log Files</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 Warning</a></h2>
<p>Anyone who can write to the directory where Apache is
@@ -28,7 +51,9 @@
possible for malicious clients to insert control-characters in
the log files, so care must be taken in dealing with raw
logs.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="errorlog" id="errorlog">Error Log</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="errorlog" id="errorlog">Error Log</a></h2>
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code></li><li><code class="directive"><a href="./mod/core.html#loglevel">LogLevel</a></code></li></ul></td></tr></table>
@@ -92,7 +117,9 @@
<div class="example"><p><code>
tail -f error_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="accesslog" id="accesslog">Access Log</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="accesslog" id="accesslog">Access Log</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_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code></li></ul></td></tr></table>
@@ -376,7 +403,9 @@
easier to simply post-process the log files to remove requests
that you do not want to consider.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="rotation" id="rotation">Log Rotation</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="rotation" id="rotation">Log Rotation</a></h2>
<p>On even a moderately busy server, the quantity of
@@ -409,7 +438,9 @@
<p>Another way to perform log rotation is using <a href="#piped">piped logs</a> as discussed in the next
section.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="piped" id="piped">Piped Logs</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="piped" id="piped">Piped Logs</a></h2>
<p>Apache httpd is capable of writing error and access log
@@ -429,22 +460,6 @@
that piped log programs usually run as root. It is therefore
very important to keep the programs simple and secure.</p>
- <p>Some simple examples using piped logs:</p>
-
- <div class="example"><p><code>
- # compressed logs<br />
- CustomLog "|/usr/bin/gzip -c >>
- /var/log/access_log.gz" common<br />
- # almost-real-time name resolution<br />
- CustomLog "|/usr/local/apache/bin/logresolve >>
- /var/log/access_log" common
- </code></p></div>
-
- <p>Notice that quotes are used to enclose the entire command
- that will be called for the pipe. Although these examples are
- for the access log, the same technique can be used for the
- error log.</p>
-
<p>One important use of piped logs is to allow log rotation
without having to restart the server. The Apache HTTP Server
includes a simple program called <a href="programs/rotatelogs.html">rotatelogs</a> for this
@@ -456,14 +471,21 @@
/var/log/access_log 86400" common
</code></p></div>
- <p>A similar, but much more flexible log rotation program
+ <p>Notice that quotes are used to enclose the entire command
+ that will be called for the pipe. Although these examples are
+ for the access log, the same technique can be used for the
+ error log.</p>
+
+ <p>A similar but much more flexible log rotation program
called <a href="http://www.cronolog.org/">cronolog</a>
is available at an external site.</p>
<p>As with conditional logging, piped logs are a very powerful
tool, but they should not be used where a simpler solution like
off-line post-processing is available.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="virtualhost" id="virtualhost">Virtual Hosts</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="virtualhost" id="virtualhost">Virtual Hosts</a></h2>
<p>When running a server with many <a href="vhosts/">virtual
@@ -505,7 +527,9 @@
host that is serving the request. Then a program like <a href="programs/other.html">split-logfile</a> can be used to
post-process the access log in order to split it into one file
per virtual host.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="other" id="other">Other Log Files</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="other" id="other">Other Log Files</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_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritelog">RewriteLog</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptlog">ScriptLog</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptlogbuffer">ScriptLogBuffer</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptloglength">ScriptLogLength</a></code></li></ul></td></tr></table>
@@ -542,4 +566,8 @@
the rewriting engine transforms requests. The level of detail
is controlled by the <code class="directive"><a href="./mod/mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></code> directive.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/logs.html.ja.jis b/docs/manual/logs.html.ja.jis
index 3eb1ced..5f1bc97 100644
--- a/docs/manual/logs.html.ja.jis
+++ b/docs/manual/logs.html.ja.jis
@@ -4,29 +4,54 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>$B%m%0%U%!%$%k(B - Apache HTTP $B%5!<%P(B</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$B%m%0%U%!%$%k(B</h1>
- <p>$B%&%'%V%5!<%P$r8z2LE*(B$B$K4IM}$9$k$?$a$K$O!"%5!<%P$N3hF0$d%Q%U%)!<%^%s%9!"(B
- $B:#H/(B$B@8$7$F$$$k$+$b$7$l$J$$LdBj$K4X$9$k%U%#!<%I%P%C%/$rF@$k$3$H$,I,MW(B$B$G$9!#(B
- Apache HTTP $B%5!<%P$K$OHs>o$KJq3gE*$G(B$B=@Fp$J%m%.%s%05!G=$,$"$j$^$9!#(B
+ -->
+<title>$B%m%0%U%!%$%k(B - Apache HTTP $B%5!<%P(B</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$B%m%0%U%!%$%k(B</h1>
+ <p>$B%&%'%V%5!<%P$r8z2LE*$K4IM}$9$k$?$a$K$O!"%5!<%P$N3hF0$d%Q%U%)!<%^%s%9!"(B
+ $B:#H/@8$7$F$$$k$+$b$7$l$J$$LdBj$K4X$9$k%U%#!<%I%P%C%/$rF@$k$3$H$,I,MW$G$9!#(B
+ Apache HTTP $B%5!<%P$K$OHs>o$KJq3gE*$G=@Fp$J%m%.%s%05!G=$,$"$j$^$9!#(B
$B$3$NJ8=q$O%m%.%s%05!G=$N@_Dj$N;EJ}$H!"%m%0$K2?$,=q$+$l$F$$$k$+$r(B
$BM}2r$9$k$?$a$NJ}K!$r@bL@$7$^$9!#(B</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#security">
- $B%;%-%e%j%F%#$K4X$9$k7Y9p(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#errorlog">$B%(%i!<%m%0(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#accesslog">$B%"%/%;%9%m%0(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#rotation">$B%m%0$N8rBX(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#piped">$B%Q%$%W7PM3$N%m%0(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#virtualhosts">$B%P!<%A%c%k%[%9%H(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#other">$BB>$N%m%0%U%!%$%k(B</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">
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#security">
+ $B%;%-%e%j%F%#$K4X$9$k7Y9p(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#errorlog">$B%(%i!<%m%0(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#accesslog">$B%"%/%;%9%m%0(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#rotation">$B%m%0$N8rBX(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#piped">$B%Q%$%W7PM3$N%m%0(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#virtualhosts">$B%P!<%A%c%k%[%9%H(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#other">$BB>$N%m%0%U%!%$%k(B</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">
$B%;%-%e%j%F%#$K4X$9$k7Y9p(B</a></h2>
- <p>Apache $B$,%m%0%U%!%$%k$r=q$$$F$$$k%G%#%l%/%H(B$B%j$K=q$-9~$a$k?M$O!"(B
+ <p>Apache $B$,%m%0%U%!%$%k$r=q$$$F$$$k%G%#%l%/%H%j$K=q$-9~$a$k?M$O!"(B
$B$[$\3N<B$K%5!<%P$,5/F0$5$l$?(B uid $B$X$N%"%/%;%9$r<j$KF~$l$k$3$H$,$G$-$^$9!#(B
$B$=$7$F!"$=$l$ODL>o$O(B root $B%f!<%6$G$9!#(B
$B$A$c$s$H7k2L$r9M$($k$3$H$J$/!"$=$N%G%#%l%/%H%j$X$N(B
- $B=q$-9~$_8"8B$rM?$((B<em>$B$J$$(B</em>$B$G(B$B$/$@$5$$!#>\$7$/$O(B
+ $B=q$-9~$_8"8B$rM?$((B<em>$B$J$$(B</em>$B$G$/$@$5$$!#>\$7$/$O(B
<a href="misc/security_tips.html">$B%;%-%e%j%F%#$N$3$D(B</a>$B$NJ8=q$r(B
$BFI$s$G$/$@$5$$!#(B</p>
<p>$B2C$($F!"%m%0%U%!%$%k$K$O%/%i%$%"%s%H$+$i$N>pJs$,$=$N$^$^!"(B
$B%(%9%1!<%W$5$l$k$3$H$J$/=q$+$l$F$$$^$9!#$G$9$+$i!"0-0U$N$"$k(B
- $B%/%i%$%"%s%H$,%m%0%U%!%$%k(B$B$K@)8fJ8;z$rA^F~$9$k$3$H$,$G$-$^$9!#(B
+ $B%/%i%$%"%s%H$,%m%0%U%!%$%k$K@)8fJ8;z$rA^F~$9$k$3$H$,$G$-$^$9!#(B
$B@8$N%m%0$r07$&$H$-$OCm0U$7$F$/$@$5$$!#(B</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="errorlog" id="errorlog">$B%(%i!<%m%0(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="errorlog" id="errorlog">$B%(%i!<%m%0(B</a></h2>
<table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code></li><li><code class="directive"><a href="./mod/core.html#loglevel">LogLevel</a></code></li></ul></td></tr></table>
@@ -43,7 +68,7 @@
Unix $B%7%9%F%`$G$O%(%i!<$r(B <code>syslog</code> $B$d(B
<a href="#piped">$B%Q%$%W$G%W%m%0%i%`$KAw$k(B</a> $B$3$H$,$G$-$^$9!#(B</p>
- <p>$B%(%i!<%m%0$N=q<0$OHf3SE*<+M3EY$N9b$$$b$N$G!"@bL@E*$K=q(B$B$+$l$F$$$^$9!#(B
+ <p>$B%(%i!<%m%0$N=q<0$OHf3SE*<+M3EY$N9b$$$b$N$G!"@bL@E*$K=q$+$l$F$$$^$9!#(B
$B$?$@$7!"$$$/$D$+$N>pJs$O$[$H$s$I$N%(%i!<%m%0$N%(%s%H%j$K$"$j$^$9!#(B
$BNc$($P!"BeI=E*$J$b$N$K<!$N$h$&$J%a%C%;!<%8$,$"$j$^$9!#(B</p>
@@ -83,7 +108,9 @@
<div class="example"><p><code>
tail -f error_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="accesslog" id="accesslog">$B%"%/%;%9%m%0(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="accesslog" id="accesslog">$B%"%/%;%9%m%0(B</a></h2>
<table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code></li></ul></td></tr></table>
@@ -162,7 +189,7 @@
<dd>$B$3$l$O%5!<%P$X%j%/%(%9%H$r$7$?%/%i%$%"%s%H(B ($B%j%b!<%H%[%9%H(B)
$B$N(B IP $B%"%I%l%9$G$9!#(B<code class="directive"><a href="./mod/core.html#hostnamelookups">HostnameLookups</a></code> $B$,(B
<code>On</code> $B$N>l9g$O!"%5!<%P$O%[%9%HL>$rD4$Y$F!"(B
- IP $B%"%I%l%9$,=q$+$l$F$$$k$H$3$m$K5-O?$7(B$B$^$9!#$7$+$7!"$3$N@_Dj$O(B
+ IP $B%"%I%l%9$,=q$+$l$F$$$k$H$3$m$K5-O?$7$^$9!#$7$+$7!"$3$N@_Dj$O(B
$B%5!<%P$r$+$J$jCY$/$9$k$N$G!"$"$^$j$*4+$a$G$-$^$;$s!#(B
$B$=$&$G$O$J$/!"(B<a href="programs/logresolve.html">logresolve</a> $B$N(B
$B$h$&$J%m%0$N8e=hM}$r9T$J$&%W%m%0%i%`$G%[%9%HL>$rD4$Y$k$N$,NI$$$G$7$g$&!#(B
@@ -350,7 +377,9 @@
$B%5!<%P$N3hF0$N40A4$J5-O?$G$"$kJ}$,$h$jLr$KN)$A$^$9!#C1=c$K%m%0%U%!%$%k$r(B
$B8e=hM}$7$F!"9MN8$7$?$/$J$$%m%0$r:o=|$9$kJ}$,4JC1$G$"$k$3$H$,$h$/$"$j$^$9!#(B</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="rotation" id="rotation">$B%m%0$N8rBX(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="rotation" id="rotation">$B%m%0$N8rBX(B</a></h2>
<p>$BIaDL$NIi2Y$N%5!<%P$G$5$(!"%m%0%U%!%$%k$KJ]B8$5$l$k>pJs$NNL$O(B
@@ -380,7 +409,9 @@
</code></p></div>
<p>$B%m%0$N8rBX$r$9$k$b$&0l$D$NJ}K!$O(B<a href="#piped">$B%Q%$%W7PM3$N%m%0(B</a>$B$r;H$&$b$N$G!"<!$N@a$G@bL@$5$l$F$$$^$9!#(B</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="piped" id="piped">$B%Q%$%W7PM3$N%m%0(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="piped" id="piped">$B%Q%$%W7PM3$N%m%0(B</a></h2>
<p>Apache httpd $B$O%(%i!<%m%0$H%"%/%;%9%m%0$r%U%!%$%k$KD>@\=q$/Be$o$j$K!"(B
@@ -399,23 +430,8 @@
$B%W%m%0%i%`$OIaDL(B root $B$H$7$F<B9T$5$l$k$3$H$r0UL#$7$^$9!#(B
$B$G$9$+$i!"%W%m%0%i%`$r4JC1$G0BA4$KJ]$D$3$H$,Hs>o$K=EMW$G$9!#(B</p>
- <p>$B%Q%$%W7PM3$N%m%0$r;H$&4JC1$JNc$O(B:</p>
-
- <div class="example"><p><code>
- # compressed logs<br />
- CustomLog "|/usr/bin/gzip -c >>
- /var/log/access_log.gz" common<br />
- # almost-real-time name resolution<br />
- CustomLog "|/usr/local/apache/bin/logresolve >>
- /var/log/access_log" common
- </code></p></div>
-
- <p>$B%Q%$%W$N@h$G8F$P$l$k%3%^%s%IA4BN$,0zMQId$G0O$^$l$F$$$k$3$H$KCmL\$7$F(B
- $B$/$@$5$$!#$3$NNc$O%"%/%;%9%m%0$r;H$C$F$$$^$9$,!"%(%i!<%m%0$K$bF1$85;=Q$r(B
- $B;H$&$3$H$,$G$-$^$9!#(B</p>
-
- <p>$B%Q%$%W7PM3$N%m%0$N=EMW$JMxMQK!$O!"%m%0$N8rBX$r%5!<%P$N:F5/F0$J$7$G(B
- $B$9$k$b$N$G$9!#(BApache HTTP $B%5!<%P$K$O$3$N$?$a$N(B <a href="programs/rotatelogs.html">rotatelogs</a> $B$H8F$P$l$k4JC1$J(B
+ <p>$B%Q%$%W7PM3$N%m%0$N=EMW$JMxMQK!$O!"%5!<%P$N:F5/F0$J$7$G%m%0$N8rBX$r(B
+ $B$9$k$3$H$G$9!#(BApache HTTP $B%5!<%P$K$O$3$N$?$a$N(B <a href="programs/rotatelogs.html">rotatelogs</a> $B$H8F$P$l$k4JC1$J(B
$B%W%m%0%i%`$,IUB0$7$F$$$^$9!#$?$H$($P!"(B24 $B;~4VKh$K%m%0$r8rBX$5$;$k$K$O!"(B
$B0J2<$N$b$N$r;H$&$3$H$,$G$-$^$9(B:</p>
@@ -424,6 +440,10 @@
/var/log/access_log 86400" common
</code></p></div>
+ <p>$B%Q%$%W$N@h$G8F$P$l$k%3%^%s%IA4BN$,0zMQId$G0O$^$l$F$$$k$3$H$KCmL\$7$F(B
+ $B$/$@$5$$!#$3$NNc$O%"%/%;%9%m%0$r;H$C$F$$$^$9$,!"%(%i!<%m%0$K$bF1$85;=Q$r(B
+ $B;H$&$3$H$,$G$-$^$9!#(B</p>
+
<p>$B;w$F$$$k$1$l$I!"$h$j$:$C$H=@Fp$J(B
<a href="http://www.cronolog.org/">cronolog</a> $B$H$$$&%m%08rBXMQ$N(B
$B%W%m%0%i%`$,30It$N%5%$%H$K$"$j$^$9!#(B</p>
@@ -431,7 +451,9 @@
<p>$B>r7oIU$-%m%.%s%0$HF1MM!"%Q%$%W7PM3$N%m%0$OHs>o$K6/NO$J(B
$BF;6q$G$9$,!"%*%U%i%$%s$N8e=hM}$N$h$&$J!"$h$j4JC1$J2r7hJ}K!$,$"$k$H$-$O(B
$B;H$o$J$$J}$,NI$$$G$7$g$&!#(B</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="virtualhosts" id="virtualhosts">$B%P!<%A%c%k%[%9%H(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="virtualhosts" id="virtualhosts">$B%P!<%A%c%k%[%9%H(B</a></h2>
<p>$BB?$/$N(B <a href="vhosts/">$B%P!<%A%c%k%[%9%H(B</a> $B$N$"$k%5!<%P$r<B9T$7$F$$$k(B
@@ -472,7 +494,9 @@
<p>$B;DG0$J$,$i!"%(%i!<%m%0$K$OF1MM$N<jK!$O$"$j$^$;$s!#$G$9$+$i!"(B
$B$9$Y$F$N%P!<%A%c%k%[%9%H$rF1$8%(%i!<%m%0$NCf$K:.$<$k$+!"(B
$B%P!<%A%c%k%[%9%HKh$K%(%i!<%m%0$r;H$&$+$rA*$P$J$1$l$P$J$j$^$;$s!#(B</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="other" id="other">$BB>$N%m%0%U%!%$%k(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="other" id="other">$BB>$N%m%0%U%!%$%k(B</a></h2>
<table class="related"><tr><th>$B4XO"%b%8%e!<%k(B</th><th>$B4XO"%G%#%l%/%F%#%V(B</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritelog">RewriteLog</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptlog">ScriptLog</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptlogbuffer">ScriptLogBuffer</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptloglength">ScriptLogLength</a></code></li></ul></td></tr></table>
@@ -510,4 +534,8 @@
$B=q$-49$($kJ}K!$N>\:Y$J2r@O$,=PNO$5$l$^$9!#>\$7$5$NEY9g$O(B <code class="directive"><a href="./mod/mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></code>
$B$G@)8f$G$-$^$9!#(B</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/logs.xml b/docs/manual/logs.xml
index 37e2774..20dd007 100644
--- a/docs/manual/logs.xml
+++ b/docs/manual/logs.xml
@@ -474,22 +474,6 @@
that piped log programs usually run as root. It is therefore
very important to keep the programs simple and secure.</p>
- <p>Some simple examples using piped logs:</p>
-
- <example>
- # compressed logs<br />
- CustomLog "|/usr/bin/gzip -c >>
- /var/log/access_log.gz" common<br />
- # almost-real-time name resolution<br />
- CustomLog "|/usr/local/apache/bin/logresolve >>
- /var/log/access_log" common
- </example>
-
- <p>Notice that quotes are used to enclose the entire command
- that will be called for the pipe. Although these examples are
- for the access log, the same technique can be used for the
- error log.</p>
-
<p>One important use of piped logs is to allow log rotation
without having to restart the server. The Apache HTTP Server
includes a simple program called <a
@@ -502,7 +486,12 @@
/var/log/access_log 86400" common
</example>
- <p>A similar, but much more flexible log rotation program
+ <p>Notice that quotes are used to enclose the entire command
+ that will be called for the pipe. Although these examples are
+ for the access log, the same technique can be used for the
+ error log.</p>
+
+ <p>A similar but much more flexible log rotation program
called <a href="http://www.cronolog.org/">cronolog</a>
is available at an external site.</p>
diff --git a/docs/manual/logs.xml.ja b/docs/manual/logs.xml.ja
index 9f2b1ad..3d9c3cb 100644
--- a/docs/manual/logs.xml.ja
+++ b/docs/manual/logs.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp"?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.5 -->
+<!-- English revision: 1.6 -->
<manualpage>
<relativepath href="."/>
@@ -440,23 +440,8 @@
$B%W%m%0%i%`$OIaDL(B root $B$H$7$F<B9T$5$l$k$3$H$r0UL#$7$^$9!#(B
$B$G$9$+$i!"%W%m%0%i%`$r4JC1$G0BA4$KJ]$D$3$H$,Hs>o$K=EMW$G$9!#(B</p>
- <p>$B%Q%$%W7PM3$N%m%0$r;H$&4JC1$JNc$O(B:</p>
-
- <example>
- # compressed logs<br />
- CustomLog "|/usr/bin/gzip -c >>
- /var/log/access_log.gz" common<br />
- # almost-real-time name resolution<br />
- CustomLog "|/usr/local/apache/bin/logresolve >>
- /var/log/access_log" common
- </example>
-
- <p>$B%Q%$%W$N@h$G8F$P$l$k%3%^%s%IA4BN$,0zMQId$G0O$^$l$F$$$k$3$H$KCmL\$7$F(B
- $B$/$@$5$$!#$3$NNc$O%"%/%;%9%m%0$r;H$C$F$$$^$9$,!"%(%i!<%m%0$K$bF1$85;=Q$r(B
- $B;H$&$3$H$,$G$-$^$9!#(B</p>
-
- <p>$B%Q%$%W7PM3$N%m%0$N=EMW$JMxMQK!$O!"%m%0$N8rBX$r%5!<%P$N:F5/F0$J$7$G(B
- $B$9$k$b$N$G$9!#(BApache HTTP $B%5!<%P$K$O$3$N$?$a$N(B <a
+ <p>$B%Q%$%W7PM3$N%m%0$N=EMW$JMxMQK!$O!"%5!<%P$N:F5/F0$J$7$G%m%0$N8rBX$r(B
+ $B$9$k$3$H$G$9!#(BApache HTTP $B%5!<%P$K$O$3$N$?$a$N(B <a
href="programs/rotatelogs.html">rotatelogs</a> $B$H8F$P$l$k4JC1$J(B
$B%W%m%0%i%`$,IUB0$7$F$$$^$9!#$?$H$($P!"(B24 $B;~4VKh$K%m%0$r8rBX$5$;$k$K$O!"(B
$B0J2<$N$b$N$r;H$&$3$H$,$G$-$^$9(B:</p>
@@ -466,6 +451,10 @@
/var/log/access_log 86400" common
</example>
+ <p>$B%Q%$%W$N@h$G8F$P$l$k%3%^%s%IA4BN$,0zMQId$G0O$^$l$F$$$k$3$H$KCmL\$7$F(B
+ $B$/$@$5$$!#$3$NNc$O%"%/%;%9%m%0$r;H$C$F$$$^$9$,!"%(%i!<%m%0$K$bF1$85;=Q$r(B
+ $B;H$&$3$H$,$G$-$^$9!#(B</p>
+
<p>$B;w$F$$$k$1$l$I!"$h$j$:$C$H=@Fp$J(B
<a href="http://www.cronolog.org/">cronolog</a> $B$H$$$&%m%08rBXMQ$N(B
$B%W%m%0%i%`$,30It$N%5%$%H$K$"$j$^$9!#(B</p>
diff --git a/docs/manual/misc/index.html.en b/docs/manual/misc/index.html.en
index 56ed252..0d4a975 100644
--- a/docs/manual/misc/index.html.en
+++ b/docs/manual/misc/index.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache Miscellaneous Documentation - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="../"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache Miscellaneous Documentation</h1>
+ -->
+<title>Apache Miscellaneous Documentation - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="../"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache Miscellaneous Documentation</h1>
<p>Below is a list of additional documentation pages that apply
to the Apache web server development project.</p>
@@ -81,4 +93,9 @@
</dd>
</dl>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/perf-tuning.html.en b/docs/manual/misc/perf-tuning.html.en
index 9ecec55..5daa782 100644
--- a/docs/manual/misc/perf-tuning.html.en
+++ b/docs/manual/misc/perf-tuning.html.en
@@ -4,13 +4,26 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache Performance Notes - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Miscellaneous Documentation</a></div><div id="page-content"><div id="preamble"><h1>Apache Performance Notes</h1>
+ -->
+<title>Apache Performance Notes - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Miscellaneous Documentation</a></div><div id="page-content"><div id="preamble"><h1>Apache Performance Notes</h1>
- <div class="warning"><strong>Warning:</strong>
- This document has not been fully updated
- to take into account changes made in the 2.0 version of the
- Apache HTTP Server. Some of the information may still be
- relevant, but please use it with care.</div>
+ <div class="warning"><h3>Warning:</h3>
+ <p>This document has not been fully updated
+ to take into account changes made in the 2.0 version of the
+ Apache HTTP Server. Some of the information may still be
+ relevant, but please use it with care.</p>
+ </div>
<p>Orignally written by Dean Gaudet.</p>
@@ -31,7 +44,15 @@
of the capabilities of the hardware and OS, while others allow
the administrator to trade functionality for speed.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#hardware">Hardware and Operating System Issues</a></li><li><img alt="" src="../images/down.gif" /> <a href="#runtime">Run-Time Configuration Issues</a></li><li><img alt="" src="../images/down.gif" /> <a href="#compiletime">Compile-Time Configuration Issues</a></li><li><img alt="" src="../images/down.gif" /> <a href="#trace">Appendix: Detailed Analysis of a Trace</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="hardware" id="hardware">Hardware and Operating System Issues</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#hardware">Hardware and Operating System Issues</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#runtime">Run-Time Configuration Issues</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#compiletime">Compile-Time Configuration Issues</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#trace">Appendix: Detailed Analysis of a Trace</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="hardware" id="hardware">Hardware and Operating System Issues</a></h2>
@@ -71,13 +92,15 @@
</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="runtime" id="runtime">Run-Time Configuration Issues</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="runtime" id="runtime">Run-Time Configuration Issues</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_dir.html">mod_dir</a></code></li><li><code class="module"><a href="../mod/mpm_common.html">mpm_common</a></code></li><li><code class="module"><a href="../mod/mod_status.html">mod_status</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li><li><code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code></li><li><code class="directive"><a href="../mod/core.html#hostnamelookups">HostnameLookups</a></code></li><li><code class="directive"><a href="../mod/core.html#enablemmap">EnableMMAP</a></code></li><li><code class="directive"><a href="../mod/core.html#enablesendfile">EnableSendfile</a></code></li><li><code class="directive"><a href="../mod/core.html#keepalivetimeout">KeepAliveTimeout</a></code></li><li><code class="directive"><a href="../mod/prefork.html#maxspareservers">MaxSpareServers</a></code></li><li><code class="directive"><a href="../mod/prefork.html#minspareservers">MinSpareServers</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code></li></ul></td></tr></table>
- <h3><code>HostnameLookups</code></h3>
+ <h3>HostnameLookups</h3>
@@ -98,12 +121,14 @@
matching the criteria. Here's an example which disables lookups
except for <code>.html</code> and <code>.cgi</code> files:</p>
-<div class="example"><pre>
-HostnameLookups off
-<Files ~ "\.(html|cgi)$">
- HostnameLookups on
-</Files>
-</pre></div>
+ <div class="example"><p><code>
+ HostnameLookups off<br />
+ <Files ~ "\.(html|cgi)$"><br />
+ <span class="indent">
+ HostnameLookups on<br />
+ </span>
+ </Files>
+ </code></p></div>
<p>But even still, if you just need DNS names in some CGIs you
could consider doing the <code>gethostbyname</code> call in the
@@ -120,7 +145,7 @@
- <h3><code>FollowSymLinks</code> and <code>SymLinksIfOwnerMatch</code></h3>
+ <h3>FollowSymLinks and SymLinksIfOwnerMatch</h3>
@@ -130,12 +155,14 @@
system calls to check up on symlinks. One extra call per
filename component. For example, if you had:</p>
-<div class="example"><pre>
-DocumentRoot /www/htdocs
-<Directory />
- Options SymLinksIfOwnerMatch
-</Directory>
-</pre></div>
+ <div class="example"><p><code>
+ DocumentRoot /www/htdocs<br />
+ <Directory /><br />
+ <span class="indent">
+ Options SymLinksIfOwnerMatch<br />
+ </span>
+ </Directory>
+ </code></p></div>
<p>and a request is made for the URI <code>/index.html</code>.
Then Apache will perform <code>lstat(2)</code> on
@@ -145,15 +172,20 @@
every single request. If you really desire the symlinks
security checking you can do something like this:</p>
-<div class="example"><pre>
-DocumentRoot /www/htdocs
-<Directory />
- Options FollowSymLinks
-</Directory>
-<Directory /www/htdocs>
- Options -FollowSymLinks +SymLinksIfOwnerMatch
-</Directory>
-</pre></div>
+ <div class="example"><p><code>
+ DocumentRoot /www/htdocs<br />
+ <Directory /><br />
+ <span class="indent">
+ Options FollowSymLinks<br />
+ </span>
+ </Directory><br />
+ <br />
+ <Directory /www/htdocs><br />
+ <span class="indent">
+ Options -FollowSymLinks +SymLinksIfOwnerMatch<br />
+ </span>
+ </Directory>
+ </code></p></div>
<p>This at least avoids the extra checks for the
<code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> path.
@@ -166,7 +198,7 @@
- <h3><code>AllowOverride</code></h3>
+ <h3>AllowOverride</h3>
@@ -175,12 +207,14 @@
<code>.htaccess</code> for each filename component. For
example,</p>
-<div class="example"><pre>
-DocumentRoot /www/htdocs
-<Directory />
- AllowOverride all
-</Directory>
-</pre></div>
+ <div class="example"><p><code>
+ DocumentRoot /www/htdocs<br />
+ <Directory /><br />
+ <span class="indent">
+ AllowOverride all<br />
+ </span>
+ </Directory>
+ </code></p></div>
<p>and a request is made for the URI <code>/index.html</code>.
Then Apache will attempt to open <code>/.htaccess</code>,
@@ -202,15 +236,15 @@
penalties. There's one case where you can speed up the server.
Instead of using a wildcard such as:</p>
-<div class="example"><pre>
-DirectoryIndex index
-</pre></div>
+ <div class="example"><p><code>
+ DirectoryIndex index
+ </code></p></div>
- <p>Use a complete list of options:</p>
+ <p>Use a complete list of options:</p>
-<div class="example"><pre>
-DirectoryIndex index.cgi index.pl index.shtml index.html
-</pre></div>
+ <div class="example"><p><code>
+ DirectoryIndex index.cgi index.pl index.shtml index.html
+ </code></p></div>
<p>where you list the most common choice first.</p>
@@ -346,7 +380,47 @@
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="compiletime" id="compiletime">Compile-Time Configuration Issues</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="compiletime" id="compiletime">Compile-Time Configuration Issues</a></h2>
+
+
+
+ <h3>Choosing an MPM</h3>
+
+
+
+ <p>Apache 2.x supports pluggable concurrency models, called
+ <a href="../mpm.html">Multi-Processing Modules</a> (MPMs).
+ When building Apache, you must choose an MPM to use. There
+ are platform-specific MPMs for some platforms:
+ <code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>,
+ <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, and <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>. For
+ general Unix-type systems, there are several MPMs from which
+ to choose. The choice of MPM can affect the speed and scalability
+ of the httpd:</p>
+
+ <ul>
+
+ <li>The <code class="module"><a href="../mod/worker.html">worker</a></code> MPM uses multiple child
+ processes with many threads each. Each thread handles
+ one connection at a time. Worker generally is a good
+ choice for high-traffic servers because it has a smaller
+ memory footprint than the prefork MPM.</li>
+
+ <li>The <code class="module"><a href="../mod/prefork.html">prefork</a></code> MPM uses multiple child
+ processes with one thread each. Each process handles
+ one connection at a time. On many systems, prefork is
+ comparable in speed to worker, but it uses more memory.
+ Prefork's threadless design has advantages over worker
+ in some situations: it can be used with non-thread-safe
+ third-party modules, and it is easier to debug on platforms
+ with poor thread debugging support.</li>
+
+ </ul>
+
+ <p>For more information on these and other MPMs, please
+ see the MPM <a href="../mpm.html">documentation</a>.</p>
@@ -382,29 +456,39 @@
do not match the code, they're contrived for pedagogical
purposes):</p>
-<div class="example"><pre>
- for (;;) {
- for (;;) {
- fd_set accept_fds;
-
- FD_ZERO (&accept_fds);
- for (i = first_socket; i <= last_socket; ++i) {
- FD_SET (i, &accept_fds);
+ <div class="example"><p><code>
+ for (;;) {<br />
+ <span class="indent">
+ for (;;) {<br />
+ <span class="indent">
+ fd_set accept_fds;<br />
+ <br />
+ FD_ZERO (&accept_fds);<br />
+ for (i = first_socket; i <= last_socket; ++i) {<br />
+ <span class="indent">
+ FD_SET (i, &accept_fds);<br />
+ </span>
+ }<br />
+ rc = select (last_socket+1, &accept_fds, NULL, NULL, NULL);<br />
+ if (rc < 1) continue;<br />
+ new_connection = -1;<br />
+ for (i = first_socket; i <= last_socket; ++i) {<br />
+ <span class="indent">
+ if (FD_ISSET (i, &accept_fds)) {<br />
+ <span class="indent">
+ new_connection = accept (i, NULL, NULL);<br />
+ if (new_connection != -1) break;<br />
+ </span>
+ }<br />
+ </span>
+ }<br />
+ if (new_connection != -1) break;<br />
+ </span>
+ }<br />
+ process the new_connection;<br />
+ </span>
}
- rc = select (last_socket+1, &accept_fds, NULL, NULL, NULL);
- if (rc < 1) continue;
- new_connection = -1;
- for (i = first_socket; i <= last_socket; ++i) {
- if (FD_ISSET (i, &accept_fds)) {
- new_connection = accept (i, NULL, NULL);
- if (new_connection != -1) break;
- }
- }
- if (new_connection != -1) break;
- }
- process the new_connection;
- }
-</pre></div>
+ </code></p></div>
<p>But this naive implementation has a serious starvation problem.
Recall that multiple children execute this loop at the same
@@ -442,31 +526,41 @@
entry into the inner loop. The loop looks like this
(differences highlighted):</p>
-<div class="example"><pre>
- for (;;) {
- <strong>accept_mutex_on ();</strong>
- for (;;) {
- fd_set accept_fds;
-
- FD_ZERO (&accept_fds);
- for (i = first_socket; i <= last_socket; ++i) {
- FD_SET (i, &accept_fds);
+ <div class="example"><p><code>
+ for (;;) {<br />
+ <span class="indent">
+ <strong>accept_mutex_on ();</strong><br />
+ for (;;) {<br />
+ <span class="indent">
+ fd_set accept_fds;<br />
+ <br />
+ FD_ZERO (&accept_fds);<br />
+ for (i = first_socket; i <= last_socket; ++i) {<br />
+ <span class="indent">
+ FD_SET (i, &accept_fds);<br />
+ </span>
+ }<br />
+ rc = select (last_socket+1, &accept_fds, NULL, NULL, NULL);<br />
+ if (rc < 1) continue;<br />
+ new_connection = -1;<br />
+ for (i = first_socket; i <= last_socket; ++i) {<br />
+ <span class="indent">
+ if (FD_ISSET (i, &accept_fds)) {<br />
+ <span class="indent">
+ new_connection = accept (i, NULL, NULL);<br />
+ if (new_connection != -1) break;<br />
+ </span>
+ }<br />
+ </span>
+ }<br />
+ if (new_connection != -1) break;<br />
+ </span>
+ }<br />
+ <strong>accept_mutex_off ();</strong><br />
+ process the new_connection;<br />
+ </span>
}
- rc = select (last_socket+1, &accept_fds, NULL, NULL, NULL);
- if (rc < 1) continue;
- new_connection = -1;
- for (i = first_socket; i <= last_socket; ++i) {
- if (FD_ISSET (i, &accept_fds)) {
- new_connection = accept (i, NULL, NULL);
- if (new_connection != -1) break;
- }
- }
- if (new_connection != -1) break;
- }
- <strong>accept_mutex_off ();</strong>
- process the new_connection;
- }
-</pre></div>
+ </code></p></div>
<p><a id="serialize" name="serialize">The functions</a>
<code>accept_mutex_on</code> and <code>accept_mutex_off</code>
@@ -636,31 +730,39 @@
<code>http_main.c</code>). The function looks roughly like
this:</p>
-<div class="example"><pre>
- void lingering_close (int s)
- {
- char junk_buffer[2048];
-
- /* shutdown the sending side */
- shutdown (s, 1);
-
- signal (SIGALRM, lingering_death);
- alarm (30);
-
- for (;;) {
- select (s for reading, 2 second timeout);
- if (error) break;
- if (s is ready for reading) {
- if (read (s, junk_buffer, sizeof (junk_buffer)) <= 0) {
- break;
+ <div class="example"><p><code>
+ void lingering_close (int s)<br />
+ {<br />
+ <span class="indent">
+ char junk_buffer[2048];<br />
+ <br />
+ /* shutdown the sending side */<br />
+ shutdown (s, 1);<br />
+ <br />
+ signal (SIGALRM, lingering_death);<br />
+ alarm (30);<br />
+ <br />
+ for (;;) {<br />
+ <span class="indent">
+ select (s for reading, 2 second timeout);<br />
+ if (error) break;<br />
+ if (s is ready for reading) {<br />
+ <span class="indent">
+ if (read (s, junk_buffer, sizeof (junk_buffer)) <= 0) {<br />
+ <span class="indent">
+ break;<br />
+ </span>
+ }<br />
+ /* just toss away whatever is here */<br />
+ </span>
+ }<br />
+ </span>
+ }<br />
+ <br />
+ close (s);<br />
+ </span>
}
- /* just toss away whatever is here */
- }
- }
-
- close (s);
- }
-</pre></div>
+ </code></p></div>
<p>This naturally adds some expense at the end of a connection,
but it is required for a reliable implementation. As HTTP/1.1
@@ -704,7 +806,7 @@
- <h3><code>DYNAMIC_MODULE_LIMIT</code></h3>
+ <h3>DYNAMIC_MODULE_LIMIT</h3>
@@ -717,7 +819,9 @@
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="trace" id="trace">Appendix: Detailed Analysis of a Trace</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="trace" id="trace">Appendix: Detailed Analysis of a Trace</a></h2>
@@ -725,7 +829,7 @@
on Solaris 8. This trace was collected using:</p>
<div class="example"><p><code>
- truss -l -p <em>httpd_child_pid</em>.
+ truss -l -p <var>httpd_child_pid</var>.
</code></p></div>
<p>The <code>-l</code> option tells truss to log the ID of the
@@ -741,10 +845,8 @@
with content negotiation look wildly different (and quite ugly
in some cases).</p>
-<div class="example"><pre>
-/67: accept(3, 0x00200BEC, 0x00200C0C, 1) (sleeping...)
-/67: accept(3, 0x00200BEC, 0x00200C0C, 1) = 9
-</pre></div>
+ <div class="example"><pre>/67: accept(3, 0x00200BEC, 0x00200C0C, 1) (sleeping...)
+/67: accept(3, 0x00200BEC, 0x00200C0C, 1) = 9</pre></div>
<p>In this trace, the listener thread is running within LWP #67.</p>
@@ -752,18 +854,14 @@
particular platform, the worker MPM uses an unserialized accept by
default unless it is listening on multiple ports.</div>
-<div class="example"><pre>
-/65: lwp_park(0x00000000, 0) = 0
-/67: lwp_unpark(65, 1) = 0
-</pre></div>
+ <div class="example"><pre>/65: lwp_park(0x00000000, 0) = 0
+/67: lwp_unpark(65, 1) = 0</pre></div>
<p>Upon accepting the connection, the listener thread wakes up
a worker thread to do the request processing. In this trace,
the worker thread that handles the request is mapped to LWP #65.</p>
-<div class="example"><pre>
-/65: getsockname(9, 0x00200BA4, 0x00200BC4, 1) = 0
-</pre></div>
+ <div class="example"><pre>/65: getsockname(9, 0x00200BA4, 0x00200BC4, 1) = 0</pre></div>
<p>In order to implement virtual hosts, Apache needs to know
the local socket address used to accept the connection. It
@@ -773,10 +871,8 @@
are used which do not have wildcard addresses). But
no effort has yet been made to do these optimizations. </p>
-<div class="example"><pre>
-/65: brk(0x002170E8) = 0
-/65: brk(0x002190E8) = 0
-</pre></div>
+ <div class="example"><pre>/65: brk(0x002170E8) = 0
+/65: brk(0x002190E8) = 0</pre></div>
<p>The <code>brk(2)</code> calls allocate memory from the heap.
It is rare to see these in a system call trace, because the httpd
@@ -786,31 +882,25 @@
call <code>malloc(3)</code> to get the blocks of raw memory
with which to create the custom memory allocators.</p>
-<div class="example"><pre>
-/65: fcntl(9, F_GETFL, 0x00000000) = 2
+ <div class="example"><pre>/65: fcntl(9, F_GETFL, 0x00000000) = 2
/65: fstat64(9, 0xFAF7B818) = 0
/65: getsockopt(9, 65535, 8192, 0xFAF7B918, 0xFAF7B910, 2190656) = 0
/65: fstat64(9, 0xFAF7B818) = 0
/65: getsockopt(9, 65535, 8192, 0xFAF7B918, 0xFAF7B914, 2190656) = 0
/65: setsockopt(9, 65535, 8192, 0xFAF7B918, 4, 2190656) = 0
-/65: fcntl(9, F_SETFL, 0x00000082) = 0
-</pre></div>
+/65: fcntl(9, F_SETFL, 0x00000082) = 0</pre></div>
<p>Next, the worker thread puts the connection to the client (file
descriptor 9) in non-blocking mode. The <code>setsockopt(2)</code>
and <code>getsockopt(2)</code> calls are a side-effect of how
Solaris's libc handles <code>fcntl(2)</code> on sockets.</p>
-<div class="example"><pre>
-/65: read(9, " G E T / 1 0 k . h t m".., 8000) = 97
-</pre></div>
+ <div class="example"><pre>/65: read(9, " G E T / 1 0 k . h t m".., 8000) = 97</pre></div>
<p>The worker thread reads the request from the client.</p>
-<div class="example"><pre>
-/65: stat("/var/httpd/apache/httpd-8999/htdocs/10k.html", 0xFAF7B978) = 0
-/65: open("/var/httpd/apache/httpd-8999/htdocs/10k.html", O_RDONLY) = 10
-</pre></div>
+ <div class="example"><pre>/65: stat("/var/httpd/apache/httpd-8999/htdocs/10k.html", 0xFAF7B978) = 0
+/65: open("/var/httpd/apache/httpd-8999/htdocs/10k.html", O_RDONLY) = 10</pre></div>
<p>This httpd has been configured with <code>Options FollowSymLinks</code>
and <code>AllowOverride None</code>. Thus it doesn't need to
@@ -819,9 +909,7 @@
It simply calls <code>stat(2)</code> to verify that the file:
1) exists, and 2) is a regular file, not a directory.</p>
-<div class="example"><pre>
-/65: sendfilev(0, 9, 0x00200F90, 2, 0xFAF7B53C) = 10269
-</pre></div>
+ <div class="example"><pre>/65: sendfilev(0, 9, 0x00200F90, 2, 0xFAF7B53C) = 10269</pre></div>
<p>In this example, the httpd is able to send the HTTP response
header and the requested file with a single <code>sendfilev(2)</code>
@@ -830,9 +918,7 @@
<code>writev(2)</code> call to send the headers before calling
<code>sendfile(2)</code>.</p>
-<div class="example"><pre>
-/65: write(4, " 1 2 7 . 0 . 0 . 1 - ".., 78) = 78
-</pre></div>
+ <div class="example"><pre>/65: write(4, " 1 2 7 . 0 . 0 . 1 - ".., 78) = 78</pre></div>
<p>This <code>write(2)</code> call records the request in the
access log. Note that one thing missing from this trace is a
@@ -842,26 +928,20 @@
optimized implementation that doesn't require as much overhead
as a typical system call.</p>
-<div class="example"><pre>
-/65: shutdown(9, 1, 1) = 0
+ <div class="example"><pre>/65: shutdown(9, 1, 1) = 0
/65: poll(0xFAF7B980, 1, 2000) = 1
/65: read(9, 0xFAF7BC20, 512) = 0
-/65: close(9) = 0
-</pre></div>
+/65: close(9) = 0</pre></div>
<p>The worker thread does a lingering close of the connection.</p>
-<div class="example"><pre>
-/65: close(10) = 0
-/65: lwp_park(0x00000000, 0) (sleeping...)
-</pre></div>
+ <div class="example"><pre>/65: close(10) = 0
+/65: lwp_park(0x00000000, 0) (sleeping...)</pre></div>
<p>Finally the worker thread closes the file that it has just delivered
and blocks until the listener assigns it another connection.</p>
-<div class="example"><pre>
-/67: accept(3, 0x001FEB74, 0x001FEB94, 1) (sleeping...)
-</pre></div>
+ <div class="example"><pre>/67: accept(3, 0x001FEB74, 0x001FEB94, 1) (sleeping...)</pre></div>
<p>Meanwhile, the listener thread is able to accept another connection
as soon as it has dispatched this connection to a worker thread (subject
@@ -871,4 +951,8 @@
high load conditions) occur in parallel with the worker thread's handling
of the just-accepted connection.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/perf-tuning.xml b/docs/manual/misc/perf-tuning.xml
index f792624..675cb19 100644
--- a/docs/manual/misc/perf-tuning.xml
+++ b/docs/manual/misc/perf-tuning.xml
@@ -10,11 +10,12 @@
<summary>
- <note type="warning"><strong>Warning:</strong>
- This document has not been fully updated
- to take into account changes made in the 2.0 version of the
- Apache HTTP Server. Some of the information may still be
- relevant, but please use it with care.</note>
+ <note type="warning"><title>Warning:</title>
+ <p>This document has not been fully updated
+ to take into account changes made in the 2.0 version of the
+ Apache HTTP Server. Some of the information may still be
+ relevant, but please use it with care.</p>
+ </note>
<p>Orignally written by Dean Gaudet.</p>
@@ -106,7 +107,7 @@
<section>
- <title><code>HostnameLookups</code></title>
+ <title>HostnameLookups</title>
<p>Prior to Apache 1.3, <directive module="core"
>HostnameLookups</directive> defaulted to <code>On</code>.
@@ -126,12 +127,14 @@
matching the criteria. Here's an example which disables lookups
except for <code>.html</code> and <code>.cgi</code> files:</p>
-<example><pre>
-HostnameLookups off
-<Files ~ "\.(html|cgi)$">
- HostnameLookups on
-</Files>
-</pre></example>
+ <example>
+ HostnameLookups off<br />
+ <Files ~ "\.(html|cgi)$"><br />
+ <indent>
+ HostnameLookups on<br />
+ </indent>
+ </Files>
+ </example>
<p>But even still, if you just need DNS names in some CGIs you
could consider doing the <code>gethostbyname</code> call in the
@@ -151,7 +154,7 @@
<section>
- <title><code>FollowSymLinks</code> and <code>SymLinksIfOwnerMatch</code></title>
+ <title>FollowSymLinks and SymLinksIfOwnerMatch</title>
<p>Wherever in your URL-space you do not have an <code>Options
FollowSymLinks</code>, or you do have an <code>Options
@@ -159,12 +162,14 @@
system calls to check up on symlinks. One extra call per
filename component. For example, if you had:</p>
-<example><pre>
-DocumentRoot /www/htdocs
-<Directory />
- Options SymLinksIfOwnerMatch
-</Directory>
-</pre></example>
+ <example>
+ DocumentRoot /www/htdocs<br />
+ <Directory /><br />
+ <indent>
+ Options SymLinksIfOwnerMatch<br />
+ </indent>
+ </Directory>
+ </example>
<p>and a request is made for the URI <code>/index.html</code>.
Then Apache will perform <code>lstat(2)</code> on
@@ -174,15 +179,20 @@
every single request. If you really desire the symlinks
security checking you can do something like this:</p>
-<example><pre>
-DocumentRoot /www/htdocs
-<Directory />
- Options FollowSymLinks
-</Directory>
-<Directory /www/htdocs>
- Options -FollowSymLinks +SymLinksIfOwnerMatch
-</Directory>
-</pre></example>
+ <example>
+ DocumentRoot /www/htdocs<br />
+ <Directory /><br />
+ <indent>
+ Options FollowSymLinks<br />
+ </indent>
+ </Directory><br />
+ <br />
+ <Directory /www/htdocs><br />
+ <indent>
+ Options -FollowSymLinks +SymLinksIfOwnerMatch<br />
+ </indent>
+ </Directory>
+ </example>
<p>This at least avoids the extra checks for the
<directive module="core">DocumentRoot</directive> path.
@@ -197,19 +207,21 @@
<section>
- <title><code>AllowOverride</code></title>
+ <title>AllowOverride</title>
<p>Wherever in your URL-space you allow overrides (typically
<code>.htaccess</code> files) Apache will attempt to open
<code>.htaccess</code> for each filename component. For
example,</p>
-<example><pre>
-DocumentRoot /www/htdocs
-<Directory />
- AllowOverride all
-</Directory>
-</pre></example>
+ <example>
+ DocumentRoot /www/htdocs<br />
+ <Directory /><br />
+ <indent>
+ AllowOverride all<br />
+ </indent>
+ </Directory>
+ </example>
<p>and a request is made for the URI <code>/index.html</code>.
Then Apache will attempt to open <code>/.htaccess</code>,
@@ -231,15 +243,15 @@
penalties. There's one case where you can speed up the server.
Instead of using a wildcard such as:</p>
-<example><pre>
-DirectoryIndex index
-</pre></example>
+ <example>
+ DirectoryIndex index
+ </example>
- <p>Use a complete list of options:</p>
+ <p>Use a complete list of options:</p>
-<example><pre>
-DirectoryIndex index.cgi index.pl index.shtml index.html
-</pre></example>
+ <example>
+ DirectoryIndex index.cgi index.pl index.shtml index.html
+ </example>
<p>where you list the most common choice first.</p>
@@ -392,6 +404,44 @@
<section>
+ <title>Choosing an MPM</title>
+
+ <p>Apache 2.x supports pluggable concurrency models, called
+ <a href="../mpm.html">Multi-Processing Modules</a> (MPMs).
+ When building Apache, you must choose an MPM to use. There
+ are platform-specific MPMs for some platforms:
+ <module>beos</module>, <module>mpm_netware</module>,
+ <module>mpmt_os2</module>, and <module>mpm_winnt</module>. For
+ general Unix-type systems, there are several MPMs from which
+ to choose. The choice of MPM can affect the speed and scalability
+ of the httpd:</p>
+
+ <ul>
+
+ <li>The <module>worker</module> MPM uses multiple child
+ processes with many threads each. Each thread handles
+ one connection at a time. Worker generally is a good
+ choice for high-traffic servers because it has a smaller
+ memory footprint than the prefork MPM.</li>
+
+ <li>The <module>prefork</module> MPM uses multiple child
+ processes with one thread each. Each process handles
+ one connection at a time. On many systems, prefork is
+ comparable in speed to worker, but it uses more memory.
+ Prefork's threadless design has advantages over worker
+ in some situations: it can be used with non-thread-safe
+ third-party modules, and it is easier to debug on platforms
+ with poor thread debugging support.</li>
+
+ </ul>
+
+ <p>For more information on these and other MPMs, please
+ see the MPM <a href="../mpm.html">documentation</a>.</p>
+
+ </section>
+
+ <section>
+
<title>mod_status and ExtendedStatus On</title>
<p>If you include <module>mod_status</module> and you also set
@@ -423,29 +473,39 @@
do not match the code, they're contrived for pedagogical
purposes):</p>
-<example><pre>
- for (;;) {
- for (;;) {
- fd_set accept_fds;
-
- FD_ZERO (&accept_fds);
- for (i = first_socket; i <= last_socket; ++i) {
- FD_SET (i, &accept_fds);
+ <example>
+ for (;;) {<br />
+ <indent>
+ for (;;) {<br />
+ <indent>
+ fd_set accept_fds;<br />
+ <br />
+ FD_ZERO (&accept_fds);<br />
+ for (i = first_socket; i <= last_socket; ++i) {<br />
+ <indent>
+ FD_SET (i, &accept_fds);<br />
+ </indent>
+ }<br />
+ rc = select (last_socket+1, &accept_fds, NULL, NULL, NULL);<br />
+ if (rc < 1) continue;<br />
+ new_connection = -1;<br />
+ for (i = first_socket; i <= last_socket; ++i) {<br />
+ <indent>
+ if (FD_ISSET (i, &accept_fds)) {<br />
+ <indent>
+ new_connection = accept (i, NULL, NULL);<br />
+ if (new_connection != -1) break;<br />
+ </indent>
+ }<br />
+ </indent>
+ }<br />
+ if (new_connection != -1) break;<br />
+ </indent>
+ }<br />
+ process the new_connection;<br />
+ </indent>
}
- rc = select (last_socket+1, &accept_fds, NULL, NULL, NULL);
- if (rc < 1) continue;
- new_connection = -1;
- for (i = first_socket; i <= last_socket; ++i) {
- if (FD_ISSET (i, &accept_fds)) {
- new_connection = accept (i, NULL, NULL);
- if (new_connection != -1) break;
- }
- }
- if (new_connection != -1) break;
- }
- process the new_connection;
- }
-</pre></example>
+ </example>
<p>But this naive implementation has a serious starvation problem.
Recall that multiple children execute this loop at the same
@@ -484,31 +544,41 @@
entry into the inner loop. The loop looks like this
(differences highlighted):</p>
-<example><pre>
- for (;;) {
- <strong>accept_mutex_on ();</strong>
- for (;;) {
- fd_set accept_fds;
-
- FD_ZERO (&accept_fds);
- for (i = first_socket; i <= last_socket; ++i) {
- FD_SET (i, &accept_fds);
+ <example>
+ for (;;) {<br />
+ <indent>
+ <strong>accept_mutex_on ();</strong><br />
+ for (;;) {<br />
+ <indent>
+ fd_set accept_fds;<br />
+ <br />
+ FD_ZERO (&accept_fds);<br />
+ for (i = first_socket; i <= last_socket; ++i) {<br />
+ <indent>
+ FD_SET (i, &accept_fds);<br />
+ </indent>
+ }<br />
+ rc = select (last_socket+1, &accept_fds, NULL, NULL, NULL);<br />
+ if (rc < 1) continue;<br />
+ new_connection = -1;<br />
+ for (i = first_socket; i <= last_socket; ++i) {<br />
+ <indent>
+ if (FD_ISSET (i, &accept_fds)) {<br />
+ <indent>
+ new_connection = accept (i, NULL, NULL);<br />
+ if (new_connection != -1) break;<br />
+ </indent>
+ }<br />
+ </indent>
+ }<br />
+ if (new_connection != -1) break;<br />
+ </indent>
+ }<br />
+ <strong>accept_mutex_off ();</strong><br />
+ process the new_connection;<br />
+ </indent>
}
- rc = select (last_socket+1, &accept_fds, NULL, NULL, NULL);
- if (rc < 1) continue;
- new_connection = -1;
- for (i = first_socket; i <= last_socket; ++i) {
- if (FD_ISSET (i, &accept_fds)) {
- new_connection = accept (i, NULL, NULL);
- if (new_connection != -1) break;
- }
- }
- if (new_connection != -1) break;
- }
- <strong>accept_mutex_off ();</strong>
- process the new_connection;
- }
-</pre></example>
+ </example>
<p><a id="serialize" name="serialize">The functions</a>
<code>accept_mutex_on</code> and <code>accept_mutex_off</code>
@@ -681,31 +751,39 @@
<code>http_main.c</code>). The function looks roughly like
this:</p>
-<example><pre>
- void lingering_close (int s)
- {
- char junk_buffer[2048];
-
- /* shutdown the sending side */
- shutdown (s, 1);
-
- signal (SIGALRM, lingering_death);
- alarm (30);
-
- for (;;) {
- select (s for reading, 2 second timeout);
- if (error) break;
- if (s is ready for reading) {
- if (read (s, junk_buffer, sizeof (junk_buffer)) <= 0) {
- break;
+ <example>
+ void lingering_close (int s)<br />
+ {<br />
+ <indent>
+ char junk_buffer[2048];<br />
+ <br />
+ /* shutdown the sending side */<br />
+ shutdown (s, 1);<br />
+ <br />
+ signal (SIGALRM, lingering_death);<br />
+ alarm (30);<br />
+ <br />
+ for (;;) {<br />
+ <indent>
+ select (s for reading, 2 second timeout);<br />
+ if (error) break;<br />
+ if (s is ready for reading) {<br />
+ <indent>
+ if (read (s, junk_buffer, sizeof (junk_buffer)) <= 0) {<br />
+ <indent>
+ break;<br />
+ </indent>
+ }<br />
+ /* just toss away whatever is here */<br />
+ </indent>
+ }<br />
+ </indent>
+ }<br />
+ <br />
+ close (s);<br />
+ </indent>
}
- /* just toss away whatever is here */
- }
- }
-
- close (s);
- }
-</pre></example>
+ </example>
<p>This naturally adds some expense at the end of a connection,
but it is required for a reliable implementation. As HTTP/1.1
@@ -752,7 +830,7 @@
<section>
- <title><code>DYNAMIC_MODULE_LIMIT</code></title>
+ <title>DYNAMIC_MODULE_LIMIT</title>
<p>If you have no intention of using dynamically loaded modules
(you probably don't if you're reading this and tuning your
@@ -773,7 +851,7 @@
on Solaris 8. This trace was collected using:</p>
<example>
- truss -l -p <em>httpd_child_pid</em>.
+ truss -l -p <var>httpd_child_pid</var>.
</example>
<p>The <code>-l</code> option tells truss to log the ID of the
@@ -789,10 +867,10 @@
with content negotiation look wildly different (and quite ugly
in some cases).</p>
-<example><pre>
-/67: accept(3, 0x00200BEC, 0x00200C0C, 1) (sleeping...)
-/67: accept(3, 0x00200BEC, 0x00200C0C, 1) = 9
-</pre></example>
+ <example>
+<pre>/67: accept(3, 0x00200BEC, 0x00200C0C, 1) (sleeping...)
+/67: accept(3, 0x00200BEC, 0x00200C0C, 1) = 9</pre>
+ </example>
<p>In this trace, the listener thread is running within LWP #67.</p>
@@ -800,18 +878,18 @@
particular platform, the worker MPM uses an unserialized accept by
default unless it is listening on multiple ports.</note>
-<example><pre>
-/65: lwp_park(0x00000000, 0) = 0
-/67: lwp_unpark(65, 1) = 0
-</pre></example>
+ <example>
+<pre>/65: lwp_park(0x00000000, 0) = 0
+/67: lwp_unpark(65, 1) = 0</pre>
+ </example>
<p>Upon accepting the connection, the listener thread wakes up
a worker thread to do the request processing. In this trace,
the worker thread that handles the request is mapped to LWP #65.</p>
-<example><pre>
-/65: getsockname(9, 0x00200BA4, 0x00200BC4, 1) = 0
-</pre></example>
+ <example>
+<pre>/65: getsockname(9, 0x00200BA4, 0x00200BC4, 1) = 0</pre>
+ </example>
<p>In order to implement virtual hosts, Apache needs to know
the local socket address used to accept the connection. It
@@ -821,10 +899,10 @@
are used which do not have wildcard addresses). But
no effort has yet been made to do these optimizations. </p>
-<example><pre>
-/65: brk(0x002170E8) = 0
-/65: brk(0x002190E8) = 0
-</pre></example>
+ <example>
+<pre>/65: brk(0x002170E8) = 0
+/65: brk(0x002190E8) = 0</pre>
+ </example>
<p>The <code>brk(2)</code> calls allocate memory from the heap.
It is rare to see these in a system call trace, because the httpd
@@ -834,31 +912,31 @@
call <code>malloc(3)</code> to get the blocks of raw memory
with which to create the custom memory allocators.</p>
-<example><pre>
-/65: fcntl(9, F_GETFL, 0x00000000) = 2
+ <example>
+<pre>/65: fcntl(9, F_GETFL, 0x00000000) = 2
/65: fstat64(9, 0xFAF7B818) = 0
/65: getsockopt(9, 65535, 8192, 0xFAF7B918, 0xFAF7B910, 2190656) = 0
/65: fstat64(9, 0xFAF7B818) = 0
/65: getsockopt(9, 65535, 8192, 0xFAF7B918, 0xFAF7B914, 2190656) = 0
/65: setsockopt(9, 65535, 8192, 0xFAF7B918, 4, 2190656) = 0
-/65: fcntl(9, F_SETFL, 0x00000082) = 0
-</pre></example>
+/65: fcntl(9, F_SETFL, 0x00000082) = 0</pre>
+ </example>
<p>Next, the worker thread puts the connection to the client (file
descriptor 9) in non-blocking mode. The <code>setsockopt(2)</code>
and <code>getsockopt(2)</code> calls are a side-effect of how
Solaris's libc handles <code>fcntl(2)</code> on sockets.</p>
-<example><pre>
-/65: read(9, " G E T / 1 0 k . h t m".., 8000) = 97
-</pre></example>
+ <example>
+<pre>/65: read(9, " G E T / 1 0 k . h t m".., 8000) = 97</pre>
+ </example>
<p>The worker thread reads the request from the client.</p>
-<example><pre>
-/65: stat("/var/httpd/apache/httpd-8999/htdocs/10k.html", 0xFAF7B978) = 0
-/65: open("/var/httpd/apache/httpd-8999/htdocs/10k.html", O_RDONLY) = 10
-</pre></example>
+ <example>
+<pre>/65: stat("/var/httpd/apache/httpd-8999/htdocs/10k.html", 0xFAF7B978) = 0
+/65: open("/var/httpd/apache/httpd-8999/htdocs/10k.html", O_RDONLY) = 10</pre>
+ </example>
<p>This httpd has been configured with <code>Options FollowSymLinks</code>
and <code>AllowOverride None</code>. Thus it doesn't need to
@@ -867,9 +945,9 @@
It simply calls <code>stat(2)</code> to verify that the file:
1) exists, and 2) is a regular file, not a directory.</p>
-<example><pre>
-/65: sendfilev(0, 9, 0x00200F90, 2, 0xFAF7B53C) = 10269
-</pre></example>
+ <example>
+<pre>/65: sendfilev(0, 9, 0x00200F90, 2, 0xFAF7B53C) = 10269</pre>
+ </example>
<p>In this example, the httpd is able to send the HTTP response
header and the requested file with a single <code>sendfilev(2)</code>
@@ -878,9 +956,9 @@
<code>writev(2)</code> call to send the headers before calling
<code>sendfile(2)</code>.</p>
-<example><pre>
-/65: write(4, " 1 2 7 . 0 . 0 . 1 - ".., 78) = 78
-</pre></example>
+ <example>
+<pre>/65: write(4, " 1 2 7 . 0 . 0 . 1 - ".., 78) = 78</pre>
+ </example>
<p>This <code>write(2)</code> call records the request in the
access log. Note that one thing missing from this trace is a
@@ -890,26 +968,26 @@
optimized implementation that doesn't require as much overhead
as a typical system call.</p>
-<example><pre>
-/65: shutdown(9, 1, 1) = 0
+ <example>
+<pre>/65: shutdown(9, 1, 1) = 0
/65: poll(0xFAF7B980, 1, 2000) = 1
/65: read(9, 0xFAF7BC20, 512) = 0
-/65: close(9) = 0
-</pre></example>
+/65: close(9) = 0</pre>
+ </example>
<p>The worker thread does a lingering close of the connection.</p>
-<example><pre>
-/65: close(10) = 0
-/65: lwp_park(0x00000000, 0) (sleeping...)
-</pre></example>
+ <example>
+<pre>/65: close(10) = 0
+/65: lwp_park(0x00000000, 0) (sleeping...)</pre>
+ </example>
<p>Finally the worker thread closes the file that it has just delivered
and blocks until the listener assigns it another connection.</p>
-<example><pre>
-/67: accept(3, 0x001FEB74, 0x001FEB94, 1) (sleeping...)
-</pre></example>
+ <example>
+<pre>/67: accept(3, 0x001FEB74, 0x001FEB94, 1) (sleeping...)</pre>
+ </example>
<p>Meanwhile, the listener thread is able to accept another connection
as soon as it has dispatched this connection to a worker thread (subject
diff --git a/docs/manual/misc/rewriteguide.html.en b/docs/manual/misc/rewriteguide.html.en
index 191a7d7..fc93055 100644
--- a/docs/manual/misc/rewriteguide.html.en
+++ b/docs/manual/misc/rewriteguide.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>URL Rewriting Guide - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Miscellaneous Documentation</a></div><div id="page-content"><div id="preamble"><h1>URL Rewriting Guide</h1>
+ -->
+<title>URL Rewriting Guide - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Miscellaneous Documentation</a></div><div id="page-content"><div id="preamble"><h1>URL Rewriting Guide</h1>
<div class="note">
<p>Originally written by<br />
<cite>Ralf S. Engelschall <rse@apache.org></cite><br />
@@ -18,7 +30,17 @@
with in practice. I give detailed descriptions on how to
solve each problem by configuring URL rewriting rulesets.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#ToC1">Introduction to <code>mod_rewrite</code></a></li><li><img alt="" src="../images/down.gif" /> <a href="#ToC2">Practical Solutions</a></li><li><img alt="" src="../images/down.gif" /> <a href="#url">URL Layout</a></li><li><img alt="" src="../images/down.gif" /> <a href="#content">Content Handling</a></li><li><img alt="" src="../images/down.gif" /> <a href="#access">Access Restriction</a></li><li><img alt="" src="../images/down.gif" /> <a href="#other">Other</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="ToC1" id="ToC1">Introduction to <code>mod_rewrite</code></a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#ToC1">Introduction to <code>mod_rewrite</code></a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ToC2">Practical Solutions</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#url">URL Layout</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#content">Content Handling</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#access">Access Restriction</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#other">Other</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="ToC1" id="ToC1">Introduction to <code>mod_rewrite</code></a></h2>
@@ -39,7 +61,9 @@
avoid the first case by presenting already invented solutions
to you.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="ToC2" id="ToC2">Practical Solutions</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ToC2" id="ToC2">Practical Solutions</a></h2>
@@ -58,7 +82,9 @@
particular ruleset really does before you use it. It
avoid problems.</div>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="url" id="url">URL Layout</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="url" id="url">URL Layout</a></h2>
@@ -960,7 +986,9 @@
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="content" id="content">Content Handling</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="content" id="content">Content Handling</a></h2>
@@ -1857,7 +1885,9 @@
- </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">Access Restriction</a></h2>
+ </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">Access Restriction</a></h2>
@@ -2041,7 +2071,7 @@
instance a authentication which checks for a set of
explicitly configured users. Only these should receive
access and without explicit prompting (which would occur
- when using the Basic Auth via <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code>).</p>
+ when using the Basic Auth via <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code>).</p>
</dd>
<dt>Solution:</dt>
@@ -2113,7 +2143,9 @@
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="other" id="other">Other</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="other" id="other">Other</a></h2>
@@ -2171,4 +2203,8 @@
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/rewriteguide.xml b/docs/manual/misc/rewriteguide.xml
index 819ff2f..b80f75f 100644
--- a/docs/manual/misc/rewriteguide.xml
+++ b/docs/manual/misc/rewriteguide.xml
@@ -2062,7 +2062,7 @@
instance a authentication which checks for a set of
explicitly configured users. Only these should receive
access and without explicit prompting (which would occur
- when using the Basic Auth via <module>mod_auth_basic</module>).</p>
+ when using the Basic Auth via <module>mod_auth</module>).</p>
</dd>
<dt>Solution:</dt>
diff --git a/docs/manual/misc/security_tips.html.en b/docs/manual/misc/security_tips.html.en
index 009edd9..ad585f9 100644
--- a/docs/manual/misc/security_tips.html.en
+++ b/docs/manual/misc/security_tips.html.en
@@ -4,10 +4,57 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Security Tips - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Miscellaneous Documentation</a></div><div id="page-content"><div id="preamble"><h1>Security Tips</h1>
+ -->
+<title>Security Tips - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Miscellaneous Documentation</a></div><div id="page-content"><div id="preamble"><h1>Security Tips</h1>
<p>Some hints and tips on security issues in setting up a web server.
Some of the suggestions will be general, others specific to Apache.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#serverroot">Permissions on ServerRoot Directories</a></li><li><img alt="" src="../images/down.gif" /> <a href="#ssi">Server Side Includes</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cgi">CGI in General</a></li><li><img alt="" src="../images/down.gif" /> <a href="#nsaliasedcgi">Non Script Aliased CGI</a></li><li><img alt="" src="../images/down.gif" /> <a href="#saliasedcgi">Script Aliased CGI</a></li><li><img alt="" src="../images/down.gif" /> <a href="#dynamic">Other sources of dynamic content</a></li><li><img alt="" src="../images/down.gif" /> <a href="#systemsettings">Protecting System Settings</a></li><li><img alt="" src="../images/down.gif" /> <a href="#protectserverfiles">Protect Server Files by Default</a></li><li><img alt="" src="../images/down.gif" /> <a href="#watchyourlogs">Watching Your Logs</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="serverroot" id="serverroot">Permissions on ServerRoot Directories</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#uptodate">Keep up to Date</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serverroot">Permissions on ServerRoot Directories</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ssi">Server Side Includes</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cgi">CGI in General</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#nsaliasedcgi">Non Script Aliased CGI</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#saliasedcgi">Script Aliased CGI</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#dynamic">Other sources of dynamic content</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#systemsettings">Protecting System Settings</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#protectserverfiles">Protect Server Files by Default</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#watchyourlogs">Watching Your Logs</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="uptodate" id="uptodate">Keep up to Date</a></h2>
+
+ <p>The Apache HTTP Server has a good record for security and a
+ developer community highly concerned about security issues. But
+ it is inevitable that some problems -- small or large -- will be
+ discovered in software after it is released. For this reason, it
+ is crucial to keep aware of updates to the software. If you have
+ obtained your version of the HTTP Server directly from Apache, we
+ highly recommend you subscribe to the <a href="http://httpd.apache.org/lists.html#http-announce">Apache
+ HTTP Server Announcements List</a> where you can keep informed of
+ new releases and security updates. Similar services are available
+ from most third-party distributors of Apache software.</p>
+
+ <p>Of course, most times that a web server is compromised, it is
+ not because of problems in the HTTP Server code. Rather, it comes
+ from problems in add-on code, CGI scripts, or the underlying
+ Operating System. You must therefore stay aware of problems and
+ updates with all the software on your system.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="serverroot" id="serverroot">Permissions on ServerRoot Directories</a></h2>
@@ -54,7 +101,9 @@
themselves are writeable (by a non-root user), then someone may be
able to overwrite the log itself with bogus data.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="ssi" id="ssi">Server Side Includes</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ssi" id="ssi">Server Side Includes</a></h2>
@@ -88,10 +137,12 @@
<p>Another solution is to disable the ability to run scripts and
programs from SSI pages. To do this replace <code>Includes</code>
with <code>IncludesNOEXEC</code> in the <code class="directive"><a href="../mod/core.html#options">Options</a></code> directive. Note that users may
- still use >--#include virtual="..." --< to execute CGI scripts if
+ still use <--#include virtual="..." --> to execute CGI scripts if
these scripts are in directories desginated by a <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> directive.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="cgi" id="cgi">CGI in General</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cgi" id="cgi">CGI in General</a></h2>
@@ -111,12 +162,14 @@
popular way of doing this is with
<a href="http://cgiwrap.unixtools.org/">CGIWrap</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="nsaliasedcgi" id="nsaliasedcgi">Non Script Aliased CGI</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="nsaliasedcgi" id="nsaliasedcgi">Non Script Aliased CGI</a></h2>
<p>Allowing users to execute CGI scripts in any directory should only be
- considered if;</p>
+ considered if:</p>
<ul>
<li>You trust your users not to write scripts which will deliberately
@@ -126,7 +179,9 @@
<li>You have no users, and nobody ever visits your server.</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="saliasedcgi" id="saliasedcgi">Script Aliased CGI</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="saliasedcgi" id="saliasedcgi">Script Aliased CGI</a></h2>
@@ -139,7 +194,9 @@
<p>Most sites choose this option over the non script aliased CGI
approach.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="dynamic" id="dynamic">Other sources of dynamic content</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="dynamic" id="dynamic">Other sources of dynamic content</a></h2>
@@ -151,7 +208,9 @@
server user can. Some scripting engines may provide restrictions, but
it is better to be safe and assume not.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="systemsettings" id="systemsettings">Protecting System Settings</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="systemsettings" id="systemsettings">Protecting System Settings</a></h2>
@@ -170,7 +229,9 @@
<p>This prevents the use of <code>.htaccess</code> files in all
directories apart from those specifically 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="protectserverfiles" id="protectserverfiles">Protect Server Files by Default</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="protectserverfiles" id="protectserverfiles">Protect Server Files by Default</a></h2>
@@ -226,7 +287,9 @@
UserDir disabled root
</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="watchyourlogs" id="watchyourlogs">Watching Your Logs</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="watchyourlogs" id="watchyourlogs">Watching Your Logs</a></h2>
@@ -272,4 +335,8 @@
<Files>
</code></p></div>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/security_tips.xml b/docs/manual/misc/security_tips.xml
index 0c6fcac..c21726f 100644
--- a/docs/manual/misc/security_tips.xml
+++ b/docs/manual/misc/security_tips.xml
@@ -13,6 +13,28 @@
Some of the suggestions will be general, others specific to Apache.</p>
</summary>
+ <section id="uptodate"><title>Keep up to Date</title>
+
+ <p>The Apache HTTP Server has a good record for security and a
+ developer community highly concerned about security issues. But
+ it is inevitable that some problems -- small or large -- will be
+ discovered in software after it is released. For this reason, it
+ is crucial to keep aware of updates to the software. If you have
+ obtained your version of the HTTP Server directly from Apache, we
+ highly recommend you subscribe to the <a
+ href="http://httpd.apache.org/lists.html#http-announce">Apache
+ HTTP Server Announcements List</a> where you can keep informed of
+ new releases and security updates. Similar services are available
+ from most third-party distributors of Apache software.</p>
+
+ <p>Of course, most times that a web server is compromised, it is
+ not because of problems in the HTTP Server code. Rather, it comes
+ from problems in add-on code, CGI scripts, or the underlying
+ Operating System. You must therefore stay aware of problems and
+ updates with all the software on your system.</p>
+
+ </section>
+
<section id="serverroot">
<title>Permissions on ServerRoot Directories</title>
@@ -98,7 +120,7 @@
programs from SSI pages. To do this replace <code>Includes</code>
with <code>IncludesNOEXEC</code> in the <directive
module="core">Options</directive> directive. Note that users may
- still use >--#include virtual="..." --< to execute CGI scripts if
+ still use <--#include virtual="..." --> to execute CGI scripts if
these scripts are in directories desginated by a <directive
module="mod_alias">ScriptAlias</directive> directive.</p>
@@ -131,7 +153,7 @@
<title>Non Script Aliased CGI</title>
<p>Allowing users to execute CGI scripts in any directory should only be
- considered if;</p>
+ considered if:</p>
<ul>
<li>You trust your users not to write scripts which will deliberately
diff --git a/docs/manual/mod/beos.html.en b/docs/manual/mod/beos.html.en
new file mode 100644
index 0000000..dd0bae1
--- /dev/null
+++ b/docs/manual/mod/beos.html.en
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>beos - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM beos</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>This Multi-Processing Module is optimized for BeOS.</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mpm_beos_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>beos.c</td></tr></table>
+<h3>Summary</h3>
+
+ <p>This Multi-Processing Module (MPM) is the default for BeOS. It uses
+ a single control process creates threads to handle requests.</p>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxclients">MaxClients</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxrequestsperthread">MaxRequestsPerThread</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startthreads">StartThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><a href="../bind.html">Setting which addresses and ports Apache
+uses</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="MaxRequestsPerThread" id="MaxRequestsPerThread">MaxRequestsPerThread</a> <a name="maxrequestsperthread" id="maxrequestsperthread">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limit on the number of requests that an individual thread
+will handle during its life</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MaxRequestsPerThread <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MaxRequestsPerThread 0</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>beos</td></tr>
+</table>
+ <p>The <code class="directive">MaxRequestsPerThread</code> directive sets
+ the limit on the number of requests that an individual server thread
+ will handle. After <code class="directive">MaxRequestsPerThread</code>
+ requests, the thread will die. If <code class="directive">MaxRequestsPerThread</code> is <code>0</code>, then the thread
+ will never expire.</p>
+
+ <p>Setting <code class="directive">MaxRequestsPerThread</code> to a
+ non-zero limit has two beneficial effects:</p>
+
+ <ul>
+ <li>it limits the amount of memory that a thread can consume
+ by (accidental) memory leakage;</li>
+
+ <li>by giving threads a finite lifetime, it helps reduce
+ the number of threads when the server load reduces.</li>
+ </ul>
+
+ <div class="note"><h3>Note:</h3>
+ <p>For <code class="directive"><a href="../mod/core.html#keepalive">KeepAlive</a></code> requests, only
+ the first request is counted towards this limit. In effect, it
+ changes the behavior to limit the number of <em>connections</em>
+ per thread.</p>
+ </div>
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/beos.xml b/docs/manual/mod/beos.xml
new file mode 100644
index 0000000..4d824a8
--- /dev/null
+++ b/docs/manual/mod/beos.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
+<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
+<modulesynopsis>
+
+<name>beos</name>
+<description>This Multi-Processing Module is optimized for BeOS.</description>
+<status>MPM</status>
+<sourcefile>beos.c</sourcefile>
+<identifier>mpm_beos_module</identifier>
+
+<summary>
+ <p>This Multi-Processing Module (MPM) is the default for BeOS. It uses
+ a single control process creates threads to handle requests.</p>
+</summary>
+<seealso><a href="../bind.html">Setting which addresses and ports Apache
+uses</a></seealso>
+
+<directivesynopsis location="mpm_common"><name>User</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>Group</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>Listen</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ListenBacklog</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>StartThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MinSpareThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxSpareThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxClients</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>CoreDumpDirectory</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxMemFree</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>PidFile</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>MaxRequestsPerThread</name>
+<description>Limit on the number of requests that an individual thread
+will handle during its life</description>
+<syntax>MaxRequestsPerThread <var>number</var></syntax>
+<default>MaxRequestsPerThread 0</default>
+<contextlist><context>server config</context></contextlist>
+
+<usage>
+ <p>The <directive>MaxRequestsPerThread</directive> directive sets
+ the limit on the number of requests that an individual server thread
+ will handle. After <directive>MaxRequestsPerThread</directive>
+ requests, the thread will die. If <directive
+ >MaxRequestsPerThread</directive> is <code>0</code>, then the thread
+ will never expire.</p>
+
+ <p>Setting <directive>MaxRequestsPerThread</directive> to a
+ non-zero limit has two beneficial effects:</p>
+
+ <ul>
+ <li>it limits the amount of memory that a thread can consume
+ by (accidental) memory leakage;</li>
+
+ <li>by giving threads a finite lifetime, it helps reduce
+ the number of threads when the server load reduces.</li>
+ </ul>
+
+ <note><title>Note:</title>
+ <p>For <directive module="core">KeepAlive</directive> requests, only
+ the first request is counted towards this limit. In effect, it
+ changes the behavior to limit the number of <em>connections</em>
+ per thread.</p>
+ </note>
+</usage>
+</directivesynopsis>
+
+</modulesynopsis>
+
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 7c99845..df73d96 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -4,10 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>core - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module core</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Core Apache HTTP Server features that are always
-available</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Core</td></tr></table></div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#acceptpathinfo">AcceptPathInfo</a></li>
+ -->
+<title>core - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Core Features</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Core Apache HTTP Server features that are always
+available</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Core</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#acceptpathinfo">AcceptPathInfo</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#accessfilename">AccessFileName</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#adddefaultcharset">AddDefaultCharset</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#addoutputfilterbytype">AddOutputFilterByType</a></li>
@@ -67,57 +86,64 @@
<li><img alt="" src="../images/down.gif" /> <a href="#timeout">TimeOut</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#usecanonicalname">UseCanonicalName</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#virtualhost"><VirtualHost></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="AcceptPathInfo" id="AcceptPathInfo">AcceptPathInfo</a> <a name="acceptpathinfo" id="acceptpathinfo">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Resources accept trailing pathname information</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AcceptPathInfo On|Off|Default</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AcceptPathInfo Default</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0.30 and later</td></tr></table>
+</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="AcceptPathInfo" id="AcceptPathInfo">AcceptPathInfo</a> <a name="acceptpathinfo" id="acceptpathinfo">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Resources accept trailing pathname information</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AcceptPathInfo On|Off|Default</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AcceptPathInfo Default</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.0.30 and later</td></tr>
+</table>
<p>This directive controls whether requests that contain trailing
pathname information that follows an actual filename (or
non-existent file in an existing directory) will be accepted or
rejected. The trailing pathname information can be made
- available to scripts in the PATH_INFO environment variable.</p>
+ available to scripts in the <code>PATH_INFO</code> environment
+ variable.</p>
<p>For example, assume the location <code>/test/</code> points to
a directory that contains only the single file
<code>here.html</code>. Then requests for
<code>/test/here.html/more</code> and
<code>/test/nothere.html/more</code> both collect
- <code>/more</code> as PATH_INFO.</p>
+ <code>/more</code> as <code>PATH_INFO</code>.</p>
<p>The three possible arguments for the
<code class="directive">AcceptPathInfo</code> directive are:</p>
<dl>
- <dt><code>off</code></dt><dd>A request will only be accepted if it
+ <dt><code>Off</code></dt><dd>A request will only be accepted if it
maps to a literal path that exists. Therefore a request with
trailing pathname information after the true filename such as
<code>/test/here.html/more</code> in the above example will return
a 404 NOT FOUND error.</dd>
- <dt><code>on</code></dt><dd>A request will be accepted if a
+ <dt><code>On</code></dt><dd>A request will be accepted if a
leading path component maps to a file that exists. The above
example <code>/test/here.html/more</code> will be accepted if
<code>/test/here.html</code> maps to a valid file.</dd>
-
- <dt><code>default</code></dt><dd>The treatment of requests with
+
+ <dt><code>Default</code></dt><dd>The treatment of requests with
trailing pathname information is determined by the <a href="../handler.html">handler</a> responsible for the request.
- The core handler for normal files defaults to rejecting PATH_INFO.
- Handlers that serve scripts, such as <a href="mod_cgi.html">cgi-script</a> and <a href="mod_isapi.html">isapi-isa</a>, generally accept PATH_INFO by
- default.</dd>
+ The core handler for normal files defaults to rejecting
+ <code>PATH_INFO</code>. Handlers that serve scripts, such as <a href="mod_cgi.html">cgi-script</a> and <a href="mod_isapi.html">isapi-isa</a>, generally accept
+ <code>PATH_INFO</code> by default.</dd>
</dl>
<p>The primary purpose of the <code>AcceptPathInfo</code>
directive is to allow you to override the handler's choice of
- accepting or rejecting PATH_INFO. This override is required, for
- example, when you use a <a href="../filter.html">filter</a>, such
+ accepting or rejecting <code>PATH_INFO</code>. This override is required,
+ for example, when you use a <a href="../filter.html">filter</a>, such
as <a href="mod_include.html">INCLUDES</a>, to generate content
- based on PATH_INFO. The core handler would usually reject the
- request, so you can use the following configuration to enable
+ based on <code>PATH_INFO</code>. The core handler would usually reject
+ the request, so you can use the following configuration to enable
such a script:</p>
<div class="example"><p><code>
@@ -125,19 +151,24 @@
<span class="indent">
Options +Includes<br />
SetOutputFilter INCLUDES<br />
- AcceptPathInfo on<br />
+ AcceptPathInfo On<br />
</span>
</Files>
</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="AccessFileName" id="AccessFileName">AccessFileName</a> <a name="accessfilename" id="accessfilename">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Name of the distributed configuration file</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AccessFileName <var>filename</var> [<var>filename</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AccessFileName .htaccess</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
- <p>When returning a document to the client the server looks for
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AccessFileName" id="AccessFileName">AccessFileName</a> <a name="accessfilename" id="accessfilename">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Name of the distributed configuration file</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AccessFileName <var>filename</var> [<var>filename</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AccessFileName .htaccess</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
+ <p>While processing a request the server looks for
the first existing configuration file from this list of names in
every directory of the path to the document, if distributed
configuration files are enabled for that directory. For
@@ -160,15 +191,26 @@
</span>
</Directory>
</code></p></div>
-<h3>See also</h3><ul><li><code class="directive"><a href="#allowoverride">AllowOverride</a></code></li><li><a href="../configuring.html">Configuration Files</a></li><li><a href="../howto/htaccess.html">.htaccess Files</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="AddDefaultCharset" id="AddDefaultCharset">AddDefaultCharset</a> <a name="adddefaultcharset" id="adddefaultcharset">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Default character set to be added for a
-response without an explicit character set</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddDefaultCharset On|Off|<var>charset</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AddDefaultCharset 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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#allowoverride">AllowOverride</a></code></li>
+<li><a href="../configuring.html">Configuration Files</a></li>
+<li><a href="../howto/htaccess.html">.htaccess Files</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="AddDefaultCharset" id="AddDefaultCharset">AddDefaultCharset</a> <a name="adddefaultcharset" id="adddefaultcharset">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Default character set to be added for a
+response without an explicit character set</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddDefaultCharset On|Off|<var>charset</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AddDefaultCharset 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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>This directive specifies the name of the character set that
will be added to any response that does not have any parameter on
the content type in the HTTP headers. This will override any
@@ -183,22 +225,28 @@
<div class="example"><p><code>
AddDefaultCharset utf-8
</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="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 MIME-type</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddOutputFilterByType <var>filter</var>[;<var>filter</var>...] <var>MIME-type</var>
-[<var>MIME-type</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0.33 and later</td></tr></table>
+
+</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 MIME-type</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddOutputFilterByType <var>filter</var>[;<var>filter</var>...]
+<var>MIME-type</var> [<var>MIME-type</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.0.33 and later</td></tr>
+</table>
<p>This directive activates a particular output <a href="../filter.html">filter</a> for a request depending on the
response MIME-type.</p>
- <p>The following example uses the DEFLATE filter, which is provided by
- <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>. It will compress all output (either static
- or dynamic) which is labeled as <code>text/html</code> or
- <code>text/plain</code> before it is sent to the client.</p>
+ <p>The following example uses the <code>DEFLATE</code> filter, which
+ is provided by <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>. It will compress all
+ output (either static or dynamic) which is labeled as
+ <code>text/html</code> or <code>text/plain</code> before it is sent
+ to the client.</p>
<div class="example"><p><code>
AddOutputFilterByType DEFLATE text/html text/plain
@@ -210,8 +258,9 @@
them.</p>
<p>The configuration below causes all script output labeled as
- <code>text/html</code> to be processed at first by the INCLUDES filter
- and then by the DEFLATE filter.</p>
+ <code>text/html</code> to be processed at first by the
+ <code>INCLUDES</code> filter and then by the <code>DEFLATE</code>
+ filter.</p>
<div class="example"><p><code>
<Location /cgi-bin/><br />
@@ -222,37 +271,58 @@
</Location>
</code></p></div>
- <div class="note"><h3>Note:</h3>
- <p>The output filters are not applied on proxy requests.</p>
- </div>
-<h3>See also</h3><ul><li><code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li><li><code class="directive"><a href="#setoutputfilter">SetOutputFilter</a></code></li><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code></li><li><a href="../filter.html">The filters documentation</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="AllowOverride" id="AllowOverride">AllowOverride</a> <a name="allowoverride" id="allowoverride">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Types of directives that are allowed in
-.htaccess files</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AllowOverride All|None|<var>directive-type</var>
-[<var>directive-type</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AllowOverride All</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
- <p>When the server finds an .htaccess file (as specified by <code class="directive"><a href="#accessfilename">AccessFileName</a></code>) it needs to know
- which directives declared in that file can override earlier
- access information.</p>
+ <div class="warning"><h3>Note</h3>
+ <p>Enabling filters with <code class="directive">AddOutputFilterByType</code>
+ may fail partially or completely in some cases. For expample, no
+ filters are applied if the content type falls back to the <code class="directive"><a href="#defaulttype">DefaultType</a></code>, even if the <code class="directive"><a href="#defaulttype">DefaultType</a></code> is the same.</p>
- <div class="note"><h3>Only available in Location sections</h3>
+ <p>However, if you want to make sure, that the filters will be
+ applied, assign the content type to a resource explicitely, for
+ example with <code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code> or
+ <code class="directive"><a href="#forcetype">ForceType</a></code>. Setting the
+ content type within a (non-nph) CGI script is also safe.</p>
+
+ <p>The by-type output filters are never applied on proxy requests.</p>
+ </div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li>
+<li><code class="directive"><a href="#setoutputfilter">SetOutputFilter</a></code></li>
+<li><a href="../filter.html">filters</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="AllowOverride" id="AllowOverride">AllowOverride</a> <a name="allowoverride" id="allowoverride">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Types of directives that are allowed in
+.htaccess files</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AllowOverride All|None|<var>directive-type</var>
+[<var>directive-type</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AllowOverride All</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
+ <p>When the server finds an <code>.htaccess</code> file (as
+ specified by <code class="directive"><a href="#accessfilename">AccessFileName</a></code>)
+ it needs to know which directives declared in that file can override
+ earlier access information.</p>
+
+ <div class="note"><h3>Only available in <Directory> sections</h3>
<code class="directive">AllowOverride</code> is valid only in
- <code class="directive"><a href="#directory"><Directory></a></code>
- sections, not in <code class="directive"><a href="#location"><Location></a></code> or <code class="directive"><a href="#files"><Files></a></code> sections, as implied by the
- <strong>Context</strong> section above.
+ <code class="directive"><a href="#directory"><Directory></a></code>
+ sections, not in <code class="directive"><a href="#location"><Location></a></code> or <code class="directive"><a href="#files"><Files></a></code> sections.
</div>
<p>When this directive is set to <code>None</code>, then
- .htaccess files are completely ignored. In this case, the
- server will not even attempt to read .htaccess files in the
- filesystem.</p>
+ <a href="#accessfilename">.htaccess</a> files are completely ignored.
+ In this case, the server will not even attempt to read
+ <code>.htaccess</code> files in the filesystem.</p>
<p>When this directive is set to <code>All</code>, then any
directive which has the .htaccess <a href="directive-dict.html#Context">Context</a> is allowed in
- .htaccess files.</p>
+ <code>.htaccess</code> files.</p>
<p>The <var>directive-type</var> can be one of the following
groupings of directives.</p>
@@ -262,17 +332,17 @@
<dd>
- Allow use of the authorization directives (<code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code>,
- <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>,
- <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code>,
- <code class="directive"><a href="#authname">AuthName</a></code>,
- <code class="directive"><a href="#authtype">AuthType</a></code>, <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>, <code class="directive"><a href="#require">Require</a></code>, <em>etc.</em>).</dd>
+ Allow use of the authorization directives (<code class="directive"><a href="../mod/mod_auth_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code>,
+ <code class="directive"><a href="../mod/mod_auth_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>,
+ <code class="directive"><a href="../mod/mod_auth.html#authgroupfile">AuthGroupFile</a></code>,
+ <code class="directive"><a href="#authname">AuthName</a></code>,
+ <code class="directive"><a href="#authtype">AuthType</a></code>, <code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code>, <code class="directive"><a href="#require">Require</a></code>, <em>etc.</em>).</dd>
<dt>FileInfo</dt>
<dd>
Allow use of the directives controlling document types (<code class="directive"><a href="#defaulttype">DefaultType</a></code>, <code class="directive"><a href="#errordocument">ErrorDocument</a></code>, <code class="directive"><a href="#forcetype">ForceType</a></code>, <code class="directive"><a href="../mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code>,
- <code class="directive"><a href="#sethandler">SetHandler</a></code>, <code class="directive"><a href="#setinputfilter">SetInputFilter</a></code>, <code class="directive"><a href="#setoutputfilter">SetOutputFilter</a></code>, and
+ <code class="directive"><a href="#sethandler">SetHandler</a></code>, <code class="directive"><a href="#setinputfilter">SetInputFilter</a></code>, <code class="directive"><a href="#setoutputfilter">SetOutputFilter</a></code>, and
<code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> Add* and Remove*
directives, <em>etc.</em>).</dd>
@@ -289,7 +359,7 @@
<dt>Limit</dt>
<dd>
- Allow use of the directives controlling host access (<code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code>, <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> and <code class="directive"><a href="../mod/mod_authz_host.html#order">Order</a></code>).</dd>
+ Allow use of the directives controlling host access (<code class="directive"><a href="../mod/mod_access.html#allow">Allow</a></code>, <code class="directive"><a href="../mod/mod_access.html#deny">Deny</a></code> and <code class="directive"><a href="../mod/mod_access.html#order">Order</a></code>).</dd>
<dt>Options</dt>
@@ -304,22 +374,33 @@
<div class="example"><p><code>
AllowOverride AuthConfig Indexes
</code></p></div>
-<h3>See also</h3><ul><li><code class="directive"><a href="#accessfilename">AccessFileName</a></code></li><li><a href="../configuring.html">Configuration Files</a></li><li><a href="../howto/htaccess.html">.htaccess Files</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="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
-authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthName <var>auth-domain</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#Override">Override:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#accessfilename">AccessFileName</a></code></li>
+<li><a href="../configuring.html">Configuration Files</a></li>
+<li><a href="../howto/htaccess.html">.htaccess Files</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="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
+authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthName <var>auth-domain</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#Override">Override:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>This directive sets the name of the authorization realm for a
directory. This realm is given to the client so that the user
knows which username and password to send.
<code class="directive">AuthName</code> takes a single argument; if the
realm name contains spaces, it must be enclosed in quotation
marks. It must be accompanied by <code class="directive"><a href="#authtype">AuthType</a></code> and <code class="directive"><a href="#require">Require</a></code> directives, and directives such
- as <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> and
- <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> to
+ as <code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code> and
+ <code class="directive"><a href="../mod/mod_auth.html#authgroupfile">AuthGroupFile</a></code> to
work.</p>
<p>For example:</p>
@@ -330,45 +411,70 @@
<p>The string provided for the <code>AuthName</code> is what will
appear in the password dialog provided by most browsers.</p>
-<h3>See also</h3><ul><li><a href="../howto/auth.html">Authentication, Authorization, 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="directive-section"><h2><a name="AuthType" id="AuthType">AuthType</a> <a name="authtype" id="authtype">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Type of user authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthType Basic|Digest</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../howto/auth.html">Authentication, Authorization, 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="directive-section"><h2><a name="AuthType" id="AuthType">AuthType</a> <a name="authtype" id="authtype">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Type of user authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthType Basic|Digest</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>This directive selects the type of user authentication for a
directory. Only <code>Basic</code> and <code>Digest</code> are
- currently implemented.
+ currently implemented.
It must be accompanied by <code class="directive"><a href="#authname">AuthName</a></code> and <code class="directive"><a href="#require">Require</a></code> directives, and directives such
- as <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> and
- <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> to
+ as <code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code> and
+ <code class="directive"><a href="../mod/mod_auth.html#authgroupfile">AuthGroupFile</a></code> to
work.</p>
-<h3>See also</h3><ul><li><a href="../howto/auth.html">Authentication, Authorization,
-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="directive-section"><h2><a name="CGIMapExtension" id="CGIMapExtension">CGIMapExtension</a> <a name="cgimapextension" id="cgimapextension">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Technique for locating the interpreter for CGI
-scripts</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CGIMapExtension cgi-path .extension</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>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>NetWare only</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../howto/auth.html">Authentication, Authorization,
+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="directive-section"><h2><a name="CGIMapExtension" id="CGIMapExtension">CGIMapExtension</a> <a name="cgimapextension" id="cgimapextension">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Technique for locating the interpreter for CGI
+scripts</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CGIMapExtension <var>cgi-path</var> <var>.extension</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>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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>NetWare only</td></tr>
+</table>
<p>This directive is used to control how Apache finds the
- interpreter used to run CGI scripts. For example, setting <code>CGIMapExtension sys:\foo.nlm .foo</code> will
- cause all CGI script files with a .foo extension to be passed to the FOO interpreter.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ContentDigest" id="ContentDigest">ContentDigest</a> <a name="contentdigest" id="contentdigest">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enables the generation of Content-MD5 HTTP Response
-headers</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ContentDigest on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ContentDigest 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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+ interpreter used to run CGI scripts. For example, setting
+ <code>CGIMapExtension sys:\foo.nlm .foo</code> will
+ cause all CGI script files with a <code>.foo</code> extension to
+ be passed to the FOO interpreter.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ContentDigest" id="ContentDigest">ContentDigest</a> <a name="contentdigest" id="contentdigest">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables the generation of Content-MD5 HTTP Response
+headers</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ContentDigest On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ContentDigest 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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>This directive enables the generation of
<code>Content-MD5</code> headers as defined in RFC1864
respectively RFC2068.</p>
@@ -392,18 +498,23 @@
values are not cached).</p>
<p><code>Content-MD5</code> is only sent for documents served
- by the core, and not by any module. For example, SSI documents,
- output from CGI scripts, and byte range responses do not have
- this header.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="DefaultType" id="DefaultType">DefaultType</a> <a name="defaulttype" id="defaulttype">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>MIME content-type that will be sent if the
-server cannot determine a type in any other way</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>DefaultType <var>MIME-type</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>DefaultType text/plain</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+ by the <code class="module"><a href="../mod/core.html">core</a></code>, and not by any module. For example,
+ SSI documents, output from CGI scripts, and byte range responses
+ do not have this header.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DefaultType" id="DefaultType">DefaultType</a> <a name="defaulttype" id="defaulttype">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>MIME content-type that will be sent if the
+server cannot determine a type in any other way</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DefaultType <var>MIME-type</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DefaultType text/plain</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>There will be times when the server is asked to provide a
document whose type cannot be determined by its MIME types
mappings.</p>
@@ -417,30 +528,35 @@
</code></p></div>
<p>would be appropriate for a directory which contained many gif
- images with filenames missing the .gif extension.</p>
+ images with filenames missing the <code>.gif</code> extension.</p>
<p>Note that unlike <code class="directive"><a href="#forcetype">ForceType</a></code>, this directive is only
provides the default mime-type. All other mime-type definitions,
including filename extensions, that might identify the media type
- will override this 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="Directory" id="Directory"><Directory></a> <a name="directory" id="directory">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enclose a group of directives that apply only to the
-named file-system directory and sub-directories</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><Directory <var>directory-path</var>>
-... </Directory></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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+ will override this 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="Directory" id="Directory"><Directory></a> <a name="directory" id="directory">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enclose a group of directives that apply only to the
+named file-system directory and sub-directories</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><Directory <var>directory-path</var>>
+... </Directory></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p><code class="directive"><Directory></code> and
<code></Directory></code> are used to enclose a group of
directives that will apply only to the named directory and
sub-directories of that directory. Any directive that is allowed
in a directory context may be used. <var>Directory-path</var> is
either the full path to a directory, or a wild-card string using
- Unix shell-style matching. In a wild-card string, `?' matches any
- single character, and `*' matches any sequences of characters.
- You may also use `[]' character ranges. None of the wildcards
- match a `/' character, so <code><Directory
+ Unix shell-style matching. In a wild-card string, <code>?</code> matches
+ any single character, and <code>*</code> matches any sequences of
+ characters. You may also use <code>[]</code> character ranges. None
+ of the wildcards match a `/' character, so <code><Directory
/*/public_html></code> will not match
<code>/home/user/public_html</code>, but <code><Directory
/home/*/public_html></code> will match. Example:</p>
@@ -457,8 +573,8 @@
<p>Be careful with the <var>directory-path</var> arguments:
They have to literally match the filesystem path which Apache uses
to access the files. Directives applied to a particular
- <Directory> will not apply to files accessed from that same
- directory via a different path, such as via different symbolic
+ <code><Directory></code> will not apply to files accessed from
+ that same directory via a different path, such as via different symbolic
links.</p>
</div>
@@ -470,10 +586,10 @@
<Directory ~ "^/www/.*/[0-9]{3}">
</code></p></div>
- <p>would match directories in /www/ that consisted of three
- numbers.</p>
+ <p>would match directories in <code>/www/</code> that consisted of
+ three numbers.</p>
- <p>If multiple (non-regular expression) directory sections
+ <p>If multiple (non-regular expression) <code class="directive"><Directory></code> sections
match the directory (or its parents) containing a document,
then the directives are applied in the order of shortest match
first, interspersed with the directives from the <a href="#accessfilename">.htaccess</a> files. For example,
@@ -503,7 +619,7 @@
<li>Apply directive <code>AllowOverride FileInfo</code> (for
directory <code>/home/web</code>).</li>
- <li>Apply any FileInfo directives in
+ <li>Apply any <code>FileInfo</code> directives in
<code>/home/web/.htaccess</code></li>
</ul>
@@ -520,14 +636,14 @@
</Directory>
</code></p></div>
- <p>The regular expression section won't be considered until after
- all normal <Directory>s and <code>.htaccess</code> files
- have been applied. Then the regular expression will match on
+ <p>the regular expression section won't be considered until after
+ all normal <code><Directory></code>s and <code>.htaccess</code>
+ files have been applied. Then the regular expression will match on
<code>/home/abc/public_html/abc</code> and be applied.</p>
<p><strong>Note that the default Apache access for
- <Directory /> is <code>Allow from All</code>. This means
- that Apache will serve any file mapped from an URL. It is
+ <code><Directory /></code> is <code>Allow from All</code>.
+ This means that Apache will serve any file mapped from an URL. It is
recommended that you change this with a block such
as</strong></p>
@@ -542,24 +658,32 @@
<p><strong>and then override this for directories you
<em>want</em> accessible. See the <a href="../misc/security_tips.html">Security Tips</a> page for more
- details.</strong></p>
+ details.</strong></p>
- <p>The directory sections typically occur in
- the access.conf file, but they may appear in any configuration
- file. <code class="directive"><Directory></code> directives
+ <p>The directory sections occur in the <code>httpd.conf</code> file.
+ <code class="directive"><Directory></code> directives
cannot nest, and cannot appear in a <code class="directive"><a href="#limit"><Limit></a></code> or <code class="directive"><a href="#limitexcept"><LimitExcept></a></code> section.</p>
-<h3>See also</h3><ul><li><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
+
+<h3>See also</h3>
+<ul>
+<li><a href="../sections.html">How <Directory>,
+ <Location> and <Files> sections work</a> for an
explanation of how these different sections are combined when a
- request is received</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="DirectoryMatch" id="DirectoryMatch"><DirectoryMatch></a> <a name="directorymatch" id="directorymatch">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enclose directives that apply to
+ request is received</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="DirectoryMatch" id="DirectoryMatch"><DirectoryMatch></a> <a name="directorymatch" id="directorymatch">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enclose directives that apply to
file-system directories matching a regular expression and their
-subdirectories</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><DirectoryMatch <var>regex</var>>
-... </DirectoryMatch></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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+subdirectories</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><DirectoryMatch <var>regex</var>>
+... </DirectoryMatch></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p><code class="directive"><DirectoryMatch></code> and
<code></DirectoryMatch></code> are used to enclose a group
of directives which will apply only to the named directory and
@@ -572,22 +696,32 @@
<p>would match directories in <code>/www/</code> that consisted of three
numbers.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#directory"><Directory></a></code> for
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#directory"><Directory></a></code> for
a description of how regular expressions are mixed in with normal
-<code><Directory></code>s</li><li><a href="../sections.html">How Directory, Location and Files sections
-work</a> for an explanation of how these different sections are
-combined when a request is received</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="DocumentRoot" id="DocumentRoot">DocumentRoot</a> <a name="documentroot" id="documentroot">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Directory that forms the main document tree visible
-from the web</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>DocumentRoot <var>directory-path</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>DocumentRoot /usr/local/apache/htdocs</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
- <p>This directive sets the directory from which httpd will
- serve files. Unless matched by a directive like Alias, the
- server appends the path from the requested URL to the document
- root to make the path to the document. Example:</p>
+<code class="directive"><Directory></code>s</li>
+<li><a href="../sections.html">How <Directory>, <Location> and
+<Files> sections work</a> for an explanation of how these different
+sections are combined when a request is received</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="DocumentRoot" id="DocumentRoot">DocumentRoot</a> <a name="documentroot" id="documentroot">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directory that forms the main document tree visible
+from the web</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DocumentRoot <var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DocumentRoot /usr/local/apache/htdocs</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
+ <p>This directive sets the directory from which <code>httpd</code>
+ will serve files. Unless matched by a directive like <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>, the server appends the
+ path from the requested URL to the document root to make the
+ path to the document. Example:</p>
<div class="example"><p><code>
DocumentRoot /usr/web
@@ -599,20 +733,29 @@
<p>The <code class="directive">DocumentRoot</code> should be specified without
a trailing slash.</p>
-<h3>See also</h3><ul><li><a href="../urlmapping.html">Mapping URLs to Filesystem
-Location</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="EnableMMAP" id="EnableMMAP">EnableMMAP</a> <a name="enablemmap" id="enablemmap">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Use memory-mapping to read files during delivery</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>EnableMMAP on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>EnableMMAP 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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
- <p>This directive controls whether the httpd may use
+
+<h3>See also</h3>
+<ul>
+<li><a href="../urlmapping.html">Mapping URLs to Filesystem
+Location</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="EnableMMAP" id="EnableMMAP">EnableMMAP</a> <a name="enablemmap" id="enablemmap">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use memory-mapping to read files during delivery</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>EnableMMAP On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>EnableMMAP 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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
+ <p>This directive controls whether the <code>httpd</code> may use
memory-mapping if it needs to read the contents of a file during
delivery. By default, when the handling of a request requires
- access to the data within a file-- for example, when delivering a
- server-parsed file using <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>-- Apache
+ access to the data within a file -- for example, when delivering a
+ server-parsed file using <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> -- Apache
memory-maps the file if the OS supports it.</p>
<p>This memory-mapping sometimes yields a performance improvement.
@@ -621,17 +764,18 @@
<ul>
<li>On some multiprocessor systems, memory-mapping can reduce the
- performance of the httpd.</li>
+ performance of the <code>httpd</code>.</li>
<li>With an NFS-mounted <code class="directive"><a href="#documentroot">DocumentRoot</a></code>,
- the httpd may crash due to a segmentation fault if a file is deleted
- or truncated while the httpd has it memory-mapped.</li>
+ the <code>httpd</code> may crash due to a segmentation fault if a file
+ is deleted or truncated while the <code>httpd</code> has it
+ memory-mapped.</li>
</ul>
<p>For server configurations that are vulnerable to these problems,
you should disable memory-mapping of delivered files by specifying:</p>
<div class="example"><p><code>
- EnableMMAP off
+ EnableMMAP Off
</code></p></div>
<p>For NFS mounted files, this feature may be disabled explicitly for
@@ -639,19 +783,26 @@
<div class="example"><p><code>
<Directory "/path-to-nfs-files">
- EnableMMAP off
+ <span class="indent">
+ EnableMMAP Off
+ </span>
</Directory>
</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="EnableSendfile" id="EnableSendfile">EnableSendfile</a> <a name="enablesendfile" id="enablesendfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Use the kernel sendfile support to deliver files to the client</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>EnableSendfile on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>EnableSendfile 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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0.44 and later</td></tr></table>
- <p>This directive controls whether httpd may use the sendfile
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="EnableSendfile" id="EnableSendfile">EnableSendfile</a> <a name="enablesendfile" id="enablesendfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use the kernel sendfile support to deliver files to the client</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>EnableSendfile On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>EnableSendfile 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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0.44 and later</td></tr>
+</table>
+ <p>This directive controls whether <code>httpd</code> may use the sendfile
support from the kernel to transmit file contents to the client.
By default, when the handling of a request requires no access
to the data within a file -- for example, when delivering a
@@ -659,17 +810,17 @@
without ever reading the file if the OS supports it.</p>
<p>This sendfile mechanism avoids seperate read and send operations,
- and buffer allocations. But on some platforms or within some
- filesystems, it is better to disable this feature to avoid
+ and buffer allocations. But on some platforms or within some
+ filesystems, it is better to disable this feature to avoid
operational problems:</p>
<ul>
<li>Some platforms may have broken sendfile support that the build
system did not detect, especially if the binaries were built on
another box and moved to such a machine with broken sendfile
- support.</li>
- <li>With a network-mounted <code class="directive"><a href="#documentroot">DocumentRoot</a></code> (e.g., NFS or SMB),
- the kernel may be unable to serve the network file through
+ support.</li>
+ <li>With a network-mounted <code class="directive"><a href="#documentroot">DocumentRoot</a></code> (e.g., NFS or SMB),
+ the kernel may be unable to serve the network file through
its own cache.</li>
</ul>
@@ -677,27 +828,34 @@
you should disable this feature by specifying:</p>
<div class="example"><p><code>
- EnableSendfile off
+ EnableSendfile Off
</code></p></div>
- <p>For NFS or SMB mounted files, this feature may be disabled explicitly
+ <p>For NFS or SMB mounted files, this feature may be disabled explicitly
for the offending files by specifying:</p>
<div class="example"><p><code>
- <Directory "/path-to-nfs-files"><br />
- EnableSendfile off<br />
+ <Directory "/path-to-nfs-files">
+ <span class="indent">
+ EnableSendfile Off
+ </span>
</Directory>
</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="ErrorDocument" id="ErrorDocument">ErrorDocument</a> <a name="errordocument" id="errordocument">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>What the server will return to the client
-in case of an error</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ErrorDocument <var>error-code</var> <var>document</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Quoting syntax for text messages is different in Apache
-2.0</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ErrorDocument" id="ErrorDocument">ErrorDocument</a> <a name="errordocument" id="errordocument">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>What the server will return to the client
+in case of an error</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ErrorDocument <var>error-code</var> <var>document</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Quoting syntax for text messages is different in Apache
+2.0</td></tr>
+</table>
<p>In the event of a problem or error, Apache can be configured
to do one of four things,</p>
@@ -732,7 +890,7 @@
<p>Note that when you specify an <code class="directive">ErrorDocument</code>
that points to a remote URL (ie. anything with a method such as
- "http" in front of it), Apache will send a redirect to the
+ <code>http</code> in front of it), Apache will send a redirect to the
client to tell it where to find the document, even if the
document ends up being on the same server. This has several
implications, the most important being that the client will not
@@ -743,12 +901,12 @@
URL in an <code>ErrorDocument 401</code>, the client will not
know to prompt the user for a password since it will not
receive the 401 status code. Therefore, <strong>if you use an
- "ErrorDocument 401" directive then it must refer to a local
+ <code>ErrorDocument 401</code> directive then it must refer to a local
document.</strong></p>
- <p>Microsoft Internet Explorer (MSIE) will ignore server-generated
- error messages when they are "too small" and substitute its own
- "friendly" error messages. The size threshold varies depending on
+ <p>Microsoft Internet Explorer (MSIE) will by default ignore
+ server-generated error messages when they are "too small" and substitute
+ its own "friendly" error messages. The size threshold varies depending on
the type of error, but in general, if you make your error document
greater than 512 bytes, then MSIE will show the server-generated
error rather than masking it. More information is available in
@@ -756,24 +914,33 @@
<p>Prior to version 2.0, messages were indicated by prefixing
them with a single unmatched double quote character.</p>
-<h3>See also</h3><ul><li><a href="../custom-error.html">documentation of
- customizable responses</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="ErrorLog" id="ErrorLog">ErrorLog</a> <a name="errorlog" id="errorlog">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Location where the server will log errors</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ErrorLog logs/error_log (Unix)
-ErrorLog logs/error.log (Windows and OS/2)</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../custom-error.html">documentation of
+ customizable responses</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="ErrorLog" id="ErrorLog">ErrorLog</a> <a name="errorlog" id="errorlog">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location where the server will log errors</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ErrorLog logs/error_log (Unix)<br />
+ErrorLog logs/error.log (Windows and OS/2)</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">ErrorLog</code> directive sets the name of
the file to which the server will log any errors it encounters. If
- the <var>file-path</var> does not begin with a slash (/) then it is
- assumed to be relative to the <code class="directive"><a href="#serverroot">ServerRoot</a></code>.</p>
+ the <var>file-path</var> is not absolute (in general: does not begin
+ with a slash (/)) then it is assumed to be relative to the <code class="directive"><a href="#serverroot">ServerRoot</a></code>.</p>
<div class="example"><h3>Example</h3><p><code>
ErrorLog /var/log/httpd/error_log
</code></p></div>
-
+
<p>If the <var>file-path</var>
begins with a pipe (|) then it is assumed to be a command to spawn
to handle the error log.</p>
@@ -797,24 +964,35 @@
document for details on why your security could be compromised
if the directory where logfiles are stored is writable by
anyone other than the user that starts the server.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#loglevel">LogLevel</a></code></li><li><a href="../logs.html">Apache Log Files</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="FileETag" id="FileETag">FileETag</a> <a name="fileetag" id="fileetag">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>File attributes used to create the ETag
-HTTP response header</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>FileETag <var>component</var> ...</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>FileETag INode MTime Size</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#loglevel">LogLevel</a></code></li>
+<li><a href="../logs.html">Apache Log Files</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="FileETag" id="FileETag">FileETag</a> <a name="fileetag" id="fileetag">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File attributes used to create the ETag
+HTTP response header</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>FileETag <var>component</var> ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>FileETag INode MTime Size</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>
The <code class="directive">FileETag</code> directive configures the file
- attributes that are used to create the ETag (entity tag) response
- header field when the document is based on a file. (The ETag
- value is used in cache management to save network bandwidth.) In
- Apache 1.3.22 and earlier, the ETag value was <em>always</em> formed
- from the file's inode, size, and last-modified time (mtime). The
- FileETag directive allows you to choose which of these -- if any
- -- should be used. The recognized keywords are:
+ attributes that are used to create the <code>ETag</code> (entity
+ tag) response header field when the document is based on a file.
+ (The <code>ETag</code> value is used in cache management to save
+ network bandwidth.) In Apache 1.3.22 and earlier, the
+ <code>ETag</code> value was <em>always</em> formed
+ from the file's inode, size, and last-modified time (mtime). The
+ <code class="directive">FileETag</code> directive allows you to choose
+ which of these -- if any -- should be used. The recognized keywords are:
</p>
<dl>
@@ -828,8 +1006,8 @@
<dd>All available fields will be used. This is equivalent to:
<div class="example"><p><code>FileETag INode MTime Size</code></p></div></dd>
<dt><strong>None</strong></dt>
- <dd>If a document is file-based, no ETag field will be included in the
- response</dd>
+ <dd>If a document is file-based, no <code>ETag</code> field will be
+ included in the response</dd>
</dl>
<p>The <code>INode</code>, <code>MTime</code>, and <code>Size</code>
@@ -844,19 +1022,24 @@
the setting for that subdirectory (which will be inherited by
any sub-subdirectories that don't override it) will be equivalent to
<code>FileETag MTime Size</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="Files" id="Files"><Files></a> <a name="files" id="files">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Contains directives that apply to matched
-filenames</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><Files <var>filename</var>> ... </Files></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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Files" id="Files"><Files></a> <a name="files" id="files">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Contains directives that apply to matched
+filenames</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><Files <var>filename</var>> ... </Files></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive"><Files></code> directive
provides for access control by filename. It is comparable to the
- <code class="directive"><a href="#directory">Directory</a></code>
- directive and <code class="directive"><a href="#location">Location</a></code> directives. It should be
- matched with a <code></Files></code> directive. The
+ <code class="directive"><a href="#directory"><Directory></a></code>
+ directive and <code class="directive"><a href="#location"><Location></a></code> directives. It should be
+ matched with a <code class="directive"><Files></code> directive. The
directives given within this section will be applied to any object
with a basename (last component of filename) matching the
specified filename. <code class="directive"><Files></code>
@@ -868,8 +1051,8 @@
portion of the filesystem they apply to.</p>
<p>The <var>filename</var> argument should include a filename, or
- a wild-card string, where `?' matches any single character, and
- `*' matches any sequences of characters. Extended regular
+ a wild-card string, where <code>?</code> matches any single character,
+ and <code>*</code> matches any sequences of characters. Extended regular
expressions can also be used, with the addition of the
<code>~</code> character. For example:</p>
@@ -877,24 +1060,32 @@
<Files ~ "\.(gif|jpe?g|png)$">
</code></p></div>
- <p>would match most common Internet graphics formats. In Apache 1.3
- and later, <code class="directive"><a href="#filesmatch"><FilesMatch></a></code> is preferred, however.</p>
+ <p>would match most common Internet graphics formats. <code class="directive"><a href="#filesmatch"><FilesMatch></a></code> is preferred,
+ however.</p>
<p>Note that unlike <code class="directive"><a href="#directory"><Directory></a></code> and <code class="directive"><a href="#location"><Location></a></code> sections, <code class="directive"><Files></code> sections can be used inside
- .htaccess files. This allows users to control access to their own
- files, at a file-by-file level.</p>
+ <code>.htaccess</code> files. This allows users to control access to
+ their own files, at a file-by-file level.</p>
-<h3>See also</h3><ul><li><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
- explanation of how these different sections are combined when a
- request is received</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="FilesMatch" id="FilesMatch"><FilesMatch></a> <a name="filesmatch" id="filesmatch">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Contains directives that apply to regular-expression matched
-filenames</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><FilesMatch <var>regex</var>> ... </FilesMatch></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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../sections.html">How <Directory>, <Location>
+ and <Files> sections work</a> for an explanation of how these
+ different sections are combined when a request is received</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="FilesMatch" id="FilesMatch"><FilesMatch></a> <a name="filesmatch" id="filesmatch">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Contains directives that apply to regular-expression matched
+filenames</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><FilesMatch <var>regex</var>> ... </FilesMatch></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive"><FilesMatch></code> directive
provides for access control by filename, just as the <code class="directive"><a href="#files"><Files></a></code> directive
does. However, it accepts a regular expression. For example:</p>
@@ -904,27 +1095,35 @@
</code></p></div>
<p>would match most common Internet graphics formats.</p>
-<h3>See also</h3><ul><li><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
- explanation of how these different sections are combined when a
- request is received</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="ForceType" id="ForceType">ForceType</a> <a name="forcetype" id="forcetype">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Forces all matching files to be served with the specified
-MIME content-type</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ForceType <var>MIME-type</var>|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>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Moved to the core in Apache 2.0</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../sections.html">How <Directory>, <Location>
+ and <Files> sections work</a> for an explanation of how these
+ different sections are combined when a request is received</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="ForceType" id="ForceType">ForceType</a> <a name="forcetype" id="forcetype">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Forces all matching files to be served with the specified
+MIME content-type</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ForceType <var>MIME-type</var>|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>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Moved to the core in Apache 2.0</td></tr>
+</table>
<p>When placed into an <code>.htaccess</code> file or a
<code class="directive"><a href="#directory"><Directory></a></code>, or
- <code class="directive"><a href="#location"><Location></a></code> or
+ <code class="directive"><a href="#location"><Location></a></code> or
<code class="directive"><a href="#files"><Files></a></code>
section, this directive forces all matching files to be served
with the content type identification given by
<var>MIME-type</var>. For example, if you had a directory full of
- GIF files, but did not want to label them all with ".gif", you
- might want to use:</p>
+ GIF files, but did not want to label them all with <code>.gif</code>,
+ you might want to use:</p>
<div class="example"><p><code>
ForceType image/gif
@@ -952,49 +1151,59 @@
</span>
</Location>
</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="HostnameLookups" id="HostnameLookups">HostnameLookups</a> <a name="hostnamelookups" id="hostnamelookups">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enables DNS lookups on client IP addresses</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>HostnameLookups on|off|double</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>HostnameLookups 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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="HostnameLookups" id="HostnameLookups">HostnameLookups</a> <a name="hostnamelookups" id="hostnamelookups">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables DNS lookups on client IP addresses</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>HostnameLookups On|Off|Double</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>HostnameLookups 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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>This directive enables DNS lookups so that host names can be
logged (and passed to CGIs/SSIs in <code>REMOTE_HOST</code>).
- The value <code>double</code> refers to doing double-reverse
- DNS. That is, after a reverse lookup is performed, a forward
+ The value <code>Double</code> refers to doing double-reverse
+ DNS lookup. That is, after a reverse lookup is performed, a forward
lookup is then performed on that result. At least one of the ip
addresses in the forward lookup must match the original
address. (In "tcpwrappers" terminology this is called
<code>PARANOID</code>.)</p>
- <p>Regardless of the setting, when <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> is
+ <p>Regardless of the setting, when <code class="module"><a href="../mod/mod_access.html">mod_access</a></code> is
used for controlling access by hostname, a double reverse lookup
will be performed. This is necessary for security. Note that the
result of this double-reverse isn't generally available unless you
- set <code>HostnameLookups double</code>. For example, if only
- <code>HostnameLookups on</code> and a request is made to an object
+ set <code>HostnameLookups Double</code>. For example, if only
+ <code>HostnameLookups On</code> and a request is made to an object
that is protected by hostname restrictions, regardless of whether
the double-reverse fails or not, CGIs will still be passed the
single-reverse result in <code>REMOTE_HOST</code>.</p>
- <p>The default is off in order to save the network
+ <p>The default is <code>Off</code> in order to save the network
traffic for those sites that don't truly need the reverse
lookups done. It is also better for the end users because they
don't have to suffer the extra latency that a lookup entails.
Heavily loaded sites should leave this directive
- <code>off</code>, since DNS lookups can take considerable
- amounts of time. The utility <a href="../programs/logresolve.html">logresolve</a>, provided in
- the <var>/support</var> directory, can be used to look up host
- names from logged IP addresses offline.</p>
-</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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enables logging of the RFC1413 identity of the remote
-user</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>IdentityCheck on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>IdentityCheck 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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+ <code>Off</code>, since DNS lookups can take considerable
+ amounts of time. The utility <a href="../programs/logresolve.html">logresolve</a>, compiled by default
+ to the <code>bin</code> subdirectory of your installation directory, can
+ be used to look up host names from logged IP addresses offline.</p>
+
+</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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables logging of the RFC1413 identity of the remote
+user</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>IdentityCheck On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>IdentityCheck 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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>This directive enables RFC1413-compliant logging of the
remote user name for each connection, where the client machine
runs identd or something similar. This information is logged in
@@ -1009,15 +1218,20 @@
possibly fail and add 30 seconds of latency to each hit. So in
general this is not very useful on public servers accessible
from the Internet.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="IfDefine" id="IfDefine"><IfDefine></a> <a name="ifdefine" id="ifdefine">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Encloses directives that will be processed only
-if a test is true at startup</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><IfDefine [!]<var>parameter-name</var>> ...
- </IfDefine></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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IfDefine" id="IfDefine"><IfDefine></a> <a name="ifdefine" id="ifdefine">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Encloses directives that will be processed only
+if a test is true at startup</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><IfDefine [!]<var>parameter-name</var>> ...
+ </IfDefine></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code><IfDefine <var>test</var>>...</IfDefine>
</code> section is used to mark directives that are conditional. The
directives within an <code class="directive"><IfDefine></code>
@@ -1058,18 +1272,23 @@
</span>
</IfDefine>
</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="IfModule" id="IfModule"><IfModule></a> <a name="ifmodule" id="ifmodule">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Encloses directives that are processed conditional on the
-presence or absence of a specific module</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><IfModule [!]<var>module-name</var>> ...
- </IfModule></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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IfModule" id="IfModule"><IfModule></a> <a name="ifmodule" id="ifmodule">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Encloses directives that are processed conditional on the
+presence or absence of a specific module</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><IfModule [!]<var>module-name</var>> ...
+ </IfModule></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code><IfModule <var>test</var>>...</IfModule></code>
- section is used to mark directives that are conditional on the presence of a
- specific module. The directives within an <code class="directive"><IfModule></code> section are only processed if the <var>test</var>
+ section is used to mark directives that are conditional on the presence of
+ a specific module. The directives within an <code class="directive"><IfModule></code> section are only processed if the <var>test</var>
is true. If <var>test</var> is false, everything between the start and
end markers is ignored.</p>
@@ -1100,22 +1319,27 @@
<div class="note">This section should only be used if you need to have one
configuration file that works whether or not a specific module
- is available. In normal operation, directives need not be
+ is available. In normal operation, directives need not be
placed in <code class="directive"><IfModule></code>
sections.</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="Include" id="Include">Include</a> <a name="include" id="include">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Includes other configuration files from within
-the server configuration files</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Include <var>file-path</var>|<var>directory-path</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Wildcard matching available in 2.0.41 and later</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Include" id="Include">Include</a> <a name="include" id="include">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Includes other configuration files from within
+the server configuration files</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Include <var>file-path</var>|<var>directory-path</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Wildcard matching available in 2.0.41 and later</td></tr>
+</table>
<p>This directive allows inclusion of other configuration files
from within the server configuration files.</p>
- <p>Shell-style (fnmatch) wildcard characters can be used to
- include several files at once, in alphabetical order. In
+ <p>Shell-style (<code>fnmatch()</code>) wildcard characters can be used to
+ include several files at once, in alphabetical order. In
addition, if <code class="directive">Include</code> points to a directory,
rather than a file, Apache will read all files in that directory
and any subdirectory. But including entire directories is not
@@ -1124,7 +1348,7 @@
fail.</p>
<p>The file path specified may be a fully qualified path (i.e.
- starting with a slash), or may be relative to the
+ starting with a slash), or may be relative to the
<code class="directive"><a href="#serverroot">ServerRoot</a></code> directory.</p>
<p>Examples:</p>
@@ -1152,20 +1376,29 @@
Processing config file: /usr/local/apache2/conf/vhosts/vhost2.conf<br />
Syntax OK
</code></p></div>
-<h3>See also</h3><ul><li><a href="../programs/apachectl.html">apachectl</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="KeepAlive" id="KeepAlive">KeepAlive</a> <a name="keepalive" id="keepalive">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enables HTTP persistent connections</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>KeepAlive on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>KeepAlive On</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../programs/apachectl.html">apachectl</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="KeepAlive" id="KeepAlive">KeepAlive</a> <a name="keepalive" id="keepalive">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables HTTP persistent connections</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>KeepAlive On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>KeepAlive On</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The Keep-Alive extension to HTTP/1.0 and the persistent
connection feature of HTTP/1.1 provide long-lived HTTP sessions
which allow multiple requests to be sent over the same TCP
connection. In some cases this has been shown to result in an
almost 50% speedup in latency times for HTML documents with
- many images. To enable Keep-Alive connections in Apache 1.2 and
- later, set <code>KeepAlive On</code>.</p>
+ many images. To enable Keep-Alive connections, set
+ <code>KeepAlive On</code>.</p>
<p>For HTTP/1.0 clients, Keep-Alive connections will only be
used if they are specifically requested by a client. In
@@ -1178,14 +1411,23 @@
unless otherwise specified. If the client requests it, chunked
encoding will be used in order to send content of unknown
length over persistent connections.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#maxkeepaliverequests">MaxKeepAliveRequests</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="KeepAliveTimeout" id="KeepAliveTimeout">KeepAliveTimeout</a> <a name="keepalivetimeout" id="keepalivetimeout">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Amount of time the server will wait for subsequent
-requests on a persistent connection</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>KeepAliveTimeout <var>seconds</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>KeepAliveTimeout 15</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#maxkeepaliverequests">MaxKeepAliveRequests</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="KeepAliveTimeout" id="KeepAliveTimeout">KeepAliveTimeout</a> <a name="keepalivetimeout" id="keepalivetimeout">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Amount of time the server will wait for subsequent
+requests on a persistent connection</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>KeepAliveTimeout <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>KeepAliveTimeout 15</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The number of seconds Apache will wait for a subsequent
request before closing the connection. Once a request has been
received, the timeout value specified by the
@@ -1195,15 +1437,20 @@
may cause performance problems in heavily loaded servers. The
higher the timeout, the more server processes will be kept
occupied waiting on connections with idle clients.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="Limit" id="Limit"><Limit></a> <a name="limit" id="limit">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Restrict enclosed access controls to only certain HTTP
-methods</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><Limit <var>method</var> [<var>method</var>] ... > ...
- </Limit></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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Limit" id="Limit"><Limit></a> <a name="limit" id="limit">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Restrict enclosed access controls to only certain HTTP
+methods</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><Limit <var>method</var> [<var>method</var>] ... > ...
+ </Limit></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>Access controls are normally effective for
<strong>all</strong> access methods, and this is the usual
desired behavior. <strong>In the general case, access control
@@ -1213,10 +1460,10 @@
<p>The purpose of the <code class="directive"><Limit></code>
directive is to restrict the effect of the access controls to the
nominated HTTP methods. For all other methods, the access
- restrictions that are enclosed in the <code><Limit></code>
- bracket <strong>will have no effect</strong>. The following
- example applies the access control only to the methods POST, PUT,
- and DELETE, leaving all other methods unprotected:</p>
+ restrictions that are enclosed in the <code class="directive"><Limit></code> bracket <strong>will have no
+ effect</strong>. The following example applies the access control
+ only to the methods <code>POST</code>, <code>PUT</code>, and
+ <code>DELETE</code>, leaving all other methods unprotected:</p>
<div class="example"><p><code>
<Limit POST PUT DELETE><br />
@@ -1234,19 +1481,24 @@
<code>LOCK</code>, and <code>UNLOCK</code>. <strong>The method name is
case-sensitive.</strong> If <code>GET</code> is used it will also
restrict <code>HEAD</code> 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="LimitExcept" id="LimitExcept"><LimitExcept></a> <a name="limitexcept" id="limitexcept">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Restrict access controls to all HTTP methods
-except the named ones</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><LimitExcept <var>method</var> [<var>method</var>] ... > ...
- </LimitExcept></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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitExcept" id="LimitExcept"><LimitExcept></a> <a name="limitexcept" id="limitexcept">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Restrict access controls to all HTTP methods
+except the named ones</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><LimitExcept <var>method</var> [<var>method</var>] ... > ...
+ </LimitExcept></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p><code class="directive"><LimitExcept></code> and
<code></LimitExcept></code> are used to enclose
a group of access control directives which will then apply to any
- HTTP access method <strong>not</strong> listed in the arguments;
+ HTTP access method <strong>not</strong> listed in the arguments;
i.e., it is the opposite of a <code class="directive"><a href="#limit"><Limit></a></code> section and can be used to control
both standard and nonstandard/unrecognized methods. See the
documentation for <code class="directive"><a href="#limit"><Limit></a></code> for more details.</p>
@@ -1261,15 +1513,20 @@
<LimitExcept>
</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="LimitRequestBody" id="LimitRequestBody">LimitRequestBody</a> <a name="limitrequestbody" id="limitrequestbody">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Restricts the total size of the HTTP request body sent
-from the client</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LimitRequestBody <var>bytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LimitRequestBody 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>All</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestBody" id="LimitRequestBody">LimitRequestBody</a> <a name="limitrequestbody" id="limitrequestbody">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Restricts the total size of the HTTP request body sent
+from the client</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LimitRequestBody <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LimitRequestBody 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>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>This directive specifies the number of <var>bytes</var> from 0
(meaning unlimited) to 2147483647 (2GB) that are allowed in a
request body. The default value is defined by the compile-time
@@ -1284,10 +1541,10 @@
response instead of servicing the request. The size of a normal
request message body will vary greatly depending on the nature of
the resource and the methods allowed on that resource. CGI scripts
- typically use the message body for passing form information to the
- server. Implementations of the PUT method will require a value at
- least as large as any representation that the server wishes to
- accept for that resource.</p>
+ typically use the message body for retrieving form information.
+ Implementations of the <code>PUT</code> method will require
+ a value at least as large as any representation that the server
+ wishes to accept for that resource.</p>
<p>This directive gives the server administrator greater
control over abnormal client request behavior, which may be
@@ -1295,21 +1552,26 @@
attacks.</p>
<p>If, for example, you are permitting file upload to a particular
- location, and wich to limit the size of the uploaded file to 100K,
+ location, and wish to limit the size of the uploaded file to 100K,
you might use the following directive:</p>
<div class="example"><p><code>
LimitRequestBody 102400
</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="LimitRequestFields" id="LimitRequestFields">LimitRequestFields</a> <a name="limitrequestfields" id="limitrequestfields">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Limits the number of HTTP request header fields that
-will be accepted from the client</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LimitRequestFields <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LimitRequestFields 100</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestFields" id="LimitRequestFields">LimitRequestFields</a> <a name="limitrequestfields" id="limitrequestfields">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limits the number of HTTP request header fields that
+will be accepted from the client</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LimitRequestFields <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LimitRequestFields 100</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p><var>Number</var> is an integer from 0 (meaning unlimited) to
32767. The default value is defined by the compile-time
constant <code>DEFAULT_LIMIT_REQUEST_FIELDS</code> (100 as
@@ -1339,21 +1601,26 @@
LimitRequestFields 50
</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="LimitRequestFieldSize" id="LimitRequestFieldSize">LimitRequestFieldSize</a> <a name="limitrequestfieldsize" id="limitrequestfieldsize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Limits the size of the HTTP request header allowed from the
-client</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LimitRequestFieldsize <var>bytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LimitRequestFieldsize 8190</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestFieldSize" id="LimitRequestFieldSize">LimitRequestFieldSize</a> <a name="limitrequestfieldsize" id="limitrequestfieldsize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limits the size of the HTTP request header allowed from the
+client</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LimitRequestFieldsize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LimitRequestFieldsize 8190</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>This directive specifies the number of <var>bytes</var> from 0
to the value of the compile-time constant
<code>DEFAULT_LIMIT_REQUEST_FIELDSIZE</code> (8190 as
distributed) that will be allowed in an HTTP request
header.</p>
- <p>The <code class="directive">LimitRequestFieldsize</code> directive
+ <p>The <code class="directive">LimitRequestFieldSize</code> directive
allows the server administrator to reduce the limit on the allowed
size of an HTTP request header field below the normal input buffer
size compiled with the server. A server needs this value to be
@@ -1370,20 +1637,25 @@
<p>For example:</p>
<div class="example"><p><code>
- LimitRequestFieldSize 16380
+ LimitRequestFieldSize 4094
</code></p></div>
<div class="note">Under normal conditions, the value should not be changed from
the default.</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="LimitRequestLine" id="LimitRequestLine">LimitRequestLine</a> <a name="limitrequestline" id="limitrequestline">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Limit the size of the HTTP request line that will be accepted
-from the client</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LimitRequestLine <var>bytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LimitRequestLine 8190</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestLine" id="LimitRequestLine">LimitRequestLine</a> <a name="limitrequestline" id="limitrequestline">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limit the size of the HTTP request line that will be accepted
+from the client</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LimitRequestLine <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LimitRequestLine 8190</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>This directive sets the number of <var>bytes</var> from 0 to
the value of the compile-time constant
<code>DEFAULT_LIMIT_REQUEST_LINE</code> (8190 as distributed)
@@ -1398,7 +1670,7 @@
restriction on the length of a request-URI allowed for a request
on the server. A server needs this value to be large enough to
hold any of its resource names, including any information that
- might be passed in the query part of a GET request.</p>
+ might be passed in the query part of a <code>GET</code> request.</p>
<p>This directive gives the server administrator greater
control over abnormal client request behavior, which may be
@@ -1407,19 +1679,24 @@
<p>For example:</p>
<div class="example"><p><code>
- LimitRequestLine 16380
+ LimitRequestLine 4094
</code></p></div>
<div class="note">Under normal conditions, the value should not be changed from
the default.</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="LimitXMLRequestBody" id="LimitXMLRequestBody">LimitXMLRequestBody</a> <a name="limitxmlrequestbody" id="limitxmlrequestbody">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Limits the size of an XML-based request body</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LimitXMLRequestBody <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LimitXMLRequestBody 1000000</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitXMLRequestBody" id="LimitXMLRequestBody">LimitXMLRequestBody</a> <a name="limitxmlrequestbody" id="limitxmlrequestbody">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limits the size of an XML-based request body</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LimitXMLRequestBody <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LimitXMLRequestBody 1000000</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>Limit (in bytes) on maximum size of an XML-based request
body. A value of <code>0</code> will disable any checking.</p>
@@ -1429,14 +1706,19 @@
LimitXMLRequestBody 0
</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="Location" id="Location"><Location></a> <a name="location" id="location">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Applies the enclosed directives only to matching
-URLs</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><Location
- URL-path|URL> ... </Location></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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Location" id="Location"><Location></a> <a name="location" id="location">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Applies the enclosed directives only to matching
+URLs</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><Location
+ <var>URL-path</var>|<var>URL</var>> ... </Location></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive"><Location></code> directive
provides for access control by URL. It is similar to the
<code class="directive"><a href="#directory"><Directory></a></code>
@@ -1446,8 +1728,8 @@
<code>.htaccess</code> files are read, and after the <code class="directive"><a href="#files"><Files></a></code> sections.</p>
<p>Note that URLs do not have to line up with the filesystem at
- all, it should be emphasized that <Location> operates
- completely outside the filesystem.</p>
+ all, it should be emphasized that <code class="directive"><Location></code> operates completely
+ outside the filesystem.</p>
<p>For all origin (non-proxy) requests, the URL to be matched is a
URL-path of the form <code>/path/</code>. No scheme, hostname,
@@ -1456,8 +1738,8 @@
<code>scheme://servername/path</code>, and you must include the
prefix.</p>
- <p>The URL may use wildcards In a wild-card string, `?' matches
- any single character, and `*' matches any sequences of
+ <p>The URL may use wildcards. In a wild-card string, <code>?</code> matches
+ any single character, and <code>*</code> matches any sequences of
characters.</p>
<p>Extended regular
@@ -1468,17 +1750,15 @@
<Location ~ "/(extra|special)/data">
</code></p></div>
- <p>would match URLs that contained the substring "/extra/data" or
- "/special/data". In Apache 1.3 and above, a new directive
- <code class="directive"><a href="#locationmatch"><LocationMatch></a></code>
- exists which behaves identical to the regex version of
- <code class="directive"><Location></code>.</p>
+ <p>would match URLs that contained the substring <code>/extra/data</code>
+ or <code>/special/data</code>. The directive <code class="directive"><a href="#locationmatch"><LocationMatch></a></code> behaves
+ identical to the regex version of <code class="directive"><Location></code>.</p>
<p>The <code class="directive"><Location></code>
functionality is especially useful when combined with the
<code class="directive"><a href="#sethandler">SetHandler</a></code>
directive. For example, to enable status requests, but allow them
- only from browsers at foo.com, you might use:</p>
+ only from browsers at <code>foo.com</code>, you might use:</p>
<div class="example"><p><code>
<Location /status><br />
@@ -1500,7 +1780,7 @@
The <code class="directive"><a href="#locationmatch"><LocationMatch></a></code>
directive and the regex version of <code class="directive"><Location></code> require you to explicitly specify multiple
slashes if that is your intention.</p>
-
+
<p>For example, <code><LocationMatch ^/abc></code> would match
the request URL <code>/abc</code> but not the request URL <code>
//abc</code>. The (non-regex) <code class="directive"><Location></code> directive behaves similarly when used for
@@ -1509,17 +1789,25 @@
if you specify <code><Location /abc/def></code> and the
request is to <code>/abc//def</code> then it will match.</p>
</div>
-<h3>See also</h3><ul><li><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
- explanation of how these different sections are combined when a
- request is received</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="LocationMatch" id="LocationMatch"><LocationMatch></a> <a name="locationmatch" id="locationmatch">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Applies the enclosed directives only to regular-expression
-matching URLs</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><LocationMatch
- <var>regex</var>> ... </LocationMatch></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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../sections.html">How <Directory>, <Location>
+ and <Files> sections work</a> for an explanation of how these
+ different sections are combined when a request is received</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="LocationMatch" id="LocationMatch"><LocationMatch></a> <a name="locationmatch" id="locationmatch">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Applies the enclosed directives only to regular-expression
+matching URLs</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><LocationMatch
+ <var>regex</var>> ... </LocationMatch></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive"><LocationMatch></code> directive
provides for access control by URL, in an identical manner to
<code class="directive"><a href="#location"><Location></a></code>. However,
@@ -1532,16 +1820,24 @@
<p>would match URLs that contained the substring <code>/extra/data</code>
or <code>/special/data</code>.</p>
-<h3>See also</h3><ul><li><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
- explanation of how these different sections are combined when a
- request is received</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="LogLevel" id="LogLevel">LogLevel</a> <a name="loglevel" id="loglevel">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Controls the verbosity of the ErrorLog</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LogLevel <var>level</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LogLevel warn</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../sections.html">How <Directory>, <Location>
+ and <Files> sections work</a> for an explanation of how these
+ different sections are combined when a request is received</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="LogLevel" id="LogLevel">LogLevel</a> <a name="loglevel" id="loglevel">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls the verbosity of the ErrorLog</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LogLevel <var>level</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LogLevel warn</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p><code class="directive">LogLevel</code> adjusts the verbosity of the
messages recorded in the error logs (see <code class="directive"><a href="#errorlog">ErrorLog</a></code> directive). The following
<var>level</var>s are available, in order of decreasing
@@ -1638,18 +1934,23 @@
<div class="example"><p><code>
LogLevel notice
</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="MaxKeepAliveRequests" id="MaxKeepAliveRequests">MaxKeepAliveRequests</a> <a name="maxkeepaliverequests" id="maxkeepaliverequests">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Number of requests allowed on a persistent
-connection</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MaxKeepAliveRequests <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MaxKeepAliveRequests 100</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxKeepAliveRequests" id="MaxKeepAliveRequests">MaxKeepAliveRequests</a> <a name="maxkeepaliverequests" id="maxkeepaliverequests">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Number of requests allowed on a persistent
+connection</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MaxKeepAliveRequests <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MaxKeepAliveRequests 100</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">MaxKeepAliveRequests</code> directive
limits the number of requests allowed per connection when
<code class="directive"><a href="#keepalive">KeepAlive</a></code> is on. If it is
- set to "<code>0</code>", unlimited requests will be allowed. We
+ set to <code>0</code>, unlimited requests will be allowed. We
recommend that this setting be kept to a high value for maximum
server performance.</p>
@@ -1658,13 +1959,18 @@
<div class="example"><p><code>
MaxKeepAliveRequests 500
</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="NameVirtualHost" id="NameVirtualHost">NameVirtualHost</a> <a name="namevirtualhost" id="namevirtualhost">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Designates an IP address for name-virtual
-hosting</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>NameVirtualHost <var>addr</var>[:<var>port</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="NameVirtualHost" id="NameVirtualHost">NameVirtualHost</a> <a name="namevirtualhost" id="namevirtualhost">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Designates an IP address for name-virtual
+hosting</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>NameVirtualHost <var>addr</var>[:<var>port</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">NameVirtualHost</code> directive is a
required directive if you want to configure <a href="../vhosts/">name-based virtual hosts</a>.</p>
@@ -1685,11 +1991,14 @@
servicing the requests. If you have multiple name-based hosts on
multiple addresses, repeat the directive for each address.</p>
- <p>Note: the "main server" and any _default_ servers will
- <strong>never</strong> be served for a request to a
- <code class="directive">NameVirtualHost</code> IP Address (unless for some
- reason you specify <code class="directive">NameVirtualHost</code> but then
- don't define any VirtualHosts for that address).</p>
+ <div class="note"><h3>Note</h3>
+ <p>Note, that the "main server" and any <code>_default_</code> servers
+ will <strong>never</strong> be served for a request to a
+ <code class="directive">NameVirtualHost</code> IP Address (unless for some
+ reason you specify <code class="directive">NameVirtualHost</code> but then
+ don't define any <code class="directive">VirtualHost</code>s for that
+ address).</p>
+ </div>
<p>Optionally you can specify a port number on which the
name-based virtual hosts should be used, e.g.</p>
@@ -1700,20 +2009,21 @@
<p>IPv6 addresses must be enclosed in square brackets, as shown
in the following example:</p>
-
+
<div class="example"><p><code>
NameVirtualHost [fe80::a00:20ff:fea7:ccea]:8080
</code></p></div>
<p>To receive requests on all interfaces, you can use an argument of
- *</p>
+ <code>*</code></p>
<div class="example"><p><code>
NameVirtualHost *
</code></p></div>
- <div class="note"><h3>Argument to <VirtualHost> directive</h3>
- <p>Note that the argument to the <VirtualHost> directive must
+ <div class="note"><h3>Argument to <code class="directive"><VirtualHost></code>
+ directive</h3>
+ <p>Note that the argument to the <code class="directive"><VirtualHost></code> directive must
exactly match the argument to the <code class="directive">NameVirtualHost</code> directive.</p>
<div class="example"><p><code>
@@ -1723,17 +2033,26 @@
</VirtualHost><br />
</code></p></div>
</div>
-<h3>See also</h3><ul><li><a href="../vhosts/">Virtual Hosts
-documentation</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="Options" id="Options">Options</a> <a name="options" id="options">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configures what features are available in a particular
-directory</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Options
- [+|-]<var>option</var> [[+|-]<var>option</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Options All</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../vhosts/">Virtual Hosts
+documentation</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="Options" id="Options">Options</a> <a name="options" id="options">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures what features are available in a particular
+directory</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Options
+ [+|-]<var>option</var> [[+|-]<var>option</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Options All</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">Options</code> directive controls which
server features are available in a particular directory.</p>
@@ -1742,17 +2061,17 @@
the following:</p>
<dl>
- <dt>All</dt>
+ <dt><code>All</code></dt>
- <dd>All options except for MultiViews. This is the default
+ <dd>All options except for <code>MultiViews</code>. This is the default
setting.</dd>
- <dt>ExecCGI</dt>
+ <dt><code>ExecCGI</code></dt>
<dd>
Execution of CGI scripts is permitted.</dd>
- <dt>FollowSymLinks</dt>
+ <dt><code>FollowSymLinks</code></dt>
<dd>
@@ -1765,34 +2084,35 @@
section.</p>
</div></dd>
- <dt>Includes</dt>
+ <dt><code>Includes</code></dt>
<dd>
Server-side includes are permitted.</dd>
- <dt>IncludesNOEXEC</dt>
+ <dt><code>IncludesNOEXEC</code></dt>
<dd>
- Server-side includes are permitted, but the #exec command and
- #exec CGI are disabled. It is still possible to #include
- virtual CGI scripts from ScriptAliase'd directories.</dd>
+ Server-side includes are permitted, but the <code>#exec cmd</code>
+ and <code>#exec cgi</code> are disabled. It is still possible to
+ <code>#include virtual</code> CGI scripts from
+ <code class="directive">ScriptAlias</code>e'd directories.</dd>
- <dt>Indexes</dt>
+ <dt><code>Indexes</code></dt>
<dd>
If a URL which maps to a directory is requested, and the
- there is no DirectoryIndex (<em>e.g.</em>, index.html) in
- that directory, then the server will return a formatted
- listing of the directory.</dd>
+ there is no <code class="directive">DirectoryIndex</code> (<em>e.g.</em>,
+ <code>index.html</code>) in that directory, then the server will
+ return a formatted listing of the directory.</dd>
- <dt>MultiViews</dt>
+ <dt><code>MultiViews</code></dt>
<dd>
<a href="../content-negotiation.html">Content negotiated</a>
- MultiViews are allowed.</dd>
+ "MultiViews" are allowed.</dd>
- <dt>SymLinksIfOwnerMatch</dt>
+ <dt><code>SymLinksIfOwnerMatch</code></dt>
<dd>
@@ -1804,13 +2124,14 @@
<p>Normally, if multiple <code class="directive">Options</code> could apply to a
directory, then the most specific one is taken complete; the
options are not merged. However if <em>all</em> the options on
- the <code class="directive">Options</code> directive are preceded by a + or -
- symbol, the options are merged. Any options preceded by a + are
- added to the options currently in force, and any options
- preceded by a - are removed from the options currently in
+ the <code class="directive">Options</code> directive are preceded by a
+ <code>+</code> or <code>-</code>
+ symbol, the options are merged. Any options preceded by a <code>+</code>
+ are added to the options currently in force, and any options
+ preceded by a <code>-</code> are removed from the options currently in
force. </p>
- <p>For example, without any + and - symbols:</p>
+ <p>For example, without any <code>+</code> and <code>-</code> symbols:</p>
<div class="example"><p><code>
<Directory /web/docs><br />
@@ -1827,8 +2148,9 @@
</code></p></div>
<p>then only <code>Includes</code> will be set for the
- /web/docs/spec directory. However if the second
- <code class="directive">Options</code> directive uses the + and - symbols:</p>
+ <code>/web/docs/spec</code> directory. However if the second
+ <code class="directive">Options</code> directive uses the <code>+</code> and
+ <code>-</code> symbols:</p>
<div class="example"><p><code>
<Directory /web/docs><br />
@@ -1845,52 +2167,51 @@
</code></p></div>
<p>then the options <code>FollowSymLinks</code> and
- <code>Includes</code> are set for the /web/docs/spec directory.</p>
-
+ <code>Includes</code> are set for the <code>/web/docs/spec</code>
+ directory.</p>
- <p><strong>Note:</strong> Using <code>-IncludesNOEXEC</code> or
- <code>-Includes</code> disables server-side includes completely
- regardless of the previous setting.</p>
+
+ <div class="note"><h3>Note</h3>
+ <p>Using <code>-IncludesNOEXEC</code> or
+ <code>-Includes</code> disables server-side includes completely
+ regardless of the previous setting.</p>
+ </div>
<p>The default in the absence of any other settings is
<code>All</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="Require" id="Require">Require</a> <a name="require" id="require">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Selects which authenticated users can access
-a resource</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Require <var>entity-name</var> [<var>entity-name</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#Override">Override:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Require" id="Require">Require</a> <a name="require" id="require">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Selects which authenticated users can access
+a resource</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Require <var>entity-name</var> [<var>entity-name</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#Override">Override:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>This directive selects which authenticated users can access
a directory. The allowed syntaxes are:</p>
- <ul>
- <li>
- Require user <var>userid</var> [<var>userid</var>] ...
+ <dl>
+ <dt><code>Require user <var>userid</var> [<var>userid</var>]
+ ...</code></dt>
+ <dd>Only the named users can access the resource.</dd>
- <p>Only the named users can access the directory.</p>
- </li>
+ <dt><code>Require group <var>group-name</var> [<var>group-name</var>]
+ ...</code></dt>
+ <dd>Only users in the named groups can access the resource.</dd>
- <li>
- Require group <var>group-name</var> [<var>group-name</var>] ...
-
-
- <p>Only users in the named groups can access the
- directory.</p>
- </li>
-
- <li>
- Require valid-user
-
- <p>All valid users can access the directory.</p>
- </li>
- </ul>
+ <dt><code>Require valid-user</code></dt>
+ <dd>All valid users can access the resource.</dd>
+ </dl>
<p><code class="directive">Require</code> must be accompanied by
<code class="directive"><a href="#authname">AuthName</a></code> and <code class="directive"><a href="#authtype">AuthType</a></code> directives, and directives such
- as <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
- and <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> (to
+ as <code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code>
+ and <code class="directive"><a href="../mod/mod_auth.html#authgroupfile">AuthGroupFile</a></code> (to
define users and groups) in order to work correctly. Example:</p>
<div class="example"><p><code>
@@ -1908,22 +2229,32 @@
place the <code class="directive">Require</code> statement into a
<code class="directive"><a href="#limit"><Limit></a></code>
section.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#satisfy">Satisfy</a></code></li><li><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</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="RLimitCPU" id="RLimitCPU">RLimitCPU</a> <a name="rlimitcpu" id="rlimitcpu">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Limits the CPU consumption of processes launched
-by Apache children</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RLimitCPU <var>number</var>|max [<var>number</var>|max]</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Unset; uses operating system defaults</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#satisfy">Satisfy</a></code></li>
+<li><code class="module"><a href="../mod/mod_access.html">mod_access</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="RLimitCPU" id="RLimitCPU">RLimitCPU</a> <a name="rlimitcpu" id="rlimitcpu">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limits the CPU consumption of processes launched
+by Apache children</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Unset; uses operating system defaults</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>Takes 1 or 2 parameters. The first parameter sets the soft
resource limit for all processes and the second parameter sets
the maximum resource limit. Either parameter can be a number,
or <code>max</code> to indicate to the server that the limit should
be set to the maximum allowed by the operating system
configuration. Raising the maximum resource limit requires that
- the server is running as root, or in the initial startup
+ the server is running as <code>root</code>, or in the initial startup
phase.</p>
<p>This applies to processes forked off from Apache children
@@ -1934,22 +2265,32 @@
<p>CPU resource limits are expressed in seconds per
process.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#rlimitmem">RLimitMEM</a></code></li><li><code class="directive"><a href="#rlimitnproc">RLimitNPROC</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="RLimitMEM" id="RLimitMEM">RLimitMEM</a> <a name="rlimitmem" id="rlimitmem">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Limits the memory consumption of processes launched
-by Apache children</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RLimitMEM <var>number</var>|max [<var>number</var>|max]</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Unset; uses operating system defaults</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#rlimitmem">RLimitMEM</a></code></li>
+<li><code class="directive"><a href="#rlimitnproc">RLimitNPROC</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="RLimitMEM" id="RLimitMEM">RLimitMEM</a> <a name="rlimitmem" id="rlimitmem">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limits the memory consumption of processes launched
+by Apache children</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Unset; uses operating system defaults</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>Takes 1 or 2 parameters. The first parameter sets the soft
resource limit for all processes and the second parameter sets
the maximum resource limit. Either parameter can be a number,
or <code>max</code> to indicate to the server that the limit should
be set to the maximum allowed by the operating system
configuration. Raising the maximum resource limit requires that
- the server is running as root, or in the initial startup
+ the server is running as <code>root</code>, or in the initial startup
phase.</p>
<p>This applies to processes forked off from Apache children
@@ -1960,22 +2301,32 @@
<p>Memory resource limits are expressed in bytes per
process.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#rlimitcpu">RLimitCPU</a></code></li><li><code class="directive"><a href="#rlimitnproc">RLimitNPROC</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="RLimitNPROC" id="RLimitNPROC">RLimitNPROC</a> <a name="rlimitnproc" id="rlimitnproc">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Limits the number of processes that can be launched by
-processes launched by Apache children</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RLimitNPROC <var>number</var>|max [<var>number</var>|max]</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Unset; uses operating system defaults</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#rlimitcpu">RLimitCPU</a></code></li>
+<li><code class="directive"><a href="#rlimitnproc">RLimitNPROC</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="RLimitNPROC" id="RLimitNPROC">RLimitNPROC</a> <a name="rlimitnproc" id="rlimitnproc">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limits the number of processes that can be launched by
+processes launched by Apache children</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RLimitNPROC <var>number</var>|max [<var>number</var>|max]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Unset; uses operating system defaults</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>Takes 1 or 2 parameters. The first parameter sets the soft
resource limit for all processes and the second parameter sets
the maximum resource limit. Either parameter can be a number,
or <code>max</code> to indicate to the server that the limit
should be set to the maximum allowed by the operating system
configuration. Raising the maximum resource limit requires that
- the server is running as root, or in the initial startup
+ the server is running as <code>root</code>, or in the initial startup
phase.</p>
<p>This applies to processes forked off from Apache children
@@ -1986,28 +2337,40 @@
<p>Process limits control the number of processes per user.</p>
- <p>Note: If CGI processes are <strong>not</strong> running
- under userids other than the web server userid, this directive
- will limit the number of processes that the server itself can
- create. Evidence of this situation will be indicated by
- <strong><code>cannot fork</code></strong> messages in the
- error_log.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#rlimitmem">RLimitMEM</a></code></li><li><code class="directive"><a href="#rlimitcpu">RLimitCPU</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="Satisfy" id="Satisfy">Satisfy</a> <a name="satisfy" id="satisfy">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Interaction between host-level access control and
-user authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Satisfy any|all</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Satisfy all</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
- <p>Access policy if both <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> and <code class="directive"><a href="#require">Require</a></code> used. The parameter can be
- either <var>all</var> or <var>any</var>. This directive is only
+ <div class="note"><h3>Note</h3>
+ <p>If CGI processes are <strong>not</strong> running
+ under userids other than the web server userid, this directive
+ will limit the number of processes that the server itself can
+ create. Evidence of this situation will be indicated by
+ <strong><code>cannot fork</code></strong> messages in the
+ <code>error_log</code>.</p>
+ </div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#rlimitmem">RLimitMEM</a></code></li>
+<li><code class="directive"><a href="#rlimitcpu">RLimitCPU</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="Satisfy" id="Satisfy">Satisfy</a> <a name="satisfy" id="satisfy">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Interaction between host-level access control and
+user authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Satisfy Any|All</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Satisfy All</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
+ <p>Access policy if both <code class="directive"><a href="../mod/mod_access.html#allow">Allow</a></code> and <code class="directive"><a href="#require">Require</a></code> used. The parameter can be
+ either <code>All</code> or <code>Any</code>. This directive is only
useful if access to a particular area is being restricted by both
username/password <em>and</em> client host address. In this case
- the default behavior (<var>all</var>) is to require that the client passes
- the address access restriction <em>and</em> enters a valid
- username and password. With the "any" option the client will be
+ the default behavior (<code>All</code>) is to require that the client
+ passes the address access restriction <em>and</em> enters a valid
+ username and password. With the <code>Any</code> option the client will be
granted access if they either pass the host restriction or enter a
valid username and password. This can be used to password restrict
an area, but to let clients from particular addresses in without
@@ -2021,32 +2384,55 @@
<div class="example"><p><code>
Require valid-user<br />
Allow from 192.168.1<br />
- Satisfy any
+ Satisfy Any
</code></p></div>
-
-<h3>See also</h3><ul><li><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code></li><li><code class="directive"><a href="#require">Require</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="ScriptInterpreterSource" id="ScriptInterpreterSource">ScriptInterpreterSource</a> <a name="scriptinterpretersource" id="scriptinterpretersource">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Technique for locating the interpreter for CGI
-scripts</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ScriptInterpreterSource registry|script</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ScriptInterpreterSource script</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Win32 only</td></tr></table>
+
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_access.html#allow">Allow</a></code></li>
+<li><code class="directive"><a href="#require">Require</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="ScriptInterpreterSource" id="ScriptInterpreterSource">ScriptInterpreterSource</a> <a name="scriptinterpretersource" id="scriptinterpretersource">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Technique for locating the interpreter for CGI
+scripts</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptInterpreterSource Registry|Registry-Strict|Script</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ScriptInterpreterSource Script</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Win32 only<br />
+option <code>Registry-Strict</code> is available in Apache 2.0 and
+later</td></tr>
+</table>
<p>This directive is used to control how Apache finds the
interpreter used to run CGI scripts. The default technique is to
- use the interpreter pointed to by the #! line in the
- script. Setting <code>ScriptInterpreterSource registry</code> will
+ use the interpreter pointed to by the <code>#!</code> line in the
+ script.</p>
+
+ <p>Setting <code>ScriptInterpreterSource Registry</code> will
cause the Windows Registry to be searched using the script file
- extension (e.g., .pl) as a search key.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ServerAdmin" id="ServerAdmin">ServerAdmin</a> <a name="serveradmin" id="serveradmin">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Email address that the server includes in error
-messages sent to the client</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ServerAdmin <var>email-address</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+ extension (e.g., <code>.pl</code>) as a search key.</p>
+
+ <p>The option <code>Registry-Strict</code> which is new in Apache 2.0
+ does the same as <code>Registry</code> but uses a more strict registry
+ search.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerAdmin" id="ServerAdmin">ServerAdmin</a> <a name="serveradmin" id="serveradmin">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Email address that the server includes in error
+messages sent to the client</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ServerAdmin <var>email-address</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">ServerAdmin</code> sets the e-mail address
that the server includes in any error messages it returns to the
client.</p>
@@ -2058,13 +2444,18 @@
</code></p></div>
<p>as users do not always mention that they are talking about 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="ServerAlias" id="ServerAlias">ServerAlias</a> <a name="serveralias" id="serveralias">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Alternate names for a host used when matching requests
-to name-virtual hosts</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ServerAlias <var>hostname</var> [<var>hostname</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
- </a></th><td>virtual host</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerAlias" id="ServerAlias">ServerAlias</a> <a name="serveralias" id="serveralias">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Alternate names for a host used when matching requests
+to name-virtual hosts</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ServerAlias <var>hostname</var> [<var>hostname</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">ServerAlias</code> directive sets the
alternate names for a host, for use with <a href="../vhosts/name-based.html">name-based virtual hosts</a>.</p>
@@ -2075,19 +2466,28 @@
# ...<br />
</VirtualHost>
</code></p></div>
-<h3>See also</h3><ul><li><a href="../vhosts/">Apache Virtual Host documentation</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="ServerName" id="ServerName">ServerName</a> <a name="servername" id="servername">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Hostname and port that the server uses to identify
-itself</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ServerName <var>fully-qualified-domain-name</var>[:<var>port</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>In version 2.0, this
- directive supersedes the functionality of the Port
- directive from version 1.3.</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../vhosts/">Apache Virtual Host documentation</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="ServerName" id="ServerName">ServerName</a> <a name="servername" id="servername">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Hostname and port that the server uses to identify
+itself</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ServerName <var>fully-qualified-domain-name</var>[:<var>port</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>In version 2.0, this
+ directive supersedes the functionality of the <code class="directive">Port</code>
+ directive from version 1.3.</td></tr>
+</table>
<p>The <code class="directive">ServerName</code> directive sets the hostname and
port that the server uses to identify itself. This is used when
- creating redirection URLs. For example, if the name of the
+ creating redirection URLs. For example, if the name of the
machine hosting the webserver is <code>simple.example.com</code>,
but the machine also has the DNS alias <code>www.example.com</code>
and you wish the webserver to be so identified, the following
@@ -2099,9 +2499,9 @@
<p>If no <code class="directive">ServerName</code> is specified, then the
server attempts to deduce the hostname by performing a reverse
- lookup on the IP address. If no port is specified in the
+ lookup on the IP address. If no port is specified in the
servername, then the server will use the port from the incoming
- request. For optimal reliability and predictability, you should
+ request. For optimal reliability and predictability, you should
specify an explicit hostname and port using the
<code class="directive">ServerName</code> directive.</p>
@@ -2117,23 +2517,46 @@
<code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> module) will refer to the
specified port, or to the port number given in the client's request.
</p>
-<h3>See also</h3><ul><li><a href="../dns-caveats.html">DNS Issues</a></li><li><a href="../vhosts/">Apache virtual host
- documentation</a></li><li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li><li><code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code></li><li><code class="directive"><a href="#serveralias">ServerAlias</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="ServerPath" id="ServerPath">ServerPath</a> <a name="serverpath" id="serverpath">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Legacy URL pathname for a name-virtual host that
-is accessed by an incompatible browser</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ServerPath <var>URL-path</var></code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
- </a></th><td>virtual host</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../dns-caveats.html">Issues Regarding DNS and
+Apache</a></li>
+<li><a href="../vhosts/">Apache virtual host
+ documentation</a></li>
+<li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li>
+<li><code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code></li>
+<li><code class="directive"><a href="#serveralias">ServerAlias</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="ServerPath" id="ServerPath">ServerPath</a> <a name="serverpath" id="serverpath">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Legacy URL pathname for a name-based virtual host that
+is accessed by an incompatible browser</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ServerPath <var>URL-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">ServerPath</code> directive sets the legacy
URL pathname for a host, for use with <a href="../vhosts/">name-based virtual hosts</a>.</p>
-<h3>See also</h3><ul><li><a href="../vhosts/">Apache Virtual Host documentation</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="ServerRoot" id="ServerRoot">ServerRoot</a> <a name="serverroot" id="serverroot">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Base directory for the server installation</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ServerRoot <var>directory-path</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ServerRoot /usr/local/apache</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../vhosts/">Apache Virtual Host documentation</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="ServerRoot" id="ServerRoot">ServerRoot</a> <a name="serverroot" id="serverroot">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Base directory for the server installation</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ServerRoot <var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ServerRoot /usr/local/apache</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">ServerRoot</code> directive sets the
directory in which the server lives. Typically it will contain the
subdirectories <code>conf/</code> and <code>logs/</code>. Relative
@@ -2144,25 +2567,37 @@
ServerRoot /home/httpd
</code></p></div>
-<h3>See also</h3><ul><li><a href="../invoking.html">the <code>-d</code>
- option to <code>httpd</code></a></li><li><a href="../misc/security_tips.html#serverroot">the
+
+<h3>See also</h3>
+<ul>
+<li><a href="../invoking.html">the <code>-d</code>
+ option to <code>httpd</code></a></li>
+<li><a href="../misc/security_tips.html#serverroot">the
security tips</a> for information on how to properly set
- permissions on the ServerRoot</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="ServerSignature" id="ServerSignature">ServerSignature</a> <a name="serversignature" id="serversignature">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configures the footer on server-generated documents</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ServerSignature On|Off|EMail</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ServerSignature 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>All</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+ permissions on the <code class="directive">ServerRoot</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="ServerSignature" id="ServerSignature">ServerSignature</a> <a name="serversignature" id="serversignature">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures the footer on server-generated documents</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ServerSignature On|Off|EMail</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ServerSignature 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>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">ServerSignature</code> directive allows the
configuration of a trailing footer line under server-generated
- documents (error messages, mod_proxy ftp directory listings,
- mod_info output, ...). The reason why you would want to enable
- such a footer line is that in a chain of proxies, the user often
- has no possibility to tell which of the chained servers actually
- produced a returned error message.<br /> The <code>Off</code>
- setting, which is the default, suppresses the error line (and is
+ documents (error messages, <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ftp directory
+ listings, <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> output, ...). The reason why you
+ would want to enable such a footer line is that in a chain of proxies,
+ the user often has no possibility to tell which of the chained servers
+ actually produced a returned error message.</p>
+
+ <p>The <code>Off</code>
+ setting, which is the default, suppresses the footer line (and is
therefore compatible with the behavior of Apache-1.2 and
below). The <code>On</code> setting simply adds a line with the
server version number and <code class="directive"><a href="#servername">ServerName</a></code> of the serving virtual host,
@@ -2172,13 +2607,23 @@
<p>After version 2.0.44, the details of the server version number
presented are controlled by the <code class="directive"><a href="#servertokens">ServerTokens</a></code> directive.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#servertokens">ServerTokens</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="ServerTokens" id="ServerTokens">ServerTokens</a> <a name="servertokens" id="servertokens">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configures the Server HTTP response header</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ServerTokens Major|Minor|Minimal|ProductOnly|OS|Full</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ServerTokens Full</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#servertokens">ServerTokens</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="ServerTokens" id="ServerTokens">ServerTokens</a> <a name="servertokens" id="servertokens">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures the Server HTTP response
+header</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ServerTokens Full</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>This directive controls whether <code>Server</code> response
header field which is sent back to clients includes a
description of the generic OS-type of the server as well as
@@ -2221,17 +2666,26 @@
<p>After version 2.0.44, this directive also controls the
information presented by the <code class="directive"><a href="#serversignature">ServerSignature</a></code> directive.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#serversignature">ServerSignature</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="SetHandler" id="SetHandler">SetHandler</a> <a name="sethandler" id="sethandler">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Forces all matching files to be processed by a
-handler</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SetHandler <var>handler-name</var>|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>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Moved into the core in Apache 2.0</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#serversignature">ServerSignature</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="SetHandler" id="SetHandler">SetHandler</a> <a name="sethandler" id="sethandler">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Forces all matching files to be processed by a
+handler</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SetHandler <var>handler-name</var>|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>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Moved into the core in Apache 2.0</td></tr>
+</table>
<p>When placed into an <code>.htaccess</code> file or a
- <code class="directive"><a href="#directory"><Directory></a></code> or
+ <code class="directive"><a href="#directory"><Directory></a></code> or
<code class="directive"><a href="#location"><Location></a></code>
section, this directive forces all matching files to be parsed
through the <a href="../handler.html">handler</a> given by
@@ -2247,7 +2701,7 @@
<p>Another example: if you wanted to have the server display a
status report whenever a URL of
<code>http://servername/status</code> was called, you might put
- the following into httpd.conf:</p>
+ the following into <code>httpd.conf</code>:</p>
<div class="example"><p><code>
<Location /status><br />
@@ -2256,14 +2710,23 @@
</span>
</Location>
</code></p></div>
-<h3>See also</h3><ul><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</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="SetInputFilter" id="SetInputFilter">SetInputFilter</a> <a name="setinputfilter" id="setinputfilter">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the filters that will process client requests and POST
-input</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SetInputFilter <var>filter</var>[;<var>filter</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</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="SetInputFilter" id="SetInputFilter">SetInputFilter</a> <a name="setinputfilter" id="setinputfilter">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the filters that will process client requests and POST
+input</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SetInputFilter <var>filter</var>[;<var>filter</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">SetInputFilter</code> directive sets the
filter or filters which will process client requests and POST
input when they are received by the server. This is in addition to
@@ -2274,14 +2737,23 @@
<p>If more than one filter is specified, they must be separated
by semicolons in the order in which they should process the
content.</p>
-<h3>See also</h3><ul><li><a href="../filter.html">Filters</a> documentation</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="SetOutputFilter" id="SetOutputFilter">SetOutputFilter</a> <a name="setoutputfilter" id="setoutputfilter">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the filters that will process responses from the
-server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SetOutputFilter <var>filter</var>[;<var>filter</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../filter.html">Filters</a> documentation</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="SetOutputFilter" id="SetOutputFilter">SetOutputFilter</a> <a name="setoutputfilter" id="setoutputfilter">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the filters that will process responses from the
+server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SetOutputFilter <var>filter</var>[;<var>filter</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">SetOutputFilter</code> directive sets the filters
which will process responses from the server before they are
sent to the client. This is in addition to any filters defined
@@ -2304,14 +2776,23 @@
<p>If more than one filter is specified, they must be separated
by semicolons in the order in which they should process the
content.</p>
-<h3>See also</h3><ul><li><a href="../filter.html">Filters</a> documentation</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="TimeOut" id="TimeOut">TimeOut</a> <a name="timeout" id="timeout">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Amount of time the server will wait for
-certain events before failing a request</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>TimeOut <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>TimeOut 300</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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../filter.html">Filters</a> documentation</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="TimeOut" id="TimeOut">TimeOut</a> <a name="timeout" id="timeout">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Amount of time the server will wait for
+certain events before failing a request</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>TimeOut <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>TimeOut 300</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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>The <code class="directive">TimeOut</code> directive currently defines
the amount of time Apache will wait for three things:</p>
@@ -2325,35 +2806,40 @@
<li>The amount of time between ACKs on transmissions of TCP
packets in responses.</li>
</ol>
-
+
<p>We plan on making these separately configurable at some point
down the road. The timer used to default to 1200 before 1.2,
but has been lowered to 300 which is still far more than
necessary in most situations. It is not set any lower by
default because there may still be odd places in the code where
the timer is not reset when a packet is sent. </p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="UseCanonicalName" id="UseCanonicalName">UseCanonicalName</a> <a name="usecanonicalname" id="usecanonicalname">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configures how the server determines its own name and
-port</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>UseCanonicalName on|off|dns</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>UseCanonicalName 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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="UseCanonicalName" id="UseCanonicalName">UseCanonicalName</a> <a name="usecanonicalname" id="usecanonicalname">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures how the server determines its own name and
+port</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>UseCanonicalName On|Off|DNS</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>UseCanonicalName 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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p>In many situations Apache must construct a <em>self-referential</em>
URL -- that is, a URL that refers back to the same server. With
- <code>UseCanonicalName on</code> Apache will use the hostname and port
+ <code>UseCanonicalName On</code> Apache will use the hostname and port
specified in the <code class="directive"><a href="#servername">ServerName</a></code>
directive to construct the canonical name for the server. This name
is used in all self-referential URLs, and for the values of
<code>SERVER_NAME</code> and <code>SERVER_PORT</code> in CGIs.</p>
- <p>With <code>UseCanonicalName off</code> Apache will form
+ <p>With <code>UseCanonicalName Off</code> Apache will form
self-referential URLs using the hostname and port supplied by
the client if any are supplied (otherwise it will use the
canonical name, as defined above). These values are the same
that are used to implement <a href="../vhosts/name-based.html">name based virtual hosts</a>,
- and are available with the same clients. The CGI variables
+ and are available with the same clients. The CGI variables
<code>SERVER_NAME</code> and <code>SERVER_PORT</code> will be
constructed from the client supplied values as well.</p>
@@ -2368,8 +2854,8 @@
authenticate twice (once for <code>www</code> and once again
for <code>www.domain.com</code> -- see <a href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">the
FAQ on this subject for more information</a>). But if
- <code class="directive">UseCanonicalName</code> is set off, then Apache will
- redirect to <code>http://www/splat/</code>.</p>
+ <code class="directive">UseCanonicalName</code> is set <code>Off</code>, then
+ Apache will redirect to <code>http://www/splat/</code>.</p>
<p>There is a third option, <code>UseCanonicalName DNS</code>,
which is intended for use with mass IP-based virtual hosting to
@@ -2378,22 +2864,32 @@
reverse DNS lookup on the server IP address that the client
connected to in order to work out self-referential URLs.</p>
- <div class="warning"><h3>Warning:</h3>
+ <div class="warning"><h3>Warning</h3>
<p>If CGIs make assumptions about the values of <code>SERVER_NAME</code>
they may be broken by this option. The client is essentially free
to give whatever value they want as a hostname. But if the CGI is
only using <code>SERVER_NAME</code> to construct self-referential URLs
then it should be just fine.</p>
</div>
-<h3>See also</h3><ul><li><code class="directive"><a href="#servername">ServerName</a></code></li><li><code class="directive"><a href="../mod/mpm_common.html#listen">Listen</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="VirtualHost" id="VirtualHost"><VirtualHost></a> <a name="virtualhost" id="virtualhost">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Contains directives that apply only to a specific
-hostname or IP address</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><VirtualHost
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#servername">ServerName</a></code></li>
+<li><code class="directive"><a href="../mod/mpm_common.html#listen">Listen</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="VirtualHost" id="VirtualHost"><VirtualHost></a> <a name="virtualhost" id="virtualhost">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Contains directives that apply only to a specific
+hostname or IP address</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><VirtualHost
<var>addr</var>[:<var>port</var>] [<var>addr</var>[:<var>port</var>]]
- ...> ... </VirtualHost></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>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>core</td></tr></table>
+ ...> ... </VirtualHost></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>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+</table>
<p><code class="directive"><VirtualHost></code> and
<code></VirtualHost></code> are used to enclose a group of
directives that will apply only to a particular virtual host. Any
@@ -2409,13 +2905,13 @@
<li>A fully qualified domain name for the IP address of the
virtual host;</li>
- <li>The character *, which is used only in combination with
+ <li>The character <code>*</code>, which is used only in combination with
<code>NameVirtualHost *</code> to match all IP addresses; or</li>
<li>The string <code>_default_</code>, which is used only
with IP virtual hosting to catch unmatched IP addresses.</li>
</ul>
-
+
<div class="example"><h3>Example</h3><p><code>
<VirtualHost 10.1.2.3><br />
<span class="indent">
@@ -2428,7 +2924,7 @@
</VirtualHost>
</code></p></div>
-
+
<p>IPv6 addresses must be specified in square brackets because
the optional port number could not be determined otherwise. An
IPv6 example is shown below:</p>
@@ -2443,19 +2939,19 @@
TransferLog logs/host.example.com-access_log<br />
</span>
</VirtualHost>
- </code></p></div>
+ </code></p></div>
<p>Each Virtual Host must correspond to a different IP address,
different port number or a different host name for the server,
in the former case the server machine must be configured to
accept IP packets for multiple addresses. (If the machine does
not have multiple network interfaces, then this can be
- accomplished with the <code>ifconfig alias</code> command (if
+ accomplished with the <code>ifconfig alias</code> command -- if
your OS supports it).</p>
<div class="note"><h3>Note</h3>
<p>The use of <code class="directive"><VirtualHost></code> does
- <strong>not</strong> affect what addresses Apache listens on. You
+ <strong>not</strong> affect what addresses Apache listens on. You
may need to ensure that Apache is listening on the correct addresses
using <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code>.</p>
</div>
@@ -2464,11 +2960,12 @@
<code>_default_</code> can be specified in
which case this virtual host will match any IP address that is
not explicitly listed in another virtual host. In the absence
- of any _default_ virtual host the "main" server config,
+ of any <code>_default_</code> virtual host the "main" server config,
consisting of all those definitions outside any VirtualHost
section, is used when no IP-match occurs. (But note that any IP
address that matches a <code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code> directive will use neither
- the "main" server config nor the _default_ virtual host. See the <a href="../vhosts/name-based.html">name-based virtual hosting</a>
+ the "main" server config nor the <code>_default_</code> virtual host.
+ See the <a href="../vhosts/name-based.html">name-based virtual hosting</a>
documentation for further details.)</p>
<p>You can specify a <code>:port</code> to change the port that is
@@ -2484,9 +2981,21 @@
directory where logfiles are stored is writable by anyone other
than the user that starts the server.</p>
</div>
-<h3>See also</h3><ul><li><a href="../vhosts/">Apache Virtual Host documentation</a></li><li><a href="../dns-caveats.html">Warnings about DNS and
- Apache</a></li><li><a href="../bind.html">Setting
- which addresses and ports Apache uses</a></li><li><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
- explanation of how these different sections are combined when a
- request is received</li></ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+<h3>See also</h3>
+<ul>
+<li><a href="../vhosts/">Apache Virtual Host documentation</a></li>
+<li><a href="../dns-caveats.html">Issues Regarding DNS and
+ Apache</a></li>
+<li><a href="../bind.html">Setting
+ which addresses and ports Apache uses</a></li>
+<li><a href="../sections.html">How <Directory>, <Location>
+ and <Files> sections work</a> for an explanation of how these
+ different sections are combined when a request is received</li>
+</ul>
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index a546727..c93ac05 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -10,7 +10,7 @@
<directivesynopsis>
<name>AcceptPathInfo</name>
-<description>Resources accept trailing pathname information</description>
+<description>Resources accept trailing pathname information</description>
<syntax>AcceptPathInfo On|Off|Default</syntax>
<default>AcceptPathInfo Default</default>
<contextlist><context>server config</context>
@@ -25,46 +25,47 @@
pathname information that follows an actual filename (or
non-existent file in an existing directory) will be accepted or
rejected. The trailing pathname information can be made
- available to scripts in the PATH_INFO environment variable.</p>
+ available to scripts in the <code>PATH_INFO</code> environment
+ variable.</p>
<p>For example, assume the location <code>/test/</code> points to
a directory that contains only the single file
<code>here.html</code>. Then requests for
<code>/test/here.html/more</code> and
<code>/test/nothere.html/more</code> both collect
- <code>/more</code> as PATH_INFO.</p>
+ <code>/more</code> as <code>PATH_INFO</code>.</p>
<p>The three possible arguments for the
<directive>AcceptPathInfo</directive> directive are:</p>
<dl>
- <dt><code>off</code></dt><dd>A request will only be accepted if it
+ <dt><code>Off</code></dt><dd>A request will only be accepted if it
maps to a literal path that exists. Therefore a request with
trailing pathname information after the true filename such as
<code>/test/here.html/more</code> in the above example will return
a 404 NOT FOUND error.</dd>
- <dt><code>on</code></dt><dd>A request will be accepted if a
+ <dt><code>On</code></dt><dd>A request will be accepted if a
leading path component maps to a file that exists. The above
example <code>/test/here.html/more</code> will be accepted if
<code>/test/here.html</code> maps to a valid file.</dd>
-
- <dt><code>default</code></dt><dd>The treatment of requests with
+
+ <dt><code>Default</code></dt><dd>The treatment of requests with
trailing pathname information is determined by the <a
href="../handler.html">handler</a> responsible for the request.
- The core handler for normal files defaults to rejecting PATH_INFO.
- Handlers that serve scripts, such as <a
+ The core handler for normal files defaults to rejecting
+ <code>PATH_INFO</code>. Handlers that serve scripts, such as <a
href="mod_cgi.html">cgi-script</a> and <a
- href="mod_isapi.html">isapi-isa</a>, generally accept PATH_INFO by
- default.</dd>
+ href="mod_isapi.html">isapi-isa</a>, generally accept
+ <code>PATH_INFO</code> by default.</dd>
</dl>
<p>The primary purpose of the <code>AcceptPathInfo</code>
directive is to allow you to override the handler's choice of
- accepting or rejecting PATH_INFO. This override is required, for
- example, when you use a <a href="../filter.html">filter</a>, such
+ accepting or rejecting <code>PATH_INFO</code>. This override is required,
+ for example, when you use a <a href="../filter.html">filter</a>, such
as <a href="mod_include.html">INCLUDES</a>, to generate content
- based on PATH_INFO. The core handler would usually reject the
- request, so you can use the following configuration to enable
+ based on <code>PATH_INFO</code>. The core handler would usually reject
+ the request, so you can use the following configuration to enable
such a script:</p>
<example>
@@ -72,7 +73,7 @@
<indent>
Options +Includes<br />
SetOutputFilter INCLUDES<br />
- AcceptPathInfo on<br />
+ AcceptPathInfo On<br />
</indent>
</Files>
</example>
@@ -89,7 +90,7 @@
</contextlist>
<usage>
- <p>When returning a document to the client the server looks for
+ <p>While processing a request the server looks for
the first existing configuration file from this list of names in
every directory of the path to the document, if distributed
configuration files are enabled for that directory. For
@@ -150,8 +151,8 @@
<directivesynopsis>
<name>AddOutputFilterByType</name>
<description>assigns an output filter to a particular MIME-type</description>
-<syntax>AddOutputFilterByType <var>filter</var>[;<var>filter</var>...] <var>MIME-type</var>
-[<var>MIME-type</var>] ...</syntax>
+<syntax>AddOutputFilterByType <var>filter</var>[;<var>filter</var>...]
+<var>MIME-type</var> [<var>MIME-type</var>] ...</syntax>
<contextlist><context>server config</context>
<context>virtual host</context><context>directory</context>
<context>.htaccess</context></contextlist>
@@ -163,10 +164,11 @@
href="../filter.html">filter</a> for a request depending on the
response MIME-type.</p>
- <p>The following example uses the DEFLATE filter, which is provided by
- <module>mod_deflate</module>. It will compress all output (either static
- or dynamic) which is labeled as <code>text/html</code> or
- <code>text/plain</code> before it is sent to the client.</p>
+ <p>The following example uses the <code>DEFLATE</code> filter, which
+ is provided by <module>mod_deflate</module>. It will compress all
+ output (either static or dynamic) which is labeled as
+ <code>text/html</code> or <code>text/plain</code> before it is sent
+ to the client.</p>
<example>
AddOutputFilterByType DEFLATE text/html text/plain
@@ -178,8 +180,9 @@
them.</p>
<p>The configuration below causes all script output labeled as
- <code>text/html</code> to be processed at first by the INCLUDES filter
- and then by the DEFLATE filter.</p>
+ <code>text/html</code> to be processed at first by the
+ <code>INCLUDES</code> filter and then by the <code>DEFLATE</code>
+ filter.</p>
<example>
<Location /cgi-bin/><br />
@@ -190,50 +193,60 @@
</Location>
</example>
- <note><title>Note:</title>
- <p>The output filters are not applied on proxy requests.</p>
+ <note type="warning"><title>Note</title>
+ <p>Enabling filters with <directive>AddOutputFilterByType</directive>
+ may fail partially or completely in some cases. For expample, no
+ filters are applied if the content type falls back to the <directive
+ module="core">DefaultType</directive>, even if the <directive
+ module="core">DefaultType</directive> is the same.</p>
+
+ <p>However, if you want to make sure, that the filters will be
+ applied, assign the content type to a resource explicitely, for
+ example with <directive module="mod_mime">AddType</directive> or
+ <directive module="core">ForceType</directive>. Setting the
+ content type within a (non-nph) CGI script is also safe.</p>
+
+ <p>The by-type output filters are never applied on proxy requests.</p>
</note>
</usage>
<seealso><directive module="mod_mime">AddOutputFilter</directive></seealso>
<seealso><directive module="core">SetOutputFilter</directive></seealso>
-<seealso><module>mod_include</module></seealso>
-<seealso><module>mod_deflate</module></seealso>
-<seealso><a href="../filter.html">The filters documentation</a></seealso>
+<seealso><a href="../filter.html">filters</a></seealso>
</directivesynopsis>
<directivesynopsis>
<name>AllowOverride</name>
<description>Types of directives that are allowed in
-.htaccess files</description>
-<syntax>AllowOverride All|None|<var>directive-type</var>
+<code>.htaccess</code> files</description>
+<syntax>AllowOverride All|None|<var>directive-type</var>
[<var>directive-type</var>] ...</syntax>
<default>AllowOverride All</default>
<contextlist><context>directory</context></contextlist>
<usage>
- <p>When the server finds an .htaccess file (as specified by <directive
- module="core">AccessFileName</directive>) it needs to know
- which directives declared in that file can override earlier
- access information.</p>
+ <p>When the server finds an <code>.htaccess</code> file (as
+ specified by <directive module="core">AccessFileName</directive>)
+ it needs to know which directives declared in that file can override
+ earlier access information.</p>
- <note><title>Only available in Directory sections</title>
+ <note><title>Only available in <Directory> sections</title>
<directive>AllowOverride</directive> is valid only in
- <directive type="section" module="core">Directory</directive>
- sections, not in <directive type="section"
+ <directive type="section" module="core">Directory</directive>
+ sections, not in <directive type="section"
module="core">Location</directive> or <directive type="section"
module="core">Files</directive> sections.
</note>
<p>When this directive is set to <code>None</code>, then
- .htaccess files are completely ignored. In this case, the
- server will not even attempt to read .htaccess files in the
- filesystem.</p>
+ <a href="#accessfilename">.htaccess</a> files are completely ignored.
+ In this case, the server will not even attempt to read
+ <code>.htaccess</code> files in the filesystem.</p>
<p>When this directive is set to <code>All</code>, then any
directive which has the .htaccess <a
href="directive-dict.html#Context">Context</a> is allowed in
- .htaccess files.</p>
+ <code>.htaccess</code> files.</p>
<p>The <var>directive-type</var> can be one of the following
groupings of directives.</p>
@@ -244,12 +257,12 @@
<dd>
Allow use of the authorization directives (<directive
- module="mod_authn_dbm">AuthDBMGroupFile</directive>,
- <directive module="mod_authn_dbm">AuthDBMUserFile</directive>,
- <directive module="mod_authz_groupfile">AuthGroupFile</directive>,
- <directive module="core">AuthName</directive>,
+ module="mod_auth_dbm">AuthDBMGroupFile</directive>,
+ <directive module="mod_auth_dbm">AuthDBMUserFile</directive>,
+ <directive module="mod_auth">AuthGroupFile</directive>,
+ <directive module="core">AuthName</directive>,
<directive module="core">AuthType</directive>, <directive
- module="mod_authn_file">AuthUserFile</directive>, <directive
+ module="mod_auth">AuthUserFile</directive>, <directive
module="core">Require</directive>, <em>etc.</em>).</dd>
<dt>FileInfo</dt>
@@ -262,7 +275,7 @@
module="mod_negotiation">LanguagePriority</directive>,
<directive module="core">SetHandler</directive>, <directive
module="core">SetInputFilter</directive>, <directive
- module="core">SetOutputFilter</directive>, and
+ module="core">SetOutputFilter</directive>, and
<module>mod_mime</module> Add* and Remove*
directives, <em>etc.</em>).</dd>
@@ -288,9 +301,9 @@
<dd>
Allow use of the directives controlling host access (<directive
- module="mod_authz_host">Allow</directive>, <directive
- module="mod_authz_host">Deny</directive> and <directive
- module="mod_authz_host">Order</directive>).</dd>
+ module="mod_access">Allow</directive>, <directive
+ module="mod_access">Deny</directive> and <directive
+ module="mod_access">Order</directive>).</dd>
<dt>Options</dt>
@@ -330,8 +343,8 @@
marks. It must be accompanied by <directive
module="core">AuthType</directive> and <directive
module="core">Require</directive> directives, and directives such
- as <directive module="mod_authn_file">AuthUserFile</directive> and
- <directive module="mod_authz_groupfile">AuthGroupFile</directive> to
+ as <directive module="mod_auth">AuthUserFile</directive> and
+ <directive module="mod_auth">AuthGroupFile</directive> to
work.</p>
<p>For example:</p>
@@ -343,8 +356,8 @@
<p>The string provided for the <code>AuthName</code> is what will
appear in the password dialog provided by most browsers.</p>
</usage>
-<seealso><a
- href="../howto/auth.html">Authentication, Authorization, and
+<seealso><a
+ href="../howto/auth.html">Authentication, Authorization, and
Access Control</a></seealso>
</directivesynopsis>
@@ -359,13 +372,13 @@
<usage>
<p>This directive selects the type of user authentication for a
directory. Only <code>Basic</code> and <code>Digest</code> are
- currently implemented.
+ currently implemented.
It must be accompanied by <directive
module="core">AuthName</directive> and <directive
module="core">Require</directive> directives, and directives such
- as <directive module="mod_authn_file">AuthUserFile</directive> and
- <directive module="mod_authz_groupfile">AuthGroupFile</directive> to
+ as <directive module="mod_auth">AuthUserFile</directive> and
+ <directive module="mod_auth">AuthGroupFile</directive> to
work.</p>
</usage>
<seealso><a href="../howto/auth.html">Authentication, Authorization,
@@ -374,9 +387,9 @@
<directivesynopsis>
<name>CGIMapExtension</name>
-<description>Technique for locating the interpreter for CGI
+<description>Technique for locating the interpreter for CGI
scripts</description>
-<syntax>CGIMapExtension cgi-path .extension</syntax>
+<syntax>CGIMapExtension <var>cgi-path</var> <var>.extension</var></syntax>
<default>None</default>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
@@ -385,17 +398,19 @@
<usage>
<p>This directive is used to control how Apache finds the
- interpreter used to run CGI scripts. For example, setting <code>CGIMapExtension sys:\foo.nlm .foo</code> will
- cause all CGI script files with a .foo extension to be passed to the FOO interpreter.</p>
+ interpreter used to run CGI scripts. For example, setting
+ <code>CGIMapExtension sys:\foo.nlm .foo</code> will
+ cause all CGI script files with a <code>.foo</code> extension to
+ be passed to the FOO interpreter.</p>
</usage>
</directivesynopsis>
<directivesynopsis>
<name>ContentDigest</name>
-<description>Enables the generation of Content-MD5 HTTP Response
-headers</description>
-<syntax>ContentDigest on|off</syntax>
-<default>ContentDigest off</default>
+<description>Enables the generation of <code>Content-MD5</code> HTTP Response
+headers</description>
+<syntax>ContentDigest On|Off</syntax>
+<default>ContentDigest Off</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context>
</contextlist>
@@ -426,9 +441,9 @@
values are not cached).</p>
<p><code>Content-MD5</code> is only sent for documents served
- by the core, and not by any module. For example, SSI documents,
- output from CGI scripts, and byte range responses do not have
- this header.</p>
+ by the <module>core</module>, and not by any module. For example,
+ SSI documents, output from CGI scripts, and byte range responses
+ do not have this header.</p>
</usage>
</directivesynopsis>
@@ -457,13 +472,13 @@
</example>
<p>would be appropriate for a directory which contained many gif
- images with filenames missing the .gif extension.</p>
+ images with filenames missing the <code>.gif</code> extension.</p>
<p>Note that unlike <directive
module="core">ForceType</directive>, this directive is only
provides the default mime-type. All other mime-type definitions,
including filename extensions, that might identify the media type
- will override this default.</p>
+ will override this default.</p>
</usage>
</directivesynopsis>
@@ -483,10 +498,10 @@
sub-directories of that directory. Any directive that is allowed
in a directory context may be used. <var>Directory-path</var> is
either the full path to a directory, or a wild-card string using
- Unix shell-style matching. In a wild-card string, `?' matches any
- single character, and `*' matches any sequences of characters.
- You may also use `[]' character ranges. None of the wildcards
- match a `/' character, so <code><Directory
+ Unix shell-style matching. In a wild-card string, <code>?</code> matches
+ any single character, and <code>*</code> matches any sequences of
+ characters. You may also use <code>[]</code> character ranges. None
+ of the wildcards match a `/' character, so <code><Directory
/*/public_html></code> will not match
<code>/home/user/public_html</code>, but <code><Directory
/home/*/public_html></code> will match. Example:</p>
@@ -503,8 +518,8 @@
<p>Be careful with the <var>directory-path</var> arguments:
They have to literally match the filesystem path which Apache uses
to access the files. Directives applied to a particular
- <Directory> will not apply to files accessed from that same
- directory via a different path, such as via different symbolic
+ <code><Directory></code> will not apply to files accessed from
+ that same directory via a different path, such as via different symbolic
links.</p>
</note>
@@ -516,10 +531,11 @@
<Directory ~ "^/www/.*/[0-9]{3}">
</example>
- <p>would match directories in /www/ that consisted of three
- numbers.</p>
+ <p>would match directories in <code>/www/</code> that consisted of
+ three numbers.</p>
- <p>If multiple (non-regular expression) directory sections
+ <p>If multiple (non-regular expression) <directive
+ type="section">Directory</directive> sections
match the directory (or its parents) containing a document,
then the directives are applied in the order of shortest match
first, interspersed with the directives from the <a
@@ -550,7 +566,7 @@
<li>Apply directive <code>AllowOverride FileInfo</code> (for
directory <code>/home/web</code>).</li>
- <li>Apply any FileInfo directives in
+ <li>Apply any <code>FileInfo</code> directives in
<code>/home/web/.htaccess</code></li>
</ul>
@@ -567,14 +583,14 @@
</Directory>
</example>
- <p>The regular expression section won't be considered until after
- all normal <Directory>s and <code>.htaccess</code> files
- have been applied. Then the regular expression will match on
+ <p>the regular expression section won't be considered until after
+ all normal <code><Directory></code>s and <code>.htaccess</code>
+ files have been applied. Then the regular expression will match on
<code>/home/abc/public_html/abc</code> and be applied.</p>
<p><strong>Note that the default Apache access for
- <Directory /> is <code>Allow from All</code>. This means
- that Apache will serve any file mapped from an URL. It is
+ <code><Directory /></code> is <code>Allow from All</code>.
+ This means that Apache will serve any file mapped from an URL. It is
recommended that you change this with a block such
as</strong></p>
@@ -590,24 +606,23 @@
<p><strong>and then override this for directories you
<em>want</em> accessible. See the <a
href="../misc/security_tips.html">Security Tips</a> page for more
- details.</strong></p>
+ details.</strong></p>
- <p>The directory sections typically occur in
- the access.conf file, but they may appear in any configuration
- file. <directive type="section">Directory</directive> directives
+ <p>The directory sections occur in the <code>httpd.conf</code> file.
+ <directive type="section">Directory</directive> directives
cannot nest, and cannot appear in a <directive module="core"
type="section">Limit</directive> or <directive module="core"
type="section">LimitExcept</directive> section.</p>
</usage>
-<seealso><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
+<seealso><a href="../sections.html">How <Directory>,
+ <Location> and <Files> sections work</a> for an
explanation of how these different sections are combined when a
request is received</seealso>
</directivesynopsis>
<directivesynopsis type="section">
<name>DirectoryMatch</name>
-<description>Enclose directives that apply to
+<description>Enclose directives that apply to
file-system directories matching a regular expression and their
subdirectories</description>
<syntax><DirectoryMatch <var>regex</var>>
@@ -632,11 +647,11 @@
</usage>
<seealso><directive type="section" module="core">Directory</directive> for
a description of how regular expressions are mixed in with normal
-<code><Directory></code>s</seealso>
+<directive type="section">Directory</directive>s</seealso>
<seealso><a
-href="../sections.html">How Directory, Location and Files sections
-work</a> for an explanation of how these different sections are
-combined when a request is received</seealso>
+href="../sections.html">How <Directory>, <Location> and
+<Files> sections work</a> for an explanation of how these different
+sections are combined when a request is received</seealso>
</directivesynopsis>
<directivesynopsis>
@@ -649,10 +664,11 @@
</contextlist>
<usage>
- <p>This directive sets the directory from which httpd will
- serve files. Unless matched by a directive like Alias, the
- server appends the path from the requested URL to the document
- root to make the path to the document. Example:</p>
+ <p>This directive sets the directory from which <code>httpd</code>
+ will serve files. Unless matched by a directive like <directive
+ module="mod_alias">Alias</directive>, the server appends the
+ path from the requested URL to the document root to make the
+ path to the document. Example:</p>
<example>
DocumentRoot /usr/web
@@ -672,19 +688,19 @@
<directivesynopsis>
<name>EnableMMAP</name>
<description>Use memory-mapping to read files during delivery</description>
-<syntax>EnableMMAP on|off</syntax>
-<default>EnableMMAP on</default>
+<syntax>EnableMMAP On|Off</syntax>
+<default>EnableMMAP On</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context>
</contextlist>
<override>FileInfo</override>
<usage>
- <p>This directive controls whether the httpd may use
+ <p>This directive controls whether the <code>httpd</code> may use
memory-mapping if it needs to read the contents of a file during
delivery. By default, when the handling of a request requires
- access to the data within a file-- for example, when delivering a
- server-parsed file using <module>mod_include</module>-- Apache
+ access to the data within a file -- for example, when delivering a
+ server-parsed file using <module>mod_include</module> -- Apache
memory-maps the file if the OS supports it.</p>
<p>This memory-mapping sometimes yields a performance improvement.
@@ -693,17 +709,18 @@
<ul>
<li>On some multiprocessor systems, memory-mapping can reduce the
- performance of the httpd.</li>
+ performance of the <code>httpd</code>.</li>
<li>With an NFS-mounted <directive module="core">DocumentRoot</directive>,
- the httpd may crash due to a segmentation fault if a file is deleted
- or truncated while the httpd has it memory-mapped.</li>
+ the <code>httpd</code> may crash due to a segmentation fault if a file
+ is deleted or truncated while the <code>httpd</code> has it
+ memory-mapped.</li>
</ul>
<p>For server configurations that are vulnerable to these problems,
you should disable memory-mapping of delivered files by specifying:</p>
<example>
- EnableMMAP off
+ EnableMMAP Off
</example>
<p>For NFS mounted files, this feature may be disabled explicitly for
@@ -711,7 +728,9 @@
<example>
<Directory "/path-to-nfs-files">
- EnableMMAP off
+ <indent>
+ EnableMMAP Off
+ </indent>
</Directory>
</example>
</usage>
@@ -720,8 +739,8 @@
<directivesynopsis>
<name>EnableSendfile</name>
<description>Use the kernel sendfile support to deliver files to the client</description>
-<syntax>EnableSendfile on|off</syntax>
-<default>EnableSendfile on</default>
+<syntax>EnableSendfile On|Off</syntax>
+<default>EnableSendfile On</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context>
</contextlist>
@@ -729,7 +748,7 @@
<compatibility>Available in version 2.0.44 and later</compatibility>
<usage>
- <p>This directive controls whether httpd may use the sendfile
+ <p>This directive controls whether <code>httpd</code> may use the sendfile
support from the kernel to transmit file contents to the client.
By default, when the handling of a request requires no access
to the data within a file -- for example, when delivering a
@@ -737,18 +756,18 @@
without ever reading the file if the OS supports it.</p>
<p>This sendfile mechanism avoids seperate read and send operations,
- and buffer allocations. But on some platforms or within some
- filesystems, it is better to disable this feature to avoid
+ and buffer allocations. But on some platforms or within some
+ filesystems, it is better to disable this feature to avoid
operational problems:</p>
<ul>
<li>Some platforms may have broken sendfile support that the build
system did not detect, especially if the binaries were built on
another box and moved to such a machine with broken sendfile
- support.</li>
+ support.</li>
<li>With a network-mounted <directive
- module="core">DocumentRoot</directive> (e.g., NFS or SMB),
- the kernel may be unable to serve the network file through
+ module="core">DocumentRoot</directive> (e.g., NFS or SMB),
+ the kernel may be unable to serve the network file through
its own cache.</li>
</ul>
@@ -756,15 +775,17 @@
you should disable this feature by specifying:</p>
<example>
- EnableSendfile off
+ EnableSendfile Off
</example>
- <p>For NFS or SMB mounted files, this feature may be disabled explicitly
+ <p>For NFS or SMB mounted files, this feature may be disabled explicitly
for the offending files by specifying:</p>
<example>
- <Directory "/path-to-nfs-files"><br />
- EnableSendfile off<br />
+ <Directory "/path-to-nfs-files">
+ <indent>
+ EnableSendfile Off
+ </indent>
</Directory>
</example>
</usage>
@@ -817,7 +838,7 @@
<p>Note that when you specify an <directive>ErrorDocument</directive>
that points to a remote URL (ie. anything with a method such as
- "http" in front of it), Apache will send a redirect to the
+ <code>http</code> in front of it), Apache will send a redirect to the
client to tell it where to find the document, even if the
document ends up being on the same server. This has several
implications, the most important being that the client will not
@@ -828,17 +849,18 @@
URL in an <code>ErrorDocument 401</code>, the client will not
know to prompt the user for a password since it will not
receive the 401 status code. Therefore, <strong>if you use an
- "ErrorDocument 401" directive then it must refer to a local
+ <code>ErrorDocument 401</code> directive then it must refer to a local
document.</strong></p>
- <p>Microsoft Internet Explorer (MSIE) will ignore server-generated
- error messages when they are "too small" and substitute its own
- "friendly" error messages. The size threshold varies depending on
+ <p>Microsoft Internet Explorer (MSIE) will by default ignore
+ server-generated error messages when they are "too small" and substitute
+ its own "friendly" error messages. The size threshold varies depending on
the type of error, but in general, if you make your error document
greater than 512 bytes, then MSIE will show the server-generated
error rather than masking it. More information is available in
Microsoft Knowledgebase article <a
- href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807">Q294807</a>.</p>
+ href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807"
+ >Q294807</a>.</p>
<p>Prior to version 2.0, messages were indicated by prefixing
them with a single unmatched double quote character.</p>
@@ -850,9 +872,9 @@
<directivesynopsis>
<name>ErrorLog</name>
-<description>Location where the server will log errors</description>
+<description>Location where the server will log errors</description>
<syntax> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</syntax>
-<default>ErrorLog logs/error_log (Unix)
+<default>ErrorLog logs/error_log (Unix)<br />
ErrorLog logs/error.log (Windows and OS/2)</default>
<contextlist><context>server config</context><context>virtual host</context>
</contextlist>
@@ -860,14 +882,14 @@
<usage>
<p>The <directive>ErrorLog</directive> directive sets the name of
the file to which the server will log any errors it encounters. If
- the <var>file-path</var> does not begin with a slash (/) then it is
- assumed to be relative to the <directive
+ the <var>file-path</var> is not absolute (in general: does not begin
+ with a slash (/)) then it is assumed to be relative to the <directive
module="core">ServerRoot</directive>.</p>
<example><title>Example</title>
ErrorLog /var/log/httpd/error_log
</example>
-
+
<p>If the <var>file-path</var>
begins with a pipe (|) then it is assumed to be a command to spawn
to handle the error log.</p>
@@ -911,13 +933,14 @@
<usage>
<p>
The <directive>FileETag</directive> directive configures the file
- attributes that are used to create the ETag (entity tag) response
- header field when the document is based on a file. (The ETag
- value is used in cache management to save network bandwidth.) In
- Apache 1.3.22 and earlier, the ETag value was <em>always</em> formed
- from the file's inode, size, and last-modified time (mtime). The
- FileETag directive allows you to choose which of these -- if any
- -- should be used. The recognized keywords are:
+ attributes that are used to create the <code>ETag</code> (entity
+ tag) response header field when the document is based on a file.
+ (The <code>ETag</code> value is used in cache management to save
+ network bandwidth.) In Apache 1.3.22 and earlier, the
+ <code>ETag</code> value was <em>always</em> formed
+ from the file's inode, size, and last-modified time (mtime). The
+ <directive>FileETag</directive> directive allows you to choose
+ which of these -- if any -- should be used. The recognized keywords are:
</p>
<dl>
@@ -931,8 +954,8 @@
<dd>All available fields will be used. This is equivalent to:
<example>FileETag INode MTime Size</example></dd>
<dt><strong>None</strong></dt>
- <dd>If a document is file-based, no ETag field will be included in the
- response</dd>
+ <dd>If a document is file-based, no <code>ETag</code> field will be
+ included in the response</dd>
</dl>
<p>The <code>INode</code>, <code>MTime</code>, and <code>Size</code>
@@ -963,10 +986,10 @@
<usage>
<p>The <directive type="section">Files</directive> directive
provides for access control by filename. It is comparable to the
- <directive module="core" type="directive">Directory</directive>
+ <directive module="core" type="section">Directory</directive>
directive and <directive module="core"
- type="directive">Location</directive> directives. It should be
- matched with a <code></Files></code> directive. The
+ type="section">Location</directive> directives. It should be
+ matched with a <directive type="section">Files</directive> directive. The
directives given within this section will be applied to any object
with a basename (last component of filename) matching the
specified filename. <directive type="section">Files</directive>
@@ -981,8 +1004,8 @@
portion of the filesystem they apply to.</p>
<p>The <var>filename</var> argument should include a filename, or
- a wild-card string, where `?' matches any single character, and
- `*' matches any sequences of characters. Extended regular
+ a wild-card string, where <code>?</code> matches any single character,
+ and <code>*</code> matches any sequences of characters. Extended regular
expressions can also be used, with the addition of the
<code>~</code> character. For example:</p>
@@ -990,22 +1013,21 @@
<Files ~ "\.(gif|jpe?g|png)$">
</example>
- <p>would match most common Internet graphics formats. In Apache 1.3
- and later, <directive module="core"
- type="section">FilesMatch</directive> is preferred, however.</p>
+ <p>would match most common Internet graphics formats. <directive
+ module="core" type="section">FilesMatch</directive> is preferred,
+ however.</p>
<p>Note that unlike <directive type="section"
module="core">Directory</directive> and <directive type="section"
module="core">Location</directive> sections, <directive
type="section">Files</directive> sections can be used inside
- .htaccess files. This allows users to control access to their own
- files, at a file-by-file level.</p>
+ <code>.htaccess</code> files. This allows users to control access to
+ their own files, at a file-by-file level.</p>
</usage>
-<seealso><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
- explanation of how these different sections are combined when a
- request is received</seealso>
+<seealso><a href="../sections.html">How <Directory>, <Location>
+ and <Files> sections work</a> for an explanation of how these
+ different sections are combined when a request is received</seealso>
</directivesynopsis>
<directivesynopsis type="section">
@@ -1031,10 +1053,9 @@
<p>would match most common Internet graphics formats.</p>
</usage>
-<seealso><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
- explanation of how these different sections are combined when a
- request is received</seealso>
+<seealso><a href="../sections.html">How <Directory>, <Location>
+ and <Files> sections work</a> for an explanation of how these
+ different sections are combined when a request is received</seealso>
</directivesynopsis>
<directivesynopsis>
@@ -1050,13 +1071,13 @@
<usage>
<p>When placed into an <code>.htaccess</code> file or a
<directive type="section" module="core">Directory</directive>, or
- <directive type="section" module="core">Location</directive> or
+ <directive type="section" module="core">Location</directive> or
<directive type="section" module="core">Files</directive>
section, this directive forces all matching files to be served
with the content type identification given by
<var>MIME-type</var>. For example, if you had a directory full of
- GIF files, but did not want to label them all with ".gif", you
- might want to use:</p>
+ GIF files, but did not want to label them all with <code>.gif</code>,
+ you might want to use:</p>
<example>
ForceType image/gif
@@ -1090,50 +1111,50 @@
<directivesynopsis>
<name>HostnameLookups</name>
<description>Enables DNS lookups on client IP addresses</description>
-<syntax>HostnameLookups on|off|double</syntax>
-<default>HostnameLookups off</default>
+<syntax>HostnameLookups On|Off|Double</syntax>
+<default>HostnameLookups Off</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context></contextlist>
<usage>
<p>This directive enables DNS lookups so that host names can be
logged (and passed to CGIs/SSIs in <code>REMOTE_HOST</code>).
- The value <code>double</code> refers to doing double-reverse
- DNS. That is, after a reverse lookup is performed, a forward
+ The value <code>Double</code> refers to doing double-reverse
+ DNS lookup. That is, after a reverse lookup is performed, a forward
lookup is then performed on that result. At least one of the ip
addresses in the forward lookup must match the original
address. (In "tcpwrappers" terminology this is called
<code>PARANOID</code>.)</p>
- <p>Regardless of the setting, when <module>mod_authz_host</module> is
+ <p>Regardless of the setting, when <module>mod_access</module> is
used for controlling access by hostname, a double reverse lookup
will be performed. This is necessary for security. Note that the
result of this double-reverse isn't generally available unless you
- set <code>HostnameLookups double</code>. For example, if only
- <code>HostnameLookups on</code> and a request is made to an object
+ set <code>HostnameLookups Double</code>. For example, if only
+ <code>HostnameLookups On</code> and a request is made to an object
that is protected by hostname restrictions, regardless of whether
the double-reverse fails or not, CGIs will still be passed the
single-reverse result in <code>REMOTE_HOST</code>.</p>
- <p>The default is off in order to save the network
+ <p>The default is <code>Off</code> in order to save the network
traffic for those sites that don't truly need the reverse
lookups done. It is also better for the end users because they
don't have to suffer the extra latency that a lookup entails.
Heavily loaded sites should leave this directive
- <code>off</code>, since DNS lookups can take considerable
+ <code>Off</code>, since DNS lookups can take considerable
amounts of time. The utility <a
- href="../programs/logresolve.html">logresolve</a>, provided in
- the <var>/support</var> directory, can be used to look up host
- names from logged IP addresses offline.</p>
+ href="../programs/logresolve.html">logresolve</a>, compiled by default
+ to the <code>bin</code> subdirectory of your installation directory, can
+ be used to look up host names from logged IP addresses offline.</p>
</usage>
</directivesynopsis>
<directivesynopsis>
<name>IdentityCheck</name>
-<description>Enables logging of the RFC1413 identity of the remote
+<description>Enables logging of the RFC1413 identity of the remote
user</description>
-<syntax>IdentityCheck on|off</syntax>
-<default>IdentityCheck off</default>
+<syntax>IdentityCheck On|Off</syntax>
+<default>IdentityCheck Off</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context></contextlist>
<usage>
@@ -1215,7 +1236,7 @@
<description>Encloses directives that are processed conditional on the
presence or absence of a specific module</description>
<syntax><IfModule [!]<var>module-name</var>> ...
- </IfModule></syntax>
+ </IfModule></syntax>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context>
</contextlist>
@@ -1223,8 +1244,8 @@
<usage>
<p>The <code><IfModule <var>test</var>>...</IfModule></code>
- section is used to mark directives that are conditional on the presence of a
- specific module. The directives within an <directive type="section"
+ section is used to mark directives that are conditional on the presence of
+ a specific module. The directives within an <directive type="section"
>IfModule</directive> section are only processed if the <var>test</var>
is true. If <var>test</var> is false, everything between the start and
end markers is ignored.</p>
@@ -1258,7 +1279,7 @@
<note>This section should only be used if you need to have one
configuration file that works whether or not a specific module
- is available. In normal operation, directives need not be
+ is available. In normal operation, directives need not be
placed in <directive type="section">IfModule</directive>
sections.</note>
</usage>
@@ -1278,8 +1299,8 @@
<p>This directive allows inclusion of other configuration files
from within the server configuration files.</p>
- <p>Shell-style (fnmatch) wildcard characters can be used to
- include several files at once, in alphabetical order. In
+ <p>Shell-style (<code>fnmatch()</code>) wildcard characters can be used to
+ include several files at once, in alphabetical order. In
addition, if <directive>Include</directive> points to a directory,
rather than a file, Apache will read all files in that directory
and any subdirectory. But including entire directories is not
@@ -1288,7 +1309,7 @@
fail.</p>
<p>The file path specified may be a fully qualified path (i.e.
- starting with a slash), or may be relative to the
+ starting with a slash), or may be relative to the
<directive module="core">ServerRoot</directive> directory.</p>
<p>Examples:</p>
@@ -1325,7 +1346,7 @@
<directivesynopsis>
<name>KeepAlive</name>
<description>Enables HTTP persistent connections</description>
-<syntax>KeepAlive on|off</syntax>
+<syntax>KeepAlive On|Off</syntax>
<default>KeepAlive On</default>
<contextlist><context>server config</context><context>virtual host</context>
</contextlist>
@@ -1336,8 +1357,8 @@
which allow multiple requests to be sent over the same TCP
connection. In some cases this has been shown to result in an
almost 50% speedup in latency times for HTML documents with
- many images. To enable Keep-Alive connections in Apache 1.2 and
- later, set <code>KeepAlive On</code>.</p>
+ many images. To enable Keep-Alive connections, set
+ <code>KeepAlive On</code>.</p>
<p>For HTTP/1.0 clients, Keep-Alive connections will only be
used if they are specifically requested by a client. In
@@ -1380,7 +1401,7 @@
<directivesynopsis type="section">
<name>Limit</name>
<description>Restrict enclosed access controls to only certain HTTP
-methods</description>
+methods</description>
<syntax><Limit <var>method</var> [<var>method</var>] ... > ...
</Limit></syntax>
<contextlist><context>server config</context><context>virtual host</context>
@@ -1398,10 +1419,11 @@
<p>The purpose of the <directive type="section">Limit</directive>
directive is to restrict the effect of the access controls to the
nominated HTTP methods. For all other methods, the access
- restrictions that are enclosed in the <code><Limit></code>
- bracket <strong>will have no effect</strong>. The following
- example applies the access control only to the methods POST, PUT,
- and DELETE, leaving all other methods unprotected:</p>
+ restrictions that are enclosed in the <directive
+ type="section">Limit</directive> bracket <strong>will have no
+ effect</strong>. The following example applies the access control
+ only to the methods <code>POST</code>, <code>PUT</code>, and
+ <code>DELETE</code>, leaving all other methods unprotected:</p>
<example>
<Limit POST PUT DELETE><br />
@@ -1425,7 +1447,7 @@
<directivesynopsis type="section">
<name>LimitExcept</name>
<description>Restrict access controls to all HTTP methods
-except the named ones</description>
+except the named ones</description>
<syntax><LimitExcept <var>method</var> [<var>method</var>] ... > ...
</LimitExcept></syntax>
<contextlist><context>server config</context><context>virtual host</context>
@@ -1437,7 +1459,7 @@
<p><directive type="section">LimitExcept</directive> and
<code></LimitExcept></code> are used to enclose
a group of access control directives which will then apply to any
- HTTP access method <strong>not</strong> listed in the arguments;
+ HTTP access method <strong>not</strong> listed in the arguments;
i.e., it is the opposite of a <directive type="section"
module="core">Limit</directive> section and can be used to control
both standard and nonstandard/unrecognized methods. See the
@@ -1483,10 +1505,10 @@
response instead of servicing the request. The size of a normal
request message body will vary greatly depending on the nature of
the resource and the methods allowed on that resource. CGI scripts
- typically use the message body for passing form information to the
- server. Implementations of the PUT method will require a value at
- least as large as any representation that the server wishes to
- accept for that resource.</p>
+ typically use the message body for retrieving form information.
+ Implementations of the <code>PUT</code> method will require
+ a value at least as large as any representation that the server
+ wishes to accept for that resource.</p>
<p>This directive gives the server administrator greater
control over abnormal client request behavior, which may be
@@ -1494,7 +1516,7 @@
attacks.</p>
<p>If, for example, you are permitting file upload to a particular
- location, and wich to limit the size of the uploaded file to 100K,
+ location, and wish to limit the size of the uploaded file to 100K,
you might use the following directive:</p>
<example>
@@ -1506,7 +1528,7 @@
<directivesynopsis>
<name>LimitRequestFields</name>
-<description>Limits the number of HTTP request header fields that
+<description>Limits the number of HTTP request header fields that
will be accepted from the client</description>
<syntax>LimitRequestFields <var>number</var></syntax>
<default>LimitRequestFields 100</default>
@@ -1560,7 +1582,7 @@
distributed) that will be allowed in an HTTP request
header.</p>
- <p>The <directive>LimitRequestFieldsize</directive> directive
+ <p>The <directive>LimitRequestFieldSize</directive> directive
allows the server administrator to reduce the limit on the allowed
size of an HTTP request header field below the normal input buffer
size compiled with the server. A server needs this value to be
@@ -1577,7 +1599,7 @@
<p>For example:</p>
<example>
- LimitRequestFieldSize 16380
+ LimitRequestFieldSize 4094
</example>
<note>Under normal conditions, the value should not be changed from
@@ -1609,7 +1631,7 @@
restriction on the length of a request-URI allowed for a request
on the server. A server needs this value to be large enough to
hold any of its resource names, including any information that
- might be passed in the query part of a GET request.</p>
+ might be passed in the query part of a <code>GET</code> request.</p>
<p>This directive gives the server administrator greater
control over abnormal client request behavior, which may be
@@ -1618,7 +1640,7 @@
<p>For example:</p>
<example>
- LimitRequestLine 16380
+ LimitRequestLine 4094
</example>
<note>Under normal conditions, the value should not be changed from
@@ -1629,7 +1651,7 @@
<directivesynopsis>
<name>LimitXMLRequestBody</name>
<description>Limits the size of an XML-based request body</description>
-<syntax>LimitXMLRequestBody <var>number</var></syntax>
+<syntax>LimitXMLRequestBody <var>bytes</var></syntax>
<default>LimitXMLRequestBody 1000000</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context></contextlist>
@@ -1653,7 +1675,7 @@
<description>Applies the enclosed directives only to matching
URLs</description>
<syntax><Location
- URL-path|URL> ... </Location></syntax>
+ <var>URL-path</var>|<var>URL</var>> ... </Location></syntax>
<contextlist><context>server config</context><context>virtual host</context>
</contextlist>
@@ -1670,8 +1692,9 @@
type="section" module="core">Files</directive> sections.</p>
<p>Note that URLs do not have to line up with the filesystem at
- all, it should be emphasized that <Location> operates
- completely outside the filesystem.</p>
+ all, it should be emphasized that <directive
+ type="section">Location</directive> operates completely
+ outside the filesystem.</p>
<p>For all origin (non-proxy) requests, the URL to be matched is a
URL-path of the form <code>/path/</code>. No scheme, hostname,
@@ -1680,8 +1703,8 @@
<code>scheme://servername/path</code>, and you must include the
prefix.</p>
- <p>The URL may use wildcards In a wild-card string, `?' matches
- any single character, and `*' matches any sequences of
+ <p>The URL may use wildcards. In a wild-card string, <code>?</code> matches
+ any single character, and <code>*</code> matches any sequences of
characters.</p>
<p>Extended regular
@@ -1692,17 +1715,17 @@
<Location ~ "/(extra|special)/data">
</example>
- <p>would match URLs that contained the substring "/extra/data" or
- "/special/data". In Apache 1.3 and above, a new directive
- <directive type="section" module="core">LocationMatch</directive>
- exists which behaves identical to the regex version of
- <directive type="section">Location</directive>.</p>
+ <p>would match URLs that contained the substring <code>/extra/data</code>
+ or <code>/special/data</code>. The directive <directive
+ type="section" module="core">LocationMatch</directive> behaves
+ identical to the regex version of <directive
+ type="section">Location</directive>.</p>
<p>The <directive type="section">Location</directive>
functionality is especially useful when combined with the
<directive module="core">SetHandler</directive>
directive. For example, to enable status requests, but allow them
- only from browsers at foo.com, you might use:</p>
+ only from browsers at <code>foo.com</code>, you might use:</p>
<example>
<Location /status><br />
@@ -1725,7 +1748,7 @@
directive and the regex version of <directive type="section"
>Location</directive> require you to explicitly specify multiple
slashes if that is your intention.</p>
-
+
<p>For example, <code><LocationMatch ^/abc></code> would match
the request URL <code>/abc</code> but not the request URL <code>
//abc</code>. The (non-regex) <directive type="section"
@@ -1737,15 +1760,14 @@
request is to <code>/abc//def</code> then it will match.</p>
</note>
</usage>
-<seealso><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
- explanation of how these different sections are combined when a
- request is received</seealso>
+<seealso><a href="../sections.html">How <Directory>, <Location>
+ and <Files> sections work</a> for an explanation of how these
+ different sections are combined when a request is received</seealso>
</directivesynopsis>
<directivesynopsis type="section">
<name>LocationMatch</name>
-<description>Applies the enclosed directives only to regular-expression
+<description>Applies the enclosed directives only to regular-expression
matching URLs</description>
<syntax><LocationMatch
<var>regex</var>> ... </LocationMatch></syntax>
@@ -1767,10 +1789,9 @@
or <code>/special/data</code>.</p>
</usage>
-<seealso><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
- explanation of how these different sections are combined when a
- request is received</seealso>
+<seealso><a href="../sections.html">How <Directory>, <Location>
+ and <Files> sections work</a> for an explanation of how these
+ different sections are combined when a request is received</seealso>
</directivesynopsis>
<directivesynopsis>
@@ -1884,7 +1905,7 @@
<directivesynopsis>
<name>MaxKeepAliveRequests</name>
-<description>Number of requests allowed on a persistent
+<description>Number of requests allowed on a persistent
connection</description>
<syntax>MaxKeepAliveRequests <var>number</var></syntax>
<default>MaxKeepAliveRequests 100</default>
@@ -1895,7 +1916,7 @@
<p>The <directive>MaxKeepAliveRequests</directive> directive
limits the number of requests allowed per connection when
<directive module="core" >KeepAlive</directive> is on. If it is
- set to "<code>0</code>", unlimited requests will be allowed. We
+ set to <code>0</code>, unlimited requests will be allowed. We
recommend that this setting be kept to a high value for maximum
server performance.</p>
@@ -1936,11 +1957,14 @@
servicing the requests. If you have multiple name-based hosts on
multiple addresses, repeat the directive for each address.</p>
- <p>Note: the "main server" and any _default_ servers will
- <strong>never</strong> be served for a request to a
- <directive>NameVirtualHost</directive> IP Address (unless for some
- reason you specify <directive>NameVirtualHost</directive> but then
- don't define any VirtualHosts for that address).</p>
+ <note><title>Note</title>
+ <p>Note, that the "main server" and any <code>_default_</code> servers
+ will <strong>never</strong> be served for a request to a
+ <directive>NameVirtualHost</directive> IP Address (unless for some
+ reason you specify <directive>NameVirtualHost</directive> but then
+ don't define any <directive>VirtualHost</directive>s for that
+ address).</p>
+ </note>
<p>Optionally you can specify a port number on which the
name-based virtual hosts should be used, e.g.</p>
@@ -1951,20 +1975,22 @@
<p>IPv6 addresses must be enclosed in square brackets, as shown
in the following example:</p>
-
+
<example>
NameVirtualHost [fe80::a00:20ff:fea7:ccea]:8080
</example>
<p>To receive requests on all interfaces, you can use an argument of
- *</p>
+ <code>*</code></p>
<example>
NameVirtualHost *
</example>
- <note><title>Argument to <VirtualHost> directive</title>
- <p>Note that the argument to the <VirtualHost> directive must
+ <note><title>Argument to <directive type="section">VirtualHost</directive>
+ directive</title>
+ <p>Note that the argument to the <directive
+ type="section">VirtualHost</directive> directive must
exactly match the argument to the <directive
>NameVirtualHost</directive> directive.</p>
@@ -2003,17 +2029,17 @@
the following:</p>
<dl>
- <dt>All</dt>
+ <dt><code>All</code></dt>
- <dd>All options except for MultiViews. This is the default
+ <dd>All options except for <code>MultiViews</code>. This is the default
setting.</dd>
- <dt>ExecCGI</dt>
+ <dt><code>ExecCGI</code></dt>
<dd>
Execution of CGI scripts is permitted.</dd>
- <dt>FollowSymLinks</dt>
+ <dt><code>FollowSymLinks</code></dt>
<dd>
@@ -2027,34 +2053,35 @@
section.</p>
</note></dd>
- <dt>Includes</dt>
+ <dt><code>Includes</code></dt>
<dd>
Server-side includes are permitted.</dd>
- <dt>IncludesNOEXEC</dt>
+ <dt><code>IncludesNOEXEC</code></dt>
<dd>
- Server-side includes are permitted, but the #exec command and
- #exec CGI are disabled. It is still possible to #include
- virtual CGI scripts from ScriptAliase'd directories.</dd>
+ Server-side includes are permitted, but the <code>#exec cmd</code>
+ and <code>#exec cgi</code> are disabled. It is still possible to
+ <code>#include virtual</code> CGI scripts from
+ <directive>ScriptAlias</directive>e'd directories.</dd>
- <dt>Indexes</dt>
+ <dt><code>Indexes</code></dt>
<dd>
If a URL which maps to a directory is requested, and the
- there is no DirectoryIndex (<em>e.g.</em>, index.html) in
- that directory, then the server will return a formatted
- listing of the directory.</dd>
+ there is no <directive>DirectoryIndex</directive> (<em>e.g.</em>,
+ <code>index.html</code>) in that directory, then the server will
+ return a formatted listing of the directory.</dd>
- <dt>MultiViews</dt>
+ <dt><code>MultiViews</code></dt>
<dd>
<a href="../content-negotiation.html">Content negotiated</a>
- MultiViews are allowed.</dd>
+ "MultiViews" are allowed.</dd>
- <dt>SymLinksIfOwnerMatch</dt>
+ <dt><code>SymLinksIfOwnerMatch</code></dt>
<dd>
@@ -2067,13 +2094,14 @@
<p>Normally, if multiple <directive>Options</directive> could apply to a
directory, then the most specific one is taken complete; the
options are not merged. However if <em>all</em> the options on
- the <directive>Options</directive> directive are preceded by a + or -
- symbol, the options are merged. Any options preceded by a + are
- added to the options currently in force, and any options
- preceded by a - are removed from the options currently in
+ the <directive>Options</directive> directive are preceded by a
+ <code>+</code> or <code>-</code>
+ symbol, the options are merged. Any options preceded by a <code>+</code>
+ are added to the options currently in force, and any options
+ preceded by a <code>-</code> are removed from the options currently in
force. </p>
- <p>For example, without any + and - symbols:</p>
+ <p>For example, without any <code>+</code> and <code>-</code> symbols:</p>
<example>
<Directory /web/docs><br />
@@ -2090,8 +2118,9 @@
</example>
<p>then only <code>Includes</code> will be set for the
- /web/docs/spec directory. However if the second
- <directive>Options</directive> directive uses the + and - symbols:</p>
+ <code>/web/docs/spec</code> directory. However if the second
+ <directive>Options</directive> directive uses the <code>+</code> and
+ <code>-</code> symbols:</p>
<example>
<Directory /web/docs><br />
@@ -2108,12 +2137,15 @@
</example>
<p>then the options <code>FollowSymLinks</code> and
- <code>Includes</code> are set for the /web/docs/spec directory.</p>
-
+ <code>Includes</code> are set for the <code>/web/docs/spec</code>
+ directory.</p>
- <p><strong>Note:</strong> Using <code>-IncludesNOEXEC</code> or
- <code>-Includes</code> disables server-side includes completely
- regardless of the previous setting.</p>
+
+ <note><title>Note</title>
+ <p>Using <code>-IncludesNOEXEC</code> or
+ <code>-Includes</code> disables server-side includes completely
+ regardless of the previous setting.</p>
+ </note>
<p>The default in the absence of any other settings is
<code>All</code>.</p>
@@ -2123,7 +2155,7 @@
<directivesynopsis>
<name>Require</name>
<description>Selects which authenticated users can access
-a resource</description>
+a resource</description>
<syntax>Require <var>entity-name</var> [<var>entity-name</var>] ...</syntax>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
@@ -2133,33 +2165,24 @@
<p>This directive selects which authenticated users can access
a directory. The allowed syntaxes are:</p>
- <ul>
- <li>
- Require user <var>userid</var> [<var>userid</var>] ...
+ <dl>
+ <dt><code>Require user <var>userid</var> [<var>userid</var>]
+ ...</code></dt>
+ <dd>Only the named users can access the resource.</dd>
- <p>Only the named users can access the directory.</p>
- </li>
+ <dt><code>Require group <var>group-name</var> [<var>group-name</var>]
+ ...</code></dt>
+ <dd>Only users in the named groups can access the resource.</dd>
- <li>
- Require group <var>group-name</var> [<var>group-name</var>] ...
-
-
- <p>Only users in the named groups can access the
- directory.</p>
- </li>
-
- <li>
- Require valid-user
-
- <p>All valid users can access the directory.</p>
- </li>
- </ul>
+ <dt><code>Require valid-user</code></dt>
+ <dd>All valid users can access the resource.</dd>
+ </dl>
<p><directive>Require</directive> must be accompanied by
<directive module="core">AuthName</directive> and <directive
module="core">AuthType</directive> directives, and directives such
- as <directive module="mod_authn_file">AuthUserFile</directive>
- and <directive module="mod_authz_groupfile">AuthGroupFile</directive> (to
+ as <directive module="mod_auth">AuthUserFile</directive>
+ and <directive module="mod_auth">AuthGroupFile</directive> (to
define users and groups) in order to work correctly. Example:</p>
<example>
@@ -2179,14 +2202,14 @@
section.</p>
</usage>
<seealso><directive module="core">Satisfy</directive></seealso>
-<seealso><module>mod_authz_host</module></seealso>
+<seealso><module>mod_access</module></seealso>
</directivesynopsis>
<directivesynopsis>
<name>RLimitCPU</name>
<description>Limits the CPU consumption of processes launched
by Apache children</description>
-<syntax>RLimitCPU <var>number</var>|max [<var>number</var>|max]</syntax>
+<syntax>RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</syntax>
<default>Unset; uses operating system defaults</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context></contextlist>
@@ -2199,7 +2222,7 @@
or <code>max</code> to indicate to the server that the limit should
be set to the maximum allowed by the operating system
configuration. Raising the maximum resource limit requires that
- the server is running as root, or in the initial startup
+ the server is running as <code>root</code>, or in the initial startup
phase.</p>
<p>This applies to processes forked off from Apache children
@@ -2219,7 +2242,7 @@
<name>RLimitMEM</name>
<description>Limits the memory consumption of processes launched
by Apache children</description>
-<syntax>RLimitMEM <var>number</var>|max [<var>number</var>|max]</syntax>
+<syntax>RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</syntax>
<default>Unset; uses operating system defaults</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context></contextlist>
@@ -2232,7 +2255,7 @@
or <code>max</code> to indicate to the server that the limit should
be set to the maximum allowed by the operating system
configuration. Raising the maximum resource limit requires that
- the server is running as root, or in the initial startup
+ the server is running as <code>root</code>, or in the initial startup
phase.</p>
<p>This applies to processes forked off from Apache children
@@ -2250,7 +2273,7 @@
<directivesynopsis>
<name>RLimitNPROC</name>
-<description>Limits the number of processes that can be launched by
+<description>Limits the number of processes that can be launched by
processes launched by Apache children</description>
<syntax>RLimitNPROC <var>number</var>|max [<var>number</var>|max]</syntax>
<default>Unset; uses operating system defaults</default>
@@ -2265,7 +2288,7 @@
or <code>max</code> to indicate to the server that the limit
should be set to the maximum allowed by the operating system
configuration. Raising the maximum resource limit requires that
- the server is running as root, or in the initial startup
+ the server is running as <code>root</code>, or in the initial startup
phase.</p>
<p>This applies to processes forked off from Apache children
@@ -2276,12 +2299,14 @@
<p>Process limits control the number of processes per user.</p>
- <p>Note: If CGI processes are <strong>not</strong> running
- under userids other than the web server userid, this directive
- will limit the number of processes that the server itself can
- create. Evidence of this situation will be indicated by
- <strong><code>cannot fork</code></strong> messages in the
- error_log.</p>
+ <note><title>Note</title>
+ <p>If CGI processes are <strong>not</strong> running
+ under userids other than the web server userid, this directive
+ will limit the number of processes that the server itself can
+ create. Evidence of this situation will be indicated by
+ <strong><code>cannot fork</code></strong> messages in the
+ <code>error_log</code>.</p>
+ </note>
</usage>
<seealso><directive module="core">RLimitMEM</directive></seealso>
<seealso><directive module="core">RLimitCPU</directive></seealso>
@@ -2289,24 +2314,24 @@
<directivesynopsis>
<name>Satisfy</name>
-<description>Interaction between host-level access control and
+<description>Interaction between host-level access control and
user authentication</description>
-<syntax>Satisfy any|all</syntax>
-<default>Satisfy all</default>
+<syntax>Satisfy Any|All</syntax>
+<default>Satisfy All</default>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>AuthConfig</override>
<usage>
<p>Access policy if both <directive
- module="mod_authz_host">Allow</directive> and <directive
+ module="mod_access">Allow</directive> and <directive
module="core">Require</directive> used. The parameter can be
- either <var>all</var> or <var>any</var>. This directive is only
+ either <code>All</code> or <code>Any</code>. This directive is only
useful if access to a particular area is being restricted by both
username/password <em>and</em> client host address. In this case
- the default behavior (<var>all</var>) is to require that the client passes
- the address access restriction <em>and</em> enters a valid
- username and password. With the "any" option the client will be
+ the default behavior (<code>All</code>) is to require that the client
+ passes the address access restriction <em>and</em> enters a valid
+ username and password. With the <code>Any</code> option the client will be
granted access if they either pass the host restriction or enter a
valid username and password. This can be used to password restrict
an area, but to let clients from particular addresses in without
@@ -2320,32 +2345,40 @@
<example>
Require valid-user<br />
Allow from 192.168.1<br />
- Satisfy any
+ Satisfy Any
</example>
-
+
</usage>
- <seealso><directive module="mod_authz_host">Allow</directive></seealso>
+ <seealso><directive module="mod_access">Allow</directive></seealso>
<seealso><directive module="core">Require</directive></seealso>
</directivesynopsis>
<directivesynopsis>
<name>ScriptInterpreterSource</name>
-<description>Technique for locating the interpreter for CGI
+<description>Technique for locating the interpreter for CGI
scripts</description>
-<syntax>ScriptInterpreterSource registry|script</syntax>
-<default>ScriptInterpreterSource script</default>
+<syntax>ScriptInterpreterSource Registry|Registry-Strict|Script</syntax>
+<default>ScriptInterpreterSource Script</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
-<compatibility>Win32 only</compatibility>
+<compatibility>Win32 only<br />
+option <code>Registry-Strict</code> is available in Apache 2.0 and
+later</compatibility>
<usage>
<p>This directive is used to control how Apache finds the
interpreter used to run CGI scripts. The default technique is to
- use the interpreter pointed to by the #! line in the
- script. Setting <code>ScriptInterpreterSource registry</code> will
+ use the interpreter pointed to by the <code>#!</code> line in the
+ script.</p>
+
+ <p>Setting <code>ScriptInterpreterSource Registry</code> will
cause the Windows Registry to be searched using the script file
- extension (e.g., .pl) as a search key.</p>
+ extension (e.g., <code>.pl</code>) as a search key.</p>
+
+ <p>The option <code>Registry-Strict</code> which is new in Apache 2.0
+ does the same as <code>Registry</code> but uses a more strict registry
+ search.</p>
</usage>
</directivesynopsis>
@@ -2409,7 +2442,7 @@
<usage>
<p>The <directive>ServerName</directive> directive sets the hostname and
port that the server uses to identify itself. This is used when
- creating redirection URLs. For example, if the name of the
+ creating redirection URLs. For example, if the name of the
machine hosting the webserver is <code>simple.example.com</code>,
but the machine also has the DNS alias <code>www.example.com</code>
and you wish the webserver to be so identified, the following
@@ -2421,9 +2454,9 @@
<p>If no <directive>ServerName</directive> is specified, then the
server attempts to deduce the hostname by performing a reverse
- lookup on the IP address. If no port is specified in the
+ lookup on the IP address. If no port is specified in the
servername, then the server will use the port from the incoming
- request. For optimal reliability and predictability, you should
+ request. For optimal reliability and predictability, you should
specify an explicit hostname and port using the
<directive>ServerName</directive> directive.</p>
@@ -2442,7 +2475,8 @@
</p>
</usage>
-<seealso><a href="../dns-caveats.html">DNS Issues</a></seealso>
+<seealso><a href="../dns-caveats.html">Issues Regarding DNS and
+Apache</a></seealso>
<seealso><a href="../vhosts/">Apache virtual host
documentation</a></seealso>
<seealso><directive module="core">UseCanonicalName</directive></seealso>
@@ -2452,7 +2486,7 @@
<directivesynopsis>
<name>ServerPath</name>
-<description>Legacy URL pathname for a name-virtual host that
+<description>Legacy URL pathname for a name-based virtual host that
is accessed by an incompatible browser</description>
<syntax>ServerPath <var>URL-path</var></syntax>
<contextlist><context>virtual host</context></contextlist>
@@ -2488,7 +2522,7 @@
option to <code>httpd</code></a></seealso>
<seealso><a href="../misc/security_tips.html#serverroot">the
security tips</a> for information on how to properly set
- permissions on the ServerRoot</seealso>
+ permissions on the <directive>ServerRoot</directive></seealso>
</directivesynopsis>
<directivesynopsis>
@@ -2504,12 +2538,14 @@
<usage>
<p>The <directive>ServerSignature</directive> directive allows the
configuration of a trailing footer line under server-generated
- documents (error messages, mod_proxy ftp directory listings,
- mod_info output, ...). The reason why you would want to enable
- such a footer line is that in a chain of proxies, the user often
- has no possibility to tell which of the chained servers actually
- produced a returned error message.<br /> The <code>Off</code>
- setting, which is the default, suppresses the error line (and is
+ documents (error messages, <module>mod_proxy</module> ftp directory
+ listings, <module>mod_info</module> output, ...). The reason why you
+ would want to enable such a footer line is that in a chain of proxies,
+ the user often has no possibility to tell which of the chained servers
+ actually produced a returned error message.</p>
+
+ <p>The <code>Off</code>
+ setting, which is the default, suppresses the footer line (and is
therefore compatible with the behavior of Apache-1.2 and
below). The <code>On</code> setting simply adds a line with the
server version number and <directive
@@ -2528,8 +2564,9 @@
<directivesynopsis>
<name>ServerTokens</name>
-<description>Configures the Server HTTP response header</description>
-<syntax>ServerTokens Major|Minor|Minimal|ProductOnly|OS|Full</syntax>
+<description>Configures the <code>Server</code> HTTP response
+header</description>
+<syntax>ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</syntax>
<default>ServerTokens Full</default>
<contextlist><context>server config</context></contextlist>
@@ -2585,7 +2622,7 @@
<name>SetHandler</name>
<description>Forces all matching files to be processed by a
handler</description>
-<syntax>SetHandler <var>handler-name</var>|none</syntax>
+<syntax>SetHandler <var>handler-name</var>|None</syntax>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context>
</contextlist>
@@ -2594,7 +2631,7 @@
<usage>
<p>When placed into an <code>.htaccess</code> file or a
- <directive type="section" module="core">Directory</directive> or
+ <directive type="section" module="core">Directory</directive> or
<directive type="section" module="core">Location</directive>
section, this directive forces all matching files to be parsed
through the <a href="../handler.html">handler</a> given by
@@ -2610,7 +2647,7 @@
<p>Another example: if you wanted to have the server display a
status report whenever a URL of
<code>http://servername/status</code> was called, you might put
- the following into httpd.conf:</p>
+ the following into <code>httpd.conf</code>:</p>
<example>
<Location /status><br />
@@ -2691,7 +2728,7 @@
<name>TimeOut</name>
<description>Amount of time the server will wait for
certain events before failing a request</description>
-<syntax>TimeOut <var>number</var></syntax>
+<syntax>TimeOut <var>seconds</var></syntax>
<default>TimeOut 300</default>
<contextlist><context>server config</context></contextlist>
@@ -2709,7 +2746,7 @@
<li>The amount of time between ACKs on transmissions of TCP
packets in responses.</li>
</ol>
-
+
<p>We plan on making these separately configurable at some point
down the road. The timer used to default to 1200 before 1.2,
but has been lowered to 300 which is still far more than
@@ -2723,27 +2760,27 @@
<name>UseCanonicalName</name>
<description>Configures how the server determines its own name and
port</description>
-<syntax>UseCanonicalName on|off|dns</syntax>
-<default>UseCanonicalName on</default>
+<syntax>UseCanonicalName On|Off|DNS</syntax>
+<default>UseCanonicalName On</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context></contextlist>
<usage>
<p>In many situations Apache must construct a <em>self-referential</em>
URL -- that is, a URL that refers back to the same server. With
- <code>UseCanonicalName on</code> Apache will use the hostname and port
+ <code>UseCanonicalName On</code> Apache will use the hostname and port
specified in the <directive module="core">ServerName</directive>
directive to construct the canonical name for the server. This name
is used in all self-referential URLs, and for the values of
<code>SERVER_NAME</code> and <code>SERVER_PORT</code> in CGIs.</p>
- <p>With <code>UseCanonicalName off</code> Apache will form
+ <p>With <code>UseCanonicalName Off</code> Apache will form
self-referential URLs using the hostname and port supplied by
the client if any are supplied (otherwise it will use the
canonical name, as defined above). These values are the same
- that are used to implement <a
+ that are used to implement <a
href="../vhosts/name-based.html">name based virtual hosts</a>,
- and are available with the same clients. The CGI variables
+ and are available with the same clients. The CGI variables
<code>SERVER_NAME</code> and <code>SERVER_PORT</code> will be
constructed from the client supplied values as well.</p>
@@ -2759,8 +2796,8 @@
for <code>www.domain.com</code> -- see <a
href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">the
FAQ on this subject for more information</a>). But if
- <directive>UseCanonicalName</directive> is set off, then Apache will
- redirect to <code>http://www/splat/</code>.</p>
+ <directive>UseCanonicalName</directive> is set <code>Off</code>, then
+ Apache will redirect to <code>http://www/splat/</code>.</p>
<p>There is a third option, <code>UseCanonicalName DNS</code>,
which is intended for use with mass IP-based virtual hosting to
@@ -2769,7 +2806,7 @@
reverse DNS lookup on the server IP address that the client
connected to in order to work out self-referential URLs.</p>
- <note type="warning"><title>Warning:</title>
+ <note type="warning"><title>Warning</title>
<p>If CGIs make assumptions about the values of <code>SERVER_NAME</code>
they may be broken by this option. The client is essentially free
to give whatever value they want as a hostname. But if the CGI is
@@ -2784,7 +2821,7 @@
<directivesynopsis type="section">
<name>VirtualHost</name>
<description>Contains directives that apply only to a specific
-hostname or IP address</description>
+hostname or IP address</description>
<syntax><VirtualHost
<var>addr</var>[:<var>port</var>] [<var>addr</var>[:<var>port</var>]]
...> ... </VirtualHost></syntax>
@@ -2806,13 +2843,13 @@
<li>A fully qualified domain name for the IP address of the
virtual host;</li>
- <li>The character *, which is used only in combination with
+ <li>The character <code>*</code>, which is used only in combination with
<code>NameVirtualHost *</code> to match all IP addresses; or</li>
<li>The string <code>_default_</code>, which is used only
with IP virtual hosting to catch unmatched IP addresses.</li>
</ul>
-
+
<example><title>Example</title>
<VirtualHost 10.1.2.3><br />
<indent>
@@ -2825,7 +2862,7 @@
</VirtualHost>
</example>
-
+
<p>IPv6 addresses must be specified in square brackets because
the optional port number could not be determined otherwise. An
IPv6 example is shown below:</p>
@@ -2840,19 +2877,19 @@
TransferLog logs/host.example.com-access_log<br />
</indent>
</VirtualHost>
- </example>
+ </example>
<p>Each Virtual Host must correspond to a different IP address,
different port number or a different host name for the server,
in the former case the server machine must be configured to
accept IP packets for multiple addresses. (If the machine does
not have multiple network interfaces, then this can be
- accomplished with the <code>ifconfig alias</code> command (if
+ accomplished with the <code>ifconfig alias</code> command -- if
your OS supports it).</p>
<note><title>Note</title>
<p>The use of <directive type="section">VirtualHost</directive> does
- <strong>not</strong> affect what addresses Apache listens on. You
+ <strong>not</strong> affect what addresses Apache listens on. You
may need to ensure that Apache is listening on the correct addresses
using <directive module="mpm_common">Listen</directive>.</p>
</note>
@@ -2861,13 +2898,13 @@
<code>_default_</code> can be specified in
which case this virtual host will match any IP address that is
not explicitly listed in another virtual host. In the absence
- of any _default_ virtual host the "main" server config,
+ of any <code>_default_</code> virtual host the "main" server config,
consisting of all those definitions outside any VirtualHost
section, is used when no IP-match occurs. (But note that any IP
address that matches a <directive
module="core">NameVirtualHost</directive> directive will use neither
- the "main" server config nor the _default_ virtual host. See the <a
- href="../vhosts/name-based.html">name-based virtual hosting</a>
+ the "main" server config nor the <code>_default_</code> virtual host.
+ See the <a href="../vhosts/name-based.html">name-based virtual hosting</a>
documentation for further details.)</p>
<p>You can specify a <code>:port</code> to change the port that is
@@ -2885,14 +2922,13 @@
</note>
</usage>
<seealso><a href="../vhosts/">Apache Virtual Host documentation</a></seealso>
-<seealso><a href="../dns-caveats.html">Warnings about DNS and
+<seealso><a href="../dns-caveats.html">Issues Regarding DNS and
Apache</a></seealso>
<seealso><a href="../bind.html">Setting
which addresses and ports Apache uses</a></seealso>
-<seealso><a href="../sections.html">How
- Directory, Location and Files sections work</a> for an
- explanation of how these different sections are combined when a
- request is received</seealso>
+<seealso><a href="../sections.html">How <Directory>, <Location>
+ and <Files> sections work</a> for an explanation of how these
+ different sections are combined when a request is received</seealso>
</directivesynopsis>
-</modulesynopsis>
+</modulesynopsis>
\ No newline at end of file
diff --git a/docs/manual/mod/directive-dict.html.en b/docs/manual/mod/directive-dict.html.en
index 4874ae5..a82d5e5 100644
--- a/docs/manual/mod/directive-dict.html.en
+++ b/docs/manual/mod/directive-dict.html.en
@@ -4,14 +4,40 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Terms Used to Describe Directives - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Terms Used to Describe Directives</h1>
+ -->
+<title>Terms Used to Describe Directives - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Terms Used to Describe Directives</h1>
<p>This document describes the terms that are used to describe
each Apache <a href="directives.html">configuration
directive</a>.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">Description</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Syntax">Syntax</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Default">Default</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Context">Context</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Override">Override</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Status">Status</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Module">Module</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">Compatibility</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../configuring.html">Configuration files</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="Description" id="Description">Description</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">Description</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Syntax">Syntax</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Default">Default</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Context">Context</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Override">Override</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Status">Status</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Module">Module</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">Compatibility</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="../configuring.html">Configuration files</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="Description" id="Description">Description</a></h2>
<p>A brief description of the purpose of the directive.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="Syntax" id="Syntax">Syntax</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Syntax" id="Syntax">Syntax</a></h2>
<p>This indicates the format of the directive as it would
appear in a configuration file. This syntax is extremely
@@ -97,7 +123,9 @@
environment variable. See the <a href="../env.html">environment variable documentation</a> for
more details.</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="Default" id="Default">Default</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Default" id="Default">Default</a></h2>
<p>If the directive has a default value (<em>i.e.</em>, if you
omit it from your configuration entirely, the Apache Web server
@@ -106,7 +134,9 @@
should say "<em>None</em>". Note that the default listed here
is not necessarily the same as the value the directive takes in
the default httpd.conf distributed with the 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="Context" id="Context">Context</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Context" id="Context">Context</a></h2>
<p>This indicates where in the server's configuration files the
directive is legal. It's a comma-separated list of one or more
@@ -163,7 +193,9 @@
files, but not within any <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> or
<code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code>
containers.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="Override" id="Override">Override</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Override" id="Override">Override</a></h2>
<p>This directive attribute indicates which configuration
override must be active in order for the directive to be
@@ -178,7 +210,9 @@
<code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> directives at
lower levels. The documentation for that directive also lists the
possible override names available.</p>
-</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">Status</a></h2>
+</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">Status</a></h2>
<p>This indicates how tightly bound into the Apache Web server
the directive is; in other words, you may need to recompile the
@@ -228,14 +262,22 @@
directive and its module to see if it remarks on the
availability.</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="Module" id="Module">Module</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Module" id="Module">Module</a></h2>
<p>This quite simply lists the name of the source module which
defines the directive.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="Compatibility" id="Compatibility">Compatibility</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Compatibility" id="Compatibility">Compatibility</a></h2>
<p>If the directive wasn't part of the original Apache version
2 distribution, the version in which it was introduced should
be listed here. In addition, if the directive is available
only on certain platforms, it will be noted here.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directive-dict.html.ja.jis b/docs/manual/mod/directive-dict.html.ja.jis
index 4ff55f8..a31e79f 100644
--- a/docs/manual/mod/directive-dict.html.ja.jis
+++ b/docs/manual/mod/directive-dict.html.ja.jis
@@ -4,31 +4,57 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>$B%G%#%l%/%F%#%V$N2r@b$K;H$o$l$kMQ8l(B - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$B%G%#%l%/%F%#%V$N2r@b$K;H$o$l$kMQ8l(B</h1>
- <p>$B$3(B$B$NJ8=q$O3F(B Apache <a href="directives.html">$B@_Dj%G%#%l%/%F%#%V(B</a>
- $B$r@bL@$9$k(B$B$?$a$K;H$o$l$F$$$kMQ8l$r@bL@$7$^$9!#(B</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">$B@bL@(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Syntax">$B9=J8(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Default">$B%G%U%)%k%H(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Context">$B%3%s%F%-%9%H(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Override">$B>e=q$-(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Status">$B%9%F!<%?%9(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Module">$B%b%8%e!<%k(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">$B8_49@-(B</a></li></ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><a href="../configuring.html">$B@_Dj%U%!%$%k(B</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="Description" id="Description">$B@bL@(B</a></h2>
+ -->
+<title>$B%G%#%l%/%F%#%V$N2r@b$K;H$o$l$kMQ8l(B - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$B%G%#%l%/%F%#%V$N2r@b$K;H$o$l$kMQ8l(B</h1>
+ <p>$B$3$NJ8=q$O3F(B Apache <a href="directives.html">$B@_Dj%G%#%l%/%F%#%V(B</a>
+ $B$r@bL@$9$k$?$a$K;H$o$l$F$$$kMQ8l$r@bL@$7$^$9!#(B</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">$B@bL@(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Syntax">$B9=J8(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Default">$B%G%U%)%k%H(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Context">$B%3%s%F%-%9%H(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Override">$B>e=q$-(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Status">$B%9%F!<%?%9(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Module">$B%b%8%e!<%k(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">$B8_49@-(B</a></li>
+</ul><h3>$B;2>H(B</h3><ul class="seealso"><li><a href="../configuring.html">$B@_Dj%U%!%$%k(B</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="Description" id="Description">$B@bL@(B</a></h2>
<p>$B%G%#%l%/%F%#%V$NL\E*$N4JC1$J@bL@!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="Syntax" id="Syntax">$B9=J8(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Syntax" id="Syntax">$B9=J8(B</a></h2>
- <p>$B@_Dj%U%!(B$B%$%kCf$N%G%#%l%/%F%#%V$N=q<0$r<($7$^$9!#(B
+ <p>$B@_Dj%U%!%$%kCf$N%G%#%l%/%F%#%V$N=q<0$r<($7$^$9!#(B
$B$3$N9=J8$O%G%#%l%/%F%#%VFCM-$J$N$G!">\:Y$O%G%#%l%/%F%#%V$N@bL@$r(B
$B;2>H$7$F$/$@$5$$!#0lHLE*$K!"%G%#%l%/%F%#%VL>$N8e$K$O(B
$B6uGr$K$h$jJ,3d$5$l$?$$$/$D$+$N0z?t$,B3$-$^$9!#(B
- $B0z?t$,6uGr$r4^(B$B$`$H$-$OFs=E0zMQId(B ($BLuCm(B: ")
+ $B0z?t$,6uGr$r4^$`$H$-$OFs=E0zMQId(B ($BLuCm(B: ")
$B$G0O$^$l$F$$$^$9!#(B $B%*%W%7%g%J%k$J0z?t$O3g8L(B
($BLuCm(B: []) $B$G0O$^$l$F$$$^$9!#(B
$B0z?t$,J#?t$NCM$r<h$jF@$k>l9g$O!"$=$l$i$NCM$O?bD>$NK@(B "|"
$B$G(B $BJ,3d$5$l$F$$$^$9!#(B
- $BJQ99$5$l$J(B$B$$%F%-%9%H$O%G%U%)%k%H$N%U%)%s%H$GI=<($5$l!"CV49$NI,MW$J(B
+ $BJQ99$5$l$J$$%F%-%9%H$O%G%U%)%k%H$N%U%)%s%H$GI=<($5$l!"CV49$NI,MW$J(B
$B0z?t$O(B<em>$B6/D4$5$l$F(B</em>$BI=<($5$l$^$9!#(B
$B0z?t$N?t$,JQ$o$k%G%#%l%/%F%#%V$O:G8e$N(B
$B0z?t$,7+$jJV$5$l$k$3$H$r<($9$?$a$K(B "..."
$B$G=*$o$j$^$9!#(B</p>
<p>
- $B%G%#%l%/%F(B$B%#%V$OB?$/$N0c$&7?$N0z?t$r$H$j$^$9!#$$$/$D$+!"NI$/(B
+ $B%G%#%l%/%F%#%V$OB?$/$N0c$&7?$N0z?t$r$H$j$^$9!#$$$/$D$+!"NI$/(B
$B;H$o$l$k$b$N$r0J2<$GDj5A$7$^$9!#(B</p>
<dl>
@@ -53,7 +79,7 @@
$B$N$h$&$K!"(B
$B%k!<%H%G%#%l%/%H%j$+$i;O$^$k%m!<%+%k$N%U%!%$%k%7%9%F%`>e$N%U%!%$%k$X$N%Q%9!#(B
$BDL>o!"%9%i%C%7%e$G;O$^$i$J$$(B <em>file-path</em> $B$O(B <a href="core.html#serverroot">ServerRoot</a>
- $B$+$i(B$B$NAjBP%Q%9$H$7$F(B $B07$o$l$^$9!#(B</dd>
+ $B$+$i$NAjBP%Q%9$H$7$F(B $B07$o$l$^$9!#(B</dd>
<dt><em>directory-path</em></dt>
@@ -100,19 +126,23 @@
<dd>Apache $B$N@_Dj$K$h$jDj5A$5$l$k(B <a href="../env.html">$B4D6-JQ?t(B</a>$B$NL>A0$G$9!#$3$l$O%*%Z%l!<%F%#%s%0%7%9%F%`$N(B
$B4D6-JQ?t$HF1$8$H$O8B$i$J$$$3$H$KCm0U$7$F$/$@$5$$!#>\:Y$O(B <a href="../env.html">$B4D6-JQ?t$N@bL@(B</a>$B$r;2>H$7$F$/$@$5$$!#(B</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="Default" id="Default">$B%G%U%)%k%H(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Default" id="Default">$B%G%U%)%k%H(B</a></h2>
<p>$B%G%#%l%/%F%#%V$K%G%U%)%k%HCM(B
(<em>$B$9$J$o$A(B</em>$B!"@_Dj%U%!%$%k$+$i(B
$B>JN,$5$l$F$$$F$b!"(BApache
$B%&%'%V%5!<%P$OFCDj$NCM$K@_Dj$5$l$F$$$k$+$N$h$&$K(B
- $BF0:n$7$^$9(B) $B$,$"$k>l9g$O$3$3$K5-=R$5(B$B$l$^$9!#(B
+ $BF0:n$7$^$9(B) $B$,$"$k>l9g$O$3$3$K5-=R$5$l$^$9!#(B
$B%G%U%)%k%HCM$NL5$$>l9g!"$3$3$O(B "<em>None</em>" $B$H(B
$B=q$+$l$^$9!#$3$3$G=q$+$l$F$$$k%G%U%)%k%H$O%5!<%P$H6&$KG[I[$5$l$F$$$k(B
$B%G%U%)%k%H$N(B httpd.conf
$BFb$K=q$+$l$F$$$k%G%#%l%/%F%#%V$NCM$H(B
$B0c$&2DG=@-$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="Context" id="Context">$B%3%s%F%-%9%H(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Context" id="Context">$B%3%s%F%-%9%H(B</a></h2>
<p>
$B$3$l$O!"%5!<%P$N@_Dj%U%!%$%kCf$N$I$3$G%G%#%l%/%F%#%V$,M-8z$J$N$+$r<($7$^$9!#(B
@@ -170,7 +200,9 @@
$B%U%!%$%k$H$GM-8z$G$9$,!"(B <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>
$B$d(B <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code>
$B$NCf$G$O;HMQ$G$-$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="Override" id="Override">$B>e=q$-(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Override" id="Override">$B>e=q$-(B</a></h2>
<p>$B$3$N%G%#%l%/%F%#%V$NB0@-$O!"(B<code>.htaccess</code>
$B%U%!%$%kCf$K(B
@@ -187,7 +219,9 @@
$B$5$i$K2<0L$N%l%Y%k$N(B <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
$B$G=$@5$5$l$J$$8B$j!"(B $B$=$NG[2<$KBP$7$FE,MQ$5$l$^$9!#(B
$B%G%#%l%/%F%#%V$N%I%-%e%a%s%H$O<h$jF@$k>e=q$-$NL>A0$b5s$2$^$9!#(B</p>
-</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">$B%9%F!<%?%9(B</a></h2>
+</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">$B%9%F!<%?%9(B</a></h2>
<p>$B$3$l$O%G%#%l%/%F%#%V$,(B Apache
$B%&%'%V%5!<%P$K$I$l$/$i$$$-$D$/AH$_9~$^$l$F$$$k$+$r(B
@@ -213,7 +247,7 @@
<dd>"Base" $B$N%G%#%l%/%F%#%V$O(B
$B%G%U%)%k%H$G%5!<%P$KAH$_9~$^$l$F$$$kI8=`%b%8%e!<%k$NCf$N0l$D$G%5(B
- $B%]!<%H$5$l$F$$$F!"$o(B$B$6$o$6@_Dj$+$i%b%8%e!<%k$r:o=|$7$?$H$-$r=|$$$F!"(B
+ $B%]!<%H$5$l$F$$$F!"$o$6$o$6@_Dj$+$i%b%8%e!<%k$r:o=|$7$?$H$-$r=|$$$F!"(B
$BDL>o$G$O;HMQ2DG=$G$"$k$3$H$r<($7$^$9!#(B</dd>
<dt>Extension</dt>
@@ -236,15 +270,23 @@
$B$7$l$^$;$s$7!"$=$&$G$J$$$+$b$7$l$^$;$s!#;HMQ2DG=$+$I$&$+$O!"(B
$B%G%#%l%/%F%#%V$H%b%8%e!<%k$N@bL@$r$7$F$$$k%Z!<%8$N@hF,$rD4$Y$F$/$@$5$$!#(B</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="Module" id="Module">$B%b%8%e!<%k(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Module" id="Module">$B%b%8%e!<%k(B</a></h2>
<p>
$B$3$l$OC1=c$K%G%#%l%/%F%#%V$,Dj5A$5$l$F$$$k%b%8%e!<%k$NL>A0$r5-:\$7$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="Compatibility" id="Compatibility">$B8_49@-(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Compatibility" id="Compatibility">$B8_49@-(B</a></h2>
<p>$B%G%#%l%/%F%#%V$,(B Apache 2
$B$NG[I[$KAH$_9~$^$l$F$$$J$+$C$?>l9g!"(B
$B%G%#%l%/%F%#%V$,F3F~$5$l$?%P!<%8%g%s$,$3$3$K=q$+$l$F$$$^$9!#(B
$B$^$?!"%G%#%l%/%F%#%V$,FCDj$N%W%i%C%H%U%)!<%`$K$N$_B8:_$9$k$H$-$b(B
$B$3$3$K=q$+$l$F$$$^$9!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de
new file mode 100644
index 0000000..76c06f8
--- /dev/null
+++ b/docs/manual/mod/directives.html.de
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>Verzeichnis der Direktiven - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="directive-index"><div id="page-header">
+<p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="../">Version 2.0</a> > <a href="./">Module</a></div><div id="preamble"><h1>Verzeichnis der Direktiven</h1>
+
+ <p>
+ Hier sind alle Apache-Direktiven aufgeführt, die in der
+ Standard-Apache-Distribution verfügbar sind. Sie sind in
+ einem einheitlichen Format beschrieben. Ein <a href="directive-dict.html" rel="Glossary">Glossar</a>
+ erläutert die in der Beschreibung verwendeten Begriffe.
+ </p>
+
+ <p>
+ Außerdem existiert eine <a href="quickreference.html">Kurzreferenz der Direktiven</a>, welche
+ zu jeder Direktive eine Zusammenfassung der Details enthält.
+ </p>
+
+<p class="letters"><a href="#A"> A </a> | <a href="#B"> B </a> | <a href="#C"> C </a> | <a href="#D"> D </a> | <a href="#E"> E </a> | <a href="#F"> F </a> | <a href="#G"> G </a> | <a href="#H"> H </a> | <a href="#I"> I </a> | <a href="#K"> K </a> | <a href="#L"> L </a> | <a href="#M"> M </a> | <a href="#N"> N </a> | <a href="#O"> O </a> | <a href="#P"> P </a> | <a href="#R"> R </a> | <a href="#S"> S </a> | <a href="#T"> T </a> | <a href="#U"> U </a> | <a href="#V"> V </a> | <a href="#X"> X </a></p>
+</div>
+<div id="directive-list"><ul>
+<li><a href="mpm_common.html#acceptmutex" id="A" name="A">AcceptMutex</a></li>
+<li><a href="core.html#acceptpathinfo">AcceptPathInfo</a></li>
+<li><a href="core.html#accessfilename">AccessFileName</a></li>
+<li><a href="mod_actions.html#action">Action</a></li>
+<li><a href="mod_autoindex.html#addalt">AddAlt</a></li>
+<li><a href="mod_autoindex.html#addaltbyencoding">AddAltByEncoding</a></li>
+<li><a href="mod_autoindex.html#addaltbytype">AddAltByType</a></li>
+<li><a href="mod_mime.html#addcharset">AddCharset</a></li>
+<li><a href="core.html#adddefaultcharset">AddDefaultCharset</a></li>
+<li><a href="mod_autoindex.html#adddescription">AddDescription</a></li>
+<li><a href="mod_mime.html#addencoding">AddEncoding</a></li>
+<li><a href="mod_mime.html#addhandler">AddHandler</a></li>
+<li><a href="mod_autoindex.html#addicon">AddIcon</a></li>
+<li><a href="mod_autoindex.html#addiconbyencoding">AddIconByEncoding</a></li>
+<li><a href="mod_autoindex.html#addiconbytype">AddIconByType</a></li>
+<li><a href="mod_mime.html#addinputfilter">AddInputFilter</a></li>
+<li><a href="mod_mime.html#addlanguage">AddLanguage</a></li>
+<li><a href="mod_info.html#addmoduleinfo">AddModuleInfo</a></li>
+<li><a href="mod_mime.html#addoutputfilter">AddOutputFilter</a></li>
+<li><a href="core.html#addoutputfilterbytype">AddOutputFilterByType</a></li>
+<li><a href="mod_mime.html#addtype">AddType</a></li>
+<li><a href="mod_alias.html#alias">Alias</a></li>
+<li><a href="mod_alias.html#aliasmatch">AliasMatch</a></li>
+<li><a href="mod_access.html#allow">Allow</a></li>
+<li><a href="mod_proxy.html#allowconnect">AllowCONNECT</a></li>
+<li><a href="core.html#allowoverride">AllowOverride</a></li>
+<li><a href="mod_auth_anon.html#anonymous">Anonymous</a></li>
+<li><a href="mod_auth_anon.html#anonymous_authoritative">Anonymous_Authoritative</a></li>
+<li><a href="mod_auth_anon.html#anonymous_logemail">Anonymous_LogEmail</a></li>
+<li><a href="mod_auth_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></li>
+<li><a href="mod_auth_anon.html#anonymous_nouserid">Anonymous_NoUserID</a></li>
+<li><a href="mod_auth_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail</a></li>
+<li><a href="perchild.html#assignuserid">AssignUserID</a></li>
+<li><a href="mod_auth.html#authauthoritative">AuthAuthoritative</a></li>
+<li><a href="mod_auth_dbm.html#authdbmauthoritative">AuthDBMAuthoritative</a></li>
+<li><a href="mod_auth_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></li>
+<li><a href="mod_auth_dbm.html#authdbmtype">AuthDBMType</a></li>
+<li><a href="mod_auth_dbm.html#authdbmuserfile">AuthDBMUserFile</a></li>
+<li><a href="mod_auth_digest.html#authdigestalgorithm">AuthDigestAlgorithm</a></li>
+<li><a href="mod_auth_digest.html#authdigestdomain">AuthDigestDomain</a></li>
+<li><a href="mod_auth_digest.html#authdigestfile">AuthDigestFile</a></li>
+<li><a href="mod_auth_digest.html#authdigestgroupfile">AuthDigestGroupFile</a></li>
+<li><a href="mod_auth_digest.html#authdigestnccheck">AuthDigestNcCheck</a></li>
+<li><a href="mod_auth_digest.html#authdigestnonceformat">AuthDigestNonceFormat</a></li>
+<li><a href="mod_auth_digest.html#authdigestnoncelifetime">AuthDigestNonceLifetime</a></li>
+<li><a href="mod_auth_digest.html#authdigestqop">AuthDigestQop</a></li>
+<li><a href="mod_auth_digest.html#authdigestshmemsize">AuthDigestShmemSize</a></li>
+<li><a href="mod_auth.html#authgroupfile">AuthGroupFile</a></li>
+<li><a href="mod_auth_ldap.html#authldapauthoritative">AuthLDAPAuthoritative</a></li>
+<li><a href="mod_auth_ldap.html#authldapbinddn">AuthLDAPBindDN</a></li>
+<li><a href="mod_auth_ldap.html#authldapbindpassword">AuthLDAPBindPassword</a></li>
+<li><a href="mod_auth_ldap.html#authldapcomparednonserver">AuthLDAPCompareDNOnServer</a></li>
+<li><a href="mod_auth_ldap.html#authldapdereferencealiases">AuthLDAPDereferenceAliases</a></li>
+<li><a href="mod_auth_ldap.html#authldapenabled">AuthLDAPEnabled</a></li>
+<li><a href="mod_auth_ldap.html#authldapfrontpagehack">AuthLDAPFrontPageHack</a></li>
+<li><a href="mod_auth_ldap.html#authldapgroupattribute">AuthLDAPGroupAttribute</a></li>
+<li><a href="mod_auth_ldap.html#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN</a></li>
+<li><a href="mod_auth_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN</a></li>
+<li><a href="mod_auth_ldap.html#authldapstarttls">AuthLDAPStartTLS</a></li>
+<li><a href="mod_auth_ldap.html#authldapurl">AuthLDAPUrl</a></li>
+<li><a href="core.html#authname">AuthName</a></li>
+<li><a href="core.html#authtype">AuthType</a></li>
+<li><a href="mod_auth.html#authuserfile">AuthUserFile</a></li>
+<li><a href="mod_setenvif.html#browsermatch" id="B" name="B">BrowserMatch</a></li>
+<li><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></li>
+<li><a href="mpm_common.html#bs2000account">BS2000Account</a></li>
+<li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
+<li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
+<li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
+<li><a href="mod_cache.html#cachedisable">CacheDisable</a></li>
+<li><a href="mod_cache.html#cacheenable">CacheEnable</a></li>
+<li><a href="mod_disk_cache.html#cacheexpirycheck">CacheExpiryCheck</a></li>
+<li><a href="mod_file_cache.html#cachefile">CacheFile</a></li>
+<li><a href="mod_cache.html#cacheforcecompletion">CacheForceCompletion</a></li>
+<li><a href="mod_disk_cache.html#cachegcclean">CacheGcClean</a></li>
+<li><a href="mod_disk_cache.html#cachegcdaily">CacheGcDaily</a></li>
+<li><a href="mod_disk_cache.html#cachegcinterval">CacheGcInterval</a></li>
+<li><a href="mod_disk_cache.html#cachegcmemusage">CacheGcMemUsage</a></li>
+<li><a href="mod_disk_cache.html#cachegcunused">CacheGcUnused</a></li>
+<li><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl</a></li>
+<li><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod</a></li>
+<li><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor</a></li>
+<li><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire</a></li>
+<li><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></li>
+<li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
+<li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
+<li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_disk_cache.html#cachesize">CacheSize</a></li>
+<li><a href="mod_disk_cache.html#cachetimemargin">CacheTimeMargin</a></li>
+<li><a href="core.html#cgimapextension">CGIMapExtension</a></li>
+<li><a href="mod_charset_lite.html#charsetdefault">CharsetDefault</a></li>
+<li><a href="mod_charset_lite.html#charsetoptions">CharsetOptions</a></li>
+<li><a href="mod_charset_lite.html#charsetsourceenc">CharsetSourceEnc</a></li>
+<li><a href="mod_speling.html#checkspelling">CheckSpelling</a></li>
+<li><a href="perchild.html#childperuserid">ChildPerUserID</a></li>
+<li><a href="core.html#contentdigest">ContentDigest</a></li>
+<li><a href="mod_usertrack.html#cookiedomain">CookieDomain</a></li>
+<li><a href="mod_usertrack.html#cookieexpires">CookieExpires</a></li>
+<li><a href="mod_log_config.html#cookielog">CookieLog</a></li>
+<li><a href="mod_usertrack.html#cookiename">CookieName</a></li>
+<li><a href="mod_usertrack.html#cookiestyle">CookieStyle</a></li>
+<li><a href="mod_usertrack.html#cookietracking">CookieTracking</a></li>
+<li><a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+<li><a href="mod_log_config.html#customlog">CustomLog</a></li>
+<li><a href="mod_dav.html#dav" id="D" name="D">Dav</a></li>
+<li><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity</a></li>
+<li><a href="mod_dav_fs.html#davlockdb">DavLockDB</a></li>
+<li><a href="mod_dav.html#davmintimeout">DavMinTimeout</a></li>
+<li><a href="mod_autoindex.html#defaulticon">DefaultIcon</a></li>
+<li><a href="mod_mime.html#defaultlanguage">DefaultLanguage</a></li>
+<li><a href="core.html#defaulttype">DefaultType</a></li>
+<li><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize</a></li>
+<li><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote</a></li>
+<li><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel</a></li>
+<li><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize</a></li>
+<li><a href="mod_access.html#deny">Deny</a></li>
+<li><a href="core.html#directory"><Directory></a></li>
+<li><a href="mod_dir.html#directoryindex">DirectoryIndex</a></li>
+<li><a href="core.html#directorymatch"><DirectoryMatch></a></li>
+<li><a href="core.html#documentroot">DocumentRoot</a></li>
+<li><a href="core.html#enablemmap" id="E" name="E">EnableMMAP</a></li>
+<li><a href="core.html#enablesendfile">EnableSendfile</a></li>
+<li><a href="core.html#errordocument">ErrorDocument</a></li>
+<li><a href="core.html#errorlog">ErrorLog</a></li>
+<li><a href="mod_example.html#example">Example</a></li>
+<li><a href="mod_expires.html#expiresactive">ExpiresActive</a></li>
+<li><a href="mod_expires.html#expiresbytype">ExpiresByType</a></li>
+<li><a href="mod_expires.html#expiresdefault">ExpiresDefault</a></li>
+<li><a href="mod_status.html#extendedstatus">ExtendedStatus</a></li>
+<li><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></li>
+<li><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions</a></li>
+<li><a href="core.html#fileetag" id="F" name="F">FileETag</a></li>
+<li><a href="core.html#files"><Files></a></li>
+<li><a href="core.html#filesmatch"><FilesMatch></a></li>
+<li><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority</a></li>
+<li><a href="core.html#forcetype">ForceType</a></li>
+<li><a href="mpm_common.html#group" id="G" name="G">Group</a></li>
+<li><a href="mod_headers.html#header" id="H" name="H">Header</a></li>
+<li><a href="mod_autoindex.html#headername">HeaderName</a></li>
+<li><a href="core.html#hostnamelookups">HostnameLookups</a></li>
+<li><a href="core.html#identitycheck" id="I" name="I">IdentityCheck</a></li>
+<li><a href="core.html#ifdefine"><IfDefine></a></li>
+<li><a href="core.html#ifmodule"><IfModule></a></li>
+<li><a href="mod_imap.html#imapbase">ImapBase</a></li>
+<li><a href="mod_imap.html#imapdefault">ImapDefault</a></li>
+<li><a href="mod_imap.html#imapmenu">ImapMenu</a></li>
+<li><a href="core.html#include">Include</a></li>
+<li><a href="mod_autoindex.html#indexignore">IndexIgnore</a></li>
+<li><a href="mod_autoindex.html#indexoptions">IndexOptions</a></li>
+<li><a href="mod_autoindex.html#indexorderdefault">IndexOrderDefault</a></li>
+<li><a href="mod_isapi.html#isapiappendlogtoerrors">ISAPIAppendLogToErrors</a></li>
+<li><a href="mod_isapi.html#isapiappendlogtoquery">ISAPIAppendLogToQuery</a></li>
+<li><a href="mod_isapi.html#isapicachefile">ISAPICacheFile</a></li>
+<li><a href="mod_isapi.html#isapifakeasync">ISAPIFakeAsync</a></li>
+<li><a href="mod_isapi.html#isapilognotsupported">ISAPILogNotSupported</a></li>
+<li><a href="mod_isapi.html#isapireadaheadbuffer">ISAPIReadAheadBuffer</a></li>
+<li><a href="core.html#keepalive" id="K" name="K">KeepAlive</a></li>
+<li><a href="core.html#keepalivetimeout">KeepAliveTimeout</a></li>
+<li><a href="mod_negotiation.html#languagepriority" id="L" name="L">LanguagePriority</a></li>
+<li><a href="mod_ldap.html#ldapcacheentries">LDAPCacheEntries</a></li>
+<li><a href="mod_ldap.html#ldapcachettl">LDAPCacheTTL</a></li>
+<li><a href="mod_ldap.html#ldapcertdbpath">LDAPCertDBPath</a></li>
+<li><a href="mod_ldap.html#ldapopcacheentries">LDAPOpCacheEntries</a></li>
+<li><a href="mod_ldap.html#ldapopcachettl">LDAPOpCacheTTL</a></li>
+<li><a href="mod_ldap.html#ldapsharedcachesize">LDAPSharedCacheSize</a></li>
+<li><a href="core.html#limit"><Limit></a></li>
+<li><a href="core.html#limitexcept"><LimitExcept></a></li>
+<li><a href="core.html#limitrequestbody">LimitRequestBody</a></li>
+<li><a href="core.html#limitrequestfields">LimitRequestFields</a></li>
+<li><a href="core.html#limitrequestfieldsize">LimitRequestFieldSize</a></li>
+<li><a href="core.html#limitrequestline">LimitRequestLine</a></li>
+<li><a href="core.html#limitxmlrequestbody">LimitXMLRequestBody</a></li>
+<li><a href="mpm_common.html#listen">Listen</a></li>
+<li><a href="mpm_common.html#listenbacklog">ListenBackLog</a></li>
+<li><a href="mod_so.html#loadfile">LoadFile</a></li>
+<li><a href="mod_so.html#loadmodule">LoadModule</a></li>
+<li><a href="core.html#location"><Location></a></li>
+<li><a href="core.html#locationmatch"><LocationMatch></a></li>
+<li><a href="mpm_common.html#lockfile">LockFile</a></li>
+<li><a href="mod_log_config.html#logformat">LogFormat</a></li>
+<li><a href="core.html#loglevel">LogLevel</a></li>
+<li><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients</a></li>
+<li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
+<li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
+<li><a href="beos.html#maxrequestsperthread">MaxRequestsPerThread</a></li>
+<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
+<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
+<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
+<li><a href="perchild.html#maxthreadsperchild">MaxThreadsPerChild</a></li>
+<li><a href="mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></li>
+<li><a href="mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></li>
+<li><a href="mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></li>
+<li><a href="mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></li>
+<li><a href="mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></li>
+<li><a href="mod_mem_cache.html#mcachesize">MCacheSize</a></li>
+<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
+<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
+<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
+<li><a href="mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></li>
+<li><a href="prefork.html#minspareservers">MinSpareServers</a></li>
+<li><a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
+<li><a href="mod_file_cache.html#mmapfile">MMapFile</a></li>
+<li><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo</a></li>
+<li><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch</a></li>
+<li><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost</a></li>
+<li><a href="mod_proxy.html#noproxy">NoProxy</a></li>
+<li><a href="perchild.html#numservers">NumServers</a></li>
+<li><a href="core.html#options" id="O" name="O">Options</a></li>
+<li><a href="mod_access.html#order">Order</a></li>
+<li><a href="mod_env.html#passenv" id="P" name="P">PassEnv</a></li>
+<li><a href="mpm_common.html#pidfile">PidFile</a></li>
+<li><a href="mod_echo.html#protocolecho">ProtocolEcho</a></li>
+<li><a href="mod_proxy.html#proxy"><Proxy></a></li>
+<li><a href="mod_proxy.html#proxyblock">ProxyBlock</a></li>
+<li><a href="mod_proxy.html#proxydomain">ProxyDomain</a></li>
+<li><a href="mod_proxy.html#proxyerroroverride">ProxyErrorOverride</a></li>
+<li><a href="mod_proxy.html#proxyiobuffersize">ProxyIOBufferSize</a></li>
+<li><a href="mod_proxy.html#proxymatch"><ProxyMatch></a></li>
+<li><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards</a></li>
+<li><a href="mod_proxy.html#proxypass">ProxyPass</a></li>
+<li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
+<li><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost</a></li>
+<li><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize</a></li>
+<li><a href="mod_proxy.html#proxyremote">ProxyRemote</a></li>
+<li><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch</a></li>
+<li><a href="mod_proxy.html#proxyrequests">ProxyRequests</a></li>
+<li><a href="mod_proxy.html#proxytimeout">ProxyTimeout</a></li>
+<li><a href="mod_proxy.html#proxyvia">ProxyVia</a></li>
+<li><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName</a></li>
+<li><a href="mod_alias.html#redirect">Redirect</a></li>
+<li><a href="mod_alias.html#redirectmatch">RedirectMatch</a></li>
+<li><a href="mod_alias.html#redirectpermanent">RedirectPermanent</a></li>
+<li><a href="mod_alias.html#redirecttemp">RedirectTemp</a></li>
+<li><a href="mod_mime.html#removecharset">RemoveCharset</a></li>
+<li><a href="mod_mime.html#removeencoding">RemoveEncoding</a></li>
+<li><a href="mod_mime.html#removehandler">RemoveHandler</a></li>
+<li><a href="mod_mime.html#removeinputfilter">RemoveInputFilter</a></li>
+<li><a href="mod_mime.html#removelanguage">RemoveLanguage</a></li>
+<li><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></li>
+<li><a href="mod_mime.html#removetype">RemoveType</a></li>
+<li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
+<li><a href="core.html#require">Require</a></li>
+<li><a href="mod_rewrite.html#rewritebase">RewriteBase</a></li>
+<li><a href="mod_rewrite.html#rewritecond">RewriteCond</a></li>
+<li><a href="mod_rewrite.html#rewriteengine">RewriteEngine</a></li>
+<li><a href="mod_rewrite.html#rewritelock">RewriteLock</a></li>
+<li><a href="mod_rewrite.html#rewritelog">RewriteLog</a></li>
+<li><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></li>
+<li><a href="mod_rewrite.html#rewritemap">RewriteMap</a></li>
+<li><a href="mod_rewrite.html#rewriteoptions">RewriteOptions</a></li>
+<li><a href="mod_rewrite.html#rewriterule">RewriteRule</a></li>
+<li><a href="core.html#rlimitcpu">RLimitCPU</a></li>
+<li><a href="core.html#rlimitmem">RLimitMEM</a></li>
+<li><a href="core.html#rlimitnproc">RLimitNPROC</a></li>
+<li><a href="core.html#satisfy" id="S" name="S">Satisfy</a></li>
+<li><a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
+<li><a href="mod_actions.html#script">Script</a></li>
+<li><a href="mod_alias.html#scriptalias">ScriptAlias</a></li>
+<li><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch</a></li>
+<li><a href="core.html#scriptinterpretersource">ScriptInterpreterSource</a></li>
+<li><a href="mod_cgi.html#scriptlog">ScriptLog</a></li>
+<li><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer</a></li>
+<li><a href="mod_cgi.html#scriptloglength">ScriptLogLength</a></li>
+<li><a href="mod_cgid.html#scriptsock">ScriptSock</a></li>
+<li><a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
+<li><a href="core.html#serveradmin">ServerAdmin</a></li>
+<li><a href="core.html#serveralias">ServerAlias</a></li>
+<li><a href="mpm_common.html#serverlimit">ServerLimit</a></li>
+<li><a href="core.html#servername">ServerName</a></li>
+<li><a href="core.html#serverpath">ServerPath</a></li>
+<li><a href="core.html#serverroot">ServerRoot</a></li>
+<li><a href="core.html#serversignature">ServerSignature</a></li>
+<li><a href="core.html#servertokens">ServerTokens</a></li>
+<li><a href="mod_env.html#setenv">SetEnv</a></li>
+<li><a href="mod_setenvif.html#setenvif">SetEnvIf</a></li>
+<li><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase</a></li>
+<li><a href="core.html#sethandler">SetHandler</a></li>
+<li><a href="core.html#setinputfilter">SetInputFilter</a></li>
+<li><a href="core.html#setoutputfilter">SetOutputFilter</a></li>
+<li><a href="mod_include.html#ssiendtag">SSIEndTag</a></li>
+<li><a href="mod_include.html#ssierrormsg">SSIErrorMsg</a></li>
+<li><a href="mod_include.html#ssistarttag">SSIStartTag</a></li>
+<li><a href="mod_include.html#ssitimeformat">SSITimeFormat</a></li>
+<li><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho</a></li>
+<li><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile</a></li>
+<li><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath</a></li>
+<li><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile</a></li>
+<li><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath</a></li>
+<li><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile</a></li>
+<li><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile</a></li>
+<li><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile</a></li>
+<li><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite</a></li>
+<li><a href="mod_ssl.html#sslengine">SSLEngine</a></li>
+<li><a href="mod_ssl.html#sslmutex">SSLMutex</a></li>
+<li><a href="mod_ssl.html#ssloptions">SSLOptions</a></li>
+<li><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog</a></li>
+<li><a href="mod_ssl.html#sslprotocol">SSLProtocol</a></li>
+<li><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
+<li><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
+<li><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile</a></li>
+<li><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath</a></li>
+<li><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite</a></li>
+<li><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine</a></li>
+<li><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
+<li><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
+<li><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol</a></li>
+<li><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify</a></li>
+<li><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth</a></li>
+<li><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed</a></li>
+<li><a href="mod_ssl.html#sslrequire">SSLRequire</a></li>
+<li><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></li>
+<li><a href="mod_ssl.html#sslsessioncache">SSLSessionCache</a></li>
+<li><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout</a></li>
+<li><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient</a></li>
+<li><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth</a></li>
+<li><a href="mpm_common.html#startservers">StartServers</a></li>
+<li><a href="mpm_common.html#startthreads">StartThreads</a></li>
+<li><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup</a></li>
+<li><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit</a></li>
+<li><a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
+<li><a href="mpm_netware.html#threadstacksize">ThreadStackSize</a></li>
+<li><a href="core.html#timeout">TimeOut</a></li>
+<li><a href="mod_log_config.html#transferlog">TransferLog</a></li>
+<li><a href="mod_mime.html#typesconfig">TypesConfig</a></li>
+<li><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv</a></li>
+<li><a href="core.html#usecanonicalname">UseCanonicalName</a></li>
+<li><a href="mpm_common.html#user">User</a></li>
+<li><a href="mod_userdir.html#userdir">UserDir</a></li>
+<li><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot</a></li>
+<li><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP</a></li>
+<li><a href="core.html#virtualhost"><VirtualHost></a></li>
+<li><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias</a></li>
+<li><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP</a></li>
+<li><a href="mod_include.html#xbithack" id="X" name="X">XBitHack</a></li>
+</ul></div>
+<div id="footer">
+<p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en
index 2f07de4..b83c9fb 100644
--- a/docs/manual/mod/directives.html.en
+++ b/docs/manual/mod/directives.html.en
@@ -4,7 +4,20 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Directive Index - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="directive-index"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="preamble"><h1>Directive Index</h1>
+ -->
+<title>Directive Index - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="directive-index"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="preamble"><h1>Directive Index</h1>
+
<p>
Each Apache directive available in the standard Apache
distribution is listed here. They are described using a
@@ -17,8 +30,11 @@
is also available giving details about each directive in a
summary form.
</p>
- <p class="letters"><a href="#A"> A </a> | <a href="#B"> B </a> | <a href="#C"> C </a> | <a href="#D"> D </a> | <a href="#E"> E </a> | <a href="#F"> F </a> | <a href="#G"> G </a> | <a href="#H"> H </a> | <a href="#I"> I </a> | <a href="#K"> K </a> | <a href="#L"> L </a> | <a href="#M"> M </a> | <a href="#N"> N </a> | <a href="#O"> O </a> | <a href="#P"> P </a> | <a href="#R"> R </a> | <a href="#S"> S </a> | <a href="#T"> T </a> | <a href="#U"> U </a> | <a href="#V"> V </a> | <a href="#X"> X </a></p>
-</div><div id="directive-list"><ul><li><a href="prefork.html#acceptmutex" id="A" name="A">AcceptMutex</a></li>
+
+<p class="letters"><a href="#A"> A </a> | <a href="#B"> B </a> | <a href="#C"> C </a> | <a href="#D"> D </a> | <a href="#E"> E </a> | <a href="#F"> F </a> | <a href="#G"> G </a> | <a href="#H"> H </a> | <a href="#I"> I </a> | <a href="#K"> K </a> | <a href="#L"> L </a> | <a href="#M"> M </a> | <a href="#N"> N </a> | <a href="#O"> O </a> | <a href="#P"> P </a> | <a href="#R"> R </a> | <a href="#S"> S </a> | <a href="#T"> T </a> | <a href="#U"> U </a> | <a href="#V"> V </a> | <a href="#X"> X </a></p>
+</div>
+<div id="directive-list"><ul>
+<li><a href="mpm_common.html#acceptmutex" id="A" name="A">AcceptMutex</a></li>
<li><a href="core.html#acceptpathinfo">AcceptPathInfo</a></li>
<li><a href="core.html#accessfilename">AccessFileName</a></li>
<li><a href="mod_actions.html#action">Action</a></li>
@@ -41,21 +57,21 @@
<li><a href="mod_mime.html#addtype">AddType</a></li>
<li><a href="mod_alias.html#alias">Alias</a></li>
<li><a href="mod_alias.html#aliasmatch">AliasMatch</a></li>
-<li><a href="mod_authz_host.html#allow">Allow</a></li>
+<li><a href="mod_access.html#allow">Allow</a></li>
<li><a href="mod_proxy.html#allowconnect">AllowCONNECT</a></li>
<li><a href="core.html#allowoverride">AllowOverride</a></li>
-<li><a href="mod_authn_anon.html#anonymous">Anonymous</a></li>
-<li><a href="mod_authn_anon.html#anonymous_authoritative">Anonymous_Authoritative</a></li>
-<li><a href="mod_authn_anon.html#anonymous_logemail">Anonymous_LogEmail</a></li>
-<li><a href="mod_authn_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></li>
-<li><a href="mod_authn_anon.html#anonymous_nouserid">Anonymous_NoUserID</a></li>
-<li><a href="mod_authn_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail</a></li>
-<li><a href="perchild.html#assignuserid">AssignUserId</a></li>
-<li><a href="mod_auth_basic.html#authbasicauthoritative">AuthBasicAuthoritative</a></li>
-<li><a href="mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></li>
-<li><a href="mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></li>
-<li><a href="mod_authn_dbm.html#authdbmtype">AuthDBMType</a></li>
-<li><a href="mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></li>
+<li><a href="mod_auth_anon.html#anonymous">Anonymous</a></li>
+<li><a href="mod_auth_anon.html#anonymous_authoritative">Anonymous_Authoritative</a></li>
+<li><a href="mod_auth_anon.html#anonymous_logemail">Anonymous_LogEmail</a></li>
+<li><a href="mod_auth_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></li>
+<li><a href="mod_auth_anon.html#anonymous_nouserid">Anonymous_NoUserID</a></li>
+<li><a href="mod_auth_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail</a></li>
+<li><a href="perchild.html#assignuserid">AssignUserID</a></li>
+<li><a href="mod_auth.html#authauthoritative">AuthAuthoritative</a></li>
+<li><a href="mod_auth_dbm.html#authdbmauthoritative">AuthDBMAuthoritative</a></li>
+<li><a href="mod_auth_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></li>
+<li><a href="mod_auth_dbm.html#authdbmtype">AuthDBMType</a></li>
+<li><a href="mod_auth_dbm.html#authdbmuserfile">AuthDBMUserFile</a></li>
<li><a href="mod_auth_digest.html#authdigestalgorithm">AuthDigestAlgorithm</a></li>
<li><a href="mod_auth_digest.html#authdigestdomain">AuthDigestDomain</a></li>
<li><a href="mod_auth_digest.html#authdigestfile">AuthDigestFile</a></li>
@@ -64,7 +80,8 @@
<li><a href="mod_auth_digest.html#authdigestnonceformat">AuthDigestNonceFormat</a></li>
<li><a href="mod_auth_digest.html#authdigestnoncelifetime">AuthDigestNonceLifetime</a></li>
<li><a href="mod_auth_digest.html#authdigestqop">AuthDigestQop</a></li>
-<li><a href="mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></li>
+<li><a href="mod_auth_digest.html#authdigestshmemsize">AuthDigestShmemSize</a></li>
+<li><a href="mod_auth.html#authgroupfile">AuthGroupFile</a></li>
<li><a href="mod_auth_ldap.html#authldapauthoritative">AuthLDAPAuthoritative</a></li>
<li><a href="mod_auth_ldap.html#authldapbinddn">AuthLDAPBindDN</a></li>
<li><a href="mod_auth_ldap.html#authldapbindpassword">AuthLDAPBindPassword</a></li>
@@ -75,16 +92,14 @@
<li><a href="mod_auth_ldap.html#authldapgroupattribute">AuthLDAPGroupAttribute</a></li>
<li><a href="mod_auth_ldap.html#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN</a></li>
<li><a href="mod_auth_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN</a></li>
-<li><a href="mod_auth_ldap.html#authldapstarttls directive">AuthLDAPStartTLS directive</a></li>
+<li><a href="mod_auth_ldap.html#authldapstarttls">AuthLDAPStartTLS</a></li>
<li><a href="mod_auth_ldap.html#authldapurl">AuthLDAPUrl</a></li>
<li><a href="core.html#authname">AuthName</a></li>
<li><a href="core.html#authtype">AuthType</a></li>
-<li><a href="mod_authn_file.html#authuserfile">AuthUserFile</a></li>
-<li><a href="mod_authz_dbm.html#authzdbmauthoritative">AuthzDBMAuthoritative</a></li>
-<li><a href="mod_authz_dbm.html#authzdbmtype">AuthzDBMType</a></li>
-<li><a href="mod_authz_groupfile.html#authzgroupfileauthoritative">AuthzGroupFileAuthoritative</a></li>
+<li><a href="mod_auth.html#authuserfile">AuthUserFile</a></li>
<li><a href="mod_setenvif.html#browsermatch" id="B" name="B">BrowserMatch</a></li>
<li><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></li>
+<li><a href="mpm_common.html#bs2000account">BS2000Account</a></li>
<li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
<li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
<li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
@@ -103,7 +118,6 @@
<li><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor</a></li>
<li><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire</a></li>
<li><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></li>
-<li><a href="mod_cache.html#cachemaxstreamingbuffer">CacheMaxStreamingBuffer</a></li>
<li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
<li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
<li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
@@ -114,7 +128,7 @@
<li><a href="mod_charset_lite.html#charsetoptions">CharsetOptions</a></li>
<li><a href="mod_charset_lite.html#charsetsourceenc">CharsetSourceEnc</a></li>
<li><a href="mod_speling.html#checkspelling">CheckSpelling</a></li>
-<li><a href="perchild.html#childperuserid">ChildPerUserId</a></li>
+<li><a href="perchild.html#childperuserid">ChildPerUserID</a></li>
<li><a href="core.html#contentdigest">ContentDigest</a></li>
<li><a href="mod_usertrack.html#cookiedomain">CookieDomain</a></li>
<li><a href="mod_usertrack.html#cookieexpires">CookieExpires</a></li>
@@ -135,7 +149,7 @@
<li><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote</a></li>
<li><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel</a></li>
<li><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize</a></li>
-<li><a href="mod_authz_host.html#deny">Deny</a></li>
+<li><a href="mod_access.html#deny">Deny</a></li>
<li><a href="core.html#directory"><Directory></a></li>
<li><a href="mod_dir.html#directoryindex">DirectoryIndex</a></li>
<li><a href="core.html#directorymatch"><DirectoryMatch></a></li>
@@ -205,12 +219,14 @@
<li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
<li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
<li><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
+<li><a href="beos.html#maxrequestsperthread">MaxRequestsPerThread</a></li>
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
-<li><a href="mpm_common.html#maxthreadsperchild">MaxThreadsPerChild</a></li>
+<li><a href="perchild.html#maxthreadsperchild">MaxThreadsPerChild</a></li>
<li><a href="mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></li>
<li><a href="mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></li>
+<li><a href="mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></li>
<li><a href="mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></li>
<li><a href="mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></li>
<li><a href="mod_mem_cache.html#mcachesize">MCacheSize</a></li>
@@ -225,9 +241,9 @@
<li><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch</a></li>
<li><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost</a></li>
<li><a href="mod_proxy.html#noproxy">NoProxy</a></li>
-<li><a href="mpm_common.html#numservers">NumServers</a></li>
+<li><a href="perchild.html#numservers">NumServers</a></li>
<li><a href="core.html#options" id="O" name="O">Options</a></li>
-<li><a href="mod_authz_host.html#order">Order</a></li>
+<li><a href="mod_access.html#order">Order</a></li>
<li><a href="mod_env.html#passenv" id="P" name="P">PassEnv</a></li>
<li><a href="mpm_common.html#pidfile">PidFile</a></li>
<li><a href="mod_echo.html#protocolecho">ProtocolEcho</a></li>
@@ -353,4 +369,8 @@
<li><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias</a></li>
<li><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP</a></li>
<li><a href="mod_include.html#xbithack" id="X" name="X">XBitHack</a></li>
-</ul></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</ul></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directives.html.ja.jis b/docs/manual/mod/directives.html.ja.jis
index e34abb1..fac215b 100644
--- a/docs/manual/mod/directives.html.ja.jis
+++ b/docs/manual/mod/directives.html.ja.jis
@@ -6,330 +6,83 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
--><title>$B%G%#%l%/%F%#%V0lMw(B - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="directive-index"><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="preamble"><h1>$B%G%#%l%/%F%#%V0lMw(B</h1>
<p>
- $BI8=`(B Apache $BG[I[$K$"$k$9$Y$F$N(B Apache $B$N%G%#%l%/%F%#%V$N0l(B$BMw$G$9!#(B
- $B$3$l$i$O0l4S$7$?7A<0$G=q$+$l$F$$$F!";H$o$l(B$B$F$$$kMQ8l$N(B
+ $BI8=`(B Apache $BG[I[$K$"$k$9$Y$F$N(B Apache $B$N%G%#%l%/%F%#%V$N0lMw$G$9!#(B
+ $B$3$l$i$O0l4S$7$?7A<0$G=q$+$l$F$$$F!";H$o$l$F$$$kMQ8l$N(B
<a href="directive-dict.html" rel="Glossary">$BMQ8l=8(B</a> $B$bMQ0U$5$l$F$$$^$9!#(B
</p>
<p>
$B3F%G%#%l%/%F%#%V$N35MW$r@bL@$7$?(B <a href="quickreference.html">$B%G%#%l%/%F%#%V%/%$%C%/%j%U%!%l%s%9(B</a>$B$b(B
$B$"$j$^$9!#(B
</p>
- <p class="letters"><a href="#A"> A </a> | <a href="#B"> B </a> | <a href="#C"> C </a> | <a href="#D"> D </a> | <a href="#E"> E </a> | <a href="#F"> F </a> | <a href="#G"> G </a> | <a href="#H"> H </a> | <a href="#I"> I </a> | <a href="#K"> K </a> | <a href="#L"> L </a> | <a href="#M"> M </a> | <a href="#N"> N </a> | <a href="#O"> O </a> | <a href="#P"> P </a> | <a href="#R"> R </a> | <a href="#S"> S </a> | <a href="#T"> T </a> | <a href="#U"> U </a> | <a href="#V"> V </a> | <a href="#X"> X </a></p>
-</div><div id="directive-list"><ul><li><a href="prefork.html#acceptmutex" id="A" name="A">AcceptMutex</a></li>
-<li><a href="core.html#acceptpathinfo">AcceptPathInfo</a></li>
+ <p class="letters"><a href="#A">?A?</a> | <a href="#C">?C?</a> | <a href="#D">?D?</a> | <a href="#E">?E?</a> | <a href="#F">?F?</a> | <a href="#H">?H?</a> | <a href="#I">?I?</a> | <a href="#K">?K?</a> | <a href="#L">?L?</a> | <a href="#M">?M?</a> | <a href="#N">?N?</a> | <a href="#O">?O?</a> | <a href="#R">?R?</a> | <a href="#S">?S?</a> | <a href="#T">?T?</a> | <a href="#U">?U?</a> | <a href="#V">?V?</a></p>
+</div><div id="directive-list"><ul><li><a href="core.html#acceptpathinfo" id="A" name="A">AcceptPathInfo</a></li>
<li><a href="core.html#accessfilename">AccessFileName</a></li>
<li><a href="mod_actions.html#action">Action</a></li>
-<li><a href="mod_autoindex.html#addalt">AddAlt</a></li>
-<li><a href="mod_autoindex.html#addaltbyencoding">AddAltByEncoding</a></li>
-<li><a href="mod_autoindex.html#addaltbytype">AddAltByType</a></li>
-<li><a href="mod_mime.html#addcharset">AddCharset</a></li>
<li><a href="core.html#adddefaultcharset">AddDefaultCharset</a></li>
-<li><a href="mod_autoindex.html#adddescription">AddDescription</a></li>
-<li><a href="mod_mime.html#addencoding">AddEncoding</a></li>
-<li><a href="mod_mime.html#addhandler">AddHandler</a></li>
-<li><a href="mod_autoindex.html#addicon">AddIcon</a></li>
-<li><a href="mod_autoindex.html#addiconbyencoding">AddIconByEncoding</a></li>
-<li><a href="mod_autoindex.html#addiconbytype">AddIconByType</a></li>
-<li><a href="mod_mime.html#addinputfilter">AddInputFilter</a></li>
-<li><a href="mod_mime.html#addlanguage">AddLanguage</a></li>
-<li><a href="mod_info.html#addmoduleinfo">AddModuleInfo</a></li>
-<li><a href="mod_mime.html#addoutputfilter">AddOutputFilter</a></li>
<li><a href="core.html#addoutputfilterbytype">AddOutputFilterByType</a></li>
-<li><a href="mod_mime.html#addtype">AddType</a></li>
<li><a href="mod_alias.html#alias">Alias</a></li>
<li><a href="mod_alias.html#aliasmatch">AliasMatch</a></li>
-<li><a href="mod_authz_host.html#allow">Allow</a></li>
-<li><a href="mod_proxy.html#allowconnect">AllowCONNECT</a></li>
<li><a href="core.html#allowoverride">AllowOverride</a></li>
-<li><a href="mod_authn_anon.html#anonymous">Anonymous</a></li>
-<li><a href="mod_authn_anon.html#anonymous_authoritative">Anonymous_Authoritative</a></li>
-<li><a href="mod_authn_anon.html#anonymous_logemail">Anonymous_LogEmail</a></li>
-<li><a href="mod_authn_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></li>
-<li><a href="mod_authn_anon.html#anonymous_nouserid">Anonymous_NoUserID</a></li>
-<li><a href="mod_authn_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail</a></li>
-<li><a href="perchild.html#assignuserid">AssignUserId</a></li>
-<li><a href="mod_auth_basic.html#authbasicauthoritative">AuthBasicAuthoritative</a></li>
-<li><a href="mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></li>
-<li><a href="mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></li>
-<li><a href="mod_authn_dbm.html#authdbmtype">AuthDBMType</a></li>
-<li><a href="mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></li>
-<li><a href="mod_auth_digest.html#authdigestalgorithm">AuthDigestAlgorithm</a></li>
-<li><a href="mod_auth_digest.html#authdigestdomain">AuthDigestDomain</a></li>
-<li><a href="mod_auth_digest.html#authdigestfile">AuthDigestFile</a></li>
-<li><a href="mod_auth_digest.html#authdigestgroupfile">AuthDigestGroupFile</a></li>
-<li><a href="mod_auth_digest.html#authdigestnccheck">AuthDigestNcCheck</a></li>
-<li><a href="mod_auth_digest.html#authdigestnonceformat">AuthDigestNonceFormat</a></li>
-<li><a href="mod_auth_digest.html#authdigestnoncelifetime">AuthDigestNonceLifetime</a></li>
-<li><a href="mod_auth_digest.html#authdigestqop">AuthDigestQop</a></li>
-<li><a href="mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></li>
-<li><a href="mod_auth_ldap.html#authldapauthoritative">AuthLDAPAuthoritative</a></li>
-<li><a href="mod_auth_ldap.html#authldapbinddn">AuthLDAPBindDN</a></li>
-<li><a href="mod_auth_ldap.html#authldapbindpassword">AuthLDAPBindPassword</a></li>
-<li><a href="mod_auth_ldap.html#authldapcomparednonserver">AuthLDAPCompareDNOnServer</a></li>
-<li><a href="mod_auth_ldap.html#authldapdereferencealiases">AuthLDAPDereferenceAliases</a></li>
-<li><a href="mod_auth_ldap.html#authldapenabled">AuthLDAPEnabled</a></li>
-<li><a href="mod_auth_ldap.html#authldapfrontpagehack">AuthLDAPFrontPageHack</a></li>
-<li><a href="mod_auth_ldap.html#authldapgroupattribute">AuthLDAPGroupAttribute</a></li>
-<li><a href="mod_auth_ldap.html#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN</a></li>
-<li><a href="mod_auth_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN</a></li>
-<li><a href="mod_auth_ldap.html#authldapstarttls directive">AuthLDAPStartTLS directive</a></li>
-<li><a href="mod_auth_ldap.html#authldapurl">AuthLDAPUrl</a></li>
<li><a href="core.html#authname">AuthName</a></li>
<li><a href="core.html#authtype">AuthType</a></li>
-<li><a href="mod_authn_file.html#authuserfile">AuthUserFile</a></li>
-<li><a href="mod_authz_dbm.html#authzdbmauthoritative">AuthzDBMAuthoritative</a></li>
-<li><a href="mod_authz_dbm.html#authzdbmtype">AuthzDBMType</a></li>
-<li><a href="mod_authz_groupfile.html#authzgroupfileauthoritative">AuthzGroupFileAuthoritative</a></li>
-<li><a href="mod_setenvif.html#browsermatch" id="B" name="B">BrowserMatch</a></li>
-<li><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></li>
-<li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
-<li><a href="mod_cache.html#cachedisable">CacheDisable</a></li>
-<li><a href="mod_cache.html#cacheenable">CacheEnable</a></li>
-<li><a href="mod_file_cache.html#cachefile">CacheFile</a></li>
-<li><a href="mod_cache.html#cacheforcecompletion">CacheForceCompletion</a></li>
-<li><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl</a></li>
-<li><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod</a></li>
-<li><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor</a></li>
-<li><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire</a></li>
-<li><a href="mod_cache.html#cachemaxstreamingbuffer">CacheMaxStreamingBuffer</a></li>
-<li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
-<li><a href="core.html#cgimapextension">CGIMapExtension</a></li>
-<li><a href="mod_charset_lite.html#charsetdefault">CharsetDefault</a></li>
-<li><a href="mod_charset_lite.html#charsetoptions">CharsetOptions</a></li>
-<li><a href="mod_charset_lite.html#charsetsourceenc">CharsetSourceEnc</a></li>
-<li><a href="mod_speling.html#checkspelling">CheckSpelling</a></li>
-<li><a href="perchild.html#childperuserid">ChildPerUserId</a></li>
+<li><a href="core.html#cgimapextension" id="C" name="C">CGIMapExtension</a></li>
<li><a href="core.html#contentdigest">ContentDigest</a></li>
-<li><a href="mod_usertrack.html#cookiedomain">CookieDomain</a></li>
-<li><a href="mod_usertrack.html#cookieexpires">CookieExpires</a></li>
-<li><a href="mod_log_config.html#cookielog">CookieLog</a></li>
-<li><a href="mod_usertrack.html#cookiename">CookieName</a></li>
-<li><a href="mod_usertrack.html#cookiestyle">CookieStyle</a></li>
-<li><a href="mod_usertrack.html#cookietracking">CookieTracking</a></li>
-<li><a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
-<li><a href="mod_log_config.html#customlog">CustomLog</a></li>
-<li><a href="mod_dav.html#dav" id="D" name="D">Dav</a></li>
-<li><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity</a></li>
-<li><a href="mod_dav.html#davlockdb">DavLockDB</a></li>
-<li><a href="mod_dav.html#davmintimeout">DavMinTimeout</a></li>
-<li><a href="mod_autoindex.html#defaulticon">DefaultIcon</a></li>
-<li><a href="mod_mime.html#defaultlanguage">DefaultLanguage</a></li>
-<li><a href="core.html#defaulttype">DefaultType</a></li>
-<li><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize</a></li>
-<li><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote</a></li>
-<li><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel</a></li>
-<li><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize</a></li>
-<li><a href="mod_authz_host.html#deny">Deny</a></li>
+<li><a href="core.html#defaulttype" id="D" name="D">DefaultType</a></li>
<li><a href="core.html#directory"><Directory></a></li>
-<li><a href="mod_dir.html#directoryindex">DirectoryIndex</a></li>
<li><a href="core.html#directorymatch"><DirectoryMatch></a></li>
<li><a href="core.html#documentroot">DocumentRoot</a></li>
<li><a href="core.html#enablemmap" id="E" name="E">EnableMMAP</a></li>
<li><a href="core.html#enablesendfile">EnableSendfile</a></li>
<li><a href="core.html#errordocument">ErrorDocument</a></li>
<li><a href="core.html#errorlog">ErrorLog</a></li>
-<li><a href="mod_example.html#example">Example</a></li>
-<li><a href="mod_expires.html#expiresactive">ExpiresActive</a></li>
-<li><a href="mod_expires.html#expiresbytype">ExpiresByType</a></li>
-<li><a href="mod_expires.html#expiresdefault">ExpiresDefault</a></li>
-<li><a href="mod_status.html#extendedstatus">ExtendedStatus</a></li>
-<li><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></li>
-<li><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions</a></li>
<li><a href="core.html#fileetag" id="F" name="F">FileETag</a></li>
<li><a href="core.html#files"><Files></a></li>
<li><a href="core.html#filesmatch"><FilesMatch></a></li>
-<li><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority</a></li>
<li><a href="core.html#forcetype">ForceType</a></li>
-<li><a href="mpm_common.html#group" id="G" name="G">Group</a></li>
-<li><a href="mod_headers.html#header" id="H" name="H">Header</a></li>
-<li><a href="mod_autoindex.html#headername">HeaderName</a></li>
-<li><a href="core.html#hostnamelookups">HostnameLookups</a></li>
+<li><a href="core.html#hostnamelookups" id="H" name="H">HostnameLookups</a></li>
<li><a href="core.html#identitycheck" id="I" name="I">IdentityCheck</a></li>
<li><a href="core.html#ifdefine"><IfDefine></a></li>
<li><a href="core.html#ifmodule"><IfModule></a></li>
-<li><a href="mod_imap.html#imapbase">ImapBase</a></li>
-<li><a href="mod_imap.html#imapdefault">ImapDefault</a></li>
-<li><a href="mod_imap.html#imapmenu">ImapMenu</a></li>
<li><a href="core.html#include">Include</a></li>
-<li><a href="mod_autoindex.html#indexignore">IndexIgnore</a></li>
-<li><a href="mod_autoindex.html#indexoptions">IndexOptions</a></li>
-<li><a href="mod_autoindex.html#indexorderdefault">IndexOrderDefault</a></li>
-<li><a href="mod_isapi.html#isapiappendlogtoerrors">ISAPIAppendLogToErrors</a></li>
-<li><a href="mod_isapi.html#isapiappendlogtoquery">ISAPIAppendLogToQuery</a></li>
-<li><a href="mod_isapi.html#isapicachefile">ISAPICacheFile</a></li>
-<li><a href="mod_isapi.html#isapifakeasync">ISAPIFakeAsync</a></li>
-<li><a href="mod_isapi.html#isapilognotsupported">ISAPILogNotSupported</a></li>
-<li><a href="mod_isapi.html#isapireadaheadbuffer">ISAPIReadAheadBuffer</a></li>
<li><a href="core.html#keepalive" id="K" name="K">KeepAlive</a></li>
<li><a href="core.html#keepalivetimeout">KeepAliveTimeout</a></li>
-<li><a href="mod_negotiation.html#languagepriority" id="L" name="L">LanguagePriority</a></li>
-<li><a href="mod_ldap.html#ldapcacheentries">LDAPCacheEntries</a></li>
-<li><a href="mod_ldap.html#ldapcachettl">LDAPCacheTTL</a></li>
-<li><a href="mod_ldap.html#ldapcertdbpath">LDAPCertDBPath</a></li>
-<li><a href="mod_ldap.html#ldapopcacheentries">LDAPOpCacheEntries</a></li>
-<li><a href="mod_ldap.html#ldapopcachettl">LDAPOpCacheTTL</a></li>
-<li><a href="mod_ldap.html#ldapsharedcachesize">LDAPSharedCacheSize</a></li>
-<li><a href="core.html#limit"><Limit></a></li>
+<li><a href="core.html#limit" id="L" name="L"><Limit></a></li>
<li><a href="core.html#limitexcept"><LimitExcept></a></li>
<li><a href="core.html#limitrequestbody">LimitRequestBody</a></li>
<li><a href="core.html#limitrequestfields">LimitRequestFields</a></li>
<li><a href="core.html#limitrequestfieldsize">LimitRequestFieldSize</a></li>
<li><a href="core.html#limitrequestline">LimitRequestLine</a></li>
<li><a href="core.html#limitxmlrequestbody">LimitXMLRequestBody</a></li>
-<li><a href="mpm_common.html#listen">Listen</a></li>
-<li><a href="mpm_common.html#listenbacklog">ListenBackLog</a></li>
-<li><a href="mod_so.html#loadfile">LoadFile</a></li>
-<li><a href="mod_so.html#loadmodule">LoadModule</a></li>
<li><a href="core.html#location"><Location></a></li>
<li><a href="core.html#locationmatch"><LocationMatch></a></li>
-<li><a href="mpm_common.html#lockfile">LockFile</a></li>
-<li><a href="mod_log_config.html#logformat">LogFormat</a></li>
<li><a href="core.html#loglevel">LogLevel</a></li>
-<li><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients</a></li>
-<li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
-<li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
-<li><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
-<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
-<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
-<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
-<li><a href="mpm_common.html#maxthreadsperchild">MaxThreadsPerChild</a></li>
-<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
-<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
-<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
-<li><a href="mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></li>
-<li><a href="prefork.html#minspareservers">MinSpareServers</a></li>
-<li><a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
-<li><a href="mod_file_cache.html#mmapfile">MMapFile</a></li>
-<li><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo</a></li>
-<li><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch</a></li>
+<li><a href="core.html#maxkeepaliverequests" id="M" name="M">MaxKeepAliveRequests</a></li>
<li><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost</a></li>
-<li><a href="mod_proxy.html#noproxy">NoProxy</a></li>
-<li><a href="mpm_common.html#numservers">NumServers</a></li>
<li><a href="core.html#options" id="O" name="O">Options</a></li>
-<li><a href="mod_authz_host.html#order">Order</a></li>
-<li><a href="mod_env.html#passenv" id="P" name="P">PassEnv</a></li>
-<li><a href="mpm_common.html#pidfile">PidFile</a></li>
-<li><a href="mod_echo.html#protocolecho">ProtocolEcho</a></li>
-<li><a href="mod_proxy.html#proxy"><Proxy></a></li>
-<li><a href="mod_proxy.html#proxyblock">ProxyBlock</a></li>
-<li><a href="mod_proxy.html#proxydomain">ProxyDomain</a></li>
-<li><a href="mod_proxy.html#proxyerroroverride">ProxyErrorOverride</a></li>
-<li><a href="mod_proxy.html#proxyiobuffersize">ProxyIOBufferSize</a></li>
-<li><a href="mod_proxy.html#proxymatch"><ProxyMatch></a></li>
-<li><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards</a></li>
-<li><a href="mod_proxy.html#proxypass">ProxyPass</a></li>
-<li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
-<li><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost</a></li>
-<li><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize</a></li>
-<li><a href="mod_proxy.html#proxyremote">ProxyRemote</a></li>
-<li><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch</a></li>
-<li><a href="mod_proxy.html#proxyrequests">ProxyRequests</a></li>
-<li><a href="mod_proxy.html#proxytimeout">ProxyTimeout</a></li>
-<li><a href="mod_proxy.html#proxyvia">ProxyVia</a></li>
-<li><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName</a></li>
-<li><a href="mod_alias.html#redirect">Redirect</a></li>
+<li><a href="mod_alias.html#redirect" id="R" name="R">Redirect</a></li>
<li><a href="mod_alias.html#redirectmatch">RedirectMatch</a></li>
<li><a href="mod_alias.html#redirectpermanent">RedirectPermanent</a></li>
<li><a href="mod_alias.html#redirecttemp">RedirectTemp</a></li>
-<li><a href="mod_mime.html#removecharset">RemoveCharset</a></li>
-<li><a href="mod_mime.html#removeencoding">RemoveEncoding</a></li>
-<li><a href="mod_mime.html#removehandler">RemoveHandler</a></li>
-<li><a href="mod_mime.html#removeinputfilter">RemoveInputFilter</a></li>
-<li><a href="mod_mime.html#removelanguage">RemoveLanguage</a></li>
-<li><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></li>
-<li><a href="mod_mime.html#removetype">RemoveType</a></li>
-<li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
<li><a href="core.html#require">Require</a></li>
-<li><a href="mod_rewrite.html#rewritebase">RewriteBase</a></li>
-<li><a href="mod_rewrite.html#rewritecond">RewriteCond</a></li>
-<li><a href="mod_rewrite.html#rewriteengine">RewriteEngine</a></li>
-<li><a href="mod_rewrite.html#rewritelock">RewriteLock</a></li>
-<li><a href="mod_rewrite.html#rewritelog">RewriteLog</a></li>
-<li><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></li>
-<li><a href="mod_rewrite.html#rewritemap">RewriteMap</a></li>
-<li><a href="mod_rewrite.html#rewriteoptions">RewriteOptions</a></li>
-<li><a href="mod_rewrite.html#rewriterule">RewriteRule</a></li>
<li><a href="core.html#rlimitcpu">RLimitCPU</a></li>
<li><a href="core.html#rlimitmem">RLimitMEM</a></li>
<li><a href="core.html#rlimitnproc">RLimitNPROC</a></li>
<li><a href="core.html#satisfy" id="S" name="S">Satisfy</a></li>
-<li><a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
<li><a href="mod_actions.html#script">Script</a></li>
<li><a href="mod_alias.html#scriptalias">ScriptAlias</a></li>
<li><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch</a></li>
<li><a href="core.html#scriptinterpretersource">ScriptInterpreterSource</a></li>
-<li><a href="mod_cgi.html#scriptlog">ScriptLog</a></li>
-<li><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer</a></li>
-<li><a href="mod_cgi.html#scriptloglength">ScriptLogLength</a></li>
-<li><a href="mod_cgid.html#scriptsock">ScriptSock</a></li>
-<li><a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
<li><a href="core.html#serveradmin">ServerAdmin</a></li>
<li><a href="core.html#serveralias">ServerAlias</a></li>
-<li><a href="mpm_common.html#serverlimit">ServerLimit</a></li>
<li><a href="core.html#servername">ServerName</a></li>
<li><a href="core.html#serverpath">ServerPath</a></li>
<li><a href="core.html#serverroot">ServerRoot</a></li>
<li><a href="core.html#serversignature">ServerSignature</a></li>
<li><a href="core.html#servertokens">ServerTokens</a></li>
-<li><a href="mod_env.html#setenv">SetEnv</a></li>
-<li><a href="mod_setenvif.html#setenvif">SetEnvIf</a></li>
-<li><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase</a></li>
<li><a href="core.html#sethandler">SetHandler</a></li>
<li><a href="core.html#setinputfilter">SetInputFilter</a></li>
<li><a href="core.html#setoutputfilter">SetOutputFilter</a></li>
-<li><a href="mod_include.html#ssiendtag">SSIEndTag</a></li>
-<li><a href="mod_include.html#ssierrormsg">SSIErrorMsg</a></li>
-<li><a href="mod_include.html#ssistarttag">SSIStartTag</a></li>
-<li><a href="mod_include.html#ssitimeformat">SSITimeFormat</a></li>
-<li><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho</a></li>
-<li><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile</a></li>
-<li><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath</a></li>
-<li><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile</a></li>
-<li><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath</a></li>
-<li><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile</a></li>
-<li><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile</a></li>
-<li><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile</a></li>
-<li><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite</a></li>
-<li><a href="mod_ssl.html#sslengine">SSLEngine</a></li>
-<li><a href="mod_ssl.html#sslmutex">SSLMutex</a></li>
-<li><a href="mod_ssl.html#ssloptions">SSLOptions</a></li>
-<li><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog</a></li>
-<li><a href="mod_ssl.html#sslprotocol">SSLProtocol</a></li>
-<li><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
-<li><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
-<li><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile</a></li>
-<li><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath</a></li>
-<li><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite</a></li>
-<li><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine</a></li>
-<li><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
-<li><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
-<li><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol</a></li>
-<li><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify</a></li>
-<li><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth</a></li>
-<li><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed</a></li>
-<li><a href="mod_ssl.html#sslrequire">SSLRequire</a></li>
-<li><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></li>
-<li><a href="mod_ssl.html#sslsessioncache">SSLSessionCache</a></li>
-<li><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout</a></li>
-<li><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient</a></li>
-<li><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth</a></li>
-<li><a href="mpm_common.html#startservers">StartServers</a></li>
-<li><a href="mpm_common.html#startthreads">StartThreads</a></li>
-<li><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup</a></li>
-<li><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit</a></li>
-<li><a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
-<li><a href="mpm_netware.html#threadstacksize">ThreadStackSize</a></li>
-<li><a href="core.html#timeout">TimeOut</a></li>
-<li><a href="mod_log_config.html#transferlog">TransferLog</a></li>
-<li><a href="mod_mime.html#typesconfig">TypesConfig</a></li>
-<li><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv</a></li>
-<li><a href="core.html#usecanonicalname">UseCanonicalName</a></li>
-<li><a href="mpm_common.html#user">User</a></li>
-<li><a href="mod_userdir.html#userdir">UserDir</a></li>
-<li><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot</a></li>
-<li><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP</a></li>
-<li><a href="core.html#virtualhost"><VirtualHost></a></li>
-<li><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias</a></li>
-<li><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP</a></li>
-<li><a href="mod_include.html#xbithack" id="X" name="X">XBitHack</a></li>
+<li><a href="core.html#timeout" id="T" name="T">TimeOut</a></li>
+<li><a href="core.html#usecanonicalname" id="U" name="U">UseCanonicalName</a></li>
+<li><a href="core.html#virtualhost" id="V" name="V"><VirtualHost></a></li>
</ul></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directives.xml.de b/docs/manual/mod/directives.xml.de
new file mode 100644
index 0000000..d8dfab2
--- /dev/null
+++ b/docs/manual/mod/directives.xml.de
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE directiveindex SYSTEM "../style/modulesynopsis.dtd"
+ [ <!ENTITY sitemap SYSTEM "../sitemap.xml.de"> ]
+>
+<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
+<!-- English revision: 1.7 -->
+
+<directiveindex>
+ <title>Verzeichnis der Direktiven</title>
+ <summary>
+ <p>
+ Hier sind alle Apache-Direktiven aufgeführt, die in der
+ Standard-Apache-Distribution verfügbar sind. Sie sind in
+ einem einheitlichen Format beschrieben. Ein <a
+ href="directive-dict.html" rel="Glossary">Glossar</a>
+ erläutert die in der Beschreibung verwendeten Begriffe.
+ </p>
+
+ <p>
+ Außerdem existiert eine <a
+ href="quickreference.html">Kurzreferenz der Direktiven</a>, welche
+ zu jeder Direktive eine Zusammenfassung der Details enthält.
+ </p>
+ </summary>
+
+ &sitemap;
+</directiveindex>
\ No newline at end of file
diff --git a/docs/manual/mod/index.html.de b/docs/manual/mod/index.html.de
new file mode 100644
index 0000000..d388650
--- /dev/null
+++ b/docs/manual/mod/index.html.de
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>Modul-Index - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="module-index"><div id="page-header">
+<p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Modul-Index</h1>
+
+ <p>
+ Unten ist eine Liste aller Module angegeben, die als Bestandteil der
+ Apache-Distribution mitgeliefert werden. Bitte beachten Sie auch die
+ vollständige alphabetische Liste <a href="directives.html">aller
+ Apache-Direktiven</a>.
+ </p>
+ </div>
+<div id="quickview"><ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#core">Kernfunktionen und Multi-Processing-Module</a></li><li><img alt="" src="../images/down.gif" /> <a href="#other">Andere Module</a></li></ul><h3>Siehe auch</h3>
+<ul class="seealso">
+<li><a href="../mpm.html">Multi-Processing-Module (MPMs)</a>
+ </li>
+<li><a href="quickreference.html">Kurzreferenz der Direktiven</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 id="core" name="core">Kernfunktionen und Multi-Processing-Module</a></h2>
+<dl>
+<dt><a href="core.html">core</a></dt><dd>Core Apache HTTP Server features that are always
+available</dd>
+<dt><a href="mpm_common.html">mpm_common</a></dt><dd class="separate">A collection of directives that are implemented by
+more than one multi-processing module (MPM)</dd>
+<dt><a href="beos.html">beos</a></dt><dd>This Multi-Processing Module is optimized for BeOS.</dd>
+<dt><a href="leader.html">leader</a></dt><dd>An experimental variant of the standard <code class="module"><a href="../mod/worker.html">worker</a></code>
+MPM</dd>
+<dt><a href="mpm_netware.html">mpm_netware</a></dt><dd>Multi-Processing Module implementing an exclusively threaded web
+ server optimized for Novell NetWare</dd>
+<dt><a href="mpmt_os2.html">mpmt_os2</a></dt><dd>Hybrid multi-process, multi-threaded MPM for OS/2</dd>
+<dt><a href="perchild.html">perchild</a></dt><dd>Multi-Processing Module allowing for daemon processes serving
+requests to be assigned a variety of different userids</dd>
+<dt><a href="prefork.html">prefork</a></dt><dd>Implements a non-threaded, pre-forking web server</dd>
+<dt><a href="threadpool.html">threadpool</a></dt><dd>Yet another experimental variant of the standard
+<code class="module"><a href="../mod/worker.html">worker</a></code> MPM</dd>
+<dt><a href="mpm_winnt.html">mpm_winnt</a></dt><dd>This Multi-Processing Module is optimized for Windows
+NT.</dd>
+<dt><a href="worker.html">worker</a></dt><dd>Multi-Processing Module implementing a hybrid
+ multi-threaded multi-process web server</dd>
+</dl></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section"><h2><a id="other" name="other">Andere Module</a></h2>
+<p class="letters"><a href="#A"> A </a> | <a href="#C"> C </a> | <a href="#D"> D </a> | <a href="#E"> E </a> | <a href="#F"> F </a> | <a href="#H"> H </a> | <a href="#I"> I </a> | <a href="#L"> L </a> | <a href="#M"> M </a> | <a href="#N"> N </a> | <a href="#P"> P </a> | <a href="#R"> R </a> | <a href="#S"> S </a> | <a href="#U"> U </a> | <a href="#V"> V </a></p>
+<dl><dt><a href="mod_access.html" id="A" name="A">mod_access</a></dt><dd>Provides access control based on client hostname, IP
+address, or other characteristics of the client request.</dd>
+<dt><a href="mod_actions.html">mod_actions</a></dt><dd>This module provides for executing CGI scripts based on
+media type or request method.</dd>
+<dt><a href="mod_alias.html">mod_alias</a></dt><dd>Provides for mapping different parts of the host
+ filesystem in the document tree and for URL redirection</dd>
+<dt><a href="mod_asis.html">mod_asis</a></dt><dd>Sends files that contain their own
+HTTP headers</dd>
+<dt><a href="mod_auth.html">mod_auth</a></dt><dd>User authentication using text files</dd>
+<dt><a href="mod_auth_anon.html">mod_auth_anon</a></dt><dd>Allows "anonymous" user access to authenticated
+areas</dd>
+<dt><a href="mod_auth_dbm.html">mod_auth_dbm</a></dt><dd>Provides for user authentication using DBM
+ files</dd>
+<dt><a href="mod_auth_digest.html">mod_auth_digest</a></dt><dd>User authentication using MD5
+ Digest Authentication.</dd>
+<dt><a href="mod_auth_ldap.html">mod_auth_ldap</a></dt><dd>Allows an LDAP directory to be used to store the database
+for HTTP Basic authentication.</dd>
+<dt><a href="mod_autoindex.html">mod_autoindex</a></dt><dd>Generates directory indexes,
+ automatically, similar to the Unix <code>ls</code> command or the
+ Win32 <code>dir</code> shell command</dd>
+<dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>Content cache keyed to URIs.</dd>
+<dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
+<dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>Execution of CGI scripts</dd>
+<dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
+ external CGI daemon</dd>
+<dt><a href="mod_charset_lite.html">mod_charset_lite</a></dt><dd>Specify character set translation or recoding</dd>
+<dt><a href="mod_dav.html" id="D" name="D">mod_dav</a></dt><dd>Distributed Authoring and Versioning
+(<a href="http://www.webdav.org/">WebDAV</a>) functionality</dd>
+<dt><a href="mod_dav_fs.html">mod_dav_fs</a></dt><dd>filesystem provider for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></dd>
+<dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>Compress content before it is delivered to the
+client</dd>
+<dt><a href="mod_dir.html">mod_dir</a></dt><dd>Provides for "trailing slash" redirects and
+ serving directory index files</dd>
+<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>Content cache storage manager keyed to URIs</dd>
+<dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>A simple echo server to illustrate protocol
+modules</dd>
+<dt><a href="mod_env.html">mod_env</a></dt><dd>Modifies the environment which is passed to CGI scripts and
+SSI pages</dd>
+<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustrates the Apache module API</dd>
+<dt><a href="mod_expires.html">mod_expires</a></dt><dd>Generation of <code>Expires</code> HTTP headers according to
+user-specified criteria</dd>
+<dt><a href="mod_ext_filter.html">mod_ext_filter</a></dt><dd>Pass the response body through an external program before
+delivery to the client</dd>
+<dt><a href="mod_file_cache.html" id="F" name="F">mod_file_cache</a></dt><dd>Caches a static list of files in memory</dd>
+<dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>Customization of HTTP request and response
+headers</dd>
+<dt><a href="mod_imap.html" id="I" name="I">mod_imap</a></dt><dd>Server-side imagemap processing</dd>
+<dt><a href="mod_include.html">mod_include</a></dt><dd>Server-parsed html documents (Server Side Includes)</dd>
+<dt><a href="mod_info.html">mod_info</a></dt><dd>Provides a comprehensive overview of the server
+configuration</dd>
+<dt><a href="mod_isapi.html">mod_isapi</a></dt><dd>ISAPI Extensions within Apache for Windows</dd>
+<dt><a href="mod_ldap.html" id="L" name="L">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
+by other LDAP modules</dd>
+<dt><a href="mod_log_config.html">mod_log_config</a></dt><dd>Logging of the requests made to the server</dd>
+<dt><a href="mod_logio.html">mod_logio</a></dt><dd>Logging of input and output bytes per request</dd>
+<dt><a href="mod_mem_cache.html" id="M" name="M">mod_mem_cache</a></dt><dd>Content cache keyed to URIs</dd>
+<dt><a href="mod_mime.html">mod_mime</a></dt><dd>Associates the requested filename's extensions
+ with the file's behavior (handlers and filters)
+ and content (mime-type, language, character set and
+ encoding)</dd>
+<dt><a href="mod_mime_magic.html">mod_mime_magic</a></dt><dd>Determines the MIME type of a file
+ by looking at a few bytes of its contents</dd>
+<dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd>Provides for <a href="../content-negotiation.html">content negotiation</a></dd>
+<dt><a href="mod_proxy.html" id="P" name="P">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
+<dt><a href="mod_proxy_connect.html">mod_proxy_connect</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for
+<code>CONNECT</code> request handling</dd>
+<dt><a href="mod_proxy_ftp.html">mod_proxy_ftp</a></dt><dd>FTP support module for
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_proxy_http.html">mod_proxy_http</a></dt><dd>HTTP support module for
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_rewrite.html" id="R" name="R">mod_rewrite</a></dt><dd>Provides a rule-based rewriting engine to rewrite requested
+URLs on the fly</dd>
+<dt><a href="mod_setenvif.html" id="S" name="S">mod_setenvif</a></dt><dd>Allows the setting of environment variables based
+on characteristics of the request</dd>
+<dt><a href="mod_so.html">mod_so</a></dt><dd>Loading of executable code and
+modules into the server at start-up or restart time</dd>
+<dt><a href="mod_speling.html">mod_speling</a></dt><dd>Attempts to correct mistaken URLs that
+users might have entered by ignoring capitalization and by
+allowing up to one misspelling</dd>
+<dt><a href="mod_ssl.html">mod_ssl</a></dt><dd>Strong cryptography using the Secure Sockets
+Layer (SSL) and Transport Layer Security (TLS) protocols</dd>
+<dt><a href="mod_status.html">mod_status</a></dt><dd>Provides information on server activity and
+performance</dd>
+<dt><a href="mod_suexec.html">mod_suexec</a></dt><dd>Allows CGI scripts to run as a specified user
+and Group</dd>
+<dt><a href="mod_unique_id.html" id="U" name="U">mod_unique_id</a></dt><dd>Provides an environment variable with a unique
+identifier for each request</dd>
+<dt><a href="mod_userdir.html">mod_userdir</a></dt><dd>User-specific directories</dd>
+<dt><a href="mod_usertrack.html">mod_usertrack</a></dt><dd>
+<em>Clickstream</em> logging of user activity on a site
+</dd>
+<dt><a href="mod_vhost_alias.html" id="V" name="V">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
+hosting</dd>
+</dl></div></div>
+<div id="footer">
+<p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en
index d61cd84..d7328d4 100644
--- a/docs/manual/mod/index.html.en
+++ b/docs/manual/mod/index.html.en
@@ -4,56 +4,88 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Module Index - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="module-index"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Module Index</h1>
+ -->
+<title>Module Index - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="module-index"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Module Index</h1>
+
<p>
Below is a list of all of the modules that come as part of
the Apache distribution. See also the complete
alphabetical list of <a href="directives.html">all Apache
directives</a>.
</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#core">Core Features and Multi-Processing Modules</a></li><li><img alt="" src="../images/down.gif" /> <a href="#other">Other Modules</a></li><li><img alt="" src="../images/down.gif" /> <a href="#obsolete">Obsolete Modules</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 id="core" name="core">Core Features and Multi-Processing Modules</a></h2><dl><dt><a href="core.html">core</a></dt><dd>Core Apache HTTP Server features that are always
+ </div>
+<div id="quickview"><ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#core">Core Features and Multi-Processing Modules</a></li><li><img alt="" src="../images/down.gif" /> <a href="#other">Other Modules</a></li></ul><h3>See also</h3>
+<ul class="seealso">
+<li><a href="../mpm.html">Multi-Processing Modules (MPMs)</a>
+ </li>
+<li><a href="quickreference.html">Directive Quick Reference</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 id="core" name="core">Core Features and Multi-Processing Modules</a></h2>
+<dl>
+<dt><a href="core.html">core</a></dt><dd>Core Apache HTTP Server features that are always
available</dd>
-<dt><a href="mpm_common.html">mpm_common</a></dt><dd>A collection of directives that are implemented by
+<dt><a href="mpm_common.html">mpm_common</a></dt><dd class="separate">A collection of directives that are implemented by
more than one multi-processing module (MPM)</dd>
+<dt><a href="beos.html">beos</a></dt><dd>This Multi-Processing Module is optimized for BeOS.</dd>
+<dt><a href="leader.html">leader</a></dt><dd>An experimental variant of the standard <code class="module"><a href="../mod/worker.html">worker</a></code>
+MPM</dd>
<dt><a href="mpm_netware.html">mpm_netware</a></dt><dd>Multi-Processing Module implementing an exclusively threaded web
server optimized for Novell NetWare</dd>
-<dt><a href="mpm_winnt.html">mpm_winnt</a></dt><dd>This Multi-Processing Module is optimized for Windows
- NT.</dd>
-<dt><a href="perchild.html">perchild</a></dt><dd>Multi-Processing Module allowing for daemon processes
- serving requests to be assigned a variety of different
- userids</dd>
+<dt><a href="mpmt_os2.html">mpmt_os2</a></dt><dd>Hybrid multi-process, multi-threaded MPM for OS/2</dd>
+<dt><a href="perchild.html">perchild</a></dt><dd>Multi-Processing Module allowing for daemon processes serving
+requests to be assigned a variety of different userids</dd>
<dt><a href="prefork.html">prefork</a></dt><dd>Implements a non-threaded, pre-forking web server</dd>
+<dt><a href="threadpool.html">threadpool</a></dt><dd>Yet another experimental variant of the standard
+<code class="module"><a href="../mod/worker.html">worker</a></code> MPM</dd>
+<dt><a href="mpm_winnt.html">mpm_winnt</a></dt><dd>This Multi-Processing Module is optimized for Windows
+NT.</dd>
<dt><a href="worker.html">worker</a></dt><dd>Multi-Processing Module implementing a hybrid
multi-threaded multi-process web server</dd>
-</dl></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a id="other" name="other">Other Modules</a></h2><dl><dt><a href="mod_actions.html">mod_actions</a></dt><dd>This module provides for executing CGI scripts based on
+</dl></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section"><h2><a id="other" name="other">Other Modules</a></h2>
+<p class="letters"><a href="#A"> A </a> | <a href="#C"> C </a> | <a href="#D"> D </a> | <a href="#E"> E </a> | <a href="#F"> F </a> | <a href="#H"> H </a> | <a href="#I"> I </a> | <a href="#L"> L </a> | <a href="#M"> M </a> | <a href="#N"> N </a> | <a href="#P"> P </a> | <a href="#R"> R </a> | <a href="#S"> S </a> | <a href="#U"> U </a> | <a href="#V"> V </a></p>
+<dl><dt><a href="mod_access.html" id="A" name="A">mod_access</a></dt><dd>Provides access control based on client hostname, IP
+address, or other characteristics of the client request.</dd>
+<dt><a href="mod_actions.html">mod_actions</a></dt><dd>This module provides for executing CGI scripts based on
media type or request method.</dd>
<dt><a href="mod_alias.html">mod_alias</a></dt><dd>Provides for mapping different parts of the host
filesystem in the document tree and for URL redirection</dd>
<dt><a href="mod_asis.html">mod_asis</a></dt><dd>Sends files that contain their own
HTTP headers</dd>
-<dt><a href="mod_auth_basic.html">mod_auth_basic</a></dt><dd>Basic authentication</dd>
+<dt><a href="mod_auth.html">mod_auth</a></dt><dd>User authentication using text files</dd>
+<dt><a href="mod_auth_anon.html">mod_auth_anon</a></dt><dd>Allows "anonymous" user access to authenticated
+areas</dd>
+<dt><a href="mod_auth_dbm.html">mod_auth_dbm</a></dt><dd>Provides for user authentication using DBM
+ files</dd>
<dt><a href="mod_auth_digest.html">mod_auth_digest</a></dt><dd>User authentication using MD5
Digest Authentication.</dd>
<dt><a href="mod_auth_ldap.html">mod_auth_ldap</a></dt><dd>Allows an LDAP directory to be used to store the database
for HTTP Basic authentication.</dd>
-<dt><a href="mod_authn_anon.html">mod_authn_anon</a></dt><dd>Allows "anonymous" user access to authenticated
- areas</dd>
-<dt><a href="mod_authn_dbm.html">mod_authn_dbm</a></dt><dd>User authentication using DBM files</dd>
-<dt><a href="mod_authn_file.html">mod_authn_file</a></dt><dd>User authentication using text files</dd>
-<dt><a href="mod_authz_dbm.html">mod_authz_dbm</a></dt><dd>Group authorization using DBM files</dd>
-<dt><a href="mod_authz_groupfile.html">mod_authz_groupfile</a></dt><dd>Group authorization using plaintext files</dd>
-<dt><a href="mod_authz_host.html">mod_authz_host</a></dt><dd>Group authorizations based on host (name or IP
-address)</dd>
<dt><a href="mod_autoindex.html">mod_autoindex</a></dt><dd>Generates directory indexes,
automatically, similar to the Unix <code>ls</code> command or the
Win32 <code>dir</code> shell command</dd>
-<dt><a href="mod_cache.html">mod_cache</a></dt><dd>Content cache keyed to URIs.</dd>
+<dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>Content cache keyed to URIs.</dd>
<dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
<dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>Execution of CGI scripts</dd>
<dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
external CGI daemon</dd>
<dt><a href="mod_charset_lite.html">mod_charset_lite</a></dt><dd>Specify character set translation or recoding</dd>
-<dt><a href="mod_dav.html">mod_dav</a></dt><dd>Distributed Authoring and Versioning
+<dt><a href="mod_dav.html" id="D" name="D">mod_dav</a></dt><dd>Distributed Authoring and Versioning
(<a href="http://www.webdav.org/">WebDAV</a>) functionality</dd>
<dt><a href="mod_dav_fs.html">mod_dav_fs</a></dt><dd>filesystem provider for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></dd>
<dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>Compress content before it is delivered to the
@@ -61,7 +93,7 @@
<dt><a href="mod_dir.html">mod_dir</a></dt><dd>Provides for "trailing slash" redirects and
serving directory index files</dd>
<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>Content cache storage manager keyed to URIs</dd>
-<dt><a href="mod_echo.html">mod_echo</a></dt><dd>A simple echo server to illustrate protocol
+<dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>A simple echo server to illustrate protocol
modules</dd>
<dt><a href="mod_env.html">mod_env</a></dt><dd>Modifies the environment which is passed to CGI scripts and
SSI pages</dd>
@@ -70,30 +102,36 @@
user-specified criteria</dd>
<dt><a href="mod_ext_filter.html">mod_ext_filter</a></dt><dd>Pass the response body through an external program before
delivery to the client</dd>
-<dt><a href="mod_file_cache.html">mod_file_cache</a></dt><dd>Caches a static list of files in memory</dd>
-<dt><a href="mod_headers.html">mod_headers</a></dt><dd>Customization of HTTP request and response
+<dt><a href="mod_file_cache.html" id="F" name="F">mod_file_cache</a></dt><dd>Caches a static list of files in memory</dd>
+<dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>Customization of HTTP request and response
headers</dd>
-<dt><a href="mod_imap.html">mod_imap</a></dt><dd>Server-side imagemap processing</dd>
+<dt><a href="mod_imap.html" id="I" name="I">mod_imap</a></dt><dd>Server-side imagemap processing</dd>
<dt><a href="mod_include.html">mod_include</a></dt><dd>Server-parsed html documents (Server Side Includes)</dd>
<dt><a href="mod_info.html">mod_info</a></dt><dd>Provides a comprehensive overview of the server
configuration</dd>
<dt><a href="mod_isapi.html">mod_isapi</a></dt><dd>ISAPI Extensions within Apache for Windows</dd>
-<dt><a href="mod_ldap.html">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
+<dt><a href="mod_ldap.html" id="L" name="L">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
by other LDAP modules</dd>
<dt><a href="mod_log_config.html">mod_log_config</a></dt><dd>Logging of the requests made to the server</dd>
<dt><a href="mod_logio.html">mod_logio</a></dt><dd>Logging of input and output bytes per request</dd>
-<dt><a href="mod_mem_cache.html">mod_mem_cache</a></dt><dd>Content cache keyed to URIs</dd>
+<dt><a href="mod_mem_cache.html" id="M" name="M">mod_mem_cache</a></dt><dd>Content cache keyed to URIs</dd>
<dt><a href="mod_mime.html">mod_mime</a></dt><dd>Associates the requested filename's extensions
with the file's behavior (handlers and filters)
and content (mime-type, language, character set and
encoding)</dd>
<dt><a href="mod_mime_magic.html">mod_mime_magic</a></dt><dd>Determines the MIME type of a file
by looking at a few bytes of its contents</dd>
-<dt><a href="mod_negotiation.html">mod_negotiation</a></dt><dd>Provides for <a href="../content-negotiation.html">content negotiation</a></dd>
-<dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
-<dt><a href="mod_rewrite.html">mod_rewrite</a></dt><dd>Provides a rule-based rewriting engine to rewrite requested
+<dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd>Provides for <a href="../content-negotiation.html">content negotiation</a></dd>
+<dt><a href="mod_proxy.html" id="P" name="P">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
+<dt><a href="mod_proxy_connect.html">mod_proxy_connect</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for
+<code>CONNECT</code> request handling</dd>
+<dt><a href="mod_proxy_ftp.html">mod_proxy_ftp</a></dt><dd>FTP support module for
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_proxy_http.html">mod_proxy_http</a></dt><dd>HTTP support module for
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_rewrite.html" id="R" name="R">mod_rewrite</a></dt><dd>Provides a rule-based rewriting engine to rewrite requested
URLs on the fly</dd>
-<dt><a href="mod_setenvif.html">mod_setenvif</a></dt><dd>Allows the setting of environment variables based
+<dt><a href="mod_setenvif.html" id="S" name="S">mod_setenvif</a></dt><dd>Allows the setting of environment variables based
on characteristics of the request</dd>
<dt><a href="mod_so.html">mod_so</a></dt><dd>Loading of executable code and
modules into the server at start-up or restart time</dd>
@@ -106,21 +144,16 @@
performance</dd>
<dt><a href="mod_suexec.html">mod_suexec</a></dt><dd>Allows CGI scripts to run as a specified user
and Group</dd>
-<dt><a href="mod_unique_id.html">mod_unique_id</a></dt><dd>Provides an environment variable with a unique
+<dt><a href="mod_unique_id.html" id="U" name="U">mod_unique_id</a></dt><dd>Provides an environment variable with a unique
identifier for each request</dd>
<dt><a href="mod_userdir.html">mod_userdir</a></dt><dd>User-specific directories</dd>
<dt><a href="mod_usertrack.html">mod_usertrack</a></dt><dd>
<em>Clickstream</em> logging of user activity on a site
</dd>
-<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
+<dt><a href="mod_vhost_alias.html" id="V" name="V">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
hosting</dd>
-</dl></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a id="obsolete" name="obsolete">Obsolete Modules</a></h2><dl><dt><a href="obs_mod_access.html">mod_access</a></dt><dd><em>(replaced by <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> since 2.0.44)</em><br />Provides access control based on client hostname, IP
-address, or other characteristics of the client request.</dd>
-<dt><a href="obs_mod_auth.html">mod_auth</a></dt><dd><em>(obsolete since 2.0.44)</em><br />User authentication using text files</dd>
-<dt><a href="obs_mod_auth_anon.html">mod_auth_anon</a></dt><dd><em>(replaced by <code class="module"><a href="../mod/mod_authn_anon.html">mod_authn_anon</a></code> since 2.0.44)</em><br />Allows "anonymous" user access to authenticated
- areas</dd>
-<dt><a href="obs_mod_auth_dbm.html">mod_auth_dbm</a></dt><dd><em>(obsolete since 2.0.44)</em><br />Provides for user authentication using DBM
- files</dd>
-<dt><a href="obs_mod_auth_digest.html">mod_auth_digest</a></dt><dd><em>(obsolete since 2.0.44)</em><br />User authentication using MD5
- Digest Authentication.</dd>
-</dl></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</dl></div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/index.html.ja.jis b/docs/manual/mod/index.html.ja.jis
index 80f080a..0593715 100644
--- a/docs/manual/mod/index.html.ja.jis
+++ b/docs/manual/mod/index.html.ja.jis
@@ -4,118 +4,132 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>$B%b%8%e!<%k0lMw(B - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="module-index"><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$B%b%8%e!<%k0lMw(B</h1>
+ -->
+<title>$B%b%8%e!<%k0lMw(B - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="module-index"><div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a></div><div id="preamble"><h1>$B%b%8%e!<%k0lMw(B</h1>
+
<p>
$B0J2<$O(B Apache $B$NG[I[$N0lIt$H$7$FG[$i$l$F$$$k$9$Y$F$N%b%8%e!<%k$N(B
$B0lMw$G$9!#$9$Y$F$N(B <a href="directives.html">Apache
- $B%G%#%l%/%F(B$B%#%V(B</a> $B$N%"%k%U%!%Y%C%H=g$N%j%9%H$b8+$F$/$@$5$$!#(B
+ $B%G%#%l%/%F%#%V(B</a> $B$N%"%k%U%!%Y%C%H=g$N%j%9%H$b8+$F$/$@$5$$!#(B
</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#core">$B%3%"5!G=$H(B MPM</a></li><li><img alt="" src="../images/down.gif" /> <a href="#other">$BB>$N%b%8%e!<%k(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#obsolete" /></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a id="core" name="core">$B%3%"5!G=$H(B MPM</a></h2><dl><dt><a href="core.html">core</a></dt><dd>Core Apache HTTP Server features that are always
+ </div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section"><h2><a id="core" name="core">$B%3%"5!G=$H(B MPM</a></h2>
+<dl>
+<dt><a href="core.html">core</a></dt><dd>Core Apache HTTP Server features that are always
available</dd>
-<dt><a href="mpm_common.html">mpm_common</a></dt><dd>$BFs$D0J>e$N%^%k%A%W%m%;%C%7%s%0%b%8%e(B$B!<%k(B (MPM)
+<dt><a href="mpm_common.html">mpm_common</a></dt><dd>$BFs$D0J>e$N%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)
$B$G<BAu$5$l$F$$$k%G%#%l%/%F%#%V$N%3%l%/%7%g%s(B</dd>
<dt><a href="mpm_netware.html">mpm_netware</a></dt><dd>Multi-Processing Module implementing an exclusively threaded web
server optimized for Novell NetWare</dd>
<dt><a href="mpm_winnt.html">mpm_winnt</a></dt><dd>Windows NT
-$B8~$1$K:GE,2=$5$l$?(B$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B</dd>
+$B8~$1$K:GE,2=$5$l$?%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B</dd>
<dt><a href="perchild.html">perchild</a></dt><dd>Multi-Processing Module allowing for daemon processes
serving requests to be assigned a variety of different
userids</dd>
-<dt><a href="prefork.html">prefork</a></dt><dd>$B%9%l%C%I$r;H$o$:!"@h9T$7$F(B fork $B$r9T(B$B$J$&%&%'%V%5!<%P$r<BAu(B
+<dt><a href="prefork.html">prefork</a></dt><dd>$B%9%l%C%I$r;H$o$:!"@h9T$7$F(B fork $B$r9T$J$&%&%'%V%5!<%P$r<BAu(B
</dd>
<dt><a href="worker.html">worker</a></dt><dd>$B%^%k%A%9%l%C%I$H%^%k%A%W%m%;%9$N%O%$%V%j%C%I7?(B
$B%&%'%V%5!<%P$r<BAu$7$?%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B</dd>
-</dl></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a id="other" name="other">$BB>$N%b%8%e!<%k(B</a></h2><dl><dt><a href="mod_actions.html">mod_actions</a></dt><dd>$B%a%G%#%"%?%$%W$d%j%/%(%9%H%a%=(B$B%C%I$K1~$8$F(B
+</dl></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section"><h2><a id="other" name="other">$BB>$N%b%8%e!<%k(B</a></h2>
+<p class="letters"><a href="#A">?A?</a> | <a href="#C">?C?</a> | <a href="#D">?D?</a> | <a href="#E">?E?</a> | <a href="#F">?F?</a> | <a href="#H">?H?</a> | <a href="#I">?I?</a> | <a href="#L">?L?</a> | <a href="#M">?M?</a> | <a href="#N">?N?</a> | <a href="#P">?P?</a> | <a href="#R">?R?</a> | <a href="#S">?S?</a> | <a href="#U">?U?</a> | <a href="#V">?V?</a></p>
+<dl><dt><a href="mod_access.html" id="A" name="A">mod_access</a></dt><dd>$B%/%i%$%"%s%H$N%[%9%HL>!"(BIP $B%"%I%l%9!"$=$NB>$N%/%i%$%"%s%H(B
+$B$N%j%/%(%9%H$NFCD'$K4p$E$$$?%"%/%;%9@)8f5!G=$rDs6!$9$k(B</dd>
+<dt><a href="mod_actions.html">mod_actions</a></dt><dd>$B%a%G%#%"%?%$%W$d%j%/%(%9%H%a%=%C%I$K1~$8$F(B
CGI $B%9%/%j%W%H$r<B9T$9$k5!G=$rDs6!(B</dd>
-<dt><a href="mod_alias.html">mod_alias</a></dt><dd>$B%[%9%H%U%!%$%k%7%9%F%`>e$N$$$m$$$m$J0c(B$B$&>l=j$r(B
+<dt><a href="mod_alias.html">mod_alias</a></dt><dd>$B%[%9%H%U%!%$%k%7%9%F%`>e$N$$$m$$$m$J0c$&>l=j$r(B
$B%I%-%e%a%s%H%D%j!<$K%^%C%W$9$k5!G=$H!"(B
URL $B$N%j%@%$%l%/%H$r9T$J$&5!G=$rDs6!$9$k(B</dd>
-<dt><a href="mod_asis.html">mod_asis</a></dt><dd>$B<+J,MQ$N(B HTTP $B%X%C%@$N=q$+$l$F$$$k(B$B%U%!%$%k$rAw?.$9$k(B</dd>
-<dt><a href="mod_auth_basic.html">mod_auth_basic</a></dt><dd>$B4pK\G'>Z(B</dd>
+<dt><a href="mod_asis.html">mod_asis</a></dt><dd>$B<+J,MQ$N(B HTTP $B%X%C%@$N=q$+$l$F$$$k%U%!%$%k$rAw?.$9$k(B</dd>
+<dt><a href="mod_auth.html">mod_auth</a></dt><dd>$B%F%-%9%H%U%!%$%k$rMQ$$$?%f!<%6G'>Z(B</dd>
+<dt><a href="mod_auth_anon.html">mod_auth_anon</a></dt><dd>Allows "anonymous" user access to authenticated
+areas</dd>
+<dt><a href="mod_auth_dbm.html">mod_auth_dbm</a></dt><dd>Provides for user authentication using DBM
+ files</dd>
<dt><a href="mod_auth_digest.html">mod_auth_digest</a></dt><dd>User authentication using MD5
Digest Authentication.</dd>
<dt><a href="mod_auth_ldap.html">mod_auth_ldap</a></dt><dd>Allows an LDAP directory to be used to store the database
for HTTP Basic authentication.</dd>
-<dt><a href="mod_authn_anon.html">mod_authn_anon</a></dt><dd>Allows "anonymous" user access to authenticated
- areas</dd>
-<dt><a href="mod_authn_dbm.html">mod_authn_dbm</a></dt><dd>User authentication using DBM files</dd>
-<dt><a href="mod_authn_file.html">mod_authn_file</a></dt><dd>$B%F%-%9%H%U%!%$%k$rMQ$$$?%f!<(B$B%6G'>Z(B</dd>
-<dt><a href="mod_authz_dbm.html">mod_authz_dbm</a></dt><dd>Group authorization using DBM files</dd>
-<dt><a href="mod_authz_groupfile.html">mod_authz_groupfile</a></dt><dd>Group authorization using plaintext files</dd>
-<dt><a href="mod_authz_host.html">mod_authz_host</a></dt><dd>$B%[%9%H(B ($BL>A0$b$7$/$O(B IP $B%"%I%l%9(B) $B$K4p$E$$$?%0%k!<%W>5G'(B</dd>
<dt><a href="mod_autoindex.html">mod_autoindex</a></dt><dd>Unix $B$N(B <code>ls</code> $B%3%^%s%I$d(B
Win32 $B$N(B <code>dir</code> $B%7%'%k%3%^%s%I$K;w$?(B
- $B%G(B$B%#%l%/%H%j%$%s%G%C%/%9$r@8@.$9$k(B</dd>
-<dt><a href="mod_cache.html">mod_cache</a></dt><dd>Content cache keyed to URIs.</dd>
+ $B%G%#%l%/%H%j%$%s%G%C%/%9$r@8@.$9$k(B</dd>
+<dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>Content cache keyed to URIs.</dd>
<dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
<dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>CGI $B%9%/%j%W%H$N<B9T(B</dd>
<dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
external CGI daemon</dd>
<dt><a href="mod_charset_lite.html">mod_charset_lite</a></dt><dd>Specify character set translation or recoding</dd>
-<dt><a href="mod_dav.html">mod_dav</a></dt><dd>$BJ,;6%*!<%5%j%s%0$H%P!<%8%g%s4IM}(B
+<dt><a href="mod_dav.html" id="D" name="D">mod_dav</a></dt><dd>$BJ,;6%*!<%5%j%s%0$H%P!<%8%g%s4IM}(B
(<a href="http://www.webdav.org/">WebDAV</a>) $B5!G=(B</dd>
-<dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>$B%/%i%$%"%s%H$XAw$i$l$kA0$K%3%s%F%s(B$B%D$r05=L$9$k(B</dd>
-<dt><a href="mod_dir.html">mod_dir</a></dt><dd>$B!V:G8e$N%9%i%C%7%e!W$N%j%@%$%l%/%H$H!"%G%#(B$B%l%/%H%j$N(B
+<dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>$B%/%i%$%"%s%H$XAw$i$l$kA0$K%3%s%F%s%D$r05=L$9$k(B</dd>
+<dt><a href="mod_dir.html">mod_dir</a></dt><dd>$B!V:G8e$N%9%i%C%7%e!W$N%j%@%$%l%/%H$H!"%G%#%l%/%H%j$N(B
$B%$%s%G%C%/%9%U%!%$%k$r07$&5!G=$rDs6!$9$k(B</dd>
-<dt><a href="mod_echo.html">mod_echo</a></dt><dd>$B%W%m%H%3%k%b%8%e!<%k$N35MW$r<($9$?$a$NC1(B$B=c$J%(%3!<%5!<%P(B
+<dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>$B%W%m%H%3%k%b%8%e!<%k$N35MW$r<($9$?$a$NC1=c$J%(%3!<%5!<%P(B
</dd>
<dt><a href="mod_env.html">mod_env</a></dt><dd>CGI $B%9%/%j%W%H5Z$S(B SSI
$B%Z!<%8$KEO$5$l$k4D6-JQ?t$rJQ99$9$k5!G=$rDs6!$9$k(B</dd>
<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustrates the Apache module API</dd>
<dt><a href="mod_expires.html">mod_expires</a></dt><dd>Generation of <code>Expires</code> HTTP headers according to
user-specified criteria</dd>
-<dt><a href="mod_ext_filter.html">mod_ext_filter</a></dt><dd>Pass the response body
- through an external program before delivery to the
- client</dd>
-<dt><a href="mod_file_cache.html">mod_file_cache</a></dt><dd>Caches a static list of files in memory</dd>
-<dt><a href="mod_headers.html">mod_headers</a></dt><dd>Customization of HTTP request
- and response headers</dd>
-<dt><a href="mod_imap.html">mod_imap</a></dt><dd>Server-side imagemap processing</dd>
+<dt><a href="mod_ext_filter.html">mod_ext_filter</a></dt><dd>Pass the response body through an external program before
+delivery to the client</dd>
+<dt><a href="mod_file_cache.html" id="F" name="F">mod_file_cache</a></dt><dd>Caches a static list of files in memory</dd>
+<dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>Customization of HTTP request and response
+headers</dd>
+<dt><a href="mod_imap.html" id="I" name="I">mod_imap</a></dt><dd>Server-side imagemap processing</dd>
<dt><a href="mod_include.html">mod_include</a></dt><dd>Server-parsed html documents (Server Side Includes)</dd>
<dt><a href="mod_info.html">mod_info</a></dt><dd>$B%5!<%P$N@_Dj$NJq3gE*$J354Q$rDs6!$9$k(B</dd>
<dt><a href="mod_isapi.html">mod_isapi</a></dt><dd>ISAPI Extensions within Apache for Windows</dd>
-<dt><a href="mod_ldap.html">mod_ldap</a></dt><dd>LDAP connection pooling and result caching
-services for use by other LDAP modules</dd>
+<dt><a href="mod_ldap.html" id="L" name="L">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
+by other LDAP modules</dd>
<dt><a href="mod_log_config.html">mod_log_config</a></dt><dd>Logging of the requests made to the server</dd>
<dt><a href="mod_logio.html">mod_logio</a></dt><dd>Logging of input and output bytes per request</dd>
-<dt><a href="mod_mime.html">mod_mime</a></dt><dd>Associates the requested filename's extensions
+<dt><a href="mod_mime.html" id="M" name="M">mod_mime</a></dt><dd>Associates the requested filename's extensions
with the file's behavior (handlers and filters)
and content (mime-type, language, character set and
encoding)</dd>
<dt><a href="mod_mime_magic.html">mod_mime_magic</a></dt><dd>Determines the MIME type of a file
by looking at a few bytes of its contents</dd>
-<dt><a href="mod_negotiation.html">mod_negotiation</a></dt><dd><a href="../content-negotiation.html">$B%3%s%F%s%H%M%4%7%(!<%7%g%s(B</a>
+<dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd><a href="../content-negotiation.html">$B%3%s%F%s%H%M%4%7%(!<%7%g%s(B</a>
$B5!G=$rDs6!$9$k(B</dd>
-<dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
-<dt><a href="mod_rewrite.html">mod_rewrite</a></dt><dd>Provides a rule-based rewriting engine to rewrite requested
+<dt><a href="mod_proxy.html" id="P" name="P">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
+<dt><a href="mod_rewrite.html" id="R" name="R">mod_rewrite</a></dt><dd>Provides a rule-based rewriting engine to rewrite requested
URLs on the fly</dd>
-<dt><a href="mod_setenvif.html">mod_setenvif</a></dt><dd>$B%j%/%(%9%H$NFCD'$K4p$E$$$?4D6-JQ(B$B?t$N@_Dj$r2DG=$K$9$k(B</dd>
-<dt><a href="mod_so.html">mod_so</a></dt><dd>$B5/F0;~$d:F5/F0;~$K<B9T%3!<%I$H%b%8%e!<%k$r%5(B$B!<%P$K%m!<%I$9$k(B
+<dt><a href="mod_setenvif.html" id="S" name="S">mod_setenvif</a></dt><dd>$B%j%/%(%9%H$NFCD'$K4p$E$$$?4D6-JQ?t$N@_Dj$r2DG=$K$9$k(B</dd>
+<dt><a href="mod_so.html">mod_so</a></dt><dd>$B5/F0;~$d:F5/F0;~$K<B9T%3!<%I$H%b%8%e!<%k$r%5!<%P$K%m!<%I$9$k(B
</dd>
<dt><a href="mod_speling.html">mod_speling</a></dt><dd>$B%f!<%6$,F~NO$7$?$G$"$m$&4V0c$C$?(B URL $B$r!"(B
-$BBgJ8;z>.J8;z$N6hJL$rL5;k$9$k$3$H$H0l$D0J2<$NDV$j4V(B$B0c$$$r5vMF$9$k$3$H$G(B
+$BBgJ8;z>.J8;z$N6hJL$rL5;k$9$k$3$H$H0l$D0J2<$NDV$j4V0c$$$r5vMF$9$k$3$H$G(B
$B=$@5$r;n$_$k(B</dd>
<dt><a href="mod_ssl.html">mod_ssl</a></dt><dd>Strong cryptography using the Secure Sockets
Layer (SSL) and Transport Layer Security (TLS) protocols</dd>
<dt><a href="mod_status.html">mod_status</a></dt><dd>Provides information on server activity and
performance</dd>
<dt><a href="mod_suexec.html">mod_suexec</a></dt><dd>$B;XDj$5$l$?%f!<%6$H%0%k!<%W$G(B CGI $B%9%/%j%W%H$r<B9T$9$k(B</dd>
-<dt><a href="mod_unique_id.html">mod_unique_id</a></dt><dd>$B$=$l$>$l$N%j%/%(%9%H$KBP$9$k0l(B$B0U$J<1JL;R$NF~$C$?4D6-JQ?t$r(B
+<dt><a href="mod_unique_id.html" id="U" name="U">mod_unique_id</a></dt><dd>$B$=$l$>$l$N%j%/%(%9%H$KBP$9$k0l0U$J<1JL;R$NF~$C$?4D6-JQ?t$r(B
$BDs6!$9$k(B</dd>
<dt><a href="mod_userdir.html">mod_userdir</a></dt><dd>$B%f!<%6@lMQ$N%G%#%l%/%H%j$rDs6!(B
</dd>
<dt><a href="mod_usertrack.html">mod_usertrack</a></dt><dd>
<em>Clickstream</em> logging of user activity on a site
</dd>
-<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
+<dt><a href="mod_vhost_alias.html" id="V" name="V">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
hosting</dd>
-</dl></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a id="obsolete" name="obsolete" /></h2><dl><dt><a href="obs_mod_access.html">mod_access</a></dt><dd><em>(replaced by <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> since 2.0.44)</em><br />Provides access control based on client hostname, IP
-address, or other characteristics of the client request.</dd>
-<dt><a href="obs_mod_auth.html">mod_auth</a></dt><dd><em>(obsolete since 2.0.44)</em><br />User authentication using text files</dd>
-<dt><a href="obs_mod_auth_anon.html">mod_auth_anon</a></dt><dd><em>(replaced by <code class="module"><a href="../mod/mod_authn_anon.html">mod_authn_anon</a></code> since 2.0.44)</em><br />Allows "anonymous" user access to authenticated
- areas</dd>
-<dt><a href="obs_mod_auth_dbm.html">mod_auth_dbm</a></dt><dd><em>(obsolete since 2.0.44)</em><br />Provides for user authentication using DBM
- files</dd>
-<dt><a href="obs_mod_auth_digest.html">mod_auth_digest</a></dt><dd><em>(obsolete since 2.0.44)</em><br />User authentication using MD5
- Digest Authentication.</dd>
-</dl></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+</dl></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/index.xml b/docs/manual/mod/index.xml
index 181fd2a..3462211 100644
--- a/docs/manual/mod/index.xml
+++ b/docs/manual/mod/index.xml
@@ -14,6 +14,10 @@
directives</a>.
</p>
</summary>
+ <seealso><a href="../mpm.html">Multi-Processing Modules (MPMs)</a>
+ </seealso>
+ <seealso><a href="quickreference.html">Directive Quick Reference</a>
+ </seealso>
&sitemap;
</moduleindex>
\ No newline at end of file
diff --git a/docs/manual/mod/index.xml.de b/docs/manual/mod/index.xml.de
new file mode 100644
index 0000000..b9cd069
--- /dev/null
+++ b/docs/manual/mod/index.xml.de
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleindex SYSTEM "../style/modulesynopsis.dtd"
+ [ <!ENTITY sitemap SYSTEM "../sitemap.xml.de"> ]
+>
+<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
+<!-- English revision: 1.4.2.1 -->
+
+<moduleindex>
+ <title>Modul-Index</title>
+ <summary>
+ <p>
+ Unten ist eine Liste aller Module angegeben, die als Bestandteil der
+ Apache-Distribution mitgeliefert werden. Bitte beachten Sie auch die
+ vollständige alphabetische Liste <a href="directives.html">aller
+ Apache-Direktiven</a>.
+ </p>
+ </summary>
+ <seealso><a href="../mpm.html">Multi-Processing-Module (MPMs)</a>
+ </seealso>
+ <seealso><a href="quickreference.html">Kurzreferenz der Direktiven</a>
+ </seealso>
+
+ &sitemap;
+</moduleindex>
\ No newline at end of file
diff --git a/docs/manual/mod/leader.html.en b/docs/manual/mod/leader.html.en
new file mode 100644
index 0000000..2217dc7
--- /dev/null
+++ b/docs/manual/mod/leader.html.en
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>leader - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM leader</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>An experimental variant of the standard <code class="module"><a href="../mod/worker.html">worker</a></code>
+MPM</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mpm_leader_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>leader.c</td></tr></table>
+<h3>Summary</h3>
+
+ <div class="warning"><h3>Warning</h3>
+ <p>This MPM is experimental, so it may or may not work
+ as expected.</p>
+ </div>
+
+ <p>This is an experimental variant of the standard
+ <code class="module"><a href="../mod/worker.html">worker</a></code> MPM. It uses a Leader/Followers design pattern
+ to coordinate work among threads. For more info, see <a href="http://deuce.doc.wustl.edu/doc/pspdfs/lf.pdf">http://deuce.doc.wustl.edu/doc/pspdfs/lf.pdf</a>.</p>
+
+ <p>To use the <code class="module"><a href="../mod/leader.html">leader</a></code> MPM, add
+ <code>--with-mpm=leader</code> to the configure script's arguments
+ when building the httpd.</p>
+
+ <p>This MPM depends on APR's atomic compare-and-swap operations for
+ thread synchronization. If you are compiling for an x86 target
+ and you don't need to support 386s, or you are compiling for a
+ SPARC and you don't need to run on pre-UltraSPARC chips, add
+ <code>--enable-nonportable-atomics=yes</code> to the configure
+ script's arguments. This will cause APR to implement atomic operations
+ using efficient opcodes not available in older CPUs.</p>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#acceptmutex">AcceptMutex</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#lockfile">LockFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxclients">MaxClients</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#serverlimit">ServerLimit</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
+</ul>
+</div>
+
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/leader.xml b/docs/manual/mod/leader.xml
new file mode 100644
index 0000000..9609306
--- /dev/null
+++ b/docs/manual/mod/leader.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
+<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
+
+<modulesynopsis>
+<name>leader</name>
+<description>An experimental variant of the standard <module>worker</module>
+MPM</description>
+<status>MPM</status>
+<sourcefile>leader.c</sourcefile>
+<identifier>mpm_leader_module</identifier>
+
+<summary>
+ <note type="warning"><title>Warning</title>
+ <p>This MPM is experimental, so it may or may not work
+ as expected.</p>
+ </note>
+
+ <p>This is an experimental variant of the standard
+ <module>worker</module> MPM. It uses a Leader/Followers design pattern
+ to coordinate work among threads. For more info, see <a
+ href="http://deuce.doc.wustl.edu/doc/pspdfs/lf.pdf"
+ >http://deuce.doc.wustl.edu/doc/pspdfs/lf.pdf</a>.</p>
+
+ <p>To use the <module>leader</module> MPM, add
+ <code>--with-mpm=leader</code> to the configure script's arguments
+ when building the httpd.</p>
+
+ <p>This MPM depends on APR's atomic compare-and-swap operations for
+ thread synchronization. If you are compiling for an x86 target
+ and you don't need to support 386s, or you are compiling for a
+ SPARC and you don't need to run on pre-UltraSPARC chips, add
+ <code>--enable-nonportable-atomics=yes</code> to the configure
+ script's arguments. This will cause APR to implement atomic operations
+ using efficient opcodes not available in older CPUs.</p>
+</summary>
+
+<directivesynopsis location="mpm_common"><name>AcceptMutex</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>CoreDumpDirectory</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>Group</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>Listen</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ListenBacklog</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>LockFile</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxClients</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxMemFree</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxSpareThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MinSpareThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>PidFile</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ServerLimit</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>StartServers</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ThreadLimit</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ThreadsPerChild</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>User</name>
+</directivesynopsis>
+
+</modulesynopsis>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_access.html.en b/docs/manual/mod/mod_access.html.en
new file mode 100644
index 0000000..2970d1c
--- /dev/null
+++ b/docs/manual/mod/mod_access.html.en
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mod_access - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_access</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Provides access control based on client hostname, IP
+address, or other characteristics of the client request.</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>access_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_access.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available only in versions prior to 2.1</td></tr></table>
+<h3>Summary</h3>
+
+ <p>The directives provided by <code class="module"><a href="../mod/mod_access.html">mod_access</a></code> are used
+ in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>,
+ <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, and
+ <code class="directive"><a href="../mod/core.html#location"><Location></a></code> sections
+ as well as <code><a href="core.html#accessfilename">.htaccess</a></code>
+ files to control access to particular parts of the server. Access
+ can be controlled based on the client hostname, IP address, or
+ other characteristics of the client request, as captured in <a href="../env.html">environment variables</a>. The <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives are used to
+ specify which clients are or are not allowed access to the server,
+ while the <code class="directive"><a href="#order">Order</a></code>
+ directive sets the default access state, and configures how the
+ <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives interact with each
+ other.</p>
+
+ <p>Both host-based access restrictions and password-based
+ authentication may be implemented simultaneously. In that case,
+ the <code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code> directive is used
+ to determine how the two sets of restrictions interact.</p>
+
+ <p>In general, access restriction directives apply to all
+ access methods (<code>GET</code>, <code>PUT</code>,
+ <code>POST</code>, etc). This is the desired behavior in most
+ cases. However, it is possible to restrict some methods, while
+ leaving other methods unrestricted, by enclosing the directives
+ in a <code class="directive"><a href="../mod/core.html#limit"><Limit></a></code> section.</p>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#allow">Allow</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#deny">Deny</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#order">Order</a></li>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#require">Require</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="Allow" id="Allow">Allow</a> <a name="allow" id="allow">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls which hosts can access an area of the
+server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code> Allow from
+ all|<var>host</var>|env=<var>env-variable</var>
+ [<var>host</var>|env=<var>env-variable</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#Override">Override:</a></th><td>Limit</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_access</td></tr>
+</table>
+
+ <p>The <code class="directive">Allow</code> directive affects which hosts can
+ access an area of the server. Access can be controlled by
+ hostname, IP Address, IP Address range, or by other
+ characteristics of the client request captured in environment
+ variables.</p>
+
+ <p>The first argument to this directive is always
+ <code>from</code>. The subsequent arguments can take three
+ different forms. If <code>Allow from all</code> is specified, then
+ all hosts are allowed access, subject to the configuration of the
+ <code class="directive"><a href="#deny">Deny</a></code> and <code class="directive"><a href="#order">Order</a></code> directives as discussed
+ below. To allow only particular hosts or groups of hosts to access
+ the server, the <var>host</var> can be specified in any of the
+ following formats:</p>
+
+ <dl>
+ <dt>A (partial) domain-name</dt>
+
+ <dd>
+ <div class="example"><h3>Example:</h3><p><code>
+ Allow from apache.org
+ </code></p></div>
+ <p>Hosts whose names match, or end in, this string are allowed
+ access. Only complete components are matched, so the above
+ example will match <code>foo.apache.org</code> but it will
+ not match <code>fooapache.org</code>. This configuration will
+ cause the server to perform a reverse DNS lookup on the
+ client IP address, regardless of the setting of the <code class="directive"><a href="../mod/core.html#hostnamelookups">HostnameLookups</a></code>
+ directive.</p></dd>
+
+ <dt>A full IP address</dt>
+
+ <dd>
+ <div class="example"><h3>Example:</h3><p><code>
+ Allow from 10.1.2.3
+ </code></p></div>
+ <p>An IP address of a host allowed access</p></dd>
+
+ <dt>A partial IP address</dt>
+
+ <dd>
+ <div class="example"><h3>Example:</h3><p><code>
+ Allow from 10.1
+ </code></p></div>
+ <p>The first 1 to 3 bytes of an IP address, for subnet
+ restriction.</p></dd>
+
+ <dt>A network/netmask pair</dt>
+
+ <dd>
+ <div class="example"><h3>Example:</h3><p><code>
+ Allow from 10.1.0.0/255.255.0.0
+ </code></p></div>
+ <p>A network a.b.c.d, and a netmask w.x.y.z. For more
+ fine-grained subnet restriction.</p></dd>
+
+ <dt>A network/nnn CIDR specification</dt>
+
+ <dd>
+ <div class="example"><h3>Example:</h3><p><code>
+ Allow from 10.1.0.0/16
+ </code></p></div>
+ <p>Similar to the previous case, except the netmask consists of
+ nnn high-order 1 bits.</p></dd>
+ </dl>
+
+ <p>Note that the last three examples above match exactly the
+ same set of hosts.</p>
+
+ <p>IPv6 addresses and IPv6 subnets can be specified as shown
+ below:</p>
+
+ <div class="example"><p><code>
+ Allow from fe80::a00:20ff:fea7:ccea<br />
+ Allow from fe80::a00:20ff:fea7:ccea/10
+ </code></p></div>
+
+ <p>The third format of the arguments to the
+ <code class="directive">Allow</code> directive allows access to the server
+ to be controlled based on the existence of an <a href="../env.html">environment variable</a>. When <code>Allow from
+ 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>
+
+ <div class="example"><h3>Example:</h3><p><code>
+ SetEnvIf User-Agent ^KnockKnock/2.0 let_me_in<br />
+ <Directory /docroot><br />
+ <span class="indent">
+ Order Deny,Allow<br />
+ Deny from all<br />
+ Allow from env=let_me_in<br />
+ </span>
+ </Directory>
+ </code></p></div>
+
+ <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>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Deny" id="Deny">Deny</a> <a name="deny" id="deny">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls which hosts are denied access to the
+server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code> Deny from all|<var>host</var>|env=<var>env-variable</var>
+[<var>host</var>|env=<var>env-variable</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#Override">Override:</a></th><td>Limit</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_access</td></tr>
+</table>
+ <p>This directive allows access to the server to be restricted
+ based on hostname, IP address, or environment variables. The
+ arguments for the <code class="directive">Deny</code> directive are
+ identical to the arguments for the <code class="directive"><a href="#allow">Allow</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="Order" id="Order">Order</a> <a name="order" id="order">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls the default access state and the order in which
+Allow and Deny are
+evaluated.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code> Order <var>ordering</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Order Deny,Allow</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>Limit</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_access</td></tr>
+</table>
+
+ <p>The <code class="directive">Order</code> directive controls the default
+ access state and the order in which <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives are evaluated.
+ <var>Ordering</var> is one of</p>
+
+ <dl>
+ <dt><code>Deny,Allow</code></dt>
+
+ <dd>The <code class="directive"><a href="#deny">Deny</a></code> directives
+ are evaluated before the <code class="directive"><a href="#allow">Allow</a></code> directives. Access is
+ allowed by default. Any client which does not match a
+ <code class="directive"><a href="#deny">Deny</a></code> directive or does
+ match an <code class="directive"><a href="#allow">Allow</a></code>
+ directive will be allowed access to the server.</dd>
+
+ <dt><code>Allow,Deny</code></dt>
+
+ <dd>The <code class="directive"><a href="#allow">Allow</a></code>
+ directives are evaluated before the <code class="directive"><a href="#deny">Deny</a></code> directives. Access is denied
+ by default. Any client which does not match an <code class="directive"><a href="#allow">Allow</a></code> directive or does match a
+ <code class="directive"><a href="#deny">Deny</a></code> directive will be
+ denied access to the server.</dd>
+
+ <dt><code>Mutual-failure</code></dt>
+
+ <dd>Only those hosts which appear on the <code class="directive"><a href="#allow">Allow</a></code> list and do not appear on
+ the <code class="directive"><a href="#deny">Deny</a></code> list are
+ granted access. This ordering has the same effect as <code>Order
+ Allow,Deny</code> and is deprecated in favor of that
+ configuration.</dd>
+ </dl>
+
+ <p>Keywords may only be separated by a comma; <em>no whitespace</em> is
+ allowed between them. Note that in all cases every <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> statement is evaluated.</p>
+
+ <p>In the following example, all hosts in the apache.org domain
+ are allowed access; all other hosts are denied access.</p>
+
+ <div class="example"><p><code>
+ Order Deny,Allow<br />
+ Deny from all<br />
+ Allow from apache.org
+ </code></p></div>
+
+ <p>In the next example, all hosts in the apache.org domain are
+ allowed access, except for the hosts which are in the
+ foo.apache.org subdomain, who are denied access. All hosts not
+ in the apache.org domain are denied access because the default
+ state is to deny access to the server.</p>
+
+ <div class="example"><p><code>
+ Order Allow,Deny<br />
+ Allow from apache.org<br />
+ Deny from foo.apache.org
+ </code></p></div>
+
+ <p>On the other hand, if the <code class="directive">Order</code> in the last
+ example is changed to <code>Deny,Allow</code>, all hosts will
+ be allowed access. This happens because, regardless of the
+ actual ordering of the directives in the configuration file,
+ the <code>Allow from apache.org</code> will be evaluated last
+ and will override the <code>Deny from foo.apache.org</code>.
+ All hosts not in the <code>apache.org</code> domain will also
+ be allowed access because the default state will change to
+ <var>allow</var>.</p>
+
+ <p>The presence of an <code class="directive">Order</code> directive can affect
+ access to a part of the server even in the absence of accompanying
+ <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives because of its effect
+ on the default access state. For example,</p>
+
+ <div class="example"><p><code>
+ <Directory /www><br />
+ <span class="indent">
+ Order Allow,Deny<br />
+ </span>
+ </Directory>
+ </code></p></div>
+
+ <p>will deny all access to the <code>/www</code> directory
+ because the default access state will be set to
+ <var>deny</var>.</p>
+
+ <p>The <code class="directive">Order</code> directive controls the order of access
+ directive processing only within each phase of the server's
+ configuration processing. This implies, for example, that an
+ <code class="directive"><a href="#allow">Allow</a></code> or <code class="directive"><a href="#deny">Deny</a></code> directive occurring in a
+ <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section will
+ always be evaluated after an <code class="directive"><a href="#allow">Allow</a></code> or <code class="directive"><a href="#deny">Deny</a></code> directive occurring in a
+ <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section or
+ <code>.htaccess</code> file, regardless of the setting of the
+ <code class="directive">Order</code> directive. For details on the merging
+ of configuration sections, see the documentation on <a href="../sections.html">How Directory, Location and Files sections
+ work</a>.</p>
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_access.html.ja.jis b/docs/manual/mod/mod_access.html.ja.jis
new file mode 100644
index 0000000..1f3b106
--- /dev/null
+++ b/docs/manual/mod/mod_access.html.ja.jis
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="iso-2022-jp"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mod_access - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_access</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%/%i%$%"%s%H$N%[%9%HL>!"(BIP $B%"%I%l%9!"$=$NB>$N%/%i%$%"%s%H(B
+$B$N%j%/%(%9%H$NFCD'$K4p$E$$$?%"%/%;%9@)8f5!G=$rDs6!$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>access_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_access.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">$B8_49@-(B:</a></th><td>2.1 $B$h$jA0$N%P!<%8%g%s$N$_$G;HMQ2DG=(B</td></tr></table>
+<h3>$B35MW(B</h3>
+
+ <p><code class="module"><a href="../mod/mod_access.html">mod_access</a></code> $B$K$h$jDs6!$5$l$k%G%#%l%/%F%#%V$O%5!<%P$NFCDj$NItJ,$X$N(B
+ $B%"%/%;%9$r@)8f$9$k$?$a$K(B <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, <code class="directive"><a href="../mod/core.html#location"><Location></a></code>
+ $B$H(B <code><a href="core.html#accessfilename">.htaccess</a></code> $B%U%!%$%k$G;HMQ$5$l$^$9!#%/%i%$%"%s%H$N%[%9%HL>!"(BIP
+ $B%"%I%l%9$d(B <a href="../env.html">$B4D6-JQ?t(B</a>$B$H$7$F<hF@$5$l$?!"$=$NB>$N%j%/%(%9%H$NFCD'$K4p$E$$$F(B
+ $B%"%/%;%9@)8f$r9T$J$&$3$H$,$G$-$^$9!#(B<code class="directive"><a href="#allow">Allow</a></code> $B$H(B
+ <code class="directive"><a href="#deny">Deny</a></code> $B%G%#%l%/%F%#%V$O(B
+ $B$I$N$h$&$J%/%i%$%"%s%H$K%"%/%;%9$r(B
+ $B5v2D$9$k!"$7$J$$$+$r;XDj$9$k$?$a$K;HMQ$5$l$^$9!#0lJ}!"(B
+ <code class="directive"><a href="#order">Order</a></code> $B%G%#%l%/%F%#%V$O(B
+ $B%G%U%)%k%H$N%"%/%;%9>uBV$H!"(B
+ <code class="directive"><a href="#allow">Allow</a></code> $B%G%#%l%/%F%#%V$H(B
+ <code class="directive"><a href="#deny">Deny</a></code>
+ $B%G%#%l%/%F%#%V$H$N$*8_$$$X$N1F6A$N;EJ}$r@_Dj$7$^$9!#(B
+ </p>
+
+ <p>$B%[%9%H$K$h$k%"%/%;%9@)8B$H%Q%9%o!<%I$K$h$kG'>Z$rF1;~$K(B
+ $B9T$J$&$3$H$,2DG=$G$9!#$=$N>l9g!"$=$NFs$D$N@)8B$N4X78$r;XDj$9$k$?$a$K(B
+ <code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code>
+ $B%G%#%l%/%F%#%V$r;HMQ$7$^$9!#(B</p>
+
+ <p>$B0lHLE*$K$O!"%"%/%;%9@)8B%G%#%l%/%F%#%V$O$9$Y$F$N%"%/%;%9%a%=%C%I(B
+ (<code>GET</code>, <code>PUT</code>, <code>POST</code> $B$J$I(B)
+ $B$KE,MQ$5$l$^$9!#$=$7$F!"$[$H$s$I$N>l9g$3$l$,K>$^$7$$F0:n$G$9!#(B
+ $B$7$+$7!"(B<code class="directive"><a href="../mod/core.html#limit"><Limit></a></code>
+ $B%;%/%7%g%s$NCf$K%G%#%l%/%F%#%V$r=q$/$3$H$G!"(B
+ $B0lIt$N%a%=%C%I$K$N$_@)8B$r$+$1$k$3$H$b$G$-$^$9!#(B</p>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#allow">Allow</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#deny">Deny</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#order">Order</a></li>
+</ul>
+<h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#require">Require</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="Allow" id="Allow">Allow</a> <a name="allow" id="allow">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%5!<%P$N$"$kNN0h$K%"%/%;%9$G$-$k%[%9%H$r@)8f$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code> Allow from
+ all|<var>host</var>|env=<var>env-variable</var>
+ [<var>host</var>|env=<var>env-variable</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Limit</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_access</td></tr>
+</table>
+
+ <p><code class="directive">Allow</code> $B%G%#%l%/%F%#%V$O$I$N%[%9%H$,(B
+ $B%5!<%P$N$"$kNN0h$r%"%/%;%9$G$-$k$+$K1F6A$rM?$($^$9!#(B
+ $B%"%/%;%9$O%[%9%HL>!"(BIP $B%"%I%l%9!"(BIP $B%"%I%l%9$NHO0O$d!"(B
+ $B4D6-JQ?t$H$7$F<hF@$5$l$?!"$=$NB>$N%/%i%$%"%s%H$N%j%/%(%9%H$N(B
+ $BFCD'$K$h$C$F@)8f$9$k$3$H$,$G$-$^$9!#(B</p>
+
+ <p>$B$3$N%G%#%l%/%F%#%V$N:G=i$N0z?t$O>o$K(B <code>from</code> $B$G$9!#(B
+ $B$=$l$KB3$/0z?t$O;0$D$N0c$C$?7A<0$,$"$j$^$9!#(B<code>Allow from
+ all</code> $B$,;XDj$5$l$F$$$l$P!"$9$Y$F$N%[%9%H$K%"%/%;%9$r5v2D$7!"(B
+ $B%"%/%;%9@)8B$O2<$G@bL@$5$l$F$$$k$h$&$K!"(B
+ <code class="directive"><a href="#deny">Deny</a></code>
+ $B%G%#%l%/%F%#%V$H(B <code class="directive"><a href="#order">Order</a></code>
+ $B%G%#%l%/%F%#%V$N@_Dj$G7h$^$j$^$9!#(B
+ $BFCDj$N%[%9%H$d%[%9%H72$K$N$_%5!<%P$X$N%"%/%;%9$r5v2D$9$k$?$a$K$O!"(B
+ $B0J2<$N$I$l$+$N7A<0$G(B <var>host</var> $B$r;XDj$9$k$3$H$,$G$-$^$9(B:</p>
+
+ <dl>
+ <dt>$B%I%a%$%sL>(B ($B$N0lIt(B)</dt>
+
+ <dd>$BNc(B: <code>Allow from apache.org</code><br />
+ $B$3$NJ8;zNs$K9g$&$+!"$3$l$G=*$o$kL>A0$N%[%9%H$N%"%/%;%9$,5v2D$5$l$^$9!#(B
+ $B3FItJ,$,40A4$K9g$&$b$N$@$1$KE,MQ$5$l$^$9$N$G!">e$NNc$O(B
+ <code>foo.apache.org</code> $B$K$O%^%C%A$7$^$9$,!"(B
+ <code>fooapache.org</code> $B$K$O%^%C%A$7$^$;$s!#(B
+ $B$3$N@_Dj$r$9$k$H!"%5!<%P$O(B
+ <code class="directive"><a href="../mod/core.html#hostnamelookups">HostnameLookups</a></code>
+ $B$N@_Dj$K4X$o$i$:!"%/%i%$%"%s%H$N(B IP $B%"%I%l%9$KBP$7$F(B
+ DNS $B$N5U0z$-$r9T$J$$$^$9!#(B</dd>
+
+ <dt>$B40A4$J(B IP $B%"%I%l%9(B</dt>
+
+ <dd>$BNc(B: <code>Allow from 10.1.2.3</code><br />
+ $B%"%/%;%9$r5v2D$9$k(B IP $B%"%I%l%9$G$9!#(B</dd>
+
+ <dt>IP $B%"%I%l%9$N0lIt(B</dt>
+
+ <dd>$BNc(B: <code>Allow from 10.1</code><br />
+ $B%5%V%M%C%H$N@)8BMQ$N!"(BIP
+ $B%"%I%l%9$N:G=i$N0l$D$+$i;0$D$^$G$N%P%$%H$G$9!#(B</dd>
+
+ <dt>$B%M%C%H%o!<%/(B/$B%M%C%H%^%9%/(B $B$NBP(B</dt>
+
+ <dd>$BNc(B: <code>Allow from 10.1.0.0/255.255.0.0</code><br />
+ $B%M%C%H%o!<%/(B a.b.c.d $B$H%M%C%H%^%9%/(B w.x.y.z $B$G$9!#(B
+ $B$h$j:YN3EY$N%5%V%M%C%H@)8BMQ$G$9!#(B</dd>
+
+ <dt>$B%M%C%H%o!<%/(B/nnn CIDR $B;XDj(B</dt>
+
+ <dd>$BNc(B: <code>Allow from 10.1.0.0/16</code><br />
+ $B%M%C%H%^%9%/$,(B nnn $B$N>e0L%S%C%H$,(B 1
+ $B$H$J$C$F$$$k$b$N$+$i$J$k$3$H0J30$OA0$N$b$N$HF1$8$G$9!#(B</dd>
+ </dl>
+
+ <p>$BCm(B: $B:G8e$N;0$D$NNc$O$^$C$?$/F1$8%[%9%H$K9g$$$^$9!#(B</p>
+
+
+ <p>IPv6 $B%"%I%l%9$H(B IPv6 $B$N%5%V%M%C%H$O0J2<$N$h$&$K;XDj$G$-$^$9(B:</p>
+
+ <div class="example"><p><code>
+ Allow from fe80::a00:20ff:fea7:ccea<br />
+ Allow from fe80::a00:20ff:fea7:ccea/10
+ </code></p></div>
+
+ <p><code class="directive">Allow</code> $B%G%#%l%/%F%#%V$N0z?t$N;0$DL\$N7A<0$O!"(B
+ <a href="../env.html">$B4D6-JQ?t(B</a>
+ $B$NB8:_$K$h$j%"%/%;%9$N@)8f$r9T$J$($k$h$&$K$9$k$b$N$G$9!#(B
+ <code>Allow from env=<var>env-variable</var></code>
+ $B$,;XDj$5$l$F$$$k$H!"4D6-JQ?t(B <var>env-variable</var>
+ $B$,B8:_$7$?>l9g$K%j%/%(%9%H$O%"%/%;%9$r5v2D$5$l$^$9!#%5!<%P$O(B
+ <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>
+ $B$N%G%#%l%/%F%#%V$K$h$j!"%/%i%$%"%s%H$N%j%/%(%9%H(B
+ $B$NFCD'$K4p$E$$$F=@Fp$K4D6-JQ?t$r@_Dj$9$k5!G=$rDs6!$7$^$9!#(B
+ $B$G$9$+$i!"$3$N%G%#%l%/%F%#%V$O%/%i%$%"%s%H$N(B
+ <code>User-Agent</code> ($B%V%i%&%6$N<oN`(B)$B!"(B<code>Referer</code>
+ $B$dB>$N(B HTTP $B%j%/%(%9%H$N%X%C%@%U%#!<%k%I$J$I$K4p$E$$$F(B
+ $B%"%/%;%95v2D$r$9$k$?$a$K;H$&$3$H$,$G$-$^$9!#(B
+ </p>
+
+ <div class="example"><h3>$BNc(B:</h3><p><code>
+ SetEnvIf User-Agent ^KnockKnock/2.0 let_me_in<br />
+ <Directory /docroot><br />
+ <span class="indent">
+ Order Deny,Allow<br />
+ Deny from all<br />
+ Allow from env=let_me_in<br />
+ </span>
+ </Directory>
+ </code></p></div>
+
+ <p>$B$3$N>l9g!"(Buser-agent $B$NJ8;zNs$,(B <code>KnockKnock/2.0</code>
+ $B$G;O$^$k%V%i%&%6$N$_$,%"%/%;%9$r5v2D$5$l!"(B
+ $BB>$N$b$N$O%"%/%;%9$r5qH]$5$l$^$9!#(B</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Deny" id="Deny">Deny</a> <a name="deny" id="deny">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%5!<%P$,%"%/%;%9$r5qH]$9$k%[%9%H$r@)8f$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code> Deny from
+ all|<var>host</var>|env=<var>env-variable</var>
+ [<var>host</var>|env=<var>env-variable</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Limit</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_access</td></tr>
+</table>
+ <p>$B$3$N%G%#%l%/%F%#%V$O%[%9%HL>!"(BIP
+ $B%"%I%l%9!"4D6-JQ?t$K4p$E$$$F%5!<%P$X$N%"%/%;%9$r@)8B$7$^$9!#(B
+ <code class="directive">Deny</code> $B%G%#%l%/%F%#%V$N0z?t$O(B <code class="directive"><a href="#allow">Allow</a></code>
+ $B%G%#%l%/%F%#%V$H$^$C$?$/F1$8$G$9!#(B</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Order" id="Order">Order</a> <a name="order" id="order">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%G%U%)%k%H$N%"%/%;%92DG=$J>uBV$H!"(BAllow $B$H(B
+Deny $B$,I>2A$5$l$k=gHV$r@)8f$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code> Order <var>ordering</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>Order Deny,Allow</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Limit</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_access</td></tr>
+</table>
+
+ <p><code class="directive">Order</code> $B%G%#%l%/%F%#%V$O%G%U%)%k%H$N%"%/%;%9$N>uBV$H(B
+ <code class="directive"><a href="#allow">Allow</a></code> $B%G%#%l%/%F%#%V$H(B
+ <code class="directive"><a href="#deny">Deny</a></code>
+ $B%G%#%l%/%F%#%V$,I>2A$5$l$k=gHV$r@)8f$7$^$9!#(B
+ <var>Ordering</var> $B$O0J2<$N$I$l$+$G$9!#(B</p>
+
+ <dl>
+ <dt>Deny,Allow</dt>
+
+ <dd><code class="directive"><a href="#deny">Deny</a></code> $B%G%#%l%/%F%#%V$,(B
+ <code class="directive"><a href="#allow">Allow</a></code>
+ $B%G%#%l%/%F%#%V$NA0$KI>2A$5$l$^$9!#(B
+ $B%"%/%;%9$O%G%U%)%k%H$G5v2D$5$l$^$9!#(B<code class="directive"><a href="#deny">Deny</a></code>
+ $B%G%#%l%/%F%#%V$K9g$o$J$$$+!"(B<code class="directive"><a href="#allow">Allow</a></code>
+ $B%G%#%l%/%F%#%V$K9g$&%/%i%$%"%s%H$O%"%/%;%9$r5v2D$5$l$^$9!#(B</dd>
+
+ <dt>Allow,Deny</dt>
+
+ <dd><code class="directive"><a href="#allow">Allow</a></code>
+ $B%G%#%l%/%F%#%V$,(B <code class="directive"><a href="#deny">Deny</a></code>
+ $B%G%#%l%/%F%#%V$NA0$KI>2A$5$l$^$9!#(B
+ $B%"%/%;%9$O%G%U%)%k%H$G5qH]$5$l$^$9!#(B<code class="directive"><a href="#allow">Allow</a></code>
+ $B%G%#%l%/%F%#%V$K9g$o$J$$$+!"(B<code class="directive"><a href="#deny">Deny</a></code>
+ $B%G%#%l%/%F%#%V$K9g$&%/%i%$%"%s%H$O%"%/%;%9$r5qH]$5$l$^$9!#(B
+ </dd>
+
+ <dt>Mutual-failure</dt>
+
+ <dd><code class="directive"><a href="#allow">Allow</a></code> $B$N%j%9%H$K8=$l$F!"(B
+ <code class="directive"><a href="#deny">Deny</a></code>
+ $B$N%j%9%H$K8=$l$J$$%[%9%H$N$_$,%"%/%;%9$r5v2D$5$l$^$9!#(B
+ $B$3$N=gHVIU$1$O(B <code>Order Allow,Deny</code> $B$HF1$88z2L$r;}$A!"(B
+ $B$=$N@_Dj$NJ}$,9%$^$7$$$?$a$KHs?d>)$H$J$C$F$$$^$9!#(B</dd>
+ </dl>
+
+ <p>$B%-!<%o!<%I$O%3%s%^$GJ,N%$9$k$3$H$@$1$,2DG=$G$9!#(B
+ $B4V$K6uGr$,$"$C$F$O$$$1$^$;$s!#$I$N>l9g$G$b!"(B<code class="directive"><a href="#allow">Allow</a></code> $B$H(B
+ <code class="directive"><a href="#deny">Deny</a></code> $BJ8$O(B
+ $BA4$FI>2A$5$l$k$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#(B
+ </p>
+
+ <p>$B0J2<$NNc$G$O!"(Bapache.org
+ $B%I%a%$%s$N$9$Y$F$N%[%9%H$O%"%/%;%9$r5v2D$5$l$^$9!#(B
+ $BB>$N$9$Y$F$N%[%9%H$O%"%/%;%9$r5qH]$5$l$^$9!#(B</p>
+
+ <div class="example"><p><code>
+ Order Deny,Allow<br />
+ Deny from all<br />
+ Allow from apache.org
+ </code></p></div>
+
+ <p>$B<!$NNc$G$O!"(Bfoo.apache.org $B%5%V%I%a%$%s$K$"$k%[%9%H0J30$N!"(B
+ apache.org $B%I%a%$%s$N$9$Y$F$N%[%9%H$,%"%/%;%9$r5v2D$5$l$^$9!#(B
+ apache.org
+ $B%I%a%$%s$G$J$$%[%9%H$O!"%G%U%)%k%H$N>uBV$,%"%/%;%95qH]$N$?$a!"(B
+ $B%5!<%P$X$N%"%/%;%9$r5qH]$5$l$^$9!#(B</p>
+
+ <div class="example"><p><code>
+ Order Allow,Deny<br />
+ Allow from apache.org<br />
+ Deny from foo.apache.org
+ </code></p></div>
+
+ <p>$B0lJ}!">e$NNc$N(B <code class="directive">Order</code> $B$,(B <code>Deny,Allow</code>
+ $B$KJQ$o$C$F$$$l$P!"$9$Y$N%[%9%H$K%"%/%;%9$,5v2D$5$l$^$9!#(B
+ $B$3$l$O!"@_Dj%U%!%$%kCf$N<B:]$N=gHV$K4X$o$i$:!"(B
+ <code>Allow from apache.org</code> $B$,:G8e$KI>2A$5$l$F!"(B
+ <code>Deny from foo.apache.org</code> $B$r>e=q$-$9$k$+$i$G$9!#(B
+ <code>apache.org</code>
+ $B%I%a%$%s$K$J$$%[%9%H$b!"%G%U%)%k%H$N>uBV$,(B <var>allow</var>
+ $B$KJQ2=$9$k$?$a$K!"%"%/%;%9$r5v2D$5$l$^$9!#(B
+ </p>
+
+ <p><code class="directive">Order</code>
+ $B%G%#%l%/%F%#%V$O%G%U%)%k%H$N%"%/%;%9$N>uBV$K1F6A$rM?$($k$N$G!"(B
+ <code class="directive"><a href="#allow">Allow</a></code> $B%G%#%l%/%F%#%V$H(B
+ <code class="directive"><a href="#deny">Deny</a></code>
+ $B%G%#%l%/%F%#%V$,L5$/$F$b!"%5!<%P$N%"%/%;%9$K1F6A$rM?$($k$3$H$,$G$-$^$9!#(B
+ $B$?$H$($P!"(B</p>
+
+ <div class="example"><p><code>
+ <Directory /www><br />
+ <span class="indent">
+ Order Allow,Deny<br />
+ </span>
+ </Directory>
+ </code></p></div>
+
+ <p>$B$O%G%U%)%k%H$N%"%/%;%9>uBV$,(B <var>deny</var> $B$K$J$k$?$a!"(B
+ <code>/www</code> $B%G%#%l%/%H%j$X$N$9$Y$F$N%"%/%;%9$r5qH]$7$^$9!#(B
+ </p>
+
+ <p><code class="directive">Order</code>
+ $B%G%#%l%/%F%#%V$O%5!<%P$N@_Dj=hM}$N3FCJ3,$G$@$1(B
+ $B%"%/%;%9%G%#%l%/%F%#%V$N=hM}$N=gHV$rJQ99$7$^$9!#$3$l$O!"$?$H$($P!"(B
+ <code class="directive">Order</code> $B%G%#%l%/%F%#%V$N@_Dj$K4X$o$i$:!"(B
+ <code class="directive"><a href="../mod/core.html#location"><Location></a></code> $B%;%/%7%g%s$N(B
+ <code class="directive"><a href="#allow">Allow</a></code> $B%G%#%l%/%F%#%V$d(B
+ <code class="directive"><a href="#deny">Deny</a></code> $B%G%#%l%/%F%#%V$O!"(B
+ <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> $B%;%/%7%g%s$d(B
+ <code>.htaccess</code> $B%U%!%$%k$N(B <code class="directive"><a href="#allow">Allow</a></code>
+ $B%G%#%l%/%F%#%V$d(B <code class="directive"><a href="#deny">Deny</a></code>
+ $B%G%#%l%/%F%#%V$h$j$b>o$K8e$KI>2A$5$l$k$H$$$&$3$H$r0UL#$7$^$9!#(B
+ $B@_Dj%;%/%7%g%s$N%^!<%8$N>\:Y$K$D$$$F$O!"(B
+ <a href="../sections.html">Directory,Location, Files
+ $B%;%/%7%g%s$NF0:nJ}K!(B</a> $B$r;2>H$7$F$/$@$5$$!#(B</p>
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/obs_mod_access.xml b/docs/manual/mod/mod_access.xml
similarity index 67%
rename from docs/manual/mod/obs_mod_access.xml
rename to docs/manual/mod/mod_access.xml
index 765f4c7..28a12f1 100644
--- a/docs/manual/mod/obs_mod_access.xml
+++ b/docs/manual/mod/mod_access.xml
@@ -4,45 +4,30 @@
<modulesynopsis>
<name>mod_access</name>
-
<description>Provides access control based on client hostname, IP
address, or other characteristics of the client request.</description>
-
-<status>Obsolete</status>
-<hint>replaced by <module>mod_authz_host</module> since 2.0.44</hint>
+<status>Base</status>
<sourcefile>mod_access.c</sourcefile>
<identifier>access_module</identifier>
-<compatibility>Available only in versions up to 2.0.43</compatibility>
+<compatibility>Available only in versions prior to 2.1</compatibility>
<summary>
- <note type="warning"><title>This module is obsolete!</title>
- <p>Note, that this module has been marked as obsolete. A bunch
- of modules was introduced in Apache version 2.0.44 that
- support the new Authentication/Authorization provider mechnism.</p>
-
- <p>If you want to use host based access control, you have to invoke the
- <module>mod_authz_host</module> module now.</p>
-
- <p>This document is kept only for historical reasons and no
- longer maintained.</p>
- </note>
-
- <p>The directives provided by mod_access are used in <directive
- module="core" type="section">Directory</directive>, <directive
- module="core" type="section">Files</directive>, and <directive
- module="core" type="section">Location</directive> sections as well as
- <code><a href="core.html#accessfilename">.htaccess</a></code>
+ <p>The directives provided by <module>mod_access</module> are used
+ in <directive module="core" type="section">Directory</directive>,
+ <directive module="core" type="section">Files</directive>, and
+ <directive module="core" type="section">Location</directive> sections
+ as well as <code><a href="core.html#accessfilename">.htaccess</a></code>
files to control access to particular parts of the server. Access
can be controlled based on the client hostname, IP address, or
other characteristics of the client request, as captured in <a
href="../env.html">environment variables</a>. The <directive
- module="mod_access" status="obsolete">Allow</directive> and <directive
- module="mod_access" status="obsolete">Deny</directive> directives are used to
+ module="mod_access">Allow</directive> and <directive
+ module="mod_access">Deny</directive> directives are used to
specify which clients are or are not allowed access to the server,
- while the <directive module="mod_access" status="obsolete">Order</directive>
+ while the <directive module="mod_access">Order</directive>
directive sets the default access state, and configures how the
- <directive module="mod_access" status="obsolete">Allow</directive> and <directive
- module="mod_access" status="obsolete">Deny</directive> directives interact with each
+ <directive module="mod_access">Allow</directive> and <directive
+ module="mod_access">Deny</directive> directives interact with each
other.</p>
<p>Both host-based access restrictions and password-based
@@ -85,8 +70,8 @@
<code>from</code>. The subsequent arguments can take three
different forms. If <code>Allow from all</code> is specified, then
all hosts are allowed access, subject to the configuration of the
- <directive module="mod_access" status="obsolete">Deny</directive> and <directive
- module="mod_access" status="obsolete">Order</directive> directives as discussed
+ <directive module="mod_access">Deny</directive> and <directive
+ module="mod_access">Order</directive> directives as discussed
below. To allow only particular hosts or groups of hosts to access
the server, the <var>host</var> can be specified in any of the
following formats:</p>
@@ -94,39 +79,53 @@
<dl>
<dt>A (partial) domain-name</dt>
- <dd>Example: <code>Allow from apache.org</code><br />
- Hosts whose names match, or end in, this string are allowed
+ <dd>
+ <example><title>Example:</title>
+ Allow from apache.org
+ </example>
+ <p>Hosts whose names match, or end in, this string are allowed
access. Only complete components are matched, so the above
example will match <code>foo.apache.org</code> but it will
not match <code>fooapache.org</code>. This configuration will
cause the server to perform a reverse DNS lookup on the
client IP address, regardless of the setting of the <directive
module="core">HostnameLookups</directive>
- directive.</dd>
+ directive.</p></dd>
<dt>A full IP address</dt>
- <dd>Example: <code>Allow from 10.1.2.3</code><br />
- An IP address of a host allowed access</dd>
+ <dd>
+ <example><title>Example:</title>
+ Allow from 10.1.2.3
+ </example>
+ <p>An IP address of a host allowed access</p></dd>
<dt>A partial IP address</dt>
- <dd>Example: <code>Allow from 10.1</code><br />
- The first 1 to 3 bytes of an IP address, for subnet
- restriction.</dd>
+ <dd>
+ <example><title>Example:</title>
+ Allow from 10.1
+ </example>
+ <p>The first 1 to 3 bytes of an IP address, for subnet
+ restriction.</p></dd>
<dt>A network/netmask pair</dt>
- <dd>Example: <code>Allow from
- 10.1.0.0/255.255.0.0</code><br />
- A network a.b.c.d, and a netmask w.x.y.z. For more
- fine-grained subnet restriction.</dd>
+ <dd>
+ <example><title>Example:</title>
+ Allow from 10.1.0.0/255.255.0.0
+ </example>
+ <p>A network a.b.c.d, and a netmask w.x.y.z. For more
+ fine-grained subnet restriction.</p></dd>
<dt>A network/nnn CIDR specification</dt>
- <dd>Example: <code>Allow from 10.1.0.0/16</code><br />
- Similar to the previous case, except the netmask consists of
- nnn high-order 1 bits.</dd>
+ <dd>
+ <example><title>Example:</title>
+ Allow from 10.1.0.0/16
+ </example>
+ <p>Similar to the previous case, except the netmask consists of
+ nnn high-order 1 bits.</p></dd>
</dl>
<p>Note that the last three examples above match exactly the
@@ -169,19 +168,14 @@
with <code>KnockKnock/2.0</code> will be allowed access, and all
others will be denied.</p>
</usage>
-
</directivesynopsis>
<directivesynopsis>
-
<name>Deny</name>
-
<description>Controls which hosts are denied access to the
server</description>
-
-<syntax> Deny from
- all|<var>host</var>|env=<var>env-variable</var>
- [<var>host</var>|env=<var>env-variable</var>] ...</syntax>
+<syntax> Deny from all|<var>host</var>|env=<var>env-variable</var>
+[<var>host</var>|env=<var>env-variable</var>] ...</syntax>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>Limit</override>
@@ -191,19 +185,15 @@
based on hostname, IP address, or environment variables. The
arguments for the <directive>Deny</directive> directive are
identical to the arguments for the <directive
- module="mod_access" status="obsolete">Allow</directive> directive.</p>
+ module="mod_access">Allow</directive> directive.</p>
</usage>
-
</directivesynopsis>
<directivesynopsis>
-
<name>Order</name>
-
<description>Controls the default access state and the order in which
<directive>Allow</directive> and <directive>Deny</directive> are
evaluated.</description>
-
<syntax> Order <var>ordering</var></syntax>
<default>Order Deny,Allow</default>
<contextlist><context>directory</context><context>.htaccess</context>
@@ -214,45 +204,45 @@
<p>The <directive>Order</directive> directive controls the default
access state and the order in which <directive
- module="mod_access" status="obsolete">Allow</directive> and <directive
- module="mod_access" status="obsolete">Deny</directive> directives are evaluated.
+ module="mod_access">Allow</directive> and <directive
+ module="mod_access">Deny</directive> directives are evaluated.
<var>Ordering</var> is one of</p>
<dl>
- <dt>Deny,Allow</dt>
+ <dt><code>Deny,Allow</code></dt>
- <dd>The <directive module="mod_access" status="obsolete">Deny</directive> directives
+ <dd>The <directive module="mod_access">Deny</directive> directives
are evaluated before the <directive
- module="mod_access" status="obsolete">Allow</directive> directives. Access is
+ module="mod_access">Allow</directive> directives. Access is
allowed by default. Any client which does not match a
- <directive module="mod_access" status="obsolete">Deny</directive> directive or does
- match an <directive module="mod_access" status="obsolete">Allow</directive>
+ <directive module="mod_access">Deny</directive> directive or does
+ match an <directive module="mod_access">Allow</directive>
directive will be allowed access to the server.</dd>
- <dt>Allow,Deny</dt>
+ <dt><code>Allow,Deny</code></dt>
- <dd>The <directive module="mod_access" status="obsolete">Allow</directive>
+ <dd>The <directive module="mod_access">Allow</directive>
directives are evaluated before the <directive
- module="mod_access" status="obsolete">Deny</directive> directives. Access is denied
+ module="mod_access">Deny</directive> directives. Access is denied
by default. Any client which does not match an <directive
- module="mod_access" status="obsolete">Allow</directive> directive or does match a
- <directive module="mod_access" status="obsolete">Deny</directive> directive will be
+ module="mod_access">Allow</directive> directive or does match a
+ <directive module="mod_access">Deny</directive> directive will be
denied access to the server.</dd>
- <dt>Mutual-failure</dt>
+ <dt><code>Mutual-failure</code></dt>
<dd>Only those hosts which appear on the <directive
- module="mod_access" status="obsolete">Allow</directive> list and do not appear on
- the <directive module="mod_access" status="obsolete">Deny</directive> list are
+ module="mod_access">Allow</directive> list and do not appear on
+ the <directive module="mod_access">Deny</directive> list are
granted access. This ordering has the same effect as <code>Order
Allow,Deny</code> and is deprecated in favor of that
configuration.</dd>
</dl>
- <p>Keywords may only be separated by a comma; no whitespace is
+ <p>Keywords may only be separated by a comma; <em>no whitespace</em> is
allowed between them. Note that in all cases every <directive
- module="mod_access" status="obsolete">Allow</directive> and <directive
- module="mod_access" status="obsolete">Deny</directive> statement is evaluated.</p>
+ module="mod_access">Allow</directive> and <directive
+ module="mod_access">Deny</directive> statement is evaluated.</p>
<p>In the following example, all hosts in the apache.org domain
are allowed access; all other hosts are denied access.</p>
@@ -287,8 +277,8 @@
<p>The presence of an <directive>Order</directive> directive can affect
access to a part of the server even in the absence of accompanying
- <directive module="mod_access" status="obsolete">Allow</directive> and <directive
- module="mod_access" status="obsolete">Deny</directive> directives because of its effect
+ <directive module="mod_access">Allow</directive> and <directive
+ module="mod_access">Deny</directive> directives because of its effect
on the default access state. For example,</p>
<example>
@@ -306,12 +296,12 @@
<p>The <directive>Order</directive> directive controls the order of access
directive processing only within each phase of the server's
configuration processing. This implies, for example, that an
- <directive module="mod_access" status="obsolete">Allow</directive> or <directive
- module="mod_access" status="obsolete">Deny</directive> directive occurring in a
+ <directive module="mod_access">Allow</directive> or <directive
+ module="mod_access">Deny</directive> directive occurring in a
<directive module="core" type="section">Location</directive> section will
always be evaluated after an <directive
- module="mod_access" status="obsolete">Allow</directive> or <directive
- module="mod_access" status="obsolete">Deny</directive> directive occurring in a
+ module="mod_access">Allow</directive> or <directive
+ module="mod_access">Deny</directive> directive occurring in a
<directive module="core" type="section">Directory</directive> section or
<code>.htaccess</code> file, regardless of the setting of the
<directive>Order</directive> directive. For details on the merging
@@ -319,7 +309,6 @@
href="../sections.html">How Directory, Location and Files sections
work</a>.</p>
</usage>
-
</directivesynopsis>
</modulesynopsis>
diff --git a/docs/manual/mod/mod_authz_host.xml.ja b/docs/manual/mod/mod_access.xml.ja
similarity index 74%
rename from docs/manual/mod/mod_authz_host.xml.ja
rename to docs/manual/mod/mod_access.xml.ja
index 90dda92..e854b47 100644
--- a/docs/manual/mod/mod_authz_host.xml.ja
+++ b/docs/manual/mod/mod_access.xml.ja
@@ -2,20 +2,19 @@
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
<modulesynopsis>
-<!-- English revision: 1.2 -->
+<!-- English revision: 1.7.2.1 -->
-<name>mod_authz_host</name>
-
-<description>$B%[%9%H(B ($BL>A0$b$7$/$O(B IP $B%"%I%l%9(B) $B$K4p$E$$$?%0%k!<%W>5G'(B</description>
+<name>mod_access</name>
+<description>$B%/%i%$%"%s%H$N%[%9%HL>!"(BIP $B%"%I%l%9!"$=$NB>$N%/%i%$%"%s%H(B
+$B$N%j%/%(%9%H$NFCD'$K4p$E$$$?%"%/%;%9@)8f5!G=$rDs6!$9$k(B</description>
<status>Base</status>
-<sourcefile>mod_authz_host.c</sourcefile>
-<identifier>authz_host_module</identifier>
-<compatibility>Apache 2.0.44 $B0J9_(B</compatibility>
+<sourcefile>mod_access.c</sourcefile>
+<identifier>access_module</identifier>
+<compatibility>2.1 $B$h$jA0$N%P!<%8%g%s$N$_$G;HMQ2DG=(B</compatibility>
<summary>
- <p><module>mod_authz_host</module> $B$K$h$jDs6!$5$l$k%G%#%l%/%F%#%V$O(B
- $B%5!<%P$NFCDj$NItJ,$X$N(B
+ <p><module>mod_access</module> $B$K$h$jDs6!$5$l$k%G%#%l%/%F%#%V$O%5!<%P$NFCDj$NItJ,$X$N(B
$B%"%/%;%9$r@)8f$9$k$?$a$K(B <directive module="core" type="section"
>Directory</directive>, <directive module="core"
type="section">Files</directive>, <directive module="core"
@@ -25,14 +24,14 @@
$B%"%I%l%9$d(B <a href="../env.html">$B4D6-JQ?t(B</a
>$B$H$7$F<hF@$5$l$?!"$=$NB>$N%j%/%(%9%H$NFCD'$K4p$E$$$F(B
$B%"%/%;%9@)8f$r9T$J$&$3$H$,$G$-$^$9!#(B<directive
- module="mod_authz_host">Allow</directive> $B$H(B
- <directive module="mod_authz_host">Deny</directive> $B%G%#%l%/%F%#%V$O(B
+ module="mod_access">Allow</directive> $B$H(B
+ <directive module="mod_access">Deny</directive> $B%G%#%l%/%F%#%V$O(B
$B$I$N$h$&$J%/%i%$%"%s%H$K%"%/%;%9$r(B
$B5v2D$9$k!"$7$J$$$+$r;XDj$9$k$?$a$K;HMQ$5$l$^$9!#0lJ}!"(B
- <directive module="mod_authz_host">Order</directive> $B%G%#%l%/%F%#%V$O(B
+ <directive module="mod_access">Order</directive> $B%G%#%l%/%F%#%V$O(B
$B%G%U%)%k%H$N%"%/%;%9>uBV$H!"(B
- <directive module="mod_authz_host">Allow</directive> $B%G%#%l%/%F%#%V$H(B
- <directive module="mod_authz_host">Deny</directive>
+ <directive module="mod_access">Allow</directive> $B%G%#%l%/%F%#%V$H(B
+ <directive module="mod_access">Deny</directive>
$B%G%#%l%/%F%#%V$H$N$*8_$$$X$N1F6A$N;EJ}$r@_Dj$7$^$9!#(B
</p>
@@ -56,8 +55,8 @@
<name>Allow</name>
<description>$B%5!<%P$N$"$kNN0h$K%"%/%;%9$G$-$k%[%9%H$r@)8f$9$k(B</description>
<syntax> Allow from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</em>] ...</syntax>
+ all|<var>host</var>|env=<var>env-variable</var>
+ [<var>host</var>|env=<var>env-variable</var>] ...</syntax>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>Limit</override>
@@ -74,11 +73,11 @@
$B$=$l$KB3$/0z?t$O;0$D$N0c$C$?7A<0$,$"$j$^$9!#(B<code>Allow from
all</code> $B$,;XDj$5$l$F$$$l$P!"$9$Y$F$N%[%9%H$K%"%/%;%9$r5v2D$7!"(B
$B%"%/%;%9@)8B$O2<$G@bL@$5$l$F$$$k$h$&$K!"(B
- <directive module="mod_authz_host">Deny</directive>
- $B%G%#%l%/%F%#%V$H(B <directive module="mod_authz_host">Order</directive>
+ <directive module="mod_access">Deny</directive>
+ $B%G%#%l%/%F%#%V$H(B <directive module="mod_access">Order</directive>
$B%G%#%l%/%F%#%V$N@_Dj$G7h$^$j$^$9!#(B
$BFCDj$N%[%9%H$d%[%9%H72$K$N$_%5!<%P$X$N%"%/%;%9$r5v2D$9$k$?$a$K$O!"(B
- $B0J2<$N$I$l$+$N7A<0$G(B <em>host</em> $B$r;XDj$9$k$3$H$,$G$-$^$9(B:</p>
+ $B0J2<$N$I$l$+$N7A<0$G(B <var>host</var> $B$r;XDj$9$k$3$H$,$G$-$^$9(B:</p>
<dl>
<dt>$B%I%a%$%sL>(B ($B$N0lIt(B)</dt>
@@ -130,8 +129,8 @@
<p><directive>Allow</directive> $B%G%#%l%/%F%#%V$N0z?t$N;0$DL\$N7A<0$O!"(B
<a href="../env.html">$B4D6-JQ?t(B</a>
$B$NB8:_$K$h$j%"%/%;%9$N@)8f$r9T$J$($k$h$&$K$9$k$b$N$G$9!#(B
- <code>Allow from env=</code><em>variablename</em>
- $B$,;XDj$5$l$F$$$k$H!"4D6-JQ?t(B <em>variablename</em>
+ <code>Allow from env=<var>env-variable</var></code>
+ $B$,;XDj$5$l$F$$$k$H!"4D6-JQ?t(B <var>env-variable</var>
$B$,B8:_$7$?>l9g$K%j%/%(%9%H$O%"%/%;%9$r5v2D$5$l$^$9!#%5!<%P$O(B
<module>mod_setenvif</module>
$B$N%G%#%l%/%F%#%V$K$h$j!"%/%i%$%"%s%H$N%j%/%(%9%H(B
@@ -142,15 +141,16 @@
$B%"%/%;%95v2D$r$9$k$?$a$K;H$&$3$H$,$G$-$^$9!#(B
</p>
-<example>
-<title>$BNc(B:</title>
-SetEnvIf User-Agent ^KnockKnock/2.0 let_me_in<br />
-<Directory /docroot><br />
- Order Deny,Allow<br />
- Deny from all<br />
- Allow from env=let_me_in<br />
-</Directory>
-</example>
+ <example><title>$BNc(B:</title>
+ SetEnvIf User-Agent ^KnockKnock/2.0 let_me_in<br />
+ <Directory /docroot><br />
+ <indent>
+ Order Deny,Allow<br />
+ Deny from all<br />
+ Allow from env=let_me_in<br />
+ </indent>
+ </Directory>
+ </example>
<p>$B$3$N>l9g!"(Buser-agent $B$NJ8;zNs$,(B <code>KnockKnock/2.0</code>
$B$G;O$^$k%V%i%&%6$N$_$,%"%/%;%9$r5v2D$5$l!"(B
@@ -167,8 +167,8 @@
<description>$B%5!<%P$,%"%/%;%9$r5qH]$9$k%[%9%H$r@)8f$9$k(B</description>
<syntax> Deny from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</em>] ...</syntax>
+ all|<var>host</var>|env=<var>env-variable</var>
+ [<var>host</var>|env=<var>env-variable</var>] ...</syntax>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>Limit</override>
@@ -177,20 +177,17 @@
<p>$B$3$N%G%#%l%/%F%#%V$O%[%9%HL>!"(BIP
$B%"%I%l%9!"4D6-JQ?t$K4p$E$$$F%5!<%P$X$N%"%/%;%9$r@)8B$7$^$9!#(B
<directive>Deny</directive> $B%G%#%l%/%F%#%V$N0z?t$O(B <directive
- module="mod_authz_host">Allow</directive>
+ module="mod_access">Allow</directive>
$B%G%#%l%/%F%#%V$H$^$C$?$/F1$8$G$9!#(B</p>
</usage>
-
</directivesynopsis>
<directivesynopsis>
-
<name>Order</name>
-
<description>$B%G%U%)%k%H$N%"%/%;%92DG=$J>uBV$H!"(B<directive>Allow</directive> $B$H(B
<directive>Deny</directive> $B$,I>2A$5$l$k=gHV$r@)8f$9$k(B</description>
-<syntax> Order <em>ordering</em></syntax>
+<syntax> Order <var>ordering</var></syntax>
<default>Order Deny,Allow</default>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
@@ -199,38 +196,38 @@
<usage>
<p><directive>Order</directive> $B%G%#%l%/%F%#%V$O%G%U%)%k%H$N%"%/%;%9$N>uBV$H(B
- <directive module="mod_authz_host">Allow</directive> $B%G%#%l%/%F%#%V$H(B
- <directive module="mod_authz_host">Deny</directive>
+ <directive module="mod_access">Allow</directive> $B%G%#%l%/%F%#%V$H(B
+ <directive module="mod_access">Deny</directive>
$B%G%#%l%/%F%#%V$,I>2A$5$l$k=gHV$r@)8f$7$^$9!#(B
- <em>Ordering</em> $B$O0J2<$N$I$l$+$G$9!#(B</p>
+ <var>Ordering</var> $B$O0J2<$N$I$l$+$G$9!#(B</p>
<dl>
<dt>Deny,Allow</dt>
- <dd><directive module="mod_authz_host">Deny</directive> $B%G%#%l%/%F%#%V$,(B
- <directive module="mod_authz_host">Allow</directive>
+ <dd><directive module="mod_access">Deny</directive> $B%G%#%l%/%F%#%V$,(B
+ <directive module="mod_access">Allow</directive>
$B%G%#%l%/%F%#%V$NA0$KI>2A$5$l$^$9!#(B
$B%"%/%;%9$O%G%U%)%k%H$G5v2D$5$l$^$9!#(B<directive
- module="mod_authz_host">Deny</directive>
- $B%G%#%l%/%F%#%V$K9g$o$J$$$+!"(B<directive module="mod_authz_host">Allow</directive>
+ module="mod_access">Deny</directive>
+ $B%G%#%l%/%F%#%V$K9g$o$J$$$+!"(B<directive module="mod_access">Allow</directive>
$B%G%#%l%/%F%#%V$K9g$&%/%i%$%"%s%H$O%"%/%;%9$r5v2D$5$l$^$9!#(B</dd>
<dt>Allow,Deny</dt>
- <dd><directive module="mod_authz_host">Allow</directive>
+ <dd><directive module="mod_access">Allow</directive>
$B%G%#%l%/%F%#%V$,(B <directive
- module="mod_authz_host">Deny</directive>
+ module="mod_access">Deny</directive>
$B%G%#%l%/%F%#%V$NA0$KI>2A$5$l$^$9!#(B
$B%"%/%;%9$O%G%U%)%k%H$G5qH]$5$l$^$9!#(B<directive
- module="mod_authz_host">Allow</directive>
- $B%G%#%l%/%F%#%V$K9g$o$J$$$+!"(B<directive module="mod_authz_host">Deny</directive>
+ module="mod_access">Allow</directive>
+ $B%G%#%l%/%F%#%V$K9g$o$J$$$+!"(B<directive module="mod_access">Deny</directive>
$B%G%#%l%/%F%#%V$K9g$&%/%i%$%"%s%H$O%"%/%;%9$r5qH]$5$l$^$9!#(B
</dd>
<dt>Mutual-failure</dt>
- <dd><directive module="mod_authz_host">Allow</directive> $B$N%j%9%H$K8=$l$F!"(B
- <directive module="mod_authz_host">Deny</directive>
+ <dd><directive module="mod_access">Allow</directive> $B$N%j%9%H$K8=$l$F!"(B
+ <directive module="mod_access">Deny</directive>
$B$N%j%9%H$K8=$l$J$$%[%9%H$N$_$,%"%/%;%9$r5v2D$5$l$^$9!#(B
$B$3$N=gHVIU$1$O(B <code>Order Allow,Deny</code> $B$HF1$88z2L$r;}$A!"(B
$B$=$N@_Dj$NJ}$,9%$^$7$$$?$a$KHs?d>)$H$J$C$F$$$^$9!#(B</dd>
@@ -238,8 +235,8 @@
<p>$B%-!<%o!<%I$O%3%s%^$GJ,N%$9$k$3$H$@$1$,2DG=$G$9!#(B
$B4V$K6uGr$,$"$C$F$O$$$1$^$;$s!#$I$N>l9g$G$b!"(B<directive
- module="mod_authz_host">Allow</directive> $B$H(B
- <directive module="mod_authz_host">Deny</directive> $BJ8$O(B
+ module="mod_access">Allow</directive> $B$H(B
+ <directive module="mod_access">Deny</directive> $BJ8$O(B
$BA4$FI>2A$5$l$k$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#(B
</p>
@@ -247,11 +244,11 @@
$B%I%a%$%s$N$9$Y$F$N%[%9%H$O%"%/%;%9$r5v2D$5$l$^$9!#(B
$BB>$N$9$Y$F$N%[%9%H$O%"%/%;%9$r5qH]$5$l$^$9!#(B</p>
-<example>
+ <example>
Order Deny,Allow<br />
Deny from all<br />
- Allow from apache.org<br />
-</example>
+ Allow from apache.org
+ </example>
<p>$B<!$NNc$G$O!"(Bfoo.apache.org $B%5%V%I%a%$%s$K$"$k%[%9%H0J30$N!"(B
apache.org $B%I%a%$%s$N$9$Y$F$N%[%9%H$,%"%/%;%9$r5v2D$5$l$^$9!#(B
@@ -259,11 +256,11 @@
$B%I%a%$%s$G$J$$%[%9%H$O!"%G%U%)%k%H$N>uBV$,%"%/%;%95qH]$N$?$a!"(B
$B%5!<%P$X$N%"%/%;%9$r5qH]$5$l$^$9!#(B</p>
-<example>
- Order Allow,Deny<br />
- Allow from apache.org<br />
- Deny from foo.apache.org<br />
-</example>
+ <example>
+ Order Allow,Deny<br />
+ Allow from apache.org<br />
+ Deny from foo.apache.org
+ </example>
<p>$B0lJ}!">e$NNc$N(B <directive>Order</directive> $B$,(B <code>Deny,Allow</code>
$B$KJQ$o$C$F$$$l$P!"$9$Y$N%[%9%H$K%"%/%;%9$,5v2D$5$l$^$9!#(B
@@ -271,24 +268,26 @@
<code>Allow from apache.org</code> $B$,:G8e$KI>2A$5$l$F!"(B
<code>Deny from foo.apache.org</code> $B$r>e=q$-$9$k$+$i$G$9!#(B
<code>apache.org</code>
- $B%I%a%$%s$K$J$$%[%9%H$b!"%G%U%)%k%H$N>uBV$,(B <em>allow</em>
+ $B%I%a%$%s$K$J$$%[%9%H$b!"%G%U%)%k%H$N>uBV$,(B <var>allow</var>
$B$KJQ2=$9$k$?$a$K!"%"%/%;%9$r5v2D$5$l$^$9!#(B
</p>
<p><directive>Order</directive>
$B%G%#%l%/%F%#%V$O%G%U%)%k%H$N%"%/%;%9$N>uBV$K1F6A$rM?$($k$N$G!"(B
- <directive module="mod_authz_host">Allow</directive> $B%G%#%l%/%F%#%V$H(B
- <directive module="mod_authz_host">Deny</directive>
+ <directive module="mod_access">Allow</directive> $B%G%#%l%/%F%#%V$H(B
+ <directive module="mod_access">Deny</directive>
$B%G%#%l%/%F%#%V$,L5$/$F$b!"%5!<%P$N%"%/%;%9$K1F6A$rM?$($k$3$H$,$G$-$^$9!#(B
$B$?$H$($P!"(B</p>
-<example>
+ <example>
<Directory /www><br />
- Order Allow,Deny<br />
+ <indent>
+ Order Allow,Deny<br />
+ </indent>
</Directory>
-</example>
+ </example>
- <p>$B$O%G%U%)%k%H$N%"%/%;%9>uBV$,(B <em>deny</em> $B$K$J$k$?$a!"(B
+ <p>$B$O%G%U%)%k%H$N%"%/%;%9>uBV$,(B <var>deny</var> $B$K$J$k$?$a!"(B
<code>/www</code> $B%G%#%l%/%H%j$X$N$9$Y$F$N%"%/%;%9$r5qH]$7$^$9!#(B
</p>
@@ -297,18 +296,17 @@
$B%"%/%;%9%G%#%l%/%F%#%V$N=hM}$N=gHV$rJQ99$7$^$9!#$3$l$O!"$?$H$($P!"(B
<directive>Order</directive> $B%G%#%l%/%F%#%V$N@_Dj$K4X$o$i$:!"(B
<directive module="core" type="section">Location</directive> $B%;%/%7%g%s$N(B
- <directive module="mod_authz_host">Allow</directive> $B%G%#%l%/%F%#%V$d(B
- <directive module="mod_authz_host">Deny</directive> $B%G%#%l%/%F%#%V$O!"(B
+ <directive module="mod_access">Allow</directive> $B%G%#%l%/%F%#%V$d(B
+ <directive module="mod_access">Deny</directive> $B%G%#%l%/%F%#%V$O!"(B
<directive module="core" type="sectino">Directory</directive> $B%;%/%7%g%s$d(B
<code>.htaccess</code> $B%U%!%$%k$N(B <directive
- module="mod_authz_host">Allow</directive>
- $B%G%#%l%/%F%#%V$d(B <directive module="mod_authz_host">Deny</directive>
+ module="mod_access">Allow</directive>
+ $B%G%#%l%/%F%#%V$d(B <directive module="mod_access">Deny</directive>
$B%G%#%l%/%F%#%V$h$j$b>o$K8e$KI>2A$5$l$k$H$$$&$3$H$r0UL#$7$^$9!#(B
$B@_Dj%;%/%7%g%s$N%^!<%8$N>\:Y$K$D$$$F$O!"(B
<a href="../sections.html">Directory,Location, Files
$B%;%/%7%g%s$NF0:nJ}K!(B</a> $B$r;2>H$7$F$/$@$5$$!#(B</p>
</usage>
-
</directivesynopsis>
</modulesynopsis>
diff --git a/docs/manual/mod/mod_actions.html.en b/docs/manual/mod/mod_actions.html.en
index 0940907..b5c3cc7 100644
--- a/docs/manual/mod/mod_actions.html.en
+++ b/docs/manual/mod/mod_actions.html.en
@@ -4,28 +4,59 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_actions - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_actions</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>This module provides for executing CGI scripts based on
-media type or request method.</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>actions_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_actions.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_actions - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_actions</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>This module provides for executing CGI scripts based on
+media type or request method.</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>actions_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_actions.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module has two directives. The <code class="directive"><a href="#action">Action</a></code> directive lets you run CGI
scripts whenever a file of a certain type is requested. The
<code class="directive"><a href="#script">Script</a></code> directive lets
you run CGI scripts whenever a particular method is used in a
request. This makes it much easier to execute scripts that process
files.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#action">Action</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#action">Action</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#script">Script</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><a href="../howto/cgi.html">Dynamic Content with CGI</a></li><li><a href="../handler.html">Apache's Handler Use</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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Activates a CGI script for a particular handler or
-content-type</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Action <var>action-type</var> <var>cgi-script</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_actions</td></tr></table>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li>
+<li><a href="../howto/cgi.html">Dynamic Content with CGI</a></li>
+<li><a href="../handler.html">Apache's Handler Use</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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Activates a CGI script for a particular handler or
+content-type</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Action <var>action-type</var> <var>cgi-script</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_actions</td></tr>
+</table>
<p>This directive adds an action, which will activate
<var>cgi-script</var> when <var>action-type</var> is triggered by the
request. The <var>cgi-script</var> is the URL-path to a resource
@@ -51,13 +82,22 @@
<p>In the second example, requests for files with a file extension of
<code>.xyz</code> are handled instead by the specified cgi script
<code>/cgi-bin/program.cgi</code>.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</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="Script" id="Script">Script</a> <a name="script" id="script">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Activates a CGI script for a particular request
-method.</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Script <var>method</var> <var>cgi-script</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_actions</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</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="Script" id="Script">Script</a> <a name="script" id="script">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Activates a CGI script for a particular request
+method.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Script <var>method</var> <var>cgi-script</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_actions</td></tr>
+</table>
<p>This directive adds an action, which will activate
<var>cgi-script</var> when a file is requested using the method of
<var>method</var>. The <var>cgi-script</var> is the URL-path to a
@@ -87,4 +127,10 @@
# A CGI PUT handler<br />
Script PUT /~bob/put.cgi<br />
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_actions.html.ja.jis b/docs/manual/mod/mod_actions.html.ja.jis
index af1706d..d24f2b2 100644
--- a/docs/manual/mod/mod_actions.html.ja.jis
+++ b/docs/manual/mod/mod_actions.html.ja.jis
@@ -4,30 +4,61 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_actions - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_actions</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%a%G%#%"%?%$%W$d%j%/%(%9%H%a%=(B$B%C%I$K1~$8$F(B
-CGI $B%9%/%j%W%H$r<B9T$9$k5!G=$rDs6!(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>actions_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_actions.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_actions - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_actions</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%a%G%#%"%?%$%W$d%j%/%(%9%H%a%=%C%I$K1~$8$F(B
+CGI $B%9%/%j%W%H$r<B9T$9$k5!G=$rDs6!(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>actions_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_actions.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$B$3$N%b%8%e!<%k$K$OFs$D$N%G%#%l%/%F%#%V$,$"$j$^$9!#(B<code class="directive"><a href="#action">Action</a></code>
$B%G%#%l%/%F%#%V$OFCDj$N%?%$%W$N%U%!%$%k$r%j%/%(%9%H$5$l$?>l9g$K(B
CGI $B%9%/%j%W%H$,<B9T$5$l$k$h$&$K$7$^$9!#(B<code class="directive"><a href="#script">Script</a></code>
$B%G%#%l%/%F%#%V$O%j%/%(%9%H$GFCDj$N%a%=%C%I$,;HMQ$5$l$?$H$-$K(B CGI
- $B%9%/%j%W%H$,<B9T$5$l$k$h(B$B$&$K$7$^$9!#(B
+ $B%9%/%j%W%H$,<B9T$5$l$k$h$&$K$7$^$9!#(B
$B$3$l$O%U%!%$%k$r=hM}$9$k%9%/%j%W%H$N<B9T$r$:$C$H4JC1$K$7$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#action">Action</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#action">Action</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#script">Script</a></li>
-</ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><a href="../howto/cgi.html">CGI $B$K$h$kF0E*%3%s%F%s%D(B</a></li><li><a href="../handler.html">Apache $B$N%O%s%I%i$N;HMQ(B</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$BFCDj$N%O%s%I%i$d%3%s%F%s%H%?%$%W$KBP$7$F(B CGI $B$r<B9T$9$k$h$&$K(B
-$B@_(B$BDj(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>Action <var>action-type</var> <var>cgi-script</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_actions</td></tr></table>
+</ul>
+<h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li>
+<li><a href="../howto/cgi.html">CGI $B$K$h$kF0E*%3%s%F%s%D(B</a></li>
+<li><a href="../handler.html">Apache $B$N%O%s%I%i$N;HMQ(B</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BFCDj$N%O%s%I%i$d%3%s%F%s%H%?%$%W$KBP$7$F(B CGI $B$r<B9T$9$k$h$&$K(B
+$B@_Dj(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>Action <var>action-type</var> <var>cgi-script</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_actions</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O(B <var>action-type</var>
- $B$,%j%/%(%9%H$5(B$B$l$?$H$-$K(B <var>cgi-script</var>
+ $B$,%j%/%(%9%H$5$l$?$H$-$K(B <var>cgi-script</var>
$B$,<B9T$5$l$k$H$$$&F0:n$rDI2C$7$^$9!#(B<var>cgi-script</var> $B$O(B
<code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> $B$d(B
<code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> $B$K$h$C$F(B
@@ -54,13 +85,22 @@
<p>2 $BHVL\$NNc$G$O!"3HD%;R$,(B <code>.xyz</code> $B$N%U%!%$%k$X$N%j%/%(%9%H$O!"(B
$B$=$N%U%!%$%k$NBe$o$j$K;XDj$5$l$?%9%/%j%W%H(B
<code>/cgi-bin/program.cgi</code> $B$,8F$P$l$^$9!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</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="Script" id="Script">Script</a> <a name="script" id="script">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$BFCDj$N%j%/%(%9%H%a%=%C%I$KBP$7$F(B CGI $B%9%/%j%W%H$r(B
-$B<B9T$9$k$h$&$K@_Dj(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>Script <var>method</var> <var>cgi-script</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_actions</td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</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="Script" id="Script">Script</a> <a name="script" id="script">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BFCDj$N%j%/%(%9%H%a%=%C%I$KBP$7$F(B CGI $B%9%/%j%W%H$r(B
+$B<B9T$9$k$h$&$K@_Dj(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>Script <var>method</var> <var>cgi-script</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_actions</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O(B <var>method</var>
$B$H$$$&%a%=%C%I$r;H$C$F%j%/%(%9%H$,9T$J$o$l$?$H$-$K(B
<var>cgi-script</var> $B$r<B9T$9$k$H$$$&F0:n$rDI2C$7$^$9!#(B
@@ -92,4 +132,10 @@
# A CGI PUT handler<br />
Script PUT /~bob/put.cgi<br />
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index 5f31999..1d6b5c5 100644
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_alias - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_alias</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Provides for mapping different parts of the host
- filesystem in the document tree and for URL redirection</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>alias_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_alias.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_alias - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_alias</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Provides for mapping different parts of the host
+ filesystem in the document tree and for URL redirection</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>alias_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_alias.c</td></tr></table>
+<h3>Summary</h3>
+
<p>The directives contained in this module allow for manipulation
and control of URLs as requests arrive at the server. The
<code class="directive"><a href="#alias">Alias</a></code> and <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> directives are used to
@@ -23,7 +40,10 @@
directives are used to instruct clients to make a new request with
a different URL. They are often used when a resource has moved to
a new location.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#alias">Alias</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#alias">Alias</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#aliasmatch">AliasMatch</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#redirect">Redirect</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#redirectmatch">RedirectMatch</a></li>
@@ -31,13 +51,23 @@
<li><img alt="" src="../images/down.gif" /> <a href="#redirecttemp">RedirectTemp</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#scriptalias">ScriptAlias</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#scriptaliasmatch">ScriptAliasMatch</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code></li><li><a href="../urlmapping.html">Mapping URLs to the filesystem</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="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><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Alias <var>URL-path</var>
-<var>file-path</var>|<var>directory-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_alias</td></tr></table>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code></li>
+<li><a href="../urlmapping.html">Mapping URLs to the filesystem</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="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>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Alias <var>URL-path</var>
+<var>file-path</var>|<var>directory-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_alias</td></tr>
+</table>
<p>The <code class="directive">Alias</code> directive allows documents to
be stored in the local filesystem other than under the
@@ -66,14 +96,19 @@
sections are run through once before aliases are performed, so
they will apply.)</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AliasMatch" id="AliasMatch">AliasMatch</a> <a name="aliasmatch" id="aliasmatch">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maps URLs to filesystem locations using regular
-expressions</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-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_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AliasMatch" id="AliasMatch">AliasMatch</a> <a name="aliasmatch" id="aliasmatch">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps URLs to filesystem locations using regular
+expressions</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-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_alias</td></tr>
+</table>
<p>This directive is equivalent to <code class="directive"><a href="#alias">Alias</a></code>, but makes use of standard
regular expressions, instead of simple prefix matching. The
supplied regular expression is matched against the URL-path, and
@@ -85,15 +120,20 @@
<div class="example"><p><code>
AliasMatch ^/icons(.*) /usr/local/apache/icons$1
</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="Redirect" id="Redirect">Redirect</a> <a name="redirect" id="redirect">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sends an external redirect asking the client to fetch
-a different URL</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Redirect [<var>status</var>] <var>URL-path</var>
-<var>URL</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_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Redirect" id="Redirect">Redirect</a> <a name="redirect" id="redirect">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sends an external redirect asking the client to fetch
+a different URL</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Redirect [<var>status</var>] <var>URL-path</var>
+<var>URL</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_alias</td></tr>
+</table>
<p>The Redirect directive maps an old URL into a new one. The
new URL is returned to the client which attempts to fetch it
again with the new address. <var>URL-path</var> a (%-decoded)
@@ -156,15 +196,20 @@
Redirect 303 /three http://example.com/other
</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="RedirectMatch" id="RedirectMatch">RedirectMatch</a> <a name="redirectmatch" id="redirectmatch">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sends an external redirect based on a regular expression match
-of the current URL</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RedirectMatch [<var>status</var>] <var>regex</var>
-<var>URL</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_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RedirectMatch" id="RedirectMatch">RedirectMatch</a> <a name="redirectmatch" id="redirectmatch">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sends an external redirect based on a regular expression match
+of the current URL</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RedirectMatch [<var>status</var>] <var>regex</var>
+<var>URL</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_alias</td></tr>
+</table>
<p>This directive is equivalent to <code class="directive"><a href="#redirect">Redirect</a></code>, but makes use of standard
regular expressions, instead of simple prefix matching. The
supplied regular expression is matched against the URL-path, and
@@ -176,36 +221,51 @@
<div class="example"><p><code>
RedirectMatch (.*)\.gif$ http://www.anotherserver.com$1.jpg
</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="RedirectPermanent" id="RedirectPermanent">RedirectPermanent</a> <a name="redirectpermanent" id="redirectpermanent">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sends an external permanent redirect asking the client to fetch
-a different URL</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RedirectPermanent <var>URL-path</var> <var>URL</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_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RedirectPermanent" id="RedirectPermanent">RedirectPermanent</a> <a name="redirectpermanent" id="redirectpermanent">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sends an external permanent redirect asking the client to fetch
+a different URL</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RedirectPermanent <var>URL-path</var> <var>URL</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_alias</td></tr>
+</table>
<p>This directive makes the client know that the Redirect is
permanent (status 301). Exactly equivalent to <code>Redirect
permanent</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="RedirectTemp" id="RedirectTemp">RedirectTemp</a> <a name="redirecttemp" id="redirecttemp">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sends an external temporary redirect asking the client to fetch
-a different URL</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RedirectTemp <var>URL-path</var> <var>URL</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_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RedirectTemp" id="RedirectTemp">RedirectTemp</a> <a name="redirecttemp" id="redirecttemp">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sends an external temporary redirect asking the client to fetch
+a different URL</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RedirectTemp <var>URL-path</var> <var>URL</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_alias</td></tr>
+</table>
<p>This directive makes the client know that the Redirect is
only temporary (status 302). Exactly equivalent to
<code>Redirect temp</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="ScriptAlias" id="ScriptAlias">ScriptAlias</a> <a name="scriptalias" id="scriptalias">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maps a URL to a filesystem location and designates the
-target as a CGI script</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ScriptAlias <var>URL-path</var>
-<var>file-path</var>|<var>directory-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_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptAlias" id="ScriptAlias">ScriptAlias</a> <a name="scriptalias" id="scriptalias">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps a URL to a filesystem location and designates the
+target as a CGI script</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptAlias <var>URL-path</var>
+<var>file-path</var>|<var>directory-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_alias</td></tr>
+</table>
<p>The <code class="directive">ScriptAlias</code> directive has the same
behavior as the <code class="directive"><a href="#alias">Alias</a></code>
directive, except that in addition it marks the target directory
@@ -220,14 +280,19 @@
<p>A request for <code>http://myserver/cgi-bin/foo</code> would cause the
server to run the script <code>/web/cgi-bin/foo</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="ScriptAliasMatch" id="ScriptAliasMatch">ScriptAliasMatch</a> <a name="scriptaliasmatch" id="scriptaliasmatch">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maps a URL to a filesystem location using a regular expression
-and designates the target as a CGI script</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ScriptAliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-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_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptAliasMatch" id="ScriptAliasMatch">ScriptAliasMatch</a> <a name="scriptaliasmatch" id="scriptaliasmatch">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps a URL to a filesystem location using a regular expression
+and designates the target as a CGI script</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptAliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-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_alias</td></tr>
+</table>
<p>This directive is equivalent to <code class="directive"><a href="#scriptalias">ScriptAlias</a></code>, but makes use of standard
regular expressions, instead of simple prefix matching. The
supplied regular expression is matched against the URL-path,
@@ -239,4 +304,10 @@
<div class="example"><p><code>
ScriptAliasMatch ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_alias.html.ja.jis b/docs/manual/mod/mod_alias.html.ja.jis
index 3a1071d..fa1172f 100644
--- a/docs/manual/mod/mod_alias.html.ja.jis
+++ b/docs/manual/mod/mod_alias.html.ja.jis
@@ -4,30 +4,50 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_alias - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_alias</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%[%9%H%U%!%$%k%7%9%F%`>e$N$$$m$$$m$J0c(B$B$&>l=j$r(B
+ -->
+<title>mod_alias - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_alias</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%[%9%H%U%!%$%k%7%9%F%`>e$N$$$m$$$m$J0c$&>l=j$r(B
$B%I%-%e%a%s%H%D%j!<$K%^%C%W$9$k5!G=$H!"(B
- URL $B$N%j%@%$%l%/%H$r9T$J$&5!G=$rDs6!$9$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>alias_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_alias.c</td></tr></table><h3>$B35MW(B</h3>
- <p>$B$3$N%b%8(B$B%e!<%k$N%G%#%l%/%F%#%V$O%5!<%P$K%j%/%(%9%H$,E~Ce$7$?$H$-$K(B
+ URL $B$N%j%@%$%l%/%H$r9T$J$&5!G=$rDs6!$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>alias_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_alias.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
+ <p>$B$3$N%b%8%e!<%k$N%G%#%l%/%F%#%V$O%5!<%P$K%j%/%(%9%H$,E~Ce$7$?$H$-$K(B
URL $B$NA`:n$d@)8f$r$9$k$3$H$r2DG=$K$7$^$9!#(B<code class="directive"><a href="#alias">Alias</a></code>
$B%G%#%l%/%F%#%V$H(B <code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
$B%G%#%l%/%F%#%V$O(B
- URL $B$H%U%!%$%k%7%9%F%`$N%Q%9$r%^%C%W$9$k$?(B$B$a$K;HMQ$5$l$^$9!#$3$l$O(B
+ URL $B$H%U%!%$%k%7%9%F%`$N%Q%9$r%^%C%W$9$k$?$a$K;HMQ$5$l$^$9!#$3$l$O(B
<code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
$B$N2<$K$J$$%I%-%e%a%s%H$r%&%'%V$N%I%-%e%a%s%H%D%j!<$N0lIt$H$7$F(B
$BAw$i$l$k$h$&$K$7$^$9!#(B<code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
$B%G%#%l%/%F%#%V$K$O%^%C%W@h$N%G%#%l%/%H%j$,(B CGI
- $B%9(B$B%/%j%W%H$N$_$G$"$k$3$H$r<($9$H$$$&DI2C$N8z2L$,$"$j$^$9!#(B
+ $B%9%/%j%W%H$N$_$G$"$k$3$H$r<($9$H$$$&DI2C$N8z2L$,$"$j$^$9!#(B
</p>
<p><code class="directive"><a href="#redirect">Redirect</a></code> $B%G%#%l%/%F%#%V$O(B
$B%/%i%$%"%s%H$K0c$C$?(B
URL $B$K?7$7$$%j%/%(%9%H$rAw$k$h$&$K;X<($7$^$9!#$3$l$O!"(B
- $B%j%=!<%9$,?7$7$$>l=j$K0\F0$7$?$H$-$K(B$B$h$/;HMQ$5$l$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#alias">Alias</a></li>
+ $B%j%=!<%9$,?7$7$$>l=j$K0\F0$7$?$H$-$K$h$/;HMQ$5$l$^$9!#(B</p>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#alias">Alias</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#aliasmatch">AliasMatch</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#redirect">Redirect</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#redirectmatch">RedirectMatch</a></li>
@@ -35,13 +55,23 @@
<li><img alt="" src="../images/down.gif" /> <a href="#redirecttemp">RedirectTemp</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#scriptalias">ScriptAlias</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#scriptaliasmatch">ScriptAliasMatch</a></li>
-</ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code></li><li><a href="../urlmapping.html">URL $B$+$i%U%!%$%k%7%9%F%`>e$N0LCV$X$N%^%C%T%s%0(B</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="Alias" id="Alias">Alias</a> <a name="alias" id="alias">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>URL $B$r%U%!%$%k%7%9%F%`$N0LCV$K%^%C%W$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>Alias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_alias</td></tr></table>
+</ul>
+<h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code></li>
+<li><a href="../urlmapping.html">URL $B$+$i%U%!%$%k%7%9%F%`>e$N0LCV$X$N%^%C%T%s%0(B</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="Alias" id="Alias">Alias</a> <a name="alias" id="alias">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>URL $B$r%U%!%$%k%7%9%F%`$N0LCV$K%^%C%W$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>Alias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_alias</td></tr>
+</table>
<p><code class="directive">Alias</code> $B%G%#%l%/%F%#%V$O%I%-%e%a%s%H$r(B
$B%m!<%+%k%U%!%$%k%7%9%F%`$N(B
<code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
@@ -58,7 +88,7 @@
$B%U%!%$%k(B /ftp/pub/image/foo.gif $B$rJV$7$^$9!#(B</p>
<p>$B$b$7(B <var>url-path</var> $B$N:G8e$K(B /
- $B$r=q$$$?$J$i!"%5!<%P$O%(%$%j%"%9$rE83+(B$B$9$k$?$a$K:G8e$N(B /
+ $B$r=q$$$?$J$i!"%5!<%P$O%(%$%j%"%9$rE83+$9$k$?$a$K:G8e$N(B /
$B$rMW5a$9$k$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#$9$J$o$A!"(B<code>Alias /icons/
/usr/local/apache/icons/</code> $B$H$$$&$b$N$r;HMQ$7$F$$$k$H!"(B
<code>/icons</code> $B$H$$$&(B url $B$O%(%$%j%"%9$5$l$^$;$s!#(B</p>
@@ -73,15 +103,20 @@
$B%;%/%7%g%s$O%(%$%j%"%9$,=hM}$5$l$kA0$K<B9T$5$l$^$9$N$G!"(B
$B$3$A$i$OE,MQ$5$l$^$9!#(B)</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AliasMatch" id="AliasMatch">AliasMatch</a> <a name="aliasmatch" id="aliasmatch">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B@55,I=8=$r;H$C$F(B URL $B$r%U%!%$%k%7%9%F%`$N0LCV$K%^%C%W$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AliasMatch" id="AliasMatch">AliasMatch</a> <a name="aliasmatch" id="aliasmatch">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B@55,I=8=$r;H$C$F(B URL $B$r%U%!%$%k%7%9%F%`$N0LCV$K%^%C%W$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_alias</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O(B <code class="directive"><a href="#alias">Alias</a></code>
- $B$H$[$H$s(B$B$IF1$8$G$9$,!"4JC1$J@hF,$+$i$N%^%C%A$r9T$J$&$N$G$O$J$/!"(B
+ $B$H$[$H$s$IF1$8$G$9$,!"4JC1$J@hF,$+$i$N%^%C%A$r9T$J$&$N$G$O$J$/!"(B
$BI8=`@55,I=8=$rMxMQ$7$^$9!#$3$3$G;XDj$5$l$?@55,I=8=$H(B URL $B$N%Q%9(B
$B$,9g$&$+$I$&$+$rD4$Y!"9g$&>l9g$O3g8L$G3g$i$l$?%^%C%A$r(B
$BM?$($i$l$?J8;zNs$GCV$-49$(!"$=$l$r%U%!%$%kL>$H$7$F;HMQ$7$^$9!#$?$H$($P!"(B
@@ -91,15 +126,20 @@
<div class="example"><p><code>
AliasMatch ^/icons(.*) /usr/local/apache/icons$1
</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="Redirect" id="Redirect">Redirect</a> <a name="redirect" id="redirect">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%/%i%$%"%s%H$,0c$&(B URL $B$r<hF@$9$k$h$&$K30It$X$N%j%@%$%l%/%H$r(B
-$BAw$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>Redirect [<var>status</var>] <var>URL-path</var>
-<var>URL</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Redirect" id="Redirect">Redirect</a> <a name="redirect" id="redirect">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%/%i%$%"%s%H$,0c$&(B URL $B$r<hF@$9$k$h$&$K30It$X$N%j%@%$%l%/%H$r(B
+$BAw$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>Redirect [<var>status</var>] <var>URL-path</var>
+<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_alias</td></tr>
+</table>
<p>Redirect $B%G%#%l%/%F%#%V$O8E$$(B URL $B$r?7$7$$$b$N$X%^%C%W$7$^$9!#(B
$B?7$7$$(B URL $B$,%/%i%$%"%s%H$KJV$5$l$^$9!#$=$7$F!"(B
$B%/%i%$%"%s%H$O?7$7$$%"%I%l%9$r$b$&0l2s<hF@$7$h$&$H$7$^$9!#(B
@@ -164,15 +204,20 @@
Redirect 303 /three http://example.com/other
</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="RedirectMatch" id="RedirectMatch">RedirectMatch</a> <a name="redirectmatch" id="redirectmatch">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B8=:_$N(B URL $B$X$N@55,I=8=$N%^%C%A$K$h$j(B
-$B30It$X$N%j%@%$%l%/%H$rAw$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>RedirectMatch [<var>status</var>] <var>regex</var>
-<var>URL</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RedirectMatch" id="RedirectMatch">RedirectMatch</a> <a name="redirectmatch" id="redirectmatch">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B8=:_$N(B URL $B$X$N@55,I=8=$N%^%C%A$K$h$j(B
+$B30It$X$N%j%@%$%l%/%H$rAw$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>RedirectMatch [<var>status</var>] <var>regex</var>
+<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_alias</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O(B <code class="directive"><a href="#redirect">Redirect</a></code>
$B$H$[$H$s$IF1$8$G$9$,!"4JC1$J@hF,$+$i$N%^%C%A$r9T$J$&$N$G$O$J$/!"(B
$BI8=`@55,I=8=$rMxMQ$7$^$9!#$3$3$G;XDj$5$l$?@55,I=8=$H(B URL-path
@@ -185,36 +230,51 @@
<div class="example"><p><code>
RedirectMatch (.*)\.gif$ http://www.anotherserver.com$1.jpg
</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="RedirectPermanent" id="RedirectPermanent">RedirectPermanent</a> <a name="redirectpermanent" id="redirectpermanent">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%/%i%$%"%s%H$,0c$&(B URL $B$r<hF@$9$k$h$&$K30It$X$N1J5WE*$J(B
-$B%j%@%$%l%/%H$rAw$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>RedirectPermanent <var>URL-path</var> <var>URL</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RedirectPermanent" id="RedirectPermanent">RedirectPermanent</a> <a name="redirectpermanent" id="redirectpermanent">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%/%i%$%"%s%H$,0c$&(B URL $B$r<hF@$9$k$h$&$K30It$X$N1J5WE*$J(B
+$B%j%@%$%l%/%H$rAw$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>RedirectPermanent <var>URL-path</var> <var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_alias</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O%/%i%$%"%s%H$K(B Redirect $B$,1J5WE*$J$b$N(B
($B%9%F!<%?%9(B 301) $B$G$"$k$3$H$rCN$i$;$^$9!#(B
<code>Redirect premanent</code> $B$H$^$C$?$/F1$8$G$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RedirectTemp" id="RedirectTemp">RedirectTemp</a> <a name="redirecttemp" id="redirecttemp">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%/%i%$%"%s%H$,0c$&(B URL $B$r<hF@$9$k$h$&$K30It$X$N0l;~E*$J(B
-$B%j%@%$%l%/%H$rAw$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>RedirectTemp <var>URL-path</var> <var>URL</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RedirectTemp" id="RedirectTemp">RedirectTemp</a> <a name="redirecttemp" id="redirecttemp">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%/%i%$%"%s%H$,0c$&(B URL $B$r<hF@$9$k$h$&$K30It$X$N0l;~E*$J(B
+$B%j%@%$%l%/%H$rAw$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>RedirectTemp <var>URL-path</var> <var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_alias</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O%/%i%$%"%s%H$K(B Redirect
$B$,0l;~E*$J$b$N$G$"$k(B ($B%9%F!<%?%9(B 302) $B$3$H$rCN$i$;$^$9!#(B
<code>Redirect temp</code> $B$H$^$C$?$/F1$8$G$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ScriptAlias" id="ScriptAlias">ScriptAlias</a> <a name="scriptalias" id="scriptalias">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>URL $B$r%U%!%$%k%7%9%F%`$N0LCV$X%^%C%W$7!"%^%C%W@h$r(B
-CGI $B%9%/%j%W%H$K;XDj(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ScriptAlias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptAlias" id="ScriptAlias">ScriptAlias</a> <a name="scriptalias" id="scriptalias">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>URL $B$r%U%!%$%k%7%9%F%`$N0LCV$X%^%C%W$7!"%^%C%W@h$r(B
+CGI $B%9%/%j%W%H$K;XDj(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ScriptAlias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_alias</td></tr>
+</table>
<p><code class="directive">ScriptAlias</code> $B%G%#%l%/%F%#%V$O!"BP>]%G%#%l%/%H%j$K(B
<code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> $B$N(B cgi-script
$B%O%s%I%i$G=hM}$5$l$k(B CGI
@@ -232,14 +292,19 @@
<p><code>http://myserver/cgi-bin/foo</code>
$B$X$N%j%/%(%9%H$KBP$7$F%5!<%P$O%9%/%j%W%H(B
<code>/web/cgi-bin/foo</code> $B$r<B9T$7$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ScriptAliasMatch" id="ScriptAliasMatch">ScriptAliasMatch</a> <a name="scriptaliasmatch" id="scriptaliasmatch">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>URL $B$r@55,I=8=$r;H$C$F%U%!%$%k%7%9%F%`$N0LCV$X%^%C%W$7!"%^%C%W@h$r(B
-CGI $B%9%/%j%W%H$K;XDj(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ScriptAliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_alias</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptAliasMatch" id="ScriptAliasMatch">ScriptAliasMatch</a> <a name="scriptaliasmatch" id="scriptaliasmatch">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>URL $B$r@55,I=8=$r;H$C$F%U%!%$%k%7%9%F%`$N0LCV$X%^%C%W$7!"%^%C%W@h$r(B
+CGI $B%9%/%j%W%H$K;XDj(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ScriptAliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_alias</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O(B <code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
$B$H$[$H$s$IF1$8$G$9$,!"4JC1$J@hF,$+$i$N%^%C%A$r9T$J$&$N$G$O$J$/!"(B
$BI8=`@55,I=8=$rMxMQ$7$^$9!#$3$3$G;XDj$5$l$?@55,I=8=$H(B URL-path
@@ -252,4 +317,10 @@
<div class="example"><p><code>
ScriptAliasMatch ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_asis.html.en b/docs/manual/mod/mod_asis.html.en
index 5f06528..4601cbf 100644
--- a/docs/manual/mod/mod_asis.html.en
+++ b/docs/manual/mod/mod_asis.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_asis - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_asis</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Sends files that contain their own
-HTTP headers</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>asis_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_asis.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_asis - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_asis</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Sends files that contain their own
+HTTP headers</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>asis_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_asis.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module provides the handler <code>send-as-is</code>
which causes Apache to send the document without adding most of
the usual HTTP headers.</p>
@@ -20,7 +37,21 @@
<p>For historical reasons, this module will also process any
file with the mime type <code>httpd/send-as-is</code>.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><p>This module provides no directives.</p><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#usage">Usage</a></li></ul><h3>See also</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="../mod/mod_cern_meta.html">mod_cern_meta</a></code></li><li><a href="../handler.html">Apache's Handler Use</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="usage" id="usage">Usage</a></h2>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<p>This module provides no directives.</p>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#usage">Usage</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code></li>
+<li><code class="module"><a href="../mod/mod_cern_meta.html">mod_cern_meta</a></code></li>
+<li><a href="../handler.html">Apache's Handler Use</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="usage" id="usage">Usage</a></h2>
<p>In the server configuration file, associate files with the
<code>send-as-is</code> handler <em>e.g.</em></p>
@@ -63,4 +94,9 @@
included in the file. The server does <em>not</em> add a
<code>Last-Modified</code> header; it probably should.</p>
</div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_asis.html.ja.jis b/docs/manual/mod/mod_asis.html.ja.jis
index 269d0c4..2a8e80d 100644
--- a/docs/manual/mod/mod_asis.html.ja.jis
+++ b/docs/manual/mod/mod_asis.html.ja.jis
@@ -4,22 +4,53 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_asis - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_asis</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B<+J,MQ$N(B HTTP $B%X%C%@$N=q$+$l$F$$$k(B$B%U%!%$%k$rAw?.$9$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>asis_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_asis.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_asis - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_asis</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B<+J,MQ$N(B HTTP $B%X%C%@$N=q$+$l$F$$$k%U%!%$%k$rAw?.$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>asis_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_asis.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$B$3$N%b%8%e!<%k$O%O%s%I%i(B <code>send-as-is</code>
$B$rDs6!$7$^$9!#$3$N%O%s%I%i$ODL>o$N(B HTTP
$B%X%C%@$r$[$H$s$IDI2C$9$k$3$H$J$/%I%-%e%a%s%H$rAw?.$7$^$9!#(B</p>
<p>$B$3$l$O%5!<%P$+$i$I$s$J<oN`$N%G!<%?$rAw$k$H$-$K$b;HMQ$G$-$^$9!#(B
Cgi $B%9%/%j%W%H$d(B nph $B%9%/%j%W%H$,L5$/$F$b%j%@%$%l%/%H$dB>$NFCJL$J(B
- HTTP $B1~Ez$rAw$k$3$H(B$B$,$G$-$^$9!#(B</p>
+ HTTP $B1~Ez$rAw$k$3$H$,$G$-$^$9!#(B</p>
<p>$BNr;KE*$JM}M3$K$h$j!"$3$N%b%8%e!<%k$O(B mime $B%?%$%W(B
<code>httpd/send-as-is</code> $B$N%U%!%$%k$b=hM}$7$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><p>$B$3$N%b%8%e!<%k$K%G%#%l%/%F%#%V$O$"$j$^$;$s!#(B</p><h3>$B%H%T%C%/(B</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#usage">$B;HMQK!(B</a></li></ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="../mod/mod_cern_meta.html">mod_cern_meta</a></code></li><li><a href="../handler.html">Apache $B$N%O%s%I%i$N;HMQ(B</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="usage" id="usage">$B;HMQK!(B</a></h2>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<p>$B$3$N%b%8%e!<%k$K%G%#%l%/%F%#%V$O$"$j$^$;$s!#(B</p>
+<h3>$B%H%T%C%/(B</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#usage">$B;HMQK!(B</a></li>
+</ul><h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code></li>
+<li><code class="module"><a href="../mod/mod_cern_meta.html">mod_cern_meta</a></code></li>
+<li><a href="../handler.html">Apache $B$N%O%s%I%i$N;HMQ(B</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="usage" id="usage">$B;HMQK!(B</a></h2>
<p>$B%5!<%P@_Dj%U%!%$%k$G!"%U%!%$%k$H(B <code>send-as-is</code>
$B%O%s%I%i$rNc$($P0J2<$N$h$&$K4XO"IU$1$F$/$@$5$$!#(B</p>
@@ -62,4 +93,9 @@
$B%5!<%P$O(B <code>Last-Modified</code> $B%X%C%@$rDI2C(B<em>$B$7$^$;$s(B</em>$B!#(B
$B$*$=$i$/$O$=$&$9$Y$-$G$7$g$&$1$l$I!#(B</p>
</div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth.html.en b/docs/manual/mod/mod_auth.html.en
new file mode 100644
index 0000000..24b49a5
--- /dev/null
+++ b/docs/manual/mod/mod_auth.html.en
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mod_auth - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_auth</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>User authentication using text files</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>auth_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_auth.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available only in versions prior to 2.1</td></tr></table>
+<h3>Summary</h3>
+
+ <p>This module allows the use of HTTP Basic Authentication to
+ restrict access by looking up users in plain text password and
+ group files. Similar functionality and greater scalability is
+ provided by <code class="module"><a href="../mod/mod_auth_dbm.html">mod_auth_dbm</a></code>. HTTP Digest
+ Authentication is provided by <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>.</p>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authauthoritative">AuthAuthoritative</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authgroupfile">AuthGroupFile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authuserfile">AuthUserFile</a></li>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<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>
+<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></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthAuthoritative" id="AuthAuthoritative">AuthAuthoritative</a> <a name="authauthoritative" id="authauthoritative">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 lower level modules</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthAuthoritative On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthAuthoritative 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>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth</td></tr>
+</table>
+ <p>Setting the <code class="directive">AuthAuthoritative</code> directive
+ explicitly to <code>Off</code> allows for both authentication and
+ authorization to be passed on to lower level modules (as defined in the
+ <code>modules.c</code> files) if there is <strong>no userID</strong>
+ or <strong>rule</strong> matching the supplied userID. If there is a
+ userID and/or rule specified; the usual password and access checks
+ will be applied and a failure will give an "Authentication Required"
+ reply.</p>
+
+ <p>So if a userID appears in the database of more than one module;
+ or if a valid <code class="directive"><a href="../mod/core.html#require">Require</a></code>
+ directive applies to more than one module; then the first module
+ will verify the credentials; and no access is passed on;
+ regardless of the <code class="directive">AuthAuthoritative</code> setting.</p>
+
+ <p>A common use for this is in conjunction with one of the
+ database modules; such as <code class="module"><a href="../mod/mod_auth_dbm.html">mod_auth_dbm</a></code>,
+ <code>mod_auth_msql</code>, and <code class="module"><a href="../mod/mod_auth_anon.html">mod_auth_anon</a></code>.
+ These modules supply the bulk of the user credential checking; but
+ a few (administrator) related accesses fall through to a lower
+ level with a well protected <code class="directive"><a href="#authuserfile">AuthUserFile</a></code>.</p>
+
+ <p>By default control is not passed on and an unknown userID or
+ rule will result in an "Authentication Required" reply. Not setting
+ it thus keeps the system secure and forces an NCSA compliant
+ behaviour.</p>
+
+ <div class="warning"><h3>Security</h3>
+ <p>Do consider the implications of allowing a user to allow
+ fall-through in his .htaccess file; and verify that this is really
+ what you want; Generally it is easier to just secure a single
+ .htpasswd file, than it is to secure a database such as mSQL.
+ Make sure that the <code class="directive"><a href="#authuserfile">AuthUserFile</a></code> and the <code class="directive"><a href="#authgroupfile">AuthGroupFile</a></code> are stored outside the document tree of
+ the web-server; do <em>not</em> put them in the directory that they
+ protect. Otherwise, clients will be able to download the <code class="directive"><a href="#authuserfile">AuthUserFile</a></code> and the <code class="directive"><a href="#authgroupfile">AuthGroupFile</a></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="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
+of user groups for authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthGroupFile <var>file-path</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#Override">Override:</a></th><td>AuthConfig</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_auth</td></tr>
+</table>
+ <p>The <code class="directive">AuthGroupFile</code> directive sets the
+ name of a textual file containing the list of user groups for user
+ authentication. <var>File-path</var> is the path to the group
+ file. If it is not absolute, it is treated as relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</p>
+
+ <p>Each line of the group file contains a groupname followed by a
+ colon, followed by the member usernames separated by spaces.</p>
+
+ <div class="example"><h3>Example:</h3><p><code>
+ mygroup: bob joe anne
+ </code></p></div>
+
+ <p>Note that searching large text files is <em>very</em>
+ inefficient; <code class="directive"><a href="../mod/mod_auth_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code> provides a much better performance.</p>
+
+ <div class="warning"><h3>Security</h3>
+ <p>Make sure that the <code class="directive">AuthGroupFile</code> is
+ stored outside the document tree of the web-server; do <em>not</em>
+ put it in the directory that it protects. Otherwise, clients may
+ be able to download the <code class="directive">AuthGroupFile</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="AuthUserFile" id="AuthUserFile">AuthUserFile</a> <a name="authuserfile" id="authuserfile">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 of users and
+passwords for authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthUserFile <var>file-path</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#Override">Override:</a></th><td>AuthConfig</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_auth</td></tr>
+</table>
+ <p>The <code class="directive">AuthUserFile</code> directive sets the name
+ of a textual file containing the list of users and passwords for
+ user authentication. <var>File-path</var> is the path to the user
+ file. If it is not absolute (<em>i.e.</em>, if it doesn't begin
+ with a slash), it is treated as relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</p>
+
+ <p>Each line of the user file contains a username followed by
+ a colon, followed by the encrypted password. If the same user
+ ID is defined multiple times, <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code> will
+ use the first occurrence to verify the password.</p>
+
+ <p>The utility <a href="../programs/htpasswd.html">htpasswd</a>
+ which is installed as part of the binary distribution, or which
+ can be found in <code>src/support</code>, is used to maintain
+ this password file. See the <a href="../programs/htpasswd.html">man
+ page</a> for more details. In short:</p>
+
+ <p>Create a password file <code>Filename</code> with
+ <code>username</code> as the initial ID. It will prompt for the
+ password:</p>
+
+ <div class="example"><p><code>
+ htpasswd -c Filename username
+ </code></p></div>
+
+ <p>Add or modify <code>username2</code> in the password file
+ <code>Filename</code>:</p>
+
+ <div class="example"><p><code>
+ htpasswd Filename username2
+ </code></p></div>
+
+ <p>Note that searching large text files is <em>very</em>
+ inefficient; <code class="directive"><a href="../mod/mod_auth_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code> should be used
+ instead.</p>
+
+ <div class="warning"><h3>Security</h3>
+ <p>Make sure that the <code class="directive">AuthUserFile</code> is
+ stored outside the document tree of the web-server. Do
+ <strong>not</strong> put it in the directory that it protects.
+ Otherwise, clients may be able to download the
+ <code class="directive">AuthUserFile</code>.</p>
+ </div>
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth.html.ja.jis b/docs/manual/mod/mod_auth.html.ja.jis
new file mode 100644
index 0000000..d2b9a7f
--- /dev/null
+++ b/docs/manual/mod/mod_auth.html.ja.jis
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="iso-2022-jp"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mod_auth - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_auth</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%F%-%9%H%U%!%$%k$rMQ$$$?%f!<%6G'>Z(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>auth_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_auth.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">$B8_49@-(B:</a></th><td>2.1 $B$h$jA0$N%P!<%8%g%s$G$N$_;HMQ2DG=(B</td></tr></table>
+<h3>$B35MW(B</h3>
+
+ <p>$B%W%l%$%s%F%-%9%H$N%Q%9%o!<%I%U%!%$%k$H%0%k!<%W%U%!%$%k$r8!::$7$F(B
+ $B%f!<%6$rC5$9$3$H$G!"(BHTTP $B4pK\G'>Z$G%"%/%;%9@)8B$G$-$k$h$&$K$7$^$9!#(B
+ $B;w$?$h$&$J5!G=$G!"$b$C$HBg$-$J%9%1!<%i%S%j%F%#$r;}$C$?$b$N$O!"(B
+ <code class="module"><a href="../mod/mod_auth_dbm.html">mod_auth_dbm</a></code> $B$GDs6!$5$l$F$$$^$9!#(B
+ $B$^$?!"(BHTTP $B%@%$%8%'%9%HG'>Z$O(B <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
+ $B$GDs6!$5$l$F$$$^$9!#(B</p>
+
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authauthoritative">AuthAuthoritative</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authgroupfile">AuthGroupFile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authuserfile">AuthUserFile</a></li>
+</ul>
+<h3>$B;2>H(B</h3>
+<ul class="seealso">
+<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>
+<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></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthAuthoritative" id="AuthAuthoritative">AuthAuthoritative</a> <a name="authauthoritative" id="authauthoritative">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BG'>Z$H>5G'%W%m%;%9$r!"(B
+$B$h$jDc$$%l%Y%k$N%b%8%e!<%k$K0\9T$5$;$k$+$I$&$+$r@_Dj$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AuthAuthoritative on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>AuthAuthoritative on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_auth</td></tr>
+</table>
+
+<div class="note">$B5-:\$5$l$F$$$k>pJs$O!"L$$@(B Apache 2.0 $B8~$1$K%"%C%W%G!<%H$5$l$F$$$^$;$s!#(B
+Apache 2.0 $B$G$O!"%b%8%e!<%k$N=g=x$E$1$K0[$J$k;EAH$_$r;H$C$F$$$^$9!#(B</div>
+
+ <p><code class="directive">AuthAuthoritative</code>
+ $B%G%#%l%/%F%#%V$GL@<(E*$K(B <strong>'off'</strong>$B$K@_Dj$9$k$H!"(B
+ $BM?$($i$l$?G'>Z%f!<%6(B ID $B$KBP$7$F(B<strong>$B%f!<%6(B ID $B$,$J$$(B</strong>
+ $B$^$?$O(B<strong>$B%k!<%k$,$J$$(B</strong>$B>l9g$K!"(B
+ $BG'>Z$H>5G'$NN>J}$N%W%m%;%9$,!"(B
+ $B$h$jDc$$%l%Y%k$N%b%8%e!<%k(B (<code>Configuration</code> $B$H(B
+ <code>modules.c</code> $B%U%!%$%k$GDj5A(B) $B$K0\9T$9$k$h$&$K$G$-$^$9!#(B
+ $B%f!<%6(B ID $B$,$"$k!"$+$D$^$?$O!"%k!<%k$,;XDj$5$l$F$$$k>l9g$O!"(B
+ $BDL>o$N%Q%9%o!<%I$H%"%/%;%9%A%'%C%/$,E,MQ$5$l$F!"(B
+ $BG'>Z$K<:GT$9$k$H!V(B Authorization Required $B!W1~Ez$,JV$5$l$^$9!#(B</p>
+
+ <p>$B$G$9$+$i!"Fs$D0J>e$N%b%8%e!<%k$N%G!<%?%Y!<%9$GF10l$N(B
+ $B%f!<%6(B ID $B$,8=$o$l$?$j!"(B
+ $B$^$?$O!"@5$7$$(B <code class="directive"><a href="../mod/core.html#require">Require</a></code>
+ $B%G%#%l%/%F%#%V$,Fs$D0J>e$N%b%8%e!<%k$G8=$o$l$?$j$7$?>l9g$O!"(B
+ $B0l$DL\$N%b%8%e!<%k$,G'Dj$r9T$C$F!"(BAuthAuthoritative $B@_Dj$K4X$o$i$:!"(B
+ $B%"%/%;%9$O0\9T$7$^$;$s!#(B</p>
+
+ <p>$B0lHLE*$J;HMQK!$O!"(B<code class="module"><a href="../mod/mod_auth_dbm.html">mod_auth_dbm</a></code>,
+ <code>mod_auth_msql</code>, <code class="module"><a href="../mod/mod_auth_anon.html">mod_auth_anon</a></code>
+ $B$H$$$C$?%G!<%?%Y!<%9%b%8%e!<%k$N0l$D$HAH$_9g$o$;$k$3$H$G$9!#(B
+ $B$3$l$i$N%b%8%e!<%k$OB?$/$N%f!<%6;q3J8!::$rDs6!$7$F$/$l$^$9!#(B
+ $B$7$+$7!">/?t$N(B ($B4IM}<T4XO"$N(B) $B%"%/%;%9$O(B
+ <code class="directive"><a href="#authuserfile">AuthUserFile</a></code>
+ $B$GNI$/J]8n$5$l$?!"$h$jDc%l%Y%k$K0\9T$9$k$h$&$K$7$^$9!#(B</p>
+
+ <p>$B%G%U%)%k%H$G$O!"@)8f$O0\9T$7$^$;$s!#$=$7$F!"L$CN$N%f!<%6(B ID $B$d(B
+ $B%k!<%k$,$"$C$F$b!V(BAuthorization Required$B!W1~Ez$,JV$5$l$^$9!#(B
+ $B$G$9$+$i!"$3$N%G%#%l%/%F%#%V@_Dj$7$J$$$3$H$G%7%9%F%`$N0BA4$r0];}$G$-$F!"$^$?!"(B
+ NCSA $B=`5r$N5sF0$r6/@)$G$-$^$9!#(B</p>
+
+ <div class="note"><h3>$B%;%-%e%j%F%#(B</h3> $B%f!<%6$,<+J,<+?H$G:n@.$7$?(B
+ .htaccess $B%U%!%$%k$GG'>Z$G$-$k$h$&$K$9$k$3$H$N1F6A$r(B
+ $B9MN8$KF~$l$F$*$$$F$/$@$5$$!#$=$7$F!"(B
+ $B$=$l$,K\Ev$K4uK>$N5sF0$G$"$k$+$I$&$+$r8!F$$7$F$/$@$5$$!#(B
+ $B0lHLE*$K8@$C$F!"(BmSQL $B$H$$$C$?%G!<%?%Y!<%9$N%;%-%e%j%F%#J]8n$h$j$b!"(B
+ $BC1=c$K0l$D$N%U%!%$%k(B .htpasswd $B$N%;%-%e%j%F%#$rJ]8n$9$kJ}$,MF0W$G$9!#(B
+ <code class="directive"><a href="#authuserfile">AuthUserFile</a></code> $B$H(B
+ <code class="directive"><a href="#authgroupfile">AuthGroupFile</a></code> $B$O!"(B
+ $B%&%'%V%5!<%P$N%I%-%e%a%s%H%D%j!<$N30B&$KJ]4I$9$k(B
+ $B$h$&$K$7$F$/$@$5$$!#J]8n$7$h$&$H$7$F$$$k%G%#%l%/%H%j0J2<$K$O!"(B
+ <em>$BCV$+$J$$$G2<$5$$(B</em>$B!#$=$&$7$J$$$H(B
+ <code class="directive"><a href="#authuserfile">AuthUserFile</a></code> $B$H(B
+ <code class="directive"><a href="#authgroupfile">AuthGroupFile</a></code>
+ $B$O%@%&%s%m!<%I$G$-$F$7$^$$$^$9!#(B</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="AuthGroupFile" id="AuthGroupFile">AuthGroupFile</a> <a name="authgroupfile" id="authgroupfile">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BG'>Z$K;HMQ$9$k%f!<%6%0%k!<%W$N0lMw$,3JG<$5$l$F$$$k!"(B
+$B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AuthGroupFile <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_auth</td></tr>
+</table>
+ <p><code class="directive">AuthGroupFile</code> $B%G%#%l%/%F%#%V$O!"(B
+ $BG'>Z$K;HMQ$9$k%f!<%6%0%k!<%W$N0lMw$,3JG<$5$l$F$$$k!"(B
+ $B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B
+ <var>file-path</var> $B$O%0%k!<%W%U%!%$%k$X$N%Q%9$G$9!#(B
+ $B$b$7@dBP%Q%9$G$J$1$l$P(B
+ (<em>$B$D$^$j(B</em> $B%9%i%C%7%e$G;O$^$i$J$$%Q%9$G$"$l$P(B)
+ $B!"(B<code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
+ $B$+$i$NAjBP%Q%9$H$7$F07$o$l$^$9!#(B</p>
+
+ <p>$B%0%k!<%W%U%!%$%k3F9T$O!"%0%k!<%WL>!"%3%m%s!"$=$7$F(B
+ $B%9%Z!<%96h@Z$j$G$=$N%a%s%P!<$N%f!<%6L>$r5-=R$7$^$9!#(B
+ $BNc$($P(B:</p>
+
+<div class="example"><p><code>mygroup: bob joe anne</code></p></div>
+
+ <p>$BBg$-$J%U%!%$%k$rC5:w$9$k$N$O!"(B<em>$BHs>o$K(B</em>$B8zN($,0-$$$H$$$&E@$K(B
+ $BCm0U$7$F$/$@$5$$!#$=$N$h$&$J>l9g$O!"(B
+ <code class="directive"><a href="../mod/mod_auth_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code>
+ $B$rBe$o$j$K;H$&$Y$-$G$7$g$&!#(B</p>
+
+<div class="note"><h3>$B%;%-%e%j%F%#(B</h3>
+ <p><code class="directive">AuthGroupFile</code> $B$O!"(B
+ $B%&%'%V%5!<%P$N%I%-%e%a%s%H%D%j!<$N30B&$K(B
+ $BJ]4I$9$k$h$&$K$7$F$/$@$5$$!#(B
+ $BJ]8n$7$h$&$H$7$F$$$k%G%#%l%/%H%j0J2<$K$O!"(B<em>$BCV$+$J$$$G2<$5$$(B</em>$B!#(B
+ $B$=$&$7$J$$$H(B <code class="directive">AuthGroupFile</code> $B$O(B
+ $B%@%&%s%m!<%I$G$-$F$7$^$$$^$9!#(B</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="AuthUserFile" id="AuthUserFile">AuthUserFile</a> <a name="authuserfile" id="authuserfile">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BG'>Z$K;HMQ$9$k%f!<%6$H%Q%9%o!<%I$N0lMw$,3JG<$5$l$F$$$k!"(B
+$B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AuthUserFile <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_auth</td></tr>
+</table>
+ <p><code class="directive">AuthUserFile</code> $B%G%#%l%/%F%#%V$O!"(B
+ $B%f!<%6G'>Z$N$?$a$N%f!<%6$H%Q%9%o!<%I$N0lMw$r3JG<$7$?(B
+ $B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B<var>file-path</var>
+ $B$O%f!<%6%U%!%$%k$X$N%Q%9$G$9!#(B
+ $B$b$7@dBP%Q%9$G$J$1$l$P(B
+ (<em>$B$D$^$j(B</em> $B%9%i%C%7%e$G;O$^$i$J$$%Q%9$G$"$l$P(B)
+ $B!"(B<code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
+ $B$+$i$NAjBP%Q%9$H$7$F07$o$l$^$9!#(B</p>
+
+ <p>$B%f!<%6%U%!%$%k$N3F9T$K$O!"%f!<%6L>!"%3%m%s!"(B
+ <code>crypt()</code> $B$G0E9f2=$7$?%Q%9%o!<%I$r5-=R$7$^$9!#(B
+ $BF10l%f!<%6$,J#?t2sEPO?$5$l$?;~$N5sF0$ODj5A$5$l$F$$$^$;$s!#(B</p>
+
+ <p>$B%P%$%J%jG[I[$N0lIt$H$7$F%$%s%9%H!<%k$5$l$k$+!"(B
+ $B$"$k$$$O(B <code>src/support</code> $B$K$"$k(B
+ <a href="../programs/htpasswd.html">htpasswd</a>
+ $B%f!<%F%#%j%F%#$G!"$3$N%Q%9%o!<%I%U%!%$%k$r%a%$%s%F%J%s%9$7$^$9!#(B
+ $B>\:Y$O(B <code>man</code> $B%Z!<%8$r$4MwD:$/$H$7$F!"4JC1$K$O(B:</p>
+
+ <p>$B=i4|(B ID username $B$G!"(BFilename
+ $B$H$$$&%Q%9%o!<%I%U%!%$%k$r@8@.$7$^$9!#(B
+ $B<!$N%3%^%s%I$rH/9T$9$k$H%Q%9%o!<%I$,MW5a$5$l$^$9(B:</p>
+
+ <div class="example"><p><code>htpasswd -c Filename username</code></p></div>
+
+ <p>$B%Q%9%o!<%I%U%!%$%k(B Filename $B$K!"(Busername2
+ $B$rDI2C$7$?$j=$@5$7$?$j$7$^$9(B:</p>
+
+ <div class="example"><p><code>htpasswd Filename username2</code></p></div>
+
+ <p>($BLuCm(B: $BHs>o$KB?$/$N%f!<%6$rEPO?$9$k$HBg$-$J%U%!%$%k$K$J$j$^$9$,(B)
+ $BBg$-$J%F%-%9%H%U%!%$%k$r8!:w$9$k$N$O(B<em>$BHs>o$K(B</em>$B8zN($,0-$$(B
+ $B$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#$=$N$h$&$JI,MW$N$"$k;~$O!"(B
+ <code class="directive"><a href="../mod/mod_auth_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>
+ $B$rBe$o$j$K;H$C$F$/$@$5$$!#(B</p>
+
+<div class="note"><h3>$B%;%-%e%j%F%#(B</h3>
+ <p><code class="directive">AuthUserFile </code>
+ $B$O!"%&%'%V%5!<%P$N%I%-%e%a%s%H%D%j!<$N30B&$KJ]4I$9$k$h$&$K$7$F$/$@$5$$!#(B
+ $BJ]8n$7$h$&$H$7$F$$$k%G%#%l%/%H%j0J2<$K$O!"(B<em>$BCV$+$J$$$G2<$5$$(B</em>$B!#(B
+ $B$=$&$7$J$$$H(B <code class="directive">AuthUserFile</code> $B$O(B
+ $B%@%&%s%m!<%I$G$-$F$7$^$$$^$9!#(B</p></div>
+
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth.xml b/docs/manual/mod/mod_auth.xml
new file mode 100644
index 0000000..d9f9c72
--- /dev/null
+++ b/docs/manual/mod/mod_auth.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
+<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
+<modulesynopsis>
+
+<name>mod_auth</name>
+<description>User authentication using text files</description>
+<status>Base</status>
+<sourcefile>mod_auth.c</sourcefile>
+<identifier>auth_module</identifier>
+<compatibility>Available only in versions prior to 2.1</compatibility>
+
+<summary>
+ <p>This module allows the use of HTTP Basic Authentication to
+ restrict access by looking up users in plain text password and
+ group files. Similar functionality and greater scalability is
+ provided by <module>mod_auth_dbm</module>. HTTP Digest
+ Authentication is provided by <module>mod_auth_digest</module>.</p>
+</summary>
+<seealso><directive module="core">Require</directive></seealso>
+<seealso><directive module="core">Satisfy</directive></seealso>
+<seealso><directive module="core">AuthName</directive></seealso>
+<seealso><directive module="core">AuthType</directive></seealso>
+
+<directivesynopsis>
+<name>AuthGroupFile</name>
+<description>Sets the name of a text file containing the list
+of user groups for authentication</description>
+<syntax>AuthGroupFile <var>file-path</var></syntax>
+<contextlist><context>directory</context><context>.htaccess</context>
+</contextlist>
+<override>AuthConfig</override>
+
+<usage>
+ <p>The <directive>AuthGroupFile</directive> directive sets the
+ name of a textual file containing the list of user groups for user
+ authentication. <var>File-path</var> is the path to the group
+ file. If it is not absolute, it is treated as relative to the <directive
+ module="core">ServerRoot</directive>.</p>
+
+ <p>Each line of the group file contains a groupname followed by a
+ colon, followed by the member usernames separated by spaces.</p>
+
+ <example><title>Example:</title>
+ mygroup: bob joe anne
+ </example>
+
+ <p>Note that searching large text files is <em>very</em>
+ inefficient; <directive module="mod_auth_dbm"
+ >AuthDBMGroupFile</directive> provides a much better performance.</p>
+
+ <note type="warning"><title>Security</title>
+ <p>Make sure that the <directive>AuthGroupFile</directive> is
+ stored outside the document tree of the web-server; do <em>not</em>
+ put it in the directory that it protects. Otherwise, clients may
+ be able to download the <directive>AuthGroupFile</directive>.</p>
+ </note>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>AuthUserFile</name>
+<description>Sets the name of a text file containing the list of users and
+passwords for authentication</description>
+<syntax>AuthUserFile <var>file-path</var></syntax>
+<contextlist><context>directory</context><context>.htaccess</context>
+</contextlist>
+<override>AuthConfig</override>
+
+<usage>
+ <p>The <directive>AuthUserFile</directive> directive sets the name
+ of a textual file containing the list of users and passwords for
+ user authentication. <var>File-path</var> is the path to the user
+ file. If it is not absolute (<em>i.e.</em>, if it doesn't begin
+ with a slash), it is treated as relative to the <directive
+ module="core">ServerRoot</directive>.</p>
+
+ <p>Each line of the user file contains a username followed by
+ a colon, followed by the encrypted password. If the same user
+ ID is defined multiple times, <module>mod_auth</module> will
+ use the first occurrence to verify the password.</p>
+
+ <p>The utility <a href="../programs/htpasswd.html">htpasswd</a>
+ which is installed as part of the binary distribution, or which
+ can be found in <code>src/support</code>, is used to maintain
+ this password file. See the <a href="../programs/htpasswd.html">man
+ page</a> for more details. In short:</p>
+
+ <p>Create a password file <code>Filename</code> with
+ <code>username</code> as the initial ID. It will prompt for the
+ password:</p>
+
+ <example>
+ htpasswd -c Filename username
+ </example>
+
+ <p>Add or modify <code>username2</code> in the password file
+ <code>Filename</code>:</p>
+
+ <example>
+ htpasswd Filename username2
+ </example>
+
+ <p>Note that searching large text files is <em>very</em>
+ inefficient; <directive
+ module="mod_auth_dbm">AuthDBMUserFile</directive> should be used
+ instead.</p>
+
+ <note type="warning"><title>Security</title>
+ <p>Make sure that the <directive>AuthUserFile</directive> is
+ stored outside the document tree of the web-server. Do
+ <strong>not</strong> put it in the directory that it protects.
+ Otherwise, clients may be able to download the
+ <directive>AuthUserFile</directive>.</p>
+ </note>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>AuthAuthoritative</name>
+<description>Sets whether authorization and authentication are
+passed to lower level modules</description>
+<syntax>AuthAuthoritative On|Off</syntax>
+<default>AuthAuthoritative On</default>
+<contextlist><context>directory</context><context>.htaccess</context>
+</contextlist>
+<override>AuthConfig</override>
+
+<usage>
+ <p>Setting the <directive>AuthAuthoritative</directive> directive
+ explicitly to <code>Off</code> allows for both authentication and
+ authorization to be passed on to lower level modules (as defined in the
+ <code>modules.c</code> files) if there is <strong>no userID</strong>
+ or <strong>rule</strong> matching the supplied userID. If there is a
+ userID and/or rule specified; the usual password and access checks
+ will be applied and a failure will give an "Authentication Required"
+ reply.</p>
+
+ <p>So if a userID appears in the database of more than one module;
+ or if a valid <directive module="core">Require</directive>
+ directive applies to more than one module; then the first module
+ will verify the credentials; and no access is passed on;
+ regardless of the <directive>AuthAuthoritative</directive> setting.</p>
+
+ <p>A common use for this is in conjunction with one of the
+ database modules; such as <module>mod_auth_dbm</module>,
+ <code>mod_auth_msql</code>, and <module>mod_auth_anon</module>.
+ These modules supply the bulk of the user credential checking; but
+ a few (administrator) related accesses fall through to a lower
+ level with a well protected <directive
+ module="mod_auth">AuthUserFile</directive>.</p>
+
+ <p>By default control is not passed on and an unknown userID or
+ rule will result in an "Authentication Required" reply. Not setting
+ it thus keeps the system secure and forces an NCSA compliant
+ behaviour.</p>
+
+ <note type="warning"><title>Security</title>
+ <p>Do consider the implications of allowing a user to allow
+ fall-through in his .htaccess file; and verify that this is really
+ what you want; Generally it is easier to just secure a single
+ .htpasswd file, than it is to secure a database such as mSQL.
+ Make sure that the <directive module="mod_auth"
+ >AuthUserFile</directive> and the <directive module="mod_auth"
+ >AuthGroupFile</directive> are stored outside the document tree of
+ the web-server; do <em>not</em> put them in the directory that they
+ protect. Otherwise, clients will be able to download the <directive
+ module="mod_auth">AuthUserFile</directive> and the <directive
+ module="mod_auth">AuthGroupFile</directive>.</p>
+ </note>
+</usage>
+</directivesynopsis>
+
+</modulesynopsis>
diff --git a/docs/manual/mod/mod_auth.xml.ja b/docs/manual/mod/mod_auth.xml.ja
new file mode 100644
index 0000000..b38c71d
--- /dev/null
+++ b/docs/manual/mod/mod_auth.xml.ja
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="iso-2022-jp"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
+<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
+<modulesynopsis>
+
+<!-- English revision: 1.7.2.1 -->
+<name>mod_auth</name>
+<description>$B%F%-%9%H%U%!%$%k$rMQ$$$?%f!<%6G'>Z(B</description>
+<status>Base</status>
+<sourcefile>mod_auth.c</sourcefile>
+<identifier>auth_module</identifier>
+<compatibility>2.1 $B$h$jA0$N%P!<%8%g%s$G$N$_;HMQ2DG=(B</compatibility>
+
+<summary>
+ <p>$B%W%l%$%s%F%-%9%H$N%Q%9%o!<%I%U%!%$%k$H%0%k!<%W%U%!%$%k$r8!::$7$F(B
+ $B%f!<%6$rC5$9$3$H$G!"(BHTTP $B4pK\G'>Z$G%"%/%;%9@)8B$G$-$k$h$&$K$7$^$9!#(B
+ $B;w$?$h$&$J5!G=$G!"$b$C$HBg$-$J%9%1!<%i%S%j%F%#$r;}$C$?$b$N$O!"(B
+ <module>mod_auth_dbm</module> $B$GDs6!$5$l$F$$$^$9!#(B
+ $B$^$?!"(BHTTP $B%@%$%8%'%9%HG'>Z$O(B <module>mod_auth_digest</module>
+ $B$GDs6!$5$l$F$$$^$9!#(B</p>
+
+</summary>
+<seealso><directive module="core">Require</directive></seealso>
+<seealso><directive module="core">Satisfy</directive></seealso>
+<seealso><directive module="core">AuthName</directive></seealso>
+<seealso><directive module="core">AuthType</directive></seealso>
+
+<directivesynopsis>
+<name>AuthGroupFile</name>
+<description>$BG'>Z$K;HMQ$9$k%f!<%6%0%k!<%W$N0lMw$,3JG<$5$l$F$$$k!"(B
+$B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$9$k(B</description>
+<syntax>AuthGroupFile <var>file-path</var></syntax>
+<contextlist><context>directory</context><context>.htaccess</context>
+</contextlist>
+<override>AuthConfig</override>
+
+<usage>
+ <p><directive>AuthGroupFile</directive> $B%G%#%l%/%F%#%V$O!"(B
+ $BG'>Z$K;HMQ$9$k%f!<%6%0%k!<%W$N0lMw$,3JG<$5$l$F$$$k!"(B
+ $B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B
+ <var>file-path</var> $B$O%0%k!<%W%U%!%$%k$X$N%Q%9$G$9!#(B
+ $B$b$7@dBP%Q%9$G$J$1$l$P(B
+ (<em>$B$D$^$j(B</em> $B%9%i%C%7%e$G;O$^$i$J$$%Q%9$G$"$l$P(B)
+ $B!"(B<directive module="core">ServerRoot</directive>
+ $B$+$i$NAjBP%Q%9$H$7$F07$o$l$^$9!#(B</p>
+
+ <p>$B%0%k!<%W%U%!%$%k3F9T$O!"%0%k!<%WL>!"%3%m%s!"$=$7$F(B
+ $B%9%Z!<%96h@Z$j$G$=$N%a%s%P!<$N%f!<%6L>$r5-=R$7$^$9!#(B
+ $BNc$($P(B:</p>
+
+<example>mygroup: bob joe anne</example>
+
+ <p>$BBg$-$J%U%!%$%k$rC5:w$9$k$N$O!"(B<em>$BHs>o$K(B</em>$B8zN($,0-$$$H$$$&E@$K(B
+ $BCm0U$7$F$/$@$5$$!#$=$N$h$&$J>l9g$O!"(B
+ <directive module="mod_auth_dbm">AuthDBMGroupFile</directive>
+ $B$rBe$o$j$K;H$&$Y$-$G$7$g$&!#(B</p>
+
+<note><title>$B%;%-%e%j%F%#(B</title>
+ <p><directive>AuthGroupFile</directive> $B$O!"(B
+ $B%&%'%V%5!<%P$N%I%-%e%a%s%H%D%j!<$N30B&$K(B
+ $BJ]4I$9$k$h$&$K$7$F$/$@$5$$!#(B
+ $BJ]8n$7$h$&$H$7$F$$$k%G%#%l%/%H%j0J2<$K$O!"(B<em>$BCV$+$J$$$G2<$5$$(B</em>$B!#(B
+ $B$=$&$7$J$$$H(B <directive>AuthGroupFile</directive> $B$O(B
+ $B%@%&%s%m!<%I$G$-$F$7$^$$$^$9!#(B</p>
+</note>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>AuthUserFile</name>
+<description>$BG'>Z$K;HMQ$9$k%f!<%6$H%Q%9%o!<%I$N0lMw$,3JG<$5$l$F$$$k!"(B
+$B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$9$k(B</description>
+<syntax>AuthUserFile <var>file-path</var></syntax>
+<contextlist><context>directory</context><context>.htaccess</context>
+</contextlist>
+<override>AuthConfig</override>
+
+<usage>
+ <p><directive>AuthUserFile</directive> $B%G%#%l%/%F%#%V$O!"(B
+ $B%f!<%6G'>Z$N$?$a$N%f!<%6$H%Q%9%o!<%I$N0lMw$r3JG<$7$?(B
+ $B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B<var>file-path</var>
+ $B$O%f!<%6%U%!%$%k$X$N%Q%9$G$9!#(B
+ $B$b$7@dBP%Q%9$G$J$1$l$P(B
+ (<em>$B$D$^$j(B</em> $B%9%i%C%7%e$G;O$^$i$J$$%Q%9$G$"$l$P(B)
+ $B!"(B<directive module="core">ServerRoot</directive>
+ $B$+$i$NAjBP%Q%9$H$7$F07$o$l$^$9!#(B</p>
+
+ <p>$B%f!<%6%U%!%$%k$N3F9T$K$O!"%f!<%6L>!"%3%m%s!"(B
+ <code>crypt()</code> $B$G0E9f2=$7$?%Q%9%o!<%I$r5-=R$7$^$9!#(B
+ $BF10l%f!<%6$,J#?t2sEPO?$5$l$?;~$N5sF0$ODj5A$5$l$F$$$^$;$s!#(B</p>
+
+ <p>$B%P%$%J%jG[I[$N0lIt$H$7$F%$%s%9%H!<%k$5$l$k$+!"(B
+ $B$"$k$$$O(B <code>src/support</code> $B$K$"$k(B
+ <a href="../programs/htpasswd.html">htpasswd</a>
+ $B%f!<%F%#%j%F%#$G!"$3$N%Q%9%o!<%I%U%!%$%k$r%a%$%s%F%J%s%9$7$^$9!#(B
+ $B>\:Y$O(B <code>man</code> $B%Z!<%8$r$4MwD:$/$H$7$F!"4JC1$K$O(B:</p>
+
+ <p>$B=i4|(B ID username $B$G!"(BFilename
+ $B$H$$$&%Q%9%o!<%I%U%!%$%k$r@8@.$7$^$9!#(B
+ $B<!$N%3%^%s%I$rH/9T$9$k$H%Q%9%o!<%I$,MW5a$5$l$^$9(B:</p>
+
+ <example>htpasswd -c Filename username</example>
+
+ <p>$B%Q%9%o!<%I%U%!%$%k(B Filename $B$K!"(Busername2
+ $B$rDI2C$7$?$j=$@5$7$?$j$7$^$9(B:</p>
+
+ <example>htpasswd Filename username2</example>
+
+ <p>($BLuCm(B: $BHs>o$KB?$/$N%f!<%6$rEPO?$9$k$HBg$-$J%U%!%$%k$K$J$j$^$9$,(B)
+ $BBg$-$J%F%-%9%H%U%!%$%k$r8!:w$9$k$N$O(B<em>$BHs>o$K(B</em>$B8zN($,0-$$(B
+ $B$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#$=$N$h$&$JI,MW$N$"$k;~$O!"(B
+ <directive module="mod_auth_dbm">AuthDBMUserFile</directive>
+ $B$rBe$o$j$K;H$C$F$/$@$5$$!#(B</p>
+
+<note><title>$B%;%-%e%j%F%#(B</title>
+ <p><directive>AuthUserFile </directive>
+ $B$O!"%&%'%V%5!<%P$N%I%-%e%a%s%H%D%j!<$N30B&$KJ]4I$9$k$h$&$K$7$F$/$@$5$$!#(B
+ $BJ]8n$7$h$&$H$7$F$$$k%G%#%l%/%H%j0J2<$K$O!"(B<em>$BCV$+$J$$$G2<$5$$(B</em>$B!#(B
+ $B$=$&$7$J$$$H(B <directive>AuthUserFile</directive> $B$O(B
+ $B%@%&%s%m!<%I$G$-$F$7$^$$$^$9!#(B</p></note>
+
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>AuthAuthoritative</name>
+<description>$BG'>Z$H>5G'%W%m%;%9$r!"(B
+$B$h$jDc$$%l%Y%k$N%b%8%e!<%k$K0\9T$5$;$k$+$I$&$+$r@_Dj$9$k(B</description>
+<syntax>AuthAuthoritative on|off</syntax>
+<default>AuthAuthoritative on</default>
+<contextlist><context>directory</context><context>.htaccess</context>
+</contextlist>
+<override>AuthConfig</override>
+
+<usage>
+
+<note>$B5-:\$5$l$F$$$k>pJs$O!"L$$@(B Apache 2.0 $B8~$1$K%"%C%W%G!<%H$5$l$F$$$^$;$s!#(B
+Apache 2.0 $B$G$O!"%b%8%e!<%k$N=g=x$E$1$K0[$J$k;EAH$_$r;H$C$F$$$^$9!#(B</note>
+
+ <p><directive>AuthAuthoritative</directive>
+ $B%G%#%l%/%F%#%V$GL@<(E*$K(B <strong>'off'</strong>$B$K@_Dj$9$k$H!"(B
+ $BM?$($i$l$?G'>Z%f!<%6(B ID $B$KBP$7$F(B<strong>$B%f!<%6(B ID $B$,$J$$(B</strong>
+ $B$^$?$O(B<strong>$B%k!<%k$,$J$$(B</strong>$B>l9g$K!"(B
+ $BG'>Z$H>5G'$NN>J}$N%W%m%;%9$,!"(B
+ $B$h$jDc$$%l%Y%k$N%b%8%e!<%k(B (<code>Configuration</code> $B$H(B
+ <code>modules.c</code> $B%U%!%$%k$GDj5A(B) $B$K0\9T$9$k$h$&$K$G$-$^$9!#(B
+ $B%f!<%6(B ID $B$,$"$k!"$+$D$^$?$O!"%k!<%k$,;XDj$5$l$F$$$k>l9g$O!"(B
+ $BDL>o$N%Q%9%o!<%I$H%"%/%;%9%A%'%C%/$,E,MQ$5$l$F!"(B
+ $BG'>Z$K<:GT$9$k$H!V(B Authorization Required $B!W1~Ez$,JV$5$l$^$9!#(B</p>
+
+ <p>$B$G$9$+$i!"Fs$D0J>e$N%b%8%e!<%k$N%G!<%?%Y!<%9$GF10l$N(B
+ $B%f!<%6(B ID $B$,8=$o$l$?$j!"(B
+ $B$^$?$O!"@5$7$$(B <directive module="core">Require</directive>
+ $B%G%#%l%/%F%#%V$,Fs$D0J>e$N%b%8%e!<%k$G8=$o$l$?$j$7$?>l9g$O!"(B
+ $B0l$DL\$N%b%8%e!<%k$,G'Dj$r9T$C$F!"(BAuthAuthoritative $B@_Dj$K4X$o$i$:!"(B
+ $B%"%/%;%9$O0\9T$7$^$;$s!#(B</p>
+
+ <p>$B0lHLE*$J;HMQK!$O!"(B<module>mod_auth_dbm</module>,
+ <code>mod_auth_msql</code>, <module>mod_auth_anon</module>
+ $B$H$$$C$?%G!<%?%Y!<%9%b%8%e!<%k$N0l$D$HAH$_9g$o$;$k$3$H$G$9!#(B
+ $B$3$l$i$N%b%8%e!<%k$OB?$/$N%f!<%6;q3J8!::$rDs6!$7$F$/$l$^$9!#(B
+ $B$7$+$7!">/?t$N(B ($B4IM}<T4XO"$N(B) $B%"%/%;%9$O(B
+ <directive module="mod_auth">AuthUserFile</directive>
+ $B$GNI$/J]8n$5$l$?!"$h$jDc%l%Y%k$K0\9T$9$k$h$&$K$7$^$9!#(B</p>
+
+ <p>$B%G%U%)%k%H$G$O!"@)8f$O0\9T$7$^$;$s!#$=$7$F!"L$CN$N%f!<%6(B ID $B$d(B
+ $B%k!<%k$,$"$C$F$b!V(BAuthorization Required$B!W1~Ez$,JV$5$l$^$9!#(B
+ $B$G$9$+$i!"$3$N%G%#%l%/%F%#%V@_Dj$7$J$$$3$H$G%7%9%F%`$N0BA4$r0];}$G$-$F!"$^$?!"(B
+ NCSA $B=`5r$N5sF0$r6/@)$G$-$^$9!#(B</p>
+
+ <note><title>$B%;%-%e%j%F%#(B</title> $B%f!<%6$,<+J,<+?H$G:n@.$7$?(B
+ .htaccess $B%U%!%$%k$GG'>Z$G$-$k$h$&$K$9$k$3$H$N1F6A$r(B
+ $B9MN8$KF~$l$F$*$$$F$/$@$5$$!#$=$7$F!"(B
+ $B$=$l$,K\Ev$K4uK>$N5sF0$G$"$k$+$I$&$+$r8!F$$7$F$/$@$5$$!#(B
+ $B0lHLE*$K8@$C$F!"(BmSQL $B$H$$$C$?%G!<%?%Y!<%9$N%;%-%e%j%F%#J]8n$h$j$b!"(B
+ $BC1=c$K0l$D$N%U%!%$%k(B .htpasswd $B$N%;%-%e%j%F%#$rJ]8n$9$kJ}$,MF0W$G$9!#(B
+ <directive module="mod_auth">AuthUserFile</directive> $B$H(B
+ <directive module="mod_auth">AuthGroupFile</directive> $B$O!"(B
+ $B%&%'%V%5!<%P$N%I%-%e%a%s%H%D%j!<$N30B&$KJ]4I$9$k(B
+ $B$h$&$K$7$F$/$@$5$$!#J]8n$7$h$&$H$7$F$$$k%G%#%l%/%H%j0J2<$K$O!"(B
+ <em>$BCV$+$J$$$G2<$5$$(B</em>$B!#$=$&$7$J$$$H(B
+ <directive module="mod_auth">AuthUserFile</directive> $B$H(B
+ <directive module="mod_auth">AuthGroupFile</directive>
+ $B$O%@%&%s%m!<%I$G$-$F$7$^$$$^$9!#(B</note>
+</usage>
+</directivesynopsis>
+
+</modulesynopsis>
diff --git a/docs/manual/mod/mod_auth_anon.html.en b/docs/manual/mod/mod_auth_anon.html.en
new file mode 100644
index 0000000..223a8c3a
--- /dev/null
+++ b/docs/manual/mod/mod_auth_anon.html.en
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mod_auth_anon - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_auth_anon</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Allows "anonymous" user access to authenticated
+areas</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>auth_anon_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_auth_anon.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available only in versions prior to 2.1</td></tr></table>
+<h3>Summary</h3>
+
+ <p>This module does access control in a manner similar to
+ anonymous-ftp sites; <em>i.e.</em> have a 'magic' user id
+ 'anonymous' and the email address as a password. These email
+ addresses can be logged.</p>
+
+ <p>Combined with other (database) access control methods, this
+ allows for effective user tracking and customization according
+ to a user profile while still keeping the site open for
+ 'unregistered' users. One advantage of using Auth-based user
+ tracking is that, unlike magic-cookies and funny URL
+ pre/postfixes, it is completely browser independent and it
+ allows users to share URLs.</p>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#anonymous">Anonymous</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_authoritative">Anonymous_Authoritative</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_logemail">Anonymous_LogEmail</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_nouserid">Anonymous_NoUserID</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></li>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#example">Example</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 (when combined with the Auth directives of a
+ htpasswd-file based (or GDM, mSQL etc.) base access
+ control system allows users in as 'guests' with the following
+ properties:</p>
+
+ <ul>
+ <li>It insists that the user enters a userId.
+ (<code>Anonymous_NoUserId</code>)</li>
+
+ <li>It insists that the user enters a password.
+ (<code>Anonymous_MustGiveEmail</code>)</li>
+
+ <li>The password entered must be a valid email address, ie.
+ contain at least one '@' and a '.'.
+ (<code>Anonymous_VerifyEmail</code>)</li>
+
+ <li>The userID must be one of <code>anonymous guest www test
+ welcome</code> and comparison is <strong>not</strong> case
+ sensitive.</li>
+
+ <li>And the Email addresses entered in the passwd field are
+ logged to the error log file
+ (<code>Anonymous_LogEmail</code>)</li>
+ </ul>
+
+ <div class="example"><h3>Excerpt of httpd.conf:</h3><p><code>
+ Anonymous_NoUserId off<br />
+ Anonymous_MustGiveEmail on<br />
+ Anonymous_VerifyEmail on<br />
+ Anonymous_LogEmail on<br />
+ Anonymous anonymous guest www test welcome<br />
+ <br />
+ AuthName "Use 'anonymous' & Email address for guest entry"<br />
+ AuthType basic<br />
+ <br />
+ # An
+ AuthUserFile/AuthDBUserFile/AuthDBMUserFile<br />
+ # directive must be specified, or use<br />
+ # Anonymous_Authoritative for public access.<br />
+ # In the .htaccess for the public directory, add:<br />
+ <Files *><br />
+ <span class="indent">
+ Order Deny,Allow<br />
+ Allow from all<br />
+ <br />
+ Require valid-user<br />
+ </span>
+ </Files>
+ </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">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies userIDs that areallowed access without
+password verification</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Anonymous <var>user</var> [<var>user</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#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_auth_anon</td></tr>
+</table>
+ <p>A list of one or more 'magic' userIDs which are allowed
+ access without password verification. The userIDs are space
+ separated. It is possible to use the ' and " quotes to allow a
+ space in a userID as well as the \ escape character.</p>
+
+ <p>Please note that the comparison is
+ <strong>case-IN-sensitive</strong>.<br />
+ I strongly suggest that the magic username
+ '<code>anonymous</code>' is always one of the allowed
+ userIDs.</p>
+
+ <div class="example"><h3>Example:</h3><p><code>
+ Anonymous anonymous "Not Registered" "I don't know"
+ </code></p></div>
+
+ <p>This would allow the user to enter without password
+ verification by using the userIDs "anonymous",
+ "AnonyMous", "Not Registered" and "I Don't Know".</p>
+
+</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_Authoritative" id="Anonymous_Authoritative">Anonymous_Authoritative</a> <a name="anonymous_authoritative" id="anonymous_authoritative">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures if authorization will fall-through
+to other methods</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Anonymous_Authoritative On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Anonymous_Authoritative 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_auth_anon</td></tr>
+</table>
+ <p>When set <code>On</code>, there is no fall-through to other
+ authentication methods. So if a userID does not match the values
+ specified in the <code class="directive"><a href="#anonymous">Anonymous</a></code>
+ directive, access is denied.</p>
+
+ <p>Be sure you know what you are doing when you decide to
+ switch it on. And remember that the order in which the Authentication
+ modules are queried is defined in the modules.c files at compile
+ time.</p>
+
+</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_LogEmail" id="Anonymous_LogEmail">Anonymous_LogEmail</a> <a name="anonymous_logemail" id="anonymous_logemail">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets whether the password entered will be logged in the
+error log</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Anonymous_LogEmail On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Anonymous_LogEmail 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_auth_anon</td></tr>
+</table>
+ <p>When set <code>On</code>, the default, the 'password' entered
+ (which hopefully contains a sensible email address) is logged in
+ the 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="Anonymous_MustGiveEmail" id="Anonymous_MustGiveEmail">Anonymous_MustGiveEmail</a> <a name="anonymous_mustgiveemail" id="anonymous_mustgiveemail">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies whether blank passwords are allowed</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Anonymous_MustGiveEmail On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Anonymous_MustGiveEmail 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_auth_anon</td></tr>
+</table>
+ <p>Specifies whether the user must specify an email address as
+ the password. This prohibits blank passwords.</p>
+
+</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_NoUserID" id="Anonymous_NoUserID">Anonymous_NoUserID</a> <a name="anonymous_nouserid" id="anonymous_nouserid">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets whether the userID field may be empty</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Anonymous_NoUserID On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Anonymous_NoUserID 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_auth_anon</td></tr>
+</table>
+ <p>When set <code>On</code>, users can leave the userID (and
+ perhaps the password field) empty. This can be very convenient for
+ MS-Explorer users who can just hit return or click directly on the
+ OK button; which seems a natural reaction.</p>
+
+</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_VerifyEmail" id="Anonymous_VerifyEmail">Anonymous_VerifyEmail</a> <a name="anonymous_verifyemail" id="anonymous_verifyemail">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets whether to check the password field for a correctly
+formatted email address</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Anonymous_VerifyEmail On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Anonymous_VerifyEmail 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_auth_anon</td></tr>
+</table>
+ <p>When set <code>On</code> the 'password' entered is checked for
+ at least one '@' and a '.' to encourage users to enter valid email
+ addresses (see the above <code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>).</p>
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/obs_mod_auth_anon.xml b/docs/manual/mod/mod_auth_anon.xml
similarity index 70%
rename from docs/manual/mod/obs_mod_auth_anon.xml
rename to docs/manual/mod/mod_auth_anon.xml
index 8689f96..7226eae 100644
--- a/docs/manual/mod/obs_mod_auth_anon.xml
+++ b/docs/manual/mod/mod_auth_anon.xml
@@ -5,34 +5,13 @@
<name>mod_auth_anon</name>
<description>Allows "anonymous" user access to authenticated
- areas</description>
-<status>Obsolete</status>
-<hint>replaced by <module>mod_authn_anon</module> since 2.0.44</hint>
+areas</description>
+<status>Extension</status>
<sourcefile>mod_auth_anon.c</sourcefile>
<identifier>auth_anon_module</identifier>
-<compatibility>Available only in versions up to 2.0.43</compatibility>
+<compatibility>Available only in versions prior to 2.1</compatibility>
<summary>
- <note type="warning"><title>This module is obsolete!</title>
- <p>Note, that this module has been marked as obsolete. A bunch
- of modules was introduced in Apache version 2.0.44 that
- support the new Authentication/Authorization provider mechnism.</p>
-
- <p>In order to get the same functionality, you have to invoke the
- <module>mod_authn_anon</module> module now.</p>
-
- <!-- XXX: I think `AuthBasicProvider anon' comes soon, doesn't it? -->
- <!--
- <p>In order to get the same functionality, you have
- to use the <module>mod_auth_basic</module> module that implements
- the HTTP part. <module>mod_authn_anon</module> provides for
- anonymous user authentication.</p>
- -->
-
- <p>This document is kept only for historical reasons and no
- longer maintained.</p>
- </note>
-
<p>This module does access control in a manner similar to
anonymous-ftp sites; <em>i.e.</em> have a 'magic' user id
'anonymous' and the email address as a password. These email
@@ -74,9 +53,7 @@
(<code>Anonymous_LogEmail</code>)</li>
</ul>
- <p>Excerpt of httpd.conf:</p>
-
- <example>
+ <example><title>Excerpt of httpd.conf:</title>
Anonymous_NoUserId off<br />
Anonymous_MustGiveEmail on<br />
Anonymous_VerifyEmail on<br />
@@ -124,12 +101,12 @@
userIDs.</p>
<example><title>Example:</title>
- Anonymous anonymous "Not Registered" 'I don\'t know'
+ Anonymous anonymous "Not Registered" "I don't know"
</example>
<p>This would allow the user to enter without password
- verification by using the userId's 'anonymous',
- 'AnonyMous','Not Registered' and 'I Don't Know'.</p>
+ verification by using the userIDs "anonymous",
+ "AnonyMous", "Not Registered" and "I Don't Know".</p>
</usage>
</directivesynopsis>
@@ -137,22 +114,22 @@
<name>Anonymous_Authoritative</name>
<description>Configures if authorization will fall-through
to other methods</description>
-<syntax>Anonymous_Authoritative on|off</syntax>
-<default>Anonymous_Authoritative off</default>
+<syntax>Anonymous_Authoritative On|Off</syntax>
+<default>Anonymous_Authoritative Off</default>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>AuthConfig</override>
<usage>
- <p>When set 'on', there is no fall-through to other authorization
- methods. So if a userID does not match the values specified in the
- <directive module="mod_auth_anon" status="obsolete">Anonymous</directive> directive,
- access is denied.</p>
+ <p>When set <code>On</code>, there is no fall-through to other
+ authentication methods. So if a userID does not match the values
+ specified in the <directive module="mod_auth_anon">Anonymous</directive>
+ directive, access is denied.</p>
<p>Be sure you know what you are doing when you decide to
- switch it on. And remember that it is the linking order of the
- modules (in the Configuration / Make file) which details the
- order in which the Authorization modules are queried.</p>
+ switch it on. And remember that the order in which the Authentication
+ modules are queried is defined in the modules.c files at compile
+ time.</p>
</usage>
</directivesynopsis>
@@ -160,14 +137,14 @@
<name>Anonymous_LogEmail</name>
<description>Sets whether the password entered will be logged in the
error log</description>
-<syntax>Anonymous_LogEmail on|off</syntax>
-<default>Anonymous_LogEmail on</default>
+<syntax>Anonymous_LogEmail On|Off</syntax>
+<default>Anonymous_LogEmail On</default>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>AuthConfig</override>
<usage>
- <p>When set <code>on</code>, the default, the 'password' entered
+ <p>When set <code>On</code>, the default, the 'password' entered
(which hopefully contains a sensible email address) is logged in
the error log.</p>
</usage>
@@ -176,8 +153,8 @@
<directivesynopsis>
<name>Anonymous_MustGiveEmail</name>
<description>Specifies whether blank passwords are allowed</description>
-<syntax>Anonymous_MustGiveEmail on|off</syntax>
-<default>Anonymous_MustGiveEmail on</default>
+<syntax>Anonymous_MustGiveEmail On|Off</syntax>
+<default>Anonymous_MustGiveEmail On</default>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>AuthConfig</override>
@@ -191,14 +168,14 @@
<directivesynopsis>
<name>Anonymous_NoUserID</name>
<description>Sets whether the userID field may be empty</description>
-<syntax>Anonymous_NoUserID on|off</syntax>
-<default>Anonymous_NoUserID off</default>
+<syntax>Anonymous_NoUserID On|Off</syntax>
+<default>Anonymous_NoUserID Off</default>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>AuthConfig</override>
<usage>
- <p>When set <code>on</code>, users can leave the userID (and
+ <p>When set <code>On</code>, users can leave the userID (and
perhaps the password field) empty. This can be very convenient for
MS-Explorer users who can just hit return or click directly on the
OK button; which seems a natural reaction.</p>
@@ -209,17 +186,17 @@
<name>Anonymous_VerifyEmail</name>
<description>Sets whether to check the password field for a correctly
formatted email address</description>
-<syntax>Anonymous_VerifyEmail on|off</syntax>
-<default>Anonymous_VerifyEmail off</default>
+<syntax>Anonymous_VerifyEmail On|Off</syntax>
+<default>Anonymous_VerifyEmail Off</default>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>AuthConfig</override>
<usage>
- <p>When set <code>on</code> the 'password' entered is checked for
+ <p>When set <code>On</code> the 'password' entered is checked for
at least one '@' and a '.' to encourage users to enter valid email
addresses (see the above <directive
- module="mod_auth_anon" status="obsolete">Auth_LogEmail</directive>).</p>
+ module="mod_auth_anon">Anonymous_LogEmail</directive>).</p>
</usage>
</directivesynopsis>
diff --git a/docs/manual/mod/mod_auth_basic.html.en b/docs/manual/mod/mod_auth_basic.html.en
deleted file mode 100644
index 7dd0ff1..0000000
--- a/docs/manual/mod/mod_auth_basic.html.en
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_auth_basic - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_auth_basic</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Basic authentication</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>auth_basic_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_auth_basic.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0.44 and later</td></tr></table><h3>Summary</h3>
-
- <p>This module allows the use of HTTP Basic Authentication to
- restrict access by looking up users in the given providers.
- HTTP Digest Authentication is provided by
- <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>.</p>
-
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authbasicauthoritative">AuthBasicAuthoritative</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authbasicprovider">AuthBasicProvider</a></li>
-</ul><h3>See also</h3><ul class="seealso"><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></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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets whether authorization and authentication are
-passed to lower level modules</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthBasicAuthoritative on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthBasicAuthoritative 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>Base</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_basic</td></tr></table>
- <p>Setting the <code class="directive">AuthBasicAuthoritative</code> directive
- explicitly to <strong>'off'</strong> allows for both
- authentication and authorization to be passed on to lower level
- modules (as defined in the <code>Configuration</code> and
- <code>modules.c</code> files) if there is <strong>no
- userID</strong> or <strong>rule</strong> matching the supplied
- userID. If there is a userID and/or rule specified; the usual
- password and access checks will be applied and a failure will give
- an Authorization Required reply.</p>
-
- <p>So if a userID appears in the database of more than one module;
- or if a valid <code class="directive"><a href="../mod/core.html#require">Require</a></code>
- directive applies to more than one module; then the first module
- will verify the credentials; and no access is passed on;
- regardless of the AuthAuthoritative setting.</p>
-
- <p>By default; control is not passed on; and an unknown userID or
- rule will result in an Authorization Required reply. Not setting
- it thus keeps the system secure; and forces an NCSA compliant
- behaviour.</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthBasicProvider" id="AuthBasicProvider">AuthBasicProvider</a> <a name="authbasicprovider" id="authbasicprovider">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the authentication provider(s) for this location</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthBasicProvider <em>provider-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>Base</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_basic</td></tr></table>
- <p>The <code class="directive">AuthBasicProvider</code> directive sets
- which provider is used to authenticate the users for this location.</p>
-
- <p>See <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code>, <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>
- for providers.</p>
-
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth_basic.html.ja.jis b/docs/manual/mod/mod_auth_basic.html.ja.jis
deleted file mode 100644
index c1252cd..0000000
--- a/docs/manual/mod/mod_auth_basic.html.ja.jis
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="iso-2022-jp"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_auth_basic - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_auth_basic</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B4pK\G'>Z(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>auth_basic_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_auth_basic.c</td></tr><tr><th><a href="module-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 2.0.44 $B0J9_(B</td></tr></table><h3>$B35MW(B</h3>
-
- <p>$BM?$($i$l$?%W%m%P%$(B$B%@(B ($BLuCm(B: $BG'>Z$G$N>H2q$r9T$&Ld$$9g$o$;@h(B)
- $B$G%f!<(B$B%6$r8!:w$7!"(BHTTP $B4pK\G'>Z$G%"%/%;%9@)8B$G$-$k$h$&$K$J$j$^$9!#(B
- HTTP $B%@%$%8%'%9%HG'>Z$K$D$$$F$O(B <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
- $B$GDs6!$5$l$^$9!#(B</p>
-
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authbasicauthoritative">AuthBasicAuthoritative</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authbasicprovider">AuthBasicProvider</a></li>
-</ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><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></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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$BG'>Z(B$B$H>5G'$r!"$h$jDc$$%l%Y%k$N%b%8%e!<%k$K0\9T$5$;$k$+$r(B
-$B@_Dj$7$^$9!#(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AuthBasicAuthoritative on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>AuthBasicAuthoritative on</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_auth_basic</td></tr></table>
- <p><code class="directive">AuthBasicAuthoritative</code>
- $B%G%#%l%/%F%#%V$GL@<(E*$K(B <strong>'off'</strong>$B$K@_Dj$9$k$H!"(B
- $BM?$($i$l$?G'>Z%f!<%6(B ID $B$KBP$7$F(B<strong>$B%f!<%6(B ID $B$,$J$$(B</strong>
- $B$^$?$O(B<strong>$B%k!<%k$,$J$$(B</strong>$B>l9g$K!"(B
- $BG'>Z$H>5G'$NN>J}$N%W%m%;%9$,!"(B
- $B$h$jDc$$%l%Y%k$N%b%8%e!<%k(B (<code>Configuration</code> $B$H(B
- <code>modules.c</code> $B%U%!%$%k$GDj5A(B) $B$K0\9T$9$k$h$&$K$G$-$^$9!#(B
- $B%f!<%6(B ID $B$,$"$k!"$+$D$^$?$O!"%k!<%k$,;XDj$5$l$F$$$k>l9g$O!"(B
- $BDL>o$N%Q%9%o!<%I$H%"%/%;%9%A%'%C%/$,E,MQ$5$l$F!"(B
- $BG'>Z$K<:GT$9$k$H!V(B Authorization Required $B!W1~Ez$,JV$5$l$^$9!#(B</p>
-
- <p>$B$G$9$+$i!"Fs$D0J>e$N%b%8%e!<%k$N%G!<%?%Y!<%9$GF10l$N(B
- $B%f!<%6(B ID $B$,8=$o$l$?$j!"(B
- $B$^$?$O!"@5$7$$(B <code class="directive"><a href="../mod/core.html#require">Require</a></code>
- $B%G%#%l%/%F%#%V$,Fs$D0J>e$N%b%8%e!<%k$G8=$o$l$?$j$7$?>l9g$O!"(B
- $B0l$DL\$N%b%8%e!<%k$,G'Dj$r9T$C$F!"(BAuthAuthoritative $B@_Dj$K4X$o$i$:!"(B
- $B%"%/%;%9$O0\9T$7$^$;$s!#(B</p>
-
- <p>$B%G%U%)%k%H$G$O!"@)8f$O0\9T$7$^$;$s!#$=$7$F!"L$CN$N%f!<%6(B ID $B$d(B
- $B%k!<%k$,$"$C$F$b!V(B Authorization Required $B!W1~Ez$,JV$5$l$^$9!#(B
- $B$G$9$+$i!"$3$N%G%#%l%/%F%#%V@_Dj$7$J$$$3$H$G%7%9%F%`$N0BA4$r0];}$G$-$F!"$^$?!"(B
- NCSA $B=`5r$N5sF0$r6/@)$G$-$^$9!#(B</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthBasicProvider" id="AuthBasicProvider">AuthBasicProvider</a> <a name="authbasicprovider" id="authbasicprovider">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B$3$N(B$B0LCV$KBP$9$kG'>Z%W%m%P%$%@$r@_Dj$7$^$9!#(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AuthBasicProvider <em>provider-name</em></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_auth_basic</td></tr></table>
- <p><code class="directive">AuthBasicProvider</code> $B%G%#%l%/%F%#%V$G!"(B
- $B$3$N0LCV$KBP$9$k%f!<%6G'>Z$KMQ$$$i$l$kG'>Z%W%m%P%$%@$r@_Dj$7$^$9!#(B</p>
-
- <p>$BG'>Z%W%m%P%$%@$K$D$$$F$O(B
- <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code>, <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>
- $B$r$4Mw2<$5$$!#(B</p>
-
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth_basic.xml b/docs/manual/mod/mod_auth_basic.xml
deleted file mode 100644
index 7349980..0000000
--- a/docs/manual/mod/mod_auth_basic.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<modulesynopsis>
-
-<name>mod_auth_basic</name>
-<description>Basic authentication</description>
-<status>Base</status>
-<sourcefile>mod_auth_basic.c</sourcefile>
-<identifier>auth_basic_module</identifier>
-<compatibility>Available in Apache 2.0.44 and later</compatibility>
-
-<summary>
-
- <p>This module allows the use of HTTP Basic Authentication to
- restrict access by looking up users in the given providers.
- HTTP Digest Authentication is provided by
- <module>mod_auth_digest</module>.</p>
-
-</summary>
-<seealso><directive module="core">AuthName</directive></seealso>
-<seealso><directive module="core">AuthType</directive></seealso>
-
-<directivesynopsis>
-<name>AuthBasicProvider</name>
-<description>Sets the authentication provider(s) for this location</description>
-<syntax>AuthBasicProvider <em>provider-name</em></syntax>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthBasicProvider</directive> directive sets
- which provider is used to authenticate the users for this location.</p>
-
- <p>See <module>mod_authn_dbm</module>, <module>mod_authn_file</module>
- for providers.</p>
-
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthBasicAuthoritative</name>
-<description>Sets whether authorization and authentication are
-passed to lower level modules</description>
-<syntax>AuthBasicAuthoritative on|off</syntax>
-<default>AuthBasicAuthoritative on</default>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>Setting the <directive>AuthBasicAuthoritative</directive> directive
- explicitly to <strong>'off'</strong> allows for both
- authentication and authorization to be passed on to lower level
- modules (as defined in the <code>Configuration</code> and
- <code>modules.c</code> files) if there is <strong>no
- userID</strong> or <strong>rule</strong> matching the supplied
- userID. If there is a userID and/or rule specified; the usual
- password and access checks will be applied and a failure will give
- an Authorization Required reply.</p>
-
- <p>So if a userID appears in the database of more than one module;
- or if a valid <directive module="core">Require</directive>
- directive applies to more than one module; then the first module
- will verify the credentials; and no access is passed on;
- regardless of the AuthAuthoritative setting.</p>
-
- <p>By default; control is not passed on; and an unknown userID or
- rule will result in an Authorization Required reply. Not setting
- it thus keeps the system secure; and forces an NCSA compliant
- behaviour.</p>
-
-</usage>
-</directivesynopsis>
-
-</modulesynopsis>
diff --git a/docs/manual/mod/mod_auth_basic.xml.ja b/docs/manual/mod/mod_auth_basic.xml.ja
deleted file mode 100644
index 99dfe48..0000000
--- a/docs/manual/mod/mod_auth_basic.xml.ja
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="iso-2022-jp"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<modulesynopsis>
-<!-- English revision: 1.3 -->
-
-<name>mod_auth_basic</name>
-<description>$B4pK\G'>Z(B</description>
-<status>Base</status>
-<sourcefile>mod_auth_basic.c</sourcefile>
-<identifier>auth_basic_module</identifier>
-<compatibility>Apache 2.0.44 $B0J9_(B</compatibility>
-
-<summary>
-
- <p>$BM?$($i$l$?%W%m%P%$%@(B ($BLuCm(B: $BG'>Z$G$N>H2q$r9T$&Ld$$9g$o$;@h(B)
- $B$G%f!<%6$r8!:w$7!"(BHTTP $B4pK\G'>Z$G%"%/%;%9@)8B$G$-$k$h$&$K$J$j$^$9!#(B
- HTTP $B%@%$%8%'%9%HG'>Z$K$D$$$F$O(B <module>mod_auth_digest</module>
- $B$GDs6!$5$l$^$9!#(B</p>
-
-</summary>
-<seealso><directive module="core">AuthName</directive></seealso>
-<seealso><directive module="core">AuthType</directive></seealso>
-
-<directivesynopsis>
-<name>AuthBasicProvider</name>
-<description>$B$3$N0LCV$KBP$9$kG'>Z%W%m%P%$%@$r@_Dj$7$^$9!#(B</description>
-<syntax>AuthBasicProvider <em>provider-name</em></syntax>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p><directive>AuthBasicProvider</directive> $B%G%#%l%/%F%#%V$G!"(B
- $B$3$N0LCV$KBP$9$k%f!<%6G'>Z$KMQ$$$i$l$kG'>Z%W%m%P%$%@$r@_Dj$7$^$9!#(B</p>
-
- <p>$BG'>Z%W%m%P%$%@$K$D$$$F$O(B
- <module>mod_authn_dbm</module>, <module>mod_authn_file</module>
- $B$r$4Mw2<$5$$!#(B</p>
-
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthBasicAuthoritative</name>
-<description>$BG'>Z$H>5G'$r!"$h$jDc$$%l%Y%k$N%b%8%e!<%k$K0\9T$5$;$k$+$r(B
-$B@_Dj$7$^$9!#(B</description>
-<syntax>AuthBasicAuthoritative on|off</syntax>
-<default>AuthBasicAuthoritative on</default>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p><directive>AuthBasicAuthoritative</directive>
- $B%G%#%l%/%F%#%V$GL@<(E*$K(B <strong>'off'</strong>$B$K@_Dj$9$k$H!"(B
- $BM?$($i$l$?G'>Z%f!<%6(B ID $B$KBP$7$F(B<strong>$B%f!<%6(B ID $B$,$J$$(B</strong>
- $B$^$?$O(B<strong>$B%k!<%k$,$J$$(B</strong>$B>l9g$K!"(B
- $BG'>Z$H>5G'$NN>J}$N%W%m%;%9$,!"(B
- $B$h$jDc$$%l%Y%k$N%b%8%e!<%k(B (<code>Configuration</code> $B$H(B
- <code>modules.c</code> $B%U%!%$%k$GDj5A(B) $B$K0\9T$9$k$h$&$K$G$-$^$9!#(B
- $B%f!<%6(B ID $B$,$"$k!"$+$D$^$?$O!"%k!<%k$,;XDj$5$l$F$$$k>l9g$O!"(B
- $BDL>o$N%Q%9%o!<%I$H%"%/%;%9%A%'%C%/$,E,MQ$5$l$F!"(B
- $BG'>Z$K<:GT$9$k$H!V(B Authorization Required $B!W1~Ez$,JV$5$l$^$9!#(B</p>
-
- <p>$B$G$9$+$i!"Fs$D0J>e$N%b%8%e!<%k$N%G!<%?%Y!<%9$GF10l$N(B
- $B%f!<%6(B ID $B$,8=$o$l$?$j!"(B
- $B$^$?$O!"@5$7$$(B <directive module="core">Require</directive>
- $B%G%#%l%/%F%#%V$,Fs$D0J>e$N%b%8%e!<%k$G8=$o$l$?$j$7$?>l9g$O!"(B
- $B0l$DL\$N%b%8%e!<%k$,G'Dj$r9T$C$F!"(BAuthAuthoritative $B@_Dj$K4X$o$i$:!"(B
- $B%"%/%;%9$O0\9T$7$^$;$s!#(B</p>
-
- <p>$B%G%U%)%k%H$G$O!"@)8f$O0\9T$7$^$;$s!#$=$7$F!"L$CN$N%f!<%6(B ID $B$d(B
- $B%k!<%k$,$"$C$F$b!V(B Authorization Required $B!W1~Ez$,JV$5$l$^$9!#(B
- $B$G$9$+$i!"$3$N%G%#%l%/%F%#%V@_Dj$7$J$$$3$H$G%7%9%F%`$N0BA4$r0];}$G$-$F!"$^$?!"(B
- NCSA $B=`5r$N5sF0$r6/@)$G$-$^$9!#(B</p>
-
-</usage>
-</directivesynopsis>
-
-</modulesynopsis>
diff --git a/docs/manual/mod/mod_auth_dbm.html.en b/docs/manual/mod/mod_auth_dbm.html.en
new file mode 100644
index 0000000..c232ccf
--- /dev/null
+++ b/docs/manual/mod/mod_auth_dbm.html.en
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mod_auth_dbm - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_auth_dbm</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Provides for user authentication using DBM
+ files</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>auth_dbm_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_auth_dbm.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available only in versions prior to 2.1</td></tr></table>
+<h3>Summary</h3>
+
+ <p>This module provides for HTTP Basic Authentication, where
+ the usernames and passwords are stored in DBM type database
+ files. It is an alternative to the plain text password files
+ provided by <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code>.</p>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authdbmauthoritative">AuthDBMAuthoritative</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authdbmgroupfile">AuthDBMGroupFile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authdbmtype">AuthDBMType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authdbmuserfile">AuthDBMUserFile</a></li>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<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>
+<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></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthDBMAuthoritative" id="AuthDBMAuthoritative">AuthDBMAuthoritative</a> <a name="authdbmauthoritative" id="authdbmauthoritative">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets whether authentication and authorization will be
+passwed on to lower level modules</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDBMAuthoritative On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthDBMAuthoritative 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_auth_dbm</td></tr>
+</table>
+ <p>Setting the <code class="directive">AuthDBMAuthoritative</code>
+ directive explicitly to <code>Off</code> allows for both
+ authentication and authorization to be passed on to lower level
+ modules (as defined in the <code>modules.c</code> files) if there
+ is <strong>no userID</strong> or <strong>rule</strong> matching the
+ supplied userID. If there is a userID and/or rule specified; the
+ usual password and access checks will be applied and a failure will
+ give an "Authentication Required" reply.</p>
+
+ <p>So if a userID appears in the database of more than one module;
+ or if a valid <code class="directive"><a href="../mod/core.html#require">Require</a></code>
+ directive applies to more than one module; then the first module
+ will verify the credentials; and no access is passed on;
+ regardless of the <code class="directive">AuthDBMAuthoritative</code>
+ setting.</p>
+
+ <p>A common use for this is in conjunction with one of the
+ basic auth modules; such as <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code>. Whereas this
+ DBM module supplies the bulk of the user credential checking; a
+ few (administrator) related accesses fall through to a lower
+ level with a well protected <code>.htpasswd</code> file.</p>
+
+ <p>By default, control is not passed on and an unknown userID
+ or rule will result in an "Authentication Required" reply. Not
+ setting it thus keeps the system secure and forces an NCSA
+ compliant behaviour.</p>
+
+ <div class="warning"><h3>Security:</h3>
+ <p>Do consider the implications of allowing a user to allow
+ fall-through in his <code>.htaccess</code> file; and verify that this
+ is really what you want; Generally it is easier to just secure
+ a single <code>.htpasswd</code> file, than it is to secure a
+ database which might have more access interfaces.</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="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
+of user groups for authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDBMGroupFile <var>file-path</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#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_auth_dbm</td></tr>
+</table>
+ <p>The <code class="directive">AuthDBMGroupFile</code> directive sets the
+ name of a DBM file containing the list of user groups for user
+ authentication. <var>File-path</var> is the absolute path to the
+ group file.</p>
+
+ <p>The group file is keyed on the username. The value for a
+ user is a comma-separated list of the groups to which the users
+ belongs. There must be no whitespace within the value, and it
+ must never contain any colons.</p>
+
+ <p>Security: make sure that the
+ <code class="directive">AuthDBMGroupFile</code> is stored outside the
+ document tree of the web-server; do <em>not</em> put it in the
+ directory that it protects. Otherwise, clients will be able to
+ download the <code class="directive">AuthDBMGroupFile</code> unless
+ otherwise protected.</p>
+
+ <p>Combining Group and Password DBM files: In some cases it is
+ easier to manage a single database which contains both the
+ password and group details for each user. This simplifies any
+ support programs that need to be written: they now only have to
+ deal with writing to and locking a single DBM file. This can be
+ accomplished by first setting the group and password files to
+ point to the same DBM:</p>
+
+ <div class="example"><p><code>
+ AuthDBMGroupFile /www/userbase<br />
+ AuthDBMUserFile /www/userbase
+ </code></p></div>
+
+ <p>The key for the single DBM is the username. The value consists
+ of</p>
+
+ <div class="example"><p><code>
+ <var>Unix Crypt-ed Password</var>:<var>List of Groups</var>[:(ignored)]
+ </code></p></div>
+
+ <p>The password section contains the encrypted password as before.
+ This is followed by a colon and the comma separated list of groups.
+ Other data may optionally be left in the DBM file after another colon;
+ it is ignored by the authentication module. This is what
+ www.telescope.org uses for its combined password and group database.</p>
+
+</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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the type of database file that is used to
+store passwords</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDBMType default|SDBM|GDBM|NDBM|DB</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthDBMType default</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_auth_dbm</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0.30 and later.</td></tr>
+</table>
+ <p>Sets the type of database file that is used to store the passwords.
+ The default database type is determined at compile time. The
+ availability of other types of database files also depends on
+ <a href="../install.html#dbm">compile-time settings</a>.</p>
+
+ <p>It is crucial that whatever program you use to create your password
+ 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="directive-section"><h2><a name="AuthDBMUserFile" id="AuthDBMUserFile">AuthDBMUserFile</a> <a name="authdbmuserfile" id="authdbmuserfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets thename of a database file containing the list of users and
+passwords for authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDBMUserFile <var>file-path</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#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_auth_dbm</td></tr>
+</table>
+ <p>The <code class="directive">AuthDBMUserFile</code> directive sets the
+ name of a DBM file containing the list of users and passwords for
+ user authentication. <var>File-path</var> is the absolute path to
+ the user file.</p>
+
+ <p>The user file is keyed on the username. The value for a user is
+ the encrypted password, optionally followed by a colon and arbitrary
+ data. The colon and the data following it will be ignored by the
+ server.</p>
+
+ <div class="warning"><h3>Security:</h3>
+ <p>Make sure that the <code class="directive">AuthDBMUserFile</code> is stored
+ outside the document tree of the web-server; do <em>not</em> put it in
+ the directory that it protects. Otherwise, clients will be able to
+ download the <code class="directive">AuthDBMUserFile</code>.</p>
+ </div>
+
+ <p>Important compatibility note: The implementation of
+ "dbmopen" in the apache modules reads the string length of the
+ hashed values from the DBM data structures, rather than relying
+ upon the string being NULL-appended. Some applications, such as
+ the Netscape web server, rely upon the string being
+ NULL-appended, so if you are having trouble using DBM files
+ interchangeably between applications this may be a part of the
+ problem.</p>
+
+ <p>A perl script called
+ <a href="../programs/dbmmanage.html">dbmmanage</a> is included with
+ Apache. This program can be used to create and update DBM
+ format password files for use with this module.</p>
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/obs_mod_auth_dbm.xml b/docs/manual/mod/mod_auth_dbm.xml
similarity index 63%
rename from docs/manual/mod/obs_mod_auth_dbm.xml
rename to docs/manual/mod/mod_auth_dbm.xml
index 6f0703b..66fb25a 100644
--- a/docs/manual/mod/obs_mod_auth_dbm.xml
+++ b/docs/manual/mod/mod_auth_dbm.xml
@@ -6,33 +6,16 @@
<name>mod_auth_dbm</name>
<description>Provides for user authentication using DBM
files</description>
-<status>Obsolete</status>
-<hint>obsolete since 2.0.44</hint>
+<status>Extension</status>
<sourcefile>mod_auth_dbm.c</sourcefile>
<identifier>auth_dbm_module</identifier>
-<compatibility>Available only in versions up to 2.0.43</compatibility>
+<compatibility>Available only in versions prior to 2.1</compatibility>
<summary>
- <note type="warning"><title>This module is obsolete!</title>
- <p>Note, that this module has been marked as obsolete. A bunch
- of modules was introduced in Apache version 2.0.44 that
- support the new Authentication/Authorization provider mechnism.</p>
-
- <p>In order to get the ability of HTTP Basic Authentication, you have
- to use the <module>mod_auth_basic</module> module that implements
- the HTTP part. <module>mod_authn_dbm</module> provides for user
- authentication based on DBM-files. DBM-File based group
- authorization is now done by the <module>mod_authz_dbm</module>
- module.</p>
-
- <p>This document is kept only for historical reasons and no
- longer maintained.</p>
- </note>
-
<p>This module provides for HTTP Basic Authentication, where
the usernames and passwords are stored in DBM type database
files. It is an alternative to the plain text password files
- provided by <module status="obsolete">mod_auth</module>.</p>
+ provided by <module>mod_auth</module>.</p>
</summary>
<seealso><directive module="core">AuthName</directive></seealso>
@@ -87,12 +70,11 @@
<var>Unix Crypt-ed Password</var>:<var>List of Groups</var>[:(ignored)]
</example>
- <p>The password section contains the Unix <code>crypt()</code>
- password as before. This is followed by a colon and the comma
- separated list of groups. Other data may optionally be left in the
- DBM file after another colon; it is ignored by the authentication
- module. This is what www.telescope.org uses for its combined
- password and group database.</p>
+ <p>The password section contains the encrypted password as before.
+ This is followed by a colon and the comma separated list of groups.
+ Other data may optionally be left in the DBM file after another colon;
+ it is ignored by the authentication module. This is what
+ www.telescope.org uses for its combined password and group database.</p>
</usage>
</directivesynopsis>
@@ -112,15 +94,16 @@
the user file.</p>
<p>The user file is keyed on the username. The value for a user is
- the <code>crypt()</code> encrypted password, optionally followed
- by a colon and arbitrary data. The colon and the data following it
- will be ignored by the server.</p>
+ the encrypted password, optionally followed by a colon and arbitrary
+ data. The colon and the data following it will be ignored by the
+ server.</p>
- <p>Security: make sure that the
- <directive>AuthDBMUserFile</directive> is stored outside the
- document tree of the web-server; do <em>not</em> put it in the
- directory that it protects. Otherwise, clients will be able to
- download the <directive>AuthDBMUserFile</directive>.</p>
+ <note type="warning"><title>Security:</title>
+ <p>Make sure that the <directive>AuthDBMUserFile</directive> is stored
+ outside the document tree of the web-server; do <em>not</em> put it in
+ the directory that it protects. Otherwise, clients will be able to
+ download the <directive>AuthDBMUserFile</directive>.</p>
+ </note>
<p>Important compatibility note: The implementation of
"dbmopen" in the apache modules reads the string length of the
@@ -150,14 +133,13 @@
<compatibility>Available in version 2.0.30 and later.</compatibility>
<usage>
+ <p>Sets the type of database file that is used to store the passwords.
+ The default database type is determined at compile time. The
+ availability of other types of database files also depends on
+ <a href="../install.html#dbm">compile-time settings</a>.</p>
-<p>Sets the type of database file that is used to store the passwords.
-The default database type is determined at compile time. The
-availability of other types of database files also depends on
-<a href="../install.html#dbm">compile-time settings</a>.</p>
-
-<p>It is crucial that whatever program you use to create your password
-files is configured to use the same type of database.</p>
+ <p>It is crucial that whatever program you use to create your password
+ files is configured to use the same type of database.</p>
</usage>
</directivesynopsis>
@@ -165,49 +147,47 @@
<name>AuthDBMAuthoritative</name>
<description>Sets whether authentication and authorization will be
passwed on to lower level modules</description>
-<syntax>AuthDBMAuthoritative on|off</syntax>
-<default>AuthDBMAuthoritative on</default>
+<syntax>AuthDBMAuthoritative On|Off</syntax>
+<default>AuthDBMAuthoritative On</default>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>AuthConfig</override>
<usage>
-
-<note>This information has not been updated to take into account the
-new module ordering techniques in Apache 2.0</note>
-
<p>Setting the <directive>AuthDBMAuthoritative</directive>
- directive explicitly to <strong>'off'</strong> allows for both
+ directive explicitly to <code>Off</code> allows for both
authentication and authorization to be passed on to lower level
- modules (as defined in the <code>Configuration</code> and
- <code>modules.c</code> file if there is <strong>no userID</strong>
- or <strong>rule</strong> matching the supplied userID. If there is
- a userID and/or rule specified; the usual password and access
- checks will be applied and a failure will give an Authorization
- Required reply.</p>
+ modules (as defined in the <code>modules.c</code> files) if there
+ is <strong>no userID</strong> or <strong>rule</strong> matching the
+ supplied userID. If there is a userID and/or rule specified; the
+ usual password and access checks will be applied and a failure will
+ give an "Authentication Required" reply.</p>
<p>So if a userID appears in the database of more than one module;
or if a valid <directive module="core">Require</directive>
directive applies to more than one module; then the first module
will verify the credentials; and no access is passed on;
- regardless of the <directive>AuthAuthoritative</directive> setting.</p>
+ regardless of the <directive>AuthDBMAuthoritative</directive>
+ setting.</p>
<p>A common use for this is in conjunction with one of the
- basic auth modules; such as <module status="obsolete">mod_auth</module>. Whereas this
+ basic auth modules; such as <module>mod_auth</module>. Whereas this
DBM module supplies the bulk of the user credential checking; a
few (administrator) related accesses fall through to a lower
- level with a well protected .htpasswd file.</p>
+ level with a well protected <code>.htpasswd</code> file.</p>
<p>By default, control is not passed on and an unknown userID
- or rule will result in an Authorization Required reply. Not
+ or rule will result in an "Authentication Required" reply. Not
setting it thus keeps the system secure and forces an NCSA
compliant behaviour.</p>
- <p>Security: Do consider the implications of allowing a user to
- allow fall-through in his .htaccess file; and verify that this
- is really what you want; Generally it is easier to just secure
- a single .htpasswd file, than it is to secure a database which
- might have more access interfaces.</p>
+ <note type="warning"><title>Security:</title>
+ <p>Do consider the implications of allowing a user to allow
+ fall-through in his <code>.htaccess</code> file; and verify that this
+ is really what you want; Generally it is easier to just secure
+ a single <code>.htpasswd</code> file, than it is to secure a
+ database which might have more access interfaces.</p>
+ </note>
</usage>
</directivesynopsis>
diff --git a/docs/manual/mod/mod_auth_digest.html.en b/docs/manual/mod/mod_auth_digest.html.en
index 139330c..9b407be 100644
--- a/docs/manual/mod/mod_auth_digest.html.en
+++ b/docs/manual/mod/mod_auth_digest.html.en
@@ -4,16 +4,36 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_auth_digest - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_auth_digest</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>User authentication using MD5
- Digest Authentication.</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>auth_digest_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_auth_digest.c</td></tr></table><h3>Summary</h3>
- <p>This module implements HTTP Digest Authentication. However, it
+ -->
+<title>mod_auth_digest - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_auth_digest</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>User authentication using MD5
+ Digest Authentication.</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>auth_digest_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_auth_digest.c</td></tr></table>
+<h3>Summary</h3>
+
+ <p>This module implements HTTP Digest Authentication. However, it
has not been extensively tested and is therefore marked
experimental.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authdigestalgorithm">AuthDigestAlgorithm</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authdigestalgorithm">AuthDigestAlgorithm</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authdigestdomain">AuthDigestDomain</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authdigestfile">AuthDigestFile</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authdigestgroupfile">AuthDigestGroupFile</a></li>
@@ -21,178 +41,278 @@
<li><img alt="" src="../images/down.gif" /> <a href="#authdigestnonceformat">AuthDigestNonceFormat</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authdigestnoncelifetime">AuthDigestNonceLifetime</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authdigestqop">AuthDigestQop</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> Using Digest Authentication</li></ul><h3>See also</h3><ul class="seealso"><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><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></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Using Digest Authentication</h2>
+<li><img alt="" src="../images/down.gif" /> <a href="#authdigestshmemsize">AuthDigestShmemSize</a></li>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#using">Using Digest Authentication</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<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>
+<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></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>Using MD5 Digest authentication is very simple. Simply set
- up authentication normally, using "AuthType Digest" and
- "AuthDigestFile" instead of the normal "AuthType Basic" and
- "AuthUserFile"; also, replace any "AuthGroupFile" with
- "AuthDigestGroupFile". Then add a "AuthDigestDomain" directive
- containing at least the root URI(s) for this protection space.
- Example:</p>
-<div class="example"><p><code>
- <Location /private/><br />
- AuthType Digest<br />
- AuthName "private area"<br />
- AuthDigestDomain /private/ http://mirror.my.dom/private2/<br />
- AuthDigestFile /web/auth/.digest_pw<br />
- Require valid-user<br />
- </Location>
-</code></p></div>
+ up authentication normally, using <code>AuthType Digest</code> and
+ <code class="directive"><a href="#authdigestfile">AuthDigestFile</a></code> instead
+ of the normal <code>AuthType Basic</code> and <code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code>; also, replace any <code class="directive"><a href="../mod/mod_auth.html#authgroupfile">AuthGroupFile</a></code> with <code class="directive"><a href="#authdigestgroupfile">AuthDigestGroupFile</a></code>. 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>
-<div class="note"><h3>Note</h3>
-
+ <p>Appropriate user (text) files can be created using the
+ <a href="../programs/htdigest.html">htdigest</a> tool.</p>
+
+ <div class="example"><h3>Example:</h3><p><code>
+ <Location /private/><br />
+ <span class="indent">
+ AuthType Digest<br />
+ AuthName "private area"<br />
+ AuthDigestDomain /private/ http://mirror.my.dom/private2/<br />
+ AuthDigestFile /web/auth/.digest_pw<br />
+ Require valid-user<br />
+ </span>
+ </Location>
+ </code></p></div>
+
+ <div class="note"><h3>Note</h3>
<p>Digest authentication provides a more secure password system
than Basic authentication, but only works with supporting
- browsers. As of July 2002, the major browsers that support digest
+ browsers. As of November 2002, the major browsers that support digest
authentication are <a href="http://www.opera.com/">Opera</a>, <a href="http://www.microsoft.com/windows/ie/">MS Internet
- Explorer</a> (fails when used with a query string), <a href="http://www.w3.org/Amaya/">Amaya</a> and <a href="http://www.mozilla.org">Mozilla</a>. Since digest
- authentication is not as widely implemented as basic
- authentication, you should use it only in controlled settings.</p>
-
+ Explorer</a> (fails when used with a query string), <a href="http://www.w3.org/Amaya/">Amaya</a>, <a href="http://www.mozilla.org">Mozilla</a> and <a href="http://channels.netscape.com/ns/browsers/download.jsp">Netscape</a> since version 7. Since digest authentication is not
+ as widely implemented as basic authentication, you should use it only
+ in controlled environments.</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="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
-response hases in digest authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestAlgorithm MD5|MD5-sess</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthDigestAlgorithm MD5</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
+<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
+response hases in digest authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDigestAlgorithm MD5|MD5-sess</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthDigestAlgorithm MD5</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_digest</td></tr>
+</table>
<p>The <code class="directive">AuthDigestAlgorithm</code> directive
selects the algorithm used to calculate the challenge and response
hashes.</p>
- <p><strong><em>MD5-sess</em> is not correctly implemented
- yet</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="AuthDigestDomain" id="AuthDigestDomain">AuthDigestDomain</a> <a name="authdigestdomain" id="authdigestdomain">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>URIs that are in the same protection space for digest
-authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestDomain <em>URI</em> [<em>URI</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
+ <div class="note">
+ <code>MD5-sess</code> is not correctly implemented yet.
+ </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="AuthDigestDomain" id="AuthDigestDomain">AuthDigestDomain</a> <a name="authdigestdomain" id="authdigestdomain">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>URIs that are in the same protection space for digest
+authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDigestDomain <var>URI</var> [<var>URI</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#Override">Override:</a></th><td>AuthConfig</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_auth_digest</td></tr>
+</table>
<p>The <code class="directive">AuthDigestDomain</code> directive allows
you to specify one or more URIs which are in the same protection
- space (i.e. use the same realm and username/password info). The
- specified URIs are prefixes, i.e. the client will assume that all
- URIs "below" these are also protected by the same
- username/password. The URIs may be either absolute URIs
- (i.e. inluding a scheme, host, port, etc) or relative URIs.</p>
+ space (<em>i.e.</em> use the same realm and username/password info).
+ The specified URIs are prefixes, <em>i.e.</em> the client will assume
+ that all URIs "below" these are also protected by the same
+ username/password. The URIs may be either absolute URIs (<em>i.e.</em>
+ inluding a scheme, host, port, etc) or relative URIs.</p>
<p>This directive <em>should</em> always be specified and
contain at least the (set of) root URI(s) for this space.
Omitting to do so will cause the client to send the
Authorization header for <em>every request</em> sent to this
server. Apart from increasing the size of the request, it may
- also have a detrimental effect on performance if
- "AuthDigestNcCheck" is on.</p>
+ also have a detrimental effect on performance if <code class="directive"><a href="#authdigestnccheck">AuthDigestNcCheck</a></code> is on.</p>
<p>The URIs specified can also point to different servers, in
which case clients (which understand this) will then share
username/password info across multiple servers without
- prompting the user each time. </p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthDigestFile" id="AuthDigestFile">AuthDigestFile</a> <a name="authdigestfile" id="authdigestfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Location of the text file containing the list
-of users and encoded passwords for digest authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestFile <em>file-path</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
+ prompting the user each time.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthDigestFile" id="AuthDigestFile">AuthDigestFile</a> <a name="authdigestfile" id="authdigestfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location of the text file containing the list
+of users and encoded passwords for digest authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDigestFile <var>file-path</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#Override">Override:</a></th><td>AuthConfig</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_auth_digest</td></tr>
+</table>
<p>The <code class="directive">AuthDigestFile</code> directive sets the
name of a textual file containing the list of users and encoded
- passwords for digest authentication. <em>File-path</em> is the
+ passwords for digest authentication. <var>File-path</var> is the
absolute path to the user file.</p>
<p>The digest file uses a special format. Files in this format
can be created using the <a href="../programs/htdigest.html">htdigest</a> utility found in
- the support/ subdirectory of the Apache distribution.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthDigestGroupFile" id="AuthDigestGroupFile">AuthDigestGroupFile</a> <a name="authdigestgroupfile" id="authdigestgroupfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Name of the text file containing the list of groups
-for digest authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestGroupFile <em>file-path</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
+ the <code>support/</code> subdirectory of the Apache distribution.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthDigestGroupFile" id="AuthDigestGroupFile">AuthDigestGroupFile</a> <a name="authdigestgroupfile" id="authdigestgroupfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Name of the text file containing the list of groups
+for digest authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDigestGroupFile <var>file-path</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#Override">Override:</a></th><td>AuthConfig</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_auth_digest</td></tr>
+</table>
<p>The <code class="directive">AuthDigestGroupFile</code> directive sets
the name of a textual file containing the list of groups and their
- members (user names). <em>File-path</em> is the absolute path to
+ members (user names). <var>File-path</var> is the absolute path to
the group file.</p>
<p>Each line of the group file contains a groupname followed by
a colon, followed by the member usernames separated by spaces.
Example:</p>
-<div class="example"><p><code>mygroup: bob joe anne</code></p></div>
+ <div class="example"><p><code>mygroup: bob joe anne</code></p></div>
<p>Note that searching large text files is <em>very</em>
inefficient.</p>
- <p>Security: make sure that the AuthGroupFile is stored outside
- the document tree of the web-server; do <em>not</em> put it in
- the directory that it protects. Otherwise, clients will be able
- to download the AuthGroupFile.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthDigestNcCheck" id="AuthDigestNcCheck">AuthDigestNcCheck</a> <a name="authdigestnccheck" id="authdigestnccheck">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enables or disables checking of the nonce-count sent by the
-server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestNcCheck On|Off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthDigestNcCheck 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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
- <p><strong>Not implemented yet.</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="AuthDigestNonceFormat" id="AuthDigestNonceFormat">AuthDigestNonceFormat</a> <a name="authdigestnonceformat" id="authdigestnonceformat">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Determines how the nonce is generated</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestNonceFormat <em>format</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
- <p><strong>Not implemented yet.</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="AuthDigestNonceLifetime" id="AuthDigestNonceLifetime">AuthDigestNonceLifetime</a> <a name="authdigestnoncelifetime" id="authdigestnoncelifetime">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>How long the server nonce is valid</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestNonceLifetime <em>seconds</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthDigestNonceLifetime 300</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
+ <div class="warning"><h3>Security:</h3>
+ <p>Make sure that the <code class="directive">AuthGroupFile</code> is stored
+ outside the document tree of the web-server; do <em>not</em> put it in
+ the directory that it protects. Otherwise, clients may be able
+ to download the <code class="directive">AuthGroupFile</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="AuthDigestNcCheck" id="AuthDigestNcCheck">AuthDigestNcCheck</a> <a name="authdigestnccheck" id="authdigestnccheck">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables or disables checking of the nonce-count sent by the
+server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDigestNcCheck On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthDigestNcCheck 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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_digest</td></tr>
+</table>
+ <div class="note">
+ Not implemented yet.
+ </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="AuthDigestNonceFormat" id="AuthDigestNonceFormat">AuthDigestNonceFormat</a> <a name="authdigestnonceformat" id="authdigestnonceformat">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines how the nonce is generated</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDigestNonceFormat <var>format</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#Override">Override:</a></th><td>AuthConfig</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_auth_digest</td></tr>
+</table>
+ <div class="note">Not implemented yet.</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="AuthDigestNonceLifetime" id="AuthDigestNonceLifetime">AuthDigestNonceLifetime</a> <a name="authdigestnoncelifetime" id="authdigestnoncelifetime">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>How long the server nonce is valid</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDigestNonceLifetime <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthDigestNonceLifetime 300</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_digest</td></tr>
+</table>
<p>The <code class="directive">AuthDigestNonceLifetime</code> directive
controls how long the server nonce is valid. When the client
contacts the server using an expired nonce the server will send
- back a 401 with <code>stale=true</code>. If <em>seconds</em> is
+ back a 401 with <code>stale=true</code>. If <var>seconds</var> is
greater than 0 then it specifies the amount of time for which the
nonce is valid; this should probably never be set to less than 10
- seconds. If <em>seconds</em> is less than 0 then the nonce never
+ seconds. If <var>seconds</var> is less than 0 then the nonce never
expires.
</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthDigestQop" id="AuthDigestQop">AuthDigestQop</a> <a name="authdigestqop" id="authdigestqop">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Determines the quality-of-protection to use in digest
-authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestQop none|auth|auth-int [auth|auth-int]</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthDigestQop auth</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthDigestQop" id="AuthDigestQop">AuthDigestQop</a> <a name="authdigestqop" id="authdigestqop">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines the quality-of-protection to use in digest
+authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDigestQop none|auth|auth-int [auth|auth-int]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthDigestQop auth</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_digest</td></tr>
+</table>
<p>The <code class="directive">AuthDigestQop</code> directive determines
- the quality-of-protection to use. <em>auth</em> will only do
- authentication (username/password); <em>auth-int</em> is
+ the quality-of-protection to use. <code>auth</code> will only do
+ authentication (username/password); <code>auth-int</code> is
authentication plus integrity checking (an MD5 hash of the entity
- is also computed and checked); <em>none</em> will cause the module
+ is also computed and checked); <code>none</code> will cause the module
to use the old RFC-2069 digest algorithm (which does not include
- integrity checking). Both <em>auth</em> and <em>auth-int</em> may
+ integrity checking). Both <code>auth</code> and <code>auth-int</code> may
be specified, in which the case the browser will choose which of
- these to use. <em>none</em> should only be used if the browser for
+ these to use. <code>none</code> should only be used if the browser for
some reason does not like the challenge it receives otherwise.</p>
- <p><strong><em>auth-int</em> is not implemented
- yet</strong>.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ <div class="note">
+ <code>auth-int</code> is not implemented yet.
+ </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="AuthDigestShmemSize" id="AuthDigestShmemSize">AuthDigestShmemSize</a> <a name="authdigestshmemsize" id="authdigestshmemsize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The amount of shared memory to allocate for keeping track
+of clients</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthDigestShmemSize <var>size</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthDigestShmemSize 1000</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_auth_digest</td></tr>
+</table>
+ <p>The <code class="directive">AuthDigestShmemSize</code> directive defines
+ the amount of shared memory, that will be allocated at the server
+ startup for keeping track of clients. Note that the shared memory
+ segment cannot be set less than the space that is neccessary for
+ tracking at least <em>one</em> client. This value is dependant on your
+ system. If you want to find out the exact value, you may simply
+ set <code class="directive">AuthDigestShmemSize</code> to the value of
+ <code>0</code> and read the error message after trying to start the
+ server.</p>
+
+ <p>The <var>size</var> is normally expressed in Bytes, but you
+ may let the number follow a <code>K</code> or an <code>M</code> to
+ express your value as KBytes or MBytes. For example, the following
+ directives are all equivalent:</p>
+
+ <div class="example"><p><code>
+ AuthDigestShmemSize 1048576<br />
+ AuthDigestShmemSize 1024K<br />
+ AuthDigestShmemSize 1M
+ </code></p></div>
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth_digest.xml b/docs/manual/mod/mod_auth_digest.xml
index ec2b63d..44e865f 100644
--- a/docs/manual/mod/mod_auth_digest.xml
+++ b/docs/manual/mod/mod_auth_digest.xml
@@ -2,6 +2,7 @@
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
<modulesynopsis>
+
<name>mod_auth_digest</name>
<description>User authentication using MD5
Digest Authentication.</description>
@@ -10,7 +11,7 @@
<identifier>auth_digest_module</identifier>
<summary>
- <p>This module implements HTTP Digest Authentication. However, it
+ <p>This module implements HTTP Digest Authentication. However, it
has not been extensively tested and is therefore marked
experimental.</p>
</summary>
@@ -20,46 +21,54 @@
<seealso><directive module="core">Require</directive></seealso>
<seealso><directive module="core">Satisfy</directive></seealso>
-<section><title>Using Digest Authentication</title>
+<section id="using"><title>Using Digest Authentication</title>
<p>Using MD5 Digest authentication is very simple. Simply set
- up authentication normally, using "AuthType Digest" and
- "AuthDigestFile" instead of the normal "AuthType Basic" and
- "AuthUserFile"; also, replace any "AuthGroupFile" with
- "AuthDigestGroupFile". Then add a "AuthDigestDomain" directive
- containing at least the root URI(s) for this protection space.
- Example:</p>
-<example>
- <Location /private/><br />
- AuthType Digest<br />
- AuthName "private area"<br />
- AuthDigestDomain /private/ http://mirror.my.dom/private2/<br />
- AuthDigestFile /web/auth/.digest_pw<br />
- Require valid-user<br />
- </Location>
-</example>
+ up authentication normally, using <code>AuthType Digest</code> and
+ <directive module="mod_auth_digest">AuthDigestFile</directive> instead
+ of the normal <code>AuthType Basic</code> and <directive
+ module="mod_auth">AuthUserFile</directive>; also, replace any <directive
+ module="mod_auth">AuthGroupFile</directive> with <directive
+ module="mod_auth_digest">AuthDigestGroupFile</directive>. Then add a
+ <directive module="mod_auth_digest">AuthDigestDomain</directive> directive
+ containing at least the root URI(s) for this protection space.</p>
-<note><title>Note</title>
-
+ <p>Appropriate user (text) files can be created using the
+ <a href="../programs/htdigest.html">htdigest</a> tool.</p>
+
+ <example><title>Example:</title>
+ <Location /private/><br />
+ <indent>
+ AuthType Digest<br />
+ AuthName "private area"<br />
+ AuthDigestDomain /private/ http://mirror.my.dom/private2/<br />
+ AuthDigestFile /web/auth/.digest_pw<br />
+ Require valid-user<br />
+ </indent>
+ </Location>
+ </example>
+
+ <note><title>Note</title>
<p>Digest authentication provides a more secure password system
than Basic authentication, but only works with supporting
- browsers. As of July 2002, the major browsers that support digest
+ browsers. As of November 2002, the major browsers that support digest
authentication are <a href="http://www.opera.com/">Opera</a>, <a
href="http://www.microsoft.com/windows/ie/">MS Internet
Explorer</a> (fails when used with a query string), <a
- href="http://www.w3.org/Amaya/">Amaya</a> and <a
- href="http://www.mozilla.org">Mozilla</a>. Since digest
- authentication is not as widely implemented as basic
- authentication, you should use it only in controlled settings.</p>
-
-</note>
+ href="http://www.w3.org/Amaya/">Amaya</a>, <a
+ href="http://www.mozilla.org">Mozilla</a> and <a
+ href="http://channels.netscape.com/ns/browsers/download.jsp"
+ >Netscape</a> since version 7. Since digest authentication is not
+ as widely implemented as basic authentication, you should use it only
+ in controlled environments.</p>
+ </note>
</section>
<directivesynopsis>
<name>AuthDigestFile</name>
<description>Location of the text file containing the list
of users and encoded passwords for digest authentication</description>
-<syntax>AuthDigestFile <em>file-path</em></syntax>
+<syntax>AuthDigestFile <var>file-path</var></syntax>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>AuthConfig</override>
@@ -67,13 +76,13 @@
<usage>
<p>The <directive>AuthDigestFile</directive> directive sets the
name of a textual file containing the list of users and encoded
- passwords for digest authentication. <em>File-path</em> is the
+ passwords for digest authentication. <var>File-path</var> is the
absolute path to the user file.</p>
<p>The digest file uses a special format. Files in this format
can be created using the <a
href="../programs/htdigest.html">htdigest</a> utility found in
- the support/ subdirectory of the Apache distribution.</p>
+ the <code>support/</code> subdirectory of the Apache distribution.</p>
</usage>
</directivesynopsis>
@@ -81,7 +90,7 @@
<name>AuthDigestGroupFile</name>
<description>Name of the text file containing the list of groups
for digest authentication</description>
-<syntax>AuthDigestGroupFile <em>file-path</em></syntax>
+<syntax>AuthDigestGroupFile <var>file-path</var></syntax>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>AuthConfig</override>
@@ -89,22 +98,24 @@
<usage>
<p>The <directive>AuthDigestGroupFile</directive> directive sets
the name of a textual file containing the list of groups and their
- members (user names). <em>File-path</em> is the absolute path to
+ members (user names). <var>File-path</var> is the absolute path to
the group file.</p>
<p>Each line of the group file contains a groupname followed by
a colon, followed by the member usernames separated by spaces.
Example:</p>
-<example>mygroup: bob joe anne</example>
+ <example>mygroup: bob joe anne</example>
<p>Note that searching large text files is <em>very</em>
inefficient.</p>
- <p>Security: make sure that the AuthGroupFile is stored outside
- the document tree of the web-server; do <em>not</em> put it in
- the directory that it protects. Otherwise, clients will be able
- to download the AuthGroupFile.</p>
+ <note type="warning"><title>Security:</title>
+ <p>Make sure that the <directive>AuthGroupFile</directive> is stored
+ outside the document tree of the web-server; do <em>not</em> put it in
+ the directory that it protects. Otherwise, clients may be able
+ to download the <directive>AuthGroupFile</directive>.</p>
+ </note>
</usage>
</directivesynopsis>
@@ -120,25 +131,26 @@
<usage>
<p>The <directive>AuthDigestQop</directive> directive determines
- the quality-of-protection to use. <em>auth</em> will only do
- authentication (username/password); <em>auth-int</em> is
+ the quality-of-protection to use. <code>auth</code> will only do
+ authentication (username/password); <code>auth-int</code> is
authentication plus integrity checking (an MD5 hash of the entity
- is also computed and checked); <em>none</em> will cause the module
+ is also computed and checked); <code>none</code> will cause the module
to use the old RFC-2069 digest algorithm (which does not include
- integrity checking). Both <em>auth</em> and <em>auth-int</em> may
+ integrity checking). Both <code>auth</code> and <code>auth-int</code> may
be specified, in which the case the browser will choose which of
- these to use. <em>none</em> should only be used if the browser for
+ these to use. <code>none</code> should only be used if the browser for
some reason does not like the challenge it receives otherwise.</p>
- <p><strong><em>auth-int</em> is not implemented
- yet</strong>.</p>
+ <note>
+ <code>auth-int</code> is not implemented yet.
+ </note>
</usage>
</directivesynopsis>
<directivesynopsis>
<name>AuthDigestNonceLifetime</name>
<description>How long the server nonce is valid</description>
-<syntax>AuthDigestNonceLifetime <em>seconds</em></syntax>
+<syntax>AuthDigestNonceLifetime <var>seconds</var></syntax>
<default>AuthDigestNonceLifetime 300</default>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
@@ -148,11 +160,11 @@
<p>The <directive>AuthDigestNonceLifetime</directive> directive
controls how long the server nonce is valid. When the client
contacts the server using an expired nonce the server will send
- back a 401 with <code>stale=true</code>. If <em>seconds</em> is
+ back a 401 with <code>stale=true</code>. If <var>seconds</var> is
greater than 0 then it specifies the amount of time for which the
nonce is valid; this should probably never be set to less than 10
- seconds. If <em>seconds</em> is less than 0 then the nonce never
- expires. <!-- Not implemented yet If <EM>seconds</EM> is 0 then
+ seconds. If <var>seconds</var> is less than 0 then the nonce never
+ expires. <!-- Not implemented yet: If <var>seconds</var> is 0 then
the nonce may be used exactly once by the client. Note that while
one-time-nonces provide higher security against replay attacks,
they also have significant performance implications, as the
@@ -172,17 +184,15 @@
<directivesynopsis>
<name>AuthDigestNonceFormat</name>
<description>Determines how the nonce is generated</description>
-<syntax>AuthDigestNonceFormat <em>format</em></syntax>
+<syntax>AuthDigestNonceFormat <var>format</var></syntax>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>AuthConfig</override>
<usage>
- <p><strong>Not implemented yet.</strong> <!--
- <P>The AuthDigestNonceFormat directive determines how the nonce is
- generated.
- -->
- </p>
+ <note>Not implemented yet.</note>
+ <!-- The AuthDigestNonceFormat directive determines how the nonce is
+ generated. -->
</usage>
</directivesynopsis>
@@ -195,19 +205,21 @@
<contextlist><context>server config</context></contextlist>
<usage>
- <p><strong>Not implemented yet.</strong> <!--
- <P>The AuthDigestNcCheck directive enables or disables the checking of the
- nonce-count sent by the server.
+ <note>
+ Not implemented yet.
+ </note>
+ <!--
+ <p>The AuthDigestNcCheck directive enables or disables the checking of the
+ nonce-count sent by the server.</p>
- <P>While recommended from a security standpoint, turning this directive
- On has one important performance implication. To check the nonce-count
- *all* requests (which have an Authorization header, irrespective of
- whether they require digest authentication) must be serialized through
- a critical section. If the server is handling a large number of
- requests which contain the Authorization header then this may noticeably
- impact performance.
- -->
- </p>
+ <p>While recommended from a security standpoint, turning this directive
+ On has one important performance implication. To check the nonce-count
+ *all* requests (which have an Authorization header, irrespective of
+ whether they require digest authentication) must be serialized through
+ a critical section. If the server is handling a large number of
+ requests which contain the Authorization header then this may noticeably
+ impact performance.</p>
+ -->
</usage>
</directivesynopsis>
@@ -226,12 +238,14 @@
selects the algorithm used to calculate the challenge and response
hashes.</p>
- <p><strong><em>MD5-sess</em> is not correctly implemented
- yet</strong>. <!--
- <P>To use <EM>MD5-sess</EM> you must first code up the
- <VAR>get_userpw_hash()</VAR> function in <VAR>mod_auth_digest.c</VAR> .
- -->
- </p>
+ <note>
+ <code>MD5-sess</code> is not correctly implemented yet.
+ </note>
+ <!--
+ <p>To use <code>MD5-sess</code> you must first code up the
+ <code>get_userpw_hash()</code> function in
+ <code>mod_auth_digest.c</code>.</p>
+ -->
</usage>
</directivesynopsis>
@@ -239,7 +253,7 @@
<name>AuthDigestDomain</name>
<description>URIs that are in the same protection space for digest
authentication</description>
-<syntax>AuthDigestDomain <em>URI</em> [<em>URI</em>] ...</syntax>
+<syntax>AuthDigestDomain <var>URI</var> [<var>URI</var>] ...</syntax>
<contextlist><context>directory</context><context>.htaccess</context>
</contextlist>
<override>AuthConfig</override>
@@ -247,28 +261,57 @@
<usage>
<p>The <directive>AuthDigestDomain</directive> directive allows
you to specify one or more URIs which are in the same protection
- space (i.e. use the same realm and username/password info). The
- specified URIs are prefixes, i.e. the client will assume that all
- URIs "below" these are also protected by the same
- username/password. The URIs may be either absolute URIs
- (i.e. inluding a scheme, host, port, etc) or relative URIs.</p>
+ space (<em>i.e.</em> use the same realm and username/password info).
+ The specified URIs are prefixes, <em>i.e.</em> the client will assume
+ that all URIs "below" these are also protected by the same
+ username/password. The URIs may be either absolute URIs (<em>i.e.</em>
+ inluding a scheme, host, port, etc) or relative URIs.</p>
<p>This directive <em>should</em> always be specified and
contain at least the (set of) root URI(s) for this space.
Omitting to do so will cause the client to send the
Authorization header for <em>every request</em> sent to this
server. Apart from increasing the size of the request, it may
- also have a detrimental effect on performance if
- "AuthDigestNcCheck" is on.</p>
+ also have a detrimental effect on performance if <directive
+ module="mod_auth_digest">AuthDigestNcCheck</directive> is on.</p>
<p>The URIs specified can also point to different servers, in
which case clients (which understand this) will then share
username/password info across multiple servers without
- prompting the user each time. </p>
+ prompting the user each time.</p>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>AuthDigestShmemSize</name>
+<description>The amount of shared memory to allocate for keeping track
+of clients</description>
+<syntax>AuthDigestShmemSize <var>size</var></syntax>
+<default>AuthDigestShmemSize 1000</default>
+<contextlist><context>server config</context></contextlist>
+
+<usage>
+ <p>The <directive>AuthDigestShmemSize</directive> directive defines
+ the amount of shared memory, that will be allocated at the server
+ startup for keeping track of clients. Note that the shared memory
+ segment cannot be set less than the space that is neccessary for
+ tracking at least <em>one</em> client. This value is dependant on your
+ system. If you want to find out the exact value, you may simply
+ set <directive>AuthDigestShmemSize</directive> to the value of
+ <code>0</code> and read the error message after trying to start the
+ server.</p>
+
+ <p>The <var>size</var> is normally expressed in Bytes, but you
+ may let the number follow a <code>K</code> or an <code>M</code> to
+ express your value as KBytes or MBytes. For example, the following
+ directives are all equivalent:</p>
+
+ <example>
+ AuthDigestShmemSize 1048576<br />
+ AuthDigestShmemSize 1024K<br />
+ AuthDigestShmemSize 1M
+ </example>
</usage>
</directivesynopsis>
</modulesynopsis>
-
-
-
diff --git a/docs/manual/mod/mod_auth_ldap.html.en b/docs/manual/mod/mod_auth_ldap.html.en
index feff2e1..668b961 100644
--- a/docs/manual/mod/mod_auth_ldap.html.en
+++ b/docs/manual/mod/mod_auth_ldap.html.en
@@ -4,13 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_auth_ldap - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_auth_ldap</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Allows an LDAP directory to be used to store the database
-for HTTP Basic authentication.</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>auth_ldap_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_auth_ldap.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0.41 and later</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_auth_ldap - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_auth_ldap</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Allows an LDAP directory to be used to store the database
+for HTTP Basic authentication.</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>auth_ldap_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_auth_ldap.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0.41 and later</td></tr></table>
+<h3>Summary</h3>
+
<p><code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> supports the following features:</p>
<ul>
@@ -30,7 +47,10 @@
<li>Support for LDAP over SSL (requires the Netscape SDK) or
TLS (requires the OpenLDAP 2.x SDK).</li>
</ul>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authldapauthoritative">AuthLDAPAuthoritative</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authldapauthoritative">AuthLDAPAuthoritative</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authldapbinddn">AuthLDAPBindDN</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authldapbindpassword">AuthLDAPBindPassword</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authldapcomparednonserver">AuthLDAPCompareDNOnServer</a></li>
@@ -40,10 +60,26 @@
<li><img alt="" src="../images/down.gif" /> <a href="#authldapgroupattribute">AuthLDAPGroupAttribute</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authldapstarttls directive">AuthLDAPStartTLS directive</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authldapstarttls">AuthLDAPStartTLS</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#authldapurl">AuthLDAPUrl</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#contents">Contents</a></li><li><img alt="" src="../images/down.gif" /> <a href="#operation">Operation</a></li><li><img alt="" src="../images/down.gif" /> <a href="#requiredirectives">The require Directives</a></li><li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li><li><img alt="" src="../images/down.gif" /> <a href="#usingtls">Using TLS</a></li><li><img alt="" src="../images/down.gif" /> <a href="#usingssl">Using SSL</a></li><li><img alt="" src="../images/down.gif" /> <a href="#frontpage">Using Microsoft
- FrontPage with mod_auth_ldap</a></li></ul><h3>See also</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</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="contents" id="contents">Contents</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#contents">Contents</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#operation">Operation</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#requiredirectives">The require Directives</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#usingtls">Using TLS</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#usingssl">Using SSL</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#frontpage">Using Microsoft
+ FrontPage with mod_auth_ldap</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</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="contents" id="contents">Contents</a></h2>
<ul>
<li>
@@ -83,7 +119,9 @@
</ul>
</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="operation" id="operation">Operation</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="operation" id="operation">Operation</a></h2>
<p>There are two phases in granting access to a user. The first
phase is authentication, in which <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code>
@@ -216,7 +254,9 @@
</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="requiredirectives" id="requiredirectives">The require Directives</a></h2>
+</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/core.html#require">Require</a></code>
directives are used during the authorization phase to ensure that
@@ -303,7 +343,9 @@
<p>Behavior of this directive is modified by the <code class="directive"><a href="#authldapcomparednonserver">AuthLDAPCompareDNOnServer</a></code>
directive.</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>
+</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>
<ul>
<li>
@@ -397,12 +439,16 @@
has a pager or not.</p>
</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="usingtls" id="usingtls">Using TLS</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="usingtls" id="usingtls">Using TLS</a></h2>
<p>To use TLS, simply set the <code class="directive"><a href="#authldapstarttls">AuthLDAPStartTLS</a></code> to on.
Nothing else needs to be done (other than ensure that your LDAP
server is configured for TLS).</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="usingssl" id="usingssl">Using SSL</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="usingssl" id="usingssl">Using SSL</a></h2>
<p>If <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> is linked against the
Netscape/iPlanet LDAP SDK, it will not talk to any SSL server
@@ -418,12 +464,13 @@
<p>To specify a secure LDAP server, use <em>ldaps://</em> in the
<code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code>
directive, instead of <em>ldap://</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="frontpage" id="frontpage">Using Microsoft
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="frontpage" id="frontpage">Using Microsoft
FrontPage with mod_auth_ldap</a></h2>
<p>Normally, FrontPage uses FrontPage-web-specific user/group
- files (i.e., the <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code> and
- <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> modules) to handle all
+ files (i.e., the <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code> module) to handle all
authentication. Unfortunately, it is not possible to just
change to LDAP authentication by adding the proper directives,
because it will break the <em>Permissions</em> forms in
@@ -470,7 +517,7 @@
<ul>
<li>When choosing the LDAP URL, the attribute to use for
authentication should be something that will also be valid
- for putting into a <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code> user file.
+ for putting into a <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code> user file.
The user ID is ideal for this.</li>
<li>When adding users via FrontPage, FrontPage administrators
@@ -482,17 +529,15 @@
file. This could cause confusion for web administrators.</li>
- <li>Apache must be compiled with <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code>,
- <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code> and
- <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> in order to
+ <li>Apache must be compiled with <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code> in order to
use FrontPage support. This is because Apache will still use
- the <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> group file for determine the extent of a
+ the <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code> group file for determine the extent of a
user's access to the FrontPage web.</li>
<li>The directives must be put in the <code>.htaccess</code>
files. Attempting to put them inside <code class="directive"><a href="../mod/core.html#location"><Location></a></code> or <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> directives won't work. This
is because <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> has to be able to grab
- the <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
+ the <code class="directive"><a href="../mod/mod_auth.html#authuserfile">AuthUserFile</a></code>
directive that is found in FrontPage <code>.htaccess</code>
files so that it knows where to look for the valid user list. If
the <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> directives aren't in the same
@@ -502,49 +547,68 @@
and won't be able to find the FrontPage-managed user file.</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="AuthLDAPAuthoritative" id="AuthLDAPAuthoritative">AuthLDAPAuthoritative</a> <a name="authldapauthoritative" id="authldapauthoritative">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Prevent other authentication modules from
-authenticating the user if this one fails</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthLDAPAuthoritative on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthLDAPAuthoritative 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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthLDAPAuthoritative" id="AuthLDAPAuthoritative">AuthLDAPAuthoritative</a> <a name="authldapauthoritative" id="authldapauthoritative">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Prevent other authentication modules from
+authenticating the user if this one fails</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPAuthoritative on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPAuthoritative 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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_ldap</td></tr>
+</table>
<p>Set to <code>off</code> if this module should let other
authentication modules attempt to authenticate the user, should
authentication with this module fail. Control is only passed on
to lower modules if there is no DN or rule that matches the
supplied user name (as passed by the client).</p>
-</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+
+</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_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_auth_ldap.html">mod_auth_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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+
+</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_ldap</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>
-</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+
+</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_ldap</td></tr>
+</table>
<p>When set, <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_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_auth_ldap.html">mod_auth_ldap</a></code> will search the
@@ -555,61 +619,86 @@
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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+
+</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_ldap</td></tr>
+</table>
<p>This directive specifies when <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_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="AuthLDAPEnabled" id="AuthLDAPEnabled">AuthLDAPEnabled</a> <a name="authldapenabled" id="authldapenabled">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Turn on or off LDAP authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code> AuthLDAPEnabled on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthLDAPEnabled 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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthLDAPEnabled" id="AuthLDAPEnabled">AuthLDAPEnabled</a> <a name="authldapenabled" id="authldapenabled">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Turn on or off LDAP authentication</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code> AuthLDAPEnabled on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPEnabled 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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_ldap</td></tr>
+</table>
<p>Set to <code>off</code> to disable
<code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> in certain directories. This is
useful if you have <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> enabled at or
near the top of your tree, but want to disable it completely in
certain locations.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthLDAPFrontPageHack" id="AuthLDAPFrontPageHack">AuthLDAPFrontPageHack</a> <a name="authldapfrontpagehack" id="authldapfrontpagehack">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Allow LDAP authentication to work with MS FrontPage</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthLDAPFrontPageHack on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthLDAPFronPageHack 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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthLDAPFrontPageHack" id="AuthLDAPFrontPageHack">AuthLDAPFrontPageHack</a> <a name="authldapfrontpagehack" id="authldapfrontpagehack">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Allow LDAP authentication to work with MS FrontPage</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPFrontPageHack on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPFronPageHack 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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_ldap</td></tr>
+</table>
<p>See the section on <a href="#frontpage">using Microsoft
FrontPage</a> with <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</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="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 check for group membership</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#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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+
+</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 check for group membership</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#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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_ldap</td></tr>
+</table>
<p>This directive specifies which LDAP attributes are used to
check for group membership. Multiple attributes can be used by
specifying this directive multiple times. If not specified,
then <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+
+</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_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,
@@ -620,39 +709,54 @@
<code>cn=Babs Jenson, o=Airius</code> as a member. If this
directive is not set, then <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_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="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>AuthLDAPUserIsDN 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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+
+</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>AuthLDAPUserIsDN 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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_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="AuthLDAPStartTLS directive" id="AuthLDAPStartTLS directive">AuthLDAPStartTLS directive</a> <a name="authldapstarttls directive" id="authldapstarttls directive">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Use a secure TLS connection to the LDAP server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthLDAPStartTLS on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthLDAPStartTLS 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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthLDAPStartTLS" id="AuthLDAPStartTLS">AuthLDAPStartTLS</a> <a name="authldapstarttls" id="authldapstarttls">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use a secure TLS connection to the LDAP server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AuthLDAPStartTLS on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AuthLDAPStartTLS 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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_ldap</td></tr>
+</table>
<p>If this directive is set to <code>on</code>,
<code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> will start a secure TLS session
after connecting to the LDAP server. This requires your LDAP
server to support TLS.</p>
-</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</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_ldap</td></tr></table>
+
+</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</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_auth_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>
@@ -736,4 +840,10 @@
<code>(&(posixid=*)(cn=Babs Jenson))</code>.</p>
<p>See above for examples of <code class="directive"><a href="#authldapurl">AuthLDAPURL</a></code> URLs.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth_ldap.xml b/docs/manual/mod/mod_auth_ldap.xml
index fe96647..d274a25 100644
--- a/docs/manual/mod/mod_auth_ldap.xml
+++ b/docs/manual/mod/mod_auth_ldap.xml
@@ -441,8 +441,7 @@
FrontPage with mod_auth_ldap</title>
<p>Normally, FrontPage uses FrontPage-web-specific user/group
- files (i.e., the <module>mod_authn_file</module> and
- <module>mod_authz_groupfile</module> modules) to handle all
+ files (i.e., the <module>mod_auth</module> module) to handle all
authentication. Unfortunately, it is not possible to just
change to LDAP authentication by adding the proper directives,
because it will break the <em>Permissions</em> forms in
@@ -491,7 +490,7 @@
<ul>
<li>When choosing the LDAP URL, the attribute to use for
authentication should be something that will also be valid
- for putting into a <module>mod_authn_file</module> user file.
+ for putting into a <module>mod_auth</module> user file.
The user ID is ideal for this.</li>
<li>When adding users via FrontPage, FrontPage administrators
@@ -503,11 +502,9 @@
file. This could cause confusion for web administrators.</li>
<!-- XXX is that true? was mod_auth before the aaa change -->
- <li>Apache must be compiled with <module>mod_auth_basic</module>,
- <module>mod_authn_file</module> and
- <module>mod_authz_groupfile</module> in order to
+ <li>Apache must be compiled with <module>mod_auth</module> in order to
use FrontPage support. This is because Apache will still use
- the <module>mod_authz_groupfile</module> group file for determine the extent of a
+ the <module>mod_auth</module> group file for determine the extent of a
user's access to the FrontPage web.</li>
<li>The directives must be put in the <code>.htaccess</code>
@@ -515,7 +512,7 @@
type="section">Location</directive> or <directive module="core"
type="section">Directory</directive> directives won't work. This
is because <module>mod_auth_ldap</module> has to be able to grab
- the <directive module="mod_authn_file">AuthUserFile</directive>
+ the <directive module="mod_auth">AuthUserFile</directive>
directive that is found in FrontPage <code>.htaccess</code>
files so that it knows where to look for the valid user list. If
the <module>mod_auth_ldap</module> directives aren't in the same
@@ -713,7 +710,7 @@
</directivesynopsis>
<directivesynopsis>
-<name>AuthLDAPStartTLS directive</name>
+<name>AuthLDAPStartTLS</name>
<description>Use a secure TLS connection to the LDAP server</description>
<syntax>AuthLDAPStartTLS on|off</syntax>
<default>AuthLDAPStartTLS off</default>
diff --git a/docs/manual/mod/mod_authn_anon.html.en b/docs/manual/mod/mod_authn_anon.html.en
deleted file mode 100644
index b19fdff..0000000
--- a/docs/manual/mod/mod_authn_anon.html.en
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_authn_anon - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_authn_anon</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Allows "anonymous" user access to authenticated
- areas</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>authn_anon_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_authn_anon.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0.44 and later</td></tr></table><h3>Summary</h3>
- <p>This module does access control in a manner similar to
- anonymous-ftp sites; <em>i.e.</em> have a 'magic' user id
- 'anonymous' and the email address as a password. These email
- addresses can be logged.</p>
-
- <p>Combined with other (database) access control methods, this
- allows for effective user tracking and customization according
- to a user profile while still keeping the site open for
- 'unregistered' users. One advantage of using Auth-based user
- tracking is that, unlike magic-cookies and funny URL
- pre/postfixes, it is completely browser independent and it
- allows users to share URLs.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#anonymous">Anonymous</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_authoritative">Anonymous_Authoritative</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_logemail">Anonymous_LogEmail</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_nouserid">Anonymous_NoUserID</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> Example</li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Example</h2>
-
- <p>The example below (when combined with the Auth directives of a
- htpasswd-file based (or GDM, mSQL <em>etc.</em>) base access
- control system allows users in as 'guests' with the following
- properties:</p>
-
- <ul>
- <li>It insists that the user enters a userId.
- (<code>Anonymous_NoUserId</code>)</li>
-
- <li>It insists that the user enters a password.
- (<code>Anonymous_MustGiveEmail</code>)</li>
-
- <li>The password entered must be a valid email address, ie.
- contain at least one '@' and a '.'.
- (<code>Anonymous_VerifyEmail</code>)</li>
-
- <li>The userID must be one of <code>anonymous guest www test
- welcome</code> and comparison is <strong>not</strong> case
- sensitive.</li>
-
- <li>And the Email addresses entered in the passwd field are
- logged to the error log file
- (<code>Anonymous_LogEmail</code>)</li>
- </ul>
-
- <p>Excerpt of httpd.conf:</p>
-
-<div class="example"><p><code>
- Anonymous_NoUserId off<br />
- Anonymous_MustGiveEmail on<br />
- Anonymous_VerifyEmail on<br />
- Anonymous_LogEmail on<br />
- Anonymous anonymous guest www test welcome<br />
-<br />
- AuthName "Use 'anonymous' & Email address for
- guest entry"<br />
- AuthType basic<br />
-<br />
- # An
- AuthUserFile/AuthDBMUserFile<br />
- # directive must be specified, or use<br />
- # Anonymous_Authoritative for public access.<br />
- # In the .htaccess for the public directory, add:<br />
- <Files *><br />
- Order Deny,Allow<br />
- Allow from all<br />
-<br />
- Require valid-user<br />
- </Files><br />
-</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">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Specifies userIDs that areallowed access without
-password verification</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous <em>user</em> [<em>user</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_authn_anon</td></tr></table>
- <p>A list of one or more 'magic' userIDs which are allowed
- access without password verification. The userIDs are space
- separated. It is possible to use the ' and " quotes to allow a
- space in a userID as well as the \ escape character.</p>
-
- <p>Please note that the comparison is
- <strong>case-IN-sensitive</strong>.<br />
- I strongly suggest that the magic username
- '<code>anonymous</code>' is always one of the allowed
- userIDs.</p>
-
- <p>Example:</p>
-<div class="example"><p><code>Anonymous anonymous "Not Registered" 'I don\'t know'</code></p></div>
-
- <p>This would allow the user to enter without password
- verification by using the userId's 'anonymous',
- 'AnonyMous','Not Registered' and 'I Don't Know'.</p>
-</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_Authoritative" id="Anonymous_Authoritative">Anonymous_Authoritative</a> <a name="anonymous_authoritative" id="anonymous_authoritative">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configures if authorization will fall-through
-to other methods</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous_Authoritative on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Anonymous_Authoritative 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_authn_anon</td></tr></table>
- <p>When set 'on', there is no fall-through to other authorization
- methods. So if a userID does not match the values specified in the
- <code class="directive"><a href="#anonymous">Anonymous</a></code> directive,
- access is denied.</p>
-
- <p>Be sure you know what you are doing when you decide to
- switch it on. And remember that it is the linking order of the
- modules (in the Configuration / Make file) which details the
- order in which the Authorization modules are queried.</p>
-</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_LogEmail" id="Anonymous_LogEmail">Anonymous_LogEmail</a> <a name="anonymous_logemail" id="anonymous_logemail">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets whether the password entered will be logged in the
-error log</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous_LogEmail on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Anonymous_LogEmail 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_authn_anon</td></tr></table>
- <p>When set <code>on</code>, the default, the 'password' entered
- (which hopefully contains a sensible email address) is logged in
- the 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="Anonymous_MustGiveEmail" id="Anonymous_MustGiveEmail">Anonymous_MustGiveEmail</a> <a name="anonymous_mustgiveemail" id="anonymous_mustgiveemail">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Specifies whether blank passwords are allowed</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous_MustGiveEmail on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Anonymous_MustGiveEmail 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_authn_anon</td></tr></table>
- <p>Specifies whether the user must specify an email address as
- the password. This prohibits blank passwords.</p>
-</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_NoUserID" id="Anonymous_NoUserID">Anonymous_NoUserID</a> <a name="anonymous_nouserid" id="anonymous_nouserid">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets whether the userID field may be empty</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous_NoUserID on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Anonymous_NoUserID 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_authn_anon</td></tr></table>
- <p>When set <code>on</code>, users can leave the userID (and
- perhaps the password field) empty. This can be very convenient for
- MS-Explorer users who can just hit return or click directly on the
- OK button; which seems a natural reaction.</p>
-</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_VerifyEmail" id="Anonymous_VerifyEmail">Anonymous_VerifyEmail</a> <a name="anonymous_verifyemail" id="anonymous_verifyemail">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets whether to check the password field for a correctly
-formatted email address</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous_VerifyEmail on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Anonymous_VerifyEmail 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_authn_anon</td></tr></table>
- <p>When set <code>on</code> the 'password' entered is checked for
- at least one '@' and a '.' to encourage users to enter valid email
- addresses (see the above <code class="directive"><a href="#auth_logemail">Auth_LogEmail</a></code>).</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_anon.xml b/docs/manual/mod/mod_authn_anon.xml
deleted file mode 100644
index 48b99cc..0000000
--- a/docs/manual/mod/mod_authn_anon.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<modulesynopsis>
-
-<name>mod_authn_anon</name>
-<description>Allows "anonymous" user access to authenticated
- areas</description>
-<status>Extension</status>
-<sourcefile>mod_authn_anon.c</sourcefile>
-<identifier>authn_anon_module</identifier>
-<compatibility>Available in Apache 2.0.44 and later</compatibility>
-
-<summary>
- <p>This module does access control in a manner similar to
- anonymous-ftp sites; <em>i.e.</em> have a 'magic' user id
- 'anonymous' and the email address as a password. These email
- addresses can be logged.</p>
-
- <p>Combined with other (database) access control methods, this
- allows for effective user tracking and customization according
- to a user profile while still keeping the site open for
- 'unregistered' users. One advantage of using Auth-based user
- tracking is that, unlike magic-cookies and funny URL
- pre/postfixes, it is completely browser independent and it
- allows users to share URLs.</p>
-</summary>
-
-<section><title>Example</title>
-
- <p>The example below (when combined with the Auth directives of a
- htpasswd-file based (or GDM, mSQL <em>etc.</em>) base access
- control system allows users in as 'guests' with the following
- properties:</p>
-
- <ul>
- <li>It insists that the user enters a userId.
- (<code>Anonymous_NoUserId</code>)</li>
-
- <li>It insists that the user enters a password.
- (<code>Anonymous_MustGiveEmail</code>)</li>
-
- <li>The password entered must be a valid email address, ie.
- contain at least one '@' and a '.'.
- (<code>Anonymous_VerifyEmail</code>)</li>
-
- <li>The userID must be one of <code>anonymous guest www test
- welcome</code> and comparison is <strong>not</strong> case
- sensitive.</li>
-
- <li>And the Email addresses entered in the passwd field are
- logged to the error log file
- (<code>Anonymous_LogEmail</code>)</li>
- </ul>
-
- <p>Excerpt of httpd.conf:</p>
-
-<example>
- Anonymous_NoUserId off<br />
- Anonymous_MustGiveEmail on<br />
- Anonymous_VerifyEmail on<br />
- Anonymous_LogEmail on<br />
- Anonymous anonymous guest www test welcome<br />
-<br />
- AuthName "Use 'anonymous' & Email address for
- guest entry"<br />
- AuthType basic<br />
-<br />
- # An
- AuthUserFile/AuthDBMUserFile<br />
- # directive must be specified, or use<br />
- # Anonymous_Authoritative for public access.<br />
- # In the .htaccess for the public directory, add:<br />
- <Files *><br />
- Order Deny,Allow<br />
- Allow from all<br />
-<br />
- Require valid-user<br />
- </Files><br />
-</example>
-</section>
-
-<directivesynopsis>
-<name>Anonymous</name>
-<description>Specifies userIDs that areallowed access without
-password verification</description>
-<syntax>Anonymous <em>user</em> [<em>user</em>] ...</syntax>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>A list of one or more 'magic' userIDs which are allowed
- access without password verification. The userIDs are space
- separated. It is possible to use the ' and " quotes to allow a
- space in a userID as well as the \ escape character.</p>
-
- <p>Please note that the comparison is
- <strong>case-IN-sensitive</strong>.<br />
- I strongly suggest that the magic username
- '<code>anonymous</code>' is always one of the allowed
- userIDs.</p>
-
- <p>Example:</p>
-<example>Anonymous anonymous "Not Registered" 'I don\'t know'</example>
-
- <p>This would allow the user to enter without password
- verification by using the userId's 'anonymous',
- 'AnonyMous','Not Registered' and 'I Don't Know'.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>Anonymous_Authoritative</name>
-<description>Configures if authorization will fall-through
-to other methods</description>
-<syntax>Anonymous_Authoritative on|off</syntax>
-<default>Anonymous_Authoritative off</default>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>When set 'on', there is no fall-through to other authorization
- methods. So if a userID does not match the values specified in the
- <directive module="mod_authn_anon">Anonymous</directive> directive,
- access is denied.</p>
-
- <p>Be sure you know what you are doing when you decide to
- switch it on. And remember that it is the linking order of the
- modules (in the Configuration / Make file) which details the
- order in which the Authorization modules are queried.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>Anonymous_LogEmail</name>
-<description>Sets whether the password entered will be logged in the
-error log</description>
-<syntax>Anonymous_LogEmail on|off</syntax>
-<default>Anonymous_LogEmail on</default>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>When set <code>on</code>, the default, the 'password' entered
- (which hopefully contains a sensible email address) is logged in
- the error log.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>Anonymous_MustGiveEmail</name>
-<description>Specifies whether blank passwords are allowed</description>
-<syntax>Anonymous_MustGiveEmail on|off</syntax>
-<default>Anonymous_MustGiveEmail on</default>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>Specifies whether the user must specify an email address as
- the password. This prohibits blank passwords.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>Anonymous_NoUserID</name>
-<description>Sets whether the userID field may be empty</description>
-<syntax>Anonymous_NoUserID on|off</syntax>
-<default>Anonymous_NoUserID off</default>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>When set <code>on</code>, users can leave the userID (and
- perhaps the password field) empty. This can be very convenient for
- MS-Explorer users who can just hit return or click directly on the
- OK button; which seems a natural reaction.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>Anonymous_VerifyEmail</name>
-<description>Sets whether to check the password field for a correctly
-formatted email address</description>
-<syntax>Anonymous_VerifyEmail on|off</syntax>
-<default>Anonymous_VerifyEmail off</default>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>When set <code>on</code> the 'password' entered is checked for
- at least one '@' and a '.' to encourage users to enter valid email
- addresses (see the above <directive
- module="mod_authn_anon">Auth_LogEmail</directive>).</p>
-</usage>
-</directivesynopsis>
-
-</modulesynopsis>
diff --git a/docs/manual/mod/mod_authn_dbm.html.en b/docs/manual/mod/mod_authn_dbm.html.en
deleted file mode 100644
index 80bb7f2..0000000
--- a/docs/manual/mod/mod_authn_dbm.html.en
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_authn_dbm - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_authn_dbm</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>User authentication using DBM files</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>authn_dbm_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_authn_dbm.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0.44 and later</td></tr></table><h3>Summary</h3>
- <p>This module provides authentication front-ends such as
- <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> and <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code>
- to authenticate users by looking up users in plain text password files.
- Similar functionality is provided by <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>.</p>
-
- <p>When using <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> or
- <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>, this module is invoked via the
- <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>
- with the 'dbm' value.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authdbmtype">AuthDBMType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdbmuserfile">AuthDBMUserFile</a></li>
-</ul><h3>See also</h3><ul class="seealso"><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><li>
- <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
-</li><li>
- <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</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="AuthDBMType" id="AuthDBMType">AuthDBMType</a> <a name="authdbmtype" id="authdbmtype">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the type of database file that is used to
-store passwords</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDBMType default|SDBM|GDBM|NDBM|DB</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthDBMType default</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_authn_dbm</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0.30 and later.</td></tr></table>
-
-<p>Sets the type of database file that is used to store the passwords.
-The default database type is determined at compile time. The
-availability of other types of database files also depends on
-<a href="../install.html#dbm">compile-time settings</a>.</p>
-
-<p>It is crucial that whatever program you use to create your password
-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="directive-section"><h2><a name="AuthDBMUserFile" id="AuthDBMUserFile">AuthDBMUserFile</a> <a name="authdbmuserfile" id="authdbmuserfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the name of a database file containing the list of users and
-passwords for authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDBMUserFile <em>file-path</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_authn_dbm</td></tr></table>
- <p>The <code class="directive">AuthDBMUserFile</code> directive sets the
- name of a DBM file containing the list of users and passwords for
- user authentication. <em>File-path</em> is the absolute path to
- the user file.</p>
-
- <p>The user file is keyed on the username. The value for a user is
- the <code>crypt()</code> encrypted password, optionally followed
- by a colon and arbitrary data. The colon and the data following it
- will be ignored by the server.</p>
-
- <p>Security: make sure that the
- <code class="directive">AuthDBMUserFile</code> is stored outside the
- document tree of the web-server; do <em>not</em> put it in the
- directory that it protects. Otherwise, clients will be able to
- download the <code class="directive">AuthDBMUserFile</code>.</p>
-
- <p>Important compatibility note: The implementation of
- "dbmopen" in the apache modules reads the string length of the
- hashed values from the DBM data structures, rather than relying
- upon the string being NULL-appended. Some applications, such as
- the Netscape web server, rely upon the string being
- NULL-appended, so if you are having trouble using DBM files
- interchangeably between applications this may be a part of the
- problem.</p>
-
- <p>A perl script called
- <a href="../programs/dbmmanage.html">dbmmanage</a> is included with
- Apache. This program can be used to create and update DBM
- format password files for use with this module.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_dbm.xml b/docs/manual/mod/mod_authn_dbm.xml
deleted file mode 100644
index 0351fb6..0000000
--- a/docs/manual/mod/mod_authn_dbm.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<modulesynopsis>
-
-<name>mod_authn_dbm</name>
-<description>User authentication using DBM files</description>
-<status>Extension</status>
-<sourcefile>mod_authn_dbm.c</sourcefile>
-<identifier>authn_dbm_module</identifier>
-<compatibility>Available in Apache 2.0.44 and later</compatibility>
-
-<summary>
- <p>This module provides authentication front-ends such as
- <module>mod_auth_digest</module> and <module>mod_auth_basic</module>
- to authenticate users by looking up users in plain text password files.
- Similar functionality is provided by <module>mod_authn_file</module>.</p>
-
- <p>When using <module>mod_auth_basic</module> or
- <module>mod_auth_digest</module>, this module is invoked via the
- <directive module="mod_auth_basic">AuthBasicProvider</directive> or
- <directive module="mod_auth_digest">AuthDigestProvider</directive>
- with the 'dbm' value.</p>
-</summary>
-
-<seealso><directive module="core">AuthName</directive></seealso>
-<seealso><directive module="core">AuthType</directive></seealso>
-<seealso>
- <directive module="mod_auth_basic">AuthBasicProvider</directive>
-</seealso>
-<seealso>
- <directive module="mod_auth_digest">AuthDigestProvider</directive>
-</seealso>
-
-<directivesynopsis>
-<name>AuthDBMUserFile</name>
-<description>Sets the name of a database file containing the list of users and
-passwords for authentication</description>
-<syntax>AuthDBMUserFile <em>file-path</em></syntax>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthDBMUserFile</directive> directive sets the
- name of a DBM file containing the list of users and passwords for
- user authentication. <em>File-path</em> is the absolute path to
- the user file.</p>
-
- <p>The user file is keyed on the username. The value for a user is
- the <code>crypt()</code> encrypted password, optionally followed
- by a colon and arbitrary data. The colon and the data following it
- will be ignored by the server.</p>
-
- <p>Security: make sure that the
- <directive>AuthDBMUserFile</directive> is stored outside the
- document tree of the web-server; do <em>not</em> put it in the
- directory that it protects. Otherwise, clients will be able to
- download the <directive>AuthDBMUserFile</directive>.</p>
-
- <p>Important compatibility note: The implementation of
- "dbmopen" in the apache modules reads the string length of the
- hashed values from the DBM data structures, rather than relying
- upon the string being NULL-appended. Some applications, such as
- the Netscape web server, rely upon the string being
- NULL-appended, so if you are having trouble using DBM files
- interchangeably between applications this may be a part of the
- problem.</p>
-
- <p>A perl script called
- <a href="../programs/dbmmanage.html">dbmmanage</a> is included with
- Apache. This program can be used to create and update DBM
- format password files for use with this module.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthDBMType</name>
-<description>Sets the type of database file that is used to
-store passwords</description>
-<syntax>AuthDBMType default|SDBM|GDBM|NDBM|DB</syntax>
-<default>AuthDBMType default</default>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-<compatibility>Available in version 2.0.30 and later.</compatibility>
-
-<usage>
-
-<p>Sets the type of database file that is used to store the passwords.
-The default database type is determined at compile time. The
-availability of other types of database files also depends on
-<a href="../install.html#dbm">compile-time settings</a>.</p>
-
-<p>It is crucial that whatever program you use to create your password
-files is configured to use the same type of database.</p>
-</usage>
-</directivesynopsis>
-
-</modulesynopsis>
diff --git a/docs/manual/mod/mod_authn_file.html.en b/docs/manual/mod/mod_authn_file.html.en
deleted file mode 100644
index 7ae0346..0000000
--- a/docs/manual/mod/mod_authn_file.html.en
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_authn_file - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_authn_file</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>User authentication using text files</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>authn_file_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_authn_file.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0.44 and later</td></tr></table><h3>Summary</h3>
-
- <p>This module provides authentication front-ends such as
- <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> and <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code>
- to authenticate users by looking up users in plain text password files.
- Similar functionality is provided by <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code>.</p>
-
- <p>When using <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> or
- <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>, this module is invoked via the
- <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>
- with the 'file' value.</p>
-
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authuserfile">AuthUserFile</a></li>
-</ul><h3>See also</h3><ul class="seealso"><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><li>
- <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
-</li><li>
- <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</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="AuthUserFile" id="AuthUserFile">AuthUserFile</a> <a name="authuserfile" id="authuserfile">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 of users and
-passwords for authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthUserFile <em>file-path</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>Base</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_authn_file</td></tr></table>
- <p>The <code class="directive">AuthUserFile</code> directive sets the name
- of a textual file containing the list of users and passwords for
- user authentication. <em>File-path</em> is the path to the user
- file. If it is not absolute (<em>i.e.</em>, if it doesn't begin
- with a slash), it is treated as relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</p>
-
- <p>Each line of the user file contains a username followed by
- a colon, followed by the <code>crypt()</code> encrypted
- password. The behavior of multiple occurrences of the same user is
- undefined.</p>
-
- <p>The utility <a href="../programs/htpasswd.html">htpasswd</a>
- which is installed as part of the binary distribution, or which
- can be found in <code>src/support</code>, is used to maintain
- this password file. See the <code>man</code> page for more
- details. In short:</p>
-
- <p>Create a password file 'Filename' with 'username' as the
- initial ID. It will prompt for the password:</p>
- <div class="example"><p><code>htpasswd -c Filename username</code></p></div>
-
- <p>Add or modify 'username2' in the password file 'Filename':</p>
- <div class="example"><p><code>htpasswd Filename username2</code></p></div>
-
- <p>Note that searching large text files is <em>very</em>
- inefficient; <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code> should be used
- instead.</p>
-
- <div class="note"><h3>Security</h3>
- <p>Make sure that the <code class="directive">AuthUserFile</code> is
- stored outside the document tree of the web-server; do <em>not</em>
- put it in the directory that it protects. Otherwise, clients will
- be able to download the <code class="directive">AuthUserFile</code>.</p>
- </div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_file.html.ja.jis b/docs/manual/mod/mod_authn_file.html.ja.jis
deleted file mode 100644
index e74a712..0000000
--- a/docs/manual/mod/mod_authn_file.html.ja.jis
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="iso-2022-jp"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_authn_file - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_authn_file</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%F%-%9%H%U%!%$%k$rMQ$$$?%f!<(B$B%6G'>Z(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>authn_file_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_authn_file.c</td></tr><tr><th><a href="module-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 2.0.44 $B0J9_(B</td></tr></table><h3>$B35MW(B</h3>
-
- <p>$BK\%b%8%e!<%k$O(B <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> $B$d(B
- <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> $B$H$$$C$?G'>Z%U%m%s%H%(%s%I$KBP$7$F!"(B
- $B%W%l%$%s%F%-%9%H$N%Q%9%o!<%I%U%!%$%kFb$+$i%f!<%6$r8!:w$9$k$3$H$G!"(B
- $B%f!<%6G'>Z5!G=$rDs6!$7$^$9!#;w$?$h$&$J5!G=$O(B <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code>
- $B$G$bDs6!$5$l$F$$$^(B$B$9!#(B</p>
-
- <p><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> $B$d(B <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
- $B$r;HMQ$9$k:]$K$O!"(B
- <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> $B$d(B
- <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprivider">AuthDigestPrivider</a></code>
- $B$G!V(B file $B!W$H;XDj$9$k$3$H$G$3$N%b%8%e(B$B!<%k$O5/F0$5$l$^$9!#(B</p>
-
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authuserfile">AuthUserFile</a></li>
-</ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><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><li>
- <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
-</li><li>
- <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</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="AuthUserFile" id="AuthUserFile">AuthUserFile</a> <a name="authuserfile" id="authuserfile">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$BG'>Z$K;HMQ$9$k%f!<%6$H%Q%9%o!<%I$N0lMw$,3JG<$5$l$F$$$k!"(B
-$B%F%-%9%H%U%!%$(B$B%k$NL>A0$r@_Dj$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AuthUserFile <em>file-path</em></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_authn_file</td></tr></table>
- <p><code class="directive">AuthUserFile</code> $B%G%#%l%/%F%#%V$O!"(B
- $B%f!<%6G'>Z$N$?$a$N%f!<%6$H%Q%9%o!<%I$N0lMw$r3JG<$7$?(B
- $B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B<em>file-path</em>
- $B$O%f!<%6%U%!%$%k$X$N%Q%9$G$9!#(B
- $B$b$7@dBP%Q%9$G$J$1$l$P(B
- (<em>$B$D$^$j(B</em> $B%9%i%C%7%e$G;O$^$i$J$$%Q%9$G$"$l$P(B)
- $B!"(B<code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
- $B$+$i$NAjBP%Q%9$H$7$F07$o$l$^$9!#(B</p>
-
- <p>$B%f!<%6%U%!%$%k$N3F9T$K$O!"%f!<%6L>!"%3%m%s!"(B
- <code>crypt()</code> $B$G0E9f2=$7$?%Q%9%o!<%I$r5-=R$7$^$9!#(B
- $BF10l%f!<%6$,J#?t2sEPO?$5$l$?;~$N5sF0$ODj5A$5$l$F$$$^$;$s!#(B</p>
-
- <p>$B%P%$%J%jG[I[$N0lIt$H$7$F%$%s%9%H!<%k$5$l$k$+!"(B
- $B$"$k$$$O(B <code>src/support</code> $B$K$"$k(B
- <a href="../programs/htpasswd.html">htpasswd</a>
- $B%f!<%F%#%j%F%#$G!"$3$N%Q%9%o!<%I%U%!%$%k$r%a%$%s%F%J%s%9$7$^$9!#(B
- $B>\:Y$O(B <code>man</code> $B%Z!<%8$r$4MwD:$/$H$7$F!"4JC1$K$O(B:</p>
-
- <p>$B=i4|(B ID <code>username</code> $B$G!"(B<code>Filename</code>
- $B$H$$$&%Q%9%o!<%I%U%!%$%k$r@8@.$7$^$9!#(B
- $B<!$N%3%^%s%I$rH/9T$9$k$H%Q%9%o!<%I$,MW5a$5$l$^$9(B:</p>
- <div class="example"><p><code>htpasswd -c Filename username</code></p></div>
-
- <p>$B%Q%9%o!<%I%U%!%$%k(B <code>Filename</code> $B$K!"(B<code>username2</code>
- $B$rDI2C$7$?$j=$@5$7$?$j$7$^$9(B:</p>
- <div class="example"><p><code>htpasswd Filename username2</code></p></div>
-
- <p>($BLuCm(B: $BHs>o$KB?$/$N%f!<%6$rEPO?$9$k$HBg$-$J%U%!%$%k$K$J$j$^$9$,(B)
- $BBg$-$J%F%-%9%H%U%!%$%k$r8!:w$9$k$N$O(B<em>$BHs>o$K8zN($,0-$$(B</em>
- $B$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#$=$N$h$&$JI,MW$N$"$k;~$O!"(B
- <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>
- $B$rBe$o$j$K;H$C$F$/$@$5$$!#(B</p>
-
- <div class="note"><h3>$B%;%-%e%j%F%#(B</h3>
- <p><code class="directive">AuthUserFile </code>
- $B$O!"%&%'%V%5!<%P$N%I%-%e%a%s%H%D%j!<$N30B&$KJ]4I$9$k$h$&$K$7$F$/$@$5$$!#(B
- $BJ]8n$7$h$&$H$7$F$$$k%G%#%l%/%H%j0J2<$K$O!"(B<em>$BCV$+$J$$$G2<$5$$(B</em>$B!#(B
- $B$=$&$7$J$$$H(B <code class="directive">AuthUserFile</code> $B$O(B
- $B%@%&%s%m!<%I$G$-$F$7$^$$$^$9!#(B</p>
- </div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_file.xml b/docs/manual/mod/mod_authn_file.xml
deleted file mode 100644
index c4297c3..0000000
--- a/docs/manual/mod/mod_authn_file.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<modulesynopsis>
-
-<name>mod_authn_file</name>
-<description>User authentication using text files</description>
-<status>Base</status>
-<sourcefile>mod_authn_file.c</sourcefile>
-<identifier>authn_file_module</identifier>
-<compatibility>Available in Apache 2.0.44 and later</compatibility>
-
-<summary>
-
- <p>This module provides authentication front-ends such as
- <module>mod_auth_digest</module> and <module>mod_auth_basic</module>
- to authenticate users by looking up users in plain text password files.
- Similar functionality is provided by <module>mod_authn_dbm</module>.</p>
-
- <p>When using <module>mod_auth_basic</module> or
- <module>mod_auth_digest</module>, this module is invoked via the
- <directive module="mod_auth_basic">AuthBasicProvider</directive> or
- <directive module="mod_auth_digest">AuthDigestProvider</directive>
- with the 'file' value.</p>
-
-</summary>
-<seealso><directive module="core">AuthName</directive></seealso>
-<seealso><directive module="core">AuthType</directive></seealso>
-<seealso>
- <directive module="mod_auth_basic">AuthBasicProvider</directive>
-</seealso>
-<seealso>
- <directive module="mod_auth_digest">AuthDigestProvider</directive>
-</seealso>
-
-<directivesynopsis>
-<name>AuthUserFile</name>
-<description>Sets the name of a text file containing the list of users and
-passwords for authentication</description>
-<syntax>AuthUserFile <em>file-path</em></syntax>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthUserFile</directive> directive sets the name
- of a textual file containing the list of users and passwords for
- user authentication. <em>File-path</em> is the path to the user
- file. If it is not absolute (<em>i.e.</em>, if it doesn't begin
- with a slash), it is treated as relative to the <directive
- module="core">ServerRoot</directive>.</p>
-
- <p>Each line of the user file contains a username followed by
- a colon, followed by the <code>crypt()</code> encrypted
- password. The behavior of multiple occurrences of the same user is
- undefined.</p>
-
- <p>The utility <a href="../programs/htpasswd.html">htpasswd</a>
- which is installed as part of the binary distribution, or which
- can be found in <code>src/support</code>, is used to maintain
- this password file. See the <code>man</code> page for more
- details. In short:</p>
-
- <p>Create a password file 'Filename' with 'username' as the
- initial ID. It will prompt for the password:</p>
- <example>htpasswd -c Filename username</example>
-
- <p>Add or modify 'username2' in the password file 'Filename':</p>
- <example>htpasswd Filename username2</example>
-
- <p>Note that searching large text files is <em>very</em>
- inefficient; <directive
- module="mod_authn_dbm">AuthDBMUserFile</directive> should be used
- instead.</p>
-
- <note><title>Security</title>
- <p>Make sure that the <directive>AuthUserFile</directive> is
- stored outside the document tree of the web-server; do <em>not</em>
- put it in the directory that it protects. Otherwise, clients will
- be able to download the <directive>AuthUserFile</directive>.</p>
- </note>
-</usage>
-</directivesynopsis>
-
-</modulesynopsis>
diff --git a/docs/manual/mod/mod_authn_file.xml.ja b/docs/manual/mod/mod_authn_file.xml.ja
deleted file mode 100644
index eaf1c28..0000000
--- a/docs/manual/mod/mod_authn_file.xml.ja
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="iso-2022-jp"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<modulesynopsis>
-<!-- English revision: 1.3 -->
-
-<name>mod_authn_file</name>
-<description>$B%F%-%9%H%U%!%$%k$rMQ$$$?%f!<%6G'>Z(B</description>
-<status>Base</status>
-<sourcefile>mod_authn_file.c</sourcefile>
-<identifier>authn_file_module</identifier>
-<compatibility>Apache 2.0.44 $B0J9_(B</compatibility>
-
-<summary>
-
- <p>$BK\%b%8%e!<%k$O(B <module>mod_auth_digest</module> $B$d(B
- <module>mod_auth_basic</module> $B$H$$$C$?G'>Z%U%m%s%H%(%s%I$KBP$7$F!"(B
- $B%W%l%$%s%F%-%9%H$N%Q%9%o!<%I%U%!%$%kFb$+$i%f!<%6$r8!:w$9$k$3$H$G!"(B
- $B%f!<%6G'>Z5!G=$rDs6!$7$^$9!#;w$?$h$&$J5!G=$O(B <module>mod_authn_dbm</module>
- $B$G$bDs6!$5$l$F$$$^$9!#(B</p>
-
- <p><module>mod_auth_basic</module> $B$d(B <module>mod_auth_digest</module>
- $B$r;HMQ$9$k:]$K$O!"(B
- <directive module="mod_auth_basic">AuthBasicProvider</directive> $B$d(B
- <directive module="mod_auth_digest">AuthDigestPrivider</directive>
- $B$G!V(B file $B!W$H;XDj$9$k$3$H$G$3$N%b%8%e!<%k$O5/F0$5$l$^$9!#(B</p>
-
-</summary>
-<seealso><directive module="core">AuthName</directive></seealso>
-<seealso><directive module="core">AuthType</directive></seealso>
-<seealso>
- <directive module="mod_auth_basic">AuthBasicProvider</directive>
-</seealso>
-<seealso>
- <directive module="mod_auth_digest">AuthDigestProvider</directive>
-</seealso>
-
-<directivesynopsis>
-<name>AuthUserFile</name>
-<description>$BG'>Z$K;HMQ$9$k%f!<%6$H%Q%9%o!<%I$N0lMw$,3JG<$5$l$F$$$k!"(B
-$B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$9$k(B</description>
-<syntax>AuthUserFile <em>file-path</em></syntax>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p><directive>AuthUserFile</directive> $B%G%#%l%/%F%#%V$O!"(B
- $B%f!<%6G'>Z$N$?$a$N%f!<%6$H%Q%9%o!<%I$N0lMw$r3JG<$7$?(B
- $B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B<em>file-path</em>
- $B$O%f!<%6%U%!%$%k$X$N%Q%9$G$9!#(B
- $B$b$7@dBP%Q%9$G$J$1$l$P(B
- (<em>$B$D$^$j(B</em> $B%9%i%C%7%e$G;O$^$i$J$$%Q%9$G$"$l$P(B)
- $B!"(B<directive module="core">ServerRoot</directive>
- $B$+$i$NAjBP%Q%9$H$7$F07$o$l$^$9!#(B</p>
-
- <p>$B%f!<%6%U%!%$%k$N3F9T$K$O!"%f!<%6L>!"%3%m%s!"(B
- <code>crypt()</code> $B$G0E9f2=$7$?%Q%9%o!<%I$r5-=R$7$^$9!#(B
- $BF10l%f!<%6$,J#?t2sEPO?$5$l$?;~$N5sF0$ODj5A$5$l$F$$$^$;$s!#(B</p>
-
- <p>$B%P%$%J%jG[I[$N0lIt$H$7$F%$%s%9%H!<%k$5$l$k$+!"(B
- $B$"$k$$$O(B <code>src/support</code> $B$K$"$k(B
- <a href="../programs/htpasswd.html">htpasswd</a>
- $B%f!<%F%#%j%F%#$G!"$3$N%Q%9%o!<%I%U%!%$%k$r%a%$%s%F%J%s%9$7$^$9!#(B
- $B>\:Y$O(B <code>man</code> $B%Z!<%8$r$4MwD:$/$H$7$F!"4JC1$K$O(B:</p>
-
- <p>$B=i4|(B ID <code>username</code> $B$G!"(B<code>Filename</code>
- $B$H$$$&%Q%9%o!<%I%U%!%$%k$r@8@.$7$^$9!#(B
- $B<!$N%3%^%s%I$rH/9T$9$k$H%Q%9%o!<%I$,MW5a$5$l$^$9(B:</p>
- <example>htpasswd -c Filename username</example>
-
- <p>$B%Q%9%o!<%I%U%!%$%k(B <code>Filename</code> $B$K!"(B<code>username2</code>
- $B$rDI2C$7$?$j=$@5$7$?$j$7$^$9(B:</p>
- <example>htpasswd Filename username2</example>
-
- <p>($BLuCm(B: $BHs>o$KB?$/$N%f!<%6$rEPO?$9$k$HBg$-$J%U%!%$%k$K$J$j$^$9$,(B)
- $BBg$-$J%F%-%9%H%U%!%$%k$r8!:w$9$k$N$O(B<em>$BHs>o$K8zN($,0-$$(B</em>
- $B$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#$=$N$h$&$JI,MW$N$"$k;~$O!"(B
- <directive module="mod_authn_dbm">AuthDBMUserFile</directive>
- $B$rBe$o$j$K;H$C$F$/$@$5$$!#(B</p>
-
- <note><title>$B%;%-%e%j%F%#(B</title>
- <p><directive>AuthUserFile </directive>
- $B$O!"%&%'%V%5!<%P$N%I%-%e%a%s%H%D%j!<$N30B&$KJ]4I$9$k$h$&$K$7$F$/$@$5$$!#(B
- $BJ]8n$7$h$&$H$7$F$$$k%G%#%l%/%H%j0J2<$K$O!"(B<em>$BCV$+$J$$$G2<$5$$(B</em>$B!#(B
- $B$=$&$7$J$$$H(B <directive>AuthUserFile</directive> $B$O(B
- $B%@%&%s%m!<%I$G$-$F$7$^$$$^$9!#(B</p>
- </note>
-</usage>
-</directivesynopsis>
-
-</modulesynopsis>
diff --git a/docs/manual/mod/mod_authz_dbm.html.en b/docs/manual/mod/mod_authz_dbm.html.en
deleted file mode 100644
index 15bc8b8..0000000
--- a/docs/manual/mod/mod_authz_dbm.html.en
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_authz_dbm - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_authz_dbm</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Group authorization using DBM files</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>authz_dbm_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_authz_dbm.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0.44 and later</td></tr></table><h3>Summary</h3>
- <p>This module provides authorization capabilities so that
- authenticated users can be allowed or denied access to portions
- of the web site by group membership. Similar functionality is
- provided by <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code>.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authdbmgroupfile">AuthDBMGroupFile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authzdbmauthoritative">AuthzDBMAuthoritative</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authzdbmtype">AuthzDBMType</a></li>
-</ul><h3>See also</h3><ul class="seealso"><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></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
-of user groups for authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDBMGroupFile <em>file-path</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_authz_dbm</td></tr></table>
- <p>The <code class="directive">AuthDBMGroupFile</code> directive sets the
- name of a DBM file containing the list of user groups for user
- authentication. <em>File-path</em> is the absolute path to the
- group file.</p>
-
- <p>The group file is keyed on the username. The value for a
- user is a comma-separated list of the groups to which the users
- belongs. There must be no whitespace within the value, and it
- must never contain any colons.</p>
-
- <p>Security: make sure that the
- <code class="directive">AuthDBMGroupFile</code> is stored outside the
- document tree of the web-server; do <em>not</em> put it in the
- directory that it protects. Otherwise, clients will be able to
- download the <code class="directive">AuthDBMGroupFile</code> unless
- otherwise protected.</p>
-
- <p>Combining Group and Password DBM files: In some cases it is
- easier to manage a single database which contains both the
- password and group details for each user. This simplifies any
- support programs that need to be written: they now only have to
- deal with writing to and locking a single DBM file. This can be
- accomplished by first setting the group and password files to
- point to the same DBM:</p>
-
-<div class="example"><p><code>
-AuthDBMGroupFile /www/userbase<br />
-AuthDBMUserFile /www/userbase
-</code></p></div>
-
- <p>The key for the single DBM is the username. The value consists
- of</p>
-
-<div class="example"><p><code>Unix Crypt-ed Password : List of Groups [ : (ignored)
- ]</code></p></div>
-
- <p>The password section contains the Unix <code>crypt()</code>
- password as before. This is followed by a colon and the comma
- separated list of groups. Other data may optionally be left in the
- DBM file after another colon; it is ignored by the authentication
- module. This is what www.telescope.org uses for its combined
- password and group database.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthzDBMAuthoritative" id="AuthzDBMAuthoritative">AuthzDBMAuthoritative</a> <a name="authzdbmauthoritative" id="authzdbmauthoritative">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets whether authorization will be passed on to lower level modules</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthzDBMAuthoritative on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthzDBMAuthoritative 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_authz_dbm</td></tr></table>
-
- <p>Setting the <code class="directive">AuthzDBMAuthoritative</code>
- directive explicitly to <strong>'off'</strong> allows for both
- authentication and authorization to be passed on to lower level
- modules (as defined in the <code>Configuration</code> and
- <code>modules.c</code> file if there is <strong>no userID</strong>
- or <strong>rule</strong> matching the supplied userID. If there is
- a userID and/or rule specified; the usual password and access
- checks will be applied and a failure will give an Authorization
- Required reply.</p>
-
- <p>So if a userID appears in the database of more than one module;
- or if a valid <code class="directive"><a href="../mod/core.html#require">Require</a></code>
- directive applies to more than one module; then the first module
- will verify the credentials; and no access is passed on;
- regardless of the <code class="directive">AuthAuthoritative</code> setting.</p>
-
- <p>A common use for this is in conjunction with one of the
- auth providers; such as <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>. Whereas this
- DBM module supplies the bulk of the user credential checking; a
- few (administrator) related accesses fall through to a lower
- level with a well protected .htpasswd file.</p>
-
- <p>By default, control is not passed on and an unknown userID
- or rule will result in an Authorization Required reply. Not
- setting it thus keeps the system secure and forces an NCSA
- compliant behaviour.</p>
-
- <p>Security: Do consider the implications of allowing a user to
- allow fall-through in his .htaccess file; and verify that this
- is really what you want; Generally it is easier to just secure
- a single .htpasswd file, than it is to secure a database which
- might have more access interfaces.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthzDBMType" id="AuthzDBMType">AuthzDBMType</a> <a name="authzdbmtype" id="authzdbmtype">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the type of database file that is used to
-store passwords</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthzDBMType default|SDBM|GDBM|NDBM|DB</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthzDBMType default</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_authz_dbm</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0.30 and later.</td></tr></table>
-
-<p>Sets the type of database file that is used to store the passwords.
-The default database type is determined at compile time. The
-availability of other types of database files also depends on
-<a href="../install.html#dbm">compile-time settings</a>.</p>
-
-<p>It is crucial that whatever program you use to create your password
-files is configured to use the same type of database.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_dbm.xml b/docs/manual/mod/mod_authz_dbm.xml
deleted file mode 100644
index 3f14900..0000000
--- a/docs/manual/mod/mod_authz_dbm.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<modulesynopsis>
-
-<name>mod_authz_dbm</name>
-<description>Group authorization using DBM files</description>
-<status>Extension</status>
-<sourcefile>mod_authz_dbm.c</sourcefile>
-<identifier>authz_dbm_module</identifier>
-<compatibility>Available in Apache 2.0.44 and later</compatibility>
-
-<summary>
- <p>This module provides authorization capabilities so that
- authenticated users can be allowed or denied access to portions
- of the web site by group membership. Similar functionality is
- provided by <module>mod_authz_groupfile</module>.</p>
-</summary>
-
-<seealso><directive module="core">Require</directive></seealso>
-<seealso><directive module="core">Satisfy</directive></seealso>
-
-<directivesynopsis>
-<name>AuthDBMGroupFile</name>
-<description>Sets the name of the database file containing the list
-of user groups for authentication</description>
-<syntax>AuthDBMGroupFile <em>file-path</em></syntax>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthDBMGroupFile</directive> directive sets the
- name of a DBM file containing the list of user groups for user
- authentication. <em>File-path</em> is the absolute path to the
- group file.</p>
-
- <p>The group file is keyed on the username. The value for a
- user is a comma-separated list of the groups to which the users
- belongs. There must be no whitespace within the value, and it
- must never contain any colons.</p>
-
- <p>Security: make sure that the
- <directive>AuthDBMGroupFile</directive> is stored outside the
- document tree of the web-server; do <em>not</em> put it in the
- directory that it protects. Otherwise, clients will be able to
- download the <directive>AuthDBMGroupFile</directive> unless
- otherwise protected.</p>
-
- <p>Combining Group and Password DBM files: In some cases it is
- easier to manage a single database which contains both the
- password and group details for each user. This simplifies any
- support programs that need to be written: they now only have to
- deal with writing to and locking a single DBM file. This can be
- accomplished by first setting the group and password files to
- point to the same DBM:</p>
-
-<example>
-AuthDBMGroupFile /www/userbase<br />
-AuthDBMUserFile /www/userbase
-</example>
-
- <p>The key for the single DBM is the username. The value consists
- of</p>
-
-<example>Unix Crypt-ed Password : List of Groups [ : (ignored)
- ]</example>
-
- <p>The password section contains the Unix <code>crypt()</code>
- password as before. This is followed by a colon and the comma
- separated list of groups. Other data may optionally be left in the
- DBM file after another colon; it is ignored by the authentication
- module. This is what www.telescope.org uses for its combined
- password and group database.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthzDBMType</name>
-<description>Sets the type of database file that is used to
-store passwords</description>
-<syntax>AuthzDBMType default|SDBM|GDBM|NDBM|DB</syntax>
-<default>AuthzDBMType default</default>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-<compatibility>Available in version 2.0.30 and later.</compatibility>
-
-<usage>
-
-<p>Sets the type of database file that is used to store the passwords.
-The default database type is determined at compile time. The
-availability of other types of database files also depends on
-<a href="../install.html#dbm">compile-time settings</a>.</p>
-
-<p>It is crucial that whatever program you use to create your password
-files is configured to use the same type of database.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthzDBMAuthoritative</name>
-<description>Sets whether authorization will be passed on to lower level modules</description>
-<syntax>AuthzDBMAuthoritative on|off</syntax>
-<default>AuthzDBMAuthoritative on</default>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
-
- <p>Setting the <directive>AuthzDBMAuthoritative</directive>
- directive explicitly to <strong>'off'</strong> allows for both
- authentication and authorization to be passed on to lower level
- modules (as defined in the <code>Configuration</code> and
- <code>modules.c</code> file if there is <strong>no userID</strong>
- or <strong>rule</strong> matching the supplied userID. If there is
- a userID and/or rule specified; the usual password and access
- checks will be applied and a failure will give an Authorization
- Required reply.</p>
-
- <p>So if a userID appears in the database of more than one module;
- or if a valid <directive module="core">Require</directive>
- directive applies to more than one module; then the first module
- will verify the credentials; and no access is passed on;
- regardless of the <directive>AuthAuthoritative</directive> setting.</p>
-
- <p>A common use for this is in conjunction with one of the
- auth providers; such as <module>mod_authn_file</module>. Whereas this
- DBM module supplies the bulk of the user credential checking; a
- few (administrator) related accesses fall through to a lower
- level with a well protected .htpasswd file.</p>
-
- <p>By default, control is not passed on and an unknown userID
- or rule will result in an Authorization Required reply. Not
- setting it thus keeps the system secure and forces an NCSA
- compliant behaviour.</p>
-
- <p>Security: Do consider the implications of allowing a user to
- allow fall-through in his .htaccess file; and verify that this
- is really what you want; Generally it is easier to just secure
- a single .htpasswd file, than it is to secure a database which
- might have more access interfaces.</p>
-</usage>
-</directivesynopsis>
-
-</modulesynopsis>
diff --git a/docs/manual/mod/mod_authz_groupfile.html.en b/docs/manual/mod/mod_authz_groupfile.html.en
deleted file mode 100644
index 34c2906..0000000
--- a/docs/manual/mod/mod_authz_groupfile.html.en
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_authz_groupfile - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_authz_groupfile</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Group authorization using plaintext files</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>authz_groupfile_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_authz_groupfile.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0.44 and later</td></tr></table><h3>Summary</h3>
- <p>This module provides authorization capabilities so that
- authenticated users can be allowed or denied access to portions
- of the web site by group membership. Similar functionality is
- provided by <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authgroupfile">AuthGroupFile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authzgroupfileauthoritative">AuthzGroupFileAuthoritative</a></li>
-</ul><h3>See also</h3><ul class="seealso"><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></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
-of user groups for authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthGroupFile <em>file-path</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_authz_groupfile</td></tr></table>
- <p>The <code class="directive">AuthGroupFile</code> directive sets the
- name of a textual file containing the list of user groups for user
- authentication. <em>File-path</em> is the path to the group
- file. If it is not absolute (<em>i.e.</em>, if it doesn't begin
- with a slash), it is treated as relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</p>
-
- <p>Each line of the group file contains a groupname followed by a
- colon, followed by the member usernames separated by spaces.
- Example:</p>
-
- <div class="example"><p><code>mygroup: bob joe anne</code></p></div>
-
- <p>Note that searching large text files is <em>very</em>
- inefficient; <code class="directive"><a href="../mod/mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code> should be used
- instead.</p>
-
- <div class="note"><h3>Security</h3>
- <p>Make sure that the <code class="directive">AuthGroupFile</code> is
- stored outside the document tree of the web-server; do <em>not</em>
- put it in the directory that it protects. Otherwise, clients will
- be able to download the <code class="directive">AuthGroupFile</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="AuthzGroupFileAuthoritative" id="AuthzGroupFileAuthoritative">AuthzGroupFileAuthoritative</a> <a name="authzgroupfileauthoritative" id="authzgroupfileauthoritative">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets whether authorization will be passed on to lower level modules</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthzGroupFileAuthoritative on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthzGroupFileAuthoritative 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_authz_groupfile</td></tr></table>
-
- <p>Setting the <code class="directive">AuthzGroupFileAuthoritative</code>
- directive explicitly to <strong>'off'</strong> allows for
- authorization to be passed on to lower level modules (as defined in
- the <code>Configuration</code> and <code>modules.c</code> file if
- there is <strong>no userID</strong> or <strong>rule</strong> matching
- the supplied userID. If there is a userID and/or rule specified; the
- usual password and access checks will be applied and a failure will
- give an Authorization Required reply.</p>
-
- <p>So if a valid <code class="directive"><a href="../mod/core.html#require">Require</a></code>
- directive applies to more than one module; then the first module
- will verify the credentials; and no access is passed on;
- regardless of the <code class="directive">AuthzGroupFileAuthoritative</code>
- setting.</p>
-
- <p>By default, control is not passed on and an unknown userID
- or rule will result in an Authorization Required reply. Not
- setting it thus keeps the system secure and forces an NCSA
- compliant behaviour.</p>
-
- <p>Security: Do consider the implications of allowing a user to
- allow fall-through in his .htaccess file; and verify that this
- is really what you want; Generally it is easier to just secure
- a single .htpasswd file, than it is to secure a database which
- might have more access interfaces.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_groupfile.xml b/docs/manual/mod/mod_authz_groupfile.xml
deleted file mode 100644
index ec54049..0000000
--- a/docs/manual/mod/mod_authz_groupfile.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<modulesynopsis>
-
-<name>mod_authz_groupfile</name>
-<description>Group authorization using plaintext files</description>
-<status>Extension</status>
-<sourcefile>mod_authz_groupfile.c</sourcefile>
-<identifier>authz_groupfile_module</identifier>
-<compatibility>Available in Apache 2.0.44 and later</compatibility>
-
-<summary>
- <p>This module provides authorization capabilities so that
- authenticated users can be allowed or denied access to portions
- of the web site by group membership. Similar functionality is
- provided by <module>mod_authz_dbm</module>.</p>
-</summary>
-
-<seealso><directive module="core">Require</directive></seealso>
-<seealso><directive module="core">Satisfy</directive></seealso>
-
-<directivesynopsis>
-<name>AuthGroupFile</name>
-<description>Sets the name of a text file containing the list
-of user groups for authentication</description>
-<syntax>AuthGroupFile <em>file-path</em></syntax>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthGroupFile</directive> directive sets the
- name of a textual file containing the list of user groups for user
- authentication. <em>File-path</em> is the path to the group
- file. If it is not absolute (<em>i.e.</em>, if it doesn't begin
- with a slash), it is treated as relative to the <directive
- module="core">ServerRoot</directive>.</p>
-
- <p>Each line of the group file contains a groupname followed by a
- colon, followed by the member usernames separated by spaces.
- Example:</p>
-
- <example>mygroup: bob joe anne</example>
-
- <p>Note that searching large text files is <em>very</em>
- inefficient; <directive
- module="mod_authz_dbm">AuthDBMGroupFile</directive> should be used
- instead.</p>
-
- <note><title>Security</title>
- <p>Make sure that the <directive>AuthGroupFile</directive> is
- stored outside the document tree of the web-server; do <em>not</em>
- put it in the directory that it protects. Otherwise, clients will
- be able to download the <directive>AuthGroupFile</directive>.</p>
- </note>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthzGroupFileAuthoritative</name>
-<description>Sets whether authorization will be passed on to lower level modules</description>
-<syntax>AuthzGroupFileAuthoritative on|off</syntax>
-<default>AuthzGroupFileAuthoritative on</default>
-<contextlist>
- <context>directory</context>
- <context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
-
- <p>Setting the <directive>AuthzGroupFileAuthoritative</directive>
- directive explicitly to <strong>'off'</strong> allows for
- authorization to be passed on to lower level modules (as defined in
- the <code>Configuration</code> and <code>modules.c</code> file if
- there is <strong>no userID</strong> or <strong>rule</strong> matching
- the supplied userID. If there is a userID and/or rule specified; the
- usual password and access checks will be applied and a failure will
- give an Authorization Required reply.</p>
-
- <p>So if a valid <directive module="core">Require</directive>
- directive applies to more than one module; then the first module
- will verify the credentials; and no access is passed on;
- regardless of the <directive>AuthzGroupFileAuthoritative</directive>
- setting.</p>
-
- <p>By default, control is not passed on and an unknown userID
- or rule will result in an Authorization Required reply. Not
- setting it thus keeps the system secure and forces an NCSA
- compliant behaviour.</p>
-
- <p>Security: Do consider the implications of allowing a user to
- allow fall-through in his .htaccess file; and verify that this
- is really what you want; Generally it is easier to just secure
- a single .htpasswd file, than it is to secure a database which
- might have more access interfaces.</p>
-</usage>
-</directivesynopsis>
-
-</modulesynopsis>
diff --git a/docs/manual/mod/mod_authz_host.html.en b/docs/manual/mod/mod_authz_host.html.en
deleted file mode 100644
index 9730a76..0000000
--- a/docs/manual/mod/mod_authz_host.html.en
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_authz_host - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_authz_host</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Group authorizations based on host (name or IP
-address)</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>authz_host_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_authz_host.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0.44 and later</td></tr></table><h3>Summary</h3>
- <p>The directives provided by <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> are
- used in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>,
- <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, and
- <code class="directive"><a href="../mod/core.html#location"><Location></a></code> sections
- as well as <code><a href="core.html#accessfilename">.htaccess</a>
- </code> files to control access to particular parts of the server.
- Access can be controlled based on the client hostname, IP address, or
- other characteristics of the client request, as captured in <a href="../env.html">environment variables</a>. The <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives are used to
- specify which clients are or are not allowed access to the server,
- while the <code class="directive"><a href="#order">Order</a></code>
- directive sets the default access state, and configures how the
- <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives interact with each
- other.</p>
-
- <p>Both host-based access restrictions and password-based
- authentication may be implemented simultaneously. In that case,
- the <code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code> directive is used
- to determine how the two sets of restrictions interact.</p>
-
- <p>In general, access restriction directives apply to all
- access methods (<code>GET</code>, <code>PUT</code>,
- <code>POST</code>, etc). This is the desired behavior in most
- cases. However, it is possible to restrict some methods, while
- leaving other methods unrestricted, by enclosing the directives
- in a <code class="directive"><a href="../mod/core.html#limit"><Limit></a></code> section.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#allow">Allow</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#deny">Deny</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#order">Order</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li><li><code class="directive"><a href="../mod/core.html#require">Require</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="Allow" id="Allow">Allow</a> <a name="allow" id="allow">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Controls which hosts can access an area of the
-server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code> Allow from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</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>Limit</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_authz_host</td></tr></table>
-
- <p>The <code class="directive">Allow</code> directive affects which hosts can
- access an area of the server. Access can be controlled by
- hostname, IP Address, IP Address range, or by other
- characteristics of the client request captured in environment
- variables.</p>
-
- <p>The first argument to this directive is always
- <code>from</code>. The subsequent arguments can take three
- different forms. If <code>Allow from all</code> is specified, then
- all hosts are allowed access, subject to the configuration of the
- <code class="directive"><a href="#deny">Deny</a></code> and <code class="directive"><a href="#order">Order</a></code> directives as discussed
- below. To allow only particular hosts or groups of hosts to access
- the server, the <em>host</em> can be specified in any of the
- following formats:</p>
-
- <dl>
- <dt>A (partial) domain-name</dt>
-
- <dd>Example: <code>Allow from apache.org</code><br />
- Hosts whose names match, or end in, this string are allowed
- access. Only complete components are matched, so the above
- example will match <code>foo.apache.org</code> but it will
- not match <code>fooapache.org</code>. This configuration will
- cause the server to perform a reverse DNS lookup on the
- client IP address, regardless of the setting of the <code class="directive"><a href="../mod/core.html#hostnamelookups">HostnameLookups</a></code>
- directive.</dd>
-
- <dt>A full IP address</dt>
-
- <dd>Example: <code>Allow from 10.1.2.3</code><br />
- An IP address of a host allowed access</dd>
-
- <dt>A partial IP address</dt>
-
- <dd>Example: <code>Allow from 10.1</code><br />
- The first 1 to 3 bytes of an IP address, for subnet
- restriction.</dd>
-
- <dt>A network/netmask pair</dt>
-
- <dd>Example: <code>Allow from
- 10.1.0.0/255.255.0.0</code><br />
- A network a.b.c.d, and a netmask w.x.y.z. For more
- fine-grained subnet restriction.</dd>
-
- <dt>A network/nnn CIDR specification</dt>
-
- <dd>Example: <code>Allow from 10.1.0.0/16</code><br />
- Similar to the previous case, except the netmask consists of
- nnn high-order 1 bits.</dd>
- </dl>
-
- <p>Note that the last three examples above match exactly the
- same set of hosts.</p>
-
- <p>IPv6 addresses and IPv6 subnets can be specified as shown
- below:</p>
-
- <div class="example"><p><code>
- Allow from fe80::a00:20ff:fea7:ccea<br />
- Allow from fe80::a00:20ff:fea7:ccea/10
- </code></p></div>
-
- <p>The third format of the arguments to the
- <code class="directive">Allow</code> directive allows access to the server
- to be controlled based on the existence of an <a href="../env.html">environment variable</a>. When <code>Allow from
- env=</code><em>env-variable</em> is specified, then the request is
- allowed access if the environment variable <em>env-variable</em>
- 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>
-
-<div class="example"><h3>Example:</h3><p><code>
-
-SetEnvIf User-Agent ^KnockKnock/2.0 let_me_in<br />
-<Directory /docroot><br />
- Order Deny,Allow<br />
- Deny from all<br />
- Allow from env=let_me_in<br />
-</Directory>
-</code></p></div>
-
- <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>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="Deny" id="Deny">Deny</a> <a name="deny" id="deny">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Controls which hosts are denied access to the
-server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code> Deny from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</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>Limit</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_authz_host</td></tr></table>
- <p>This directive allows access to the server to be restricted
- based on hostname, IP address, or environment variables. The
- arguments for the <code class="directive">Deny</code> directive are
- identical to the arguments for the <code class="directive"><a href="#allow">Allow</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="Order" id="Order">Order</a> <a name="order" id="order">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Controls the default access state and the order in which
-Allow and Deny are
-evaluated.</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code> Order <em>ordering</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Order Deny,Allow</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>Limit</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_authz_host</td></tr></table>
-
- <p>The <code class="directive">Order</code> directive controls the default
- access state and the order in which <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives are evaluated.
- <em>Ordering</em> is one of</p>
-
- <dl>
- <dt>Deny,Allow</dt>
-
- <dd>The <code class="directive"><a href="#deny">Deny</a></code> directives
- are evaluated before the <code class="directive"><a href="#allow">Allow</a></code> directives. Access is
- allowed by default. Any client which does not match a
- <code class="directive"><a href="#deny">Deny</a></code> directive or does
- match an <code class="directive"><a href="#allow">Allow</a></code>
- directive will be allowed access to the server.</dd>
-
- <dt>Allow,Deny</dt>
-
- <dd>The <code class="directive"><a href="#allow">Allow</a></code>
- directives are evaluated before the <code class="directive"><a href="#deny">Deny</a></code> directives. Access is denied
- by default. Any client which does not match an <code class="directive"><a href="#allow">Allow</a></code> directive or does match a
- <code class="directive"><a href="#deny">Deny</a></code> directive will be
- denied access to the server.</dd>
-
- <dt>Mutual-failure</dt>
-
- <dd>Only those hosts which appear on the <code class="directive"><a href="#allow">Allow</a></code> list and do not appear on
- the <code class="directive"><a href="#deny">Deny</a></code> list are
- granted access. This ordering has the same effect as <code>Order
- Allow,Deny</code> and is deprecated in favor of that
- configuration.</dd>
- </dl>
-
- <p>Keywords may only be separated by a comma; no whitespace is
- allowed between them. Note that in all cases every <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> statement is evaluated.</p>
-
- <p>In the following example, all hosts in the apache.org domain
- are allowed access; all other hosts are denied access.</p>
-
-<div class="example"><p><code>
- Order Deny,Allow<br />
- Deny from all<br />
- Allow from apache.org<br />
-</code></p></div>
-
- <p>In the next example, all hosts in the apache.org domain are
- allowed access, except for the hosts which are in the
- foo.apache.org subdomain, who are denied access. All hosts not
- in the apache.org domain are denied access because the default
- state is to deny access to the server.</p>
-
-<div class="example"><p><code>
- Order Allow,Deny<br />
- Allow from apache.org<br />
- Deny from foo.apache.org<br />
-</code></p></div>
-
- <p>On the other hand, if the <code class="directive">Order</code> in the last
- example is changed to <code>Deny,Allow</code>, all hosts will
- be allowed access. This happens because, regardless of the
- actual ordering of the directives in the configuration file,
- the <code>Allow from apache.org</code> will be evaluated last
- and will override the <code>Deny from foo.apache.org</code>.
- All hosts not in the <code>apache.org</code> domain will also
- be allowed access because the default state will change to
- <em>allow</em>.</p>
-
- <p>The presence of an <code class="directive">Order</code> directive can affect
- access to a part of the server even in the absence of accompanying
- <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives because of its effect
- on the default access state. For example,</p>
-
-<div class="example"><p><code>
- <Directory /www><br />
- Order Allow,Deny<br />
- </Directory>
-</code></p></div>
-
- <p>will deny all access to the <code>/www</code> directory
- because the default access state will be set to
- <em>deny</em>.</p>
-
- <p>The <code class="directive">Order</code> directive controls the order of access
- directive processing only within each phase of the server's
- configuration processing. This implies, for example, that an
- <code class="directive"><a href="#allow">Allow</a></code> or <code class="directive"><a href="#deny">Deny</a></code> directive occurring in a
- <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section will
- always be evaluated after an <code class="directive"><a href="#allow">Allow</a></code> or <code class="directive"><a href="#deny">Deny</a></code> directive occurring in a
- <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section or
- <code>.htaccess</code> file, regardless of the setting of the
- <code class="directive">Order</code> directive. For details on the merging
- of configuration sections, see the documentation on <a href="../sections.html">How Directory, Location and Files sections
- work</a>.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_host.html.ja.jis b/docs/manual/mod/mod_authz_host.html.ja.jis
deleted file mode 100644
index 3428b49..0000000
--- a/docs/manual/mod/mod_authz_host.html.ja.jis
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="iso-2022-jp"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_authz_host - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_authz_host</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%[%9%H(B ($BL>A0$b$7$/$O(B IP $B%"%I%l%9(B) $B$K4p$E$$$?%0%k!<%W>5G'(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>authz_host_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_authz_host.c</td></tr><tr><th><a href="module-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 2.0.44 $B0J9_(B</td></tr></table><h3>$B35MW(B</h3>
- <p><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> $B$K$h$jDs6!$5$l$k%G%#%l%/%F%#%V$O(B
- $B%5!<%P$NFCDj$NItJ,$X$N(B
- $B%"%/%;%9$r@)8f$9$k$?$a$K(B <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, <code class="directive"><a href="../mod/core.html#location"><Location></a></code>
- $B$H(B <code><a href="core.html#accessfilename">.htaccess</a></code> $B%U%!%$%k$G;HMQ$5$l$^$9!#%/%i%$%"%s%H$N%[%9%HL>!"(BIP
- $B%"%I%l%9$d(B <a href="../env.html">$B4D6-JQ?t(B</a>$B$H$7$F<hF@$5$l$?!"$=$NB>$N%j%/%(%9%H$NFCD'$K4p$E$$$F(B
- $B%"%/%;%9@)8f$r9T$J$&$3$H$,$G$-$^$9!#(B<code class="directive"><a href="#allow">Allow</a></code> $B$H(B
- <code class="directive"><a href="#deny">Deny</a></code> $B%G%#%l%/%F%#%V$O(B
- $B$I$N$h$&$J%/%i%$%"%s%H$K%"%/%;%9$r(B
- $B5v2D$9$k!"$7$J$$$+$r;XDj$9$k$?$a$K(B$B;HMQ$5$l$^$9!#0lJ}!"(B
- <code class="directive"><a href="#order">Order</a></code> $B%G%#%l%/%F%#%V$O(B
- $B%G%U%)%k%H$N%"%/%;%9>uBV$H!"(B
- <code class="directive"><a href="#allow">Allow</a></code> $B%G%#%l%/%F%#%V$H(B
- <code class="directive"><a href="#deny">Deny</a></code>
- $B%G%#%l%/%F%#%V$H$N$*8_$$$X$N1F6A$N;EJ}$r@_Dj$7$^$9!#(B
- </p>
-
- <p>$B%[%9%H$K$h$k%"%/%;%9(B$B@)8B$H%Q%9%o!<%I$K$h$kG'>Z$rF1;~$K(B
- $B9T$J$&$3$H$,2DG=$G$9!#$=$N>l9g!"$=$NFs$D$N@)8B$N4X78$r;XDj$9$k$?$a$K(B
- <code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code>
- $B%G%#%l%/%F%#%V$r;HMQ$7$^$9!#(B</p>
-
- <p>$B0lHLE*$K$O!"%"%/%;%9@)8B%G%#%l%/%F%#%V$O$9$Y$F$N%"%/%;%9%a%=%C%I(B
- (<code>GET</code>, <code>PUT</code>, <code>POST</code> $B$J$I(B)
- $B$KE,MQ$5$l$^$9!#$=$7$F!"$[$H$s$I$N>l9g$3$l$,K>$^$7$$F0:n$G$9!#(B
- $B$7$+$7!"(B<code class="directive"><a href="../mod/core.html#limit"><Limit></a></code>
- $B%;%/%7%g%s$NCf$K%G%#%l%/%F%#%V$r=q$/$3$H$G!"(B
- $B0lIt$N%a%=%C%I$K$N$_@)8B$r$+$1$k$3$H$b$G$-$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#allow">Allow</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#deny">Deny</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#order">Order</a></li>
-</ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li><li><code class="directive"><a href="../mod/core.html#require">Require</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="Allow" id="Allow">Allow</a> <a name="allow" id="allow">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%5!<%P$N$"$kNN0h$K%"%/%;%9$G$-$k%[%9%H$r@)8f$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code> Allow from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Limit</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_authz_host</td></tr></table>
-
- <p><code class="directive">Allow</code> $B%G%#%l%/%F%#%V$O$I$N%[%9%H$,(B
- $B%5!<%P$N$"$kNN0h$r%"%/%;%9$G$-$k$+$K1F6A$rM?$($^$9!#(B
- $B%"%/%;%9$O%[%9%HL>!"(BIP $B%"%I%l%9!"(BIP $B%"%I%l%9$NHO0O$d!"(B
- $B4D6-JQ?t$H$7$F(B$B<hF@$5$l$?!"$=$NB>$N%/%i%$%"%s%H$N%j%/%(%9%H$N(B
- $BFCD'$K$h$C$F@)8f$9$k$3$H$,$G$-$^$9!#(B</p>
-
- <p>$B$3$N%G%#%l%/%F%#%V$N:G=i$N0z?t$O>o$K(B <code>from</code> $B$G$9!#(B
- $B$=$l$KB3$/0z?t$O;0$D$N0c$C$?7A<0$,$"$j$^$9!#(B<code>Allow from
- all</code> $B$,;XDj$5$l$F$$$l$P!"$9$Y$F$N%[%9%H$K%"%/%;%9$r5v2D$7!"(B
- $B%"%/%;%9@)8B$O2<$G@bL@$5$l$F$$$k$h$&$K!"(B
- <code class="directive"><a href="#deny">Deny</a></code>
- $B%G%#%l%/%F%#%V$H(B <code class="directive"><a href="#order">Order</a></code>
- $B%G%#%l%/%F%#%V$N@_Dj$G7h$^$j$^$9!#(B
- $BFCDj$N%[%9%H$d%[%9%H72$K$N$_%5!<%P$X$N%"%/%;%9$r5v2D$9$k$?$a$K$O!"(B
- $B0J2<$N$I$l$+$N7A<0$G(B <em>host</em> $B$r;XDj$9$k$3$H$,$G$-$^$9(B:</p>
-
- <dl>
- <dt>$B%I%a%$%sL>(B ($B$N0lIt(B)</dt>
-
- <dd>$BNc(B: <code>Allow from apache.org</code><br />
- $B$3$NJ8;zNs$K9g$&$+!"$3$l$G=*$o$kL>A0$N%[%9%H$N%"%/%;%9$,5v2D$5$l$^$9!#(B
- $B3FItJ,$,40A4$K9g$&$b$N$@$1$KE,MQ$5$l$^$9$N$G!">e$NNc$O(B
- <code>foo.apache.org</code> $B$K$O%^%C%A$7$^$9$,!"(B
- <code>fooapache.org</code> $B$K$O%^%C%A$7$^$;$s!#(B
- $B$3$N@_Dj$r$9$k$H!"%5(B$B!<%P$O(B
- <code class="directive"><a href="../mod/core.html#hostnamelookups">HostnameLookups</a></code>
- $B$N@_Dj$K4X$o$i$:!"%/%i%$%"%s%H$N(B IP $B%"%I%l%9$KBP$7$F(B
- DNS $B$N5U0z$-$r9T$J$$$^$9!#(B</dd>
-
- <dt>$B40A4$J(B IP $B%"%I%l%9(B</dt>
-
- <dd>$BNc(B: <code>Allow from 10.1.2.3</code><br />
- $B%"%/%;%9$r5v2D$9$k(B IP $B%"%I%l%9$G$9!#(B</dd>
-
- <dt>IP $B%"%I%l%9$N0lIt(B</dt>
-
- <dd>$BNc(B: <code>Allow from 10.1</code><br />
- $B%5%V%M%C%H$N@)8BMQ$N!"(BIP
- $B%"%I%l%9$N:G=i$N0l$D$+$i;0$D$^$G$N%P%$%H$G$9!#(B</dd>
-
- <dt>$B%M%C%H%o!<%/(B/$B%M%C%H%^%9%/(B $B$NBP(B</dt>
-
- <dd>$BNc(B: <code>Allow from 10.1.0.0/255.255.0.0</code><br />
- $B%M%C%H%o!<%/(B a.b.c.d $B$H%M%C%H%^%9%/(B w.x.y.z $B$G$9!#(B
- $B$h$j:YN3EY$N%5%V%M%C%H@)8BMQ$G$9!#(B</dd>
-
- <dt>$B%M%C%H%o!<%/(B/nnn CIDR $B;XDj(B</dt>
-
- <dd>$BNc(B: <code>Allow from 10.1.0.0/16</code><br />
- $B%M%C%H%^%9%/$,(B nnn $B$N>e0L%S%C%H$,(B 1
- $B$H$J$C$F$$$k$b$N$+$i$J$k$3$H0J30$OA0$N$b$N$HF1$8$G$9!#(B</dd>
- </dl>
-
- <p>$BCm(B: $B:G8e$N;0$D$NNc$O$^$C$?$/F1$8%[%9%H$K9g$$$^$9!#(B</p>
-
-
- <p>IPv6 $B%"%I%l%9$H(B IPv6 $B$N%5%V%M%C%H$O0J2<$N$h$&$K;XDj$G$-$^$9(B:</p>
-
- <div class="example"><p><code>
- Allow from fe80::a00:20ff:fea7:ccea<br />
- Allow from fe80::a00:20ff:fea7:ccea/10
- </code></p></div>
-
- <p><code class="directive">Allow</code> $B%G%#%l%/%F%#%V$N0z?t$N;0$DL\$N7A<0$O!"(B
- <a href="../env.html">$B4D6-JQ?t(B</a>
- $B$NB8:_$K$h$j%"%/%;%9$N@)8f$r9T$J$($k$h$&$K$9$k$b$N$G$9!#(B
- <code>Allow from env=</code><em>variablename</em>
- $B$,;XDj$5$l$F$$$k$H!"4D6-JQ?t(B <em>variablename</em>
- $B$,B8:_$7$?>l9g$K%j%/%(%9%H$O%"%/%;%9$r5v2D$5$l$^$9!#%5!<%P$O(B
- <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>
- $B$N%G%#%l%/%F%#%V$K$h$j!"%/%i%$%"%s%H$N%j%/%(%9%H(B
- $B$NFCD'$K4p$E$$$F=@Fp$K4D6-JQ?t$r@_Dj$9$k5!G=$rDs6!$7$^$9!#(B
- $B$G$9$+$i!"$3$N%G%#%l%/%F%#%V$O%/%i%$%"%s%H$N(B
- <code>User-Agent</code> ($B%V%i%&%6$N<oN`(B)$B!"(B<code>Referer</code>
- $B$dB>$N(B HTTP $B%j%/%(%9%H$N%X%C%@%U%#!<%k%I$J$I$K4p$E$$$F(B
- $B%"%/%;%95v2D$r$9$k$?$a$K;H$&$3$H$,$G$-$^$9!#(B
- </p>
-
-<div class="example"><h3>$BNc(B:</h3><p><code>
-
-SetEnvIf User-Agent ^KnockKnock/2.0 let_me_in<br />
-<Directory /docroot><br />
-   Order Deny,Allow<br />
-   Deny from all<br />
-   Allow from env=let_me_in<br />
-</Directory>
-</code></p></div>
-
- <p>$B$3$N>l9g!"(Buser-agent $B$NJ8;zNs$,(B <code>KnockKnock/2.0</code>
- $B$G;O$^$k%V%i%&%6$N$_$,%"%/%;%9$r5v2D$5$l!"(B
- $BB>$N$b$N$O%"%/%;%9$r5qH]$5$l$^$9!#(B</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="Deny" id="Deny">Deny</a> <a name="deny" id="deny">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%5!<%P$,%"%/%;%9$r5qH]$9$k%[%9%H$r@)8f$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code> Deny from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Limit</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_authz_host</td></tr></table>
- <p>$B$3$N%G%#%l%/%F%#%V$O%[%9%HL>!"(BIP
- $B%"%I%l%9!"4D6-JQ?t$K4p$E$$$F%5!<%P$X$N%"%/%;%9$r@)8B$7$^$9!#(B
- <code class="directive">Deny</code> $B%G%#%l%/%F%#%V$N0z?t$O(B <code class="directive"><a href="#allow">Allow</a></code>
- $B%G%#%l%/%F%#%V$H$^$C$?$/F1$8$G$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="Order" id="Order">Order</a> <a name="order" id="order">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%G%U%)%k%H$N%"%/%;%92DG=$J>uBV$H!"(BAllow $B$H(B
-Deny $B$,I>2A$5$l$k=gHV$r@)8f$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code> Order <em>ordering</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>Order Deny,Allow</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Limit</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_authz_host</td></tr></table>
-
- <p><code class="directive">Order</code> $B%G%#%l%/%F%#%V$O%G%U%)%k%H$N%"%/%;%9$N>uBV$H(B
- <code class="directive"><a href="#allow">Allow</a></code> $B%G%#%l%/%F%#%V$H(B
- <code class="directive"><a href="#deny">Deny</a></code>
- $B%G%#%l%/%F%#%V$,I>2A$5$l$k=gHV$r@)8f$7$^$9!#(B
- <em>Ordering</em> $B$O0J2<$N$I$l$+$G$9!#(B</p>
-
- <dl>
- <dt>Deny,Allow</dt>
-
- <dd><code class="directive"><a href="#deny">Deny</a></code> $B%G%#%l%/%F%#%V$,(B
- <code class="directive"><a href="#allow">Allow</a></code>
- $B%G%#%l%/%F%#%V$NA0$KI>2A$5$l$^$9!#(B
- $B%"%/%;%9$O%G%U%)%k%H$G5v2D$5$l$^$9!#(B<code class="directive"><a href="#deny">Deny</a></code>
- $B%G%#%l%/%F%#%V$K9g$o$J$$$+!"(B<code class="directive"><a href="#allow">Allow</a></code>
- $B%G%#%l%/%F%#%V$K9g$&%/%i%$%"%s%H$O%"%/%;%9$r5v2D$5$l$^$9!#(B</dd>
-
- <dt>Allow,Deny</dt>
-
- <dd><code class="directive"><a href="#allow">Allow</a></code>
- $B%G%#%l%/%F%#%V$,(B <code class="directive"><a href="#deny">Deny</a></code>
- $B%G%#%l%/%F%#%V$NA0$KI>2A$5$l$^$9!#(B
- $B%"%/%;%9$O%G%U%)%k%H$G5qH]$5$l$^$9!#(B<code class="directive"><a href="#allow">Allow</a></code>
- $B%G%#%l%/%F%#%V$K9g$o$J$$$+!"(B<code class="directive"><a href="#deny">Deny</a></code>
- $B%G%#%l%/%F%#%V$K9g$&%/%i%$%"%s%H$O%"%/%;%9$r5qH]$5$l$^$9!#(B
- </dd>
-
- <dt>Mutual-failure</dt>
-
- <dd><code class="directive"><a href="#allow">Allow</a></code> $B$N%j%9%H$K8=$l$F!"(B
- <code class="directive"><a href="#deny">Deny</a></code>
- $B$N%j%9%H$K8=$l$J$$%[%9%H$N$_$,%"%/%;%9$r5v2D$5$l$^$9!#(B
- $B$3$N=gHVIU$1$O(B <code>Order Allow,Deny</code> $B$HF1$88z2L$r;}$A!"(B
- $B$=$N@_Dj$NJ}$,9%$^$7$$$?$a$KHs?d>)$H$J$C$F$$$^$9!#(B</dd>
- </dl>
-
- <p>$B%-!<%o!<%I$O%3%s%^$GJ,N%$9$k$3$H$@$1$,2DG=$G$9!#(B
- $B4V$K6uGr$,$"$C$F$O$$$1$^$;$s!#$I$N>l9g$G$b!"(B<code class="directive"><a href="#allow">Allow</a></code> $B$H(B
- <code class="directive"><a href="#deny">Deny</a></code> $BJ8$O(B
- $BA4$FI>2A$5$l$k$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#(B
- </p>
-
- <p>$B0J2<$NNc$G$O!"(Bapache.org
- $B%I%a%$%s$N$9$Y$F$N%[%9%H$O%"%/%;%9$r5v2D$5$l$^$9!#(B
- $BB>$N$9$Y$F$N%[%9%H$O%"%/%;%9$r5qH]$5$l$^$9!#(B</p>
-
-<div class="example"><p><code>
- Order Deny,Allow<br />
- Deny from all<br />
- Allow from apache.org<br />
-</code></p></div>
-
- <p>$B<!$NNc$G$O!"(Bfoo.apache.org $B%5%V%I%a%$%s$K$"$k%[%9%H0J30$N!"(B
- apache.org $B%I%a%$%s$N$9$Y$F$N%[%9%H$,%"%/%;%9$r5v2D$5$l$^$9!#(B
- apache.org
- $B%I%a%$%s$G$J$$%[%9%H$O!"%G%U%)%k%H$N>uBV$,%"%/%;%95qH]$N$?$a!"(B
- $B%5!<%P$X$N%"%/%;%9$r5qH]$5$l$^$9!#(B</p>
-
-<div class="example"><p><code>
- Order Allow,Deny<br />
- Allow from apache.org<br />
- Deny from foo.apache.org<br />
-</code></p></div>
-
- <p>$B0lJ}!">e$NNc$N(B <code class="directive">Order</code> $B$,(B <code>Deny,Allow</code>
- $B$KJQ$o$C$F$$$l$P!"$9$Y$N%[%9%H$K%"%/%;%9$,5v2D$5$l$^$9!#(B
- $B$3$l$O!"@_Dj%U%!%$%kCf$N<B:]$N=gHV$K4X$o$i$:!"(B
- <code>Allow from apache.org</code> $B$,:G8e$KI>2A$5$l$F!"(B
- <code>Deny from foo.apache.org</code> $B$r>e=q$-$9$k$+$i$G$9!#(B
- <code>apache.org</code>
- $B%I%a%$%s$K$J$$%[%9%H$b!"%G%U%)%k%H$N>uBV$,(B <em>allow</em>
- $B$KJQ2=$9$k$?$a$K!"%"%/%;%9$r5v2D$5$l$^$9!#(B
- </p>
-
- <p><code class="directive">Order</code>
- $B%G%#%l%/%F%#%V$O%G%U%)%k%H$N%"%/%;%9$N>uBV$K1F6A$rM?$($k$N$G!"(B
- <code class="directive"><a href="#allow">Allow</a></code> $B%G%#%l%/%F%#%V$H(B
- <code class="directive"><a href="#deny">Deny</a></code>
- $B%G%#%l%/%F%#%V$,L5$/$F$b!"%5!<%P$N%"%/%;%9$K1F6A$rM?$($k$3$H$,$G$-$^$9!#(B
- $B$?$H$($P!"(B</p>
-
-<div class="example"><p><code>
- <Directory /www><br />
-   Order Allow,Deny<br />
- </Directory>
-</code></p></div>
-
- <p>$B$O%G%U%)%k%H$N%"%/%;%9>uBV$,(B <em>deny</em> $B$K$J$k$?$a!"(B
- <code>/www</code> $B%G%#%l%/%H%j$X$N$9$Y$F$N%"%/%;%9$r5qH]$7$^$9!#(B
- </p>
-
- <p><code class="directive">Order</code>
- $B%G%#%l%/%F%#%V$O%5!<%P$N@_Dj=hM}$N3FCJ3,$G$@$1(B
- $B%"%/%;%9%G%#%l%/%F%#%V$N=hM}$N=gHV$rJQ99$7$^$9!#$3$l$O!"$?$H$($P!"(B
- <code class="directive">Order</code> $B%G%#%l%/%F%#%V$N@_Dj$K4X$o$i$:!"(B
- <code class="directive"><a href="../mod/core.html#location"><Location></a></code> $B%;%/%7%g%s$N(B
- <code class="directive"><a href="#allow">Allow</a></code> $B%G%#%l%/%F%#%V$d(B
- <code class="directive"><a href="#deny">Deny</a></code> $B%G%#%l%/%F%#%V$O!"(B
- <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> $B%;%/%7%g%s$d(B
- <code>.htaccess</code> $B%U%!%$%k$N(B <code class="directive"><a href="#allow">Allow</a></code>
- $B%G%#%l%/%F%#%V$d(B <code class="directive"><a href="#deny">Deny</a></code>
- $B%G%#%l%/%F%#%V$h$j$b>o$K8e$KI>2A$5$l$k$H$$$&$3$H$r0UL#$7$^$9!#(B
- $B@_Dj%;%/%7%g%s$N%^!<%8$N>\:Y$K$D$$$F$O!"(B
- <a href="../sections.html">Directory,Location, Files
- $B%;%/%7%g%s$NF0:nJ}K!(B</a> $B$r;2>H$7$F$/$@$5$$!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_host.xml b/docs/manual/mod/mod_authz_host.xml
deleted file mode 100644
index 6048134..0000000
--- a/docs/manual/mod/mod_authz_host.xml
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<modulesynopsis>
-
-<name>mod_authz_host</name>
-
-<description>Group authorizations based on host (name or IP
-address)</description>
-
-<status>Base</status>
-<sourcefile>mod_authz_host.c</sourcefile>
-<identifier>authz_host_module</identifier>
-<compatibility>Available in Apache 2.0.44 and later</compatibility>
-
-<summary>
- <p>The directives provided by <module>mod_authz_host</module> are
- used in <directive module="core" type="section">Directory</directive>,
- <directive module="core" type="section">Files</directive>, and
- <directive module="core" type="section">Location</directive> sections
- as well as <code><a href="core.html#accessfilename">.htaccess</a>
- </code> files to control access to particular parts of the server.
- Access can be controlled based on the client hostname, IP address, or
- other characteristics of the client request, as captured in <a
- href="../env.html">environment variables</a>. The <directive
- module="mod_authz_host">Allow</directive> and <directive
- module="mod_authz_host">Deny</directive> directives are used to
- specify which clients are or are not allowed access to the server,
- while the <directive module="mod_authz_host">Order</directive>
- directive sets the default access state, and configures how the
- <directive module="mod_authz_host">Allow</directive> and <directive
- module="mod_authz_host">Deny</directive> directives interact with each
- other.</p>
-
- <p>Both host-based access restrictions and password-based
- authentication may be implemented simultaneously. In that case,
- the <directive module="core">Satisfy</directive> directive is used
- to determine how the two sets of restrictions interact.</p>
-
- <p>In general, access restriction directives apply to all
- access methods (<code>GET</code>, <code>PUT</code>,
- <code>POST</code>, etc). This is the desired behavior in most
- cases. However, it is possible to restrict some methods, while
- leaving other methods unrestricted, by enclosing the directives
- in a <directive module="core" type="section">Limit</directive> section.</p>
-</summary>
-
-<seealso><directive module="core">Satisfy</directive></seealso>
-<seealso><directive module="core">Require</directive></seealso>
-
-<directivesynopsis>
-<name>Allow</name>
-
-<description>Controls which hosts can access an area of the
-server</description>
-<syntax> Allow from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</em>] ...</syntax>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>Limit</override>
-
-<usage>
-
- <p>The <directive>Allow</directive> directive affects which hosts can
- access an area of the server. Access can be controlled by
- hostname, IP Address, IP Address range, or by other
- characteristics of the client request captured in environment
- variables.</p>
-
- <p>The first argument to this directive is always
- <code>from</code>. The subsequent arguments can take three
- different forms. If <code>Allow from all</code> is specified, then
- all hosts are allowed access, subject to the configuration of the
- <directive module="mod_authz_host">Deny</directive> and <directive
- module="mod_authz_host">Order</directive> directives as discussed
- below. To allow only particular hosts or groups of hosts to access
- the server, the <em>host</em> can be specified in any of the
- following formats:</p>
-
- <dl>
- <dt>A (partial) domain-name</dt>
-
- <dd>Example: <code>Allow from apache.org</code><br />
- Hosts whose names match, or end in, this string are allowed
- access. Only complete components are matched, so the above
- example will match <code>foo.apache.org</code> but it will
- not match <code>fooapache.org</code>. This configuration will
- cause the server to perform a reverse DNS lookup on the
- client IP address, regardless of the setting of the <directive
- module="core">HostnameLookups</directive>
- directive.</dd>
-
- <dt>A full IP address</dt>
-
- <dd>Example: <code>Allow from 10.1.2.3</code><br />
- An IP address of a host allowed access</dd>
-
- <dt>A partial IP address</dt>
-
- <dd>Example: <code>Allow from 10.1</code><br />
- The first 1 to 3 bytes of an IP address, for subnet
- restriction.</dd>
-
- <dt>A network/netmask pair</dt>
-
- <dd>Example: <code>Allow from
- 10.1.0.0/255.255.0.0</code><br />
- A network a.b.c.d, and a netmask w.x.y.z. For more
- fine-grained subnet restriction.</dd>
-
- <dt>A network/nnn CIDR specification</dt>
-
- <dd>Example: <code>Allow from 10.1.0.0/16</code><br />
- Similar to the previous case, except the netmask consists of
- nnn high-order 1 bits.</dd>
- </dl>
-
- <p>Note that the last three examples above match exactly the
- same set of hosts.</p>
-
- <p>IPv6 addresses and IPv6 subnets can be specified as shown
- below:</p>
-
- <example>
- Allow from fe80::a00:20ff:fea7:ccea<br />
- Allow from fe80::a00:20ff:fea7:ccea/10
- </example>
-
- <p>The third format of the arguments to the
- <directive>Allow</directive> directive allows access to the server
- to be controlled based on the existence of an <a
- href="../env.html">environment variable</a>. When <code>Allow from
- env=</code><em>env-variable</em> is specified, then the request is
- allowed access if the environment variable <em>env-variable</em>
- 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
- <module>mod_setenvif</module>. 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>
-
-<example>
-<title>Example:</title>
-SetEnvIf User-Agent ^KnockKnock/2.0 let_me_in<br />
-<Directory /docroot><br />
- Order Deny,Allow<br />
- Deny from all<br />
- Allow from env=let_me_in<br />
-</Directory>
-</example>
-
- <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>
-</usage>
-
-</directivesynopsis>
-
-<directivesynopsis>
-
-<name>Deny</name>
-
-<description>Controls which hosts are denied access to the
-server</description>
-
-<syntax> Deny from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</em>] ...</syntax>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>Limit</override>
-
-<usage>
- <p>This directive allows access to the server to be restricted
- based on hostname, IP address, or environment variables. The
- arguments for the <directive>Deny</directive> directive are
- identical to the arguments for the <directive
- module="mod_authz_host">Allow</directive> directive.</p>
-</usage>
-
-</directivesynopsis>
-
-<directivesynopsis>
-
-<name>Order</name>
-
-<description>Controls the default access state and the order in which
-<directive>Allow</directive> and <directive>Deny</directive> are
-evaluated.</description>
-
-<syntax> Order <em>ordering</em></syntax>
-<default>Order Deny,Allow</default>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>Limit</override>
-
-<usage>
-
- <p>The <directive>Order</directive> directive controls the default
- access state and the order in which <directive
- module="mod_authz_host">Allow</directive> and <directive
- module="mod_authz_host">Deny</directive> directives are evaluated.
- <em>Ordering</em> is one of</p>
-
- <dl>
- <dt>Deny,Allow</dt>
-
- <dd>The <directive module="mod_authz_host">Deny</directive> directives
- are evaluated before the <directive
- module="mod_authz_host">Allow</directive> directives. Access is
- allowed by default. Any client which does not match a
- <directive module="mod_authz_host">Deny</directive> directive or does
- match an <directive module="mod_authz_host">Allow</directive>
- directive will be allowed access to the server.</dd>
-
- <dt>Allow,Deny</dt>
-
- <dd>The <directive module="mod_authz_host">Allow</directive>
- directives are evaluated before the <directive
- module="mod_authz_host">Deny</directive> directives. Access is denied
- by default. Any client which does not match an <directive
- module="mod_authz_host">Allow</directive> directive or does match a
- <directive module="mod_authz_host">Deny</directive> directive will be
- denied access to the server.</dd>
-
- <dt>Mutual-failure</dt>
-
- <dd>Only those hosts which appear on the <directive
- module="mod_authz_host">Allow</directive> list and do not appear on
- the <directive module="mod_authz_host">Deny</directive> list are
- granted access. This ordering has the same effect as <code>Order
- Allow,Deny</code> and is deprecated in favor of that
- configuration.</dd>
- </dl>
-
- <p>Keywords may only be separated by a comma; no whitespace is
- allowed between them. Note that in all cases every <directive
- module="mod_authz_host">Allow</directive> and <directive
- module="mod_authz_host">Deny</directive> statement is evaluated.</p>
-
- <p>In the following example, all hosts in the apache.org domain
- are allowed access; all other hosts are denied access.</p>
-
-<example>
- Order Deny,Allow<br />
- Deny from all<br />
- Allow from apache.org<br />
-</example>
-
- <p>In the next example, all hosts in the apache.org domain are
- allowed access, except for the hosts which are in the
- foo.apache.org subdomain, who are denied access. All hosts not
- in the apache.org domain are denied access because the default
- state is to deny access to the server.</p>
-
-<example>
- Order Allow,Deny<br />
- Allow from apache.org<br />
- Deny from foo.apache.org<br />
-</example>
-
- <p>On the other hand, if the <directive>Order</directive> in the last
- example is changed to <code>Deny,Allow</code>, all hosts will
- be allowed access. This happens because, regardless of the
- actual ordering of the directives in the configuration file,
- the <code>Allow from apache.org</code> will be evaluated last
- and will override the <code>Deny from foo.apache.org</code>.
- All hosts not in the <code>apache.org</code> domain will also
- be allowed access because the default state will change to
- <em>allow</em>.</p>
-
- <p>The presence of an <directive>Order</directive> directive can affect
- access to a part of the server even in the absence of accompanying
- <directive module="mod_authz_host">Allow</directive> and <directive
- module="mod_authz_host">Deny</directive> directives because of its effect
- on the default access state. For example,</p>
-
-<example>
- <Directory /www><br />
- Order Allow,Deny<br />
- </Directory>
-</example>
-
- <p>will deny all access to the <code>/www</code> directory
- because the default access state will be set to
- <em>deny</em>.</p>
-
- <p>The <directive>Order</directive> directive controls the order of access
- directive processing only within each phase of the server's
- configuration processing. This implies, for example, that an
- <directive module="mod_authz_host">Allow</directive> or <directive
- module="mod_authz_host">Deny</directive> directive occurring in a
- <directive module="core" type="section">Location</directive> section will
- always be evaluated after an <directive
- module="mod_authz_host">Allow</directive> or <directive
- module="mod_authz_host">Deny</directive> directive occurring in a
- <directive module="core" type="section">Directory</directive> section or
- <code>.htaccess</code> file, regardless of the setting of the
- <directive>Order</directive> directive. For details on the merging
- of configuration sections, see the documentation on <a
- href="../sections.html">How Directory, Location and Files sections
- work</a>.</p>
-</usage>
-
-</directivesynopsis>
-
-</modulesynopsis>
diff --git a/docs/manual/mod/mod_autoindex.html.en b/docs/manual/mod/mod_autoindex.html.en
index 2b14ca5..4ea36b2 100644
--- a/docs/manual/mod/mod_autoindex.html.en
+++ b/docs/manual/mod/mod_autoindex.html.en
@@ -4,13 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_autoindex - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_autoindex</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Generates directory indexes,
+ -->
+<title>mod_autoindex - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_autoindex</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Generates directory indexes,
automatically, similar to the Unix <code>ls</code> command or the
- Win32 <code>dir</code> shell command</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>autoindex_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_autoindex.c</td></tr></table><h3>Summary</h3>
+ Win32 <code>dir</code> shell command</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>autoindex_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_autoindex.c</td></tr></table>
+<h3>Summary</h3>
+
<p>The index of a directory can come from one of two
sources:</p>
@@ -51,7 +68,10 @@
displayed value - so a 1010-byte file will always be displayed
before a 1011-byte file (if in ascending order) even though
they both are shown as "1K".</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#addalt">AddAlt</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#addalt">AddAlt</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#addaltbyencoding">AddAltByEncoding</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#addaltbytype">AddAltByType</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#adddescription">AddDescription</a></li>
@@ -64,7 +84,14 @@
<li><img alt="" src="../images/down.gif" /> <a href="#indexoptions">IndexOptions</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#indexorderdefault">IndexOrderDefault</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#readmename">ReadmeName</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#query">Autoindex Request Query Arguments</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>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#query">Autoindex Request Query Arguments</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>Apache 2.0.23 reorganized the Query Arguments for Column
@@ -163,14 +190,18 @@
</form>
</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
-icon selected by filename</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddAlt <var>string</var> <var>file</var> [<var>file</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>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_autoindex</td></tr></table>
+</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
+icon selected by filename</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddAlt <var>string</var> <var>file</var> [<var>file</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>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_autoindex</td></tr>
+</table>
<p><code class="directive">AddAlt</code> provides the alternate text to
display for a file, instead of an icon, for <code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>.
<var>File</var> is a file extension, partial filename, wild-card
@@ -184,15 +215,20 @@
AddAlt "PDF file" *.pdf<br />
AddAlt Compressed *.gz *.zip *.Z
</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="AddAltByEncoding" id="AddAltByEncoding">AddAltByEncoding</a> <a name="addaltbyencoding" id="addaltbyencoding">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 icon
-selected by MIME-encoding</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddAltByEncoding <var>string</var> <var>MIME-encoding</var>
-[<var>MIME-encoding</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>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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddAltByEncoding" id="AddAltByEncoding">AddAltByEncoding</a> <a name="addaltbyencoding" id="addaltbyencoding">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 icon
+selected by MIME-encoding</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddAltByEncoding <var>string</var> <var>MIME-encoding</var>
+[<var>MIME-encoding</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>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_autoindex</td></tr>
+</table>
<p><code class="directive">AddAltByEncoding</code> provides the alternate
text to display for a file, instead of an icon, for <code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>.
<var>MIME-encoding</var> is a valid content-encoding, such as
@@ -204,15 +240,20 @@
<div class="example"><h3>Example</h3><p><code>
AddAltByEncoding gzip x-gzip
</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="AddAltByType" id="AddAltByType">AddAltByType</a> <a name="addaltbytype" id="addaltbytype">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
-icon selected by MIME content-type</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddAltByType <var>string</var> <var>MIME-type</var>
-[<var>MIME-type</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>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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddAltByType" id="AddAltByType">AddAltByType</a> <a name="addaltbytype" id="addaltbytype">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
+icon selected by MIME content-type</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddAltByType <var>string</var> <var>MIME-type</var>
+[<var>MIME-type</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>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_autoindex</td></tr>
+</table>
<p><code class="directive">AddAltByType</code> sets the alternate text to
display for a file, instead of an icon, for <code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>.
<var>MIME-type</var> is a valid content-type, such as
@@ -224,13 +265,18 @@
<div class="example"><h3>Example</h3><p><code>
AddAltByType 'plain text' text/plain
</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="AddDescription" id="AddDescription">AddDescription</a> <a name="adddescription" id="adddescription">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Description to display for a file</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddDescription <var>string file</var> [<var>file</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>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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddDescription" id="AddDescription">AddDescription</a> <a name="adddescription" id="adddescription">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Description to display for a file</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddDescription <var>string file</var> [<var>file</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>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_autoindex</td></tr>
+</table>
<p>This sets the description to display for a file, for
<code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>.
<var>File</var> is a file extension, partial filename, wild-card
@@ -258,14 +304,19 @@
element (such as cutting off the end of a bolded phrase), the
results may affect the rest of the directory listing.</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="AddIcon" id="AddIcon">AddIcon</a> <a name="addicon" id="addicon">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Icon to display for a file selected by name</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddIcon <var>icon</var> <var>name</var> [<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#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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddIcon" id="AddIcon">AddIcon</a> <a name="addicon" id="addicon">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Icon to display for a file selected by name</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddIcon <var>icon</var> <var>name</var> [<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#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_autoindex</td></tr>
+</table>
<p>This sets the icon to display next to a file ending in
<var>name</var> for <code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>. <var>Icon</var> is either a (%-escaped)
relative URL to the icon, or of the format <code>
@@ -286,15 +337,20 @@
<p><code class="directive"><a href="#addiconbytype">AddIconByType</a></code>
should be used in preference to <code class="directive">AddIcon</code>,
when possible.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AddIconByEncoding" id="AddIconByEncoding">AddIconByEncoding</a> <a name="addiconbyencoding" id="addiconbyencoding">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Icon to display next to files selected by MIME
-content-encoding</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddIconByEncoding <var>icon MIME-encoding</var>
-[<var>MIME-encoding</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>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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddIconByEncoding" id="AddIconByEncoding">AddIconByEncoding</a> <a name="addiconbyencoding" id="addiconbyencoding">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Icon to display next to files selected by MIME
+content-encoding</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddIconByEncoding <var>icon</var> <var>MIME-encoding</var>
+[<var>MIME-encoding</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>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_autoindex</td></tr>
+</table>
<p>This sets the icon to display next to files with <code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>.
<var>Icon</var> is either a (%-escaped) relative URL to the icon,
or of the format <code>(<var>alttext</var>,<var>url</var>)</code>
@@ -307,15 +363,20 @@
<div class="example"><h3>Example</h3><p><code>
AddIconByEncoding /icons/compress.xbm x-compress
</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="AddIconByType" id="AddIconByType">AddIconByType</a> <a name="addiconbytype" id="addiconbytype">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Icon to display next to files selected by MIME
-content-type</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddIconByType <var>icon</var> <var>MIME-type</var>
-[<var>MIME-type</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>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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddIconByType" id="AddIconByType">AddIconByType</a> <a name="addiconbytype" id="addiconbytype">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Icon to display next to files selected by MIME
+content-type</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddIconByType <var>icon</var> <var>MIME-type</var>
+[<var>MIME-type</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>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_autoindex</td></tr>
+</table>
<p>This sets the icon to display next to files of type
<var>MIME-type</var> for <code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>.
<var>Icon</var> is either a (%-escaped) relative URL to the icon,
@@ -329,14 +390,19 @@
<div class="example"><h3>Example</h3><p><code>
AddIconByType (IMG,/icons/image.xbm) 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="DefaultIcon" id="DefaultIcon">DefaultIcon</a> <a name="defaulticon" id="defaulticon">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Icon to display for files when no specific icon is
-configured</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>DefaultIcon <var>url-path</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>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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DefaultIcon" id="DefaultIcon">DefaultIcon</a> <a name="defaulticon" id="defaulticon">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Icon to display for files when no specific icon is
+configured</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DefaultIcon <var>url-path</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>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_autoindex</td></tr>
+</table>
<p>The <code class="directive">DefaultIcon</code> directive sets the icon
to display for files when no specific icon is known, for <code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>.
<var>Url-path</var> is a (%-escaped) relative URL to the icon.</p>
@@ -344,14 +410,19 @@
<div class="example"><h3>Example</h3><p><code>
DefaultIcon /icon/unknown.xbm
</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="HeaderName" id="HeaderName">HeaderName</a> <a name="headername" id="headername">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Name of the file that will be inserted at the top
-of the index listing</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>HeaderName <var>filename</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>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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="HeaderName" id="HeaderName">HeaderName</a> <a name="headername" id="headername">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Name of the file that will be inserted at the top
+of the index listing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>HeaderName <var>filename</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>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_autoindex</td></tr>
+</table>
<p>The <code class="directive">HeaderName</code> directive sets the name
of the file that will be inserted at the top of the index
listing. <var>Filename</var> is the name of the file to include.</p>
@@ -396,14 +467,19 @@
then you will probably want to set <a href="#indexoptions:suppresshtmlpreamble"><code>IndexOptions
+SuppressHTMLPreamble</code></a>, so that these tags are not
repeated.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="IndexIgnore" id="IndexIgnore">IndexIgnore</a> <a name="indexignore" id="indexignore">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Adds to the list of files to hide when listing
-a directory</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>IndexIgnore <var>file</var> [<var>file</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>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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IndexIgnore" id="IndexIgnore">IndexIgnore</a> <a name="indexignore" id="indexignore">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Adds to the list of files to hide when listing
+a directory</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>IndexIgnore <var>file</var> [<var>file</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>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_autoindex</td></tr>
+</table>
<p>The <code class="directive">IndexIgnore</code> directive adds to the
list of files to hide when listing a directory. <var>File</var> is a
file extension, partial filename, wildcard expression or full
@@ -415,15 +491,20 @@
<div class="example"><p><code>
IndexIgnore README .htaccess *~
</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="IndexOptions" id="IndexOptions">IndexOptions</a> <a name="indexoptions" id="indexoptions">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Various configuration settings for directory
-indexing</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>IndexOptions [+|-]<var>option</var> [[+|-]<var>option</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>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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IndexOptions" id="IndexOptions">IndexOptions</a> <a name="indexoptions" id="indexoptions">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Various configuration settings for directory
+indexing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>IndexOptions [+|-]<var>option</var> [[+|-]<var>option</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>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_autoindex</td></tr>
+</table>
<p>The <code class="directive">IndexOptions</code> directive specifies the
behavior of the directory indexing. <var>Option</var> can be one
of</p>
@@ -504,6 +585,13 @@
the standard width of the icons supplied with the Apache
software.</dd>
+ <dt><a name="indexoptions:ignorecase" id="indexoptions:ignorecase">IgnoreCase</a></dt>
+
+ <dd>If this option is enabled, names are sorted in a case-insensitive
+ manner. For instance, if the sort order is ascending by name, and
+ IgnoreCase is enabled, file Zeta will be listed after file alfa
+ (Note: file GAMMA will always be listed before file gamma). </dd>
+
<dt><a name="indexoptions:ignoreclient" id="indexoptions:ignoreclient">IgnoreClient</a></dt>
<dd>This option causes <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> to ignore all
@@ -693,15 +781,20 @@
keywords without any <code>+</code> or <code>-</code> prefixes.</p>
</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="IndexOrderDefault" id="IndexOrderDefault">IndexOrderDefault</a> <a name="indexorderdefault" id="indexorderdefault">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the default ordering of the directory index</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>IndexOrderDefault Ascending|Descending
-Name|Date|Size|Description</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>IndexOrderDefault Ascending 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>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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IndexOrderDefault" id="IndexOrderDefault">IndexOrderDefault</a> <a name="indexorderdefault" id="indexorderdefault">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the default ordering of the directory index</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>IndexOrderDefault Ascending|Descending
+Name|Date|Size|Description</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>IndexOrderDefault Ascending 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>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_autoindex</td></tr>
+</table>
<p>The <code class="directive">IndexOrderDefault</code> directive is used
in combination with the <code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code> index option. By default, fancyindexed
directory listings are displayed in ascending order by filename; the
@@ -720,14 +813,19 @@
particular order by combining this directive with the <code><a href="#indexoptions:suppresscolumnsorting">SuppressColumnSorting</a></code> index option; this will prevent
the client from requesting the directory listing in a different
order.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ReadmeName" id="ReadmeName">ReadmeName</a> <a name="readmename" id="readmename">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Name of the file that will be inserted at the end
-of the index listing</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ReadmeName <var>filename</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>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_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ReadmeName" id="ReadmeName">ReadmeName</a> <a name="readmename" id="readmename">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Name of the file that will be inserted at the end
+of the index listing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ReadmeName <var>filename</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>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_autoindex</td></tr>
+</table>
<p>The <code class="directive">ReadmeName</code> directive sets the name
of the file that will be appended to the end of the index
listing. <var>Filename</var> is the name of the file to include, and
@@ -746,4 +844,10 @@
<p>See also <code class="directive"><a href="#headername">HeaderName</a></code>, where this behavior is described in greater
detail.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_autoindex.html.ja.jis b/docs/manual/mod/mod_autoindex.html.ja.jis
index 51d6fb8..ef99495 100644
--- a/docs/manual/mod/mod_autoindex.html.ja.jis
+++ b/docs/manual/mod/mod_autoindex.html.ja.jis
@@ -4,13 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_autoindex - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_autoindex</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>Unix $B$N(B <code>ls</code> $B%3%^%s%I$d(B
+ -->
+<title>mod_autoindex - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_autoindex</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>Unix $B$N(B <code>ls</code> $B%3%^%s%I$d(B
Win32 $B$N(B <code>dir</code> $B%7%'%k%3%^%s%I$K;w$?(B
- $B%G(B$B%#%l%/%H%j%$%s%G%C%/%9$r@8@.$9$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>autoindex_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_autoindex.c</td></tr></table><h3>$B35MW(B</h3>
+ $B%G%#%l%/%H%j%$%s%G%C%/%9$r@8@.$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>autoindex_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_autoindex.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$B%G%#%l%/%H%j$N%$%s%G%C%/%9$OFs$D$N>pJs8;$N$&$A$N(B
$B0l$D$+$i@8@.$G$-$^$9(B:</p>
@@ -18,7 +35,7 @@
<li>$BIaDL$O(B <code>index.html</code> $B$H8F$P$l$k(B
$B%f!<%6$K$h$C$F=q$+$l$?%U%!%$%k!#(B
<code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
- $B%G%#(B$B%l%/%F%#%V$G$3$N%U%!%$%kL>$r@_Dj$7$^$9!#(B
+ $B%G%#%l%/%F%#%V$G$3$N%U%!%$%kL>$r@_Dj$7$^$9!#(B
$B$3$l$O(B <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> $B$G@)8f$5$l$^$9!#(B</li>
<li>$B$b$7$/$O!"%5!<%P$K$h$C$F@8@.$5$l$?0lMw!#(B
@@ -27,7 +44,7 @@
<code class="directive"><a href="#addiconbytype">AddIconByType</a></code>
$B$r;H$&$3$H$G!"MM!9$J%U%!%$%k%?%$%W$KBP$7$F%"%$%3%s0lMw$r(B
$B%;%C%H$7$^$9!#$D$^$j!"%j%9%H$5$l$?%U%!%$%kKh$K!"(B
- $B%U%!%$%k$K%^%C%A$7$?0lHV:G=i$N%"%$%3%s$,(B$BI=<($5$l$^$9!#(B
+ $B%U%!%$%k$K%^%C%A$7$?0lHV:G=i$N%"%$%3%s$,I=<($5$l$^$9!#(B
$B$3$l$i$O(B <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> $B$G@)8f$5$l$^$9!#(B</li>
</ul>
<p>$BK>$`$J$i$P!"<+F0%$%s%G%C%/%9@8@.$r40A4$K=|5n(B ($B$"$k$$$OCV49(B)
@@ -57,7 +74,10 @@
$B$?$H$(N>J}$H$b$,(B "1K" $B$HI=<($5$l$F$$$?$H$7$F$b!"(B
1010 $B%P%$%H$N%U%!%$%k$OI,$:(B 1011
$B%P%$%H$N%U%!%$%k$h$j$bA0(B ($B>:=g$N>l9g(B) $B$KI=<($5$l$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#addalt">AddAlt</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#addalt">AddAlt</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#addaltbyencoding">AddAltByEncoding</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#addaltbytype">AddAltByType</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#adddescription">AddDescription</a></li>
@@ -70,7 +90,14 @@
<li><img alt="" src="../images/down.gif" /> <a href="#indexoptions">IndexOptions</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#indexorderdefault">IndexOrderDefault</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#readmename">ReadmeName</a></li>
-</ul><h3>$B%H%T%C%/(B</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#query">Autoindex $B%j%/%(%9%H%/%(%j!<0z?t(B</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 $B%j%/%(%9%H%/%(%j!<0z?t(B</a></h2>
+</ul>
+<h3>$B%H%T%C%/(B</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#query">Autoindex $B%j%/%(%9%H%/%(%j!<0z?t(B</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 $B%j%/%(%9%H%/%(%j!<0z?t(B</a></h2>
<p>Apache 2.0.23 $B$G!"(B
@@ -91,7 +118,7 @@
<li><code>C=N</code> $B$O!"%U%!%$%kL>$G%=!<%H$7$^$9!#(B</li>
<li><code>C=M</code> $B$O!"99?7F|;~!"(B
- $B%G%#%l(B$B%/%H%j!"%U%!%$%kL>$N=g$G%=!<%H$7$^$9!#(B</li>
+ $B%G%#%l%/%H%j!"%U%!%$%kL>$N=g$G%=!<%H$7$^$9!#(B</li>
<li><code>C=S</code> $B$O!"%5%$%:!"(B
$B%G%#%l%/%H%j!"%U%!%$%kL>$N=g$G%=!<%H$7$^$9!#(B</li>
@@ -177,14 +204,18 @@
</form>
</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%"%$%3%s$NBe$o$j$K(B
-$BI=<($5$l$k!"%U%!%$%kL>$GA*Br$5$l$?BeBX%F%-%9%H(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddAlt <var>string</var> <var>file</var> [<var>file</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%"%$%3%s$NBe$o$j$K(B
+$BI=<($5$l$k!"%U%!%$%kL>$GA*Br$5$l$?BeBX%F%-%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddAlt <var>string</var> <var>file</var> [<var>file</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code class="directive">AddAlt</code> $B$O!"(B<code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>
$B$K$*$$$F!"%"%$%3%s$NBe$o$j$KI=<($9$kBeBX%F%-%9%H$rDs6!$7$^$9!#(B
<var>file</var> $B$O!"@bL@$9$k%U%!%$%k$N%U%!%$%k3HD%;R!"(B
@@ -200,15 +231,20 @@
AddAlt "PDF file" *.pdf<br />
AddAlt Compressed *.gz *.zip *.Z
</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="AddAltByEncoding" id="AddAltByEncoding">AddAltByEncoding</a> <a name="addaltbyencoding" id="addaltbyencoding">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%"%$%3%s$NBe$o$j$KI=<($5$l$k!"(BMIME $BId9f2=J}K!$GA*Br$5$l$?(B
-$BBeBX%F%-%9%H(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddAltByEncoding <var>string</var> <var>MIME-encoding</var>
-[<var>MIME-encoding</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddAltByEncoding" id="AddAltByEncoding">AddAltByEncoding</a> <a name="addaltbyencoding" id="addaltbyencoding">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%"%$%3%s$NBe$o$j$KI=<($5$l$k!"(BMIME $BId9f2=J}K!$GA*Br$5$l$?(B
+$BBeBX%F%-%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddAltByEncoding <var>string</var> <var>MIME-encoding</var>
+[<var>MIME-encoding</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code class="directive">AddAltByEncoding</code> $B$O!"(B
<code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>
$B$K$*$$$F!"%"%$%3%s$NBe$o$j$KI=<($9$kBeBXJ8;zNs$rDs6!$7$^$9!#(B
@@ -224,15 +260,20 @@
<div class="example"><h3>$BNc(B</h3><p><code>
AddAltByEncoding gzip x-gzip
</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="AddAltByType" id="AddAltByType">AddAltByType</a> <a name="addaltbytype" id="addaltbytype">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%"%$%3%s$NBe$o$j$K(B
-$BI=<($5$l$k!"(BMIME $B%?%$%W$GA*Br$5$l$?BeBX%F%-%9%H(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddAltByType <var>string</var> <var>MIME-type</var>
-[<var>MIME-type</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddAltByType" id="AddAltByType">AddAltByType</a> <a name="addaltbytype" id="addaltbytype">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%"%$%3%s$NBe$o$j$K(B
+$BI=<($5$l$k!"(BMIME $B%?%$%W$GA*Br$5$l$?BeBX%F%-%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddAltByType <var>string</var> <var>MIME-type</var>
+[<var>MIME-type</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code class="directive">AddAltByType</code> $B$O!"(B
<code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>
$B$K$*$$$F!"%"%$%3%s$NBe$o$j$KI=<($9$kBeBXJ8;zNs$r@_Dj$7$^$9!#(B
@@ -248,13 +289,18 @@
<div class="example"><h3>$BNc(B</h3><p><code>
AddAltByType 'plain text' text/plain
</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="AddDescription" id="AddDescription">AddDescription</a> <a name="adddescription" id="adddescription">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k$KBP$7$FI=<($9$k@bL@(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddDescription <var>string</var> <var>file</var> [<var>file</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddDescription" id="AddDescription">AddDescription</a> <a name="adddescription" id="adddescription">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k$KBP$7$FI=<($9$k@bL@(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddDescription <var>string</var> <var>file</var> [<var>file</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>
$B$K$*$$$F!"%U%!%$%k$KBP$7$FI=<($9$k@bL@$r@_Dj$7$^$9!#(B
<var>file</var> $B$O@bL@$9$k%U%!%$%k$N%U%!%$%k3HD%;R!"(B
@@ -294,14 +340,19 @@
($BB@;z$N8l6g$N:G8e$,@Z$l$k$H$$$C$?(B) $B>l9g!"(B
$B=PNO7k2L$O!"%G%#%l%/%H%j0lMw$N;D$j$NItJ,$K1F6A$rM?$($k$G$7$g$&!#(B</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="AddIcon" id="AddIcon">AddIcon</a> <a name="addicon" id="addicon">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k$KI=<($9$k%"%$%3%s$rL>A0$GA*Br(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddIcon <var>icon</var> <var>name</var>
-[<var>name</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddIcon" id="AddIcon">AddIcon</a> <a name="addicon" id="addicon">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k$KI=<($9$k%"%$%3%s$rL>A0$GA*Br(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddIcon <var>icon</var> <var>name</var>
+[<var>name</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>
$B$K$*$$$F!"(B
<var>name</var> $B$G=*$o$k%U%!%$%k$NNY$KI=<($9$k%"%$%3%s$r@_Dj$7$^$9!#(B
@@ -327,15 +378,20 @@
$B$h$j(B
<code class="directive"><a href="#addiconbytype">AddIconByType</a></code>
$B$rM%@hE*$K;H$&$Y$-$G$7$g$&!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AddIconByEncoding" id="AddIconByEncoding">AddIconByEncoding</a> <a name="addiconbyencoding" id="addiconbyencoding">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k$KI=<($9$k%"%$%3%s$r(B MIME
-$BId9f2=J}K!$GA*Br(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddIconByEncoding <var>icon</var> <var>MIME-encoding</var>
-[<var>MIME-encoding</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddIconByEncoding" id="AddIconByEncoding">AddIconByEncoding</a> <a name="addiconbyencoding" id="addiconbyencoding">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k$KI=<($9$k%"%$%3%s$r(B MIME
+$BId9f2=J}K!$GA*Br(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddIconByEncoding <var>icon</var> <var>MIME-encoding</var>
+[<var>MIME-encoding</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>
$B$K$*$$$F!"%U%!%$%k$NNY$KI=<($9$k%"%$%3%s$r@_Dj$7$^$9!#(B
<var>icon</var> $B$O!"(B(% $B$G%(%9%1!<%W$5$l$?(B) $B%"%$%3%s$X$NAjBP(B URL
@@ -350,15 +406,20 @@
<div class="example"><h3>$BNc(B</h3><p><code>
AddIconByEncoding /icons/compress.xbm x-compress
</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="AddIconByType" id="AddIconByType">AddIconByType</a> <a name="addiconbytype" id="addiconbytype">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k$NNY$KI=<($9$k%"%$%3%s$r(B
-MIME $B%?%$%W$K$h$C$FA*Br(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddIconByType <var>icon</var> <var>MIME-type</var>
-[<var>MIME-type</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddIconByType" id="AddIconByType">AddIconByType</a> <a name="addiconbytype" id="addiconbytype">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k$NNY$KI=<($9$k%"%$%3%s$r(B
+MIME $B%?%$%W$K$h$C$FA*Br(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddIconByType <var>icon</var> <var>MIME-type</var>
+[<var>MIME-type</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>
$B$K$*$$$F!"%U%!%$%k$NNY$KI=<($9$k%"%$%3%s$r@_Dj$7$^$9!#(B
<var>icon</var> $B$O!"(B(% $B$G%(%9%1!<%W$5$l$?(B) $B%"%$%3%s$X$NAjBP(B URL
@@ -373,14 +434,19 @@
<div class="example"><h3>$BNc(B</h3><p><code>
AddIconByType (IMG,/icons/image.xbm) 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="DefaultIcon" id="DefaultIcon">DefaultIcon</a> <a name="defaulticon" id="defaulticon">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$BFCDj$N%"%$%3%s$,2?$b@_Dj$5$l$F$$$J$$;~$K(B
-$B%U%!%$%k$KI=<($9$k%"%$%3%s(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>DefaultIcon <var>url-path</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DefaultIcon" id="DefaultIcon">DefaultIcon</a> <a name="defaulticon" id="defaulticon">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BFCDj$N%"%$%3%s$,2?$b@_Dj$5$l$F$$$J$$;~$K(B
+$B%U%!%$%k$KI=<($9$k%"%$%3%s(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>DefaultIcon <var>url-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>
$B$K$*$$$F!"(B
$BFCDj$N%"%$%3%s$,$J$$>l9g$K%U%!%$%k$KI=<($9$k%"%$%3%s$r@_Dj$7$^$9!#(B
@@ -390,14 +456,19 @@
<div class="example"><h3>$BNc(B</h3><p><code>
DefaultIcon /icon/unknown.xbm
</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="HeaderName" id="HeaderName">HeaderName</a> <a name="headername" id="headername">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>
-$B%$%s%G%C%/%90lMw$N@hF,$KA^F~$5$l$k%U%!%$%k$NL>A0(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>HeaderName <var>filename</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="HeaderName" id="HeaderName">HeaderName</a> <a name="headername" id="headername">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>
+$B%$%s%G%C%/%90lMw$N@hF,$KA^F~$5$l$k%U%!%$%k$NL>A0(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>HeaderName <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code class="directive">HeaderName</code>
$B%G%#%l%/%F%#%V$O!"(B
$B%$%s%G%C%/%90lMw$N@hF,$KA^F~$9$k%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B
@@ -456,14 +527,19 @@
<a href="#indexoptions:suppresshtmlpreamble"><code>IndexOptions
+SuppressHTMLPreamble</code></a>
$B$r@_Dj$7$F!"$3$l$i$N%?%0$,7+$jJV$5$l$J$$$h$&$K$7$?$$$H;W$&$G$7$g$&!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="IndexIgnore" id="IndexIgnore">IndexIgnore</a> <a name="indexignore" id="indexignore">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%G%#%l%/%H%j0lMw$r9T$J$&:]$KL5;k$9$Y$-(B
-$B%U%!%$%k%j%9%H$KDI2C(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>IndexIgnore <var>file</var> [<var>file</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IndexIgnore" id="IndexIgnore">IndexIgnore</a> <a name="indexignore" id="indexignore">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%G%#%l%/%H%j0lMw$r9T$J$&:]$KL5;k$9$Y$-(B
+$B%U%!%$%k%j%9%H$KDI2C(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>IndexIgnore <var>file</var> [<var>file</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code class="directive">IndexIgnore</code> $B%G%#%l%/%F%#%V$O!"(B
$B%G%#%l%/%H%j$N0lMw$r9T$&:]$KL5;k$9$Y$-%U%!%$%k%j%9%H$KDI2C$7$^$9!#(B
<var>file</var> $B$O!"L5;k$9$k%U%!%$%kL>$N%U%!%$%k3HD%;R$+!"%U%!%$%kL>$N0lIt$+!"(B
@@ -475,14 +551,19 @@
<div class="example"><p><code>
IndexIgnore README .htaccess *~
</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="IndexOptions" id="IndexOptions">IndexOptions</a> <a name="indexoptions" id="indexoptions">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%G%#%l%/%H%j%$%s%G%C%/%9$NMM!9$J@_Dj9`L\(B
-</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>IndexOptions [+|-]<var>option</var> [[+|-]<var>option</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IndexOptions" id="IndexOptions">IndexOptions</a> <a name="indexoptions" id="indexoptions">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%G%#%l%/%H%j%$%s%G%C%/%9$NMM!9$J@_Dj9`L\(B
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>IndexOptions [+|-]<var>option</var> [[+|-]<var>option</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code class="directive">IndexOptions</code>
$B$O!"%G%#%l%/%H%j%$%s%G%C%/%9$N5sF0$r;XDj$7$^$9!#(B
<var>option</var> $B$O<!$N$I$l$+$G$9(B:</p>
@@ -772,7 +853,7 @@
</code></p></div>
<p>$BCf?H$N8z2L$O(B
- <code>IndexOptions FancyIndexing +SuppressSize</code>
+ <code>IndexOptions?FancyIndexing?+SuppressSize</code>
$B$HF10l$G$9!#(B
$B@\F,<-$NIU$+$J$$(B <code>FancyIndexing</code>
$B$G$=$l0JA0$NA}8:%-!<%o!<%I$rL58z$K$5$l$F!"(B
@@ -784,16 +865,21 @@
$B@\F,<-$NIU$+$J$$%-!<%o!<%I$G@_Dj$7$F$/$@$5$$!#(B</p>
</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="IndexOrderDefault" id="IndexOrderDefault">IndexOrderDefault</a> <a name="indexorderdefault" id="indexorderdefault">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>
-$B%G%#%l%/%H%j%$%s%G%C%/%9$NI8=`$N=gHVIU$1$r@_Dj(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>IndexOrderDefault Ascending|Descending
-Name|Date|Size|Description</code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>IndexOrderDefault Ascending Name</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IndexOrderDefault" id="IndexOrderDefault">IndexOrderDefault</a> <a name="indexorderdefault" id="indexorderdefault">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>
+$B%G%#%l%/%H%j%$%s%G%C%/%9$NI8=`$N=gHVIU$1$r@_Dj(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>IndexOrderDefault Ascending|Descending
+Name|Date|Size|Description</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>IndexOrderDefault Ascending Name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code class="directive">IndexOrderDefault</code> $B%G%#%l%/%F%#%V$O(B
<code><a href="#indexoptions:fancyindexing">FancyIndexing</a></code>
$B%$%s%G%C%/%9%*%W%7%g%s$HJ;$;$FMQ$$$l$l$^$9!#(B
@@ -815,13 +901,18 @@
$B%G%#%l%/%H%j0lMw$r$"$kFCDj$N=gHV$G$N$_I=<($9$k$h$&$K$G$-$^$9!#(B
$B$3$l$O!"(B
$B%/%i%$%"%s%H$,JL$N=gHV$G%G%#%l%/%H%j0lMw$r%j%/%(%9%H$9$k$3$H$rKI$.$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ReadmeName" id="ReadmeName">ReadmeName</a> <a name="readmename" id="readmename">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%$%s%G%C%/%90lMw$N:G8e$KA^F~$5$l$k%U%!%$%k$NL>A0(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ReadmeName <var>filename</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_autoindex</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ReadmeName" id="ReadmeName">ReadmeName</a> <a name="readmename" id="readmename">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%$%s%G%C%/%90lMw$N:G8e$KA^F~$5$l$k%U%!%$%k$NL>A0(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ReadmeName <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_autoindex</td></tr>
+</table>
<p><code class="directive">ReadmeName</code> $B%G%#%l%/%F%#%V$O!"(B
$B%$%s%G%C%/%9$N=*$o$j$KIU$12C$($i$l$k%U%!%$%k$NL>A0$r@_Dj$7$^$9!#(B
<var>filename</var> $B$OA^F~$9$k%U%!%$%k$NL>A0$G!"(B
@@ -840,4 +931,10 @@
<p>$B$h$j>\:Y$K$^$G$3$N5sF0$K$D$$$F5-=R$7$F$$$k(B <code class="directive"><a href="#headername">HeaderName</a></code>
$B$b$4Mw2<$5$$!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_autoindex.xml b/docs/manual/mod/mod_autoindex.xml
index 6c17d14..b794986 100644
--- a/docs/manual/mod/mod_autoindex.xml
+++ b/docs/manual/mod/mod_autoindex.xml
@@ -328,7 +328,7 @@
<name>AddIconByEncoding</name>
<description>Icon to display next to files selected by MIME
content-encoding</description>
-<syntax>AddIconByEncoding <var>icon MIME-encoding</var>
+<syntax>AddIconByEncoding <var>icon</var> <var>MIME-encoding</var>
[<var>MIME-encoding</var>] ...</syntax>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context>
@@ -593,6 +593,14 @@
the standard width of the icons supplied with the Apache
software.</dd>
+ <dt><a name="indexoptions:ignorecase"
+ id="indexoptions:ignorecase">IgnoreCase</a></dt>
+
+ <dd>If this option is enabled, names are sorted in a case-insensitive
+ manner. For instance, if the sort order is ascending by name, and
+ IgnoreCase is enabled, file Zeta will be listed after file alfa
+ (Note: file GAMMA will always be listed before file gamma). </dd>
+
<dt><a name="indexoptions:ignoreclient"
id="indexoptions:ignoreclient">IgnoreClient</a></dt>
diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en
index d371d01..52c05dd 100644
--- a/docs/manual/mod/mod_cache.html.en
+++ b/docs/manual/mod/mod_cache.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_cache - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_cache</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Content cache keyed to URIs.</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>cache_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_cache.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_cache - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_cache</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Content cache keyed to URIs.</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>cache_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_cache.c</td></tr></table>
+<h3>Summary</h3>
+
<div class="warning">
This module is experimental. Documentation is still under development...
</div>
@@ -34,7 +51,10 @@
<p>Content is stored in and retrieved from the cache using URI based keys. Content with
access protection is not cached.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cachedefaultexpire">CacheDefaultExpire</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cachedefaultexpire">CacheDefaultExpire</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cachedisable">CacheDisable</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cacheenable">CacheEnable</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cacheforcecompletion">CacheForceCompletion</a></li>
@@ -42,10 +62,19 @@
<li><img alt="" src="../images/down.gif" /> <a href="#cacheignorenolastmod">CacheIgnoreNoLastMod</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cachelastmodifiedfactor">CacheLastModifiedFactor</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cachemaxexpire">CacheMaxExpire</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cachemaxstreamingbuffer">CacheMaxStreamingBuffer</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#related">Related Modules and Directives</a></li><li><img alt="" src="../images/down.gif" /> <a href="#sampleconf">Sample Configuration</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_disk_cache.html">mod_disk_cache</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_disk_cache.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachesize">CacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcinterval">CacheGcInterval</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheexpirycheck">CacheExpiryCheck</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachetimemargin">CacheTimeMargin</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcdaily">CacheGcDaily</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcunused">CacheGcUnused</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcclean">CacheGcClean</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.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></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>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#related">Related Modules and Directives</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sampleconf">Sample Configuration</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_disk_cache.html">mod_disk_cache</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_disk_cache.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachesize">CacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcinterval">CacheGcInterval</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheexpirycheck">CacheExpiryCheck</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachetimemargin">CacheTimeMargin</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcdaily">CacheGcDaily</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcunused">CacheGcUnused</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachegcclean">CacheGcClean</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.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">Sample Configuration</a></h2>
<div class="example"><h3>Sample httpd.conf</h3><p><code>
#<br />
# Sample Cache Configuration<br />
@@ -78,13 +107,17 @@
</span>
</IfModule>
</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">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><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheDefaultExpire <var>seconds</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheDefaultExpire 3600 (one hour)</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_cache</td></tr></table>
+</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>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheDefaultExpire <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheDefaultExpire 3600 (one hour)</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>
+</table>
<p>The <code class="directive">CacheDefaultExpire</code> directive specifies a default time,
in seconds, to cache a document if neither an expiry date nor last-modified date are provided
with the document. The value specified with the <code class="directive">CacheMaxExpire</code>
@@ -93,12 +126,17 @@
<div class="example"><p><code>
CacheDefaultExpire 86400
</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="CacheDisable" id="CacheDisable">CacheDisable</a> <a name="cachedisable" id="cachedisable">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Disable caching of specified URLs</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheDisable <var> url-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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheDisable" id="CacheDisable">CacheDisable</a> <a name="cachedisable" id="cachedisable">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Disable caching of specified URLs</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheDisable <var> url-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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>
+</table>
<p>The <code class="directive">CacheDisable</code> directive instructs
<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> to <em>not</em> cache urls at or below
<var>url-string</var>.</p>
@@ -106,13 +144,18 @@
<div class="example"><h3>Example</h3><p><code>
CacheDisable /local_files
</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="CacheEnable" id="CacheEnable">CacheEnable</a> <a name="cacheenable" id="cacheenable">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enable caching of specified URLs using a specified storage
-manager</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheEnable <var>cache_type</var> <var>url-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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheEnable" id="CacheEnable">CacheEnable</a> <a name="cacheenable" id="cacheenable">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable caching of specified URLs using a specified storage
+manager</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheEnable <var>cache_type</var> <var>url-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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>
+</table>
<p>The <code class="directive">CacheEnable</code> directive instructs
<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> to cache urls at or below
<var>url-string</var>. The cache storage manager is specified with the
@@ -137,14 +180,19 @@
CacheEnable fd /images<br />
CacheEnable disk /<br />
</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="CacheForceCompletion" id="CacheForceCompletion">CacheForceCompletion</a> <a name="cacheforcecompletion" id="cacheforcecompletion">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Percentage of document served, after which the server
-will complete caching the file even if the request is cancelled.</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheForceCompletion <var>Percentage</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheForceCompletion 60</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheForceCompletion" id="CacheForceCompletion">CacheForceCompletion</a> <a name="cacheforcecompletion" id="cacheforcecompletion">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Percentage of document served, after which the server
+will complete caching the file even if the request is cancelled.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheForceCompletion <var>Percentage</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheForceCompletion 60</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>
+</table>
<p>Ordinarily, if a request is cancelled while the response is being
cached and delivered to the client the processing of the response will
stop and the cache entry will be removed. The
@@ -165,14 +213,19 @@
<div class="warning"><h3>Note:</h3>
This feature is currently <em>not</em> implemented.
</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="CacheIgnoreCacheControl" id="CacheIgnoreCacheControl">CacheIgnoreCacheControl</a> <a name="cacheignorecachecontrol" id="cacheignorecachecontrol">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Ignore the fact that the client requested the content not be
-cached.</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheIgnoreCacheControl On|Off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheIgnoreCacheControl 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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheIgnoreCacheControl" id="CacheIgnoreCacheControl">CacheIgnoreCacheControl</a> <a name="cacheignorecachecontrol" id="cacheignorecachecontrol">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ignore the fact that the client requested the content not be
+cached.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheIgnoreCacheControl On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheIgnoreCacheControl 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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>
+</table>
<p>Ordinarily, documents with no-cache or no-store header values will not be stored in the cache.
The <code class="directive">CacheIgnoreCacheControl</code> directive allows this behavior to be overridden.
<code class="directive">CacheIgnoreCacheControl</code> On tells the server to attempt to cache the document
@@ -182,14 +235,19 @@
<div class="example"><p><code>
CacheIgnoreCacheControl On
</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="CacheIgnoreNoLastMod" id="CacheIgnoreNoLastMod">CacheIgnoreNoLastMod</a> <a name="cacheignorenolastmod" id="cacheignorenolastmod">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Ignore the fact that a response has no Last Modified
-header.</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheIgnoreNoLastMod On|Off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheIgnoreNoLastMod 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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheIgnoreNoLastMod" id="CacheIgnoreNoLastMod">CacheIgnoreNoLastMod</a> <a name="cacheignorenolastmod" id="cacheignorenolastmod">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ignore the fact that a response has no Last Modified
+header.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheIgnoreNoLastMod On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheIgnoreNoLastMod 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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>
+</table>
<p>Ordinarily, documents without a last-modified date are not cached.
Under some circumstances the last-modified date is removed (during
<code class="module"><a href="../mod/mod_include.html">mod_include</a></code> processing for example) or not provided
@@ -204,14 +262,19 @@
<div class="example"><p><code>
CacheIgnoreNoLastMod On
</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="CacheLastModifiedFactor" id="CacheLastModifiedFactor">CacheLastModifiedFactor</a> <a name="cachelastmodifiedfactor" id="cachelastmodifiedfactor">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The factor used to compute an expiry date based on the
-LastModified date.</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheLastModifiedFactor <var>float</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheLastModifiedFactor 0.1</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheLastModifiedFactor" id="CacheLastModifiedFactor">CacheLastModifiedFactor</a> <a name="cachelastmodifiedfactor" id="cachelastmodifiedfactor">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The factor used to compute an expiry date based on the
+LastModified date.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheLastModifiedFactor <var>float</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheLastModifiedFactor 0.1</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>
+</table>
<p>In the event that a document does not provide an expiry date but does
provide a last-modified date, an expiry date can be calculated based on
the time since the document was last modified. The
@@ -234,13 +297,18 @@
<div class="example"><p><code>
CacheLastModifiedFactor 0.5
</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="CacheMaxExpire" id="CacheMaxExpire">CacheMaxExpire</a> <a name="cachemaxexpire" id="cachemaxexpire">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The maximum time in seconds to cache a document</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheMaxExpire <var>seconds</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheMaxExpire 86400 (one day)</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheMaxExpire" id="CacheMaxExpire">CacheMaxExpire</a> <a name="cachemaxexpire" id="cachemaxexpire">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum time in seconds to cache a document</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheMaxExpire <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheMaxExpire 86400 (one day)</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache</td></tr>
+</table>
<p>The <code class="directive">CacheMaxExpire</code> directive specifies the maximum number of
seconds for which cachable HTTP documents will be retained without checking the origin
server. Thus, documents will be out of date at most this number of seconds. This maximum
@@ -249,40 +317,10 @@
<div class="example"><p><code>
CacheMaxExpire 604800
</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="CacheMaxStreamingBuffer" id="CacheMaxStreamingBuffer">CacheMaxStreamingBuffer</a> <a name="cachemaxstreamingbuffer" id="cachemaxstreamingbuffer">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maximum amount of a streamed response to buffer in memory
-before declaring the response uncacheable</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheMaxStreamingBuffer <var>size_in_bytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheMaxStreamingBuffer 0</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_cache</td></tr></table>
- <p>The <code class="directive">CacheMaxStreamingBuffer</code> directive
- specifies the maximum number of bytes of a streamed response to
- buffer before deciding that the response is too big to cache.
- A streamed response is one in which the entire content is not
- immediately available and in which the <code>Content-Length</code>
- may not be known. Sources of streaming responses include proxied
- responses and the output of CGI scripts. By default, a streamed
- response will <em>not</em> be cached unless it has a
- <code>Content-Length</code> header. The reason for this is to
- avoid using a large amount of memory to buffer a partial response
- that might end up being too large to fit in the cache.
- The <code class="directive">CacheMaxStreamingBuffer</code> directive allows
- buffering of streamed responses that don't contain a
- <code>Content-Length</code> up to the specified maximum amount of
- space. If the maximum buffer space is reached, the buffered
- content is discarded and the attempt to cache is abandoned.</p>
- <div class="note"><h3>Note:</h3>
- <p>Using a nonzero value for <code class="directive">CacheMaxStreamingBuffer</code> will not delay the transmission
- of the response to the client. As soon as <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>
- copies a block of streamed content into a buffer, it sends the block
- on to the next output filter for delivery to the client.</p>
- </div>
-
- <div class="example"><p><code>
- # Enable caching of streamed responses up to 64KB:<br />
- CacheMaxStreamingBuffer 65536
- </code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml
index 9ba8a4e..00bdfd6 100644
--- a/docs/manual/mod/mod_cache.xml
+++ b/docs/manual/mod/mod_cache.xml
@@ -63,6 +63,7 @@
<directive module="mod_mem_cache">MCacheMinObjectSize</directive>
<directive module="mod_mem_cache">MCacheMaxObjectSize</directive>
<directive module="mod_mem_cache">MCacheRemovalAlgorithm</directive>
+ <directive module="mod_mem_cache">MCacheMaxStreamingBuffer</directive>
</directivelist>
</related>
</section>
@@ -313,46 +314,4 @@
</usage>
</directivesynopsis>
-<directivesynopsis>
-<name>CacheMaxStreamingBuffer</name>
-<description>Maximum amount of a streamed response to buffer in memory
-before declaring the response uncacheable</description>
-<syntax>CacheMaxStreamingBuffer <var>size_in_bytes</var></syntax>
-<default>CacheMaxStreamingBuffer 0</default>
-<contextlist><context>server config</context><context>virtual host</context>
-</contextlist>
-
-<usage>
- <p>The <directive>CacheMaxStreamingBuffer</directive> directive
- specifies the maximum number of bytes of a streamed response to
- buffer before deciding that the response is too big to cache.
- A streamed response is one in which the entire content is not
- immediately available and in which the <code>Content-Length</code>
- may not be known. Sources of streaming responses include proxied
- responses and the output of CGI scripts. By default, a streamed
- response will <em>not</em> be cached unless it has a
- <code>Content-Length</code> header. The reason for this is to
- avoid using a large amount of memory to buffer a partial response
- that might end up being too large to fit in the cache.
- The <directive>CacheMaxStreamingBuffer</directive> directive allows
- buffering of streamed responses that don't contain a
- <code>Content-Length</code> up to the specified maximum amount of
- space. If the maximum buffer space is reached, the buffered
- content is discarded and the attempt to cache is abandoned.</p>
-
- <note><title>Note:</title>
- <p>Using a nonzero value for <directive
- >CacheMaxStreamingBuffer</directive> will not delay the transmission
- of the response to the client. As soon as <module>mod_cache</module>
- copies a block of streamed content into a buffer, it sends the block
- on to the next output filter for delivery to the client.</p>
- </note>
-
- <example>
- # Enable caching of streamed responses up to 64KB:<br />
- CacheMaxStreamingBuffer 65536
- </example>
-</usage>
-</directivesynopsis>
-
</modulesynopsis>
diff --git a/docs/manual/mod/mod_cern_meta.html.en b/docs/manual/mod/mod_cern_meta.html.en
index b29ecb5..29a0765 100644
--- a/docs/manual/mod/mod_cern_meta.html.en
+++ b/docs/manual/mod/mod_cern_meta.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_cern_meta - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_cern_meta</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>CERN httpd metafile semantics</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>cern_meta_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_cern_meta.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_cern_meta - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_cern_meta</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>CERN httpd metafile semantics</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>cern_meta_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_cern_meta.c</td></tr></table>
+<h3>Summary</h3>
+
<p>Emulate the CERN HTTPD Meta file semantics. Meta files are HTTP
headers that can be output in addition to the normal range of
headers for each file accessed. They appear rather like the
@@ -19,18 +36,31 @@
CERN users who can exploit this module.</p>
<p>More information on the <a href="http://www.w3.org/pub/WWW/Daemon/User/Config/General.html#MetaDir">CERN metafile semantics</a> is available.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#metadir">MetaDir</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#metadir">MetaDir</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#metafiles">MetaFiles</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#metasuffix">MetaSuffix</a></li>
-</ul><h3>See also</h3><ul class="seealso"><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></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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Name of the directory to find CERN-style meta information
-files</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MetaDir <var>directory</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MetaDir .web</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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_cern_meta</td></tr></table>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<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></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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Name of the directory to find CERN-style meta information
+files</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MetaDir <var>directory</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MetaDir .web</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cern_meta</td></tr>
+</table>
<p>Specifies the name of the directory in which Apache can find
meta information files. The directory is usually a 'hidden'
subdirectory of the directory that contains the file being
@@ -43,24 +73,34 @@
files:</p>
<div class="example"><p><code>MetaDir .meta</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="MetaFiles" id="MetaFiles">MetaFiles</a> <a name="metafiles" id="metafiles">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Activates CERN meta-file processing</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MetaFiles on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MetaFiles 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>Indexes</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_cern_meta</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MetaFiles" id="MetaFiles">MetaFiles</a> <a name="metafiles" id="metafiles">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Activates CERN meta-file processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MetaFiles on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MetaFiles 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>Indexes</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_cern_meta</td></tr>
+</table>
<p>Turns on/off Meta file processing on a per-directory basis.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="MetaSuffix" id="MetaSuffix">MetaSuffix</a> <a name="metasuffix" id="metasuffix">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>File name suffix for the file containg CERN-style
-meta information</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MetaSuffix <var>suffix</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MetaSuffix .meta</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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_cern_meta</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MetaSuffix" id="MetaSuffix">MetaSuffix</a> <a name="metasuffix" id="metasuffix">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File name suffix for the file containg CERN-style
+meta information</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MetaSuffix <var>suffix</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MetaSuffix .meta</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cern_meta</td></tr>
+</table>
<p>Specifies the file name suffix for the file containing the
meta information. For example, the default values for the two
directives will cause a request to
@@ -72,4 +112,10 @@
<div class="example"><h3>Example:</h3><p><code>
MetaSuffix .meta
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cgi.html.en b/docs/manual/mod/mod_cgi.html.en
index aefdfb1..672f034 100644
--- a/docs/manual/mod/mod_cgi.html.en
+++ b/docs/manual/mod/mod_cgi.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_cgi - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_cgi</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Execution of CGI scripts</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>cgi_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_cgi.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_cgi - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_cgi</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Execution of CGI scripts</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>cgi_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_cgi.c</td></tr></table>
+<h3>Summary</h3>
+
<p>Any file that has the mime type
@@ -35,10 +52,29 @@
<code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> should be used in place of
this module. At the user level, the two modules are essentially
identical.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#scriptlog">ScriptLog</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#scriptlog">ScriptLog</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#scriptlogbuffer">ScriptLogBuffer</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#scriptloglength">ScriptLogLength</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#env">CGI Environment variables</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cgi-debug">CGI Debugging</a></li></ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><a href="../suexec.html">Running CGI programs under different user IDs</a></li><li><a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI Specification</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="env" id="env">CGI Environment variables</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#env">CGI Environment variables</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cgi-debug">CGI Debugging</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
+<li><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li>
+<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li>
+<li><a href="../suexec.html">Running CGI programs under different user IDs</a></li>
+<li><a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI Specification</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="env" id="env">CGI Environment variables</a></h2>
<p>The server will set the CGI environment variables as described
in the <a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI
specification</a>, with the following provisions:</p>
@@ -73,7 +109,9 @@
<dd>This will only be set if the CGI script is subject to
authentication.</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="cgi-debug" id="cgi-debug">CGI Debugging</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cgi-debug" id="cgi-debug">CGI Debugging</a></h2>
<p>Debugging CGI scripts has traditionally been difficult, mainly
because it has not been possible to study the output (standard
output and error) for scripts which are failing to run
@@ -118,12 +156,16 @@
<p>(The %stdout and %stderr parts may be missing if the script did
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>
+</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
@@ -149,26 +191,36 @@
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>
+
+</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>
+
+</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)
@@ -176,4 +228,10 @@
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 id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cgi.html.ja.jis b/docs/manual/mod/mod_cgi.html.ja.jis
index 5076593..2187a3e 100644
--- a/docs/manual/mod/mod_cgi.html.ja.jis
+++ b/docs/manual/mod/mod_cgi.html.ja.jis
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_cgi - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_cgi</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>CGI $B%9%/%j%W%H$N<B9T(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>cgi_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_cgi.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_cgi - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_cgi</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>CGI $B%9%/%j%W%H$N<B9T(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>cgi_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_cgi.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>Mime $B%?%$%W$,(B <code>application/x-httpd-cgi</code>
@@ -30,13 +47,32 @@
<a href="../howto/cgi.html">CGI $B$K$h$kF0E*%3%s%F%s%D(B</a>
$B$r;2>H$7$F$/$@$5$$!#(B</p>
- <p>Unix $B$G%^%k%A%9%l%C%I$N(B MPM $B$r;H(B$B$C$F$$$k>l9g$O!"$3$N%b%8%e!<%k$N(B
+ <p>Unix $B$G%^%k%A%9%l%C%I$N(B MPM $B$r;H$C$F$$$k>l9g$O!"$3$N%b%8%e!<%k$N(B
$BBe$o$j$K(B <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> $B$r;H$&I,MW$,$"$j$^$9!#(B
$B%f!<%6%l%Y%k$G$O$3$NFs$D$N%b%8%e!<%k$OK\<AE*$K$OF10l$G$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#scriptlog">ScriptLog</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#scriptlog">ScriptLog</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#scriptlogbuffer">ScriptLogBuffer</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#scriptloglength">ScriptLogLength</a></li>
-</ul><h3>$B%H%T%C%/(B</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#env">CGI $B4D6-JQ?t(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cgi-debug">CGI $B$N%G%P%C%0(B</a></li></ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><a href="../suexec.html">CGI $B%W%m%0%i%`$rJL$N%f!<%6(B ID $B$G<B9T$9$k(B</a></li><li><a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI $B5,3J=q(B</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="env" id="env">CGI $B4D6-JQ?t(B</a></h2>
+</ul>
+<h3>$B%H%T%C%/(B</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#env">CGI $B4D6-JQ?t(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cgi-debug">CGI $B$N%G%P%C%0(B</a></li>
+</ul><h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
+<li><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li>
+<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li>
+<li><a href="../suexec.html">CGI $B%W%m%0%i%`$rJL$N%f!<%6(B ID $B$G<B9T$9$k(B</a></li>
+<li><a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI $B5,3J=q(B</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="env" id="env">CGI $B4D6-JQ?t(B</a></h2>
<p>$B%5!<%P$O(B <a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI
$B5,3J(B</a> $B$G7h$a$i$l$F$$$k(B CGI
$B4D6-JQ?t$r@_Dj$7$^$9!#0J2<$N$b$N$O!">r7oIU$-$G@_Dj$5$l$^$9!#(B</p>
@@ -50,7 +86,7 @@
$B;XDj$5$l$F$$$J$$$H$-$N?6$kIq$$$G$O!"(B<code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> $B$O%Q%9>pJs(B
(URI $B$N%9%/%j%W%H$N%U%!%$%kL>$N8e$KB3$/(B <code>/more/path/info</code>) $B$r(B
$B<u$1IU$1$^$9$,!"%3%"$O%5!<%P$O%Q%9>pJs$N$"$k%j%/%(%9%H$K(B
- $BBP$7$F(B 404 NOT FOUND $B%(%i!<$rJV$7(B$B$^$9!#(B<code class="directive">AcceptPathInfo</code>
+ $BBP$7$F(B 404 NOT FOUND $B%(%i!<$rJV$7$^$9!#(B<code class="directive">AcceptPathInfo</code>
$B%G%#%l%/%F%#%V$r(B
$B>JN,$9$k$H!"(B<code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> $B$X$N%j%/%(%9%H$KBP$7$F(B
<code>On</code> $B$r(B
@@ -78,7 +114,9 @@
<dd>CGI
$B%9%/%j%W%H$KG'>Z$,I,MW$J$H$-$K$N$_@_Dj$5$l$^$9!#(B</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="cgi-debug" id="cgi-debug">CGI $B$N%G%P%C%0(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cgi-debug" id="cgi-debug">CGI $B$N%G%P%C%0(B</a></h2>
<p>CGI $B%9%/%j%W%H$N%G%P%C%0$O!"@5$7$/F0:n$7$F$$$J$$%9%/%j%W%H$N=PNO(B
($BI8=`=PNO$H%(%i!<(B)
$B$rD4$Y$k$3$H$,$G$-$J$$$?$a$K!"Fq$7$$>uBV$,B3$$$F$$$^$7$?!#(B
@@ -123,12 +161,16 @@
<p>($B%9%/%j%W%H$,I8=`=PNO$dI8=`%(%i!<$K2?$b=PNO$7$J$+$C$?>l9g$O!"(B
%stdout $B$d(B %stderr $B$O$"$j$^$;$s(B)$B!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>CGI $B%9%/%j%W%H$N%(%i!<%m%0%U%!%$%k$N>l=j(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ScriptLog <var>file-path</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </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>
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>CGI $B%9%/%j%W%H$N%(%i!<%m%0%U%!%$%k$N>l=j(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ScriptLog <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</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> $B%G%#%l%/%F%#%V$O(B CGI $B%9%/%j%W%H$N(B
$B%(%i!<%m%0%U%!%$%k$r@_Dj$7$^$9!#(B<code class="directive">ScriptLog</code> $B$,(B
$B@_Dj$5$l$F$$$J$$$H$-$O!"(B
@@ -156,26 +198,36 @@
$B>o$K;HMQ$5$l$k$h$&$K$O0U?^$5$l$F$$$J$$$H$$$&$3$H$KCm0U$7$F$/$@$5$$!#(B
$BB.EY$d8zN($O:GE,2=$5$l$F$*$i$:!"@_7W$5$l$?0J30$NJ}K!$G;HMQ$5$l$k$H(B
$B%;%-%e%j%F%#$NLdBj$,$"$k$+$b$7$l$^$;$s!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%9%/%j%W%H%m%0$K5-O?$5$l$k(B PUT $B$d(B POST $B%j%/%(%9%H$NFbMF$N>e8B(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ScriptLogBuffer <em>bytes</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>ScriptLogBuffer 1024</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </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>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%9%/%j%W%H%m%0$K5-O?$5$l$k(B PUT $B$d(B POST $B%j%/%(%9%H$NFbMF$N>e8B(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ScriptLogBuffer <em>bytes</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>ScriptLogBuffer 1024</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</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>$BBg$-$JK\BN$r<u$1<h$C$?$H$-$K%m%0%U%!%$%k$,$9$0$KBg$-$/$J$j$9$.$k(B
$BLdBj$rHr$1$k$?$a$K!"%U%!%$%k$K%m%0<}=8$5$l$k(B PUT $B$H(B POST
$B$NK\BN$NBg$-$5$O@)8B$5$l$F$$$^$9!#%G%U%)%k%H$G$O!"(B1024
$B%P%$%H$^$G$,%m%0<}=8$5$l$^$9$,!"(B
$B$3$N%G%#%l%/%F%#%V$O$=$l$rJQ99$9$k$3$H$,$G$-$^$9!#(B
</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>CGI $B%9%/%j%W%H$N%m%0%U%!%$%k$NBg$-$5$N>e8B(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ScriptLogLength <var>bytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>ScriptLogLength 10385760</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </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>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>CGI $B%9%/%j%W%H$N%m%0%U%!%$%k$NBg$-$5$N>e8B(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ScriptLogLength <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>ScriptLogLength 10385760</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</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> $B$O(B CGI $B%9%/%j%W%H$N%m%0%U%!%$%k(B
$B$NBg$-$5$r@)8B$9$k$?$a$K;HMQ$9$k$3$H$,$G$-$^$9!#%m%0%U%!%$%k$O(B
CGI $B$N%(%i!<Kh$KBgNL$N>pJs(B ($B%j%/%(%9%H$N$9$Y$F$N%X%C%@!"(B
@@ -184,4 +236,10 @@
$B$3$N%G%#%l%/%F%#%V$r;H$C$F(B CGI $B$N%m%0%U%!%$%k$N(B
$B:GBg$N%U%!%$%k%5%$%:$r@_Dj$9$k$3$H$,$G$-$^$9!#(B
$B%U%!%$%k$,$3$NBg$-$5$rD6$($?>l9g$O!"$=$l0J>e$O=q$-9~$^$l$^$;$s!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cgid.html.en b/docs/manual/mod/mod_cgid.html.en
index fe45372..80479ef 100644
--- a/docs/manual/mod/mod_cgid.html.en
+++ b/docs/manual/mod/mod_cgid.html.en
@@ -4,13 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_cgid - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_cgid</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Execution of CGI scripts using an
- external CGI daemon</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>cgid_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_cgid.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Unix threaded MPMs only</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_cgid - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_cgid</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Execution of CGI scripts using an
+ external CGI daemon</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>cgid_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_cgid.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Unix threaded MPMs only</td></tr></table>
+<h3>Summary</h3>
+
<p>Except for the optimizations and the additional <code class="directive"><a href="#scriptsock">ScriptSock</a></code> directive noted below,
<code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> behaves similarly to <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>.
<strong>See the <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> summary for additional details
@@ -33,18 +50,31 @@
additional directive <code>ScriptSock</code> which gives the
name of the socket to use for communication with the cgi
daemon.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptlog">ScriptLog</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptlog">ScriptLog</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptloglength">ScriptLogLength</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#scriptsock">ScriptSock</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><a href="../suexec.html">Running CGI programs under different user IDs</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="ScriptSock" id="ScriptSock">ScriptSock</a> <a name="scriptsock" id="scriptsock">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The name of the socket to use for communication with
-the cgi daemon</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ScriptSock <var>file-path</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ScriptSock logs/cgisock</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_cgid</td></tr></table>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li>
+<li><a href="../suexec.html">Running CGI programs under different user IDs</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="ScriptSock" id="ScriptSock">ScriptSock</a> <a name="scriptsock" id="scriptsock">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The name of the socket to use for communication with
+the cgi daemon</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScriptSock <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ScriptSock logs/cgisock</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_cgid</td></tr>
+</table>
<p>This directive sets the name of the socket to use for
communication with the CGI daemon. The socket will be opened
using the permissions of the user who starts Apache (usually
@@ -56,4 +86,10 @@
ScriptSock /var/run/cgid.sock
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_charset_lite.html.en b/docs/manual/mod/mod_charset_lite.html.en
index 63d881b..de4edd0 100644
--- a/docs/manual/mod/mod_charset_lite.html.en
+++ b/docs/manual/mod/mod_charset_lite.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_charset_lite - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_charset_lite</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Specify character set translation or recoding</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>charset_lite_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_charset_lite.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_charset_lite - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_charset_lite</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Specify character set translation or recoding</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>charset_lite_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_charset_lite.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This is an <strong>experimental</strong> module and should
be used with care. Experiment with your
<code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code> configuration to ensure that it
@@ -31,10 +48,20 @@
<p>This module provides a small subset of configuration
mechanisms implemented by Russian Apache and its associated
<code>mod_charset</code>.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#charsetdefault">CharsetDefault</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#charsetdefault">CharsetDefault</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#charsetoptions">CharsetOptions</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#charsetsourceenc">CharsetSourceEnc</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#problems">Common Problems</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>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#problems">Common Problems</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>
@@ -67,13 +94,17 @@
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><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CharsetDefault <var>charset</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_charset_lite</td></tr></table>
+</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>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CharsetDefault <var>charset</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_charset_lite</td></tr>
+</table>
<p>The <code class="directive">CharsetDefault</code> directive specifies the
charset that content in the associated container should be
translated to.</p>
@@ -91,14 +122,19 @@
</span>
</Directory>
</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="CharsetOptions" id="CharsetOptions">CharsetOptions</a> <a name="charsetoptions" id="charsetoptions">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configures charset translation behavior</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CharsetOptions <var>option</var> [<var>option</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CharsetOptions DebugLevel=0 NoImplicitAdd</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_charset_lite</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CharsetOptions" id="CharsetOptions">CharsetOptions</a> <a name="charsetoptions" id="charsetoptions">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures charset translation behavior</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CharsetOptions <var>option</var> [<var>option</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CharsetOptions DebugLevel=0 NoImplicitAdd</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_charset_lite</td></tr>
+</table>
<p>The <code class="directive">CharsetOptions</code> directive configures certain
behaviors of <code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code>. <var>Option</var> can
be one of</p>
@@ -126,13 +162,18 @@
should be specified so that <code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code>
doesn't add its filter.</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="CharsetSourceEnc" id="CharsetSourceEnc">CharsetSourceEnc</a> <a name="charsetsourceenc" id="charsetsourceenc">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Source charset of files</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CharsetSourceEnc <var>charset</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_charset_lite</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CharsetSourceEnc" id="CharsetSourceEnc">CharsetSourceEnc</a> <a name="charsetsourceenc" id="charsetsourceenc">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Source charset of files</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CharsetSourceEnc <var>charset</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_charset_lite</td></tr>
+</table>
<p>The <code class="directive">CharsetSourceEnc</code> directive specifies the
source charset of files in the associated container.</p>
@@ -152,4 +193,10 @@
<p>The character set names in this example work with the iconv
translation support in Solaris 8.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav.html.en b/docs/manual/mod/mod_dav.html.en
index b4436f2..fdd23e6 100644
--- a/docs/manual/mod/mod_dav.html.en
+++ b/docs/manual/mod/mod_dav.html.en
@@ -4,21 +4,53 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_dav - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_dav</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Distributed Authoring and Versioning
-(<a href="http://www.webdav.org/">WebDAV</a>) functionality</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>dav_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_dav.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_dav - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_dav</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Distributed Authoring and Versioning
+(<a href="http://www.webdav.org/">WebDAV</a>) functionality</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>dav_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_dav.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module provides class 1 and class 2 <a href="http://www.webdav.org">WebDAV</a> ('Web-based Distributed
Authoring and Versioning') functionality for Apache. This
extension to the HTTP protocol allows creating, moving,
copying, and deleting resources and collections on a remote web
server.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#dav">Dav</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#dav">Dav</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#davdepthinfinity">DavDepthInfinity</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#davmintimeout">DavMinTimeout</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#example">Enabling WebDAV</a></li></ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="../mod/mod_dav_fs.html#davlockdb">DavLockDB</a></code></li><li><code class="directive"><a href="../mod/core.html#limitxmlrequestbody">LimitXMLRequestBody</a></code></li><li><a href="http://www.webdav.org">WebDAV Resources</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">Enabling WebDAV</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#example">Enabling WebDAV</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/mod_dav_fs.html#davlockdb">DavLockDB</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#limitxmlrequestbody">LimitXMLRequestBody</a></code></li>
+<li><a href="http://www.webdav.org">WebDAV Resources</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">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
container in your <code>httpd.conf</code> file:</p>
@@ -72,13 +104,17 @@
over an <a href="../ssl/">SSL</a> enabled connection is secure,
too.</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="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>
+</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>
@@ -99,25 +135,35 @@
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>
+
+</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>
+
+</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
@@ -137,4 +183,10 @@
</span>
</Location>
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav.html.ja.jis b/docs/manual/mod/mod_dav.html.ja.jis
index 46ef89a..d05c236 100644
--- a/docs/manual/mod/mod_dav.html.ja.jis
+++ b/docs/manual/mod/mod_dav.html.ja.jis
@@ -4,15 +4,32 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_dav - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_dav</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$BJ,;6%*!<%5%j%s%0$H%P!<%8%g%s4IM}(B
-(<a href="http://www.webdav.org/">WebDAV</a>) $B5!G=(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>dav_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_dav.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_dav - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_dav</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$BJ,;6%*!<%5%j%s%0$H%P!<%8%g%s4IM}(B
+(<a href="http://www.webdav.org/">WebDAV</a>) $B5!G=(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>dav_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_dav.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$B$3$N%b%8%e!<%k$O%/%i%9(B 1 $B$H%/%i%9(B 2 $B$N(B
<a href="http://www.webdav.org">WebDAV</a>
- ('$B%&%'%V%Y!<%9$NJ,;6%*!<(B$B%5%j%s%0$H%P!<%8%g%s4IM}(B')
+ ('$B%&%'%V%Y!<%9$NJ,;6%*!<%5%j%s%0$H%P!<%8%g%s4IM}(B')
$B5!G=$r(B Apache $B$KDs6!$7$^$9!#(B
$B$3$N(B HTTP $B%W%m%H%3%k$N3HD%$K$h$j!"%j%b!<%H$N%&%'%V%5!<%P>e$K$"$k(B
$B%j%=!<%9$d%3%l%/%7%g%s$r(B
@@ -25,24 +42,33 @@
<p>$BF1;~$K(B <code>httpd.conf</code> $B%U%!%$%k$N(B
$B%0%m!<%P%k%;%/%7%g%s$K<!$r2C$($k$3$H$K$h$C$F!"(B
- DAV $B%m%C%/%G!<%?%Y!<(B$B%9$N$?$a$K;H$&(B
+ DAV $B%m%C%/%G!<%?%Y!<%9$N$?$a$K;H$&(B
$B@5Ev$J%U%!%$%kL>$r;XDj$7$^$9(B:</p>
-<div class="example"><p><code>DavLockDB /tmp/DavLock    
+<div class="example"><p><code>DavLockDB /tmp/DavLock????
<em>($B%&%'%V%5!<%P$N=q$-9~$a$k%U%!%$%kL>$G!"(B
- $B3HD%;R$N(B$B$J$$$b$N(B)</em>
+ $B3HD%;R$N$J$$$b$N(B)</em>
</code></p></div>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#dav">Dav</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#dav">Dav</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#davdepthinfinity">DavDepthInfinity</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#davlockdb">DavLockDB</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#davmintimeout">DavMinTimeout</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>WebDAV HTTP $B%a%=%C%I$rM-8z$K$7(B$B$^$9(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>Dav on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>Dav off</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%G%#%l%/%H%j(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_dav</td></tr></table>
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>WebDAV HTTP $B%a%=%C%I$rM-8z$K$7$^$9(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>Dav on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>Dav off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%G%#%l%/%H%j(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_dav</td></tr>
+</table>
<p>$BM?$($i$l$?%3%s%F%J$G(B WebDAV HTTP $B%a%=%C%I$,;H$($k$h$&$K$9$k$K$O!"(B
<code class="directive">Dav</code> $B%G%#%l%/%F%#%V$r;H$$$^$9!#(B
DAV $B$rM-8z$K$7$?>l=j$X$N%"%/%;%9$r@)8B$9$k$?$a$K$O!"(B
@@ -61,30 +87,40 @@
AuthName DAV<br />
AuthUserFile user.passwd<br />
<br />
-   <LimitExcept GET HEAD OPTIONS><br />
-   require user admin<br />
-   </LimitExcept><br />
+ ??<LimitExcept GET HEAD OPTIONS><br />
+ ??require user admin<br />
+ ??</LimitExcept><br />
</Location><br />
</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="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a> <a name="davdepthinfinity" id="davdepthinfinity">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>PROPFIND, Depth: Infinity $B%j%/%(%9%H$r5v2D$7$^$9(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>DavDepthInfinity on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>DavDepthInfinity off</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%G%#%l%/%H%j(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_dav</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>PROPFIND, Depth: Infinity $B%j%/%(%9%H$r5v2D$7$^$9(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>DavDepthInfinity on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>DavDepthInfinity off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%G%#%l%/%H%j(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_dav</td></tr>
+</table>
<p>'Depth: Infinity' $B$r4^$s$G$$$k(B
- PROPFIND $B%j%/(B$B%(%9%H$r=hM}$G$-$k$h$&$K$9$k$K$O!"(B
+ PROPFIND $B%j%/%(%9%H$r=hM}$G$-$k$h$&$K$9$k$K$O!"(B
<code class="directive">DavDepthInfinity</code>
$B%G%#%l%/%F%#%V$r;H$$$^$9!#$3$N%?%$%W$N%j%/%(%9%H$O(B
denial-of-service $B%"%?%C%/$H$J$j$&$k$N$G!"(B
$B%G%U%)%k%H$G$O5v2D$5$l$F$$$^$;$s!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>DAV $B%m%C%/%G!<%?%Y!<%9(B$B$N0LCV$G$9(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>DavLockDB <em>file-path</em></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_dav</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>DAV $B%m%C%/%G!<%?%Y!<%9$N0LCV$G$9(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>DavLockDB <em>file-path</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_dav</td></tr>
+</table>
<p>$B%m%C%/%G!<%?%Y!<%9$X$N%U%k%Q%9$r!"3HD%;R$r=|$$$?7A$G(B
$B;XDj$9$k$K$O!"(B<code class="directive">DavLockDB</code>
$B$r;H$$$^$9!#%G%U%)%k%H$N(B
@@ -97,14 +133,19 @@
<div class="example"><h3>$BNc(B</h3><p><code>
DavLockDB /tmp/DavLock
</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="DavMinTimeout" id="DavMinTimeout">DavMinTimeout</a> <a name="davmintimeout" id="davmintimeout">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%5!<%P$,(B DAV $B%j%=!<%9$N%m%C%/$r0];}$9$k:G>.;~4V$G$9!#(B
-</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>DavMinTimeout <em>seconds</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>DavMinTimeout 0</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%G%#%l%/%H%j(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_dav</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%5!<%P$,(B DAV $B%j%=!<%9$N%m%C%/$r0];}$9$k:G>.;~4V$G$9!#(B
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>DavMinTimeout <em>seconds</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>DavMinTimeout 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%G%#%l%/%H%j(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_dav</td></tr>
+</table>
<p>$B%/%i%$%"%s%H$,(B DAV $B%j%=!<%9%m%C%/$rMW5a$7$?>l9g!"(B
$B%m%C%/$,%5!<%P$K$h$C$F<+F0E*$K2r=|$5$l$k$^$G$N;~4V$r(B
$BF1;~$K;XDj$9$k$3$H$,$G$-$^$9!#$3$NCM$OC1$J$k%j%/%(%9%H$G$"$C$F!"(B
@@ -124,4 +165,10 @@
DavMinTimeout 600<br />
</Location><br />
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav_fs.html.en b/docs/manual/mod/mod_dav_fs.html.en
index bb18de9..15690bd 100644
--- a/docs/manual/mod/mod_dav_fs.html.en
+++ b/docs/manual/mod/mod_dav_fs.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_dav_fs - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_dav_fs</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>filesystem provider for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>dav_fs_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_dav_fs.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_dav_fs - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_dav_fs</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>filesystem provider for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>dav_fs_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_dav_fs.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module <em>requires</em> the service of <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>. It acts as a support module for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> and provides access to resources located in the
server's file system. The formal name of this provider is
<code>filesystem</code>. <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> backend providers
@@ -22,13 +39,25 @@
<p>Since <code>filesystem</code> is the default provider for
<code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>, you may simply use the value
<code>On</code> instead.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#davlockdb">DavLockDB</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_dav.html">mod_dav</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="DavLockDB" id="DavLockDB">DavLockDB</a> <a name="davlockdb" id="davlockdb">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Location of the DAV lock database</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>DavLockDB <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_dav_fs</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#davlockdb">DavLockDB</a></li>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</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="DavLockDB" id="DavLockDB">DavLockDB</a> <a name="davlockdb" id="davlockdb">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location of the DAV lock database</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DavLockDB <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_dav_fs</td></tr>
+</table>
<p>Use the <code class="directive">DavLockDB</code> directive to specify
the full path to the lock database, excluding an extension. If
the path is not absolute, it will be taken relative to <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. The implementation of
@@ -40,4 +69,10 @@
<div class="example"><h3>Example</h3><p><code>
DavLockDB logs/DavLock
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_deflate.html.en b/docs/manual/mod/mod_deflate.html.en
index 078df0e..825afc3 100644
--- a/docs/manual/mod/mod_deflate.html.en
+++ b/docs/manual/mod/mod_deflate.html.en
@@ -4,21 +4,53 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_deflate - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_deflate</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Compress content before it is delivered to the
-client</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>deflate_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_deflate.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_deflate - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_deflate</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Compress content before it is delivered to the
+client</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>deflate_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_deflate.c</td></tr></table>
+<h3>Summary</h3>
+
<p>The <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> module provides
the <code>DEFLATE</code> output filter that allows output from
your server to be compressed before being sent to the client over
the network.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#deflatebuffersize">DeflateBufferSize</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#deflatebuffersize">DeflateBufferSize</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#deflatefilternote">DeflateFilterNote</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#deflatememlevel">DeflateMemLevel</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#deflatewindowsize">DeflateWindowSize</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#recommended">Recommended Configuration</a></li><li><img alt="" src="../images/down.gif" /> <a href="#enable">Enabling Compression</a></li><li><img alt="" src="../images/down.gif" /> <a href="#proxies">Dealing with proxy servers</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../filter.html">The filter documentation</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">Recommended Configuration</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#recommended">Recommended Configuration</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enable">Enabling Compression</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxies">Dealing with proxy servers</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><a href="../filter.html">The filter documentation</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">Recommended Configuration</a></h2>
<p>This is a sample configuration for the impatient. But please take
the time and read the sections below for a detailed description!</p>
@@ -53,7 +85,9 @@
</Location>
</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">Enabling Compression</a></h2>
+</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>
<h3><a name="output" id="output">Output Compression</a></h3>
<p>Compression is implemented by the <code>DEFLATE</code>
@@ -147,7 +181,9 @@
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>
+</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
@@ -156,7 +192,7 @@
prevents compressed content from being sent to a client that will
not understand it.</p>
- <p>If you use some special exclusions dependant
+ <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,
@@ -175,22 +211,31 @@
<div class="example"><h3>Example</h3><p><code>
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">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><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>DeflateBufferSize <var>value</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>DeflateBufferSize 8096</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_deflate</td></tr></table>
+</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>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DeflateBufferSize <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DeflateBufferSize 8096</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_deflate</td></tr>
+</table>
<p>The <code class="directive">DeflateBufferSize</code> directive specifies
the size in bytes of the fragments that zlib should compress at one
time.</p>
-</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">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Places the compression ratio in a note for logging</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>DeflateFilterNote <var>notename</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_deflate</td></tr></table>
+
+</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">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Places the compression ratio in a note for logging</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DeflateFilterNote <var>notename</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_deflate</td></tr>
+</table>
<p>The <code class="directive">DeflateFilterNote</code> directive
specifies that a note about compression ratios should be attached
to the request. The name of the note is the value specified for
@@ -203,24 +248,44 @@
LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate<br />
CustomLog logs/deflate_log deflate
</code></p></div>
-<h3>See also</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="DeflateMemLevel" id="DeflateMemLevel">DeflateMemLevel</a> <a name="deflatememlevel" id="deflatememlevel">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>How much memory should be used by zlib for compression</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>DeflateMemLevel <var>value</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>DeflateMemLevel 9</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_deflate</td></tr></table>
+
+<h3>See also</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="DeflateMemLevel" id="DeflateMemLevel">DeflateMemLevel</a> <a name="deflatememlevel" id="deflatememlevel">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>How much memory should be used by zlib for compression</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DeflateMemLevel <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DeflateMemLevel 9</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_deflate</td></tr>
+</table>
<p>The <code class="directive">DeflateMemLevel</code> directive specifies
how much memory should be used by zlib for compression
(a value between 1 and 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">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Zlib compression window size</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>DeflateWindowSize <var>value</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>DeflateWindowSize 15</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_deflate</td></tr></table>
+
+</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">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Zlib compression window size</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DeflateWindowSize <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DeflateWindowSize 15</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_deflate</td></tr>
+</table>
<p>The <code class="directive">DeflateWindowSize</code> directive specifies the
zlib compression window size (a value between 1 and 15). Generally, the
higher the window size, the higher can the compression ratio be expected.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_deflate.html.ja.jis b/docs/manual/mod/mod_deflate.html.ja.jis
index 524ef67..c71e16e 100644
--- a/docs/manual/mod/mod_deflate.html.ja.jis
+++ b/docs/manual/mod/mod_deflate.html.ja.jis
@@ -4,22 +4,53 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_deflate - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_deflate</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%/%i%$%"%s%H$XAw$i$l$kA0$K%3%s%F%s(B$B%D$r05=L$9$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>deflate_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_deflate.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_deflate - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_deflate</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%/%i%$%"%s%H$XAw$i$l$kA0$K%3%s%F%s%D$r05=L$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>deflate_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_deflate.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p><code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> $B%b%8%e!<%k$O(B <code>DEFLATE</code>
- $B=PNO%U%#%k%?$rDs6!$7$^$9!#(B$B$3$l$O%5!<%P$+$i$N=PNO$r!"%M%C%H%o!<%/$r(B
+ $B=PNO%U%#%k%?$rDs6!$7$^$9!#$3$l$O%5!<%P$+$i$N=PNO$r!"%M%C%H%o!<%/$r(B
$BDL$7$F%/%i%$%"%s%H$KAw$kA0$K05=L$9$k$3$H$r2DG=$K$7$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#deflatebuffersize">DeflateBufferSize</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#deflatebuffersize">DeflateBufferSize</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#deflatefilternote">DeflateFilterNote</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#deflatememlevel">DeflateMemLevel</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#deflatewindowsize">DeflateWindowSize</a></li>
-</ul><h3>$B%H%T%C%/(B</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> $B05=L$rM-8z$K$9$k(B</li></ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li><li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</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>$B05=L$rM-8z$K$9$k(B</h2>
+</ul>
+<h3>$B%H%T%C%/(B</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> $B05=L$rM-8z$K$9$k(B</li>
+</ul><h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</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>$B05=L$rM-8z$K$9$k(B</h2>
<p>$B05=L5!G=$O(B <code>DEFLATE</code> <a href="../filter.html">$B%U%#%k%?(B</a>
- $B$K$h$j(B$B<BAu$5$l$F$$$^$9!#0J2<$N%G%#%l%/%F%#%V$O$=$N%G%#%l%/%F%#%V$N$"$k(B
+ $B$K$h$j<BAu$5$l$F$$$^$9!#0J2<$N%G%#%l%/%F%#%V$O$=$N%G%#%l%/%F%#%V$N$"$k(B
$B%3%s%F%JCf$N%I%-%e%a%s%H$r05=L$9$k$h$&$K$7$^$9(B:</p>
<p><strong>$B$h$/;H$o$l$F$$$k%V%i%&%6$G$O!"$9$Y$F$N%3%s%F%s%D$KBP$9$k(B
$B05=L$r07$($k$o$1$G$O$"$j$^$;$s!#$G$9$+$i!"(B'gzip-only-text/html'
@@ -27,7 +58,7 @@
$B05=L$,F/$/$h$&$K$7$?J}$,$h$$$+$b$7$l$^$;$s(B ($B0J2<;2>H(B)
</strong></p>
<p><strong>$B$3$NCM$r(B 1 $B0J30$NCM$K@_Dj$7$?>l9g$OL5;k$5$l$^$9$N$G!"(B
- $B%M%,%F%#%V%^(B$B%C%A$r9T$J$&$3$H$,$G$-$^$9!#(B</strong></p>
+ $B%M%,%F%#%V%^%C%A$r9T$J$&$3$H$,$G$-$^$9!#(B</strong></p>
<div class="example"><p><code>SetEnv gzip-only-text/html 1<br />
SetOutputFilter DEFLATE
@@ -47,45 +78,70 @@
$B%G%#%l%/%F%#%V$r;H$C$FFCDj$N%V%i%&%6$KBP$7$F$O05=L$,9T$J$o$l$J$$$h$&$K(B
'no-gzip' $B%N!<%H$r%;%C%H$9$k$HNI$$$G$7$g$&!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>zlib $B$,0lEY$K05=L$9$k2t$NBg$-$5(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>DeflateBufferSize <em>value</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>DeflateBufferSize 8096</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_deflate</td></tr></table>
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>zlib $B$,0lEY$K05=L$9$k2t$NBg$-$5(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>DeflateBufferSize <em>value</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>DeflateBufferSize 8096</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_deflate</td></tr>
+</table>
<p><code class="directive">DeflateBufferSize</code> $B%G%#%l%/%F%#%V$O(B
zlib $B$,0lEY$K05=L$9$k2t$NBg$-$5$r%P%$%HC10L$G;XDj$7$^$9!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%m%.%s%0MQ$K05=LHf$r%a%b$KDI2C(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>DeflateFilterNote <em>notename</em></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_deflate</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%m%.%s%0MQ$K05=LHf$r%a%b$KDI2C(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>DeflateFilterNote <em>notename</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_deflate</td></tr>
+</table>
<p><code class="directive">DeflateFilterNote</code> $B%G%#%l%/%F%#%V$O(B
- $B05=LHf$K4X$9$k%a%b$,%j%/%(%9%H$KIU2C(B$B$5$l$k$3$H$r;XDj$7$^$9!#(B
+ $B05=LHf$K4X$9$k%a%b$,%j%/%(%9%H$KIU2C$5$l$k$3$H$r;XDj$7$^$9!#(B
$B%a%b$NL>A0$O%G%#%l%/%F%#%V$K;XDj$5$l$?CM$G$9!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>zlib $B$,05=L$K;H$&%a%b%j$N%l%Y%k$r;XDj(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>DeflateMemLevel <em>value</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>DeflateMemLevel 9</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_deflate</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>zlib $B$,05=L$K;H$&%a%b%j$N%l%Y%k$r;XDj(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>DeflateMemLevel <em>value</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>DeflateMemLevel 9</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_deflate</td></tr>
+</table>
<p><code class="directive">DeflateMemLevel</code> $B%G%#%l%/%F%#%V$O(B
zlib $B$,05=L$K;H$&%a%b%j$N%l%Y%k$r@_Dj$7$^$9(B (1 $B$+$i(B 9 $B$N4V$NCM(B)$B!#(B
($BLuCm(B: 2 $B$rDl$H$9$kBP?t$NCM$K$J$j$^$9!#(B
8 $BDxEY$,NI$$$G$7$g$&!#(B)</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>Zlib $B$N05=LMQ%&%#%s%I%&$NBg$-$5(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>DeflateWindowSize <em>value</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>DeflateWindowSize 15</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_deflate</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>Zlib $B$N05=LMQ%&%#%s%I%&$NBg$-$5(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>DeflateWindowSize <em>value</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>DeflateWindowSize 15</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_deflate</td></tr>
+</table>
<p><code class="directive">DeflateWindowSize</code> $B%G%#%l%/%F%#%V$O(B
zlib $B$N05=LMQ%&%#%s%I%&(B ($BLuCm(B: zlib $B$G;HMQ$5$l$kMzNr%P%C%U%!(B)
$B$NBg$-$5$r;XDj$7$^$9(B (1 $B$+$i(B 15 $B$N4V$NCM(B)$B!#(B
($BLuCm(B: 2 $B$rDl$H$9$kBP?t$NCM$K$J$j$^$9!#(B
8 $B$+$i(B 15 $B$K$9$k$N$,NI$$$G$7$g$&!#(B)</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_deflate.xml b/docs/manual/mod/mod_deflate.xml
index 7c3a929..b971130 100644
--- a/docs/manual/mod/mod_deflate.xml
+++ b/docs/manual/mod/mod_deflate.xml
@@ -166,7 +166,7 @@
prevents compressed content from being sent to a client that will
not understand it.</p>
- <p>If you use some special exclusions dependant
+ <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,
diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en
index e784549..26c7072 100644
--- a/docs/manual/mod/mod_dir.html.en
+++ b/docs/manual/mod/mod_dir.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_dir - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_dir</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Provides for "trailing slash" redirects and
- serving directory index files</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>dir_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_dir.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_dir - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_dir</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Provides for "trailing slash" redirects and
+ serving directory index files</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>dir_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_dir.c</td></tr></table>
+<h3>Summary</h3>
+
<p>The index of a directory can come from one of two sources:</p>
<ul>
@@ -31,17 +48,26 @@
<code>dirname</code> is a directory. Directories require a
trailing slash, so <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> issues a redirect to
<code>http://servername/foo/dirname/</code>.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#directoryindex">DirectoryIndex</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="DirectoryIndex" id="DirectoryIndex">DirectoryIndex</a> <a name="directoryindex" id="directoryindex">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>List of resources to look for when the client requests
-a directory</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>DirectoryIndex
- <var>local-url</var> [<var>local-url</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>DirectoryIndex index.html</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_dir</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#directoryindex">DirectoryIndex</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="DirectoryIndex" id="DirectoryIndex">DirectoryIndex</a> <a name="directoryindex" id="directoryindex">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>List of resources to look for when the client requests
+a directory</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DirectoryIndex
+ <var>local-url</var> [<var>local-url</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DirectoryIndex index.html</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_dir</td></tr>
+</table>
<p>The <code class="directive">DirectoryIndex</code> directive sets the
list of resources to look for, when the client requests an index
of the directory by specifying a / at the end of the a directory
@@ -71,4 +97,10 @@
<p>would cause the CGI script <code>/cgi-bin/index.pl</code> to be
executed if neither <code>index.html</code> or <code>index.txt</code>
existed in a directory.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dir.html.ja.jis b/docs/manual/mod/mod_dir.html.ja.jis
index 64eb1a2..c21beaf 100644
--- a/docs/manual/mod/mod_dir.html.ja.jis
+++ b/docs/manual/mod/mod_dir.html.ja.jis
@@ -4,54 +4,80 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_dir - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_dir</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B!V:G8e$N%9%i%C%7%e!W$N%j%@%$%l%/%H$H!"%G%#(B$B%l%/%H%j$N(B
-$B%$%s%G%C%/%9%U%!%$%k$r07$&5!G=$rDs6!$9$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>dir_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_dir.c</td></tr></table><h3>$B35MW(B</h3>
- <p>$B%G%#%l%/%H(B$B%j%$%s%G%C%/%9$O!"<!$NFs$D$N$&$A$I$A$i$+$,MxMQ$5$l$^$9(B:</p>
+ -->
+<title>mod_dir - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_dir</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B!V:G8e$N%9%i%C%7%e!W$N%j%@%$%l%/%H$H!"%G%#%l%/%H%j$N(B
+$B%$%s%G%C%/%9%U%!%$%k$r07$&5!G=$rDs6!$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>dir_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_dir.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
+ <p>$B%G%#%l%/%H%j%$%s%G%C%/%9$O!"<!$NFs$D$N$&$A$I$A$i$+$,MxMQ$5$l$^$9(B:</p>
<ul>
<li>$B0l$DL\$O!"%f!<%6$,:n@.$7$?%U%!%$%k$rMQ$$$k$b$N$G!"DL>o(B
<code>index.html</code> $B$H$$$&%U%!%$%kL>$r;H$$$^$9!#$3$N%U%!%$%kL>$O!"(B
<code class="directive"><a href="#directoryindex">DirectoryIndex</a></code> $B%G%#%l%/%F%#%V$G(B
- $B;XDj$9$k$3$H$,$G$-$^$9!#$3$N(B$B5!G=$O(B <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code>
+ $B;XDj$9$k$3$H$,$G$-$^$9!#$3$N5!G=$O(B <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code>
$B%b%8%e!<%k$GDs6!$5$l$^$9!#(B</li>
<li>$B$b$&0l$D$NJ}K!$O!"(B
$B%5!<%P$K$h$C$F<+F0E*$K@8@.$5$l$k%G%#%l%/%H%j%j%9%H$rMQ$$$k>l9g$G$9!#(B
$B$3$N5!G=$O!"(B<code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>
- $B%b%8%e!<%k$K(B$B$h$jDs6!$5$l$^$9!#(B</li>
+ $B%b%8%e!<%k$K$h$jDs6!$5$l$^$9!#(B</li>
</ul>
<p>$B<+F0E*$J%$%s%G%C%/%9@8@.5!G=$r:o=|(B ($B$b$7$/$O8r49(B)
$B$G$-$k$h$&$K!"$3$NFs$D$N5!G=$OJ,N%$5$l$F$$$^$9!#(B</p>
<p>$B$J$*(B <code>http://servername/foo/dirname</code> $B$H$$$&(B URL
- $B$X$N(B$B%j%/%(%9%H$,$"$C$?:]$K!"(B<code>dirname</code>
+ $B$X$N%j%/%(%9%H$,$"$C$?:]$K!"(B<code>dirname</code>
$B$H$$$&%G%#%l%/%H%j$,$"$l$P!"!V:G8e$K%9%i%C%7%e$r$D$1$?7A!W$N(B URL
$B$X$N%j%@%$%l%/%H$rAw=P$7$^$9!#(B
$B%G%#%l%/%H%j$X$N%"%/%;%9$O%9%i%C%7%e$G=*$o$C$F$$$kI,MW$,$"$j!"(B
<code>mod_dir</code> $B$O!"(B<code>http://servername/foo/dirname/</code>
$B$X$N%j%@%$%l%/%H$rAw=P$9$k$3$H$K$J$j$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#directoryindex">DirectoryIndex</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="DirectoryIndex" id="DirectoryIndex">DirectoryIndex</a> <a name="directoryindex" id="directoryindex">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%/%i%$%"%s%H$,%G%#%l%/%H%j$r%j%/%(%9%H$7$?$H$-$KD4$Y$k(B
-$B%j%=!<%9$N%j%9%H(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>DirectoryIndex
- <em>local-url</em> [<em>local-url</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>DirectoryIndex index.html</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Indexes</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_dir</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#directoryindex">DirectoryIndex</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="DirectoryIndex" id="DirectoryIndex">DirectoryIndex</a> <a name="directoryindex" id="directoryindex">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%/%i%$%"%s%H$,%G%#%l%/%H%j$r%j%/%(%9%H$7$?$H$-$KD4$Y$k(B
+$B%j%=!<%9$N%j%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>DirectoryIndex
+ <em>local-url</em> [<em>local-url</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>DirectoryIndex index.html</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_dir</td></tr>
+</table>
<p>
$B%/%i%$%"%s%H$,!"%G%#%l%/%H%jL>$N:G8e$K!V(B/$B!W(B
$B$r;XDj$7$F%G%#%l%/%H%j%$%s%G%C%/%9$rMW5a$9$k>l9g$KC5$9%j%=!<%9$N%j%9%H$r(B
<code class="directive">DirectoryIndex</code> $B%G%#%l%/%F%#%V$G@_Dj$7$^$9!#(B
<em>Local-url</em>
- $B$O!"%j%/%(%9%H$5$l$?%G%#%l%/%H%j$K(B$BBP1~$9$k!"%5!<%P>e$N%I%-%e%a%s%H$N(B
+ $B$O!"%j%/%(%9%H$5$l$?%G%#%l%/%H%j$KBP1~$9$k!"%5!<%P>e$N%I%-%e%a%s%H$N(B
(% $B%(%s%3!<%I$5$l$?(B) URL $B$G!"IaDL$O%G%#%l%/%H%jCf$N%U%!%$%k$NL>A0$G$9!#(B
$BJ#?t$N(B URL $B$,@_Dj$5$l$?>l9g$K$O!":G=i$K8+$D$+$C$?$b$N$rJV$7$^$9!#(B
$B$=$l$i$,8+$D$+$i$:!"(B<code>Indexes</code>
@@ -74,4 +100,10 @@
<p>$B$H$7$?>l9g!"(B<code>index.html</code> $B$H(B <code>index.txt</code>
$B$N$I$A$i$b%G%#%l%/%H%jFb$KB8:_$7$J$$>l9g!"(BCGI $B%9%/%j%W%H(B
<code>/cgi-bin/index.pl</code> $B$,<B9T$5$l$^$9!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_disk_cache.html.en b/docs/manual/mod/mod_disk_cache.html.en
index dddba3e..ed01d56 100644
--- a/docs/manual/mod/mod_disk_cache.html.en
+++ b/docs/manual/mod/mod_disk_cache.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_disk_cache - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_disk_cache</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Content cache storage manager keyed to URIs</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>disk_cache_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_disk_cache.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_disk_cache - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_disk_cache</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Content cache storage manager keyed to URIs</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>disk_cache_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_disk_cache.c</td></tr></table>
+<h3>Summary</h3>
+
<div class="warning">
This module is experimental. Documentation is still under development...
</div>
@@ -24,7 +41,10 @@
<p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> requires the services of
<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
</div>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cachedirlength">CacheDirLength</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cachedirlength">CacheDirLength</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cachedirlevels">CacheDirLevels</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cacheexpirycheck">CacheExpiryCheck</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cachegcclean">CacheGcClean</a></li>
@@ -37,13 +57,19 @@
<li><img alt="" src="../images/down.gif" /> <a href="#cacheroot">CacheRoot</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cachesize">CacheSize</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cachetimemargin">CacheTimeMargin</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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The number of characters in subdirectory names</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheDirLength <var>length</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheDirLength 2</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+</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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The number of characters in subdirectory names</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheDirLength <var>length</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheDirLength 2</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>The <code class="directive">CacheDirLength</code> directive sets the number
of characters for each subdirectory name in the cache hierarchy.</p>
@@ -55,14 +81,19 @@
<div class="example"><p><code>
CacheDirLength 4
</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="CacheDirLevels" id="CacheDirLevels">CacheDirLevels</a> <a name="cachedirlevels" id="cachedirlevels">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The number of levels of subdirectories in the
-cache.</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheDirLevels <var>levels</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheDirLevels 3</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheDirLevels" id="CacheDirLevels">CacheDirLevels</a> <a name="cachedirlevels" id="cachedirlevels">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The number of levels of subdirectories in the
+cache.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheDirLevels <var>levels</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheDirLevels 3</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>The <code class="directive">CacheDirLevels</code> directive sets the number
of subdirectory levels in the cache. Cached data will be saved this
many directory levels below the <code class="directive"><a href="#cacheroot">CacheRoot</a></code> directory.</p>
@@ -76,14 +107,19 @@
<div class="example"><p><code>
CacheDirLevels 5
</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="CacheExpiryCheck" id="CacheExpiryCheck">CacheExpiryCheck</a> <a name="cacheexpirycheck" id="cacheexpirycheck">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Indicates if the cache observes Expires dates when seeking
-files</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheExpiryCheck On|Off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheExpiryCheck On</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheExpiryCheck" id="CacheExpiryCheck">CacheExpiryCheck</a> <a name="cacheexpirycheck" id="cacheexpirycheck">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Indicates if the cache observes Expires dates when seeking
+files</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheExpiryCheck On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheExpiryCheck On</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>More detail will be added here, when the function is implemented.</p>
<div class="example"><p><code>
@@ -94,14 +130,19 @@
The <code class="directive">CacheExpiryCheck</code> directive is currently
<em>not</em> implemented.
</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="CacheGcClean" id="CacheGcClean">CacheGcClean</a> <a name="cachegcclean" id="cachegcclean">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The time to retain unchanged cached files that match a
-URL</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheGcClean <var>hours</var> <var>url-string</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheGcClean ?</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheGcClean" id="CacheGcClean">CacheGcClean</a> <a name="cachegcclean" id="cachegcclean">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The time to retain unchanged cached files that match a
+URL</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheGcClean <var>hours</var> <var>url-string</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheGcClean ?</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>More detail will be added here, when the function is implemented.</p>
<div class="example"><p><code>
@@ -112,14 +153,19 @@
The <code class="directive">CacheGcClean</code> directive is currently
<em>not</em> implemented.
</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="CacheGcDaily" id="CacheGcDaily">CacheGcDaily</a> <a name="cachegcdaily" id="cachegcdaily">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The recurring time each day for garbage collection to be run.
-(24 hour clock)</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheGcDaily <var>time</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheGcDaily ?</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheGcDaily" id="CacheGcDaily">CacheGcDaily</a> <a name="cachegcdaily" id="cachegcdaily">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The recurring time each day for garbage collection to be run.
+(24 hour clock)</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheGcDaily <var>time</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheGcDaily ?</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>More detail will be added here, when the function is implemented.</p>
<div class="example"><p><code>
@@ -130,12 +176,17 @@
The <code class="directive">CacheGcDaily</code> directive is currently
<em>not</em> implemented.
</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="CacheGcInterval" id="CacheGcInterval">CacheGcInterval</a> <a name="cachegcinterval" id="cachegcinterval">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The interval between garbage collection attempts.</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheGcInterval <var>hours</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheGcInterval" id="CacheGcInterval">CacheGcInterval</a> <a name="cachegcinterval" id="cachegcinterval">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The interval between garbage collection attempts.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheGcInterval <var>hours</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>The <code class="directive">CacheGcInterval</code> directive specifies the
number of hours to wait between attempts to free up disk space.</p>
<p>More detail will be added here, when the function is implemented.</p>
@@ -148,14 +199,19 @@
The <code class="directive">CacheGcInterval</code> directive is currently
<em>not</em> implemented.
</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="CacheGcMemUsage" id="CacheGcMemUsage">CacheGcMemUsage</a> <a name="cachegcmemusage" id="cachegcmemusage">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The maximum kilobytes of memory used for garbage
-collection</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheGcMemUsage <var>KBytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheGcMemUsage ?</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheGcMemUsage" id="CacheGcMemUsage">CacheGcMemUsage</a> <a name="cachegcmemusage" id="cachegcmemusage">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum kilobytes of memory used for garbage
+collection</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheGcMemUsage <var>KBytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheGcMemUsage ?</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>More detail will be added here, when the function is implemented.</p>
<div class="example"><p><code>
@@ -166,14 +222,19 @@
The <code class="directive">CacheGcMemUsage</code> directive is currently
<em>not</em> implemented.
</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="CacheGcUnused" id="CacheGcUnused">CacheGcUnused</a> <a name="cachegcunused" id="cachegcunused">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The time to retain unreferenced cached files that match a
-URL.</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheGcUnused <var>hours</var> <var>url-string</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheGcUnused ?</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheGcUnused" id="CacheGcUnused">CacheGcUnused</a> <a name="cachegcunused" id="cachegcunused">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The time to retain unreferenced cached files that match a
+URL.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheGcUnused <var>hours</var> <var>url-string</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheGcUnused ?</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>More detail will be added here, when the function is implemented.</p>
<div class="example"><p><code>
@@ -184,14 +245,19 @@
The <code class="directive">CacheGcUnused</code> directive is currently
<em>not</em> implemented.
</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="CacheMaxFileSize" id="CacheMaxFileSize">CacheMaxFileSize</a> <a name="cachemaxfilesize" id="cachemaxfilesize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The maximum size (in bytes) of a document to be placed in the
-cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheMaxFileSize <var>bytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheMaxFileSize 1000000</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheMaxFileSize" id="CacheMaxFileSize">CacheMaxFileSize</a> <a name="cachemaxfilesize" id="cachemaxfilesize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum size (in bytes) of a document to be placed in the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheMaxFileSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheMaxFileSize 1000000</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>The <code class="directive">CacheMaxFileSize</code> directive sets the
maximum size, in bytes, for a document to be considered for storage in
the cache.</p>
@@ -199,14 +265,19 @@
<div class="example"><p><code>
CacheMaxFileSize 64000
</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="CacheMinFileSize" id="CacheMinFileSize">CacheMinFileSize</a> <a name="cacheminfilesize" id="cacheminfilesize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The minimum size (in bytes) of a document to be placed in the
-cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheMinFileSize <var>bytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheMinFileSize 1</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheMinFileSize" id="CacheMinFileSize">CacheMinFileSize</a> <a name="cacheminfilesize" id="cacheminfilesize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The minimum size (in bytes) of a document to be placed in the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheMinFileSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheMinFileSize 1</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>The <code class="directive">CacheMinFileSize</code> directive sets the
minimum size, in bytes, for a document to be considered for storage
in the cache.</p>
@@ -214,14 +285,19 @@
<div class="example"><p><code>
CacheMinFileSize 64
</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="CacheRoot" id="CacheRoot">CacheRoot</a> <a name="cacheroot" id="cacheroot">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The directory root under which cache files are
-stored</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheRoot <var>directory</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</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_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheRoot" id="CacheRoot">CacheRoot</a> <a name="cacheroot" id="cacheroot">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The directory root under which cache files are
+stored</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheRoot <var>directory</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</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_disk_cache</td></tr>
+</table>
<p>The <code class="directive">CacheRoot</code> directive defines the name of
the directory on the disk to contain cache files. If the <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> module has been loaded or compiled in to the
Apache server, this directive <em>must</em> be defined. Failing to
@@ -232,14 +308,19 @@
<div class="example"><p><code>
CacheRoot c:/cacheroot
</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="CacheSize" id="CacheSize">CacheSize</a> <a name="cachesize" id="cachesize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The maximum amount of disk space that will be used by the
-cache in KBytes</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheSize <var>KBytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheSize 1000000</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSize" id="CacheSize">CacheSize</a> <a name="cachesize" id="cachesize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum amount of disk space that will be used by the
+cache in KBytes</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSize <var>KBytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSize 1000000</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>The <code class="directive">CacheSize</code> directive sets the desired
disk space usage of the cache, in KBytes (1024-byte units). This
directive does not put a hard limit on the size of the cache. The
@@ -250,13 +331,18 @@
<div class="example"><p><code>
CacheSize 5000000
</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="CacheTimeMargin" id="CacheTimeMargin">CacheTimeMargin</a> <a name="cachetimemargin" id="cachetimemargin">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The minimum time margin to cache a document</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CacheTimeMargin <var>?</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CacheTimeMargin ?</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_disk_cache</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheTimeMargin" id="CacheTimeMargin">CacheTimeMargin</a> <a name="cachetimemargin" id="cachetimemargin">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The minimum time margin to cache a document</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheTimeMargin <var>?</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheTimeMargin ?</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_disk_cache</td></tr>
+</table>
<p>More detail will be added here, when the function is implemented.</p>
<div class="example"><p><code>
@@ -267,4 +353,10 @@
The <code class="directive">CacheTimeMargin</code> directive is currently
<em>not</em> implemented.
</div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_echo.html.en b/docs/manual/mod/mod_echo.html.en
index 6afe3c3..e422921 100644
--- a/docs/manual/mod/mod_echo.html.en
+++ b/docs/manual/mod/mod_echo.html.en
@@ -4,29 +4,61 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_echo - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_echo</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>A simple echo server to illustrate protocol
-modules</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>echo_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_echo.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0 and later</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_echo - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_echo</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>A simple echo server to illustrate protocol
+modules</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>echo_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_echo.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.0 and later</td></tr></table>
+<h3>Summary</h3>
+
<p>This module provides an example protocol module to illustrate the
concept. It provides a simple echo server. Telnet to it and type
stuff, and it will echo it.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#protocolecho">ProtocolEcho</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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Turn the echo server on or off</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProtocolEcho On|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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_echo</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>ProtocolEcho is only available in 2.0 and
-later.</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#protocolecho">ProtocolEcho</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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Turn the echo server on or off</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProtocolEcho On|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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_echo</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>ProtocolEcho is only available in 2.0 and
+later.</td></tr>
+</table>
<p>The <code class="directive">ProtocolEcho</code> directive enables or
disables the echo server.</p>
<div class="example"><h3>Example</h3><p><code>
ProtocolEcho On
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_echo.html.ja.jis b/docs/manual/mod/mod_echo.html.ja.jis
index 130c070..2da3b89 100644
--- a/docs/manual/mod/mod_echo.html.ja.jis
+++ b/docs/manual/mod/mod_echo.html.ja.jis
@@ -4,24 +4,50 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_echo - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_echo</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%W%m%H%3%k%b%8%e!<%k$N35MW$r<($9$?$a$NC1(B$B=c$J%(%3!<%5!<%P(B
-</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>echo_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_echo.c</td></tr><tr><th><a href="module-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 2.0 $B0J9_(B</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_echo - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_echo</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%W%m%H%3%k%b%8%e!<%k$N35MW$r<($9$?$a$NC1=c$J%(%3!<%5!<%P(B
+</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>echo_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_echo.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">$B8_49@-(B:</a></th><td>Apache 2.0 $B0J9_(B</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$BK\%b%8%e!<%k$O%3%s%;%W%H$rEA$($k$?$a$N%W%m%H%3%k%b%8%e!<%k$N(B
$B<BAuNc$H$J$C$F$$$^$9!#C1=c$J%(%3!<%5!<%P$rDs6!$7$^$9!#(B
Telnet $B$G@\B3$7!"J8;zNs$rAw?.$9$k$H!"%(%3!<$rJV$7$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#protocolecho">ProtocolEcho</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%(%3!<%5!<%P$NM-8zL58z$r@_Dj$7$^$9!#(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ProtocolEcho <em>On|Off</em></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_echo</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 2.0 $B0J9_(B</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#protocolecho">ProtocolEcho</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%(%3!<%5!<%P$NM-8zL58z$r@_Dj$7$^$9!#(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ProtocolEcho <em>On|Off</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_echo</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>Apache 2.0 $B0J9_(B</td></tr>
+</table>
<p><code class="directive">ProtocolEcho</code> $B%G%#%l%/%F%#%V$G(B
$B%(%3!<%5!<%P$NM-8zL58z$r@_Dj$7$^$9!#(B</p>
@@ -30,4 +56,10 @@
ProtocolEcho On
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_env.html.en b/docs/manual/mod/mod_env.html.en
index 9e51b61..0375abf 100644
--- a/docs/manual/mod/mod_env.html.en
+++ b/docs/manual/mod/mod_env.html.en
@@ -4,28 +4,57 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_env - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_env</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Modifies the environment which is passed to CGI scripts and
-SSI pages</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>env_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_env.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_env - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_env</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Modifies the environment which is passed to CGI scripts and
+SSI pages</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>env_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_env.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module allows for control of the environment that will
be provided to CGI scripts and SSI pages. Environment variables
may be passed from the shell which invoked the httpd process.
Alternatively, environment variables may be set or unset within
the configuration process.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#passenv">PassEnv</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#passenv">PassEnv</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#setenv">SetEnv</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#unsetenv">UnsetEnv</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><a href="../env.html">Environment Variables</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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Passes environment variables from the shell</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>PassEnv <var>env-variable</var> [<var>env-variable</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_env</td></tr></table>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><a href="../env.html">Environment Variables</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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Passes environment variables from the shell</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>PassEnv <var>env-variable</var> [<var>env-variable</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_env</td></tr>
+</table>
<p>Specifies one or more environment variables to pass to CGI
scripts and SSI pages from the environment of the shell which
invoked the httpd process.</p>
@@ -33,31 +62,47 @@
<div class="example"><h3>Example</h3><p><code>
PassEnv LD_LIBRARY_PATH
</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="SetEnv" id="SetEnv">SetEnv</a> <a name="setenv" id="setenv">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets environment variables</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SetEnv <var>env-variable</var> <var>value</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_env</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetEnv" id="SetEnv">SetEnv</a> <a name="setenv" id="setenv">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets environment variables</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SetEnv <var>env-variable</var> <var>value</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_env</td></tr>
+</table>
<p>Sets an environment variable, which is then passed on to CGI
scripts and SSI pages.</p>
<div class="example"><h3>Example</h3><p><code>
SetEnv SPECIAL_PATH /foo/bin
</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="UnsetEnv" id="UnsetEnv">UnsetEnv</a> <a name="unsetenv" id="unsetenv">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Removes variables from the environment</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>UnsetEnv <var>env-variable</var> [<var>env-variable</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_env</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="UnsetEnv" id="UnsetEnv">UnsetEnv</a> <a name="unsetenv" id="unsetenv">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Removes variables from the environment</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>UnsetEnv <var>env-variable</var> [<var>env-variable</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_env</td></tr>
+</table>
<p>Removes one or more environment variables from those passed
on to CGI scripts and SSI pages.</p>
<div class="example"><h3>Example</h3><p><code>
UnsetEnv LD_LIBRARY_PATH
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_env.html.ja.jis b/docs/manual/mod/mod_env.html.ja.jis
index 6bd48ef..cb1a2ce 100644
--- a/docs/manual/mod/mod_env.html.ja.jis
+++ b/docs/manual/mod/mod_env.html.ja.jis
@@ -4,28 +4,57 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_env - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_env</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>CGI $B%9%/%j%W%H5Z$S(B SSI
- $B%Z!<%8$KEO$5$l$k4D6-JQ?t$rJQ99$9$k5!G=$rDs6!$9$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>env_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_env.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_env - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_env</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>CGI $B%9%/%j%W%H5Z$S(B SSI
+ $B%Z!<%8$KEO$5$l$k4D6-JQ?t$rJQ99$9$k5!G=$rDs6!$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>env_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_env.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$B$3$N%b%8%e!<%k$K$h$j(B CGI $B%9%/%j%W%H$H(B SSI
- $B%Z(B$B!<%8$KE,MQ$5$l$k4D6-JQ?t$r@)8f$9$k$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
+ $B%Z!<%8$KE,MQ$5$l$k4D6-JQ?t$r@)8f$9$k$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
$B4D6-JQ?t$O(B httpd $B%W%m%;%9$r5/F0$7$?%7%'%k$+$iEO$5$l$^$9!#$^$?!"(B
$B@_Dj%U%!%$%k$G4D6-JQ?t$r@_Dj$7$?$j!":o=|$7$?$j$9$k$3$H$,$G$-$^$9!#(B
</p>
- </div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#passenv">PassEnv</a></li>
+ </div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#passenv">PassEnv</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#setenv">SetEnv</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#unsetenv">UnsetEnv</a></li>
-</ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><a href="../env.html">$B4D6-JQ?t(B</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%7%'%k$+$i$N4D6-JQ?t$rEO$9(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>PassEnv
- <em>env-variable</em> [<em>env-variable</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_env</td></tr></table>
+</ul>
+<h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><a href="../env.html">$B4D6-JQ?t(B</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%7%'%k$+$i$N4D6-JQ?t$rEO$9(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>PassEnv
+ <em>env-variable</em> [<em>env-variable</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_env</td></tr>
+</table>
<p>httpd $B%W%m%;%9$r5/F0$7$?%7%'%k$N4D6-$+$i(B CGI $B%9%/%j%W%H$H(B
SSI $B%Z!<%8$KEO$94D6-JQ?t$r0l$D0J>e;XDj$7$^$9!#Nc(B:
@@ -33,28 +62,44 @@
<div class="example"><p><code>
PassEnv LD_LIBRARY_PATH
</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="SetEnv" id="SetEnv">SetEnv</a> <a name="setenv" id="setenv">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B4D6-JQ?t$r@_Dj$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>SetEnv <em>env-variable value</em></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_env</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetEnv" id="SetEnv">SetEnv</a> <a name="setenv" id="setenv">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B4D6-JQ?t$r@_Dj$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>SetEnv <em>env-variable value</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_env</td></tr>
+</table>
<p>$B4D6-JQ?t$r@_Dj$7!"$=$l$r(B CGI $B%9%/%j%W%H$H(B SSI
$B%Z!<%8$KEO$9$h$&$K$7$^$9!#Nc(B:</p>
<div class="example"><p><code>
SetEnv SPECIAL_PATH /foo/bin
</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="UnsetEnv" id="UnsetEnv">UnsetEnv</a> <a name="unsetenv" id="unsetenv">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B4D6-$+$iJQ?t$r<h$j=|$/(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>UnsetEnv <em>env-variable</em> [<em>env-variable</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_env</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="UnsetEnv" id="UnsetEnv">UnsetEnv</a> <a name="unsetenv" id="unsetenv">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B4D6-$+$iJQ?t$r<h$j=|$/(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>UnsetEnv <em>env-variable</em> [<em>env-variable</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_env</td></tr>
+</table>
<p>CGI $B%9%/%j%W%H$H(B SSI
$B%Z!<%8$KEO$5$l$k4D6-JQ?t$+$i;XDj$5$l$?4D6-JQ?t$r<h$j=|$-$^$9!#Nc(B:</p>
<div class="example"><p><code>
UnsetEnv LD_LIBRARY_PATH
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_example.html.en b/docs/manual/mod/mod_example.html.en
index 1b2e8a5..4fab579 100644
--- a/docs/manual/mod/mod_example.html.en
+++ b/docs/manual/mod/mod_example.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_example - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_example</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Illustrates the Apache module API</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>example_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_example.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_example - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_example</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Illustrates the Apache module API</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>example_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_example.c</td></tr></table>
+<h3>Summary</h3>
+
<div class="warning">
This document has not been updated
to take into account changes made in the 2.0 version of the
@@ -31,8 +48,19 @@
location, and then browse to that location, you will see a
display of some of the tracing the example module did as the
various callbacks were made.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#example">Example</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> Compiling the example module</li><li><img alt="" src="../images/down.gif" /> Using the <code>mod_example</code> Module</li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Compiling the example module</h2>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#example">Example</a></li>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> Compiling the example module</li>
+<li><img alt="" src="../images/down.gif" /> Using the <code>mod_example</code> Module</li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Compiling the example module</h2>
<p>To include the example module in your server, follow the
steps below:</p>
@@ -70,7 +98,9 @@
<li>Follow steps [1] through [3] above, with appropriate
changes.</li>
</ol>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Using the <code>mod_example</code> Module</h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Using the <code>mod_example</code> Module</h2>
<p>To activate the example module, include a block similar to
the following in your <code>srm.conf</code> file:</p>
@@ -89,13 +119,17 @@
<p>After reloading/restarting your server, you should be able
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</td></tr></table>
+</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</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
@@ -104,4 +138,10 @@
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 id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_expires.html.en b/docs/manual/mod/mod_expires.html.en
index 8a97ed3..bf3530d 100644
--- a/docs/manual/mod/mod_expires.html.en
+++ b/docs/manual/mod/mod_expires.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_expires - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_expires</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Generation of <code>Expires</code> HTTP headers according to
-user-specified criteria</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>expires_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_expires.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_expires - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_expires</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Generation of <code>Expires</code> HTTP headers according to
+user-specified criteria</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>expires_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_expires.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module controls the setting of the <code>Expires</code>
HTTP header in server responses. The expiration date can set to
be relative to either the time the source file was last
@@ -21,10 +38,20 @@
from the source until this time has passed. After that, the
cache copy is considered "expired" and invalid, and a new copy
must be obtained from the source.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#expiresactive">ExpiresActive</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#expiresactive">ExpiresActive</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#expiresbytype">ExpiresByType</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#expiresdefault">ExpiresDefault</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#AltSyn">Alternate Interval Syntax</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>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#AltSyn">Alternate Interval Syntax</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>
@@ -85,14 +112,18 @@
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 Expires
-headers</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ExpiresActive On|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>Indexes</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_expires</td></tr></table>
+</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 Expires
+headers</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ExpiresActive On|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>Indexes</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_expires</td></tr>
+</table>
<p>This directive enables or disables the generation of the
<code>Expires</code> header for the document realm in question.
(That is, if found in an <code>.htaccess</code> file, for
@@ -110,15 +141,20 @@
<code>Expires</code> header will be generated. If the criteria
aren't met, no header will be sent, and the effect will be as
though this directive wasn't even specified.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ExpiresByType" id="ExpiresByType">ExpiresByType</a> <a name="expiresbytype" id="expiresbytype">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Value of the Expires header configured
-by MIME type</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ExpiresByType <var>MIME-type</var>
-<var><code>seconds</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>Indexes</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_expires</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExpiresByType" id="ExpiresByType">ExpiresByType</a> <a name="expiresbytype" id="expiresbytype">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Value of the Expires header configured
+by MIME type</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ExpiresByType <var>MIME-type</var>
+<var><code>seconds</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>Indexes</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_expires</td></tr>
+</table>
<p>This directive defines the value of the <code>Expires</code>
header generated for documents of the specified type (<em>e.g.</em>,
<code>text/html</code>). The second argument sets the number of
@@ -162,17 +198,28 @@
<p>You can also specify the expiration time calculation using
an <a href="#AltSyn">alternate syntax</a>, described earlier in
this 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="ExpiresDefault" id="ExpiresDefault">ExpiresDefault</a> <a name="expiresdefault" id="expiresdefault">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Default algorithm for calculating expiration time</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ExpiresDefault <var><code>seconds</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>Indexes</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_expires</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExpiresDefault" id="ExpiresDefault">ExpiresDefault</a> <a name="expiresdefault" id="expiresdefault">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Default algorithm for calculating expiration time</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ExpiresDefault <var><code>seconds</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>Indexes</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_expires</td></tr>
+</table>
<p>This directive sets the default algorithm for calculating the
expiration time for all documents in the affected realm. It can be
overridden on a type-by-type basis by the <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> directive. See the
description of that directive for details about the syntax of the
argument, and the <a href="#AltSyn">alternate syntax</a>
description as well.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ext_filter.html.en b/docs/manual/mod/mod_ext_filter.html.en
index a7f2eae..b51e112 100644
--- a/docs/manual/mod/mod_ext_filter.html.en
+++ b/docs/manual/mod/mod_ext_filter.html.en
@@ -4,26 +4,37 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_ext_filter - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_ext_filter</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Pass the response body through an external program before
-delivery to the client</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>ext_filter_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_ext_filter.c</td></tr></table><h3>Summary</h3>
- <p>This is an <strong>experimental</strong> module and should
- be used with care. Test your <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>
- configuration carefully to ensure that it performs the desired
- function. You may wish to review <a href="../filter.html">
- this information</a> for background on the Apache filtering
- model.</p>
+ -->
+<title>mod_ext_filter - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_ext_filter</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Pass the response body through an external program before
+delivery to the client</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>ext_filter_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_ext_filter.c</td></tr></table>
+<h3>Summary</h3>
<p><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> presents a simple and familiar
- programming model for filters. With this module, a program
- which reads from stdin and writes to stdout (i.e., a Unix-style
- filter command) can be a filter for Apache. This filtering
- mechanism is much slower than using a filter which is specially
- written for the Apache API and runs inside of the Apache server
- process, but it does have the following benefits:</p>
+ programming model for <a href="../filter.html">filters</a>. With
+ this module, a program which reads from stdin and writes to stdout
+ (i.e., a Unix-style filter command) can be a filter for
+ Apache. This filtering mechanism is much slower than using a
+ filter which is specially written for the Apache API and runs
+ inside of the Apache server process, but it does have the
+ following benefits:</p>
<ul>
<li>the programming model is much simpler</li>
@@ -39,9 +50,23 @@
<p>Even when the performance characteristics are not suitable
for production use, <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> can be used as
a prototype environment for filters.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#extfilterdefine">ExtFilterDefine</a></li>
+
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#extfilterdefine">ExtFilterDefine</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#extfilteroptions">ExtFilterOptions</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../filter.html">The filter documentation</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>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><a href="../filter.html">Filters</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>
<div class="example"><p><code>
@@ -191,12 +216,16 @@
close(SAVE);
</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">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Define an external filter</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ExtFilterDefine <var>filtername</var> <var>parameters</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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_ext_filter</td></tr></table>
+</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>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ExtFilterDefine <var>filtername</var> <var>parameters</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ext_filter</td></tr>
+</table>
<p>The <code class="directive">ExtFilterDefine</code> directive defines the
characteristics of an external filter, including the program to
run and its arguments.</p>
@@ -279,13 +308,18 @@
<dd>This parameter specifies the name of an environment variable
which must be set, or the filter will be disabled.</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">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configure mod_ext_filter options</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ExtFilterOptions <var>option</var> [<var>option</var>] ...</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ExtFilterOptions DebugLevel=0 NoLogStderr</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_ext_filter</td></tr></table>
+
+</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">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure mod_ext_filter options</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ExtFilterOptions <var>option</var> [<var>option</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ExtFilterOptions DebugLevel=0 NoLogStderr</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_ext_filter</td></tr>
+</table>
<p>The <code class="directive">ExtFilterOptions</code> directive specifies
special processing options for <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>.
<var>Option</var> can be one of</p>
@@ -323,4 +357,10 @@
<p>Messages written to the filter's standard error will be stored
in the Apache error log. No debug messages will be generated by
<code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>. </p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_file_cache.html.en b/docs/manual/mod/mod_file_cache.html.en
index 006d01e..dc9e545 100644
--- a/docs/manual/mod/mod_file_cache.html.en
+++ b/docs/manual/mod/mod_file_cache.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_file_cache - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_file_cache</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Caches a static list of files in memory</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>file_cache_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_file_cache.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_file_cache - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_file_cache</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Caches a static list of files in memory</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>file_cache_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_file_cache.c</td></tr></table>
+<h3>Summary</h3>
+
<div class="warning">
This module should be used with care. You can easily create a broken
@@ -34,9 +51,19 @@
<p>This module is an extension of and borrows heavily from the
<code>mod_mmap_static</code> module in Apache 1.3.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cachefile">CacheFile</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cachefile">CacheFile</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#mmapfile">MMapFile</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#using">Using mod_file_cache</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 mod_file_cache</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#using">Using mod_file_cache</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 mod_file_cache</a></h2>
<p><code class="module"><a href="../mod/mod_file_cache.html">mod_file_cache</a></code> caches a list of statically
configured files via <code class="directive"><a href="#mmapfile">MMapFile</a></code> or <code class="directive"><a href="#cachefile">CacheFile</a></code> directives in the main server configuration.</p>
@@ -110,12 +137,16 @@
| sed -e 's/.*/mmapfile &/' > /www/conf/mmap.conf
</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>
+</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
@@ -135,12 +166,17 @@
<div class="example"><h3>Example</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">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>
+
+</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
@@ -160,4 +196,10 @@
<div class="example"><h3>Example</h3><p><code>
MMapFile /usr/local/apache/htdocs/index.html
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index 9abc67f..5bf2e7e 100644
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -4,20 +4,48 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_headers - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_headers</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Customization of HTTP request and response
-headers</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>headers_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_headers.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td><code class="directive"><a href="#requestheader">RequestHeader</a></code>
-is available only in Apache 2.0</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_headers - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_headers</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Customization of HTTP request and response
+headers</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>headers_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_headers.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td><code class="directive"><a href="#requestheader">RequestHeader</a></code>
+is available only in Apache 2.0</td></tr></table>
+<h3>Summary</h3>
+
<p>This module provides directives to control and modify HTTP
request and response headers. Headers can be merged, replaced
or removed.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#header">Header</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#header">Header</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#requestheader">RequestHeader</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#order">Order of Processing</a></li><li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</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>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#order">Order of Processing</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</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. They are valid in the
@@ -48,7 +76,9 @@
<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="examples" id="examples">Examples</a></h2>
+</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>
@@ -114,14 +144,18 @@
</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">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configure HTTP response headers</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Header set|append|add|unset|echo <var>header</var>
-[<var>value</var> [env=[!]<var>variable</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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_headers</td></tr></table>
+</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>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Header set|append|add|unset|echo <var>header</var>
+[<var>value</var> [env=[!]<var>variable</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_headers</td></tr>
+</table>
<p>This directive can replace, merge or remove HTTP response
headers. The header is modified just after the content handler
and output filters are run, allowing outgoing headers to be
@@ -199,14 +233,19 @@
before the response is sent to the network. These means that it is
possible to set and/or override most headers, except for those headers
added by the header filter.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RequestHeader" id="RequestHeader">RequestHeader</a> <a name="requestheader" id="requestheader">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configure HTTP request headers</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RequestHeader set|append|add|unset <var>header</var>
-[<var>value</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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_headers</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RequestHeader" id="RequestHeader">RequestHeader</a> <a name="requestheader" id="requestheader">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure HTTP request headers</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RequestHeader set|append|add|unset <var>header</var>
+[<var>value</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_headers</td></tr>
+</table>
<p>This directive can replace, merge or remove HTTP request
headers. The header is modified just before the content handler
is run, allowing incoming headers to be modified. The action it
@@ -248,4 +287,10 @@
just before the request is run by its handler in the fixup phase.
This should allow headers generated by the browser, or by Apache
input filters to be overridden or modified.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_imap.html.en b/docs/manual/mod/mod_imap.html.en
index 2794399..4ebb369 100644
--- a/docs/manual/mod/mod_imap.html.en
+++ b/docs/manual/mod/mod_imap.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_imap - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_imap</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Server-side imagemap processing</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>imap_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_imap.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_imap - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_imap</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Server-side imagemap processing</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>imap_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_imap.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module processes <code>.map</code> files, thereby
replacing the functionality of the <code>imagemap</code> CGI
program. Any directory or document type configured to use the
@@ -28,10 +45,23 @@
<p>However, we are trying to phase out "magic MIME types" so we
are deprecating this method.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#imapbase">ImapBase</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#imapbase">ImapBase</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#imapdefault">ImapDefault</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#imapmenu">ImapMenu</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#features">New Features</a></li><li><img alt="" src="../images/down.gif" /> <a href="#imapfile">Imagemap File</a></li><li><img alt="" src="../images/down.gif" /> <a href="#example">Example Mapfile</a></li><li><img alt="" src="../images/down.gif" /> <a href="#referencing">Referencing your mapfile</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="features" id="features">New Features</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#features">New Features</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#imapfile">Imagemap File</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#example">Example Mapfile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#referencing">Referencing your mapfile</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="features" id="features">New Features</a></h2>
<p>The imagemap module adds some new features that were not
possible with previously distributed imagemap programs.</p>
@@ -48,7 +78,9 @@
<li>Configurable generation of imagemap menus.</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="imapfile" id="imapfile">Imagemap File</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="imapfile" id="imapfile">Imagemap File</a></h2>
<p>The lines in the imagemap files can have one of several
formats:</p>
@@ -211,7 +243,9 @@
</dl>
-</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 Mapfile</a></h2>
+</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 Mapfile</a></h2>
<div class="example"><p><code>
#Comments are printed in a 'formatted' or 'semiformatted' menu.<br />
@@ -226,7 +260,9 @@
rect mailto:nate@tripod.com 100,150 200,0 "Bugs?"<br />
</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="referencing" id="referencing">Referencing your mapfile</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="referencing" id="referencing">Referencing your mapfile</a></h2>
<div class="example"><h3>HTML example</h3><p><code>
<a href="/maps/imagemap1.map"><br />
@@ -244,28 +280,41 @@
</a>
</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 base 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_imap</td></tr></table>
+</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 base 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_imap</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_imap</td></tr></table>
+
+<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_imap</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
@@ -273,14 +322,19 @@
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#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_imap</td></tr></table>
+
+</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#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_imap</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>
@@ -312,4 +366,10 @@
of your menus, but requires you to treat your map files as
HTML instead of plaintext.</dd>
</dl>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_include.html.en b/docs/manual/mod/mod_include.html.en
index 9b6077a..94a6fe3 100644
--- a/docs/manual/mod/mod_include.html.en
+++ b/docs/manual/mod/mod_include.html.en
@@ -4,27 +4,66 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_include - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_include</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Server-parsed html documents (Server Side Includes)</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>include_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_include.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Implemented as an output filter since Apache
-2.0</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_include - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_include</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Server-parsed html documents (Server Side Includes)</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>include_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_include.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Implemented as an output filter since Apache
+2.0</td></tr></table>
+<h3>Summary</h3>
+
<p>This module provides a filter which will process files
before they are sent to the client. The processing is
controlled by specially formatted SGML comments, referred to as
<dfn>elements</dfn>. These elements allow conditional text, the
inclusion of other files or programs, as well as the setting and
printing of environment variables.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#ssiendtag">SSIEndTag</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#ssiendtag">SSIEndTag</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ssierrormsg">SSIErrorMsg</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ssistarttag">SSIStartTag</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ssitimeformat">SSITimeFormat</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ssiundefinedecho">SSIUndefinedEcho</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#xbithack">XBitHack</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#enabling">Enabling Server-Side Includes</a></li><li><img alt="" src="../images/down.gif" /> <a href="#pathinfo">PATH_INFO with Server Side Includes</a></li><li><img alt="" src="../images/down.gif" /> <a href="#elements">Basic Elements</a></li><li><img alt="" src="../images/down.gif" /> <a href="#includevars">Include Variables</a></li><li><img alt="" src="../images/down.gif" /> <a href="#substitution">Variable Substitution</a></li><li><img alt="" src="../images/down.gif" /> <a href="#flowctrl">Flow Control Elements</a></li></ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li><li><a href="../misc/custom_errordocs.html">International Customized
-Server Error Messages</a></li><li><a href="../filter.html">Filters</a></li><li><a href="../howto/ssi.html">SSI Tutorial</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="enabling" id="enabling">Enabling Server-Side Includes</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#enabling">Enabling Server-Side Includes</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#pathinfo">PATH_INFO with Server Side Includes</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#elements">Basic Elements</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#includevars">Include Variables</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#substitution">Variable Substitution</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#flowctrl">Flow Control Elements</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li>
+<li><a href="../misc/custom_errordocs.html">International Customized
+Server Error Messages</a></li>
+<li><a href="../filter.html">Filters</a></li>
+<li><a href="../howto/ssi.html">SSI Tutorial</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="enabling" id="enabling">Enabling Server-Side Includes</a></h2>
<p>Server Side Includes are implemented by the
@@ -59,14 +98,18 @@
output will have the mime type <code>text/html</code>).</p>
<p>For more information, see our <a href="../howto/ssi.html">Tutorial on Server Side Includes</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="pathinfo" id="pathinfo">PATH_INFO with Server Side Includes</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="pathinfo" id="pathinfo">PATH_INFO with Server Side Includes</a></h2>
<p>Files processed for server-side includes no longer accept
requests with <code>PATH_INFO</code> (trailing pathname information)
by default. You can use the <code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code> directive to
configure the server to accept requests with <code>PATH_INFO</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="elements" id="elements">Basic Elements</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="elements" id="elements">Basic Elements</a></h2>
<p>The document is parsed as an HTML document, with special
commands embedded as SGML comments. A command has the syntax: </p>
@@ -341,7 +384,9 @@
<!--#set var="category" value="help" -->
</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="includevars" id="includevars">Include Variables</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="includevars" id="includevars">Include Variables</a></h2>
<p>In addition to the variables in the standard CGI environment,
@@ -375,7 +420,9 @@
usage (special characters like <code>&</code> etc. are
preceded by backslashes).</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="substitution" id="substitution">Variable Substitution</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="substitution" id="substitution">Variable Substitution</a></h2>
<p>Variable substitution is done within quoted strings in most
cases where they may reasonably occur as an argument to an SSI
@@ -424,7 +471,9 @@
</span>
<!--#endif -->
</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="flowctrl" id="flowctrl">Flow Control Elements</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="flowctrl" id="flowctrl">Flow Control Elements</a></h2>
<p>The basic flow control elements are:</p>
@@ -527,14 +576,18 @@
and<br />
<br />
<code>'<var>string1</var> <var>string2</var>'</code> results in <code><var>string1</var> <var>string2</var></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="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 "-->"</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><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0.30 and later.</td></tr></table>
+</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 "-->"</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>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0.30 and later.</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>
@@ -542,17 +595,26 @@
SSIEndTag "%>"
</code></p></div>
-<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><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0.30 and later.</td></tr></table>
+
+<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>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0.30 and later.</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
@@ -565,14 +627,19 @@
<div class="example"><h3>Example</h3><p><code>
SSIErrorMsg "<!-- Error -->"
</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="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 "<!--"</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><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0.30 and later.</td></tr></table>
+
+</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 "<!--"</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>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0.30 and later.</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>
@@ -592,16 +659,25 @@
<div class="example"><h3>SSI directives with alternate start and end tags</h3><p><code>
<%#printenv %>
</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><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0.30 and later.</td></tr></table>
+
+<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>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0.30 and later.</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
@@ -616,29 +692,39 @@
<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</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.0.34 and later.</td></tr></table>
+
+</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</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.0.34 and later.</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>
<div class="example"><h3>Example</h3><p><code>
SSIUndefinedEcho "<!-- undef -->"
</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">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>
+
+</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 MIME type <code>text/html</code>. <code class="directive">XBitHack</code> can take on the following values:</p>
@@ -667,4 +753,10 @@
</dd>
</dl>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_include.html.ja.jis b/docs/manual/mod/mod_include.html.ja.jis
index 9841c82..0eda3fc 100644
--- a/docs/manual/mod/mod_include.html.ja.jis
+++ b/docs/manual/mod/mod_include.html.ja.jis
@@ -4,32 +4,70 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_include - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_include</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%5!<%P$,%Q!<%9$9$k(B html $B%I%-(B$B%e%a%s%H(B (Server Side Includes)</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>include_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_include.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_include - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_include</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%5!<%P$,%Q!<%9$9$k(B html $B%I%-%e%a%s%H(B (Server Side Includes)</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>include_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_include.c</td></tr></table>
+<h3>$B35MW(B</h3>
- <p>$B$3$N%b%8%e!<%k$O%U%!%$%k$,%/%i%$%"%s%H$KAw$i$l$kA0$K=h(B$BM}$9$k%U%#%k%?$r(B
+
+ <p>$B$3$N%b%8%e!<%k$O%U%!%$%k$,%/%i%$%"%s%H$KAw$i$l$kA0$K=hM}$9$k%U%#%k%?$r(B
$BDs6!$7$^$9!#=hM}$NFbMF$O(B<em>$BMWAG(B</em>$B$H8F$P$l$kFCJL$J7A<0$N(B SGML $B%3%a%s%H$K$h$j(B
$B@)8f$5$l$^$9!#$3$l$i$NMWAG$O>r7oJ,4t$d!"B>$N%U%!%$%k$d(B
$B%W%m%0%i%`$N=PNO$N<h$j9~$_!"4D6-JQ?t$N@_Dj$dI=<($r9T$J$&$3$H$,(B
- $B$G$-$^$9(B$B!#(B</p>
+ $B$G$-$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#ssiendtag">SSIEndTag</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#ssiendtag">SSIEndTag</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ssierrormsg">SSIErrorMsg</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ssistarttag">SSIStartTag</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ssitimeformat">SSITimeFormat</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ssiundefinedecho">SSIUndefinedEcho</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#xbithack">XBitHack</a></li>
-</ul><h3>$B%H%T%C%/(B</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#enabling">Server-Side Includes $B$rM-8z$K$9$k(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#basic">$B4pK\MWAG(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#includevars">Include $BJQ?t(B</a></li><li><img alt="" src="../images/down.gif" /> $BJQ?tCV49(B</li><li><img alt="" src="../images/down.gif" /> <a href="#flowctrl">$B%U%m!<@)8fMQMWAG(B</a></li><li><img alt="" src="../images/down.gif" /> ErrorDocuments $B$G(B Server Side Includes $B$r;H$&(B</li><li><img alt="" src="../images/down.gif" /> Server Side Includes $B$G$N(B PATH_INFO</li></ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li><li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</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="enabling" id="enabling">Server-Side Includes $B$rM-8z$K$9$k(B</a></h2>
+</ul>
+<h3>$B%H%T%C%/(B</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#enabling">Server-Side Includes $B$rM-8z$K$9$k(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#basic">$B4pK\MWAG(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#includevars">Include $BJQ?t(B</a></li>
+<li><img alt="" src="../images/down.gif" /> $BJQ?tCV49(B</li>
+<li><img alt="" src="../images/down.gif" /> <a href="#flowctrl">$B%U%m!<@)8fMQMWAG(B</a></li>
+<li><img alt="" src="../images/down.gif" /> ErrorDocuments $B$G(B Server Side Includes $B$r;H$&(B</li>
+<li><img alt="" src="../images/down.gif" /> Server Side Includes $B$G$N(B PATH_INFO</li>
+</ul><h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</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="enabling" id="enabling">Server-Side Includes $B$rM-8z$K$9$k(B</a></h2>
<p>Server Side Includes $B$O(B <code>INCLUDES</code>
<a href="../filter.html">$B%U%#%k%?(B</a> $B$K$h$j<BAu$5$l$F$$$^$9!#(B
Server-side include $B$N%G%#%l%/%F%#%V$r4^$`%I%-%e%a%s%H$N3HD%;R$,(B
.shtml $B$N>l9g!"0J2<$N%G%#%l%/%F%#%V$G$O(B Apache $B$,$=$l$i$r(B
- $B%Q!<%9$7$F!"$=$N7k2L$G$-$k%I%-%e(B$B%a%s%H$K(B <code>text/html</code> $B$N(B
+ $B%Q!<%9$7$F!"$=$N7k2L$G$-$k%I%-%e%a%s%H$K(B <code>text/html</code> $B$N(B
MIME $B%?%$%W$r3d$jEv$F$^$9(B:</p>
<div class="example"><p><code>
@@ -56,7 +94,9 @@
<p>$B>\$7$$>pJs$O(B <a href="../howto/ssi.html"> Server Side
Includes $B$N%A%e!<%H%j%"%k(B</a> $B$rFI$s$G$/$@$5$$!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="basic" id="basic">$B4pK\MWAG(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="basic" id="basic">$B4pK\MWAG(B</a></h2>
<p>$B%I%-%e%a%s%H$O!"(BSGML $B$N%3%a%s%H$H$7$FFCJL$J%3%^%s%I$,Kd$a9~$^$l$?(B
HTML $B%I%-%e%a%s%H$H$7$F%Q!<%9$5$l$^$9!#%3%^%s%I$N9=J8$O<!$N$h$&$K(B
@@ -79,7 +119,7 @@
<dt><strong>config</strong></dt>
<dd>
- <p>$B$3$N%3%^%s%I$O%Q!<%9;~$N(B$B?6$kIq$$$r@)8f$7$^$9!#;XDj2DG=$JB0@-$O(B:</p>
+ <p>$B$3$N%3%^%s%I$O%Q!<%9;~$N?6$kIq$$$r@)8f$7$^$9!#;XDj2DG=$JB0@-$O(B:</p>
<dl>
<dt><strong>errmsg</strong></dt>
@@ -328,7 +368,9 @@
<p><strong>set</strong> $BMWAG$O(B Apache 1.2 $B0J9_$G$N$_;HMQ2DG=$G$9!#(B</p>
</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="includevars" id="includevars">Include $BJQ?t(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="includevars" id="includevars">Include $BJQ?t(B</a></h2>
<p>$BI8=`(B CGI $B4D6-$NJQ?t$K2C$($F!"(B<code>echo</code> $B%3%^%s%I$d!"(B
@@ -358,7 +400,9 @@
<dd>$B%f!<%6$,%j%/%(%9%H$7$?%I%-%e%a%s%H$N:G=*=$@5;~9o!#(B</dd>
</dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>$BJQ?tCV49(B</h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>$BJQ?tCV49(B</h2>
<p>$BJQ?tCV49$O$?$$$F$$$N>l9g(B SSI $B%G%#%l%/%F%#%V$N0z?t$H$7$FBEEv$J>l=j$K$"$k(B
@@ -391,14 +435,16 @@
<div class="example"><p><code>
<!--#if expr="\"$DOCUMENT_URI\" = \"/foo/file.html\"" --><br />
-   in foo<br />
+?? in foo<br />
<!--#elif expr="\"$DOCUMENT_URI\" = \"/bar/file.html\"" --><br />
-   in bar<br />
+?? in bar<br />
<!--#else --><br />
-   in neither<br />
+?? in neither<br />
<!--#endif -->
</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="flowctrl" id="flowctrl">$B%U%m!<@)8fMQMWAG(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="flowctrl" id="flowctrl">$B%U%m!<@)8fMQMWAG(B</a></h2>
<p>Apache 1.2 $B0J9_$G;HMQ$G$-$^$9!#4pK\%U%m!<@)8fMWAG$O(B:</p>
@@ -479,29 +525,37 @@
<div class="example"><pre><em>string1 string2</em> $B$O(B <em>string1 string2</em> $B$K$J$j$^$9(B</pre><pre><em>'string1 string2'</em> $B$O(B <em>string1 string2</em> $B$K$J$j$^$9(B</pre></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>ErrorDocuments $B$G(B Server Side Includes $B$r;H$&(B</h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>ErrorDocuments $B$G(B Server Side Includes $B$r;H$&(B</h2>
<p>mod_include $B$N5!G=$r;H$C$F!"9q:]2=$5$l!"%+%9%?%^%$%:$5$l$?%(%i!<(B
$B%I%-%e%a%s%H$rDs6!$9$k$?$a$NJ}K!$r@bL@$7$?(B
<a href="../misc/custom_errordocs.html">$BJ8=q(B</a>$B$,$"$j$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Server Side Includes $B$G$N(B PATH_INFO</h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Server Side Includes $B$G$N(B PATH_INFO</h2>
<p>server-side includes $B$G=hM}$5$l$k%U%!%$%k$O(B PATH_INFO
($B8e$KIU$$$?%Q%9L>$N>pJs(B) $BIU$-$N%j%/%(%9%H$r<u$1IU$1$J$/$J$j$^$7$?!#(B
PATH_INFO $B$NIU$$$?%j%/%(%9%H$r<u$1IU$1$k$h$&$K@_Dj$9$k$?$a$K!"(B<code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code> $B%G%#%l%/%F%#%V$r(B
$B;H$&$3$H$,$G$-$^$9!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>include $BMWAG$r=*N;$5$;$kJ8;zNs(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>SSIEndTag <em>tag</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>SSIEndTag "-->"</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_include</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>$B%P!<%8%g%s(B 2.0.30 $B0J9_$G;HMQ2DG=!#(B
-</td></tr></table>
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>include $BMWAG$r=*N;$5$;$kJ8;zNs(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>SSIEndTag <em>tag</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>SSIEndTag "-->"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>$B%P!<%8%g%s(B 2.0.30 $B0J9_$G;HMQ2DG=!#(B
+</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O(B mod_include $B$,C5$9!"(Binclude $BMWAG$N=*N;$r<($9(B
$BJ8;zNs$rJQ99$7$^$9!#(B</p>
@@ -510,16 +564,25 @@
SSIEndTag "%>"
</code></p></div>
-<h3>$B;2(B$B>H(B</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>SSI $B$N%(%i!<$,$"$C$?$H$-$KI=<($5$l$k%(%i!<%a%C%;!<%8(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>SSIErrorMsg <em>message</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>SSIErrorMsg
-"[an error occurred while processing this directive]"</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>All</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_include</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>$B%P!<%8%g%s(B 2.0.30 $B0J9_$G;HMQ2DG=(B</td></tr></table>
+
+<h3>$B;2>H(B</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>SSI $B$N%(%i!<$,$"$C$?$H$-$KI=<($5$l$k%(%i!<%a%C%;!<%8(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>SSIErrorMsg <em>message</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>SSIErrorMsg
+"[an error occurred while processing this directive]"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>$B%P!<%8%g%s(B 2.0.30 $B0J9_$G;HMQ2DG=(B</td></tr>
+</table>
<p>SSIErrorMsg $B%G%#%l%/%F%#%V$O(B mod_include $B$,%(%i!<$,5/$3$C$?$H$-$K(B
$BI=<($9$k%a%C%;!<%8$rJQ99$7$^$9!#%W%m%@%/%7%g%s%5!<%P$G$O(B
$B%a%C%;!<%8$,%f!<%6$KI=<($5$l$J$$$h$&$K$9$k$?$a$K(B
@@ -534,14 +597,19 @@
SSIErrorMsg "<!-- Error -->"
</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="SSIStartTag" id="SSIStartTag">SSIStartTag</a> <a name="ssistarttag" id="ssistarttag">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>include $BMWAG$r3+;O$9$kJ8;zNs(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>SSIStartTag <em>tag</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>SSIStartTag "<!--"</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_include</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>$B%P!<%8%g%s(B 2.0.30 $B0J9_$G;HMQ2DG=!#(B</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>include $BMWAG$r3+;O$9$kJ8;zNs(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>SSIStartTag <em>tag</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>SSIStartTag "<!--"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>$B%P!<%8%g%s(B 2.0.30 $B0J9_$G;HMQ2DG=!#(B</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O(B mod_include $B$,C5$9!"(Binclude $BMWAG$N3+;O$r(B
$B<($9J8;zNs$rJQ99$7$^$9!#(B</p>
@@ -564,15 +632,24 @@
<%#printenv %>
</code></p></div>
-<h3>$B;2(B$B>H(B</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$BF|IU$1$r8=$9J8;zNs$N=q<0$r@_Dj$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>SSITimeFormat <em>formatstring</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>SSITimeFormat "%A, %d-%b-%Y %H:%M:%S %Z"</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>All</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_include</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>$B%P!<%8%g%s(B 2.0.30 $B0J9_$G;HMQ2DG=!#(B</td></tr></table>
+
+<h3>$B;2>H(B</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BF|IU$1$r8=$9J8;zNs$N=q<0$r@_Dj$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>SSITimeFormat <em>formatstring</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>SSITimeFormat "%A, %d-%b-%Y %H:%M:%S %Z"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>$B%P!<%8%g%s(B 2.0.30 $B0J9_$G;HMQ2DG=!#(B</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O(B DATE $B4D6-JQ?t$r(B echo $B$7$FF|IU$r8=$9J8;zNs$,(B
$BI=<($5$l$k$H$-$N=q<0$rJQ99$7$^$9!#(B<em>formatstring</em> $B$O(B
C $BI8=`%i%$%V%i%j$N(B strftime(3) $B$HF1$87A<0$G$9!#(B</p>
@@ -588,15 +665,20 @@
<p>$B>e$N%G%#%l%/%F%#%V$G$O!"F|IU$O(B "22:26, June 14, 2002" $B$H$$$&(B
$B7A<0$GI=<($5$l$^$9!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$BL$Dj5A$NJQ?t$,(B echo $B$5$l$?$H$-$KI=<($5$l$kJ8;zNs(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>SSIUndefinedEcho <em>tag</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>SSIUndefinedEcho "(none)"</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_include</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>$B%P!<%8%g%s(B 2.0.34 $B0J9_$G;HMQ2DG=!#(B
-</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BL$Dj5A$NJQ?t$,(B echo $B$5$l$?$H$-$KI=<($5$l$kJ8;zNs(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>SSIUndefinedEcho <em>tag</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>SSIUndefinedEcho "(none)"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>$B%P!<%8%g%s(B 2.0.34 $B0J9_$G;HMQ2DG=!#(B
+</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$OJQ?t$,Dj5A$5$l$F$$$J$$$K$b4X$o$i$:(B
"echo" $B$5$l$?$H$-$K(B mod_include $B$,I=<($9$kJ8;zNs$r(B
$BJQ99$7$^$9!#(B</p>
@@ -606,15 +688,20 @@
SSIUndefinedEcho "<!-- undef -->"
</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B<B9T%S%C%H$,@_Dj$5$l$?%U%!%$%k$N(B SSI $B%G%#%l%/%F%#%V$r(B
-$B2r@O$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>XBitHack on|off|full</code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>XBitHack off</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Options</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_include</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B<B9T%S%C%H$,@_Dj$5$l$?%U%!%$%k$N(B SSI $B%G%#%l%/%F%#%V$r(B
+$B2r@O$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>XBitHack on|off|full</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>XBitHack off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Options</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_include</td></tr>
+</table>
<p>XBitHack $B%G%#%l%/%F%#%V$ODL>o$N(B HTML $B%I%-%e%a%s%H$N2r@O$r(B
$B@)8f$7$^$9!#$3$N%G%#%l%/%F%#%V$O(B MIME $B%?%$%W(B <code>text/html</code>
$B$H4XO"IU$1$i$l$F$$$k%U%!%$%k$K$N$_1F6A$7$^$9!#(BXBitHack $B$O(B
@@ -648,4 +735,10 @@
</dd>
</dl>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en
index 8a62c2d..42ac087 100644
--- a/docs/manual/mod/mod_info.html.en
+++ b/docs/manual/mod/mod_info.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_info - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_info</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Provides a comprehensive overview of the server
-configuration</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>info_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_info.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_info - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_info</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Provides a comprehensive overview of the server
+configuration</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>info_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_info.c</td></tr></table>
+<h3>Summary</h3>
+
<p>To configure <code class="module"><a href="../mod/mod_info.html">mod_info</a></code>, add the following to your
<code>httpd.conf</code> file.</p>
@@ -55,24 +72,39 @@
from it. Therefore, this module should <strong>only</strong> be
used in a controlled environment and always with caution.</p>
</div>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#addmoduleinfo">AddModuleInfo</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><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Apache 1.3 and above</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#addmoduleinfo">AddModuleInfo</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>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Apache 1.3 and above</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>
<div class="example"><p><code>
- AddModuleInfo mod_authn_file.c 'See <a \<br />
+ AddModuleInfo mod_auth.c 'See <a \<br />
<span class="indent">
- href="http://www.apache.org/docs-2.0/mod/mod_authn_file.html">\<br />
- http://www.apache.org/docs-2.0/mod/mod_authn_file.html</a>'
+ href="http://www.apache.org/docs-2.0/mod/mod_auth.html">\<br />
+ http://www.apache.org/docs-2.0/mod/mod_auth.html</a>'
</span>
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_info.html.ja.jis b/docs/manual/mod/mod_info.html.ja.jis
index 5bb4915..7e15268 100644
--- a/docs/manual/mod/mod_info.html.ja.jis
+++ b/docs/manual/mod/mod_info.html.ja.jis
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_info - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_info</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%5!<%P$N@_Dj$NJq3gE*$J354Q$rDs6!$9$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>info_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_info.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_info - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_info</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%5!<%P$N@_Dj$NJq3gE*$J354Q$rDs6!$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>info_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_info.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p><code class="module"><a href="../mod/mod_info.html">mod_info</a></code> $B$r@_Dj$9$k$K$O!"0J2<$r(B <code>httpd.conf</code>
$B%U%!%$%k$K2C$($^$9!#(B</p>
@@ -22,7 +39,7 @@
<p>$B%5!<%P@_Dj$N>pJs$X$N%"%/%;%9$r@)8B$9$k$?$a$K!"(B
<code class="directive"><a href="../mod/core.html#location"><Location></a></code>
$B%G%#%l%/%F%#%V$NCf$K(B <code class="directive"><a href="../mod/core.html#limit"><Limit></a></code>
- $B@a$rF~$l$k$H$h$$(B$B$+$b$7$l$^$;$s!#(B</p>
+ $B@a$rF~$l$k$H$h$$$+$b$7$l$^$;$s!#(B</p>
<p>$B0lC6@_Dj$9$k$H!"(B<code>http://your.host.dom/server-info</code>
$B$r%"%/%;%9$9$k$3$H$G%5!<%P$N>pJs$rF@$i$l$k$h$&$K$J$j$^$9!#(B</p>
@@ -32,7 +49,7 @@
$B%5!<%P$N@_Dj%U%!%$%k$,:G8e$K%5!<%P$KFI$_9~$^$l$?8e$KJQ99$5$l$F$$$k(B
$B>l9g$K$O!"I=<($5$l$F$$$kFbMF$O<B9T$5$l$F$$$k%5!<%P$N@_Dj$rH?1G$7$F(B
<em>$B$$$J$$(B</em>$B$+$b$7$l$J$$$3$H$KCm0U$7$F$/$@$5$$!#(B
- $B$^$?!"@_Dj%U%!%$%k$O%5!<%P$,(B$B<B9T$5$l$F$$$k%f!<%6$N8"8B$G(B
+ $B$^$?!"@_Dj%U%!%$%k$O%5!<%P$,<B9T$5$l$F$$$k%f!<%6$N8"8B$G(B
$BFI$_9~$_5v2D$,M?$($i$l$F$$$kI,MW$,$"$j$^$9(B
(<code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>
$B%G%#%l%/%F%#%V$r;2>H$7$F$/$@$5$$(B)$B!#(B
@@ -52,15 +69,24 @@
$B$G$9$+$i!"$3$N%b%8%e!<%k$O$A$c$s$H%"%/%;%9$,@)8f$5$l$?4D6-$G!"(B
$BCm0U$7$F;H$C$F$/$@$5$$!#(B</p>
</div>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#addmoduleinfo">AddModuleInfo</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>server-info $B%O%s%I%i$K$h$jI=<($5$l$k%b%8%e!<%k$N>pJs$K(B
-$BDI2C$N>pJs$rIU$12C$($k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddModuleInfo <em>module-name string</em></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_info</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 1.3 $B0J9_(B</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#addmoduleinfo">AddModuleInfo</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>server-info $B%O%s%I%i$K$h$jI=<($5$l$k%b%8%e!<%k$N>pJs$K(B
+$BDI2C$N>pJs$rIU$12C$($k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddModuleInfo <em>module-name string</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_info</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>Apache 1.3 $B0J9_(B</td></tr>
+</table>
<p>$B$3$l$O!"(B<em>string</em> $B$NFbMF$,%b%8%e!<%k(B <em>module-name</em>
$B$N(B<strong>$BDI2C>pJs(B</strong> $B$H$7$F(B HTML
$B$H$7$F2r<a$5$l!"I=<($5$l$k$h$&$K$7$^$9!#Nc(B:</p>
@@ -72,4 +98,10 @@
http://www.apache.org/docs-2.0/mod/mod_authn_file.html</a>'
</span>
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml
index be76579..630b5cd 100644
--- a/docs/manual/mod/mod_info.xml
+++ b/docs/manual/mod/mod_info.xml
@@ -73,10 +73,10 @@
the module <var>module-name</var>. Example:</p>
<example>
- AddModuleInfo mod_authn_file.c 'See <a \<br />
+ AddModuleInfo mod_auth.c 'See <a \<br />
<indent>
- href="http://www.apache.org/docs-2.0/mod/mod_authn_file.html">\<br />
- http://www.apache.org/docs-2.0/mod/mod_authn_file.html</a>'
+ href="http://www.apache.org/docs-2.0/mod/mod_auth.html">\<br />
+ http://www.apache.org/docs-2.0/mod/mod_auth.html</a>'
</indent>
</example>
</usage>
diff --git a/docs/manual/mod/mod_isapi.html.en b/docs/manual/mod/mod_isapi.html.en
index 91a88d0..57881db 100644
--- a/docs/manual/mod/mod_isapi.html.en
+++ b/docs/manual/mod/mod_isapi.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_isapi - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_isapi</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>ISAPI Extensions within Apache for Windows</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>isapi_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_isapi.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Win32 only</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_isapi - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_isapi</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>ISAPI Extensions within Apache for Windows</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>isapi_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_isapi.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Win32 only</td></tr></table>
+<h3>Summary</h3>
+
<p>This module implements the Internet Server extension API. It
allows Internet Server extensions (<em>e.g.</em> ISAPI .dll
modules) to be served by Apache for Windows, subject to the
@@ -21,13 +38,25 @@
directly if you are experiencing problems running their ISAPI
extension. <strong>Please <em>do not</em> post such problems to
Apache's lists or bug reporting pages.</strong></p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#isapiappendlogtoerrors">ISAPIAppendLogToErrors</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#isapiappendlogtoerrors">ISAPIAppendLogToErrors</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#isapiappendlogtoquery">ISAPIAppendLogToQuery</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#isapicachefile">ISAPICacheFile</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#isapifakeasync">ISAPIFakeAsync</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#isapilognotsupported">ISAPILogNotSupported</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#isapireadaheadbuffer">ISAPIReadAheadBuffer</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#usage">Usage</a></li><li><img alt="" src="../images/down.gif" /> <a href="#notes">Additional Notes</a></li><li><img alt="" src="../images/down.gif" /> <a href="#journal">Programmer's Journal</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="usage" id="usage">Usage</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#usage">Usage</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#notes">Additional Notes</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#journal">Programmer's Journal</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="usage" id="usage">Usage</a></h2>
<p>In the server configuration file, use
the <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> directive to
@@ -55,7 +84,9 @@
<p>Review the <a href="#notes">Additional Notes</a> and the <a href="#journal">Programmer's Journal</a> for additional details
and clarification of the specific ISAPI support offered by
<code class="module"><a href="../mod/mod_isapi.html">mod_isapi</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="notes" id="notes">Additional Notes</a></h2>
+</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">Additional Notes</a></h2>
<p>Apache's ISAPI implementation conforms to all of the ISAPI
2.0 specification, except for some "Microsoft-specific"
@@ -81,7 +112,9 @@
it <strong>does not support ISAPI Filters</strong>. Support for
filters may be added at a later date, but no support is planned
at this time.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="journal" id="journal">Programmer's Journal</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="journal" id="journal">Programmer's Journal</a></h2>
<p>If you are programming Apache 2.0 <code class="module"><a href="../mod/mod_isapi.html">mod_isapi</a></code>
modules, you must limit your calls to <code>ServerSupportFunction</code>
@@ -186,77 +219,112 @@
<code>TransmitFile</code> semantics. Apache also supports preloading
ISAPI .dlls for performance, neither of which were not available under
Apache 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">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Record HSE_APPEND_LOG_PARAMETER 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>
+</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 HSE_APPEND_LOG_PARAMETER 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 HSE_APPEND_LOG_PARAMETER 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>
+
+</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 HSE_APPEND_LOG_PARAMETER 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>
+
+</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>
+
+</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>
+
+</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>
+
+</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 id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en
index 79955d2..f95b9ed 100644
--- a/docs/manual/mod/mod_ldap.html.en
+++ b/docs/manual/mod/mod_ldap.html.en
@@ -4,13 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_ldap - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_ldap</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>LDAP connection pooling and result caching services for use
-by other LDAP modules</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>ldap_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>util_ldap.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0.41 and later</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_ldap - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_ldap</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>LDAP connection pooling and result caching services for use
+by other LDAP modules</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>ldap_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>util_ldap.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0.41 and later</td></tr></table>
+<h3>Summary</h3>
+
<p>This module was created to improve the performance of
websites relying on backend connections to LDAP servers. In
addition to the functions provided by the standard LDAP
@@ -21,13 +38,25 @@
apr-util. This is achieved by adding the <code>--with-ldap</code>
flag to the <code>./configure</code> script when building
Apache.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#ldapcacheentries">LDAPCacheEntries</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#ldapcacheentries">LDAPCacheEntries</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ldapcachettl">LDAPCacheTTL</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ldapcertdbpath">LDAPCertDBPath</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ldapopcacheentries">LDAPOpCacheEntries</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ldapopcachettl">LDAPOpCacheTTL</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ldapsharedcachesize">LDAPSharedCacheSize</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#exampleconfig">Example Configuration</a></li><li><img alt="" src="../images/down.gif" /> <a href="#pool">LDAP Connection Pool</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cache">LDAP Cache</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>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#exampleconfig">Example Configuration</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#pool">LDAP Connection Pool</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cache">LDAP Cache</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_auth_ldap.html">mod_auth_ldap</a></code>.</p>
@@ -58,7 +87,9 @@
</span>
</Location>
</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="pool" id="pool">LDAP Connection Pool</a></h2>
+</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
@@ -75,7 +106,9 @@
<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>
-</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>
+</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
@@ -151,33 +184,47 @@
information each time, depending on which <code>httpd</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="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 entires in the primary LDAP cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LDAPCacheEntries <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LDAPCacheEntries 1024</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_ldap</td></tr></table>
+</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 entires in the primary LDAP cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LDAPCacheEntries <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LDAPCacheEntries 1024</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_ldap</td></tr>
+</table>
<p>Specifies the maximum size of the primary LDAP cache. This
cache contains successful search/binds. Set it to 0 to turn off
search/bind caching. The default size is 1024 cached
searches.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="LDAPCacheTTL" id="LDAPCacheTTL">LDAPCacheTTL</a> <a name="ldapcachettl" id="ldapcachettl">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Time that cached items remain valid</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LDAPCacheTTL <var>seconds</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LDAPCacheTTL 600</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_ldap</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LDAPCacheTTL" id="LDAPCacheTTL">LDAPCacheTTL</a> <a name="ldapcachettl" id="ldapcachettl">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Time that cached items remain valid</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LDAPCacheTTL <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LDAPCacheTTL 600</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_ldap</td></tr>
+</table>
<p>Specifies the time (in seconds) that an item in the
search/bind cache remains valid. The default is 600 seconds (10
minutes).</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="LDAPCertDBPath" id="LDAPCertDBPath">LDAPCertDBPath</a> <a name="ldapcertdbpath" id="ldapcertdbpath">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Directory containing certificates for SSL support</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LDAPCertDBPath <var>directory-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_ldap</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LDAPCertDBPath" id="LDAPCertDBPath">LDAPCertDBPath</a> <a name="ldapcertdbpath" id="ldapcertdbpath">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directory containing certificates for SSL support</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LDAPCertDBPath <var>directory-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_ldap</td></tr>
+</table>
<p>This directive is only valid if Apache has been linked
against the Netscape/iPlanet Directory SDK.</p>
@@ -185,34 +232,55 @@
should look for the certificate authorities database for SSL
support. There should be a file named <code>cert7.db</code> in that
directory.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="LDAPOpCacheEntries" id="LDAPOpCacheEntries">LDAPOpCacheEntries</a> <a name="ldapopcacheentries" id="ldapopcacheentries">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Number of entries used to cache LDAP compare
-operations</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LDAPOpCacheEntries <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LDAPOpCacheEntries 1024</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_ldap</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LDAPOpCacheEntries" id="LDAPOpCacheEntries">LDAPOpCacheEntries</a> <a name="ldapopcacheentries" id="ldapopcacheentries">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Number of entries used to cache LDAP compare
+operations</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LDAPOpCacheEntries <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LDAPOpCacheEntries 1024</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_ldap</td></tr>
+</table>
<p>This specifies the number of entries <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code>
will use to cache LDAP compare operations. The default is 1024
entries. Setting it to 0 disables operation caching.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="LDAPOpCacheTTL" id="LDAPOpCacheTTL">LDAPOpCacheTTL</a> <a name="ldapopcachettl" id="ldapopcachettl">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Time that entries in the operation cache remain
-valid</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LDAPOpCacheTTL <var>seconds</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LDAPOpCacheTTL 600</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_ldap</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LDAPOpCacheTTL" id="LDAPOpCacheTTL">LDAPOpCacheTTL</a> <a name="ldapopcachettl" id="ldapopcachettl">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Time that entries in the operation cache remain
+valid</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LDAPOpCacheTTL <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LDAPOpCacheTTL 600</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_ldap</td></tr>
+</table>
<p>Specifies the time (in seconds) that entries in the
operation cache remain valid. The default is 600 seconds.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="LDAPSharedCacheSize" id="LDAPSharedCacheSize">LDAPSharedCacheSize</a> <a name="ldapsharedcachesize" id="ldapsharedcachesize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Size in bytes of the shared-memory cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LDAPSharedCacheSize <var>bytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LDAPSharedCacheSize 102400</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_ldap</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LDAPSharedCacheSize" id="LDAPSharedCacheSize">LDAPSharedCacheSize</a> <a name="ldapsharedcachesize" id="ldapsharedcachesize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Size in bytes of the shared-memory cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LDAPSharedCacheSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LDAPSharedCacheSize 102400</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_ldap</td></tr>
+</table>
<p>Specifies the number of bytes to specify for the shared
memory cache. The default is 100kb.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
index 587cffa..a3b8b1d 100644
--- a/docs/manual/mod/mod_log_config.html.en
+++ b/docs/manual/mod/mod_log_config.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_log_config - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_log_config</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Logging of the requests made to the server</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>log_config_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_log_config.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_log_config - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_log_config</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Logging of the requests made to the server</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>log_config_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_log_config.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module provides for flexible logging of client
requests. Logs are written in a customizable format, and may be
written directly to a file, or to an external program.
@@ -22,11 +39,25 @@
to set a custom format, and <code class="directive"><a href="#customlog">CustomLog</a></code> to define a log file and format in one
step. The <code class="directive">TransferLog</code> and <code class="directive">CustomLog</code> directives can be used multiple times in each
server to cause each request to be logged to multiple files.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cookielog">CookieLog</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cookielog">CookieLog</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#customlog">CustomLog</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#logformat">LogFormat</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#transferlog">TransferLog</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#formats">Custom Log Formats</a></li><li><img alt="" src="../images/down.gif" /> <a href="#security">Security Considerations</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../logs.html">Apache Log Files</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">Custom Log Formats</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#formats">Custom Log Formats</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#security">Security Considerations</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><a href="../logs.html">Apache Log Files</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">Custom Log Formats</a></h2>
<p>The format argument to the <code class="directive"><a href="#logformat">LogFormat</a></code> and <code class="directive"><a href="#customlog">CustomLog</a></code> directives is a string. This string is
logged to the log file for each request. It can contain literal
@@ -41,74 +72,76 @@
<table class="bordered"><tr class="header"><th>Format String</th>
<th>Description</th></tr>
-<tr><td><code>%...a</code></td>
+<tr><td><code>%%</code></td>
+ <td>The percent sign (<em>Apache 2.0.44 and later</em>)</td></tr>
+<tr class="odd"><td><code>%...a</code></td>
<td>Remote IP-address</td></tr>
-<tr class="odd"><td><code>%...A</code></td>
+<tr><td><code>%...A</code></td>
<td>Local IP-address</td></tr>
-<tr><td><code>%...B</code></td>
+<tr class="odd"><td><code>%...B</code></td>
<td>Bytes sent, excluding HTTP headers.</td></tr>
-<tr class="odd"><td><code>%...b</code></td>
+<tr><td><code>%...b</code></td>
<td>Bytes sent, excluding HTTP headers. In CLF format, <em>i.e.</em>
a '<code>-</code>' rather than a 0 when no bytes are sent.</td></tr>
-<tr><td><code>%...{<var>Foobar</var>}C</code></td>
+<tr class="odd"><td><code>%...{<var>Foobar</var>}C</code></td>
<td>The contents of cookie <var>Foobar</var> in the request sent
to the server.</td></tr>
-<tr class="odd"><td><code>%...D</code></td>
+<tr><td><code>%...D</code></td>
<td>The time taken to serve the request, in microseconds.</td></tr>
-<tr><td><code>%...{<var>FOOBAR</var>}e</code></td>
+<tr class="odd"><td><code>%...{<var>FOOBAR</var>}e</code></td>
<td>The contents of the environment variable
<var>FOOBAR</var></td></tr>
-<tr class="odd"><td><code>%...f</code></td>
+<tr><td><code>%...f</code></td>
<td>Filename</td></tr>
-<tr><td><code>%...h</code></td>
+<tr class="odd"><td><code>%...h</code></td>
<td>Remote host</td></tr>
-<tr class="odd"><td><code>%...H</code></td>
+<tr><td><code>%...H</code></td>
<td>The request protocol</td></tr>
-<tr><td><code>%...{<var>Foobar</var>}i</code></td>
+<tr class="odd"><td><code>%...{<var>Foobar</var>}i</code></td>
<td>The contents of <code><var>Foobar</var>:</code> header line(s)
in the request sent to the server.</td></tr>
-<tr class="odd"><td><code>%...l</code></td>
+<tr><td><code>%...l</code></td>
<td>Remote logname (from identd, if supplied)</td></tr>
-<tr><td><code>%...m</code></td>
+<tr class="odd"><td><code>%...m</code></td>
<td>The request method</td></tr>
-<tr class="odd"><td><code>%...{<var>Foobar</var>}n</code></td>
+<tr><td><code>%...{<var>Foobar</var>}n</code></td>
<td>The contents of note <var>Foobar</var> from another
module.</td></tr>
-<tr><td><code>%...{<var>Foobar</var>}o</code></td>
+<tr class="odd"><td><code>%...{<var>Foobar</var>}o</code></td>
<td>The contents of <code><var>Foobar</var>:</code> header line(s)
in the reply.</td></tr>
-<tr class="odd"><td><code>%...p</code></td>
+<tr><td><code>%...p</code></td>
<td>The canonical port of the server serving the request</td></tr>
-<tr><td><code>%...P</code></td>
+<tr class="odd"><td><code>%...P</code></td>
<td>The process ID of the child that serviced the request.</td></tr>
-<tr class="odd"><td><code>%...q</code></td>
+<tr><td><code>%...q</code></td>
<td>The query string (prepended with a <code>?</code> if a query
string exists, otherwise an empty string)</td></tr>
-<tr><td><code>%...r</code></td>
+<tr class="odd"><td><code>%...r</code></td>
<td>First line of request</td></tr>
-<tr class="odd"><td><code>%...s</code></td>
+<tr><td><code>%...s</code></td>
<td>Status. For requests that got internally redirected, this is
the status of the *original* request --- <code>%...>s</code>
for the last.</td></tr>
-<tr><td><code>%...t</code></td>
+<tr class="odd"><td><code>%...t</code></td>
<td>Time, in common log format time format (standard english
format)</td></tr>
-<tr class="odd"><td><code>%...{<var>format</var>}t</code></td>
+<tr><td><code>%...{<var>format</var>}t</code></td>
<td>The time, in the form given by format, which should be in
<code>strftime(3)</code> format. (potentially localized)</td></tr>
-<tr><td><code>%...T</code></td>
+<tr class="odd"><td><code>%...T</code></td>
<td>The time taken to serve the request, in seconds.</td></tr>
-<tr class="odd"><td><code>%...u</code></td>
+<tr><td><code>%...u</code></td>
<td>Remote user (from auth; may be bogus if return status
(<code>%s</code>) is 401)</td></tr>
-<tr><td><code>%...U</code></td>
+<tr class="odd"><td><code>%...U</code></td>
<td>The URL path requested, not including any query string.</td></tr>
-<tr class="odd"><td><code>%...v</code></td>
+<tr><td><code>%...v</code></td>
<td>The canonical <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>
of the server serving the request.</td></tr>
-<tr><td><code>%...V</code></td>
+<tr class="odd"><td><code>%...V</code></td>
<td>The server name according to the <code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code> setting.</td></tr>
-<tr class="odd"><td><code>%...X</code></td>
+<tr><td><code>%...X</code></td>
<td>Connection status when response is completed:
<table>
@@ -125,10 +158,10 @@
<p>(This directive was <code>%...c</code> in late versions of Apache
1.3, but this conflicted with the historical ssl
<code>%...{<var>var</var>}c</code> syntax.)</p></td></tr>
-<tr><td><code>%...I</code></td>
+<tr class="odd"><td><code>%...I</code></td>
<td>Bytes received, including request and headers, cannot be zero.
You need to enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>
-<tr class="odd"><td><code>%...O</code></td>
+<tr><td><code>%...O</code></td>
<td>Bytes sent, including headers, cannot be zero. You need to
enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>
</table>
@@ -175,31 +208,42 @@
because otherwise log analysis programs would have to duplicate
the entire vhost matching algorithm in order to decide what
host really served 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="security" id="security">Security Considerations</a></h2>
+</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>See the <a href="../misc/security_tips.html#serverroot">security tips</a>
document for details on why your security could be compromised
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="CookieLog" id="CookieLog">CookieLog</a> <a name="cookielog" id="cookielog">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets filename for the logging of cookies</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CookieLog <var>filename</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><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>This directive is deprecated.</td></tr></table>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CookieLog" id="CookieLog">CookieLog</a> <a name="cookielog" id="cookielog">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets filename for the logging of cookies</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CookieLog <var>filename</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>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>This directive is deprecated.</td></tr>
+</table>
<p>The <code class="directive">CookieLog</code> directive sets the
filename for logging of cookies. The filename is relative to the
<code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. This directive is
included only for compatibility with <code>mod_cookies</code>,
and is deprecated.</p>
-</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>
+
+</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>]</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>
+[env=[!]<var>environment-variable</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
@@ -263,14 +307,19 @@
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">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\" %>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>
+
+</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\" %>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>
@@ -303,12 +352,17 @@
<div class="example"><h3>Example</h3><p><code>
LogFormat "%v %h %l %u %t \"%r\" %>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">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Specifly 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>
+
+</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>Specifly 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
@@ -322,4 +376,10 @@
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""<br />
TransferLog logs/access_log
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_log_config.xml b/docs/manual/mod/mod_log_config.xml
index dbcc2e8..59d0f39 100644
--- a/docs/manual/mod/mod_log_config.xml
+++ b/docs/manual/mod/mod_log_config.xml
@@ -47,6 +47,9 @@
<tr><th>Format String</th>
<th>Description</th></tr>
+ <tr><td><code>%%</code></td>
+ <td>The percent sign (<em>Apache 2.0.44 and later</em>)</td></tr>
+
<tr><td><code>%...a</code></td>
<td>Remote IP-address</td></tr>
diff --git a/docs/manual/mod/mod_logio.html.en b/docs/manual/mod/mod_logio.html.en
index bd9e147..465fb04 100644
--- a/docs/manual/mod/mod_logio.html.en
+++ b/docs/manual/mod/mod_logio.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_logio - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_logio</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Logging of input and output bytes per request</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>logio_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_logio.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_logio - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_logio</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Logging of input and output bytes per request</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>logio_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_logio.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module provides the logging of input and output number of
bytes received/sent per request. The numbers reflect the actual bytes
@@ -19,7 +36,20 @@
<p>This module requires <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><p>This module provides no directives.</p><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#formats">Custom Log Formats</a></li></ul><h3>See also</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li><li><a href="../logs.html">Apache Log Files</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">Custom Log Formats</a></h2>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<p>This module provides no directives.</p>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#formats">Custom Log Formats</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
+<li><a href="../logs.html">Apache Log Files</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">Custom Log Formats</a></h2>
<p>This modules adds two new logging directives. The characteristics of the
@@ -43,4 +73,9 @@
<dd><code>"%h %l %u %t \"%r\" %>s %b \"%{Referer}i\"
\"%{User-agent}i\" %I %O"</code></dd>
</dl>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mem_cache.html.en b/docs/manual/mod/mod_mem_cache.html.en
index b02b012..6db841e 100644
--- a/docs/manual/mod/mod_mem_cache.html.en
+++ b/docs/manual/mod/mod_mem_cache.html.en
@@ -4,130 +4,229 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_mem_cache - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_mem_cache</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Content cache keyed to URIs</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>mem_cache_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_mem_cache.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_mem_cache - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_mem_cache</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Content cache keyed to URIs</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mem_cache_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_mem_cache.c</td></tr></table>
+<h3>Summary</h3>
-<div class="warning">
-This module is experimental. Documentation is still under development...
-</div>
- <p><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> implements a memory based storage manager.
- <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> can be configured to operate in two modes:
- caching open file descriptors or caching objects in heap storage.
- <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> is most useful when used to cache locally
- generated content or to cache backend server content for
- <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> configured for
- <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> (aka <dfn>reverse proxy</dfn>)</p>
-
- <p>Content is stored in and retrieved from the cache using URI based keys. Content with
- access protection is not cached.</p>
-
- <div class="note"><h3>Note:</h3>
- <p><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> requires the services of <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
+ <div class="warning">
+ This module is experimental. Documentation is still under
+ development...
</div>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#mcachemaxobjectcount">MCacheMaxObjectCount</a></li>
+
+ <p>This module <em>requires</em> the service of <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>. It acts as a support module for <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> and provides a memory based storage manager.
+ <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> can be configured to operate in two
+ modes: caching open file descriptors or caching objects in heap storage.
+ <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> is most useful when used to cache locally
+ generated content or to cache backend server content for <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> configured for <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> (aka <dfn>reverse proxy</dfn>).</p>
+
+ <p>Content is stored in and retrieved from the cache using URI based
+ keys. Content with access protection is not cached.</p>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#mcachemaxobjectcount">MCacheMaxObjectCount</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#mcachemaxobjectsize">MCacheMaxObjectSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#mcacheminobjectsize">MCacheMinObjectSize</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#mcachesize">MCacheSize</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="MCacheMaxObjectCount" id="MCacheMaxObjectCount">MCacheMaxObjectCount</a> <a name="mcachemaxobjectcount" id="mcachemaxobjectcount">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The maximum number of objects allowed to be placed in the cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MCacheMaxObjectCount <var>value</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MCacheMaxObjectCount 1009</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_mem_cache</td></tr></table>
- <p>The <code class="directive">MCacheMaxObjectCount</code> directive sets the maximum
- number of objects to be cached. If a new object needs to be inserted in the cache
- and the maximum number of objects has been reached, an object will be removed
- to allow the new object to be cached. The object to be removed is selected using
- the algorithm specified by <code class="directive">MCacheRemovalAlgorithm</code>.</p>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code></li>
+<li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</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="MCacheMaxObjectCount" id="MCacheMaxObjectCount">MCacheMaxObjectCount</a> <a name="mcachemaxobjectcount" id="mcachemaxobjectcount">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum number of objects allowed to be placed in the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MCacheMaxObjectCount <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MCacheMaxObjectCount 1009</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_mem_cache</td></tr>
+</table>
+ <p>The <code class="directive">MCacheMaxObjectCount</code> directive sets the
+ maximum number of objects to be cached. The value is used to create the
+ open hash table. If a new object needs to be inserted in the cache and
+ the maximum number of objects has been reached, an object will be
+ removed to allow the new object to be cached. The object to be removed
+ is selected using the algorithm specified by <code class="directive"><a href="#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code>.</p>
+
+ <div class="example"><h3>Example</h3><p><code>
+ MCacheMaxObjectCount 13001
+ </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="MCacheMaxObjectSize" id="MCacheMaxObjectSize">MCacheMaxObjectSize</a> <a name="mcachemaxobjectsize" id="mcachemaxobjectsize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum size (in bytes) of a document allowed in the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MCacheMaxObjectSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MCacheMaxObjectSize 10000</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_mem_cache</td></tr>
+</table>
+ <p>The <code class="directive">MCacheMaxObjectSize</code> directive sets the
+ maximum allowable size, in bytes, of a document for it to be considered
+ cacheable.</p>
+
+ <div class="example"><h3>Example</h3><p><code>
+ MCacheMaxObjectSize 6400000
+ </code></p></div>
+
+ <div class="note"><h3>Note</h3>
+ <p>The value of <code class="directive">MCacheMaxObjectSize</code> must be
+ greater than the value specified by the <code class="directive"><a href="#mcacheminobjectsize">MCacheMinObjectSize</a></code> directive.</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="MCacheMaxStreamingBuffer" id="MCacheMaxStreamingBuffer">MCacheMaxStreamingBuffer</a> <a name="mcachemaxstreamingbuffer" id="mcachemaxstreamingbuffer">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum amount of a streamed response to buffer in memory
+before declaring the response uncacheable</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MCacheMaxStreamingBuffer <var>size_in_bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MCacheMaxStreamingBuffer the smaller of 100000 or MCacheMaxObjectSize</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_mem_cache</td></tr>
+</table>
+ <p>The <code class="directive">MCacheMaxStreamingBuffer</code> directive
+ specifies the maximum number of bytes of a streamed response to
+ buffer before deciding that the response is too big to cache.
+ A streamed response is one in which the entire content is not
+ immediately available and in which the <code>Content-Length</code>
+ may not be known. Sources of streaming responses include proxied
+ responses and the output of CGI scripts. By default, a streamed
+ response will <em>not</em> be cached unless it has a
+ <code>Content-Length</code> header. The reason for this is to
+ avoid using a large amount of memory to buffer a partial response
+ that might end up being too large to fit in the cache.
+ The <code class="directive">MCacheMaxStreamingBuffer</code> directive allows
+ buffering of streamed responses that don't contain a
+ <code>Content-Length</code> up to the specified maximum amount of
+ space. If the maximum buffer space is reached, the buffered
+ content is discarded and the attempt to cache is abandoned.</p>
<div class="note"><h3>Note:</h3>
- The value of <code class="directive">MCacheMaxObjectCount</code> is used to create
- the open hash table.
+ <p>Using a nonzero value for <code class="directive">MCacheMaxStreamingBuffer</code>
+ will not delay the transmission of the response to the client.
+ As soon as <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> copies a block of streamed
+ content into a buffer, it sends the block on to the next output
+ filter for delivery to the client.</p>
</div>
<div class="example"><p><code>
- MCacheMaxObjectCount 13001<br />
+ # Enable caching of streamed responses up to 64KB:<br />
+ MCacheMaxStreamingBuffer 65536
</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="MCacheMaxObjectSize" id="MCacheMaxObjectSize">MCacheMaxObjectSize</a> <a name="mcachemaxobjectsize" id="mcachemaxobjectsize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The maximum size (in bytes) of a document allowed in the
-cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MCacheMaxObjectSize <var>bytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MCacheMaxObjectSize 10000</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_mem_cache</td></tr></table>
- <p>The <code class="directive">MCacheMaxObjectSize</code> directive sets the maximum
- allowable size, in bytes, of a document for it to be considered cacheable.</p>
- <div class="warning"><h3>Note:</h3>
- The value of <code class="directive">MCacheMaxObjectSize</code> must be greater
- than the value specified by the <code class="directive">MCacheMinObjectSize</code>
- directive.
- </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="MCacheMinObjectSize" id="MCacheMinObjectSize">MCacheMinObjectSize</a> <a name="mcacheminobjectsize" id="mcacheminobjectsize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The minimum size (in bytes) of a document to be allowed in the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MCacheMinObjectSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MCacheMinObjectSize 0</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_mem_cache</td></tr>
+</table>
+ <p>The <code class="directive">MCacheMinObjectSize</code> directive sets the
+ minimum size in bytes of a document for it to be considered
+ cacheable.</p>
- <div class="example"><p><code>
- MCacheMaxObjectSize 6400000<br />
+ <div class="example"><h3>Example</h3><p><code>
+ MCacheMinObjectSize 10000
</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="MCacheMinObjectSize" id="MCacheMinObjectSize">MCacheMinObjectSize</a> <a name="mcacheminobjectsize" id="mcacheminobjectsize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The minimum size (in bytes) of a document to be allowed in the
-cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MCacheMinObjectSize <var>bytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MCacheMinObjectSize 0</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_mem_cache</td></tr></table>
- <p>The <code class="directive">MCacheMinObjectSize</code> directive sets the minimum
- size in bytes of a document for it to be considered cacheable.</p>
- <div class="example"><p><code>
- MCacheMinObjectSize 10000<br />
- </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="MCacheRemovalAlgorithm" id="MCacheRemovalAlgorithm">MCacheRemovalAlgorithm</a> <a name="mcacheremovalalgorithm" id="mcacheremovalalgorithm">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The algorithm used to select documents for removal from the
-cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MCacheRemovalAlgorithm <code>LRU|GDSF</code></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MCacheRemovalAlgorithm GDSF</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_mem_cache</td></tr></table>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MCacheRemovalAlgorithm" id="MCacheRemovalAlgorithm">MCacheRemovalAlgorithm</a> <a name="mcacheremovalalgorithm" id="mcacheremovalalgorithm">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The algorithm used to select documents for removal from the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MCacheRemovalAlgorithm LRU|GDSF</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MCacheRemovalAlgorithm GDSF</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_mem_cache</td></tr>
+</table>
<p>The <code class="directive">MCacheRemovalAlgorithm</code> directive specifies
the algorithm used to select documents for removal from the cache.
- Two choices are available:<br />
- <code>LRU</code> (Least Recently Used): <code>LRU</code> removes the
- documents that have not been accessed for the longest time.<br />
- <code>GDSF</code> (GreadyDual-Size): <code>GDSF</code> assigns a priority
- to cached documents based on the cost of a cache miss and the size of
- the document. Documents with the lowest priority are removed first.</p>
+ Two choices are available:</p>
- <div class="example"><p><code>
- MCacheRemovalAlgorithm GDSF<br />
- MCacheRemovalAlgorithm LRU<br />
+ <dl>
+ <dt><code>LRU</code> (Least Recently Used)</dt>
+ <dd><code>LRU</code> removes the documents that have not been accessed
+ for the longest time.</dd>
+
+ <dt><code>GDSF</code> (GreadyDual-Size)</dt>
+ <dd><code>GDSF</code> assigns a priority to cached documents based
+ on the cost of a cache miss and the size of the document. Documents
+ with the lowest priority are removed first.</dd>
+ </dl>
+
+ <div class="example"><h3>Example</h3><p><code>
+ MCacheRemovalAlgorithm GDSF<br />
+ MCacheRemovalAlgorithm LRU
</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="MCacheSize" id="MCacheSize">MCacheSize</a> <a name="mcachesize" id="mcachesize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The maximum amount of memory used by the cache in KBytes</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MCacheSize <var>KBytes</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MCacheSize 100</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>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_mem_cache</td></tr></table>
- <p>The <code class="directive">MCacheSize</code> directive sets the maximum amount of memory
- to be used by the cache, in KBytes (1024-byte units). If a new object needs to be
- inserted in the cache and the size of the object is greater than the
- remaining memory, objects will be removed until the new object can be cached.
- The object to be removed is selected using the algorithm specified by
- <code class="directive">MCacheRemovalAlgorithm</code>.</p>
- <div class="warning"><h3>Note:</h3>
- The <code class="directive">MCacheSize</code> value must be greater than the value
- specified by the <code class="directive">MCacheMaxObjectSize</code> directive.
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MCacheSize" id="MCacheSize">MCacheSize</a> <a name="mcachesize" id="mcachesize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum amount of memory used by the cache in
+KBytes</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MCacheSize <var>KBytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MCacheSize 100</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_mem_cache</td></tr>
+</table>
+ <p>The <code class="directive">MCacheSize</code> directive sets the maximum
+ amount of memory to be used by the cache, in KBytes (1024-byte units).
+ If a new object needs to be inserted in the cache and the size of the
+ object is greater than the remaining memory, objects will be removed
+ until the new object can be cached. The object to be removed is
+ selected using the algorithm specified by <code class="directive"><a href="#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code>.</p>
+
+ <div class="example"><h3>Example</h3><p><code>
+ MCacheSize 700000
+ </code></p></div>
+
+ <div class="note"><h3>Note</h3>
+ <p>The <code class="directive">MCacheSize</code> value must be greater than
+ the value specified by the <code class="directive"><a href="#mcachemaxobjectsize">MCacheMaxObjectSize</a></code> directive.</p>
</div>
- <div class="example"><p><code>
- MCacheSize 700000<br />
- </code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mem_cache.xml b/docs/manual/mod/mod_mem_cache.xml
index 1025b75..0405274 100644
--- a/docs/manual/mod/mod_mem_cache.xml
+++ b/docs/manual/mod/mod_mem_cache.xml
@@ -10,75 +10,75 @@
<identifier>mem_cache_module</identifier>
<summary>
-
-<note type="warning">
-This module is experimental. Documentation is still under development...
-</note>
- <p><module>mod_mem_cache</module> implements a memory based storage manager.
- <module>mod_mem_cache</module> can be configured to operate in two modes:
- caching open file descriptors or caching objects in heap storage.
- <module>mod_mem_cache</module> is most useful when used to cache locally
- generated content or to cache backend server content for
- <module>mod_proxy</module> configured for
- <directive module="mod_proxy">ProxyPass</directive> (aka <dfn>reverse proxy</dfn>)</p>
-
- <p>Content is stored in and retrieved from the cache using URI based keys. Content with
- access protection is not cached.</p>
-
- <note><title>Note:</title>
- <p><module>mod_mem_cache</module> requires the services of <module>mod_cache</module>.</p>
+ <note type="warning">
+ This module is experimental. Documentation is still under
+ development...
</note>
+
+ <p>This module <em>requires</em> the service of <module
+ >mod_cache</module>. It acts as a support module for <module
+ >mod_cache</module> and provides a memory based storage manager.
+ <module>mod_mem_cache</module> can be configured to operate in two
+ modes: caching open file descriptors or caching objects in heap storage.
+ <module>mod_mem_cache</module> is most useful when used to cache locally
+ generated content or to cache backend server content for <module
+ >mod_proxy</module> configured for <directive module="mod_proxy"
+ >ProxyPass</directive> (aka <dfn>reverse proxy</dfn>).</p>
+
+ <p>Content is stored in and retrieved from the cache using URI based
+ keys. Content with access protection is not cached.</p>
</summary>
+<seealso><module>mod_cache</module></seealso>
+<seealso><module>mod_disk_cache</module></seealso>
<directivesynopsis>
<name>MCacheSize</name>
-<description>The maximum amount of memory used by the cache in KBytes</description>
+<description>The maximum amount of memory used by the cache in
+KBytes</description>
<syntax>MCacheSize <var>KBytes</var></syntax>
<default>MCacheSize 100</default>
-<contextlist><context>server config</context><context>virtual host</context>
-</contextlist>
+<contextlist><context>server config</context></contextlist>
<usage>
- <p>The <directive>MCacheSize</directive> directive sets the maximum amount of memory
- to be used by the cache, in KBytes (1024-byte units). If a new object needs to be
- inserted in the cache and the size of the object is greater than the
- remaining memory, objects will be removed until the new object can be cached.
- The object to be removed is selected using the algorithm specified by
- <directive>MCacheRemovalAlgorithm</directive>.</p>
+ <p>The <directive>MCacheSize</directive> directive sets the maximum
+ amount of memory to be used by the cache, in KBytes (1024-byte units).
+ If a new object needs to be inserted in the cache and the size of the
+ object is greater than the remaining memory, objects will be removed
+ until the new object can be cached. The object to be removed is
+ selected using the algorithm specified by <directive
+ module="mod_mem_cache">MCacheRemovalAlgorithm</directive>.</p>
- <note type="warning"><title>Note:</title>
- The <directive>MCacheSize</directive> value must be greater than the value
- specified by the <directive>MCacheMaxObjectSize</directive> directive.
- </note>
-
- <example>
- MCacheSize 700000<br />
+ <example><title>Example</title>
+ MCacheSize 700000
</example>
+
+ <note><title>Note</title>
+ <p>The <directive>MCacheSize</directive> value must be greater than
+ the value specified by the <directive module="mod_mem_cache"
+ >MCacheMaxObjectSize</directive> directive.</p>
+ </note>
</usage>
</directivesynopsis>
<directivesynopsis>
<name>MCacheMaxObjectCount</name>
-<description>The maximum number of objects allowed to be placed in the cache</description>
+<description>The maximum number of objects allowed to be placed in the
+cache</description>
<syntax>MCacheMaxObjectCount <var>value</var></syntax>
<default>MCacheMaxObjectCount 1009</default>
-<contextlist><context>server config</context><context>virtual host</context>
-</contextlist>
+<contextlist><context>server config</context></contextlist>
<usage>
- <p>The <directive>MCacheMaxObjectCount</directive> directive sets the maximum
- number of objects to be cached. If a new object needs to be inserted in the cache
- and the maximum number of objects has been reached, an object will be removed
- to allow the new object to be cached. The object to be removed is selected using
- the algorithm specified by <directive>MCacheRemovalAlgorithm</directive>.</p>
+ <p>The <directive>MCacheMaxObjectCount</directive> directive sets the
+ maximum number of objects to be cached. The value is used to create the
+ open hash table. If a new object needs to be inserted in the cache and
+ the maximum number of objects has been reached, an object will be
+ removed to allow the new object to be cached. The object to be removed
+ is selected using the algorithm specified by <directive
+ module="mod_mem_cache">MCacheRemovalAlgorithm</directive>.</p>
- <note><title>Note:</title>
- The value of <directive>MCacheMaxObjectCount</directive> is used to create
- the open hash table.
- </note>
-
- <example>
- MCacheMaxObjectCount 13001<br />
+ <example><title>Example</title>
+ MCacheMaxObjectCount 13001
</example>
</usage>
</directivesynopsis>
@@ -89,15 +89,15 @@
cache</description>
<syntax>MCacheMinObjectSize <var>bytes</var></syntax>
<default>MCacheMinObjectSize 0</default>
-<contextlist><context>server config</context><context>virtual host</context>
-</contextlist>
+<contextlist><context>server config</context></contextlist>
<usage>
- <p>The <directive>MCacheMinObjectSize</directive> directive sets the minimum
- size in bytes of a document for it to be considered cacheable.</p>
+ <p>The <directive>MCacheMinObjectSize</directive> directive sets the
+ minimum size in bytes of a document for it to be considered
+ cacheable.</p>
- <example>
- MCacheMinObjectSize 10000<br />
+ <example><title>Example</title>
+ MCacheMinObjectSize 10000
</example>
</usage>
</directivesynopsis>
@@ -108,22 +108,22 @@
cache</description>
<syntax>MCacheMaxObjectSize <var>bytes</var></syntax>
<default>MCacheMaxObjectSize 10000</default>
-<contextlist><context>server config</context><context>virtual host</context>
-</contextlist>
+<contextlist><context>server config</context></contextlist>
<usage>
- <p>The <directive>MCacheMaxObjectSize</directive> directive sets the maximum
- allowable size, in bytes, of a document for it to be considered cacheable.</p>
+ <p>The <directive>MCacheMaxObjectSize</directive> directive sets the
+ maximum allowable size, in bytes, of a document for it to be considered
+ cacheable.</p>
- <note type="warning"><title>Note:</title>
- The value of <directive>MCacheMaxObjectSize</directive> must be greater
- than the value specified by the <directive>MCacheMinObjectSize</directive>
- directive.
- </note>
-
- <example>
- MCacheMaxObjectSize 6400000<br />
+ <example><title>Example</title>
+ MCacheMaxObjectSize 6400000
</example>
+
+ <note><title>Note</title>
+ <p>The value of <directive>MCacheMaxObjectSize</directive> must be
+ greater than the value specified by the <directive
+ module="mod_mem_cache">MCacheMinObjectSize</directive> directive.</p>
+ </note>
</usage>
</directivesynopsis>
@@ -131,24 +131,71 @@
<name>MCacheRemovalAlgorithm</name>
<description>The algorithm used to select documents for removal from the
cache</description>
-<syntax>MCacheRemovalAlgorithm <code>LRU|GDSF</code></syntax>
+<syntax>MCacheRemovalAlgorithm LRU|GDSF</syntax>
<default>MCacheRemovalAlgorithm GDSF</default>
-<contextlist><context>server config</context><context>virtual host</context>
-</contextlist>
+<contextlist><context>server config</context></contextlist>
<usage>
<p>The <directive>MCacheRemovalAlgorithm</directive> directive specifies
the algorithm used to select documents for removal from the cache.
- Two choices are available:<br />
- <code>LRU</code> (Least Recently Used): <code>LRU</code> removes the
- documents that have not been accessed for the longest time.<br />
- <code>GDSF</code> (GreadyDual-Size): <code>GDSF</code> assigns a priority
- to cached documents based on the cost of a cache miss and the size of
- the document. Documents with the lowest priority are removed first.</p>
+ Two choices are available:</p>
+
+ <dl>
+ <dt><code>LRU</code> (Least Recently Used)</dt>
+ <dd><code>LRU</code> removes the documents that have not been accessed
+ for the longest time.</dd>
+
+ <dt><code>GDSF</code> (GreadyDual-Size)</dt>
+ <dd><code>GDSF</code> assigns a priority to cached documents based
+ on the cost of a cache miss and the size of the document. Documents
+ with the lowest priority are removed first.</dd>
+ </dl>
+
+ <example><title>Example</title>
+ MCacheRemovalAlgorithm GDSF<br />
+ MCacheRemovalAlgorithm LRU
+ </example>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>MCacheMaxStreamingBuffer</name>
+<description>Maximum amount of a streamed response to buffer in memory
+before declaring the response uncacheable</description>
+<syntax>MCacheMaxStreamingBuffer <var>size_in_bytes</var></syntax>
+<default>MCacheMaxStreamingBuffer the smaller of 100000 or MCacheMaxObjectSize</default>
+<contextlist><context>server config</context>
+</contextlist>
+
+<usage>
+ <p>The <directive>MCacheMaxStreamingBuffer</directive> directive
+ specifies the maximum number of bytes of a streamed response to
+ buffer before deciding that the response is too big to cache.
+ A streamed response is one in which the entire content is not
+ immediately available and in which the <code>Content-Length</code>
+ may not be known. Sources of streaming responses include proxied
+ responses and the output of CGI scripts. By default, a streamed
+ response will <em>not</em> be cached unless it has a
+ <code>Content-Length</code> header. The reason for this is to
+ avoid using a large amount of memory to buffer a partial response
+ that might end up being too large to fit in the cache.
+ The <directive>MCacheMaxStreamingBuffer</directive> directive allows
+ buffering of streamed responses that don't contain a
+ <code>Content-Length</code> up to the specified maximum amount of
+ space. If the maximum buffer space is reached, the buffered
+ content is discarded and the attempt to cache is abandoned.</p>
+
+ <note><title>Note:</title>
+ <p>Using a nonzero value for <directive>MCacheMaxStreamingBuffer</directive>
+ will not delay the transmission of the response to the client.
+ As soon as <module>mod_mem_cache</module> copies a block of streamed
+ content into a buffer, it sends the block on to the next output
+ filter for delivery to the client.</p>
+ </note>
<example>
- MCacheRemovalAlgorithm GDSF<br />
- MCacheRemovalAlgorithm LRU<br />
+ # Enable caching of streamed responses up to 64KB:<br />
+ MCacheMaxStreamingBuffer 65536
</example>
</usage>
</directivesynopsis>
diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en
index f63d7c8..abdf60d 100644
--- a/docs/manual/mod/mod_mime.html.en
+++ b/docs/manual/mod/mod_mime.html.en
@@ -4,14 +4,31 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_mime - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_mime</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Associates the requested filename's extensions
+ -->
+<title>mod_mime - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_mime</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Associates the requested filename's extensions
with the file's behavior (handlers and filters)
and content (mime-type, language, character set and
- encoding)</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>mime_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_mime.c</td></tr></table><h3>Summary</h3>
+ encoding)</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mime_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_mime.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module is used to associate various bits of "meta
information" with files by their filename extensions. This
information relates the filename of the document to it's
@@ -20,7 +37,7 @@
negotiation, so the user's preferences are respected when
choosing one of several possible files to serve. See
<code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> for more information
- about content negotiation. </p>
+ about <a href="../content-negotiation.html">content negotiation</a>.</p>
<p>The 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> and <code class="directive"><a href="#addtype">AddType</a></code> are all used to map file
extensions onto the meta-information for that file. Respectively
@@ -50,7 +67,10 @@
encoding) you may need to 'touch' affected files (updating
their last modified date) to ensure that all visitors are
receive the corrected content headers.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#addcharset">AddCharset</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#addcharset">AddCharset</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#addencoding">AddEncoding</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#addhandler">AddHandler</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#addinputfilter">AddInputFilter</a></li>
@@ -68,34 +88,52 @@
<li><img alt="" src="../images/down.gif" /> <a href="#removeoutputfilter">RemoveOutputFilter</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#removetype">RemoveType</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#typesconfig">TypesConfig</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#multipleext">Files with Multiple Extensions</a></li><li><img alt="" src="../images/down.gif" /> <a href="#contentencoding">Content encoding</a></li><li><img alt="" src="../images/down.gif" /> <a href="#charset-lang">Character sets and languages</a></li></ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code></li><li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code></li><li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code></li><li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code></li><li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</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>
-
-
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#multipleext">Files with Multiple Extensions</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#contentencoding">Content encoding</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#charset-lang">Character sets and languages</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</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, and the order of the
extensions is <em>normally</em> irrelevant. For example, if the
file <code>welcome.html.fr</code> maps onto content type
- text/html 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 which maps onto the same
+ <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 which maps onto the same
type of meta-information, then the one to the right will be
- used. For example, if ".gif" maps to the MIME-type image/gif
- and ".html" maps to the MIME-type text/html, then the file
- <code>welcome.gif.html</code> will be associated with the
- MIME-type "text/html".</p>
+ used. For example, if <code>.gif</code> maps to the MIME-type
+ <code>image/gif</code> and <code>.html</code> maps to the MIME-type
+ <code>text/html</code>, then the file <code>welcome.gif.html</code>
+ will be associated with the MIME-type <code>text/html</code>.</p>
<p>Care should be taken when a file with multiple extensions
gets associated with both a MIME-type and a handler. This will
usually result in the request being by the module associated
with the handler. For example, if the <code>.imap</code>
- extension is mapped to the handler "imap-file" (from mod_imap)
- and the <code>.html</code> extension is mapped to the MIME-type
- "text/html", then the file <code>world.imap.html</code> will be
- associated with both the "imap-file" handler and "text/html"
- MIME-type. When it is processed, the "imap-file" handler will
- be used, and so it will be treated as a mod_imap imagemap
+ extension is mapped to the handler <code>imap-file</code> (from
+ <code class="module"><a href="../mod/mod_imap.html">mod_imap</a></code>) and the <code>.html</code> extension is
+ mapped to the MIME-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> MIME-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_imap.html">mod_imap</a></code> imagemap
file.</p>
-</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>
-
+</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 MIME type can additionally be encoded a
particular way to simplify transmission over the Internet.
While this usually will refer to compression, such as
@@ -104,18 +142,18 @@
designed for transmitting a binary file in an ASCII (text)
format.</p>
- <p>The MIME RFC puts it this way:</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>
- <div class="note">
- The Content-Encoding entity-header field is used as a
- modifier to the media-type. When present, its value indicates
- what additional content coding has been applied to the
- resource, and thus what decoding mechanism must be applied in
- order to obtain the media-type referenced by the Content-Type
- header field. The Content-Encoding is primarily used to allow
- a document to be compressed without losing the identity of
- its underlying media type.
- </div>
+ <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
@@ -130,16 +168,14 @@
<code>Resume.doc.zip</code>would be known to be a pkzip'ed Word
document.</p>
- <p>Apache send a <code>Content-encoding</code> header with the
+ <p>Apache sends a <code>Content-encoding</code> header with the
resource, in order to tell the client browser about the
encoding method.</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">Character sets and languages</a></h2>
-
-
-
+</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
@@ -153,102 +189,108 @@
<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
+ 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>Charset</h3>
+ <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<br />
+ Content-Type: text/plain; charset=ISO-8859-1
+ </code></p></div>
- <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<br />
-Content-Type: text/plain; charset=ISO-8859-2
-</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 charset</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddCharset <em>charset extension</em>
-[<em>extension</em>] ...</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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>AddCharset is only available in Apache
-1.3.10 and later</td></tr></table>
+ <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>
- <p>The AddCharset directive maps the given filename extensions
- to the specified content charset. <em>charset</em> is the MIME
- charset parameter of filenames containing <em>extension</em>.
- This mapping is added to any already in force, overriding any
- mappings that already exist for the same <em>extension</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="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
+charset</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddCharset <var>charset</var> <var>extension</var>
+[<var>extension</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_mime</td></tr>
+</table>
+ <p>The <code class="directive">AddCharset</code> directive maps the given
+ filename extensions to the specified content charset. <var>charset</var>
+ is the MIME charset parameter of filenames containing
+ <var>extension</var>. This mapping is added to any already in force,
+ overriding any mappings that already exist for the same
+ <var>extension</var>.</p>
- <p>Example:</p>
-<div class="example"><p><code>
- AddLanguage ja .ja<br />
- AddCharset EUC-JP .euc<br />
- AddCharset ISO-2022-JP .jis<br />
- AddCharset SHIFT_JIS .sjis
-</code></p></div>
+ <div class="example"><h3>Example</h3><p><code>
+ AddLanguage ja .ja<br />
+ AddCharset EUC-JP .euc<br />
+ AddCharset ISO-2022-JP .jis<br />
+ AddCharset SHIFT_JIS .sjis
+ </code></p></div>
<p>Then the document <code>xxxx.ja.jis</code> will be treated
- as being a Japanese document whose charset is ISO-2022-JP (as
- will the document <code>xxxx.jis.ja</code>). The AddCharset
- directive is useful for both to inform the client about the
- character encoding of the document so that the document can be
- interpreted and displayed appropriately, and for <a href="../content-negotiation.html">content negotiation</a>,
+ as being a Japanese document whose charset is <code>ISO-2022-JP</code>
+ (as will the document <code>xxxx.jis.ja</code>). The
+ <code class="directive">AddCharset</code> directive is useful for both to
+ inform the client about the character encoding of the document so that
+ the document can be interpreted and displayed appropriately, and for <a href="../content-negotiation.html">content negotiation</a>,
where the server returns one from several documents based on
the client's charset preference.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-<h3>See also</h3><ul><li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li><li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</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="AddEncoding" id="AddEncoding">AddEncoding</a> <a name="addencoding" id="addencoding">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 encoding type</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddEncoding
- <em>MIME-enc extension</em> [<em>extension</em>] ...</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_mime</td></tr></table>
+<h3>See also</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</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="AddEncoding" id="AddEncoding">AddEncoding</a> <a name="addencoding" id="addencoding">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 encoding
+type</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddEncoding <var>MIME-enc</var> <var>extension</var>
+[<var>extension</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_mime</td></tr>
+</table>
+ <p>The <code class="directive">AddEncoding</code> directive maps the given
+ filename extensions to the specified encoding type. <var>MIME-enc</var>
+ is the MIME encoding to use for documents containing the
+ <var>extension</var>. This mapping is added to any already in force,
+ overriding any mappings that already exist for the same
+ <var>extension</var>.</p>
- <p>The AddEncoding directive maps the given filename extensions
- to the specified encoding type. <em>MIME-enc</em> is the MIME
- encoding to use for documents containing the
- <em>extension</em>. This mapping is added to any already in
- force, overriding any mappings that already exist for the same
- <em>extension</em>. Example:</p>
-
- <div class="example"><p><code>
+ <div class="example"><h3>Example</h3><p><code>
AddEncoding x-gzip .gz<br />
AddEncoding x-compress .Z
</code></p></div>
- <p>This will cause filenames containing the .gz extension to be
- marked as encoded using the x-gzip encoding, and filenames
- containing the .Z extension to be marked as encoded with
- x-compress. </p>
+ <p>This will cause filenames containing the <code>.gz</code> extension
+ to be marked as encoded using the <code>x-gzip</code> encoding, and
+ filenames containing the <code>.Z</code> extension to be marked as
+ encoded with <code>x-compress</code>.</p>
- <p>Old clients expect <code>x-gzip</code> and
- <code>x-compress</code>, however the standard dictates that
- they're equivalent to <code>gzip</code> and
- <code>compress</code> respectively. Apache does content
- encoding comparisons by ignoring any leading <code>x-</code>.
+ <p>Old clients expect <code>x-gzip</code> and <code>x-compress</code>,
+ however the standard dictates that they're equivalent to
+ <code>gzip</code> and <code>compress</code> respectively. Apache does
+ content encoding comparisons by ignoring any leading <code>x-</code>.
When responding with an encoding Apache will use whatever form
(<em>i.e.</em>, <code>x-foo</code> or <code>foo</code>) the
client requested. If the client didn't specifically request a
@@ -259,139 +301,152 @@
recent encodings, such as <code>deflate</code> should be
specified without the <code>x-</code>.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AddHandler" id="AddHandler">AddHandler</a> <a name="addhandler" id="addhandler">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maps the filename extensions
-to the specified handler</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddHandler
- <em>handler-name extension</em> [<em>extension</em>] ...</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_mime</td></tr></table>
-<p>Files having the name <em>extension</em> will be served by the
-specified <a href="../handler.html">handler-name</a>. This mapping is
-added to any already in force, overriding any mappings that already
-exist for the same <em>extension</em>. For example, to activate CGI
-scripts with the file extension "<code>.cgi</code>", you might
-use:</p>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddHandler" id="AddHandler">AddHandler</a> <a name="addhandler" id="addhandler">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps the filename extensions to the specified
+handler</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddHandler <var>handler-name</var> <var>extension</var>
+[<var>extension</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_mime</td></tr>
+</table>
+ <p>Files having the name <var>extension</var> will be served by the
+ specified <var><a href="../handler.html">handler-name</a></var>. This
+ mapping is added to any already in force, overriding any mappings that
+ already exist for the same <var>extension</var>. For example, to
+ activate CGI scripts with the file extension <code>.cgi</code>, you
+ might use:</p>
-<div class="example"><p><code>
- AddHandler cgi-script .cgi
-</code></p></div>
+ <div class="example"><p><code>
+ AddHandler cgi-script .cgi
+ </code></p></div>
- <p>Once that has been put into your srm.conf or httpd.conf
- file, any file containing the "<code>.cgi</code>" extension
- will be treated as a CGI program.</p>
+ <p>Once that has been put into your httpd.conf file, any file containing
+ the <code>.cgi</code> extension will be treated as a CGI program.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</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="AddInputFilter" id="AddInputFilter">AddInputFilter</a> <a name="addinputfilter" id="addinputfilter">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maps filename extensions
- to the filters that will process
- client requests</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddInputFilter
- <em>filter</em>[<em>;filter</em>...] extension
- [<em>extension</em> ...]</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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>AddInputFilter
- is only available in Apache 2.0.26 and later.</td></tr></table>
-
- <p>AddInputFilter maps the filename extensions <em>extension</em>
- to the <a href="../filter.html">filters</a> which will process
- client requests and POST input when they are received by the
- server. This is in addition to any filters defined elsewhere,
- including the <a href="core.html#setinputfilter">SetInputFilter</a> directive.
- This mapping is merged over any already in force, overriding any
- mappings that already exist for the same <em>extension</em>.</p>
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</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="AddInputFilter" id="AddInputFilter">AddInputFilter</a> <a name="addinputfilter" id="addinputfilter">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps filename extensions to the filters that will process
+client requests</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddInputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</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_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>AddInputFilter is only available in Apache 2.0.26 and
+later.</td></tr>
+</table>
+ <p><code class="directive">AddInputFilter</code> maps the filename extension
+ <var>extension</var> to the <a href="../filter.html">filters</a> which
+ will process client requests and POST input when they are received by
+ the server. This is in addition to any filters defined elsewhere,
+ including the <code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code>
+ directive. This mapping is merged over any already in force, overriding
+ any mappings that already exist for the same <var>extension</var>.</p>
<p>If more than one filter is specified, they must be separated
by semicolons in the order in which they should process the
- content. Both the filter and <em>extension</em> arguments are
+ content. Both the filter and <var>extension</var> arguments are
case-insensitive, and the extension may be specified with or
without a leading dot.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AddLanguage" id="AddLanguage">AddLanguage</a> <a name="addlanguage" id="addlanguage">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maps the given filename extension
-to the specified content language</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddLanguage
- <em>MIME-lang extension</em> [<em>extension</em>] ...</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_mime</td></tr></table>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddLanguage" id="AddLanguage">AddLanguage</a> <a name="addlanguage" id="addlanguage">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps the given filename extension to the specified content
+language</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddLanguage <var>MIME-lang</var> <var>extension</var>
+[<var>extension</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_mime</td></tr>
+</table>
+ <p>The <code class="directive">AddLanguage</code> directive maps the given
+ filename extension to the specified content language.
+ <var>MIME-lang</var> is the MIME language of filenames containing
+ <var>extension</var>. This mapping is added to any already in force,
+ overriding any mappings that already exist for the same
+ <var>extension</var>.</p>
- <p>The AddLanguage directive maps the given filename extension
- to the specified content language. <em>MIME-lang</em> is the
- MIME language of filenames containing <em>extension</em>. This
- mapping is added to any already in force, overriding any
- mappings that already exist for the same
- <em>extension</em>.</p>
-
- <p>Example:</p>
-
- <div class="example"><p><code>
+ <div class="example"><h3>Example</h3><p><code>
AddEncoding x-compress .Z<br />
- AddLanguage en .en<br />
- AddLanguage fr .fr
+ AddLanguage en .en<br />
+ AddLanguage fr .fr
</code></p></div>
<p>Then the document <code>xxxx.en.Z</code> will be treated as
being a compressed English document (as will the document
<code>xxxx.Z.en</code>). Although the content language is
reported to the client, the browser is unlikely to use this
- information. The AddLanguage directive is more useful for <a href="../content-negotiation.html">content negotiation</a>,
- where the server returns one from several documents based on
- the client's language preference.</p>
+ information. The <code class="directive">AddLanguage</code> directive is
+ more useful for <a href="../content-negotiation.html">content
+ negotiation</a>, where the server returns one from several documents
+ based on the client's language preference.</p>
<p>If multiple language assignments are made for the same
extension, the last one encountered is the one that is used.
That is, for the case of:</p>
-<div class="example"><p><code>
- AddLanguage en .en<br />
- AddLanguage en-uk .en<br />
- AddLanguage en-us .en
-</code></p></div>
+ <div class="example"><p><code>
+ AddLanguage en .en<br />
+ AddLanguage en-uk .en<br />
+ AddLanguage en-us .en
+ </code></p></div>
- <p>documents with the extension "<code>.en</code>" would be
- treated as being "<code>en-us</code>".</p>
+ <p>documents with the extension <code>.en</code> would be treated as
+ being <code>en-us</code>.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-<h3>See also</h3><ul><li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</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="AddOutputFilter" id="AddOutputFilter">AddOutputFilter</a> <a name="addoutputfilter" id="addoutputfilter">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maps filename
-extensions to the filters that will process
-responses from the server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddOutputFilter
- <em>filter</em>[<em>;filter</em>...] extension
- [<em>extension</em> ...]</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 /></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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>AddOutputFilter
- is only available in Apache 2.0.26 and later.</td></tr></table>
-
+<h3>See also</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</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="AddOutputFilter" id="AddOutputFilter">AddOutputFilter</a> <a name="addoutputfilter" id="addoutputfilter">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps filename extensions to the filters that will process
+responses from the server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddOutputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</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_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>AddOutputFilter is only available in Apache 2.0.26 and
+later.</td></tr>
+</table>
<p>The <code class="directive">AddOutputFilter</code> directive maps the
- filename extensions <em>extension</em> to the <a href="../filter.html">filters</a> which will process responses
- from the server before they are sent to the client. This is in
- addition to any filters defined elsewhere, including the
- <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code>
- directive. This mapping is merged over any already in force,
- overriding any mappings that already exist for the same
- <em>extension</em>.</p>
+ filename extension <var>extension</var> to the <a href="../filter.html">filters</a> which will process responses
+ from the server before they are sent to the client. This is in
+ addition to any filters defined elsewhere, including <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code> and <code class="directive"><a href="../mod/core.html#addoutputfilterbytype">AddOutputFilterByType</a></code> directive. This mapping is merged
+ over any already in force, overriding any mappings that already exist
+ for the same <var>extension</var>.</p>
<p>For example, the following configuration will process all
- .shtml files for server-side includes and will then compress
- the output using <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>.</p>
-
+ <code>.shtml</code> files for server-side includes and will then
+ compress the output using <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>.</p>
<div class="example"><p><code>
AddOutputFilter INCLUDES;DEFLATE shtml
@@ -399,87 +454,107 @@
<p>If more than one filter is specified, they must be separated
by semicolons in the order in which they should process the
- content. Both the filter and <em>extension</em> arguments are
- case-insensitive, and the extension may be specified with or
+ content. Both the <var>filter</var> and <var>extension</var> arguments
+ are case-insensitive, and the extension may be specified with or
without a leading dot.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#removeoutputfilter">RemoveOutputFilter</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="AddType" id="AddType">AddType</a> <a name="addtype" id="addtype">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maps the given filename extensions
-onto the specified content type</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AddType <em>MIME-type
- extension</em> [<em>extension</em>] ...</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_mime</td></tr></table>
-
- <p>The AddType directive maps the given filename extensions onto
- the specified content type. <em>MIME-type</em> is the MIME type to
- use for filenames containing <em>extension</em>. This mapping is
- added to any already in force, overriding any mappings that
- already exist for the same <em>extension</em>. This directive can
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#removeoutputfilter">RemoveOutputFilter</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="AddType" id="AddType">AddType</a> <a name="addtype" id="addtype">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps the given filename extensions onto the specified content
+type</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AddType <var>MIME-type</var> <var>extension</var>
+[<var>extension</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_mime</td></tr>
+</table>
+ <p>The <code class="directive">AddType</code> directive maps the given filename
+ extensions onto the specified content type. <var>MIME-type</var> is the
+ MIME type to use for filenames containing <var>extension</var>. This
+ mapping is added to any already in force, overriding any mappings that
+ already exist for the same <var>extension</var>. This directive can
be used to add mappings not listed in the MIME types file (see the
- <code class="directive"><a href="#typesconfig">TypesConfig</a></code>
- directive).</p>
+ <code class="directive"><a href="#typesconfig">TypesConfig</a></code> directive).</p>
- <p>Example:</p>
-
- <div class="example"><p><code>
+ <div class="example"><h3>Example</h3><p><code>
AddType image/gif .gif
</code></p></div>
- <div class="note">It is recommended that new MIME types be added using the
- AddType directive rather than changing the
- <code class="directive">TypesConfig</code> file. </div>
+ <div class="note">
+ It is recommended that new MIME types be added using the
+ <code class="directive">AddType</code> directive rather than changing the
+ <code class="directive"><a href="#typesconfig">TypesConfig</a></code> file.
+ </div>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li><li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</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="DefaultLanguage" id="DefaultLanguage">DefaultLanguage</a> <a name="defaultlanguage" id="defaultlanguage">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets all files in the given scope to the
-specified language</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>DefaultLanguage
- <em>MIME-lang</em></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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>DefaultLanguage
- is only available in Apache 1.3.4 and later.</td></tr></table>
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</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="DefaultLanguage" id="DefaultLanguage">DefaultLanguage</a> <a name="defaultlanguage" id="defaultlanguage">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets all files in the given scope to the specified
+language</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DefaultLanguage <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_mime</td></tr>
+</table>
+ <p>The <code class="directive">DefaultLanguage</code> directive tells Apache
+ that all files in the directive's scope (<em>e.g.</em>, all files
+ covered by the current <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> container) that don't have an explicit language
+ extension (such as <code>.fr</code> or <code>.de</code> as configured
+ by <code class="directive"><a href="#addlanguage">AddLanguage</a></code>) should be
+ considered to be in the specified <var>MIME-lang</var> language. This
+ allows entire directories to be marked as containing Dutch content, for
+ instance, without having to rename each file. Note that unlike using
+ extensions to specify languages, <code class="directive">DefaultLanguage</code>
+ can only specify a single language.</p>
- <p>The DefaultLanguage directive tells Apache that all files in
- the directive's scope (<em>e.g.</em>, all files covered by the
- current <code><Directory></code> container) that don't
- have an explicit language extension (such as <code>.fr</code>
- or <code>.de</code> as configured by <code>AddLanguage</code>)
- should be considered to be in the specified <em>MIME-lang</em>
- language. This allows entire directories to be marked as
- containing Dutch content, for instance, without having to
- rename each file. Note that unlike using extensions to specify
- languages, <code>DefaultLanguage</code> can only specify a
- single language.</p>
-
- <p>If no <code>DefaultLanguage</code> directive is in force,
+ <p>If no <code class="directive">DefaultLanguage</code> directive is in force,
and a file does not have any language extensions as configured
- by <code>AddLanguage</code>, then that file will be considered
- to have no language attribute.</p>
+ by <code class="directive"><a href="#addlanguage">AddLanguage</a></code>, then that file
+ will be considered to have no language attribute.</p>
-<div class="example"><h3>Example</h3><p><code>
-DefaultLanguage en
-</code></p></div>
+ <div class="example"><h3>Example</h3><p><code>
+ DefaultLanguage en
+ </code></p></div>
-<h3>See also</h3><ul><li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</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="ModMimeUsePathInfo" id="ModMimeUsePathInfo">ModMimeUsePathInfo</a> <a name="modmimeusepathinfo" id="modmimeusepathinfo">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Tells mod_mime to treat path_info components as part of the filename</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ModMimeUsePathInfo On|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>Base</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0.41 and later</td></tr></table>
+<h3>See also</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</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="ModMimeUsePathInfo" id="ModMimeUsePathInfo">ModMimeUsePathInfo</a> <a name="modmimeusepathinfo" id="modmimeusepathinfo">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Tells mod_mime to treat path_info
+components as part of the filename</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ModMimeUsePathInfo On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ModMimeUsePathInfo 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>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.0.41 and later</td></tr>
+</table>
<p>The <code class="directive">ModMimeUsePathInfo</code> directive is used to
- combine the filename with the path_info URL component to apply
- <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code>'s directives to the request. The default
- value is <code>Off</code> - therefore, the path_info component is
- ignored.</p>
+ combine the filename with the <code>path_info</code> URL component to
+ apply <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code>'s directives to the request. The default
+ value is <code>Off</code> - therefore, the <code>path_info</code>
+ component is ignored.</p>
<p>This directive is recommended when you have a virtual filesystem.</p>
@@ -488,283 +563,350 @@
</code></p></div>
<p>If you have a request for <code>/bar/foo.shtml</code> where
- <code>/bar</code> is a Location and <code class="directive">ModMimeUsePathInfo</code> is on, <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> will
- treat the incoming request as <code>/bar/foo.shtml</code> and
- directives like <code>AddOutputFilter INCLUDES .shtml</code> will add
- the INCLUDES filter to the request. If <code class="directive">ModMimeUsePathInfo</code> is not set, the INCLUDES filter will
- not be added.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="MultiviewsMatch" id="MultiviewsMatch">MultiviewsMatch</a> <a name="multiviewsmatch" id="multiviewsmatch">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The types of files that will be included when
-searching for a matching file with MultiViews</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MultiviewsMatch
- <em>[NegotiatedOnly] [Handlers] [Filters] [Any]</em></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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available
- in Apache 2.0.26 and later.</td></tr></table>
+ <code>/bar</code> is a Location and <code class="directive">ModMimeUsePathInfo</code> is <code>On</code>,
+ <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> will treat the incoming request as
+ <code>/bar/foo.shtml</code> and directives like <code>AddOutputFilter
+ INCLUDES .shtml</code> will add the <code>INCLUDES</code> filter to the
+ request. If <code class="directive">ModMimeUsePathInfo</code> is not set, the
+ <code>INCLUDES</code> filter will not be added.</p>
- <p>MultiviewsMatch permits three different behaviors for
- <a href="mod_negotiation.html">mod_negotiation</a>'s Multiviews
- feature. Multiviews allows a request for a file, e.g. index.html,
- to match any negotiated extensions following the base request,
- e.g. index.html.en, index.html.fr, or index.html.gz.</p>
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</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="MultiviewsMatch" id="MultiviewsMatch">MultiviewsMatch</a> <a name="multiviewsmatch" id="multiviewsmatch">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The types of files that will be included when searching for
+a matching file with MultiViews</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
+[Handlers|Filters]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MultiviewsMatch NegotiatedOnly</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_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.0.26 and later.</td></tr>
+</table>
+ <p><code class="directive">MultiviewsMatch</code> permits three different
+ behaviors for <a href="mod_negotiation.html">mod_negotiation</a>'s
+ Multiviews feature. Multiviews allows a request for a file,
+ <em>e.g.</em> <code>index.html</code>, to match any negotiated
+ extensions following the base request, <em>e.g.</em>
+ <code>index.html.en</code>, <code>index.html.fr</code>, or
+ <code>index.html.gz</code>.</p>
- <p>The NegotiatedOnly option provides that every extension following
- the base name must correlate to a recognized mod_mime extension for
- content negotation, e.g. Charset, Content-Type, Language, or
- Encoding. This is the strictest implementation with the fewest
- unexpected side effects, and is the default behavior.</p>
+ <p>The <code>NegotiatedOnly</code> option provides that every extension
+ following the base name must correlate to a recognized
+ <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> extension for content negotation, <em>e.g.</em>
+ Charset, Content-Type, Language, or Encoding. This is the strictest
+ implementation with the fewest unexpected side effects, and is the
+ default behavior.</p>
<p>To include extensions associated with Handlers and/or Filters,
- set the MultiviewsMatch directive to either Handlers, Filters, or
- both option keywords. If all other factors are equal, the smallest
- file will be served, e.g. in deciding between index.html.cgi of 500
- characters and index.html.pl of 1000 bytes, the .cgi file would win
- in this example. Users of .asis files might prefer to use the
- Handler option, if .asis files are associated with the asis-handler.</p>
+ set the <code class="directive">MultiviewsMatch</code> directive to either
+ <code>Handlers</code>, <code>Filters</code>, or both option keywords.
+ If all other factors are equal, the smallest file will be served,
+ <em>e.g.</em> in deciding between <code>index.html.cgi</code> of 500
+ bytes and <code>index.html.pl</code> of 1000 bytes, the <code>.cgi</code>
+ file would win in this example. Users of <code>.asis</code> files
+ might prefer to use the Handler option, if <code>.asis</code> files are
+ associated with the <code>asis-handler</code>.</p>
- <p>You may finally allow Any extensions to match, even if mod_mime
- doesn't recognize the extension. This was the behavior in Apache 1.3,
- and can cause unpredicatable results, such as serving .old or .bak
- files the webmaster never expected to be served.</p>
+ <p>You may finally allow <code>Any</code> extensions to match, even if
+ <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> doesn't recognize the extension. This was the
+ behavior in Apache 1.3, and can cause unpredicatable results, such as
+ serving .old or .bak files the webmaster never expected to be served.</p>
<p>For example, the following configuration will allow handlers
and filters to participate in Multviews, but will exclude unknown
files:</p>
-<div class="example"><p><code>
-MultiviewsMatch Handlers Filters
-</code></p></div>
-<h3>See also</h3><ul><li><code class="directive"><a href="../mod/core.html#options">Options</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="RemoveCharset" id="RemoveCharset">RemoveCharset</a> <a name="removecharset" id="removecharset">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Removes any character set associations for a set of file
-extensions</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RemoveCharset
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
- </a></th><td>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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>RemoveCharset is
- only available in Apache 2.0.24 and later.</td></tr></table>
- <p>The <code>RemoveCharset</code> directive removes any
+ <div class="example"><p><code>
+ MultiviewsMatch Handlers Filters
+ </code></p></div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
+<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</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="RemoveCharset" id="RemoveCharset">RemoveCharset</a> <a name="removecharset" id="removecharset">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Removes any character set associations for a set of file
+extensions</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RemoveCharset <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>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_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>RemoveCharset is only available in Apache 2.0.24 and
+later.</td></tr>
+</table>
+ <p>The <code class="directive">RemoveCharset</code> directive removes any
character set associations for files with the given extensions.
This allows <code>.htaccess</code> files in subdirectories to
undo any associations inherited from parent directories or the
server config files.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-<div class="example"><h3>Example</h3><p><code>
-RemoveCharset .html .shtml
-</code></p></div>
+ <div class="example"><h3>Example</h3><p><code>
+ RemoveCharset .html .shtml
+ </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="RemoveEncoding" id="RemoveEncoding">RemoveEncoding</a> <a name="removeencoding" id="removeencoding">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Removes any content encoding associations for a set of file
-extensions</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RemoveEncoding
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
- </a></th><td>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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>RemoveEncoding
- is only available in Apache 1.3.13 and later.</td></tr></table>
-
- <p>The <code>RemoveEncoding</code> directive removes any
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveEncoding" id="RemoveEncoding">RemoveEncoding</a> <a name="removeencoding" id="removeencoding">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Removes any content encoding associations for a set of file
+extensions</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>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_mime</td></tr>
+</table>
+ <p>The <code class="directive">RemoveEncoding</code> directive removes any
encoding associations for files with the given extensions. This
allows <code>.htaccess</code> files in subdirectories to undo
any associations inherited from parent directories or the
server config files. An example of its use might be:</p>
-
-<div class="example"><h3>/foo/.htaccess:</h3><pre>
-AddEncoding x-gzip .gz
-AddType text/plain .asc
-<Files *.gz.asc>
- RemoveEncoding .gz
-</Files>
-</pre></div>
+ <div class="example"><h3>/foo/.htaccess:</h3><p><code>
+ AddEncoding x-gzip .gz<br />
+ AddType text/plain .asc<br />
+ <Files *.gz.asc><br />
+ <span class="indent">
+ RemoveEncoding .gz<br />
+ </span>
+ </Files>
+ </code></p></div>
<p>This will cause <code>foo.gz</code> to be marked as being
encoded with the gzip method, but <code>foo.gz.asc</code> as an
unencoded plaintext file.</p>
- <p><strong>Note:</strong>RemoveEncoding directives are processed
- <em>after</em> any AddEncoding directives, so it is possible they
- may undo the effects of the latter if both occur within the
- same directory configuration.</p>
+ <div class="note"><h3>Note</h3>
+ <p><code class="directive">RemoveEncoding</code> directives are processed
+ <em>after</em> any <code class="directive"><a href="#addencoding">AddEncoding</a></code>
+ directives, so it is possible they may undo the effects of the latter
+ if both occur within the same directory configuration.</p>
+ </div>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RemoveHandler" id="RemoveHandler">RemoveHandler</a> <a name="removehandler" id="removehandler">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Removes any handler associations for a set of file
-extensions</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RemoveHandler
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
- </a></th><td>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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>RemoveHandler is
- only available in Apache 1.3.4 and later.</td></tr></table>
- <p>The <code>RemoveHandler</code> directive removes any handler
- associations for files with the given extensions. This allows
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveHandler" id="RemoveHandler">RemoveHandler</a> <a name="removehandler" id="removehandler">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Removes any handler associations for a set of file
+extensions</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RemoveHandler <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>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_mime</td></tr>
+</table>
+ <p>The <code class="directive">RemoveHandler</code> directive removes any
+ handler associations for files with the given extensions. This allows
<code>.htaccess</code> files in subdirectories to undo any
associations inherited from parent directories or the server
config files. An example of its use might be:</p>
-<div class="example"><h3>/foo/.htaccess:</h3><p><code>
-AddHandler server-parsed .html
-</code></p></div>
+ <div class="example"><h3>/foo/.htaccess:</h3><p><code>
+ AddHandler server-parsed .html
+ </code></p></div>
-<div class="example"><h3>/foo/bar/.htaccess:</h3><p><code>
-RemoveHandler .html
-</code></p></div>
+ <div class="example"><h3>/foo/bar/.htaccess:</h3><p><code>
+ RemoveHandler .html
+ </code></p></div>
<p>This has the effect of returning <code>.html</code> files in
the <code>/foo/bar</code> directory to being treated as normal
- files, rather than as candidates for parsing (see the <a href="mod_include.html"><code>mod_include</code></a>
- module).</p>
+ files, rather than as candidates for parsing (see the <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> module).</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RemoveInputFilter" id="RemoveInputFilter">RemoveInputFilter</a> <a name="removeinputfilter" id="removeinputfilter">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Removes any input filter associations for a set of file
-extensions</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RemoveInputFilter
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
- </a></th><td>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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>RemoveInputFilter is only available in Apache
-2.0.26 and later.</td></tr></table>
- <p>The <code>RemoveInputFilter</code> directive removes any
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveInputFilter" id="RemoveInputFilter">RemoveInputFilter</a> <a name="removeinputfilter" id="removeinputfilter">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Removes any input filter associations for a set of file
+extensions</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>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_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>RemoveInputFilter is only available in Apache 2.0.26 and
+later.</td></tr>
+</table>
+ <p>The <code class="directive">RemoveInputFilter</code> directive removes any
input filter associations for files with the given extensions.
This allows <code>.htaccess</code> files in subdirectories to
undo any associations inherited from parent directories or the
server config files.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RemoveLanguage" id="RemoveLanguage">RemoveLanguage</a> <a name="removelanguage" id="removelanguage">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Removes any language associations for a set of file
-extensions</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RemoveLanguage
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
- </a></th><td>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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>RemoveLanguage
- is only available in Apache 2.0.24 and later.</td></tr></table>
-
- <p>The <code>RemoveLanguage</code> directive removes any
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveLanguage" id="RemoveLanguage">RemoveLanguage</a> <a name="removelanguage" id="removelanguage">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Removes any language associations for a set of file
+extensions</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>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_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>RemoveLanguage is only available in Apache 2.0.24 and
+later.</td></tr>
+</table>
+ <p>The <code class="directive">RemoveLanguage</code> directive removes any
language associations for files with the given extensions. This
allows <code>.htaccess</code> files in subdirectories to undo
any associations inherited from parent directories or the
server config files.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RemoveOutputFilter" id="RemoveOutputFilter">RemoveOutputFilter</a> <a name="removeoutputfilter" id="removeoutputfilter">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Removes any output filter associations for a set of file
-extensions</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RemoveOutputFilter
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
- </a></th><td>virtual host, directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override:
- </a></th><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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>RemoveOutputFilter is only available in Apache
-2.0.26 and later.</td></tr></table>
- <p>The <code>RemoveOutputFilter</code> directive removes any
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveOutputFilter" id="RemoveOutputFilter">RemoveOutputFilter</a> <a name="removeoutputfilter" id="removeoutputfilter">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Removes any output filter associations for a set of file
+extensions</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>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_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>RemoveOutputFilter is only available in Apache 2.0.26 and
+later.</td></tr>
+</table>
+ <p>The <code class="directive">RemoveOutputFilter</code> directive removes any
output filter associations for files with the given extensions.
This allows <code>.htaccess</code> files in subdirectories to
undo any associations inherited from parent directories or the
server config files.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
<div class="example"><h3>Example</h3><p><code>
- RemoveOutputFilter shtml
+ RemoveOutputFilter shtml
</code></p></div>
-<h3>See also</h3><ul><li><code class="directive"><a href="#addoutputfilter">AddOutputFilter</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="RemoveType" id="RemoveType">RemoveType</a> <a name="removetype" id="removetype">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Removes any content type associations for a set of file
-extensions</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RemoveType
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
- </a></th><td>virtual host, directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override:
- </a></th><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_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>RemoveType is
- only available in Apache 1.3.13 and later.</td></tr></table>
- <p>The <code class="directive">RemoveType</code> directive removes any MIME type
- associations for files with the given extensions. This allows
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#addoutputfilter">AddOutputFilter</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="RemoveType" id="RemoveType">RemoveType</a> <a name="removetype" id="removetype">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Removes any content type associations for a set of file
+extensions</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RemoveType <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>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_mime</td></tr>
+</table>
+ <p>The <code class="directive">RemoveType</code> directive removes any MIME
+ type associations for files with the given extensions. This allows
<code>.htaccess</code> files in subdirectories to undo any
associations inherited from parent directories or the server
config files. An example of its use might be:</p>
-<div class="example"><h3>/foo/.htaccess:</h3><p><code>
-RemoveType .cgi
-</code></p></div>
+ <div class="example"><h3>/foo/.htaccess:</h3><p><code>
+ RemoveType .cgi
+ </code></p></div>
<p>This will remove any special handling of <code>.cgi</code>
files in the <code>/foo/</code> directory and any beneath it,
- causing the files to be treated as being of the <a href="core.html#defaulttype">default type</a>.</p>
+ causing the files to be treated as being of the <code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code>.</p>
- <div class="note"><strong>Note:</strong><code class="directive">RemoveType</code> directives
- are processed <em>after</em> any <code class="directive">AddType</code>
- directives, so it is possible they may undo the effects of the
- latter if both occur within the same directory
- configuration.</div>
+ <div class="note"><h3>Note</h3>
+ <p><code class="directive">RemoveType</code> directives are processed
+ <em>after</em> any <code class="directive"><a href="#addtype">AddType</a></code>
+ directives, so it is possible they may undo the effects of the
+ latter if both occur within the same directory configuration.</p>
+ </div>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="TypesConfig" id="TypesConfig">TypesConfig</a> <a name="typesconfig" id="typesconfig">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The location of the mime.types file</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>TypesConfig <em>file-path</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>TypesConfig conf/mime.types</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_mime</td></tr></table>
- <p>The TypesConfig directive sets the location of the MIME types
- configuration file. <em>Filename</em> is relative to the <a href="core.html#serverroot">ServerRoot</a>. This file sets the
- default list of mappings from filename extensions to content
- types. Most administrators use the provided
- <code>mime.types</code> file, which associates common filename
- extensions with IANA registered content types. The current list is
- maintained at
- <code>http://www.isi.edu/in-notes/iana/assignments/media-types/media-types</code>. This
- simplifies the <code>httpd.conf</code> file by providing the
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="TypesConfig" id="TypesConfig">TypesConfig</a> <a name="typesconfig" id="typesconfig">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The location of the mime.types file</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>TypesConfig <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>TypesConfig conf/mime.types</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_mime</td></tr>
+</table>
+ <p>The <code class="directive">TypesConfig</code> directive sets the location
+ of the MIME types configuration file. <var>File-path</var> is relative
+ to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. This file sets
+ the default list of mappings from filename extensions to content
+ types. Most administrators use the provided <code>mime.types</code>
+ file, which associates common filename extensions with IANA registered
+ content types. The current list is maintained at <a href="http://www.isi.edu/in-notes/iana/assignments/media-types/media-types">http://www.isi.edu/in-notes/iana/assignments/media-types/media-types</a>.
+ This simplifies the <code>httpd.conf</code> file by providing the
majority of media-type definitions, and may be overridden by
<code class="directive"><a href="#addtype">AddType</a></code> directives as
- needed. You should not edit the <code>mime.types</code> file,
- because it may be replaced when you upgrade your server.</p>
-
+ needed. You should not edit the <code>mime.types</code> file, because
+ it may be replaced when you upgrade your server.</p>
+
<p>The file contains lines in the format of the arguments to
an <code class="directive"><a href="#addtype">AddType</a></code> directive:</p>
<div class="example"><p><code>
- MIME-type extension extension ...
+ <var>MIME-type</var> [<var>extension</var>] ...
</code></p></div>
- <p>
- The case of the extension does not matter. Blank lines, and lines
- beginning with a hash character (`#') are ignored. </p>
+ <p>The case of the extension does not matter. Blank lines, and lines
+ beginning with a hash character (<code>#</code>) are ignored.</p>
- <div class="note">Please do not send requests to the Apache HTTP Server Project
- to add any new entries in the distributed mime.types file
- unless (1) they are already registered with IANA, and (2) they
- use widely accepted, non-conflicting filename extensions across
- platforms. category/x-subtype requests will be automatically
- rejected, as will any new two-letter extensions as they will
- likely conflict later with the already crowded language and
- character set namespace.</div>
+ <div class="note">
+ Please do <strong>not</strong> send requests to the Apache HTTP
+ Server Project to add any new entries in the distributed
+ <code>mime.types</code> file unless (1) they are already
+ registered with IANA, and (2) they use widely accepted,
+ non-conflicting filename extensions across platforms.
+ <code>category/x-subtype</code> requests will be automatically
+ rejected, as will any new two-letter extensions as they will
+ likely conflict later with the already crowded language and
+ character set namespace.
+ </div>
-<h3>See also</h3><ul><li><code class="module"><a href="../mod/mod_mime_magic.html">mod_mime_magic</a></code></li></ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+<h3>See also</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_mime_magic.html">mod_mime_magic</a></code></li>
+</ul>
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mime.html.ja.jis b/docs/manual/mod/mod_mime.html.ja.jis
index e47d108..0e0b551 100644
--- a/docs/manual/mod/mod_mime.html.ja.jis
+++ b/docs/manual/mod/mod_mime.html.ja.jis
@@ -4,17 +4,34 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_mime - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_mime</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%j%/%(%9%H$5$l$?%U%!%$%k$N3HD%;R$H%U%!(B$B%$%k$N?6$kIq$$(B
+ -->
+<title>mod_mime - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_mime</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%j%/%(%9%H$5$l$?%U%!%$%k$N3HD%;R$H%U%!%$%k$N?6$kIq$$(B
($B%O%s%I%i$H%U%#%k%?(B)$B!"FbMF(B (MIME $B%?%$%W!"8@8l!"J8;z%;%C%H!"%(%s%3!<%G%#%s%0(B)
- $B$H$r4XO"(B$BIU$1$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>mime_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_mime.c</td></tr></table><h3>$B35MW(B</h3>
+ $B$H$r4XO"IU$1$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>mime_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_mime.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$B$3$N%b%8%e!<%k$O3HD%;R$r;H$C$F$$$m$$$m$J!V%a%?>pJs!W$r%U%!%$%k$K(B
$B4XO"IU$1$k$?$a$K;HMQ$5$l$^$9!#$3$N>pJs$O%I%-%e%a%s%H$N%U%!%$%kL>$H(B
MIME $B%?%$%W!"8@8l!"J8;z%;%C%H!"%(%s%3!<%G%#%s%0$H$r4XO"IU$1$^$9!#(B
- $B$3$N>pJs$O%V%i%&(B$B%6$KAw$i$l$^$9$7!"J#?t$N%U%!%$%k$NCf$+$i%f!<%6$N9%$_$N(B
+ $B$3$N>pJs$O%V%i%&%6$KAw$i$l$^$9$7!"J#?t$N%U%!%$%k$NCf$+$i%f!<%6$N9%$_$N(B
$B$b$N$,A*$P$l$k$h$&$K!"%3%s%F%s%H%M%4%7%(!<%7%g%s$G$b;H$o$l$^$9!#(B
$B%3%s%F%s%H%M%4%7%(!<%7%g%s$K4X$9$k>\$7$$>pJs$O(B <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code>
$B$r8+$F$/$@$5$$!#(B</p>
@@ -24,7 +41,7 @@
<code class="directive"><a href="#addhandler">AddHandler</a></code> $B%G%#%l%/%F%#%V!"(B
<code class="directive"><a href="#addlanguage">AddLanguage</a></code> $B%G%#%l%/%F%#%V!"(B
<code class="directive"><a href="#addtype">AddType</a></code> $B%G%#%l%/%F%#%V$O$9$Y$F!"(B
- $B%U%!%$%k$N3H(B$BD%;R$r%a%?>pJs$K%^%C%W$9$k$?$a$K;HMQ$5$l$^$9!#(B
+ $B%U%!%$%k$N3HD%;R$r%a%?>pJs$K%^%C%W$9$k$?$a$K;HMQ$5$l$^$9!#(B
$B$=$l$>$l!"%I%-%e%a%s%H$NJ8;z%;%C%H(B ($BLuCm(B: charset)$B!"(Bcontent-encoding,
content-language, MIME $B%?%$%W(B (content-type) $B$r@_Dj$7$^$9!#(B
<code class="directive"><a href="#typesconfig">TypesConfig</a></code> $B%G%#%l%/%F%#%V$O3HD%;R$r(B
@@ -39,7 +56,7 @@
<code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> $B$,(B Multiviews $B$N%^%C%A$r$H$k$H$-$K(B
$B9MN8$9$k$h$&$K$G$-$^$9!#(B</p>
- <p><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> $B$O%a%?>pJs$r%U%!%$%kL>$H4XO"(B$BIU$1$^$9$,!"(B
+ <p><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> $B$O%a%?>pJs$r%U%!%$%kL>$H4XO"IU$1$^$9$,!"(B
<code class="module"><a href="../mod/core.html">core</a></code> $B%5!<%P$K$O$"$k%3%s%F%J(B
(<em>$B$?$H$($P(B</em>, <code class="directive"><a href="../mod/core.html#location"><Location></a></code>, <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#files"><Files></a></code>) $B$NCf$N$9$Y$F$N%U%!%$%k$rFCDj$N(B
$B%a%?>pJs$H4XO"IU$1$k%G%#%l%/%F%#%V$,$"$j$^$9!#$3$l$i$N%G%#%l%/%F%#%V$K$O(B
@@ -55,7 +72,10 @@
$BJQ99$7$?$H$-$O!"$9$Y$F$NK,Ld<T$,@5$7$$%3%s%F%s%H%X%C%@$r(B
$B<u$1<h$k$h$&$K!"1F6A$r<u$1$k%U%!%$%k$K(B 'touch' $B%3%^%s%I$r<B9T$9$k(B
($B:G=*99?7F|$r99?7$9$k(B) $BI,MW$,$"$k$+$b$7$l$^$;$s!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#addcharset">AddCharset</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#addcharset">AddCharset</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#addencoding">AddEncoding</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#addhandler">AddHandler</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#addinputfilter">AddInputFilter</a></li>
@@ -73,7 +93,25 @@
<li><img alt="" src="../images/down.gif" /> <a href="#removeoutputfilter">RemoveOutputFilter</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#removetype">RemoveType</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#typesconfig">TypesConfig</a></li>
-</ul><h3>$B%H%T%C%/(B</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#multipleext">$BJ#?t$N3HD%;R$N$"$k%U%!%$%k(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#contentencoding">$B%3%s%F%s%H%(%s%3!<%G%#%s%0(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#charset-lang">$BJ8;z%;%C%H$H8@8l(B</a></li></ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code></li><li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code></li><li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code></li><li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code></li><li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</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">$BJ#?t$N3HD%;R$N$"$k%U%!%$%k(B</a></h2>
+</ul>
+<h3>$B%H%T%C%/(B</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#multipleext">$BJ#?t$N3HD%;R$N$"$k%U%!%$%k(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#contentencoding">$B%3%s%F%s%H%(%s%3!<%G%#%s%0(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#charset-lang">$BJ8;z%;%C%H$H8@8l(B</a></li>
+</ul><h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</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">$BJ#?t$N3HD%;R$N$"$k%U%!%$%k(B</a></h2>
<p>$B%U%!%$%k$OJ#?t$N3HD%;R$r;}$D$3$H$,$G$-!"3HD%;R$N=gHV$O(B<em>$BDL>o$O(B</em>$B4X78$"$j$^$;$s!#Nc$($P!"%U%!%$%k(B <code>welcome.html.fr</code>
@@ -86,7 +124,7 @@
$B$K%^%C%W$5$l$k>l9g$O!"%U%!%$%k(B <code>welcome.gif.html</code> $B$O(B
MIME $B%?%$%W(B "text/html" $B$K4XO"IU$1$i$l$^$9!#(B</p>
- <p>$BJ#?t$N3HD%(B$B;R$N$"$k%U%!%$%k$,(B MIME
+ <p>$BJ#?t$N3HD%;R$N$"$k%U%!%$%k$,(B MIME
$B%?%$%W$H%O%s%I%i$NN>J}$K4XO"IU$1$i$l$F$$$k$H$-$OCm0U$9$kI,MW$,$"$j$^$9!#(B
$B$=$N>l9g!"IaDL$O%j%/%(%9%H$,%O%s%I%i$K4XO"IU$1$i$l$?(B
$B%b%8%e!<%k$K$h$C$F07$o$l$k$3$H$K$J$j$^$9!#$?$H$($P!"3HD%;R(B
@@ -97,7 +135,9 @@
$B%?%$%W$K4XO"IU$1$i$l$^$9!#%U%!%$%k$,=hM}$5$l$k$H$-$O(B "imap-file"
$B%O%s%I%i$,;HMQ$5$l$^$9$N$G!"$=$N%U%!%$%k$O(B mod_imap
$B$N%$%a!<%8%^%C%W%U%!%$%k$H$7$F07$o$l$k$3$H$K$J$j$^$9!#(B</p>
-</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">$B%3%s%F%s%H%(%s%3!<%G%#%s%0(B</a></h2>
+</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">$B%3%s%F%s%H%(%s%3!<%G%#%s%0(B</a></h2>
<p>$BFCDj$N(B MIME $B%?%$%W$N%U%!%$%k$O%$%s%?!<%M%C%H$G$NE>Aw$r4JC1$K$9$k$?$a$K!"(B
$B$5$i$KId9f2=$9$k$3$H$,$G$-$^$9!#$3$l$ODL>o$O(B <code>gzip</code> $B$N(B
@@ -134,7 +174,9 @@
<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">$BJ8;z%;%C%H$H8@8l(B</a></h2>
+</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">$BJ8;z%;%C%H$H8@8l(B</a></h2>
@@ -177,15 +219,19 @@
<p>$B8@8l$N;XDj$OFsJ8;z$NC;=L7A$G9T$J$o$l$^$9!#(B<code>charset</code> $B$,(B
$B;HMQ$9$Y$-J8;z%;%C%H$NL>A0$G$9!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%kL>$N3HD%;R$r;XDj$5$l$?J8;z%;%C%H$K%^%C%W$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddCharset <em>charset extension</em>
-[<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>AddCharset $B$O(B Apache 1.3.10 $B0J9_$G$N$_;HMQ2DG=(B</td></tr></table>
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%kL>$N3HD%;R$r;XDj$5$l$?J8;z%;%C%H$K%^%C%W$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddCharset <em>charset extension</em>
+[<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>AddCharset $B$O(B Apache 1.3.10 $B0J9_$G$N$_;HMQ2DG=(B</td></tr>
+</table>
<p>AddCharset $B%G%#%l%/%F%#%V$O!"M?$($i$l$?3HD%;R$r;XDj$5$l$?(B
charset $B$K%^%C%W$7$^$9!#(B<em>charset</em> $B$O!"3HD%;R(B
@@ -211,15 +257,25 @@
<p>$B0z?t(B <em>extension</em>$B$OBgJ8;z>.J8;z$r6hJL$;$:!"(B
$B:G=i$N%I%C%H$O$"$C$F$b$J$/$F$b9=$$$^$;$s!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li><li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</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="AddEncoding" id="AddEncoding">AddEncoding</a> <a name="addencoding" id="addencoding">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%kL>$N3HD%;R$r;XDj$5$l$?%(%s%3!<%G%#%s%0(B
-$B$K%^%C%W$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddEncoding
- <em>MIME-enc extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</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="AddEncoding" id="AddEncoding">AddEncoding</a> <a name="addencoding" id="addencoding">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%kL>$N3HD%;R$r;XDj$5$l$?%(%s%3!<%G%#%s%0(B
+$B$K%^%C%W$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddEncoding
+ <em>MIME-enc extension</em> [<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+</table>
<p>AddEncoding $B%G%#%l%/%F%#%V$O!"M?$($i$l$?3HD%;R$r;XDj$5$l$?(B
$B%(%s%3!<%G%#%s%0$K%^%C%W$7$^$9!#(B<em>MIME-enc</em> $B$O!"3HD%;R(B
@@ -255,14 +311,19 @@
<p>$B0z?t(B <em>extension</em> $B$OBgJ8;z>.J8;z$r6hJL$;$:!"(B
$B:G=i$N%I%C%H$O$"$C$F$b$J$/$F$b9=$$$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AddHandler" id="AddHandler">AddHandler</a> <a name="addhandler" id="addhandler">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%kL>$N3HD%;R$r;XDj$5$l$?%O%s%I%i$K%^%C%W$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddHandler
- <em>handler-name extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddHandler" id="AddHandler">AddHandler</a> <a name="addhandler" id="addhandler">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%kL>$N3HD%;R$r;XDj$5$l$?%O%s%I%i$K%^%C%W$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddHandler
+ <em>handler-name extension</em> [<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+</table>
<p>$B3HD%;R(B <em>extension</em> $B$,L>A0$K$"$k%U%!%$%k$O;XDj$5$l$?(B <a href="../handler.html">handler-name</a> $B$K07$o$l$^$9!#(B
$B$3$N?7$7$$%^%C%T%s%0$O4{$K$"$kB>$N%^%C%T%s%0$KDI2C$5$l!"(B
$BF1$83HD%;R(B <em>extension</em>
@@ -280,17 +341,26 @@
<p>$B0z?t(B <em>extension</em> $B$OBgJ8;z>.J8;z$r6hJL$;$:!"(B
$B:G=i$N%I%C%H$O$"$C$F$b$J$/$F$b9=$$$^$;$s!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</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="AddInputFilter" id="AddInputFilter">AddInputFilter</a> <a name="addinputfilter" id="addinputfilter">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k$N3HD%;R$r%/%i%$%"%s%H$N%j%/%(%9%H$r=hM}$9$k(B
- $B%U%#%k%?$K%^%C%W$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddInputFilter
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</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="AddInputFilter" id="AddInputFilter">AddInputFilter</a> <a name="addinputfilter" id="addinputfilter">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k$N3HD%;R$r%/%i%$%"%s%H$N%j%/%(%9%H$r=hM}$9$k(B
+ $B%U%#%k%?$K%^%C%W$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddInputFilter
<em>filter</em>[<em>;filter</em>...] extension
- [<em>extension</em> ...]</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>AddInputFilter
- $B$O(B Apache 2.0.26 $B0J9_$N$_$G;HMQ2DG=!#(B</td></tr></table>
+ [<em>extension</em> ...]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>AddInputFilter
+ $B$O(B Apache 2.0.26 $B0J9_$N$_$G;HMQ2DG=!#(B</td></tr>
+</table>
<p>AddInputFilter $B$O%U%!%$%k$N3HD%;R(B <em>extension</em> $B$r(B
$B%/%i%$%"%s%H$N%j%/%(%9%H$d(B POST $B$,%5!<%P$KMh$?$H$-$K(B
@@ -304,14 +374,19 @@
$B7R$$$G=q$/I,MW$,$"$j$^$9!#%U%#%k%?$H(B <em>extension</em> $B$H$N(B
$BN>J}$N0z?t$OBgJ8;z>.J8;z$r6hJL$;$:!"3HD%;R$N:G=i$N%I%C%H$O(B
$B$"$C$F$b$J$/$F$b9=$$$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AddLanguage" id="AddLanguage">AddLanguage</a> <a name="addlanguage" id="addlanguage">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%kL>$r;XDj$5$l$?8@8l$K%^%C%W(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddLanguage
- <em>MIME-lang extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddLanguage" id="AddLanguage">AddLanguage</a> <a name="addlanguage" id="addlanguage">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%kL>$r;XDj$5$l$?8@8l$K%^%C%W(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddLanguage
+ <em>MIME-lang extension</em> [<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+</table>
<p>AddLanguage $B%G%#%l%/%F%#%V$O!"M?$($i$l$?3HD%;R$r;XDj$5$l$?(B
content language $B$K%^%C%W$7$^$9!#(B<em>MIME-lang</em> $B$O!"3HD%;R(B
@@ -350,18 +425,27 @@
<p>$B0z?t(B <em>extension</em> $B$OBgJ8;z>.J8;z$r6hJL$;$:!"(B
$B:G=i$N%I%C%H$O$"$C$F$b$J$/$F$b9=$$$^$;$s!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</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="AddOutputFilter" id="AddOutputFilter">AddOutputFilter</a> <a name="addoutputfilter" id="addoutputfilter">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%kL>$N3HD%;R$r%5!<%P$+$i$N1~Ez$r=hM}$9$k%U%#%k%?$K(B
- $B%^%C%W$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddOutputFilter
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</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="AddOutputFilter" id="AddOutputFilter">AddOutputFilter</a> <a name="addoutputfilter" id="addoutputfilter">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%kL>$N3HD%;R$r%5!<%P$+$i$N1~Ez$r=hM}$9$k%U%#%k%?$K(B
+ $B%^%C%W$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddOutputFilter
<em>filter</em>[<em>;filter</em>...] extension
- [<em>extension</em> ...]</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td /></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>AddOutputFilter
- $B$O(B Apache 2.0.26 $B0J9_$G$N$_;HMQ2DG=!#(B</td></tr></table>
+ [<em>extension</em> ...]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td /></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>AddOutputFilter
+ $B$O(B Apache 2.0.26 $B0J9_$G$N$_;HMQ2DG=!#(B</td></tr>
+</table>
<p><code class="directive">AddOutputFilter</code> $B%G%#%l%/%F%#%V$O(B
$B3HD%;R(B <em>extension</em> $B$r%5!<%P$N1~Ez$,%/%i%$%"%s%H$KAw$i$l$k(B
@@ -383,14 +467,19 @@
$BN>J}$N0z?t$OBgJ8;z>.J8;z$r6hJL$;$:!"3HD%;R$N:G=i$N%I%C%H$O(B
$B$"$C$F$b$J$/$F$b9=$$$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AddType" id="AddType">AddType</a> <a name="addtype" id="addtype">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%kL>$N3HD%;R$r;XDj$5$l$?%3%s%F%s%H%?%$%W$K%^%C%W(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AddType <em>MIME-type
- extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddType" id="AddType">AddType</a> <a name="addtype" id="addtype">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%kL>$N3HD%;R$r;XDj$5$l$?%3%s%F%s%H%?%$%W$K%^%C%W(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AddType <em>MIME-type
+ extension</em> [<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+</table>
<p>AddType $B%G%#%l%/%F%#%V$O!"(B
$BM?$($i$l$?3HD%;R$r;XDj$5$l$?%3%s%F%s%H%?%$%W$K%^%C%W$7$^$9!#(B
@@ -414,17 +503,27 @@
<p>$B0z?t(B <em>extension</em> $B$OBgJ8;z>.J8;z$r6hJL$;$:!"(B
$B:G=i$N%I%C%H$O$"$C$F$b$J$/$F$b9=$$$^$;$s!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li><li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</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="DefaultLanguage" id="DefaultLanguage">DefaultLanguage</a> <a name="defaultlanguage" id="defaultlanguage">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B$"$k%9%3!<%W$N$9$Y$F$N%U%!%$%k$r;XDj$5$l$?8@8l$K(B
-$B@_Dj$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>DefaultLanguage
- <em>MIME-lang</em></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>DefaultLanguage
- $B$O(B Apache 1.3.4 $B$N$_$G;HMQ2DG=(B</td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</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="DefaultLanguage" id="DefaultLanguage">DefaultLanguage</a> <a name="defaultlanguage" id="defaultlanguage">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B$"$k%9%3!<%W$N$9$Y$F$N%U%!%$%k$r;XDj$5$l$?8@8l$K(B
+$B@_Dj$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>DefaultLanguage
+ <em>MIME-lang</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>DefaultLanguage
+ $B$O(B Apache 1.3.4 $B$N$_$G;HMQ2DG=(B</td></tr>
+</table>
<p>DefaultLanguage $B%G%#%l%/%F%#%V$O!"(BApache
$B$,%G%#%l%/%F%#%V$N%9%3!<%W(B (<em>$BNc$($P(B</em>$B!"$=$N;~E@$N(B
@@ -448,14 +547,23 @@
DefaultLanguage en
</code></p></div>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</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="ModMimeUsePathInfo" id="ModMimeUsePathInfo">ModMimeUsePathInfo</a> <a name="modmimeusepathinfo" id="modmimeusepathinfo">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>path_info $B%3%s%]!<%M%s%H$r%U%!%$%kL>$N0lIt$H$7$F07$&$h$&$K(B mod_mime
-$B$KDLCN$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ModMimeUsePathInfo On|Off</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%G%#%l%/%H%j(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 2.0.41 $B0J9_(B</td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</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="ModMimeUsePathInfo" id="ModMimeUsePathInfo">ModMimeUsePathInfo</a> <a name="modmimeusepathinfo" id="modmimeusepathinfo">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>path_info $B%3%s%]!<%M%s%H$r%U%!%$%kL>$N0lIt$H$7$F07$&$h$&$K(B mod_mime
+$B$KDLCN$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ModMimeUsePathInfo On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%G%#%l%/%H%j(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>Apache 2.0.41 $B0J9_(B</td></tr>
+</table>
<p><code class="directive">ModMimeUsePathInfo</code> $B%G%#%l%/%F%#%V$O!"(B
<code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> $B$N;}$D%G%#%l%/%F%#%V$r(B
$B%j%/%(%9%H$KE,MQ$5$;$k$?$a$K!"%U%!%$%kL>$H(B path_info URL
@@ -479,16 +587,21 @@
INCLUDES $B%U%#%k%?$r%j%/%(%9%H$KIU2C$5$;$^$9!#(B
<code class="directive">ModMimeUsePathInfo</code> $B$,@_Dj$5$l$J$1$l$P!"(B
icludes $B%U%#%k%?$OIU2C$5$l$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="MultiviewsMatch" id="MultiviewsMatch">MultiviewsMatch</a> <a name="multiviewsmatch" id="multiviewsmatch">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>MultiViews $B$G$N%^%C%A%s%0$N8!:w$K4^$^$;$k(B
-$B%U%!%$%k$N%?%$%W$r;XDj$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>MultiviewsMatch
- <em>[NegotiatedOnly] [Handlers] [Filters] [Any]</em></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 2.0.26 $B0J9_(B</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MultiviewsMatch" id="MultiviewsMatch">MultiviewsMatch</a> <a name="multiviewsmatch" id="multiviewsmatch">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>MultiViews $B$G$N%^%C%A%s%0$N8!:w$K4^$^$;$k(B
+$B%U%!%$%k$N%?%$%W$r;XDj$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>MultiviewsMatch
+ <em>[NegotiatedOnly] [Handlers] [Filters] [Any]</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>Apache 2.0.26 $B0J9_(B</td></tr>
+</table>
<p><code class="directive">MultiviewsMatch</code> $B$r;HMQ$9$k$3$H$G!"(B
<a href="mod_negotiation.html">mod_negotiation</a> $B$N(B
@@ -526,15 +639,24 @@
MultiviewsMatch Handlers Filters
</code></p></div>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="directive"><a href="../mod/core.html#options">Options</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="RemoveCharset" id="RemoveCharset">RemoveCharset</a> <a name="removecharset" id="removecharset">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k$N3HD%;R$K4XO"IU$1$i$l$?$9$Y$F$NJ8;z%;%C%H(B
-$B$r2r=|$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>RemoveCharset
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>RemoveCharset $B$O(B Apache 2.0.24 $B0J9_$G;HMQ2DG=(B</td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#options">Options</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="RemoveCharset" id="RemoveCharset">RemoveCharset</a> <a name="removecharset" id="removecharset">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k$N3HD%;R$K4XO"IU$1$i$l$?$9$Y$F$NJ8;z%;%C%H(B
+$B$r2r=|$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>RemoveCharset
+ <em>extension</em> [<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>RemoveCharset $B$O(B Apache 2.0.24 $B0J9_$G;HMQ2DG=(B</td></tr>
+</table>
<p><code class="directive">RemoveCharset</code> $B%G%#%l%/%F%#%V(B
$B$OM?$($i$l$?3HD%;R$K4XO"IU$1$i$l$?J8;z%;%C%H$r<h$j>C$7$^$9!#(B
$B$3$l$K$h$j!"%5%V%G%#%l%/%H%j$K$"$k(B <code>.htaccess</code>
@@ -548,16 +670,21 @@
RemoveCharset .html .shtml
</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="RemoveEncoding" id="RemoveEncoding">RemoveEncoding</a> <a name="removeencoding" id="removeencoding">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k$N3HD%;R$K4XO"IU$1$i$l$?$9$Y$F$N%3%s%F%s%H%(%s%3!<%G%#%s%0(B
-$B$r2r=|$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>RemoveEncoding
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>RemoveEncoding
- $B$O(B Apache 1.3.13 $B$N$_$G;HMQ2DG=(B</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveEncoding" id="RemoveEncoding">RemoveEncoding</a> <a name="removeencoding" id="removeencoding">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k$N3HD%;R$K4XO"IU$1$i$l$?$9$Y$F$N%3%s%F%s%H%(%s%3!<%G%#%s%0(B
+$B$r2r=|$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>RemoveEncoding
+ <em>extension</em> [<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>RemoveEncoding
+ $B$O(B Apache 1.3.13 $B$N$_$G;HMQ2DG=(B</td></tr>
+</table>
<p><code class="directive">RemoveEncoding</code> $B%G%#%l%/%F%#%V$O!"(B
$BM?$($i$l$?3HD%;R$K4XO"IU$1$i$l$?%(%s%3!<%G%#%s%0$r<h$j>C$7$^$9!#(B
@@ -587,16 +714,21 @@
<p><em>extension</em> $B$OBgJ8;z>.J8;z$r6hJL$7$^$;$s!#(B
$B$^$?!":G=i$N%I%C%H$O$"$C$F$b$J$/$F$b9=$$$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RemoveHandler" id="RemoveHandler">RemoveHandler</a> <a name="removehandler" id="removehandler">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k$N3HD%;R$K4XO"IU$1$i$l$?$9$Y$F$N%O%s%I%i$r(B
-$B2r=|$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>RemoveHandler
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>RemoveHandler $B$O(B
- Apache 1.3.4 $B0J9_$G$N$_;HMQ2DG=(B</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveHandler" id="RemoveHandler">RemoveHandler</a> <a name="removehandler" id="removehandler">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k$N3HD%;R$K4XO"IU$1$i$l$?$9$Y$F$N%O%s%I%i$r(B
+$B2r=|$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>RemoveHandler
+ <em>extension</em> [<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>RemoveHandler $B$O(B
+ Apache 1.3.4 $B0J9_$G$N$_;HMQ2DG=(B</td></tr>
+</table>
<p><code>RemoveHandler</code> $B%G%#%l%/%F%#%V(B
$B$OM?$($i$l$?3HD%;R$K4XO"IU$1$i$l$?%O%s%I%i$r<h$j>C$7$^$9!#(B
@@ -619,14 +751,19 @@
<p><em>extension</em> $B$OBgJ8;z>.J8;z$r6hJL$7$^$;$s!#(B
$B$^$?!":G=i$N%I%C%H$O$"$C$F$b$J$/$F$b9=$$$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RemoveInputFilter" id="RemoveInputFilter">RemoveInputFilter</a> <a name="removeinputfilter" id="removeinputfilter">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k3HD%;R$K4XO"IU$1$i$l$?F~NO%U%#%k%?$r2r=|$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>RemoveInputFilter
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 2.0.26 $B0J9_(B</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveInputFilter" id="RemoveInputFilter">RemoveInputFilter</a> <a name="removeinputfilter" id="removeinputfilter">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k3HD%;R$K4XO"IU$1$i$l$?F~NO%U%#%k%?$r2r=|$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>RemoveInputFilter
+ <em>extension</em> [<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>Apache 2.0.26 $B0J9_(B</td></tr>
+</table>
<p><code class="directive">RemoveInputFilter</code> $B%G%#%l%/%F%#%V$O(B
$B;XDj$5$l$?%U%!%$%k3HD%;R$K4XO"IU$1$i$l$?F~NO%U%#%k%?$r2r=|$7$^$9!#(B
@@ -637,14 +774,19 @@
<p><em>extension</em> $B0z?t$OBgJ8;z>.J8;z$r6hJL$7$^$;$s!#$^$?!"(B
$B:G=i$N%I%C%H$O$"$C$F$b$J$/$F$b9=$$$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RemoveLanguage" id="RemoveLanguage">RemoveLanguage</a> <a name="removelanguage" id="removelanguage">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k3HD%;R$K4XO"IU$1$i$l$?8@8l$r2r=|$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>RemoveLanguage
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 2.0.24 $B0J9_(B</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveLanguage" id="RemoveLanguage">RemoveLanguage</a> <a name="removelanguage" id="removelanguage">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k3HD%;R$K4XO"IU$1$i$l$?8@8l$r2r=|$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>RemoveLanguage
+ <em>extension</em> [<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>Apache 2.0.24 $B0J9_(B</td></tr>
+</table>
<p><code class="directive">RemoveLanguage</code> $B%G%#%l%/%F%#%V$O(B
$B;XDj$5$l$?%U%!%$%k3HD%;R$K4XO"IU$1$i$l$?8@8l$r2r=|$7$^$9!#(B
@@ -654,16 +796,21 @@
<p><em>extension</em> $B0z?t$OBgJ8;z>.J8;z$r6hJL$7$^$;$s!#$^$?!"(B
$B:G=i$N%I%C%H$O$D$$$F$b$D$+$J$/$F$b9=$$$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RemoveOutputFilter" id="RemoveOutputFilter">RemoveOutputFilter</a> <a name="removeoutputfilter" id="removeoutputfilter">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k3HD%;R$K4XO"IU$1$i$l$?=PNO%U%#%k%?$r2r=|$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>RemoveOutputFilter
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td /></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>RemoveOutputFilter $B$O(B Apache
-2.0.26 $B0J9_$G$N$_;HMQ2DG=(B</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveOutputFilter" id="RemoveOutputFilter">RemoveOutputFilter</a> <a name="removeoutputfilter" id="removeoutputfilter">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k3HD%;R$K4XO"IU$1$i$l$?=PNO%U%#%k%?$r2r=|$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>RemoveOutputFilter
+ <em>extension</em> [<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td /></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>RemoveOutputFilter $B$O(B Apache
+2.0.26 $B0J9_$G$N$_;HMQ2DG=(B</td></tr>
+</table>
<p><code class="directive">RemoveOutputFilter</code> $B%G%#%l%/%F%#%V$O(B
$B;XDj$5$l$?%U%!%$%k3HD%;R$K4XO"IU$1$i$l$?=PNO%U%#%k%?$r2r=|$7$^$9!#(B
@@ -678,17 +825,26 @@
RemoveOutputFilter shtml
</code></p></div>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="directive"><a href="#addoutputfilter">AddOutputFilter</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="RemoveType" id="RemoveType">RemoveType</a> <a name="removetype" id="removetype">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%U%!%$%k$N3HD%;R$H4XO"IU$1$i$l$?%3%s%F%s%H%?%$%W$r(B
-$B2r=|$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>RemoveType
- <em>extension</em> [<em>extension</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td /></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>RemoveType $B$O(B
- Apache 1.3.13 $B0J9_$G$N$_;HMQ2DG=!#(B</td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="directive"><a href="#addoutputfilter">AddOutputFilter</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="RemoveType" id="RemoveType">RemoveType</a> <a name="removetype" id="removetype">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%U%!%$%k$N3HD%;R$H4XO"IU$1$i$l$?%3%s%F%s%H%?%$%W$r(B
+$B2r=|$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>RemoveType
+ <em>extension</em> [<em>extension</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td /></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>RemoveType $B$O(B
+ Apache 1.3.13 $B0J9_$G$N$_;HMQ2DG=!#(B</td></tr>
+</table>
<p><code class="directive">RemoveType</code> $B%G%#%l%/%F%#%V$OM?$($i$l$?3HD%;R$N(B
MIME $B%?%$%W$N4XO"IU$1$r<h$j>C$7$^$9!#$3$l$K$h$j!"(B
@@ -710,13 +866,18 @@
<p><em>extension</em> $B$OBgJ8;z>.J8;z$r6hJL$7$^$;$s!#(B
$B$^$?!":G=i$N%I%C%H$O$"$C$F$b$J$/$F$b9=$$$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="TypesConfig" id="TypesConfig">TypesConfig</a> <a name="typesconfig" id="typesconfig">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>mime.types $B%U%!%$%k$N0LCV(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>TypesConfig <em>file-path</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>TypesConfig conf/mime.types</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B%Y!<%9(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_mime</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="TypesConfig" id="TypesConfig">TypesConfig</a> <a name="typesconfig" id="typesconfig">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>mime.types $B%U%!%$%k$N0LCV(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>TypesConfig <em>file-path</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>TypesConfig conf/mime.types</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B%Y!<%9(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_mime</td></tr>
+</table>
<p>TypesConfig $B%G%#%l%/%F%#%V$O!"(BMIME
$B%?%$%W@_Dj%U%!%$%k$N0LCV$r@_Dj$7$^$9!#(B<em>filename</em> $B$O(B
@@ -753,4 +914,14 @@
$B8@8l$dJ8;z%;%C%H$NL>A06u4V$G4{$K;HMQ$5$l$F$$$F!">WFM$N2DG=@-$N$"$k(B
2 $BJ8;z$N3HD%;R$b5Q2<$5$l$^$9!#(B</div>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="module"><a href="../mod/mod_mime_magic.html">mod_mime_magic</a></code></li></ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_mime_magic.html">mod_mime_magic</a></code></li>
+</ul>
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mime.xml b/docs/manual/mod/mod_mime.xml
index 0b61532..f24a41d 100644
--- a/docs/manual/mod/mod_mime.xml
+++ b/docs/manual/mod/mod_mime.xml
@@ -21,7 +21,7 @@
negotiation, so the user's preferences are respected when
choosing one of several possible files to serve. See
<module>mod_negotiation</module> for more information
- about content negotiation. </p>
+ about <a href="../content-negotiation.html">content negotiation</a>.</p>
<p>The directives <directive
module="mod_mime">AddCharset</directive>, <directive
@@ -70,9 +70,8 @@
their last modified date) to ensure that all visitors are
receive the corrected content headers.</p>
</summary>
-
- <seealso><directive
- module="mod_mime_magic">MimeMagicFile</directive></seealso>
+<seealso><directive
+module="mod_mime_magic">MimeMagicFile</directive></seealso>
<seealso><directive module="core">AddDefaultCharset</directive></seealso>
<seealso><directive module="core">ForceType</directive></seealso>
<seealso><directive module="core">DefaultType</directive></seealso>
@@ -80,37 +79,34 @@
<seealso><directive module="core">SetInputFilter</directive></seealso>
<seealso><directive module="core">SetOutputFilter</directive></seealso>
-
-<section id="multipleext">
-<title>Files with Multiple Extensions</title>
-
+<section id="multipleext"><title>Files with Multiple Extensions</title>
<p>Files can have more than one extension, and the order of the
extensions is <em>normally</em> irrelevant. For example, if the
file <code>welcome.html.fr</code> maps onto content type
- text/html 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 which maps onto the same
+ <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 which maps onto the same
type of meta-information, then the one to the right will be
- used. For example, if ".gif" maps to the MIME-type image/gif
- and ".html" maps to the MIME-type text/html, then the file
- <code>welcome.gif.html</code> will be associated with the
- MIME-type "text/html".</p>
+ used. For example, if <code>.gif</code> maps to the MIME-type
+ <code>image/gif</code> and <code>.html</code> maps to the MIME-type
+ <code>text/html</code>, then the file <code>welcome.gif.html</code>
+ will be associated with the MIME-type <code>text/html</code>.</p>
<p>Care should be taken when a file with multiple extensions
gets associated with both a MIME-type and a handler. This will
usually result in the request being by the module associated
with the handler. For example, if the <code>.imap</code>
- extension is mapped to the handler "imap-file" (from mod_imap)
- and the <code>.html</code> extension is mapped to the MIME-type
- "text/html", then the file <code>world.imap.html</code> will be
- associated with both the "imap-file" handler and "text/html"
- MIME-type. When it is processed, the "imap-file" handler will
- be used, and so it will be treated as a mod_imap imagemap
+ extension is mapped to the handler <code>imap-file</code> (from
+ <module>mod_imap</module>) and the <code>.html</code> extension is
+ mapped to the MIME-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> MIME-type.
+ When it is processed, the <code>imap-file</code> handler will be used,
+ and so it will be treated as a <module>mod_imap</module> imagemap
file.</p>
</section>
<section id="contentencoding"><title>Content encoding</title>
-
<p>A file of a particular MIME type can additionally be encoded a
particular way to simplify transmission over the Internet.
While this usually will refer to compression, such as
@@ -119,18 +115,18 @@
designed for transmitting a binary file in an ASCII (text)
format.</p>
- <p>The MIME RFC puts it this way:</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>
- <note>
- The Content-Encoding entity-header field is used as a
- modifier to the media-type. When present, its value indicates
- what additional content coding has been applied to the
- resource, and thus what decoding mechanism must be applied in
- order to obtain the media-type referenced by the Content-Type
- header field. The Content-Encoding is primarily used to allow
- a document to be compressed without losing the identity of
- its underlying media type.
- </note>
+ <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
@@ -146,18 +142,14 @@
<code>Resume.doc.zip</code>would be known to be a pkzip'ed Word
document.</p>
- <p>Apache send a <code>Content-encoding</code> header with the
+ <p>Apache sends a <code>Content-encoding</code> header with the
resource, in order to tell the client browser about the
encoding method.</p>
<example>Content-encoding: pkzip</example>
-
</section>
-<section id="charset-lang">
-
-<title>Character sets and languages</title>
-
+<section id="charset-lang"><title>Character sets and languages</title>
<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
@@ -171,7 +163,7 @@
<module>mod_negotiation</module>) 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
+ encoding or mime type. All filename extensions associations
created with <directive module="mod_mime">AddCharset</directive>,
<directive module="mod_mime">AddEncoding</directive>, <directive
module="mod_mime">AddLanguage</directive> and <directive
@@ -185,118 +177,99 @@
from matching by using the <directive module="mod_mime"
>MultiviewsMatch</directive> directive.</p>
-<section>
-<title>Charset</title>
+ <section id="charset"><title>Charset</title>
+ <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>
- <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>
+ <example>
+ Content-Language: en, fr<br />
+ Content-Type: text/plain; charset=ISO-8859-1
+ </example>
-<example>
-Content-Language: en, fr<br />
-Content-Type: text/plain; charset=ISO-8859-2
-</example>
-
- <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>
+ <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>
+ </section>
</section>
-</section>
-
<directivesynopsis>
<name>AddCharset</name>
-<description>Maps the given filename extensions
- to the specified content charset</description>
-<syntax>AddCharset <em>charset extension</em>
-[<em>extension</em>] ...</syntax>
-<contextlist>
-<context>server config</context>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
+<description>Maps the given filename extensions to the specified content
+charset</description>
+<syntax>AddCharset <var>charset</var> <var>extension</var>
+[<var>extension</var>] ...</syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
-<compatibility>AddCharset is only available in Apache
-1.3.10 and later</compatibility>
<usage>
-
- <p>The AddCharset directive maps the given filename extensions
- to the specified content charset. <em>charset</em> is the MIME
- charset parameter of filenames containing <em>extension</em>.
- This mapping is added to any already in force, overriding any
- mappings that already exist for the same <em>extension</em>.</p>
+ <p>The <directive>AddCharset</directive> directive maps the given
+ filename extensions to the specified content charset. <var>charset</var>
+ is the MIME charset parameter of filenames containing
+ <var>extension</var>. This mapping is added to any already in force,
+ overriding any mappings that already exist for the same
+ <var>extension</var>.</p>
- <p>Example:</p>
-<example>
- AddLanguage ja .ja<br />
- AddCharset EUC-JP .euc<br />
- AddCharset ISO-2022-JP .jis<br />
- AddCharset SHIFT_JIS .sjis
-</example>
+ <example><title>Example</title>
+ AddLanguage ja .ja<br />
+ AddCharset EUC-JP .euc<br />
+ AddCharset ISO-2022-JP .jis<br />
+ AddCharset SHIFT_JIS .sjis
+ </example>
<p>Then the document <code>xxxx.ja.jis</code> will be treated
- as being a Japanese document whose charset is ISO-2022-JP (as
- will the document <code>xxxx.jis.ja</code>). The AddCharset
- directive is useful for both to inform the client about the
- character encoding of the document so that the document can be
- interpreted and displayed appropriately, and for <a
+ as being a Japanese document whose charset is <code>ISO-2022-JP</code>
+ (as will the document <code>xxxx.jis.ja</code>). The
+ <directive>AddCharset</directive> directive is useful for both to
+ inform the client about the character encoding of the document so that
+ the document can be interpreted and displayed appropriately, and for <a
href="../content-negotiation.html">content negotiation</a>,
where the server returns one from several documents based on
the client's charset preference.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-
</usage>
<seealso><module>mod_negotiation</module></seealso>
<seealso><directive module="core">AddDefaultCharset</directive></seealso>
-
</directivesynopsis>
<directivesynopsis>
<name>AddEncoding</name>
-<description>Maps the given filename extensions
- to the specified encoding type</description>
-<syntax>AddEncoding
- <em>MIME-enc extension</em> [<em>extension</em>] ...</syntax>
-<contextlist>
-<context>server config</context>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
+<description>Maps the given filename extensions to the specified encoding
+type</description>
+<syntax>AddEncoding <var>MIME-enc</var> <var>extension</var>
+[<var>extension</var>] ...</syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
-
<usage>
+ <p>The <directive>AddEncoding</directive> directive maps the given
+ filename extensions to the specified encoding type. <var>MIME-enc</var>
+ is the MIME encoding to use for documents containing the
+ <var>extension</var>. This mapping is added to any already in force,
+ overriding any mappings that already exist for the same
+ <var>extension</var>.</p>
- <p>The AddEncoding directive maps the given filename extensions
- to the specified encoding type. <em>MIME-enc</em> is the MIME
- encoding to use for documents containing the
- <em>extension</em>. This mapping is added to any already in
- force, overriding any mappings that already exist for the same
- <em>extension</em>. Example:</p>
-
- <example>
+ <example><title>Example</title>
AddEncoding x-gzip .gz<br />
AddEncoding x-compress .Z
</example>
- <p>This will cause filenames containing the .gz extension to be
- marked as encoded using the x-gzip encoding, and filenames
- containing the .Z extension to be marked as encoded with
- x-compress. </p>
+ <p>This will cause filenames containing the <code>.gz</code> extension
+ to be marked as encoded using the <code>x-gzip</code> encoding, and
+ filenames containing the <code>.Z</code> extension to be marked as
+ encoded with <code>x-compress</code>.</p>
- <p>Old clients expect <code>x-gzip</code> and
- <code>x-compress</code>, however the standard dictates that
- they're equivalent to <code>gzip</code> and
- <code>compress</code> respectively. Apache does content
- encoding comparisons by ignoring any leading <code>x-</code>.
+ <p>Old clients expect <code>x-gzip</code> and <code>x-compress</code>,
+ however the standard dictates that they're equivalent to
+ <code>gzip</code> and <code>compress</code> respectively. Apache does
+ content encoding comparisons by ignoring any leading <code>x-</code>.
When responding with an encoding Apache will use whatever form
(<em>i.e.</em>, <code>x-foo</code> or <code>foo</code>) the
client requested. If the client didn't specifically request a
@@ -307,182 +280,149 @@
recent encodings, such as <code>deflate</code> should be
specified without the <code>x-</code>.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-
</usage>
</directivesynopsis>
<directivesynopsis>
<name>AddHandler</name>
-<description>Maps the filename extensions
-to the specified handler</description>
-<syntax>AddHandler
- <em>handler-name extension</em> [<em>extension</em>] ...</syntax>
-<contextlist>
-<context>server config</context>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
+<description>Maps the filename extensions to the specified
+handler</description>
+<syntax>AddHandler <var>handler-name</var> <var>extension</var>
+[<var>extension</var>] ...</syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
<usage>
-<p>Files having the name <em>extension</em> will be served by the
-specified <a href="../handler.html">handler-name</a>. This mapping is
-added to any already in force, overriding any mappings that already
-exist for the same <em>extension</em>. For example, to activate CGI
-scripts with the file extension "<code>.cgi</code>", you might
-use:</p>
+ <p>Files having the name <var>extension</var> will be served by the
+ specified <var><a href="../handler.html">handler-name</a></var>. This
+ mapping is added to any already in force, overriding any mappings that
+ already exist for the same <var>extension</var>. For example, to
+ activate CGI scripts with the file extension <code>.cgi</code>, you
+ might use:</p>
-<example>
- AddHandler cgi-script .cgi
-</example>
+ <example>
+ AddHandler cgi-script .cgi
+ </example>
- <p>Once that has been put into your srm.conf or httpd.conf
- file, any file containing the "<code>.cgi</code>" extension
- will be treated as a CGI program.</p>
+ <p>Once that has been put into your httpd.conf file, any file containing
+ the <code>.cgi</code> extension will be treated as a CGI program.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-
</usage>
<seealso><directive module="core">SetHandler</directive></seealso>
</directivesynopsis>
<directivesynopsis>
<name>AddInputFilter</name>
-<description>Maps filename extensions
- to the filters that will process
- client requests</description>
-<syntax>AddInputFilter
- <em>filter</em>[<em>;filter</em>...] extension
- [<em>extension</em> ...]</syntax>
-<contextlist>
-<context>server config</context>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
-<compatibility>AddInputFilter
- is only available in Apache 2.0.26 and later.</compatibility>
+<description>Maps filename extensions to the filters that will process
+client requests</description>
+<syntax>AddInputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context><context>.htaccess</context></contextlist>
+<override>FileInfo</override>
+<compatibility>AddInputFilter is only available in Apache 2.0.26 and
+later.</compatibility>
<usage>
-
- <p>AddInputFilter maps the filename extensions <em>extension</em>
- to the <a href="../filter.html">filters</a> which will process
- client requests and POST input when they are received by the
- server. This is in addition to any filters defined elsewhere,
- including the <a
- href="core.html#setinputfilter">SetInputFilter</a> directive.
- This mapping is merged over any already in force, overriding any
- mappings that already exist for the same <em>extension</em>.</p>
+ <p><directive>AddInputFilter</directive> maps the filename extension
+ <var>extension</var> to the <a href="../filter.html">filters</a> which
+ will process client requests and POST input when they are received by
+ the server. This is in addition to any filters defined elsewhere,
+ including the <directive module="core">SetInputFilter</directive>
+ directive. This mapping is merged over any already in force, overriding
+ any mappings that already exist for the same <var>extension</var>.</p>
<p>If more than one filter is specified, they must be separated
by semicolons in the order in which they should process the
- content. Both the filter and <em>extension</em> arguments are
+ content. Both the filter and <var>extension</var> arguments are
case-insensitive, and the extension may be specified with or
without a leading dot.</p>
-
</usage>
-
</directivesynopsis>
-
<directivesynopsis>
<name>AddLanguage</name>
-<description>Maps the given filename extension
-to the specified content language</description>
-<syntax>AddLanguage
- <em>MIME-lang extension</em> [<em>extension</em>] ...</syntax>
-<contextlist>
-<context>server config</context>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
+<description>Maps the given filename extension to the specified content
+language</description>
+<syntax>AddLanguage <var>MIME-lang</var> <var>extension</var>
+[<var>extension</var>] ...</syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
<usage>
+ <p>The <directive>AddLanguage</directive> directive maps the given
+ filename extension to the specified content language.
+ <var>MIME-lang</var> is the MIME language of filenames containing
+ <var>extension</var>. This mapping is added to any already in force,
+ overriding any mappings that already exist for the same
+ <var>extension</var>.</p>
- <p>The AddLanguage directive maps the given filename extension
- to the specified content language. <em>MIME-lang</em> is the
- MIME language of filenames containing <em>extension</em>. This
- mapping is added to any already in force, overriding any
- mappings that already exist for the same
- <em>extension</em>.</p>
-
- <p>Example:</p>
-
- <example>
+ <example><title>Example</title>
AddEncoding x-compress .Z<br />
- AddLanguage en .en<br />
- AddLanguage fr .fr
+ AddLanguage en .en<br />
+ AddLanguage fr .fr
</example>
<p>Then the document <code>xxxx.en.Z</code> will be treated as
being a compressed English document (as will the document
<code>xxxx.Z.en</code>). Although the content language is
reported to the client, the browser is unlikely to use this
- information. The AddLanguage directive is more useful for <a
- href="../content-negotiation.html">content negotiation</a>,
- where the server returns one from several documents based on
- the client's language preference.</p>
+ information. The <directive>AddLanguage</directive> directive is
+ more useful for <a href="../content-negotiation.html">content
+ negotiation</a>, where the server returns one from several documents
+ based on the client's language preference.</p>
<p>If multiple language assignments are made for the same
extension, the last one encountered is the one that is used.
That is, for the case of:</p>
-<example>
- AddLanguage en .en<br />
- AddLanguage en-uk .en<br />
- AddLanguage en-us .en
-</example>
+ <example>
+ AddLanguage en .en<br />
+ AddLanguage en-uk .en<br />
+ AddLanguage en-us .en
+ </example>
- <p>documents with the extension "<code>.en</code>" would be
- treated as being "<code>en-us</code>".</p>
+ <p>documents with the extension <code>.en</code> would be treated as
+ being <code>en-us</code>.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-
</usage>
<seealso><module>mod_negotiation</module></seealso>
</directivesynopsis>
<directivesynopsis>
<name>AddOutputFilter</name>
-<description>Maps filename
-extensions to the filters that will process
+<description>Maps filename extensions to the filters that will process
responses from the server</description>
-<syntax>AddOutputFilter
- <em>filter</em>[<em>;filter</em>...] extension
- [<em>extension</em> ...]</syntax>
-<contextlist>
-<context>server config</context>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
-<override></override>
-<compatibility>AddOutputFilter
- is only available in Apache 2.0.26 and later.</compatibility>
+<syntax>AddOutputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context><context>.htaccess</context></contextlist>
+<override>FileInfo</override>
+<compatibility>AddOutputFilter is only available in Apache 2.0.26 and
+later.</compatibility>
<usage>
-
<p>The <directive>AddOutputFilter</directive> directive maps the
- filename extensions <em>extension</em> to the <a
+ filename extension <var>extension</var> to the <a
href="../filter.html">filters</a> which will process responses
- from the server before they are sent to the client. This is in
- addition to any filters defined elsewhere, including the
- <directive module="core">SetOutputFilter</directive>
- directive. This mapping is merged over any already in force,
- overriding any mappings that already exist for the same
- <em>extension</em>.</p>
+ from the server before they are sent to the client. This is in
+ addition to any filters defined elsewhere, including <directive
+ module="core">SetOutputFilter</directive> and <directive module="core"
+ >AddOutputFilterByType</directive> directive. This mapping is merged
+ over any already in force, overriding any mappings that already exist
+ for the same <var>extension</var>.</p>
<p>For example, the following configuration will process all
- .shtml files for server-side includes and will then compress
- the output using <module>mod_deflate</module>.</p>
-
+ <code>.shtml</code> files for server-side includes and will then
+ compress the output using <module>mod_deflate</module>.</p>
<example>
AddOutputFilter INCLUDES;DEFLATE shtml
@@ -490,53 +430,44 @@
<p>If more than one filter is specified, they must be separated
by semicolons in the order in which they should process the
- content. Both the filter and <em>extension</em> arguments are
- case-insensitive, and the extension may be specified with or
+ content. Both the <var>filter</var> and <var>extension</var> arguments
+ are case-insensitive, and the extension may be specified with or
without a leading dot.</p>
-
</usage>
-
<seealso><directive module="mod_mime">RemoveOutputFilter</directive></seealso>
</directivesynopsis>
<directivesynopsis>
<name>AddType</name>
-<description>Maps the given filename extensions
-onto the specified content type</description>
-<syntax>AddType <em>MIME-type
- extension</em> [<em>extension</em>] ...</syntax>
-<contextlist>
-<context>server config</context>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
+<description>Maps the given filename extensions onto the specified content
+type</description>
+<syntax>AddType <var>MIME-type</var> <var>extension</var>
+[<var>extension</var>] ...</syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
<usage>
-
- <p>The AddType directive maps the given filename extensions onto
- the specified content type. <em>MIME-type</em> is the MIME type to
- use for filenames containing <em>extension</em>. This mapping is
- added to any already in force, overriding any mappings that
- already exist for the same <em>extension</em>. This directive can
+ <p>The <directive>AddType</directive> directive maps the given filename
+ extensions onto the specified content type. <var>MIME-type</var> is the
+ MIME type to use for filenames containing <var>extension</var>. This
+ mapping is added to any already in force, overriding any mappings that
+ already exist for the same <var>extension</var>. This directive can
be used to add mappings not listed in the MIME types file (see the
- <directive module="mod_mime">TypesConfig</directive>
- directive).</p>
+ <directive module="mod_mime">TypesConfig</directive> directive).</p>
- <p>Example:</p>
-
- <example>
+ <example><title>Example</title>
AddType image/gif .gif
</example>
- <note>It is recommended that new MIME types be added using the
- AddType directive rather than changing the
- <directive>TypesConfig</directive> file. </note>
+ <note>
+ It is recommended that new MIME types be added using the
+ <directive>AddType</directive> directive rather than changing the
+ <directive module="mod_mime">TypesConfig</directive> file.
+ </note>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-
</usage>
<seealso><directive module="core">DefaultType</directive></seealso>
<seealso><directive module="core">ForceType</directive></seealso>
@@ -544,117 +475,108 @@
<directivesynopsis>
<name>MultiviewsMatch</name>
-<description>The types of files that will be included when
-searching for a matching file with MultiViews</description>
-<syntax>MultiviewsMatch
- <em>[NegotiatedOnly] [Handlers] [Filters] [Any]</em></syntax>
+<description>The types of files that will be included when searching for
+a matching file with MultiViews</description>
+<syntax>MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
+[Handlers|Filters]</syntax>
<default>MultiviewsMatch NegotiatedOnly</default>
-<contextlist>
-<context>server config</context>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
-<compatibility>Available
- in Apache 2.0.26 and later.</compatibility>
+<compatibility>Available in Apache 2.0.26 and later.</compatibility>
<usage>
+ <p><directive>MultiviewsMatch</directive> permits three different
+ behaviors for <a href="mod_negotiation.html">mod_negotiation</a>'s
+ Multiviews feature. Multiviews allows a request for a file,
+ <em>e.g.</em> <code>index.html</code>, to match any negotiated
+ extensions following the base request, <em>e.g.</em>
+ <code>index.html.en</code>, <code>index.html.fr</code>, or
+ <code>index.html.gz</code>.</p>
- <p>MultiviewsMatch permits three different behaviors for
- <a href="mod_negotiation.html">mod_negotiation</a>'s Multiviews
- feature. Multiviews allows a request for a file, e.g. index.html,
- to match any negotiated extensions following the base request,
- e.g. index.html.en, index.html.fr, or index.html.gz.</p>
-
- <p>The NegotiatedOnly option provides that every extension following
- the base name must correlate to a recognized mod_mime extension for
- content negotation, e.g. Charset, Content-Type, Language, or
- Encoding. This is the strictest implementation with the fewest
- unexpected side effects, and is the default behavior.</p>
+ <p>The <code>NegotiatedOnly</code> option provides that every extension
+ following the base name must correlate to a recognized
+ <module>mod_mime</module> extension for content negotation, <em>e.g.</em>
+ Charset, Content-Type, Language, or Encoding. This is the strictest
+ implementation with the fewest unexpected side effects, and is the
+ default behavior.</p>
<p>To include extensions associated with Handlers and/or Filters,
- set the MultiviewsMatch directive to either Handlers, Filters, or
- both option keywords. If all other factors are equal, the smallest
- file will be served, e.g. in deciding between index.html.cgi of 500
- characters and index.html.pl of 1000 bytes, the .cgi file would win
- in this example. Users of .asis files might prefer to use the
- Handler option, if .asis files are associated with the asis-handler.</p>
+ set the <directive>MultiviewsMatch</directive> directive to either
+ <code>Handlers</code>, <code>Filters</code>, or both option keywords.
+ If all other factors are equal, the smallest file will be served,
+ <em>e.g.</em> in deciding between <code>index.html.cgi</code> of 500
+ bytes and <code>index.html.pl</code> of 1000 bytes, the <code>.cgi</code>
+ file would win in this example. Users of <code>.asis</code> files
+ might prefer to use the Handler option, if <code>.asis</code> files are
+ associated with the <code>asis-handler</code>.</p>
- <p>You may finally allow Any extensions to match, even if mod_mime
- doesn't recognize the extension. This was the behavior in Apache 1.3,
- and can cause unpredicatable results, such as serving .old or .bak
- files the webmaster never expected to be served.</p>
+ <p>You may finally allow <code>Any</code> extensions to match, even if
+ <module>mod_mime</module> doesn't recognize the extension. This was the
+ behavior in Apache 1.3, and can cause unpredicatable results, such as
+ serving .old or .bak files the webmaster never expected to be served.</p>
<p>For example, the following configuration will allow handlers
and filters to participate in Multviews, but will exclude unknown
files:</p>
-<example>
-MultiviewsMatch Handlers Filters
-</example>
+ <example>
+ MultiviewsMatch Handlers Filters
+ </example>
</usage>
<seealso><directive module="core">Options</directive></seealso>
+<seealso><module>mod_negotiation</module></seealso>
</directivesynopsis>
<directivesynopsis>
<name>DefaultLanguage</name>
-<description>Sets all files in the given scope to the
-specified language</description>
-<syntax>DefaultLanguage
- <em>MIME-lang</em></syntax>
-<contextlist>
-<context>server config</context>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
+<description>Sets all files in the given scope to the specified
+language</description>
+<syntax>DefaultLanguage <var>MIME-lang</var></syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
-<compatibility>DefaultLanguage
- is only available in Apache 1.3.4 and later.</compatibility>
<usage>
+ <p>The <directive>DefaultLanguage</directive> directive tells Apache
+ that all files in the directive's scope (<em>e.g.</em>, all files
+ covered by the current <directive module="core" type="section"
+ >Directory</directive> container) that don't have an explicit language
+ extension (such as <code>.fr</code> or <code>.de</code> as configured
+ by <directive module="mod_mime">AddLanguage</directive>) should be
+ considered to be in the specified <var>MIME-lang</var> language. This
+ allows entire directories to be marked as containing Dutch content, for
+ instance, without having to rename each file. Note that unlike using
+ extensions to specify languages, <directive>DefaultLanguage</directive>
+ can only specify a single language.</p>
- <p>The DefaultLanguage directive tells Apache that all files in
- the directive's scope (<em>e.g.</em>, all files covered by the
- current <code><Directory></code> container) that don't
- have an explicit language extension (such as <code>.fr</code>
- or <code>.de</code> as configured by <code>AddLanguage</code>)
- should be considered to be in the specified <em>MIME-lang</em>
- language. This allows entire directories to be marked as
- containing Dutch content, for instance, without having to
- rename each file. Note that unlike using extensions to specify
- languages, <code>DefaultLanguage</code> can only specify a
- single language.</p>
-
- <p>If no <code>DefaultLanguage</code> directive is in force,
+ <p>If no <directive>DefaultLanguage</directive> directive is in force,
and a file does not have any language extensions as configured
- by <code>AddLanguage</code>, then that file will be considered
- to have no language attribute.</p>
+ by <directive module="mod_mime">AddLanguage</directive>, then that file
+ will be considered to have no language attribute.</p>
-<example><title>Example</title>
-DefaultLanguage en
-</example>
-
+ <example><title>Example</title>
+ DefaultLanguage en
+ </example>
</usage>
<seealso><module>mod_negotiation</module></seealso>
</directivesynopsis>
<directivesynopsis>
<name>ModMimeUsePathInfo</name>
-<description>Tells mod_mime to treat path_info components as part of the filename</description>
+<description>Tells <module>mod_mime</module> to treat <code>path_info</code>
+components as part of the filename</description>
<syntax>ModMimeUsePathInfo On|Off</syntax>
-<contextlist>
-<context>directory</context>
-</contextlist>
+<default>ModMimeUsePathInfo Off</default>
+<contextlist><context>directory</context></contextlist>
<compatibility>Available in Apache 2.0.41 and later</compatibility>
<usage>
<p>The <directive>ModMimeUsePathInfo</directive> directive is used to
- combine the filename with the path_info URL component to apply
- <module>mod_mime</module>'s directives to the request. The default
- value is <code>Off</code> - therefore, the path_info component is
- ignored.</p>
+ combine the filename with the <code>path_info</code> URL component to
+ apply <module>mod_mime</module>'s directives to the request. The default
+ value is <code>Off</code> - therefore, the <code>path_info</code>
+ component is ignored.</p>
<p>This directive is recommended when you have a virtual filesystem.</p>
@@ -664,43 +586,41 @@
<p>If you have a request for <code>/bar/foo.shtml</code> where
<code>/bar</code> is a Location and <directive
- >ModMimeUsePathInfo</directive> is on, <module>mod_mime</module> will
- treat the incoming request as <code>/bar/foo.shtml</code> and
- directives like <code>AddOutputFilter INCLUDES .shtml</code> will add
- the INCLUDES filter to the request. If <directive
- >ModMimeUsePathInfo</directive> is not set, the INCLUDES filter will
- not be added.</p>
+ >ModMimeUsePathInfo</directive> is <code>On</code>,
+ <module>mod_mime</module> will treat the incoming request as
+ <code>/bar/foo.shtml</code> and directives like <code>AddOutputFilter
+ INCLUDES .shtml</code> will add the <code>INCLUDES</code> filter to the
+ request. If <directive>ModMimeUsePathInfo</directive> is not set, the
+ <code>INCLUDES</code> filter will not be added.</p>
</usage>
+<seealso><directive module="core">AcceptPathInfo</directive></seealso>
</directivesynopsis>
<directivesynopsis>
<name>RemoveCharset</name>
<description>Removes any character set associations for a set of file
extensions</description>
-<syntax>RemoveCharset
- <em>extension</em> [<em>extension</em>] ...</syntax>
-<contextlist>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
-<compatibility>RemoveCharset is
- only available in Apache 2.0.24 and later.</compatibility>
+<syntax>RemoveCharset <var>extension</var> [<var>extension</var>]
+...</syntax>
+<contextlist><context>virtual host</context><context>directory</context>
+<context>.htaccess</context></contextlist>
+<override>FileInfo</override>
+<compatibility>RemoveCharset is only available in Apache 2.0.24 and
+later.</compatibility>
<usage>
- <p>The <code>RemoveCharset</code> directive removes any
+ <p>The <directive>RemoveCharset</directive> directive removes any
character set associations for files with the given extensions.
This allows <code>.htaccess</code> files in subdirectories to
undo any associations inherited from parent directories or the
server config files.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-<example><title>Example</title>
-RemoveCharset .html .shtml
-</example>
-
+ <example><title>Example</title>
+ RemoveCharset .html .shtml
+ </example>
</usage>
</directivesynopsis>
@@ -708,116 +628,101 @@
<name>RemoveEncoding</name>
<description>Removes any content encoding associations for a set of file
extensions</description>
-<syntax>RemoveEncoding
- <em>extension</em> [<em>extension</em>] ...</syntax>
-<contextlist>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
-<compatibility>RemoveEncoding
- is only available in Apache 1.3.13 and later.</compatibility>
+<syntax>RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</syntax>
+<contextlist><context>virtual host</context><context>directory</context>
+<context>.htaccess</context></contextlist>
+<override>FileInfo</override>
<usage>
-
- <p>The <code>RemoveEncoding</code> directive removes any
+ <p>The <directive>RemoveEncoding</directive> directive removes any
encoding associations for files with the given extensions. This
allows <code>.htaccess</code> files in subdirectories to undo
any associations inherited from parent directories or the
server config files. An example of its use might be:</p>
-
-<example><title>/foo/.htaccess:</title>
-<pre>
-AddEncoding x-gzip .gz
-AddType text/plain .asc
-<Files *.gz.asc>
- RemoveEncoding .gz
-</Files>
-</pre></example>
+ <example><title>/foo/.htaccess:</title>
+ AddEncoding x-gzip .gz<br />
+ AddType text/plain .asc<br />
+ <Files *.gz.asc><br />
+ <indent>
+ RemoveEncoding .gz<br />
+ </indent>
+ </Files>
+ </example>
<p>This will cause <code>foo.gz</code> to be marked as being
encoded with the gzip method, but <code>foo.gz.asc</code> as an
unencoded plaintext file.</p>
- <p><strong>Note:</strong>RemoveEncoding directives are processed
- <em>after</em> any AddEncoding directives, so it is possible they
- may undo the effects of the latter if both occur within the
- same directory configuration.</p>
+ <note><title>Note</title>
+ <p><directive>RemoveEncoding</directive> directives are processed
+ <em>after</em> any <directive module="mod_mime">AddEncoding</directive>
+ directives, so it is possible they may undo the effects of the latter
+ if both occur within the same directory configuration.</p>
+ </note>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
</usage>
</directivesynopsis>
-
<directivesynopsis>
<name>RemoveHandler</name>
<description>Removes any handler associations for a set of file
extensions</description>
-<syntax>RemoveHandler
- <em>extension</em> [<em>extension</em>] ...</syntax>
-<contextlist>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
-<compatibility>RemoveHandler is
- only available in Apache 1.3.4 and later.</compatibility>
+<syntax>RemoveHandler <var>extension</var> [<var>extension</var>]
+...</syntax>
+<contextlist><context>virtual host</context><context>directory</context>
+<context>.htaccess</context></contextlist>
+<override>FileInfo</override>
<usage>
-
- <p>The <code>RemoveHandler</code> directive removes any handler
- associations for files with the given extensions. This allows
+ <p>The <directive>RemoveHandler</directive> directive removes any
+ handler associations for files with the given extensions. This allows
<code>.htaccess</code> files in subdirectories to undo any
associations inherited from parent directories or the server
config files. An example of its use might be:</p>
-<example><title>/foo/.htaccess:</title>
-AddHandler server-parsed .html
-</example>
+ <example><title>/foo/.htaccess:</title>
+ AddHandler server-parsed .html
+ </example>
-<example><title>/foo/bar/.htaccess:</title>
-RemoveHandler .html
-</example>
+ <example><title>/foo/bar/.htaccess:</title>
+ RemoveHandler .html
+ </example>
<p>This has the effect of returning <code>.html</code> files in
the <code>/foo/bar</code> directory to being treated as normal
- files, rather than as candidates for parsing (see the <a
- href="mod_include.html"><code>mod_include</code></a>
- module).</p>
+ files, rather than as candidates for parsing (see the <module
+ >mod_include</module> module).</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
</usage>
</directivesynopsis>
-
<directivesynopsis>
<name>RemoveInputFilter</name>
<description>Removes any input filter associations for a set of file
extensions</description>
-<syntax>RemoveInputFilter
- <em>extension</em> [<em>extension</em>] ...</syntax>
-<contextlist>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
-<compatibility>RemoveInputFilter is only available in Apache
-2.0.26 and later.</compatibility>
+<syntax>RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</syntax>
+<contextlist><context>virtual host</context><context>directory</context>
+<context>.htaccess</context></contextlist>
+<override>FileInfo</override>
+<compatibility>RemoveInputFilter is only available in Apache 2.0.26 and
+later.</compatibility>
<usage>
-
- <p>The <code>RemoveInputFilter</code> directive removes any
+ <p>The <directive>RemoveInputFilter</directive> directive removes any
input filter associations for files with the given extensions.
This allows <code>.htaccess</code> files in subdirectories to
undo any associations inherited from parent directories or the
server config files.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
-
</usage>
</directivesynopsis>
@@ -825,26 +730,22 @@
<name>RemoveLanguage</name>
<description>Removes any language associations for a set of file
extensions</description>
-<syntax>RemoveLanguage
- <em>extension</em> [<em>extension</em>] ...</syntax>
-<contextlist>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
-<compatibility>RemoveLanguage
- is only available in Apache 2.0.24 and later.</compatibility>
-
+<syntax>RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</syntax>
+<contextlist><context>virtual host</context><context>directory</context>
+<context>.htaccess</context></contextlist>
+<override>FileInfo</override>
+<compatibility>RemoveLanguage is only available in Apache 2.0.24 and
+later.</compatibility>
<usage>
-
- <p>The <code>RemoveLanguage</code> directive removes any
+ <p>The <directive>RemoveLanguage</directive> directive removes any
language associations for files with the given extensions. This
allows <code>.htaccess</code> files in subdirectories to undo
any associations inherited from parent directories or the
server config files.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
</usage>
</directivesynopsis>
@@ -853,127 +754,115 @@
<name>RemoveOutputFilter</name>
<description>Removes any output filter associations for a set of file
extensions</description>
-<syntax>RemoveOutputFilter
- <em>extension</em> [<em>extension</em>] ...</syntax>
-<contextlist>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
-<override></override>
-<compatibility>RemoveOutputFilter is only available in Apache
-2.0.26 and later.</compatibility>
+<syntax>RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</syntax>
+<contextlist><context>virtual host</context><context>directory</context>
+<context>.htaccess</context></contextlist>
+<override>FileInfo</override>
+<compatibility>RemoveOutputFilter is only available in Apache 2.0.26 and
+later.</compatibility>
<usage>
-
- <p>The <code>RemoveOutputFilter</code> directive removes any
+ <p>The <directive>RemoveOutputFilter</directive> directive removes any
output filter associations for files with the given extensions.
This allows <code>.htaccess</code> files in subdirectories to
undo any associations inherited from parent directories or the
server config files.</p>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
<example><title>Example</title>
- RemoveOutputFilter shtml
+ RemoveOutputFilter shtml
</example>
</usage>
-
<seealso><directive module="mod_mime">AddOutputFilter</directive></seealso>
</directivesynopsis>
-
<directivesynopsis>
<name>RemoveType</name>
<description>Removes any content type associations for a set of file
extensions</description>
-<syntax>RemoveType
- <em>extension</em> [<em>extension</em>] ...</syntax>
-<contextlist>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
-<override></override>
-<compatibility>RemoveType is
- only available in Apache 1.3.13 and later.</compatibility>
+<syntax>RemoveType <var>extension</var> [<var>extension</var>]
+...</syntax>
+<contextlist><context>virtual host</context><context>directory</context>
+<context>.htaccess</context></contextlist>
+<override>FileInfo</override>
<usage>
- <p>The <directive>RemoveType</directive> directive removes any MIME type
- associations for files with the given extensions. This allows
+ <p>The <directive>RemoveType</directive> directive removes any MIME
+ type associations for files with the given extensions. This allows
<code>.htaccess</code> files in subdirectories to undo any
associations inherited from parent directories or the server
config files. An example of its use might be:</p>
-<example><title>/foo/.htaccess:</title>
-RemoveType .cgi
-</example>
+ <example><title>/foo/.htaccess:</title>
+ RemoveType .cgi
+ </example>
<p>This will remove any special handling of <code>.cgi</code>
files in the <code>/foo/</code> directory and any beneath it,
- causing the files to be treated as being of the <a
- href="core.html#defaulttype">default type</a>.</p>
+ causing the files to be treated as being of the <directive
+ module="core">DefaultType</directive>.</p>
- <note><strong>Note:</strong><directive>RemoveType</directive> directives
- are processed <em>after</em> any <directive>AddType</directive>
- directives, so it is possible they may undo the effects of the
- latter if both occur within the same directory
- configuration.</note>
+ <note><title>Note</title>
+ <p><directive>RemoveType</directive> directives are processed
+ <em>after</em> any <directive module="mod_mime">AddType</directive>
+ directives, so it is possible they may undo the effects of the
+ latter if both occur within the same directory configuration.</p>
+ </note>
- <p>The <em>extension</em> argument is case-insensitive, and can
+ <p>The <var>extension</var> argument is case-insensitive, and can
be specified with or without a leading dot.</p>
</usage>
</directivesynopsis>
<directivesynopsis>
<name>TypesConfig</name>
-<description>The location of the mime.types file</description>
-<syntax>TypesConfig <em>file-path</em></syntax>
+<description>The location of the <code>mime.types</code> file</description>
+<syntax>TypesConfig <var>file-path</var></syntax>
<default>TypesConfig conf/mime.types</default>
-<contextlist>
-<context>server config</context>
-</contextlist>
+<contextlist><context>server config</context></contextlist>
<usage>
-
- <p>The TypesConfig directive sets the location of the MIME types
- configuration file. <em>Filename</em> is relative to the <a
- href="core.html#serverroot">ServerRoot</a>. This file sets the
- default list of mappings from filename extensions to content
- types. Most administrators use the provided
- <code>mime.types</code> file, which associates common filename
- extensions with IANA registered content types. The current list is
- maintained at
- <code>http://www.isi.edu/in-notes/iana/assignments/media-types/media-types</code>. This
- simplifies the <code>httpd.conf</code> file by providing the
+ <p>The <directive>TypesConfig</directive> directive sets the location
+ of the MIME types configuration file. <var>File-path</var> is relative
+ to the <directive module="core">ServerRoot</directive>. This file sets
+ the default list of mappings from filename extensions to content
+ types. Most administrators use the provided <code>mime.types</code>
+ file, which associates common filename extensions with IANA registered
+ content types. The current list is maintained at <a href=
+ "http://www.isi.edu/in-notes/iana/assignments/media-types/media-types"
+ >http://www.isi.edu/in-notes/iana/assignments/media-types/media-types</a>.
+ This simplifies the <code>httpd.conf</code> file by providing the
majority of media-type definitions, and may be overridden by
<directive module="mod_mime">AddType</directive> directives as
- needed. You should not edit the <code>mime.types</code> file,
- because it may be replaced when you upgrade your server.</p>
-
+ needed. You should not edit the <code>mime.types</code> file, because
+ it may be replaced when you upgrade your server.</p>
+
<p>The file contains lines in the format of the arguments to
an <directive module="mod_mime">AddType</directive> directive:</p>
<example>
- MIME-type extension extension ...
+ <var>MIME-type</var> [<var>extension</var>] ...
</example>
- <p>
- The case of the extension does not matter. Blank lines, and lines
- beginning with a hash character (`#') are ignored. </p>
+ <p>The case of the extension does not matter. Blank lines, and lines
+ beginning with a hash character (<code>#</code>) are ignored.</p>
- <note>Please do not send requests to the Apache HTTP Server Project
- to add any new entries in the distributed mime.types file
- unless (1) they are already registered with IANA, and (2) they
- use widely accepted, non-conflicting filename extensions across
- platforms. category/x-subtype requests will be automatically
- rejected, as will any new two-letter extensions as they will
- likely conflict later with the already crowded language and
- character set namespace.</note>
-
+ <note>
+ Please do <strong>not</strong> send requests to the Apache HTTP
+ Server Project to add any new entries in the distributed
+ <code>mime.types</code> file unless (1) they are already
+ registered with IANA, and (2) they use widely accepted,
+ non-conflicting filename extensions across platforms.
+ <code>category/x-subtype</code> requests will be automatically
+ rejected, as will any new two-letter extensions as they will
+ likely conflict later with the already crowded language and
+ character set namespace.
+ </note>
</usage>
<seealso><module>mod_mime_magic</module></seealso>
</directivesynopsis>
-</modulesynopsis>
+</modulesynopsis>
diff --git a/docs/manual/mod/mod_mime_magic.html.en b/docs/manual/mod/mod_mime_magic.html.en
index 6b8a481..ce5283f 100644
--- a/docs/manual/mod/mod_mime_magic.html.en
+++ b/docs/manual/mod/mod_mime_magic.html.en
@@ -4,192 +4,149 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_mime_magic - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_mime_magic</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Determines the MIME type of a file
- by looking at a few bytes of its contents</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>mime_magic_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_mime_magic.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_mime_magic - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_mime_magic</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Determines the MIME type of a file
+ by looking at a few bytes of its contents</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mime_magic_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_mime_magic.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module determines the MIME type of files in the same
- way the Unix file(1) command works: it looks at the first few
- bytes of the file. It is intended as a "second line of defense"
- for cases that <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> can't
- resolve. To assure that mod_mime gets first try at determining
- a file's MIME type, be sure to list mod_mime_magic
- <strong>before</strong> mod_mime in the configuration.</p>
+ way the Unix <code>file(1)</code> command works: it looks at the first
+ few bytes of the file. It is intended as a "second line of defense"
+ for cases that <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> can't resolve.</p>
<p>This module is derived from a free version of the
<code>file(1)</code> command for Unix, which uses "magic
numbers" and other hints from a file's contents to figure out
what the contents are. This module is active only if the magic
file is specified by the <code class="directive"><a href="#mimemagicfile">MimeMagicFile</a></code> directive.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#mimemagicfile">MimeMagicFile</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> Format of the Magic File</li><li><img alt="" src="../images/down.gif" /> Performance Issues</li><li><img alt="" src="../images/down.gif" /> <a href="#notes">Notes</a></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Format of the Magic File</h2>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#mimemagicfile">MimeMagicFile</a></li>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#format">Format of the Magic File</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#performance">Performance Issues</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#notes">Notes</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="format" id="format">Format of the Magic File</a></h2>
<p>The contents of the file are plain ASCII text in 4-5
columns. Blank lines are allowed but ignored. Commented lines
- use a hash mark "#". The remaining lines are parsed for the
- following columns:</p>
+ use a hash mark (<code>#</code>). The remaining lines are parsed for
+ the following columns:</p>
- <table class="bordered">
- <tr>
- <th>Column</th>
-
- <th>Description</th>
- </tr>
-
- <tr>
- <td>1</td>
-
+ <table class="bordered"><tr class="header"><th>Column</th><th>Description</th></tr>
+<tr><td>1</td>
<td>byte number to begin checking from<br />
- ">" indicates a dependency upon the previous non-">"
- line</td>
- </tr>
-
- <tr>
- <td>2</td>
-
- <td>
- type of data to match
-
- <table class="bordered">
- <tr>
- <td>byte</td>
-
- <td>single character</td>
- </tr>
-
- <tr>
- <td>short</td>
-
- <td>machine-order 16-bit integer</td>
- </tr>
-
- <tr>
- <td>long</td>
-
- <td>machine-order 32-bit integer</td>
- </tr>
-
- <tr>
- <td>string</td>
-
- <td>arbitrary-length string</td>
- </tr>
-
- <tr>
- <td>date</td>
-
- <td>long integer date (seconds since Unix
- epoch/1970)</td>
- </tr>
-
- <tr>
- <td>beshort</td>
-
- <td>big-endian 16-bit integer</td>
- </tr>
-
- <tr>
- <td>belong</td>
-
- <td>big-endian 32-bit integer</td>
- </tr>
-
- <tr>
- <td>bedate</td>
-
- <td>big-endian 32-bit integer date</td>
- </tr>
-
- <tr>
- <td>leshort</td>
-
- <td>little-endian 16-bit integer</td>
- </tr>
-
- <tr>
- <td>lelong</td>
-
- <td>little-endian 32-bit integer</td>
- </tr>
-
- <tr>
- <td>ledate</td>
-
- <td>little-endian 32-bit integer date</td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td>3</td>
-
- <td>contents of data to match</td>
- </tr>
-
- <tr>
- <td>4</td>
-
- <td>MIME type if matched</td>
- </tr>
-
- <tr>
- <td>5</td>
-
- <td>MIME encoding if matched (optional)</td>
- </tr>
- </table>
+ "<code>></code>" indicates a dependency upon the previous
+ non-"<code>></code>" line</td></tr>
+<tr class="odd"><td>2</td>
+ <td>type of data to match
+ <table class="bordered">
+ <tr><td><code>byte</code></td>
+ <td>single character</td></tr>
+ <tr><td><code>short</code></td>
+ <td>machine-order 16-bit integer</td></tr>
+ <tr><td><code>long</code></td>
+ <td>machine-order 32-bit integer</td></tr>
+ <tr><td><code>string</code></td>
+ <td>arbitrary-length string</td></tr>
+ <tr><td><code>date</code></td>
+ <td>long integer date (seconds since Unix epoch/1970)</td></tr>
+ <tr><td><code>beshort</code></td>
+ <td>big-endian 16-bit integer</td></tr>
+ <tr><td><code>belong</code></td>
+ <td>big-endian 32-bit integer</td></tr>
+ <tr><td><code>bedate</code></td>
+ <td>big-endian 32-bit integer date</td></tr>
+ <tr><td><code>leshort</code></td>
+ <td>little-endian 16-bit integer</td></tr>
+ <tr><td><code>lelong</code></td>
+ <td>little-endian 32-bit integer</td></tr>
+ <tr><td><code>ledate</code></td>
+ <td>little-endian 32-bit integer date</td></tr>
+ </table></td></tr>
+<tr><td>3</td>
+ <td>contents of data to match</td></tr>
+<tr class="odd"><td>4</td>
+ <td>MIME type if matched</td></tr>
+<tr><td>5</td>
+ <td>MIME encoding if matched (optional)</td></tr>
+</table>
<p>For example, the following magic file lines would recognize
- some audio formats.</p>
-<div class="example"><pre>
-# Sun/NeXT audio data
-0 string .snd
->12 belong 1 audio/basic
->12 belong 2 audio/basic
->12 belong 3 audio/basic
->12 belong 4 audio/basic
->12 belong 5 audio/basic
->12 belong 6 audio/basic
->12 belong 7 audio/basic
->12 belong 23 audio/x-adpcm
-</pre></div>
- <p>Or these would recognize the difference between "*.doc" files
- containing Microsoft Word or FrameMaker documents. (These are
+ some audio formats:</p>
+
+ <div class="example"><pre># Sun/NeXT audio data
+0 string .snd
+>12 belong 1 audio/basic
+>12 belong 2 audio/basic
+>12 belong 3 audio/basic
+>12 belong 4 audio/basic
+>12 belong 5 audio/basic
+>12 belong 6 audio/basic
+>12 belong 7 audio/basic
+>12 belong 23 audio/x-adpcm</pre></div>
+
+ <p>Or these would recognize the difference between <code>*.doc</code>
+ files containing Microsoft Word or FrameMaker documents. (These are
incompatible file formats which use the same file suffix.)</p>
-<div class="example"><pre>
-# Frame
-0 string \<MakerFile application/x-frame
-0 string \<MIFFile application/x-frame
-0 string \<MakerDictionary application/x-frame
-0 string \<MakerScreenFon application/x-frame
-0 string \<MML application/x-frame
-0 string \<Book application/x-frame
-0 string \<Maker application/x-frame
+
+ <div class="example"><pre># Frame
+0 string \<MakerFile application/x-frame
+0 string \<MIFFile application/x-frame
+0 string \<MakerDictionary application/x-frame
+0 string \<MakerScreenFon application/x-frame
+0 string \<MML application/x-frame
+0 string \<Book application/x-frame
+0 string \<Maker application/x-frame
# MS-Word
-0 string \376\067\0\043 application/msword
-0 string \320\317\021\340\241\261 application/msword
-0 string \333\245-\0\0\0 application/msword
-</pre></div>
+0 string \376\067\0\043 application/msword
+0 string \320\317\021\340\241\261 application/msword
+0 string \333\245-\0\0\0 application/msword</pre></div>
+
<p>An optional MIME encoding can be included as a fifth column.
For example, this can recognize gzipped files and set the
encoding for them.</p>
-<div class="example"><pre>
-# gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
-0 string \037\213 application/octet-stream x-gzip
-</pre></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Performance Issues</h2>
+
+ <div class="example"><pre># gzip (GNU zip, not to be confused with
+# [Info-ZIP/PKWARE] zip archiver)
+
+0 string \037\213 application/octet-stream x-gzip</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="performance" id="performance">Performance Issues</a></h2>
<p>This module is not for every system. If your system is barely
keeping up with its load or if you're performing a web server
benchmark, you may not want to enable this because the
processing is not free.</p>
<p>However, an effort was made to improve the performance of
- the original file(1) code to make it fit in a busy web server.
- It was designed for a server where there are thousands of users
+ the original <code>file(1)</code> code to make it fit in a busy web
+ server. It was designed for a server where there are thousands of users
who publish their own documents. This is probably very common
on intranets. Many times, it's helpful if the server can make
more intelligent decisions about a file's contents than the
@@ -197,93 +154,115 @@
page work" calls when users improperly name their own files.
You have to decide if the extra work suits your
environment.</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">Notes</a></h2>
+ <p>The following notes apply to the <code class="module"><a href="../mod/mod_mime_magic.html">mod_mime_magic</a></code>
+ module and are included here for compliance with contributors'
+ copyright restrictions that require their acknowledgment.</p>
- <p>When compiling an Apache server, this module should be at or
- near the top of the list of modules in the Configuration file.
- The modules are listed in increasing priority so that will mean
- this one is used only as a last resort, just like it was
- designed to.</p>
+ <div class="note">
+ <p>mod_mime_magic: MIME type lookup via file magic numbers<br />
+ Copyright (c) 1996-1997 Cisco Systems, Inc.</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">Notes</a></h2>
+ <p>This software was submitted by Cisco Systems to the Apache Group
+ in July 1997. Future revisions and derivatives of this source code
+ must acknowledge Cisco Systems as the original contributor of this
+ module. All other licensing and usage conditions are those of the
+ Apache Group.</p>
- <p>The following notes apply to the mod_mime_magic module and are
- included here for compliance with contributors' copyright
- restrictions that require their acknowledgment. </p>
-<pre>
-/*
- * mod_mime_magic: MIME type lookup via file magic numbers
- * Copyright (c) 1996-1997 Cisco Systems, Inc.
- *
- * This software was submitted by Cisco Systems to the Apache Group in July
- * 1997. Future revisions and derivatives of this source code must
- * acknowledge Cisco Systems as the original contributor of this module.
- * All other licensing and usage conditions are those of the Apache Group.
- *
- * Some of this code is derived from the free version of the file command
- * originally posted to comp.sources.unix. Copyright info for that program
- * is included below as required.
- * ---------------------------------------------------------------------------
- * - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
- *
- * This software is not subject to any license of the American Telephone and
- * Telegraph Company or of the Regents of the University of California.
- *
- * Permission is granted to anyone to use this software for any purpose on any
- * computer system, and to alter it and redistribute it freely, subject to
- * the following restrictions:
- *
- * 1. The author is not responsible for the consequences of use of this
- * software, no matter how awful, even if they arise from flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources, credits
- * must appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software. Since few users ever read
- * sources, credits must appear in the documentation.
- *
- * 4. This notice may not be removed or altered.
- * -------------------------------------------------------------------------
- *
- * For compliance with Mr Darwin's terms: this has been very significantly
- * modified from the free "file" command.
- * - all-in-one file for compilation convenience when moving from one
- * version of Apache to the next.
- * - Memory allocation is done through the Apache API's pool structure.
- * - All functions have had necessary Apache API request or server
- * structures passed to them where necessary to call other Apache API
- * routines. (<em>i.e.</em>, usually for logging, files, or memory allocation in
- * itself or a called function.)
- * - struct magic has been converted from an array to a single-ended linked
- * list because it only grows one record at a time, it's only accessed
- * sequentially, and the Apache API has no equivalent of realloc().
- * - Functions have been changed to get their parameters from the server
- * configuration instead of globals. (It should be reentrant now but has
- * not been tested in a threaded environment.)
- * - Places where it used to print results to stdout now saves them in a
- * list where they're used to set the MIME type in the Apache request
- * record.
- * - Command-line flags have been removed since they will never be used here.
- *
- */
-</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="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 <em>file-path</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_mime_magic</td></tr></table>
+ <p>Some of this code is derived from the free version of the file
+ command originally posted to comp.sources.unix. Copyright info for
+ that program is included below as required.</p>
+ </div>
+
+ <div class="note">
+ <p> - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.</p>
+
+ <p>This software is not subject to any license of the American
+ Telephone and Telegraph Company or of the Regents of the University
+ of California.</p>
+
+ <p>Permission is granted to anyone to use this software for any
+ purpose on any computer system, and to alter it and redistribute it
+ freely, subject to the following restrictions:</p>
+
+ <ol>
+ <li>The author is not responsible for the consequences of use of
+ this software, no matter how awful, even if they arise from flaws
+ in it.</li>
+
+ <li>The origin of this software must not be misrepresented, either
+ by explicit claim or by omission. Since few users ever read
+ sources, credits must appear in the documentation.</li>
+
+ <li>Altered versions must be plainly marked as such, and must not
+ be misrepresented as being the original software. Since few users
+ ever read sources, credits must appear in the documentation.</li>
+
+ <li>This notice may not be removed or altered.</li>
+ </ol>
+ </div>
+
+ <div class="note">
+ <p>For compliance with Mr Darwin's terms: this has been very
+ significantly modified from the free "file" command.</p>
+
+ <ul>
+ <li>all-in-one file for compilation convenience when moving from
+ one version of Apache to the next.</li>
+
+ <li>Memory allocation is done through the Apache API's pool
+ structure.</li>
+
+ <li>All functions have had necessary Apache API request or server
+ structures passed to them where necessary to call other Apache API
+ routines. (<em>i.e.</em>, usually for logging, files, or memory
+ allocation in itself or a called function.)</li>
+
+ <li>struct magic has been converted from an array to a single-ended
+ linked list because it only grows one record at a time, it's only
+ accessed sequentially, and the Apache API has no equivalent of
+ <code>realloc()</code>.</li>
+
+ <li>Functions have been changed to get their parameters from the
+ server configuration instead of globals. (It should be reentrant
+ now but has not been tested in a threaded environment.)</li>
+
+ <li>Places where it used to print results to stdout now saves them
+ in a list where they're used to set the MIME type in the Apache
+ request record.</li>
+
+ <li>Command-line flags have been removed since they will never be
+ used here.</li>
+ </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
- ServerRoot. 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>
+ <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>
- <p>For example</p>
+ <div class="example"><h3>Example</h3><p><code>
+ MimeMagicFile conf/magic
+ </code></p></div>
- <div class="example"><p><code>MimeMagicFile conf/magic</code></p></div>
-
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mime_magic.xml b/docs/manual/mod/mod_mime_magic.xml
index cdc3419..18d0fd8 100644
--- a/docs/manual/mod/mod_mime_magic.xml
+++ b/docs/manual/mod/mod_mime_magic.xml
@@ -12,12 +12,9 @@
<summary>
<p>This module determines the MIME type of files in the same
- way the Unix file(1) command works: it looks at the first few
- bytes of the file. It is intended as a "second line of defense"
- for cases that <module>mod_mime</module> can't
- resolve. To assure that mod_mime gets first try at determining
- a file's MIME type, be sure to list mod_mime_magic
- <strong>before</strong> mod_mime in the configuration.</p>
+ way the Unix <code>file(1)</code> command works: it looks at the first
+ few bytes of the file. It is intended as a "second line of defense"
+ for cases that <module>mod_mime</module> can't resolve.</p>
<p>This module is derived from a free version of the
<code>file(1)</code> command for Unix, which uses "magic
@@ -27,180 +24,114 @@
>MimeMagicFile</directive> directive.</p>
</summary>
-<section><title>Format of the Magic File</title>
+<section id="format"><title>Format of the Magic File</title>
<p>The contents of the file are plain ASCII text in 4-5
columns. Blank lines are allowed but ignored. Commented lines
- use a hash mark "#". The remaining lines are parsed for the
- following columns:</p>
+ use a hash mark (<code>#</code>). The remaining lines are parsed for
+ the following columns:</p>
- <table border="1">
- <tr>
- <th>Column</th>
-
- <th>Description</th>
- </tr>
-
- <tr>
- <td>1</td>
-
+ <table style="zebra" border="1">
+ <tr><th>Column</th><th>Description</th></tr>
+ <tr><td>1</td>
<td>byte number to begin checking from<br />
- ">" indicates a dependency upon the previous non-">"
- line</td>
- </tr>
+ "<code>></code>" indicates a dependency upon the previous
+ non-"<code>></code>" line</td></tr>
- <tr>
- <td>2</td>
+ <tr><td>2</td>
+ <td>type of data to match
+ <table border="1">
+ <tr><td><code>byte</code></td>
+ <td>single character</td></tr>
+ <tr><td><code>short</code></td>
+ <td>machine-order 16-bit integer</td></tr>
+ <tr><td><code>long</code></td>
+ <td>machine-order 32-bit integer</td></tr>
+ <tr><td><code>string</code></td>
+ <td>arbitrary-length string</td></tr>
+ <tr><td><code>date</code></td>
+ <td>long integer date (seconds since Unix epoch/1970)</td></tr>
+ <tr><td><code>beshort</code></td>
+ <td>big-endian 16-bit integer</td></tr>
+ <tr><td><code>belong</code></td>
+ <td>big-endian 32-bit integer</td></tr>
+ <tr><td><code>bedate</code></td>
+ <td>big-endian 32-bit integer date</td></tr>
+ <tr><td><code>leshort</code></td>
+ <td>little-endian 16-bit integer</td></tr>
+ <tr><td><code>lelong</code></td>
+ <td>little-endian 32-bit integer</td></tr>
+ <tr><td><code>ledate</code></td>
+ <td>little-endian 32-bit integer date</td></tr>
+ </table></td></tr>
- <td>
- type of data to match
+ <tr><td>3</td>
+ <td>contents of data to match</td></tr>
- <table border="1">
- <tr>
- <td>byte</td>
+ <tr><td>4</td>
+ <td>MIME type if matched</td></tr>
- <td>single character</td>
- </tr>
-
- <tr>
- <td>short</td>
-
- <td>machine-order 16-bit integer</td>
- </tr>
-
- <tr>
- <td>long</td>
-
- <td>machine-order 32-bit integer</td>
- </tr>
-
- <tr>
- <td>string</td>
-
- <td>arbitrary-length string</td>
- </tr>
-
- <tr>
- <td>date</td>
-
- <td>long integer date (seconds since Unix
- epoch/1970)</td>
- </tr>
-
- <tr>
- <td>beshort</td>
-
- <td>big-endian 16-bit integer</td>
- </tr>
-
- <tr>
- <td>belong</td>
-
- <td>big-endian 32-bit integer</td>
- </tr>
-
- <tr>
- <td>bedate</td>
-
- <td>big-endian 32-bit integer date</td>
- </tr>
-
- <tr>
- <td>leshort</td>
-
- <td>little-endian 16-bit integer</td>
- </tr>
-
- <tr>
- <td>lelong</td>
-
- <td>little-endian 32-bit integer</td>
- </tr>
-
- <tr>
- <td>ledate</td>
-
- <td>little-endian 32-bit integer date</td>
- </tr>
- </table>
- </td>
- </tr>
-
- <tr>
- <td>3</td>
-
- <td>contents of data to match</td>
- </tr>
-
- <tr>
- <td>4</td>
-
- <td>MIME type if matched</td>
- </tr>
-
- <tr>
- <td>5</td>
-
- <td>MIME encoding if matched (optional)</td>
- </tr>
+ <tr><td>5</td>
+ <td>MIME encoding if matched (optional)</td></tr>
</table>
<p>For example, the following magic file lines would recognize
- some audio formats.</p>
-<example>
-<pre>
-# Sun/NeXT audio data
-0 string .snd
->12 belong 1 audio/basic
->12 belong 2 audio/basic
->12 belong 3 audio/basic
->12 belong 4 audio/basic
->12 belong 5 audio/basic
->12 belong 6 audio/basic
->12 belong 7 audio/basic
->12 belong 23 audio/x-adpcm
-</pre>
-</example>
- <p>Or these would recognize the difference between "*.doc" files
- containing Microsoft Word or FrameMaker documents. (These are
+ some audio formats:</p>
+
+ <example>
+<pre># Sun/NeXT audio data
+0 string .snd
+>12 belong 1 audio/basic
+>12 belong 2 audio/basic
+>12 belong 3 audio/basic
+>12 belong 4 audio/basic
+>12 belong 5 audio/basic
+>12 belong 6 audio/basic
+>12 belong 7 audio/basic
+>12 belong 23 audio/x-adpcm</pre>
+ </example>
+
+ <p>Or these would recognize the difference between <code>*.doc</code>
+ files containing Microsoft Word or FrameMaker documents. (These are
incompatible file formats which use the same file suffix.)</p>
-<example>
-<pre>
-# Frame
-0 string \<MakerFile application/x-frame
-0 string \<MIFFile application/x-frame
-0 string \<MakerDictionary application/x-frame
-0 string \<MakerScreenFon application/x-frame
-0 string \<MML application/x-frame
-0 string \<Book application/x-frame
-0 string \<Maker application/x-frame
+
+ <example>
+<pre># Frame
+0 string \<MakerFile application/x-frame
+0 string \<MIFFile application/x-frame
+0 string \<MakerDictionary application/x-frame
+0 string \<MakerScreenFon application/x-frame
+0 string \<MML application/x-frame
+0 string \<Book application/x-frame
+0 string \<Maker application/x-frame
# MS-Word
-0 string \376\067\0\043 application/msword
-0 string \320\317\021\340\241\261 application/msword
-0 string \333\245-\0\0\0 application/msword
-</pre>
-</example>
+0 string \376\067\0\043 application/msword
+0 string \320\317\021\340\241\261 application/msword
+0 string \333\245-\0\0\0 application/msword</pre>
+ </example>
+
<p>An optional MIME encoding can be included as a fifth column.
For example, this can recognize gzipped files and set the
encoding for them.</p>
-<example>
-<pre>
-# gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
-0 string \037\213 application/octet-stream x-gzip
-</pre>
-</example>
+
+ <example>
+<pre># gzip (GNU zip, not to be confused with
+# [Info-ZIP/PKWARE] zip archiver)
+
+0 string \037\213 application/octet-stream x-gzip</pre>
+ </example>
</section>
-<section><title>Performance Issues</title>
+<section id="performance"><title>Performance Issues</title>
<p>This module is not for every system. If your system is barely
keeping up with its load or if you're performing a web server
benchmark, you may not want to enable this because the
processing is not free.</p>
<p>However, an effort was made to improve the performance of
- the original file(1) code to make it fit in a busy web server.
- It was designed for a server where there are thousands of users
+ the original <code>file(1)</code> code to make it fit in a busy web
+ server. It was designed for a server where there are thousands of users
who publish their own documents. This is probably very common
on intranets. Many times, it's helpful if the server can make
more intelligent decisions about a file's contents than the
@@ -208,102 +139,112 @@
page work" calls when users improperly name their own files.
You have to decide if the extra work suits your
environment.</p>
-
- <p>When compiling an Apache server, this module should be at or
- near the top of the list of modules in the Configuration file.
- The modules are listed in increasing priority so that will mean
- this one is used only as a last resort, just like it was
- designed to.</p>
-
</section>
<section id="notes"><title>Notes</title>
+ <p>The following notes apply to the <module>mod_mime_magic</module>
+ module and are included here for compliance with contributors'
+ copyright restrictions that require their acknowledgment.</p>
- <p>The following notes apply to the mod_mime_magic module and are
- included here for compliance with contributors' copyright
- restrictions that require their acknowledgment. </p>
-<pre>
-/*
- * mod_mime_magic: MIME type lookup via file magic numbers
- * Copyright (c) 1996-1997 Cisco Systems, Inc.
- *
- * This software was submitted by Cisco Systems to the Apache Group in July
- * 1997. Future revisions and derivatives of this source code must
- * acknowledge Cisco Systems as the original contributor of this module.
- * All other licensing and usage conditions are those of the Apache Group.
- *
- * Some of this code is derived from the free version of the file command
- * originally posted to comp.sources.unix. Copyright info for that program
- * is included below as required.
- * ---------------------------------------------------------------------------
- * - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.
- *
- * This software is not subject to any license of the American Telephone and
- * Telegraph Company or of the Regents of the University of California.
- *
- * Permission is granted to anyone to use this software for any purpose on any
- * computer system, and to alter it and redistribute it freely, subject to
- * the following restrictions:
- *
- * 1. The author is not responsible for the consequences of use of this
- * software, no matter how awful, even if they arise from flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources, credits
- * must appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software. Since few users ever read
- * sources, credits must appear in the documentation.
- *
- * 4. This notice may not be removed or altered.
- * -------------------------------------------------------------------------
- *
- * For compliance with Mr Darwin's terms: this has been very significantly
- * modified from the free "file" command.
- * - all-in-one file for compilation convenience when moving from one
- * version of Apache to the next.
- * - Memory allocation is done through the Apache API's pool structure.
- * - All functions have had necessary Apache API request or server
- * structures passed to them where necessary to call other Apache API
- * routines. (<em>i.e.</em>, usually for logging, files, or memory allocation in
- * itself or a called function.)
- * - struct magic has been converted from an array to a single-ended linked
- * list because it only grows one record at a time, it's only accessed
- * sequentially, and the Apache API has no equivalent of realloc().
- * - Functions have been changed to get their parameters from the server
- * configuration instead of globals. (It should be reentrant now but has
- * not been tested in a threaded environment.)
- * - Places where it used to print results to stdout now saves them in a
- * list where they're used to set the MIME type in the Apache request
- * record.
- * - Command-line flags have been removed since they will never be used here.
- *
- */
-</pre>
+ <note>
+ <p>mod_mime_magic: MIME type lookup via file magic numbers<br />
+ Copyright (c) 1996-1997 Cisco Systems, Inc.</p>
+
+ <p>This software was submitted by Cisco Systems to the Apache Group
+ in July 1997. Future revisions and derivatives of this source code
+ must acknowledge Cisco Systems as the original contributor of this
+ module. All other licensing and usage conditions are those of the
+ Apache Group.</p>
+
+ <p>Some of this code is derived from the free version of the file
+ command originally posted to comp.sources.unix. Copyright info for
+ that program is included below as required.</p>
+ </note>
+
+ <note>
+ <p> - Copyright (c) Ian F. Darwin, 1987. Written by Ian F. Darwin.</p>
+
+ <p>This software is not subject to any license of the American
+ Telephone and Telegraph Company or of the Regents of the University
+ of California.</p>
+
+ <p>Permission is granted to anyone to use this software for any
+ purpose on any computer system, and to alter it and redistribute it
+ freely, subject to the following restrictions:</p>
+
+ <ol>
+ <li>The author is not responsible for the consequences of use of
+ this software, no matter how awful, even if they arise from flaws
+ in it.</li>
+
+ <li>The origin of this software must not be misrepresented, either
+ by explicit claim or by omission. Since few users ever read
+ sources, credits must appear in the documentation.</li>
+
+ <li>Altered versions must be plainly marked as such, and must not
+ be misrepresented as being the original software. Since few users
+ ever read sources, credits must appear in the documentation.</li>
+
+ <li>This notice may not be removed or altered.</li>
+ </ol>
+ </note>
+
+ <note>
+ <p>For compliance with Mr Darwin's terms: this has been very
+ significantly modified from the free "file" command.</p>
+
+ <ul>
+ <li>all-in-one file for compilation convenience when moving from
+ one version of Apache to the next.</li>
+
+ <li>Memory allocation is done through the Apache API's pool
+ structure.</li>
+
+ <li>All functions have had necessary Apache API request or server
+ structures passed to them where necessary to call other Apache API
+ routines. (<em>i.e.</em>, usually for logging, files, or memory
+ allocation in itself or a called function.)</li>
+
+ <li>struct magic has been converted from an array to a single-ended
+ linked list because it only grows one record at a time, it's only
+ accessed sequentially, and the Apache API has no equivalent of
+ <code>realloc()</code>.</li>
+
+ <li>Functions have been changed to get their parameters from the
+ server configuration instead of globals. (It should be reentrant
+ now but has not been tested in a threaded environment.)</li>
+
+ <li>Places where it used to print results to stdout now saves them
+ in a list where they're used to set the MIME type in the Apache
+ request record.</li>
+
+ <li>Command-line flags have been removed since they will never be
+ used here.</li>
+ </ul>
+ </note>
</section>
<directivesynopsis>
<name>MimeMagicFile</name>
<description>Enable MIME-type determination based on file contents
using the specified magic file</description>
-<syntax>MimeMagicFile <em>file-path</em></syntax>
-<contextlist><context>server config</context>
-<context>virtual host</context></contextlist>
+<syntax>MimeMagicFile <var>file-path</var></syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+</contextlist>
<usage>
<p>The <directive>MimeMagicFile</directive> 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
- ServerRoot. 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>
+ <directive module="core">ServerRoot</directive>. 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>
- <p>For example</p>
-
- <example>MimeMagicFile conf/magic</example>
-
+ <example><title>Example</title>
+ MimeMagicFile conf/magic
+ </example>
</usage>
</directivesynopsis>
-</modulesynopsis>
+</modulesynopsis>
diff --git a/docs/manual/mod/mod_negotiation.html.en b/docs/manual/mod/mod_negotiation.html.en
index 28b2d13..a30b76e 100644
--- a/docs/manual/mod/mod_negotiation.html.en
+++ b/docs/manual/mod/mod_negotiation.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_negotiation - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_negotiation</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Provides for <a href="../content-negotiation.html">content negotiation</a></td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>negotiation_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_negotiation.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_negotiation - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_negotiation</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Provides for <a href="../content-negotiation.html">content negotiation</a></td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>negotiation_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_negotiation.c</td></tr></table>
+<h3>Summary</h3>
+
<p>Content negotiation, or more accurately content selection, is
the selection of the document that best matches the clients
capabilities, from one of several available documents. There
@@ -19,15 +36,33 @@
<code>type-map</code>) which explicitly lists the files
containing the variants.</li>
- <li>A MultiViews search (enabled by the MultiViews <code class="directive"><a href="../mod/core.html#options">Options</a></code>, where the server does an
- implicit filename pattern match, and choose from amongst the
+ <li>A MultiViews search (enabled by the <code>MultiViews</code>
+ <code class="directive"><a href="../mod/core.html#options">Options</a></code>), where the server does
+ an implicit filename pattern match, and choose from amongst the
results.</li>
</ul>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#forcelanguagepriority">ForceLanguagePriority</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#languagepriority">LanguagePriority</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#typemaps">Type maps</a></li><li><img alt="" src="../images/down.gif" /> <a href="#multiviews">MultiViews</a></li></ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="../mod/mod_mime.html#defaultlanguage">DefaultLanguage</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addencoding">AddEncoding</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#multiviewsmatch">MultiViewsMatch</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 the same format as RFC822 mail headers. It
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#typemaps">Type maps</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#multiviews">MultiViews</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
+<li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li>
+<li><a href="../content-negotiation.html">Content
+Negotiation</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">Type maps</a></h2>
+ <p>A type map has a format similar to RFC822 mail headers. It
contains document descriptions separated by blank lines, with
lines beginning with a hash character ('#') treated as
comments. A document description consists of several header
@@ -39,8 +74,7 @@
and between the tokens of value. The headers allowed are: </p>
<dl>
- <dt>Content-Encoding:</dt>
-
+ <dt><code>Content-Encoding:</code></dt>
<dd>The encoding of the file. Apache only recognizes
encodings that are defined by an <code class="directive"><a href="../mod/mod_mime.html#addencoding">AddEncoding</a></code> directive.
This normally includes the encodings <code>x-compress</code>
@@ -48,18 +82,17 @@
files. The <code>x-</code> prefix is ignored for encoding
comparisons.</dd>
- <dt>Content-Language:</dt>
+ <dt><code>Content-Language:</code></dt>
+ <dd>The language(s) of the variant, as an Internet standard
+ language tag (<a href="http://www.ietf.org/rfc/rfc1766.txt">RFC 1766</a>). An example is <code>en</code>,
+ meaning English. If the variant contains more than one
+ language, they are separated by a comma.</dd>
- <dd>The language of the variant, as an Internet standard
- language tag (RFC 1766). An example is <code>en</code>,
- meaning English.</dd>
-
- <dt>Content-Length:</dt>
-
+ <dt><code>Content-Length:</code></dt>
<dd>The length of the file, in bytes. If this header is not
present, then the actual length of the file is used.</dd>
- <dt>Content-Type:</dt>
+ <dt><code>Content-Type:</code></dt>
<dd>
The MIME media type of the document, with optional
@@ -68,14 +101,12 @@
<code>name=value</code>. Common parameters include:
<dl>
- <dt>level</dt>
-
+ <dt><code>level</code></dt>
<dd>an integer specifying the version of the media type.
For <code>text/html</code> this defaults to 2, otherwise
0.</dd>
- <dt>qs</dt>
-
+ <dt><code>qs</code></dt>
<dd>a floating-point number with a value in the range 0.0
to 1.0, indicating the relative 'quality' of this variant
compared to the other available variants, independent of
@@ -84,16 +115,16 @@
is attempting to represent a photograph. However, if the
resource being represented is ascii art, then an ascii
file would have a higher source quality than a jpeg file.
- All qs values are therefore specific to a given
+ All <code>qs</code> values are therefore specific to a given
resource.</dd>
</dl>
- Example:
-<div class="example"><p><code>Content-Type: image/jpeg; qs=0.8</code></p></div>
+ <div class="example"><h3>Example</h3><p><code>
+ Content-Type: image/jpeg; qs=0.8
+ </code></p></div>
</dd>
- <dt>URI:</dt>
-
+ <dt><code>URI:</code></dt>
<dd>uri of the file containing the variant (of the given
media type, encoded with the given content encoding). These
are interpreted as URLs relative to the map file; they must
@@ -101,31 +132,30 @@
which the client would be granted access if they were to be
requested directly.</dd>
- <dt>Body:</dt>
-
- <dd><p>New in Apache 2.0, the actual content of the resource may
+ <dt><code>Body:</code></dt>
+ <dd>New in Apache 2.0, the actual content of the resource may
be included in the type-map file using the Body header. This
header must contain a string that designates a delimiter for
- the body content. Then all following lines in the type map
+ the body content. Then all following lines in the type map
file will be considered part of the resource body until the
- delimiter string is found.</p>
+ delimiter string is found.
- <p>Example:</p>
-<div class="example"><p><code>
-Body:----xyz----<br />
-<html><br />
-<body><br />
-<p>Content of the page.</p><br />
-</body><br />
-</html><br />
-----xyz----
-</code></p></div>
+ <div class="example"><h3>Example:</h3><p><code>
+ Body:----xyz----<br />
+ <html><br />
+ <body><br />
+ <p>Content of the page.</p><br />
+ </body><br />
+ </html><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>A MultiViews search is enabled by the MultiViews <code class="directive"><a href="../mod/core.html#options">Options</a></code>. If the server receives a
+</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>A MultiViews search is enabled by the <code>MultiViews</code>
+ <code class="directive"><a href="../mod/core.html#options">Options</a></code>. If the server receives a
request for <code>/some/dir/foo</code> and
<code>/some/dir/foo</code> does <em>not</em> exist, then the
server reads the directory looking for all files named
@@ -134,15 +164,19 @@
content-encodings it would have if the client had asked for one
of them by name. It then chooses the best match to the client's
requirements, and returns that 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="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><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>The syntax changed in version 2.0.</td></tr></table>
+</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>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The syntax changed in version 2.0.</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
@@ -158,16 +192,21 @@
<code class="directive">CacheNegotiatedDocs</code> did not take an
argument; it was turned on by the presence of the directive by
itself.</p>
-</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><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0.30 and later</td></tr></table>
+
+</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>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0.30 and later</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
negotation where the server could otherwise not return a single
@@ -177,48 +216,60 @@
<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 Accept-Language header assigned en and de
- each as quality .500 (equally acceptable) then the first matching
- variant, en, will be served.</p>
+ 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>
-<div class="example"><p><code>
+ <div class="example"><p><code>
LanguagePriority en fr de<br />
ForceLanguagePriority Prefer
-</code></p></div>
+ </code></p></div>
<p><code>ForceLanguagePriority Fallback</code> uses
- <code>LanguagePriority</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 Accept-Language only permitted an
- es language response, but such a variant isn't found, then the
- first variant from the LanguagePriority list below will be
- served.</p>
+ <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>
-<div class="example"><p><code>
+ <div class="example"><p><code>
LanguagePriority en fr de<br />
ForceLanguagePriority Fallback
-</code></p></div>
+ </code></p></div>
- <p>Both options, Prefer and Fallback, may be specified, so either the
- first matching variant from LanguagePriority will be served if more
- that 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>
-</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 <em>MIME-lang</em> [<em>MIME-lang</em>] ...</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>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 <em>MIME-lang</em> are in order of decreasing preference.
- Example:</p>
+ of <var>MIME-lang</var> are in order of decreasing preference.</p>
-<div class="example"><p><code>LanguagePriority en fr de</code></p></div>
+ <div class="example"><h3>Example:</h3><p><code>
+ LanguagePriority en fr de
+ </code></p></div>
<p>For a request for <code>foo.html</code>, where
<code>foo.html.fr</code> and <code>foo.html.de</code> both
@@ -229,4 +280,14 @@
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>. Correctly implemented HTTP/1.1 requests
will mean this directive has no effect.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
+</ul>
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_negotiation.html.ja.jis b/docs/manual/mod/mod_negotiation.html.ja.jis
index 69979cb..4ad2d2c 100644
--- a/docs/manual/mod/mod_negotiation.html.ja.jis
+++ b/docs/manual/mod/mod_negotiation.html.ja.jis
@@ -4,13 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_negotiation - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_negotiation</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td><a href="../content-negotiation.html">$B%3%s%F%s%H%M%4%7%(!<%7%g%s(B</a>
- $B5!G=$rDs6!$9$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>negotiation_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_negotiation.c</td></tr></table><h3>$B35MW(B</h3>
- <p>$B%3%s%F%s%H(B$B%M%4%7%(!<%7%g%s!"$h$j@53N$K$O%3%s%F%s%D$NA*Br5!G=$O!"(B
+ -->
+<title>mod_negotiation - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_negotiation</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td><a href="../content-negotiation.html">$B%3%s%F%s%H%M%4%7%(!<%7%g%s(B</a>
+ $B5!G=$rDs6!$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>negotiation_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_negotiation.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
+ <p>$B%3%s%F%s%H%M%4%7%(!<%7%g%s!"$h$j@53N$K$O%3%s%F%s%D$NA*Br5!G=$O!"(B
$BJ#?tMQ0U$5$l$F$$$k%I%-%e%a%s%H$+$i!"%/%i%$%"%s%H$NG=NO$K0lHV9g$C$?(B
$B%I%-%e%a%s%H$rA*Br$9$k5!G=$G$9!#$3$N<BAu$OFs$D$"$j$^$9!#(B</p>
@@ -21,12 +38,30 @@
<li>MultiViews $B$NC5:w(B (MultiViews <code class="directive"><a href="../mod/core.html#option">Option</a></code> $B$G;HMQ$9$k$h$&$K$J$j$^$9(B)$B!#(B
$B%5!<%P$,0EL[$NFb$K%U%!%$%kL>$N%Q%?!<%s%^%C%A$r9T$J$$!"(B
- $B$=$N(B$B7k2L$+$iA*Br$7$^$9!#(B</li>
+ $B$=$N7k2L$+$iA*Br$7$^$9!#(B</li>
</ul>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#forcelanguagepriority">ForceLanguagePriority</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#languagepriority">LanguagePriority</a></li>
-</ul><h3>$B%H%T%C%/(B</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#typemaps">$B%?%$%W%^%C%W(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#multiviews">MultiViews</a></li></ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><code class="directive"><a href="../mod/mod_mime.html#defaultlanguage">DefaultLanguage</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addencoding">AddEncoding</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#multiviewsmatch">MultiViewsMatch</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">$B%?%$%W%^%C%W(B</a></h2>
+</ul>
+<h3>$B%H%T%C%/(B</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#typemaps">$B%?%$%W%^%C%W(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#multiviews">MultiViews</a></li>
+</ul><h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/mod_mime.html#defaultlanguage">DefaultLanguage</a></code></li>
+<li><code class="directive"><a href="../mod/mod_mime.html#addencoding">AddEncoding</a></code></li>
+<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
+<li><code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code></li>
+<li><code class="directive"><a href="../mod/mod_mime.html#multiviewsmatch">MultiViewsMatch</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">$B%?%$%W%^%C%W(B</a></h2>
<p>$B%?%$%W%^%C%W$O(B RFC 822 $B$N%a!<%k%X%C%@$HF1$8=q<0$G$9!#(B
$B%I%-%e%a%s%H$N5-=R$,6u9T$GJ,N%$5$l$F=q$+$l$F$$$F!"%O%C%7%eJ8;z(B
('#') $B$G;O$^$k9T$O%3%a%s%H$H$7$F07$o$l$^$9!#(B
@@ -77,7 +112,7 @@
<dt>qs</dt>
<dd>$B%/%i%$%"%s%H$NG=NO$K4X78$J$/!"(Bvariant
- $B$rB>$HHf3S$7$?$H$-$NAjBP(B$BE*$J!VIJ<A!W$G!"(B0.0 $B$+$i(B 1.0
+ $B$rB>$HHf3S$7$?$H$-$NAjBPE*$J!VIJ<A!W$G!"(B0.0 $B$+$i(B 1.0
$B$NHO0O$NIbF0E@>.?t!#(B
$BNc$($P!"<L??$rI=8=$7$h$&$H$7$F$$$k$H$-$OIaDL$O(B JPEG
$B%U%!%$%k$NJ}$,(B ASCII $B%U%!%$%k$h$j$b9b$$IJ<A$K$J$j$^$9!#(B
@@ -119,7 +154,9 @@
</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>
+</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 $BC5:w$O!"(BMultiviews <code class="directive"><a href="../mod/core.html#options">Options</a></code> $B%G%#%l%/%F%#%V$K$h$jM-8z$K$J$j$^$9!#(B
@@ -132,15 +169,19 @@
$B$=$N%U%!%$%kL>$rD>@\;XDj$7$?$H$-$HF1$8$b$N$,3d$jEv$F$i$l$^$9!#(B
$B$=$l$+$i%/%i%$%"%s%H$NMW5a$K0lHV9g$&$b$N$rA*$S!"(B
$B$=$N%I%-%e%a%s%H$rJV$7$^$9!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%3%s%F%s%H%M%4%7%(!<%7%g%s$5$l$?%I%-%e%a%s%H$r%W%m%-%7%5!<%P$,(B
-$B%-%c%C%7%e$G$-$k$h$&$K$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>CacheNegotiatedDocs on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>CacheNegotiatedDocs off</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_negotiation</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>$B%P!<%8%g%s(B 2.0$B$G9=J8$,JQ$o$j$^$7$?(B</td></tr></table>
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%3%s%F%s%H%M%4%7%(!<%7%g%s$5$l$?%I%-%e%a%s%H$r%W%m%-%7%5!<%P$,(B
+$B%-%c%C%7%e$G$-$k$h$&$K$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>CacheNegotiatedDocs on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>CacheNegotiatedDocs off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_negotiation</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>$B%P!<%8%g%s(B 2.0$B$G9=J8$,JQ$o$j$^$7$?(B</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$,@_Dj$5$l$F$$$k$H!"%3%s%F%s%H%M%4%7%(!<%7%g%s(B
$B$r$7$?7k2L$N%I%-%e%a%s%H$N%-%c%C%7%e$r5v2D$7$^$9!#(B
$B$3$l$O!"%W%m%-%7$N8e$m$K$$$k%/%i%$%"%s%H$,G=NO$K0lHV9g$C$?(B
@@ -154,16 +195,21 @@
<p>2.0 $B$h$jA0$N%P!<%8%g%s$G$O!"(B
<code class="directive">CacheNegotiatedDocs</code> $B$O0z?t$r<h$i$:!"(B
$B%G%#%l%/%F%#%V$,B8:_$9$k$3$H$G(B on $B$NF0:n$r$7$F$$$^$7$?!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$BMW5a$K9g$&C1FH$N%I%-%e%a%s%H$,8+$D$+$i$J$+$C$?$H$-$K9T$J$&$3$H$r;XDj(B
-</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>ForceLanguagePriority Prefer</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_negotiation</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>$B%P!<%8%g%s(B 2.0.30 $B0J9_$G;HMQ2DG=(B</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BMW5a$K9g$&C1FH$N%I%-%e%a%s%H$,8+$D$+$i$J$+$C$?$H$-$K9T$J$&$3$H$r;XDj(B
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>ForceLanguagePriority Prefer</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_negotiation</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>$B%P!<%8%g%s(B 2.0.30 $B0J9_$G;HMQ2DG=(B</td></tr>
+</table>
<p><code class="directive">ForceLanguagePriority</code> $B%G%#%l%/%F%#%V$O(B
$BMW5a$K9g$&%I%-%e%a%s%H$r0l$D$@$1JV$9$3$H$,$G$-$J$$$H$-$K!"(B
<code class="directive"><a href="#languagepriority">LanguagePriority</a></code>
@@ -196,14 +242,19 @@
$B$G$9$+$i!"J#?t$N(B variant $B$,$"$k$H$-$O(B LanguagePriority $B$N:G=i$N(B
variant $B$,Aw$i$l!"%/%i%$%"%s%H$N5vMF8@8l$K9g$&(B vaiant $B$,$J$$$H$-$O(B
$BB8:_$9$k%I%-%e%a%s%H$G:G=i$N$b$N$,Aw$i$l$k!"$H$$$&MM$K$9$k$3$H$,$G$-$^$9!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%/%i%$%"%s%H$,M%@hEY$r<($5$J$+$C$?$H$-$N8@8l$N(B variant $B$NM%@hEY$r(B
-$B;XDj(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>LanguagePriority <em>MIME-lang</em> [<em>MIME-lang</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_negotiation</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%/%i%$%"%s%H$,M%@hEY$r<($5$J$+$C$?$H$-$N8@8l$N(B variant $B$NM%@hEY$r(B
+$B;XDj(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>LanguagePriority <em>MIME-lang</em> [<em>MIME-lang</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_negotiation</td></tr>
+</table>
<p><code class="directive">LanguagePriority</code> $B$O!"(BMultiViews
$B%j%/%(%9%H$r07$&$H$-$K!"%/%i%$%"%s%H$,M%@h=g0L$rDs6!$7$F$$$J$$>l9g$N(B
$B8@8l$NM%@h=g0L$r@_Dj$7$^$9!#(B<em>MIME-lang</em>
@@ -222,4 +273,10 @@
<code>None</code> $B0J30$N$H$-$K$N$_8z2L$,$"$k$3$H$KCm0U$7$F$/$@$5$$!#(B
HTTP/1.1 $B%j%/%(%9%H$,@5$7$/<BAu$5$l$F$$$k>l9g$K$O!"(B
$B$3$N%G%#%l%/%F%#%V$OL58z$K$J$j$^$9!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_negotiation.xml b/docs/manual/mod/mod_negotiation.xml
index 8b3d454..82dbbed 100644
--- a/docs/manual/mod/mod_negotiation.xml
+++ b/docs/manual/mod/mod_negotiation.xml
@@ -21,21 +21,19 @@
<code>type-map</code>) which explicitly lists the files
containing the variants.</li>
- <li>A MultiViews search (enabled by the MultiViews <directive
- module="core">Options</directive>, where the server does an
- implicit filename pattern match, and choose from amongst the
+ <li>A MultiViews search (enabled by the <code>MultiViews</code>
+ <directive module="core">Options</directive>), where the server does
+ an implicit filename pattern match, and choose from amongst the
results.</li>
</ul>
</summary>
-
-<seealso><directive module="mod_mime">DefaultLanguage</directive></seealso>
-<seealso><directive module="mod_mime">AddEncoding</directive></seealso>
-<seealso><directive module="mod_mime">AddLanguage</directive></seealso>
-<seealso><directive module="mod_mime">AddType</directive></seealso>
-<seealso><directive module="mod_mime">MultiViewsMatch</directive></seealso>
+<seealso><directive module="core">Options</directive></seealso>
+<seealso><module>mod_mime</module></seealso>
+<seealso><a href="../content-negotiation.html">Content
+Negotiation</a></seealso>
<section id="typemaps"><title>Type maps</title>
- <p>A type map has the same format as RFC822 mail headers. It
+ <p>A type map has a format similar to RFC822 mail headers. It
contains document descriptions separated by blank lines, with
lines beginning with a hash character ('#') treated as
comments. A document description consists of several header
@@ -47,8 +45,7 @@
and between the tokens of value. The headers allowed are: </p>
<dl>
- <dt>Content-Encoding:</dt>
-
+ <dt><code>Content-Encoding:</code></dt>
<dd>The encoding of the file. Apache only recognizes
encodings that are defined by an <directive
module="mod_mime">AddEncoding</directive> directive.
@@ -57,18 +54,18 @@
files. The <code>x-</code> prefix is ignored for encoding
comparisons.</dd>
- <dt>Content-Language:</dt>
+ <dt><code>Content-Language:</code></dt>
+ <dd>The language(s) of the variant, as an Internet standard
+ language tag (<a href="http://www.ietf.org/rfc/rfc1766.txt"
+ >RFC 1766</a>). An example is <code>en</code>,
+ meaning English. If the variant contains more than one
+ language, they are separated by a comma.</dd>
- <dd>The language of the variant, as an Internet standard
- language tag (RFC 1766). An example is <code>en</code>,
- meaning English.</dd>
-
- <dt>Content-Length:</dt>
-
+ <dt><code>Content-Length:</code></dt>
<dd>The length of the file, in bytes. If this header is not
present, then the actual length of the file is used.</dd>
- <dt>Content-Type:</dt>
+ <dt><code>Content-Type:</code></dt>
<dd>
The MIME media type of the document, with optional
@@ -77,14 +74,12 @@
<code>name=value</code>. Common parameters include:
<dl>
- <dt>level</dt>
-
+ <dt><code>level</code></dt>
<dd>an integer specifying the version of the media type.
For <code>text/html</code> this defaults to 2, otherwise
0.</dd>
- <dt>qs</dt>
-
+ <dt><code>qs</code></dt>
<dd>a floating-point number with a value in the range 0.0
to 1.0, indicating the relative 'quality' of this variant
compared to the other available variants, independent of
@@ -93,16 +88,16 @@
is attempting to represent a photograph. However, if the
resource being represented is ascii art, then an ascii
file would have a higher source quality than a jpeg file.
- All qs values are therefore specific to a given
+ All <code>qs</code> values are therefore specific to a given
resource.</dd>
</dl>
- Example:
-<example>Content-Type: image/jpeg; qs=0.8</example>
+ <example><title>Example</title>
+ Content-Type: image/jpeg; qs=0.8
+ </example>
</dd>
- <dt>URI:</dt>
-
+ <dt><code>URI:</code></dt>
<dd>uri of the file containing the variant (of the given
media type, encoded with the given content encoding). These
are interpreted as URLs relative to the map file; they must
@@ -110,34 +105,30 @@
which the client would be granted access if they were to be
requested directly.</dd>
- <dt>Body:</dt>
-
- <dd><p>New in Apache 2.0, the actual content of the resource may
+ <dt><code>Body:</code></dt>
+ <dd>New in Apache 2.0, the actual content of the resource may
be included in the type-map file using the Body header. This
header must contain a string that designates a delimiter for
- the body content. Then all following lines in the type map
+ the body content. Then all following lines in the type map
file will be considered part of the resource body until the
- delimiter string is found.</p>
+ delimiter string is found.
- <p>Example:</p>
-<example>
-Body:----xyz----<br />
-<html><br />
-<body><br />
-<p>Content of the page.</p><br />
-</body><br />
-</html><br />
-----xyz----
-</example>
+ <example><title>Example:</title>
+ Body:----xyz----<br />
+ <html><br />
+ <body><br />
+ <p>Content of the page.</p><br />
+ </body><br />
+ </html><br />
+ ----xyz----
+ </example>
</dd>
</dl>
</section>
-<section id="multiviews">
- <title>MultiViews</title>
-
- <p>A MultiViews search is enabled by the MultiViews <directive
- module="core">Options</directive>. If the server receives a
+<section id="multiviews"><title>MultiViews</title>
+ <p>A MultiViews search is enabled by the <code>MultiViews</code>
+ <directive module="core">Options</directive>. If the server receives a
request for <code>/some/dir/foo</code> and
<code>/some/dir/foo</code> does <em>not</em> exist, then the
server reads the directory looking for all files named
@@ -152,8 +143,8 @@
<name>CacheNegotiatedDocs</name>
<description>Allows content-negotiated documents to be
cached by proxy servers</description>
-<syntax>CacheNegotiatedDocs on|off</syntax>
-<default>CacheNegotiatedDocs off</default>
+<syntax>CacheNegotiatedDocs On|Off</syntax>
+<default>CacheNegotiatedDocs Off</default>
<contextlist><context>server config</context><context>virtual host</context>
</contextlist>
<compatibility>The syntax changed in version 2.0.</compatibility>
@@ -183,11 +174,8 @@
found</description>
<syntax>ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</syntax>
<default>ForceLanguagePriority Prefer</default>
-<contextlist><context>server config</context>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
<compatibility>Available in version 2.0.30 and later</compatibility>
@@ -202,56 +190,59 @@
<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 Accept-Language header assigned en and de
- each as quality .500 (equally acceptable) then the first matching
- variant, en, will be served.</p>
+ 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>
-<example>
+ <example>
LanguagePriority en fr de<br />
ForceLanguagePriority Prefer
-</example>
+ </example>
<p><code>ForceLanguagePriority Fallback</code> uses
- <code>LanguagePriority</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 Accept-Language only permitted an
- es language response, but such a variant isn't found, then the
- first variant from the LanguagePriority list below will be
- served.</p>
+ <directive module="mod_negotiation">LanguagePriority</directive> 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 <directive module="mod_negotiation"
+ >LanguagePriority</directive> list below will be served.</p>
-<example>
+ <example>
LanguagePriority en fr de<br />
ForceLanguagePriority Fallback
-</example>
+ </example>
- <p>Both options, Prefer and Fallback, may be specified, so either the
- first matching variant from LanguagePriority will be served if more
- that 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>
+ <p>Both options, <code>Prefer</code> and <code>Fallback</code>, may be
+ specified, so either the first matching variant from <directive
+ module="mod_negotiation">LanguagePriority</directive> 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>
</usage>
+<seealso><directive module="mod_mime">AddLanguage</directive></seealso>
</directivesynopsis>
<directivesynopsis>
<name>LanguagePriority</name>
<description>The precendence of language variants for cases where
the client does not express a preference</description>
-<syntax>LanguagePriority <em>MIME-lang</em> [<em>MIME-lang</em>] ...</syntax>
-<contextlist><context>server config</context>
-<context>virtual host</context>
-<context>directory</context>
-<context>.htaccess</context>
-</contextlist>
+<syntax>LanguagePriority <var>MIME-lang</var> [<var>MIME-lang</var>]
+...</syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context><context>.htaccess</context></contextlist>
<override>FileInfo</override>
<usage>
<p>The <directive>LanguagePriority</directive> 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 <em>MIME-lang</em> are in order of decreasing preference.
- Example:</p>
+ of <var>MIME-lang</var> are in order of decreasing preference.</p>
-<example>LanguagePriority en fr de</example>
+ <example><title>Example:</title>
+ LanguagePriority en fr de
+ </example>
<p>For a request for <code>foo.html</code>, where
<code>foo.html.fr</code> and <code>foo.html.de</code> both
@@ -264,6 +255,7 @@
is not <code>None</code>. Correctly implemented HTTP/1.1 requests
will mean this directive has no effect.</p>
</usage>
+<seealso><directive module="mod_mime">AddLanguage</directive></seealso>
</directivesynopsis>
</modulesynopsis>
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 109e1b3..1365496 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_proxy - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_proxy</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>HTTP/1.1 proxy/gateway server</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>proxy_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_proxy.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_proxy - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_proxy</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>HTTP/1.1 proxy/gateway server</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>proxy_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_proxy.c</td></tr></table>
+<h3>Summary</h3>
+
<div class="warning"><h3>Warning</h3>
This document has been updated to take into account changes
made in the 2.0 version of the Apache HTTP Server. Some of the
@@ -47,7 +64,10 @@
dangerous both to your network and to the Internet at large.</p></div>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#allowconnect">AllowCONNECT</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#allowconnect">AllowCONNECT</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#noproxy">NoProxy</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxy"><Proxy></a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxyblock">ProxyBlock</a></li>
@@ -65,7 +85,14 @@
<li><img alt="" src="../images/down.gif" /> <a href="#proxyrequests">ProxyRequests</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxytimeout">ProxyTimeout</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxyvia">ProxyVia</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#configs">Common configuration topics</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="configs" id="configs">Common configuration topics</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#configs">Common configuration topics</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="configs" id="configs">Common configuration topics</a></h2>
<ul>
<li><a href="#forwardreverse">Forward and Reverse Proxies</a></li>
@@ -265,14 +292,18 @@
-</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 CONNECT through
-the proxy</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AllowCONNECT <em>port</em> [<em>port</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AllowCONNECT 443 563</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_proxy</td></tr></table>
+</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 CONNECT through
+the proxy</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AllowCONNECT <em>port</em> [<em>port</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AllowCONNECT 443 563</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_proxy</td></tr>
+</table>
<p>The <code class="directive">AllowCONNECT</code> directive specifies a list
of port numbers to which the proxy <code>CONNECT</code> method may
connect. Today's browsers use this method when a <em>https</em>
@@ -281,13 +312,18 @@
default snews port (563) are enabled. Use the
<code class="directive">AllowCONNECT</code> directive to overrride this default and
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="directive-section"><h2><a name="NoProxy" id="NoProxy">NoProxy</a> <a name="noproxy" id="noproxy">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Hosts, domains, or networks that will be connected
-to directly</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>NoProxy <em>host</em> [<em>host</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_proxy</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="NoProxy" id="NoProxy">NoProxy</a> <a name="noproxy" id="noproxy">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Hosts, domains, or networks that will be connected
+to directly</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>NoProxy <em>host</em> [<em>host</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_proxy</td></tr>
+</table>
<p>This directive is only useful for Apache proxy servers within
intranets. The <code class="directive">NoProxy</code> directive specifies a
list of subnets, IP addresses, hosts and/or domains, separated by
@@ -382,13 +418,22 @@
and <code>www.mydomain.com.</code> (note the trailing period) are
considered equal.</dd>
</dl>
-<h3>See also</h3><ul><li><a href="../dns-caveats.html">DNS Issues</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="Proxy" id="Proxy"><Proxy></a> <a name="proxy" id="proxy">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Container for directives applied to proxied
-resources</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><Proxy <em>wildcard-url</em>> ...</Proxy></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_proxy</td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../dns-caveats.html">DNS Issues</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="Proxy" id="Proxy"><Proxy></a> <a name="proxy" id="proxy">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Container for directives applied to proxied
+resources</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><Proxy <em>wildcard-url</em>> ...</Proxy></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_proxy</td></tr>
+</table>
<p>Directives placed in <code class="directive"><Proxy></code>
sections apply only to matching proxied content. Shell-style
wildcards are allowed.</p>
@@ -414,14 +459,19 @@
SetOutputFilter INCLUDES<br />
</Proxy>
</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="ProxyBlock" id="ProxyBlock">ProxyBlock</a> <a name="proxyblock" id="proxyblock">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Words, hosts, or domains that are banned from being
-proxied</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyBlock *|<em>word|host|domain</em>
-[<em>word|host|domain</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_proxy</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyBlock" id="ProxyBlock">ProxyBlock</a> <a name="proxyblock" id="proxyblock">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Words, hosts, or domains that are banned from being
+proxied</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyBlock *|<em>word|host|domain</em>
+[<em>word|host|domain</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_proxy</td></tr>
+</table>
<p>The <code class="directive">ProxyBlock</code> directive specifies a list of
words, hosts and/or domains, separated by spaces. HTTP, HTTPS, and
FTP document requests to sites whose names contain matched words,
@@ -448,12 +498,17 @@
<p>blocks connections to all sites.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ProxyDomain" id="ProxyDomain">ProxyDomain</a> <a name="proxydomain" id="proxydomain">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Default domain name for proxied requests</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyDomain <em>Domain</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_proxy</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyDomain" id="ProxyDomain">ProxyDomain</a> <a name="proxydomain" id="proxydomain">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Default domain name for proxied requests</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyDomain <em>Domain</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_proxy</td></tr>
+</table>
<p>This directive is only useful for Apache proxy servers within
intranets. The <code class="directive">ProxyDomain</code> directive specifies
the default domain which the apache proxy server will belong to. If a
@@ -466,47 +521,67 @@
NoProxy .mycompany.com 192.168.112.0/21<br />
ProxyDomain .mycompany.com
</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="ProxyErrorOverride" id="ProxyErrorOverride">ProxyErrorOverride</a> <a name="proxyerroroverride" id="proxyerroroverride">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Override error pages for proxied content</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyErrorOverride On|Off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ProxyErrorOverride 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_proxy</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0 and later</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyErrorOverride" id="ProxyErrorOverride">ProxyErrorOverride</a> <a name="proxyerroroverride" id="proxyerroroverride">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Override error pages for proxied content</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyErrorOverride On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyErrorOverride 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.0 and later</td></tr>
+</table>
<p>This directive is useful for reverse-proxy setups, where you want to
have a common look and feel on the error pages seen by the end user.
This also allows for included files (via mod_include's SSI) to get
the error code and act accordingly (default behavior would display
the error page of the proxied server, turning this on shows the SSI
Error message).</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ProxyIOBufferSize" id="ProxyIOBufferSize">ProxyIOBufferSize</a> <a name="proxyiobuffersize" id="proxyiobuffersize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>IO buffer size for outgoing HTTP and FTP
-connections</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyIOBufferSize <em>bytes</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_proxy</td></tr></table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ProxyMatch" id="ProxyMatch"><ProxyMatch></a> <a name="proxymatch" id="proxymatch">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Container for directives applied to regular-expression-matched
-proxied resources</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code><Proxy <em>regex</em>> ...</Proxy></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_proxy</td></tr></table>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyIOBufferSize" id="ProxyIOBufferSize">ProxyIOBufferSize</a> <a name="proxyiobuffersize" id="proxyiobuffersize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>IO buffer size for outgoing HTTP and FTP
+connections</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyIOBufferSize <em>bytes</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_proxy</td></tr>
+</table>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyMatch" id="ProxyMatch"><ProxyMatch></a> <a name="proxymatch" id="proxymatch">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Container for directives applied to regular-expression-matched
+proxied resources</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><Proxy <em>regex</em>> ...</Proxy></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_proxy</td></tr>
+</table>
<p>The <code class="directive"><ProxyMatch></code> directive is
identical to the <code class="directive"><a href="#proxy"><Proxy></a></code> directive, except it matches URLs
using regular expressions.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ProxyMaxForwards" id="ProxyMaxForwards">ProxyMaxForwards</a> <a name="proxymaxforwards" id="proxymaxforwards">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maximium number of proxies that a request can be forwarded
-through</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyMaxForwards <em>number</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ProxyMaxForwards 10</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_proxy</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0 and later</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyMaxForwards" id="ProxyMaxForwards">ProxyMaxForwards</a> <a name="proxymaxforwards" id="proxymaxforwards">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximium number of proxies that a request can be forwarded
+through</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyMaxForwards <em>number</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyMaxForwards 10</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_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.0 and later</td></tr>
+</table>
<p>The <code class="directive">ProxyMaxForwards</code> directive specifies the
maximum number of proxies through which a request may pass. This is
set to prevent infinite proxy loops, or a DoS attack.</p>
@@ -514,13 +589,18 @@
<div class="example"><h3>Example</h3><p><code>
ProxyMaxForwards 10
</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="ProxyPass" id="ProxyPass">ProxyPass</a> <a name="proxypass" id="proxypass">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maps remote servers into the local server
-URL-space</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyPass [<em>path</em>] !|<em>url</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_proxy</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPass" id="ProxyPass">ProxyPass</a> <a name="proxypass" id="proxypass">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps remote servers into the local server
+URL-space</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPass [<em>path</em>] !|<em>url</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_proxy</td></tr>
+</table>
<p>This directive allows remote servers to be mapped into the space of
the local server; the local server does not act as a proxy in the
conventional sense, but appears to be a mirror of the remote
@@ -555,13 +635,18 @@
the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directive
with the <code>[P]</code> flag.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ProxyPassReverse" id="ProxyPassReverse">ProxyPassReverse</a> <a name="proxypassreverse" id="proxypassreverse">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Adjusts the URL in HTTP response headers sent from
-a reverse proxied server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyPassReverse [<em>path</em>] <em>url</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_proxy</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPassReverse" id="ProxyPassReverse">ProxyPassReverse</a> <a name="proxypassreverse" id="proxypassreverse">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Adjusts the URL in HTTP response headers sent from
+a reverse proxied server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPassReverse [<em>path</em>] <em>url</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_proxy</td></tr>
+</table>
<p>This directive lets Apache adjust the URL in the <code>Location</code>,
<code>Content-Location</code> and <code>URI</code> headers on
HTTP redirect responses. This is essential when Apache is used as
@@ -598,28 +683,38 @@
<p>When used inside a <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section, the first argument is
ommitted and the local directory is obtained from the <code class="directive"><a href="../mod/core.html#location"><Location></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="ProxyPreserveHost" id="ProxyPreserveHost">ProxyPreserveHost</a> <a name="proxypreservehost" id="proxypreservehost">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Use incoming Host HTTP request header for
-proxy request</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyPreserveHost on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ProxyPreserveHost 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_proxy</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in
-Apache 2.0.31 and later.</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPreserveHost" id="ProxyPreserveHost">ProxyPreserveHost</a> <a name="proxypreservehost" id="proxypreservehost">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use incoming Host HTTP request header for
+proxy request</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPreserveHost on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyPreserveHost 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in
+Apache 2.0.31 and later.</td></tr>
+</table>
<p>When enabled, this option will pass the Host: line from the
incoming request to the proxied host, instead of the hostname
specified in the proxypass line.
</p>
<p>This option should normally be turned '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="ProxyReceiveBufferSize" id="ProxyReceiveBufferSize">ProxyReceiveBufferSize</a> <a name="proxyreceivebuffersize" id="proxyreceivebuffersize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Network buffer size for outgoing HTTP and FTP
-connections</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyReceiveBufferSize <em>bytes</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_proxy</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyReceiveBufferSize" id="ProxyReceiveBufferSize">ProxyReceiveBufferSize</a> <a name="proxyreceivebuffersize" id="proxyreceivebuffersize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Network buffer size for outgoing HTTP and FTP
+connections</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyReceiveBufferSize <em>bytes</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_proxy</td></tr>
+</table>
<p>The <code class="directive">ProxyReceiveBufferSize</code> directive
specifies an explicit network buffer size for outgoing HTTP and FTP
connections, for increased throughput. It has to be greater than 512
@@ -628,12 +723,17 @@
<div class="example"><h3>Example</h3><p><code>
ProxyReceiveBufferSize 2048
</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="ProxyRemote" id="ProxyRemote">ProxyRemote</a> <a name="proxyremote" id="proxyremote">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Remote proxy used to handle certain requests</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyRemote <em>match remote-server</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_proxy</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyRemote" id="ProxyRemote">ProxyRemote</a> <a name="proxyremote" id="proxyremote">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Remote proxy used to handle certain requests</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyRemote <em>match remote-server</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_proxy</td></tr>
+</table>
<p>This defines remote proxies to this proxy. <em>match</em> is either the
name of a URL-scheme that the remote server supports, or a partial URL
for which the remote server should be used, or '*' to indicate the
@@ -662,24 +762,34 @@
<p>This option also supports reverse proxy configuration - a backend
webserver can be embedded within a virtualhost URL space even if that
server is hidden by another forward proxy.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ProxyRemoteMatch" id="ProxyRemoteMatch">ProxyRemoteMatch</a> <a name="proxyremotematch" id="proxyremotematch">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Remote proxy used to handle requests
-matched by regular expressions</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyRemote <em>regex remote-server</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_proxy</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyRemoteMatch" id="ProxyRemoteMatch">ProxyRemoteMatch</a> <a name="proxyremotematch" id="proxyremotematch">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Remote proxy used to handle requests
+matched by regular expressions</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyRemote <em>regex remote-server</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_proxy</td></tr>
+</table>
<p>The <code class="directive">ProxyRemoteMatch</code> is identical
to the <code class="directive"><a href="#proxyremote">ProxyRemote</a></code>
directive, except the first argument is a regular expression
match against the requested URL.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ProxyRequests" id="ProxyRequests">ProxyRequests</a> <a name="proxyrequests" id="proxyrequests">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enables forward (standard) proxy requests</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyRequests on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ProxyRequests 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_proxy</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyRequests" id="ProxyRequests">ProxyRequests</a> <a name="proxyrequests" id="proxyrequests">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables forward (standard) proxy requests</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyRequests on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyRequests 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
+</table>
<p>This allows or prevents Apache from functioning as a forward proxy
server. (Setting ProxyRequests to 'off' does not disable use of the
<code class="directive"><a href="#proxypass">ProxyPass</a></code> directive.)</p>
@@ -691,28 +801,38 @@
<a href="#access">secured your server</a>. Open proxy servers are
dangerous both to your network and to the Internet at large.</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="ProxyTimeout" id="ProxyTimeout">ProxyTimeout</a> <a name="proxytimeout" id="proxytimeout">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Network timeout for proxied requests</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyTimeout <em>seconds</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ProxyTimeout 300</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_proxy</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in
-Apache 2.0.31 and later</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyTimeout" id="ProxyTimeout">ProxyTimeout</a> <a name="proxytimeout" id="proxytimeout">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Network timeout for proxied requests</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyTimeout <em>seconds</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyTimeout 300</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_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in
+Apache 2.0.31 and later</td></tr>
+</table>
<p>This directive allows a user to specifiy a timeout on proxy requests.
This is usefull when you have a slow/buggy appserver which hangs,
and you would rather just return a timeout and fail gracefully instead
of waiting however long it takes the server to return
</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ProxyVia" id="ProxyVia">ProxyVia</a> <a name="proxyvia" id="proxyvia">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Information provided in the Via HTTP response
-header for proxied requests</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ProxyVia on|off|full|block</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ProxyVia 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_proxy</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyVia" id="ProxyVia">ProxyVia</a> <a name="proxyvia" id="proxyvia">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Information provided in the Via HTTP response
+header for proxied requests</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyVia on|off|full|block</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyVia 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
+</table>
<p>This directive controls the use of the <code>Via:</code> HTTP
header by the proxy. Its intended use is to control the flow of of
proxy requests along a chain of proxy servers. See RFC2068 (HTTP/1.1)
@@ -735,4 +855,10 @@
proxy request will have all its <code>Via:</code> header lines
removed. No new <code>Via:</code> header will be generated.</li>
</ul>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_connect.html.en b/docs/manual/mod/mod_proxy_connect.html.en
new file mode 100644
index 0000000..bfabf24
--- /dev/null
+++ b/docs/manual/mod/mod_proxy_connect.html.en
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mod_proxy_connect - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_proxy_connect</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for
+<code>CONNECT</code> request handling</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>proxy_connect_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>proxy_connect.c</td></tr></table>
+<h3>Summary</h3>
+
+ <p>This module <em>requires</em> the service of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>. It provides support for the <code>CONNECT</code>
+ HTTP method. This method is mainly used to tunnel SSL requests
+ through proxy servers.</p>
+
+ <p>Thus, in order to get the ability of handling <code>CONNECT</code>
+ requests, <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and
+ <code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code> have to be present in the server.</p>
+
+ <div class="warning"><h3>Warning</h3>
+ <p>Do not enable proxying until you have <a href="mod_proxy.html#access">secured your server</a>. Open proxy
+ servers are dangerous both to your network and to the Internet at
+ large.</p>
+ </div>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<p>This module provides no directives.</p>
+<h3>See also</h3>
+<ul class="seealso">
+<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></div>
+
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_connect.xml b/docs/manual/mod/mod_proxy_connect.xml
new file mode 100644
index 0000000..f694b51
--- /dev/null
+++ b/docs/manual/mod/mod_proxy_connect.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
+<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
+<modulesynopsis>
+
+<name>mod_proxy_connect</name>
+<description><module>mod_proxy</module> extension for
+<code>CONNECT</code> request handling</description>
+<status>Extension</status>
+<sourcefile>proxy_connect.c</sourcefile>
+<identifier>proxy_connect_module</identifier>
+
+<summary>
+ <p>This module <em>requires</em> the service of <module
+ >mod_proxy</module>. It provides support for the <code>CONNECT</code>
+ HTTP method. This method is mainly used to tunnel SSL requests
+ through proxy servers.</p>
+
+ <p>Thus, in order to get the ability of handling <code>CONNECT</code>
+ requests, <module>mod_proxy</module> and
+ <module>mod_proxy_connect</module> have to be present in the server.</p>
+
+ <note type="warning"><title>Warning</title>
+ <p>Do not enable proxying until you have <a
+ href="mod_proxy.html#access">secured your server</a>. Open proxy
+ servers are dangerous both to your network and to the Internet at
+ large.</p>
+ </note>
+</summary>
+<seealso><directive module="mod_proxy">AllowCONNECT</directive></seealso>
+<seealso><module>mod_proxy</module></seealso>
+
+</modulesynopsis>
diff --git a/docs/manual/mod/mod_proxy_ftp.html.en b/docs/manual/mod/mod_proxy_ftp.html.en
new file mode 100644
index 0000000..a034f21
--- /dev/null
+++ b/docs/manual/mod/mod_proxy_ftp.html.en
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mod_proxy_ftp - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_proxy_ftp</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>FTP support module for
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>proxy_ftp_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>proxy_ftp.c</td></tr></table>
+<h3>Summary</h3>
+
+ <p>This module <em>requires</em> the service of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>. It provides support for the proxying
+ FTP sites.</p>
+
+ <p>Thus, in order to get the ability of handling FTP proxy requests,
+ <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code>
+ have to be present in the server.</p>
+
+ <div class="warning"><h3>Warning</h3>
+ <p>Do not enable proxying until you have <a href="mod_proxy.html#access">secured your server</a>. Open proxy
+ servers are dangerous both to your network and to the Internet at
+ large.</p>
+ </div>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<p>This module provides no directives.</p>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
+</ul></div>
+
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_ftp.xml b/docs/manual/mod/mod_proxy_ftp.xml
new file mode 100644
index 0000000..7e87d32
--- /dev/null
+++ b/docs/manual/mod/mod_proxy_ftp.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
+<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
+<modulesynopsis>
+
+<name>mod_proxy_ftp</name>
+<description>FTP support module for
+<module>mod_proxy</module></description>
+<status>Extension</status>
+<sourcefile>proxy_ftp.c</sourcefile>
+<identifier>proxy_ftp_module</identifier>
+
+<summary>
+ <p>This module <em>requires</em> the service of <module
+ >mod_proxy</module>. It provides support for the proxying
+ FTP sites.</p>
+
+ <p>Thus, in order to get the ability of handling FTP proxy requests,
+ <module>mod_proxy</module> and <module>mod_proxy_ftp</module>
+ have to be present in the server.</p>
+
+ <note type="warning"><title>Warning</title>
+ <p>Do not enable proxying until you have <a
+ href="mod_proxy.html#access">secured your server</a>. Open proxy
+ servers are dangerous both to your network and to the Internet at
+ large.</p>
+ </note>
+</summary>
+<seealso><module>mod_proxy</module></seealso>
+
+</modulesynopsis>
diff --git a/docs/manual/mod/mod_proxy_http.html.en b/docs/manual/mod/mod_proxy_http.html.en
new file mode 100644
index 0000000..e292240
--- /dev/null
+++ b/docs/manual/mod/mod_proxy_http.html.en
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mod_proxy_http - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_proxy_http</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>HTTP support module for
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>proxy_http_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>proxy_http.c</td></tr></table>
+<h3>Summary</h3>
+
+ <p>This module <em>requires</em> the service of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>. It provides the features used for
+ proxying HTTP requests. <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>
+ supports HTTP/0.9, HTTP/1.0 and HTTP/1.1. It does <em>not</em>
+ provide any caching abilities. If you want to set up a caching
+ proxy, you might want to use the additional service of the
+ <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> module.</p>
+
+ <p>Thus, in order to get the ability of handling HTTP proxy requests,
+ <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>
+ have to be present in the server.</p>
+
+ <div class="warning"><h3>Warning</h3>
+ <p>Do not enable proxying until you have <a href="mod_proxy.html#access">secured your server</a>. Open proxy
+ servers are dangerous both to your network and to the Internet at
+ large.</p>
+ </div>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<p>This module provides no directives.</p>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
+<li><code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code></li>
+</ul></div>
+
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_http.xml b/docs/manual/mod/mod_proxy_http.xml
new file mode 100644
index 0000000..bc43bcd
--- /dev/null
+++ b/docs/manual/mod/mod_proxy_http.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
+<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
+<modulesynopsis>
+
+<name>mod_proxy_http</name>
+<description>HTTP support module for
+<module>mod_proxy</module></description>
+<status>Extension</status>
+<sourcefile>proxy_http.c</sourcefile>
+<identifier>proxy_http_module</identifier>
+
+<summary>
+ <p>This module <em>requires</em> the service of <module
+ >mod_proxy</module>. It provides the features used for
+ proxying HTTP requests. <module>mod_proxy_http</module>
+ supports HTTP/0.9, HTTP/1.0 and HTTP/1.1. It does <em>not</em>
+ provide any caching abilities. If you want to set up a caching
+ proxy, you might want to use the additional service of the
+ <module>mod_cache</module> module.</p>
+
+ <p>Thus, in order to get the ability of handling HTTP proxy requests,
+ <module>mod_proxy</module> and <module>mod_proxy_http</module>
+ have to be present in the server.</p>
+
+ <note type="warning"><title>Warning</title>
+ <p>Do not enable proxying until you have <a
+ href="mod_proxy.html#access">secured your server</a>. Open proxy
+ servers are dangerous both to your network and to the Internet at
+ large.</p>
+ </note>
+</summary>
+<seealso><module>mod_proxy</module></seealso>
+<seealso><module>mod_proxy_connect</module></seealso>
+
+</modulesynopsis>
diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 98232fc..97ab54b 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -4,13 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_rewrite - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_rewrite</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Provides a rule-based rewriting engine to rewrite requested
-URLs on the fly</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>rewrite_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_rewrite.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 1.3 and later</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_rewrite - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_rewrite</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Provides a rule-based rewriting engine to rewrite requested
+URLs on the fly</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>rewrite_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_rewrite.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 1.3 and later</td></tr></table>
+<h3>Summary</h3>
+
<blockquote>
<p>``The great thing about mod_rewrite is it gives you
all the configurability and flexibility of Sendmail.
@@ -69,7 +86,10 @@
<a href="mailto:rse@engelschall.com"><code>rse@engelschall.com</code></a><br />
<a href="http://www.engelschall.com/"><code>www.engelschall.com</code></a>
</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#rewritebase">RewriteBase</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#rewritebase">RewriteBase</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#rewritecond">RewriteCond</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#rewriteengine">RewriteEngine</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#rewritelock">RewriteLock</a></li>
@@ -78,7 +98,16 @@
<li><img alt="" src="../images/down.gif" /> <a href="#rewritemap">RewriteMap</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#rewriteoptions">RewriteOptions</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#rewriterule">RewriteRule</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#Internal">Internal Processing</a></li><li><img alt="" src="../images/down.gif" /> <a href="#EnvVar">Environment Variables</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Solutions">Practical Solutions</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="Internal" id="Internal">Internal Processing</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#Internal">Internal Processing</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#EnvVar">Environment Variables</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Solutions">Practical Solutions</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="Internal" id="Internal">Internal Processing</a></h2>
<p>The internal processing of this module is very complex but
needs to be explained once even to the average user to avoid
@@ -236,7 +265,9 @@
directives.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="EnvVar" id="EnvVar">Environment Variables</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="EnvVar" id="EnvVar">Environment Variables</a></h2>
<p>This module keeps track of two additional (non-standard)
CGI/SSI environment variables named <code>SCRIPT_URL</code>
@@ -259,21 +290,27 @@
SCRIPT_URI=http://en1.engelschall.com/u/rse/
</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="Solutions" id="Solutions">Practical Solutions</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Solutions" id="Solutions">Practical Solutions</a></h2>
<p>We also have an <a href="../misc/rewriteguide.html">URL
Rewriting Guide</a> available, which provides a collection of
practical solutions for URL-based problems. There you can
find real-life rulesets and additional information about
mod_rewrite.</p>
-</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><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RewriteBase <em>URL-path</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>See usage for information.</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>FileInfo</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_rewrite</td></tr></table>
+</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>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RewriteBase <em>URL-path</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>See usage for information.</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>FileInfo</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_rewrite</td></tr>
+</table>
<p>The <code class="directive">RewriteBase</code> directive explicitly
sets the base URL for per-directory rewrites. As you will see
below, <code class="directive"><a href="#rewriterule">RewriteRule</a></code>
@@ -352,16 +389,21 @@
implementation is correct.</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="RewriteCond" id="RewriteCond">RewriteCond</a> <a name="rewritecond" id="rewritecond">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Defines a condition under which rewriting will take place
-</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code> RewriteCond
- <em>TestString</em> <em>CondPattern</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, 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_rewrite</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RewriteCond" id="RewriteCond">RewriteCond</a> <a name="rewritecond" id="rewritecond">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Defines a condition under which rewriting will take place
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code> RewriteCond
+ <em>TestString</em> <em>CondPattern</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, 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_rewrite</td></tr>
+</table>
<p>The <code class="directive">RewriteCond</code> directive defines a
rule condition. Precede a <code class="directive"><a href="#rewriterule">RewriteRule</a></code> directive with one
or more <code class="directive">RewriteCond</code> directives. The following
@@ -745,14 +787,19 @@
tables, <em>etc.</em> If you use any other browser you get
the standard homepage.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RewriteEngine" id="RewriteEngine">RewriteEngine</a> <a name="rewriteengine" id="rewriteengine">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enables or disables runtime rewriting engine</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RewriteEngine on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>RewriteEngine 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_rewrite</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RewriteEngine" id="RewriteEngine">RewriteEngine</a> <a name="rewriteengine" id="rewriteengine">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables or disables runtime rewriting engine</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RewriteEngine on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>RewriteEngine 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_rewrite</td></tr>
+</table>
<p>The <code class="directive">RewriteEngine</code> directive enables or
disables the runtime rewriting engine. If it is set to
@@ -767,27 +814,37 @@
inherited. This means that you need to have a
<code>RewriteEngine on</code> directive for each virtual host
in which you wish to use 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="RewriteLock" id="RewriteLock">RewriteLock</a> <a name="rewritelock" id="rewritelock">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the name of the lock file used for RewriteMap
-synchronization</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RewriteLock <em>file-path</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_rewrite</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RewriteLock" id="RewriteLock">RewriteLock</a> <a name="rewritelock" id="rewritelock">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the name of the lock file used for RewriteMap
+synchronization</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RewriteLock <em>file-path</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_rewrite</td></tr>
+</table>
<p>This directive sets the filename for a synchronization
lockfile which mod_rewrite needs to communicate with <code class="directive"><a href="#rewritemap">RewriteMap</a></code>
<em>programs</em>. Set this lockfile to a local path (not on a
NFS-mounted device) when you want to use a rewriting
map-program. It is not required for other types of rewriting
maps.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RewriteLog" id="RewriteLog">RewriteLog</a> <a name="rewritelog" id="rewritelog">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the name of the file used for logging rewrite engine
-processing</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RewriteLog <em>file-path</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_rewrite</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RewriteLog" id="RewriteLog">RewriteLog</a> <a name="rewritelog" id="rewritelog">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the name of the file used for logging rewrite engine
+processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RewriteLog <em>file-path</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_rewrite</td></tr>
+</table>
<p>The <code class="directive">RewriteLog</code> directive sets the name
of the file to which the server logs any rewriting actions it
performs. If the name does not begin with a slash
@@ -818,14 +875,19 @@
RewriteLog "/usr/local/var/apache/logs/rewrite.log"
</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="RewriteLogLevel" id="RewriteLogLevel">RewriteLogLevel</a> <a name="rewriteloglevel" id="rewriteloglevel">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the verbosity of the log file used by the rewrite
-engine</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RewriteLogLevel <em>Level</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>RewriteLogLevel 0</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_rewrite</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RewriteLogLevel" id="RewriteLogLevel">RewriteLogLevel</a> <a name="rewriteloglevel" id="rewriteloglevel">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the verbosity of the log file used by the rewrite
+engine</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RewriteLogLevel <em>Level</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>RewriteLogLevel 0</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_rewrite</td></tr>
+</table>
<p>The <code class="directive">RewriteLogLevel</code> directive sets the
verbosity level of the rewriting logfile. The default level 0
means no logging, while 9 or more means that practically all
@@ -845,16 +907,21 @@
RewriteLogLevel 3
</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="RewriteMap" id="RewriteMap">RewriteMap</a> <a name="rewritemap" id="rewritemap">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Defines a mapping function for key-lookup</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</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, 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_rewrite</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>The choice of different dbm types is available in
-Apache 2.0.41 and later</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RewriteMap" id="RewriteMap">RewriteMap</a> <a name="rewritemap" id="rewritemap">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Defines a mapping function for key-lookup</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</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, 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_rewrite</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The choice of different dbm types is available in
+Apache 2.0.41 and later</td></tr>
+</table>
<p>The <code class="directive">RewriteMap</code> directive defines a
<em>Rewriting Map</em> which can be used inside rule
substitution strings by the mapping-functions to
@@ -1083,14 +1150,19 @@
once!
</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="RewriteOptions" id="RewriteOptions">RewriteOptions</a> <a name="rewriteoptions" id="rewriteoptions">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets some special options for the rewrite engine</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RewriteOptions <em>Options</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, 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_rewrite</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RewriteOptions" id="RewriteOptions">RewriteOptions</a> <a name="rewriteoptions" id="rewriteoptions">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets some special options for the rewrite engine</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RewriteOptions <em>Options</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, 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_rewrite</td></tr>
+</table>
<p>The <code class="directive">RewriteOptions</code> directive sets some
special options for the current per-server or per-directory
@@ -1106,16 +1178,21 @@
that conditions and rules of the parent directory's
<code>.htaccess</code> configuration are inherited.</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="RewriteRule" id="RewriteRule">RewriteRule</a> <a name="rewriterule" id="rewriterule">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Defines rules for the rewriting engine</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>RewriteRule
- <em>Pattern</em> <em>Substitution</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, 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_rewrite</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>The cookie-flag is available in Apache 2.0.40 and later.</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RewriteRule" id="RewriteRule">RewriteRule</a> <a name="rewriterule" id="rewriterule">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Defines rules for the rewriting engine</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RewriteRule
+ <em>Pattern</em> <em>Substitution</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, 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_rewrite</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The cookie-flag is available in Apache 2.0.40 and later.</td></tr>
+</table>
<p>The <code class="directive">RewriteRule</code> directive is the real
rewriting workhorse. The directive can occur more than once.
Each directive then defines one single rewriting rule. The
@@ -1673,4 +1750,10 @@
RewriteMap real-to-user txt:/path/to/file/map.txt
RewriteRule ^/([^/]+)/~([^/]+)/(.*)$ /u/${real-to-user:$2|nobody}/$3.$1
</pre></div>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en
index 06d55f3..00eca7f 100644
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_setenvif - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_setenvif</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Allows the setting of environment variables based
-on characteristics of the request</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>setenvif_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_setenvif.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_setenvif - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_setenvif</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Allows the setting of environment variables based
+on characteristics of the request</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>setenvif_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_setenvif.c</td></tr></table>
+<h3>Summary</h3>
+
<p>The <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> module allows you to set
environment variables according to whether different aspects of
@@ -26,19 +43,31 @@
BrowserMatch ^Mozilla netscape<br />
BrowserMatch MSIE !netscape<br />
</code></p></div>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#browsermatch">BrowserMatch</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#browsermatch">BrowserMatch</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#browsermatchnocase">BrowserMatchNoCase</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#setenvif">SetEnvIf</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#setenvifnocase">SetEnvIfNoCase</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><a href="../env.html">Environment Variables in Apache</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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets environment variables conditional on HTTP User-Agent
-</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>BrowserMatch <em>regex [!]env-variable</em>[=<em>value</em>]
-[[!]<em>env-variable</em>[=<em>value</em>]] ...</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_setenvif</td></tr></table>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><a href="../env.html">Environment Variables in Apache</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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets environment variables conditional on HTTP User-Agent
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>BrowserMatch <em>regex [!]env-variable</em>[=<em>value</em>]
+[[!]<em>env-variable</em>[=<em>value</em>]] ...</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_setenvif</td></tr>
+</table>
<p>The <code class="directive">BrowserMatch</code> is a special cases of the
<code class="directive"><a href="#setenvif">SetEnvIf</a></code> directive that
sets environment variables conditional on the
@@ -55,18 +84,23 @@
BrowserMatch "^Mozilla/[2-3]" tables agif frames javascript<br />
BrowserMatch MSIE !javascript<br />
</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="BrowserMatchNoCase" id="BrowserMatchNoCase">BrowserMatchNoCase</a> <a name="browsermatchnocase" id="browsermatchnocase">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets environment variables conditional on User-Agent without
-respect to case</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>BrowserMatchNoCase <em>regex [!]env-variable</em>[=<em>value</em>]
- [[!]<em>env-variable</em>[=<em>value</em>]] ...</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_setenvif</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Apache 1.2 and
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="BrowserMatchNoCase" id="BrowserMatchNoCase">BrowserMatchNoCase</a> <a name="browsermatchnocase" id="browsermatchnocase">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets environment variables conditional on User-Agent without
+respect to case</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>BrowserMatchNoCase <em>regex [!]env-variable</em>[=<em>value</em>]
+ [[!]<em>env-variable</em>[=<em>value</em>]] ...</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_setenvif</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Apache 1.2 and
above (in Apache 1.2 this directive was found in the
- now-obsolete mod_browser module)</td></tr></table>
+ now-obsolete mod_browser module)</td></tr>
+</table>
<p>The <code class="directive">BrowserMatchNoCase</code> directive is
semantically identical to the <code class="directive"><a href="#browsermatch">BrowserMatch</a></code> directive.
@@ -85,16 +119,21 @@
BrowserMatchNoCase Robot is_a_robot<br />
SetEnvIfNoCase User-Agent Robot is_a_robot<br />
</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="SetEnvIf" id="SetEnvIf">SetEnvIf</a> <a name="setenvif" id="setenvif">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets environment variables based on attributes of the request
-</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SetEnvIf <em>attribute
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetEnvIf" id="SetEnvIf">SetEnvIf</a> <a name="setenvif" id="setenvif">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets environment variables based on attributes of the request
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SetEnvIf <em>attribute
regex [!]env-variable</em>[=<em>value</em>]
- [[!]<em>env-variable</em>[=<em>value</em>]] ...</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_setenvif</td></tr></table>
+ [[!]<em>env-variable</em>[=<em>value</em>]] ...</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_setenvif</td></tr>
+</table>
<p>The <code class="directive">SetEnvIf</code> directive defines
environment variables based on attributes of the request. The
<em>attribute</em> specified in the first argument can be one of three
@@ -193,19 +232,28 @@
<code>HAVE_TS</code> if the request contains any headers that
begin with "TS" whose values begins with any character in the
set [a-z].</p>
-<h3>See also</h3><ul><li><a href="../env.html">Environment Variables in Apache</a>,
+
+<h3>See also</h3>
+<ul>
+<li><a href="../env.html">Environment Variables in Apache</a>,
for additional examples.
-</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="SetEnvIfNoCase" id="SetEnvIfNoCase">SetEnvIfNoCase</a> <a name="setenvifnocase" id="setenvifnocase">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets environment variables based on attributes of the request
-without respect to case</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SetEnvIfNoCase <em>attribute regex
+</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="SetEnvIfNoCase" id="SetEnvIfNoCase">SetEnvIfNoCase</a> <a name="setenvifnocase" id="setenvifnocase">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets environment variables based on attributes of the request
+without respect to case</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SetEnvIfNoCase <em>attribute regex
[!]env-variable</em>[=<em>value</em>]
- [[!]<em>env-variable</em>[=<em>value</em>]] ...</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_setenvif</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Apache 1.3 and above</td></tr></table>
+ [[!]<em>env-variable</em>[=<em>value</em>]] ...</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_setenvif</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Apache 1.3 and above</td></tr>
+</table>
<p>The <code class="directive">SetEnvIfNoCase</code> is semantically identical to
the <code class="directive"><a href="#setenvif">SetEnvIf</a></code> directive,
@@ -220,4 +268,10 @@
field <code>Host:</code> was included and contained
<code>Apache.Org</code>, <code>apache.org</code>, or any other
combination.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_setenvif.html.ja.jis b/docs/manual/mod/mod_setenvif.html.ja.jis
index 725e68c..31d0969 100644
--- a/docs/manual/mod/mod_setenvif.html.ja.jis
+++ b/docs/manual/mod/mod_setenvif.html.ja.jis
@@ -4,20 +4,37 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_setenvif - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_setenvif</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%j%/%(%9%H$NFCD'$K4p$E$$$?4D6-JQ(B$B?t$N@_Dj$r2DG=$K$9$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>setenvif_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_setenvif.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_setenvif - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_setenvif</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%j%/%(%9%H$NFCD'$K4p$E$$$?4D6-JQ?t$N@_Dj$r2DG=$K$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>setenvif_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_setenvif.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p><code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>
- $B%b%8%e!<%k$O!"%j%/%(%9%H$N$"$kB&LL$,;XDj$5$l$?@55,I=(B$B8=(B
+ $B%b%8%e!<%k$O!"%j%/%(%9%H$N$"$kB&LL$,;XDj$5$l$?@55,I=8=(B
$B$K9g$&$+$I$&$+$K$h$C$F4D6-JQ?t$r@_Dj$9$k5!G=$rDs6!$7$^$9!#(B
$B$3$l$i$N4D6-JQ?t$r;HMQ$7$F!"%5!<%P$NB>$NItJ,$,$I$N$h$&$JF0:n$r$9$k$+$r(B
$B7hDj$9$k$3$H$,$G$-$^$9!#(B</p>
<p>$B$3$N%b%8%e!<%k$,Ds6!$9$k%G%#%l%/%F%#%V$O!"(B
- $B@_Dj%U%!(B$B%$%k$K8=$l$k=gHV$KE,MQ$5$l$^$9!#(B
+ $B@_Dj%U%!%$%k$K8=$l$k=gHV$KE,MQ$5$l$^$9!#(B
$B$=$l$r;H$C$F!"<!$NNc$N$h$&$K$h$jJ#;($J@_Dj$r$9$k$3$H$,$G$-$^$9!#(B
$B$3$l$O!"%V%i%&%6$,(B mozilla $B$G$O$"$k$1$l$I!"(BMSIE $B$G$O$J$$$H$-$K(B
<code>netscape</code> $B$r@_Dj$7$^$9!#(B</p>
@@ -25,19 +42,31 @@
BrowserMatch ^Mozilla netscape<br />
BrowserMatch MSIE !netscape<br />
</code></p></div>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#browsermatch">BrowserMatch</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#browsermatch">BrowserMatch</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#browsermatchnocase">BrowserMatchNoCase</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#setenvif">SetEnvIf</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#setenvifnocase">SetEnvIfNoCase</a></li>
-</ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><a href="../env.html">Apache $B$N4D6-JQ?t(B</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>HTTP User-Agent $B$K4p$E$$$F4D6-JQ?t$r@_Dj$9$k(B
-</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>BrowserMatch <em>regex [!]env-variable</em>[=<em>value</em>]
-[[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_setenvif</td></tr></table>
+</ul>
+<h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><a href="../env.html">Apache $B$N4D6-JQ?t(B</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>HTTP User-Agent $B$K4p$E$$$F4D6-JQ?t$r@_Dj$9$k(B
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>BrowserMatch <em>regex [!]env-variable</em>[=<em>value</em>]
+[[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_setenvif</td></tr>
+</table>
<p><code class="directive">BrowserMatch</code> $B$O(B
<code class="directive"><a href="#setenvif">SetEnvIf</a></code> $B%G%#%l%/%F%#%V$N(B
$BFCNc$G!"(B<code>User-Agent</code> HTTP $B%j%/%(%9%H%X%C%@$K4p$E$$$F(B
@@ -54,18 +83,23 @@
BrowserMatch "^Mozilla/[2-3]" tables agif frames javascript<br />
BrowserMatch MSIE !javascript<br />
</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="BrowserMatchNoCase" id="BrowserMatchNoCase">BrowserMatchNoCase</a> <a name="browsermatchnocase" id="browsermatchnocase">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>HTTP User-Agent $B$K4p$E$$$FBgJ8;z>.J8;z$r6hJL$;$:$K(B
-$B4D6-JQ?t$r@_Dj$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>BrowserMatchNoCase <em>regex [!]env-variable</em>[=<em>value</em>]
- [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_setenvif</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 1.2 $B0J9_(B
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="BrowserMatchNoCase" id="BrowserMatchNoCase">BrowserMatchNoCase</a> <a name="browsermatchnocase" id="browsermatchnocase">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>HTTP User-Agent $B$K4p$E$$$FBgJ8;z>.J8;z$r6hJL$;$:$K(B
+$B4D6-JQ?t$r@_Dj$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>BrowserMatchNoCase <em>regex [!]env-variable</em>[=<em>value</em>]
+ [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_setenvif</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>Apache 1.2 $B0J9_(B
(Apache 1.2 $B$G$O$3$N%G%#%l%/%F%#%V$O$b$&MQ$$$i$l$F$$$J$$(B
- mod_browser $B%b%8%e!<%k$K$"$j$^$7$?(B)</td></tr></table>
+ mod_browser $B%b%8%e!<%k$K$"$j$^$7$?(B)</td></tr>
+</table>
<p><code class="directive">BrowserMatchNoCase</code> $B%G%#%l%/%F%#%V$O(B
$B0UL#E*$K$O(B <code class="directive"><a href="#browsermatch">BrowserMatch</a></code> $B%G%#%l%/%F%#%V$H(B
@@ -87,23 +121,28 @@
BrowserMatchNoCase Robot is_a_robot<br />
SetEnvIfNoCase User-Agent Robot is_a_robot<br />
</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="SetEnvIf" id="SetEnvIf">SetEnvIf</a> <a name="setenvif" id="setenvif">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%j%/%(%9%H$NB0@-$K4p$E$$$F4D6-JQ?t$r@_Dj$9$k(B
-</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>SetEnvIf <em>attribute
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetEnvIf" id="SetEnvIf">SetEnvIf</a> <a name="setenvif" id="setenvif">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%j%/%(%9%H$NB0@-$K4p$E$$$F4D6-JQ?t$r@_Dj$9$k(B
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>SetEnvIf <em>attribute
regex [!]env-variable</em>[=<em>value</em>]
- [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_setenvif</td></tr></table>
+ [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_setenvif</td></tr>
+</table>
<p><code class="directive">SetEnvIf</code>
$B%G%#%l%/%F%#%V$O!"%j%/%(%9%H$NB0@-$K4p$E$$$F4D6-JQ?t$rDj5A$7$^$9!#(B
$B:G=i$N0z?t$G;XDj$G$-$k(B <em>attribute</em> $B$O0J2<$N;0$D$N$I$l$+$G$9(B:</p>
<ol>
<li>HTTP $B%j%/%(%9%H%X%C%@%U%#!<%k%I(B ($B>\$7$$>pJs$O(B <a href="http://www.rfc-editor.org/rfc/rfc2616.txt">RFC 2616</a> $B$r(B
- $B;2>H$7$F$/$@$5(B$B$$(B)$B!#Nc$($P!"(B<code>Host</code>,
+ $B;2>H$7$F$/$@$5$$(B)$B!#Nc$($P!"(B<code>Host</code>,
<code>User-Agent</code>, <code>Referer</code>,
<code>Accept-Language</code> $B$G$9!#%j%/%(%9%H%X%C%@$N=89g$r8=$9$?$a$K(B
$B@55,I=8=$r;H$&$3$H$b$G$-$^$9!#(B</li>
@@ -184,17 +223,26 @@
<p>$B:G8e$NNc$O!"%j%/%(%9%H$K(B "TS" $B$G;O$^$j!"CM$,=89g(B [a-z] $B$N$I$l$+$G(B
$B;O$^$k%X%C%@$,$"$k$H$-$K(B <code>HAVE_TS</code> $B$r@_Dj$7$^$9!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li>$BB>$NNc$O!"(B<a href="../env.html">Apache $B$N4D6-JQ?t(B</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="SetEnvIfNoCase" id="SetEnvIfNoCase">SetEnvIfNoCase</a> <a name="setenvifnocase" id="setenvifnocase">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%j%/%(%9%H$NB0@-$K4p$E$$$FBgJ8;z>.J8;z$r6hJL$;$:$K4D6-JQ?t$r@_Dj$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>SetEnvIfNoCase <em>attribute regex
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li>$BB>$NNc$O!"(B<a href="../env.html">Apache $B$N4D6-JQ?t(B</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="SetEnvIfNoCase" id="SetEnvIfNoCase">SetEnvIfNoCase</a> <a name="setenvifnocase" id="setenvifnocase">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%j%/%(%9%H$NB0@-$K4p$E$$$FBgJ8;z>.J8;z$r6hJL$;$:$K4D6-JQ?t$r@_Dj$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>SetEnvIfNoCase <em>attribute regex
[!]env-variable</em>[=<em>value</em>]
- [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_setenvif</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 1.3 $B0J9_(B</td></tr></table>
+ [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_setenvif</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>Apache 1.3 $B0J9_(B</td></tr>
+</table>
<p><code class="directive">SetEnvIfNoCase</code> $B$O0UL#E*$K$O(B
<code class="directive"><a href="#setenvif">SetEnvIf</a></code> $B%G%#%l%/%F%#%V$H(B
@@ -210,4 +258,10 @@
$B$=$NB>$NBgJ8;z>.J8;z$NAH$_9g$o$;$G$"$C$?$H$-$K(B <code>site</code>
$B4D6-JQ?t$r(B "<code>apache</code>" $B$K@_Dj$7$^$9!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_so.html.en b/docs/manual/mod/mod_so.html.en
index dce5414..d4289e2 100644
--- a/docs/manual/mod/mod_so.html.en
+++ b/docs/manual/mod/mod_so.html.en
@@ -4,14 +4,31 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_so - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_so</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Loading of executable code and
-modules into the server at start-up or restart time</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>so_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_so.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>This is a Base module (always included) on
-Windows</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_so - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_so</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Loading of executable code and
+modules into the server at start-up or restart time</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>so_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_so.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>This is a Base module (always included) on
+Windows</td></tr></table>
+<h3>Summary</h3>
+
<p>On selected operating systems this module can be used to
load modules into Apache at runtime via the <a href="../dso.html">Dynamic Shared Object</a> (DSO) mechanism,
@@ -27,9 +44,19 @@
with Apache 2.0 - the module must be modified to dynamically
load or compile into Apache 2.0.</p>
</div>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#loadfile">LoadFile</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#loadfile">LoadFile</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#loadmodule">LoadModule</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> Creating Loadable Modules for Windows</li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Creating Loadable Modules for Windows</h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> Creating Loadable Modules for Windows</li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Creating Loadable Modules for Windows</h2>
<div class="note"><h3>Note</h3>
<p>The module name format changed for Windows
@@ -99,12 +126,16 @@
root, and use the <code class="directive">LoadModule</code>
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</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>
+</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</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
@@ -116,13 +147,18 @@
<div class="example"><p><code>LoadFile libexex/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">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</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>
+
+</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</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>
@@ -136,4 +172,10 @@
<p>loads the named module from the modules subdirectory of the
ServerRoot.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_so.html.ja.jis b/docs/manual/mod/mod_so.html.ja.jis
index 90df04a..a4b4cd1 100644
--- a/docs/manual/mod/mod_so.html.ja.jis
+++ b/docs/manual/mod/mod_so.html.ja.jis
@@ -4,16 +4,33 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_so - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_so</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B5/F0;~$d:F5/F0;~$K<B9T%3!<%I$H%b%8%e!<%k$r%5(B$B!<%P$K%m!<%I$9$k(B
-</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>so_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_so.c</td></tr><tr><th><a href="module-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>$B$3$N%b%8%e!<%k$O(B Window $B$G$O(B ($B>o$K4^$^$l(B$B$F$$$k(B) Base
-$B%b%8%e!<%k$G$9(B</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_so - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_so</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B5/F0;~$d:F5/F0;~$K<B9T%3!<%I$H%b%8%e!<%k$r%5!<%P$K%m!<%I$9$k(B
+</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>so_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_so.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">$B8_49@-(B:</a></th><td>$B$3$N%b%8%e!<%k$O(B Window $B$G$O(B ($B>o$K4^$^$l$F$$$k(B) Base
+$B%b%8%e!<%k$G$9(B</td></tr></table>
+<h3>$B35MW(B</h3>
- <p>$B$$$/$D$+$N%*%Z(B$B%l!<%F%#%s%0%7%9%F%`$G$O!"%5!<%P$N:F%3%s%Q%$%k$r$9$kBe$o$j$K!"(B
+
+ <p>$B$$$/$D$+$N%*%Z%l!<%F%#%s%0%7%9%F%`$G$O!"%5!<%P$N:F%3%s%Q%$%k$r$9$kBe$o$j$K!"(B
$B$3$N%b%8%e!<%k$r;HMQ$7$F(B
<a href="../dso.html">$BF0E*6&M-%*%V%8%'%/%H(B</a>
(DSO) $B5!9=$K$h$j!"<B9T;~$K(B Apache $B$K%b%8%e!<%k$rFI$_9~$^$;$k$3$H$,(B
@@ -29,9 +46,19 @@
$B!=(B $B%b%8%e!<%k$O(B Apache 2.0 $BMQ$KF0E*$K%m!<%I$5$l$k$+!"(B
$BD>@\AH$_9~$^$l$k$?$a$K=$@5$5$l$J$1$l$P$J$j$^$;$s!#(B</p>
</div>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#loadfile">LoadFile</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#loadfile">LoadFile</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#loadmodule">LoadModule</a></li>
-</ul><h3>$B%H%T%C%/(B</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> Windows $BMQ$N%m!<%I2D(B$BG=$J%b%8%e!<%k$r:n@.$9$k(B</li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Windows $BMQ$N%m!<%I2D(B$BG=$J%b%8%e!<%k$r:n@.$9$k(B</h2>
+</ul>
+<h3>$B%H%T%C%/(B</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> Windows $BMQ$N%m!<%I2DG=$J%b%8%e!<%k$r:n@.$9$k(B</li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Windows $BMQ$N%m!<%I2DG=$J%b%8%e!<%k$r:n@.$9$k(B</h2>
<div class="note"><h3>$BCm(B</h3>
<p>Apache 1.3.15 $B$H(B 2.0 $B$H$G(B Windows $B$N%b%8%e!<%kL>$N7A<0$OJQ99$5$l$^$7$?(B
@@ -49,7 +76,7 @@
<p>$B%b%8%e!<%k$,<B:]$KF0:n$9$k$H$-$O!"(B
$BFs$D$NJ}K!$N$I$A$i$+$G%5!<%P$KDI2C$9$k$3$H$,$G$-$^$9!#$^$:!"(BUnix
- $B$HF1MM$K%5!<%P$K%3%s%Q%$%k$7$FAH(B$B$_9~$`$3$H$,$G$-$^$9!#(BWindows
+ $B$HF1MM$K%5!<%P$K%3%s%Q%$%k$7$FAH$_9~$`$3$H$,$G$-$^$9!#(BWindows
$BMQ$N(B Apache $B$O(B Unix $BMQ$N(B Apache $B$K$"$k(B <code>Configure</code>
$B%W%m%0%i%`$,$"$j$^$;$s$N$G!"%b%8%e!<%k$N%=!<%9%U%!%$%k$r(B
ApacheCore $B%W%m%8%'%/%H%U%!%$%k$KDI2C$7!"%7%s%\%k$r(B
@@ -87,7 +114,7 @@
<p>$B$5$"!"$"$J$?$N%b%8%e!<%k$N(B DLL $B$r:n@.$7$^$7$g$&!#$3$l$r!"(B
libhttpd.lib $B6&M-%i%$%V%i%j$,%3%s%Q%$%k$5$l$?$H$-$K:n@.$5$l$?(B
ibhttpd.lib $B%(%/%9%]!<%H%i%$%V%i%j$H%j%s%/$7$F$/$@$5$$!#$3$N;~$K!"(B
- Apache $B$N%X%C%@%U%!%$%k$,@5$7(B$B$$0LCV$K$"$k$h$&$K!"(B
+ Apache $B$N%X%C%@%U%!%$%k$,@5$7$$0LCV$K$"$k$h$&$K!"(B
$B%3%s%Q%$%i$N@_Dj$rJQ$($kI,MW$,$"$k$+$b$7$l$^$;$s!#(B
$B$3$N%i%$%V%i%j$O%5!<%P%k!<%H$N(B modules $B%G%#%l%/%H%j$K$"$j$^$9!#(B
$B%S%k%I4D6-$,@5$7$/@_Dj$5$l$k$h$&$K!"4{B8$N%b%8%e!<%kMQ$N(B .dsp $B$r(B
@@ -99,12 +126,16 @@
$B%G%#%l%/%H%j$K%b%8%e!<%k$rCV$$$F!"(B
<code><code class="directive">LoadModule</code></code>
$B%G%#%l%/%F%#%V$r;H$C$FFI$_9~$s$G$/$@$5$$!#(B</p>
-</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B;XDj$5$l$?%*%V%8%'%/%H%U%!%$%k$d%i%$%V%i%j$r%j%s%/$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>LoadFile <em>filename</em> [<em>filename</em>] ...</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_so</td></tr></table>
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B;XDj$5$l$?%*%V%8%'%/%H%U%!%$%k$d%i%$%V%i%j$r%j%s%/$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>LoadFile <em>filename</em> [<em>filename</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_so</td></tr>
+</table>
<p>LoadFile $B%G%#%l%/%F%#%V$O!"%5!<%P$,5/F0$5$l$?$H$-$d:F5/F0$5$l$?$H$-$K!"(B
$B;XDj$5$l$?%*%V%8%'%/%H%U%!%$%k$d%i%$%V%i%j$r%j%s%/$7$^$9!#(B
@@ -115,13 +146,18 @@
<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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%*%V%8%'%/%H%U%!%$%k$d%i%$%V%i%j$r%j%s%/$7!";HMQ%b%8%e!<%k$N(B
-$B%j%9%H$KDI2C$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>LoadModule <em>module filename</em></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_so</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%*%V%8%'%/%H%U%!%$%k$d%i%$%V%i%j$r%j%s%/$7!";HMQ%b%8%e!<%k$N(B
+$B%j%9%H$KDI2C$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>LoadModule <em>module filename</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_so</td></tr>
+</table>
<p>LoadModule $B%G%#%l%/%F%#%V$O(B <em>filename</em>
$B$H$$$&%*%V%8%'%/%H%U%!%$%k$*$h$S%i%$%V%i%j$r%j%s%/$7!"(B<em>module</em>
@@ -136,4 +172,10 @@
<p>$B$3$l$O(B ServerRoot $B$N(B modules $B%5%V%G%#%l%/%H%j$+$i;XDj$5$l$?L>A0$N(B
$B%b%8%e!<%k$r%m!<%I$7$^$9!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_speling.html.en b/docs/manual/mod/mod_speling.html.en
index fdfd444..a743bd0 100644
--- a/docs/manual/mod/mod_speling.html.en
+++ b/docs/manual/mod/mod_speling.html.en
@@ -4,13 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_speling - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_speling</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Attempts to correct mistaken URLs that
+ -->
+<title>mod_speling - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_speling</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Attempts to correct mistaken URLs that
users might have entered by ignoring capitalization and by
-allowing up to one misspelling</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>speling_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_speling.c</td></tr></table><h3>Summary</h3>
+allowing up to one misspelling</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>speling_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_speling.c</td></tr></table>
+<h3>Summary</h3>
+
<p>Requests to documents sometimes cannot be served by the core
apache server because the request was misspelled or
@@ -39,21 +56,30 @@
client can select the correct candidate.</li>
</ul>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#checkspelling">CheckSpelling</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="CheckSpelling" id="CheckSpelling">CheckSpelling</a> <a name="checkspelling" id="checkspelling">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enables the spelling
-module</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CheckSpelling on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CheckSpelling 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_speling</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>CheckSpelling was available as a separately available
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#checkspelling">CheckSpelling</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="CheckSpelling" id="CheckSpelling">CheckSpelling</a> <a name="checkspelling" id="checkspelling">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables the spelling
+module</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CheckSpelling on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CheckSpelling 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_speling</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>CheckSpelling was available as a separately available
module for Apache 1.1, but was limited to miscapitalizations. As
of Apache 1.3, it is part of the Apache distribution. Prior to Apache
-1.3.2, the CheckSpelling directive was only available in the
-"server" and "virtual host" contexts.</td></tr></table>
+1.3.2, the <code>CheckSpelling</code> directive was only available in the
+"server" and "virtual host" contexts.</td></tr>
+</table>
<p>This directive enables or disables the spelling module. When
enabled, keep in mind that</p>
@@ -77,4 +103,10 @@
get incorrectly treated as the negotiated file
"<code>/stats.html</code>".</li>
</ul>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_speling.html.ja.jis b/docs/manual/mod/mod_speling.html.ja.jis
index 7e911a0..0c81d7f 100644
--- a/docs/manual/mod/mod_speling.html.ja.jis
+++ b/docs/manual/mod/mod_speling.html.ja.jis
@@ -4,18 +4,35 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_speling - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_speling</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%f!<%6$,F~NO$7$?$G$"$m$&4V0c$C$?(B URL $B$r!"(B
-$BBgJ8;z>.J8;z$N6hJL$rL5;k$9$k$3$H$H0l$D0J2<$NDV$j4V(B$B0c$$$r5vMF$9$k$3$H$G(B
-$B=$@5$r;n$_$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>speling_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_speling.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_speling - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_speling</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%f!<%6$,F~NO$7$?$G$"$m$&4V0c$C$?(B URL $B$r!"(B
+$BBgJ8;z>.J8;z$N6hJL$rL5;k$9$k$3$H$H0l$D0J2<$NDV$j4V0c$$$r5vMF$9$k$3$H$G(B
+$B=$@5$r;n$_$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>speling_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_speling.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$B%j%/%(%9%H$NDV$j$,4V0c$C$F$$$?$j!"(B
$BBgJ8;z>.J8;z$,0c$C$F$$$?$j$9$k$?$a$K!"(BApache $B$N%3%"%5!<%P$,(B
$B%I%-%e%a%s%H$X$N%j%/%(%9%H$X$N1~Ez$r@5$7$/Ds6!$G$-$J$$$3$H$,$"$j$^$9!#(B
- $B$3$N%b%8%e!<%k$O!"B>$N$9$Y$F$N%b%8%e!<%k$,$"$-$i$a$?8e(B$B$G$"$C$?$H$7$F$b!"(B
+ $B$3$N%b%8%e!<%k$O!"B>$N$9$Y$F$N%b%8%e!<%k$,$"$-$i$a$?8e$G$"$C$?$H$7$F$b!"(B
$B%j%/%(%9%H$K9g$&%I%-%e%a%s%H$r8+$D$1$h$&$H$9$k$3$H$K$h$j$3$NLdBj$N(B
$B2r7h$r;n$_$^$9!#$3$N%b%8%e!<%k$O%j%/%(%9%H$5$l$?%G%#%l%/%H%j$K$"$k(B
$B$=$l$>$l$N%I%-%e%a%s%H$NL>A0$H!"%j%/%(%9%H$5$l$?%I%-%e%a%s%H$NL>A0$H$r(B
@@ -39,20 +56,29 @@
$B%/%i%$%"%s%H$,@5$7$$8uJd$rA*Br$G$-$k$h$&$K$7$^$9!#(B</li>
</ul>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#checkspelling">CheckSpelling</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="CheckSpelling" id="CheckSpelling">CheckSpelling</a> <a name="checkspelling" id="checkspelling">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>spelling $B%b%8%e!<%k$r;HMQ$9$k$h$&$K$9$k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>CheckSpelling on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>CheckSpelling Off</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:
- </a></th><td>Options</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_speling</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>CheckSpelling $B$O(B Apache 1.1 $B$G$OJLG[I[$N%b%8%e!<%k$G!"(B
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#checkspelling">CheckSpelling</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="CheckSpelling" id="CheckSpelling">CheckSpelling</a> <a name="checkspelling" id="checkspelling">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>spelling $B%b%8%e!<%k$r;HMQ$9$k$h$&$K$9$k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>CheckSpelling on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>CheckSpelling Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B, $B%G%#%l%/%H%j(B, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">$B>e=q$-(B:</a></th><td>Options</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_speling</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>CheckSpelling $B$O(B Apache 1.1 $B$G$OJLG[I[$N%b%8%e!<%k$G!"(B
$BBgJ8;z>.J8;z$N4V0c$$$N$_$N5!G=$G$7$?!#(BApache 1.3 $B$G(B Apache $B$NG[I[$K(B
-$B4^$^$l$k$h$&$K$J$j(B$B$^$7$?!#(BApache 1.3.2 $B$h$jA0$G$O(B CheckSpelling
+$B4^$^$l$k$h$&$K$J$j$^$7$?!#(BApache 1.3.2 $B$h$jA0$G$O(B CheckSpelling
$B%G%#%l%/%F%#%V$O!V%5!<%P!W$H!V%P!<%A%c%k%[%9%H!W%3%s%F%-%9%H$G$N$_(B
-$B;HMQ2DG=$G$7$?(B</td></tr></table>
+$B;HMQ2DG=$G$7$?(B</td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$ODV$jMQ$N%b%8%e!<%k$r;HMQ$9$k$+$I$&$+$r(B
$B7h$a$^$9!#;HMQ;~$K$O!"0J2<$N$3$H$r3P$($F$*$$$F$/$@$5$$(B</p>
@@ -73,7 +99,13 @@
<li>$BDV$j$ND{@5$OB8:_$9$k%U%!%$%k$K87L)$KE,MQ$5$l$^$9$N$G!"(B
<code><Location /status></code>
- $B$O%M%4%7%(!<%7%g%s$N7k2L$N%U%!%$(B$B%k(B "<code>/stats.html</code>"
+ $B$O%M%4%7%(!<%7%g%s$N7k2L$N%U%!%$%k(B "<code>/stats.html</code>"
$B$H$7$F4V0c$C$F07$o$l$k$+$b$7$l$^$;$s!#(B</li>
</ul>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index 618cc5a..ac9fac2 100644
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_ssl - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_ssl</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Strong cryptography using the Secure Sockets
-Layer (SSL) and Transport Layer Security (TLS) protocols</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>ssl_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_ssl.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_ssl - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_ssl</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Strong cryptography using the Secure Sockets
+Layer (SSL) and Transport Layer Security (TLS) protocols</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>ssl_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_ssl.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module provides SSL v2/v3 and TLS v1 support for the Apache
HTTP Server. It was contributed by Ralf S. Engeschall based on his
mod_ssl project and originally derived from work by Ben Laurie.</p>
@@ -19,7 +36,10 @@
<p>Further details, discussion, and examples are provided in the
<a href="../ssl/">SSL documentation</a>.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#sslcacertificatefile">SSLCACertificateFile</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#sslcacertificatefile">SSLCACertificateFile</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sslcacertificatepath">SSLCACertificatePath</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sslcarevocationfile">SSLCARevocationFile</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sslcarevocationpath">SSLCARevocationPath</a></li>
@@ -50,7 +70,15 @@
<li><img alt="" src="../images/down.gif" /> <a href="#sslsessioncachetimeout">SSLSessionCacheTimeout</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sslverifyclient">SSLVerifyClient</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sslverifydepth">SSLVerifyDepth</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> Environment Variables</li><li><img alt="" src="../images/down.gif" /> Custom Log Formats</li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Environment Variables</h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> Environment Variables</li>
+<li><img alt="" src="../images/down.gif" /> Custom Log Formats</li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Environment Variables</h2>
<p>This module provides a lot of SSL information as additional environment
variables to the SSI and CGI namespace. The generated variables are listed in
@@ -100,7 +128,9 @@
<tr><td colspan="3">[ where <em>x509</em> is a component of a X.509 DN:
<code>C,ST,L,O,OU,CN,T,I,G,S,D,UID,Email</code> ]</td></tr>
</table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Custom Log Formats</h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Custom Log Formats</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
@@ -119,13 +149,17 @@
CustomLog logs/ssl_request_log \
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</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="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
-for Client Auth</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLCACertificateFile <em>file-path</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_ssl</td></tr></table>
+</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
+for Client Auth</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLCACertificateFile <em>file-path</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_ssl</td></tr>
+</table>
<p>
This directive sets the <em>all-in-one</em> file where you can assemble the
Certificates of Certification Authorities (CA) whose <em>clients</em> you deal
@@ -136,13 +170,18 @@
<div class="example"><h3>Example</h3><p><code>
SSLCACertificateFile /usr/local/apache/conf/ssl.crt/ca-bundle-client.crt
</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="SSLCACertificatePath" id="SSLCACertificatePath">SSLCACertificatePath</a> <a name="sslcacertificatepath" id="sslcacertificatepath">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Directory of PEM-encoded CA Certificates for
-Client Auth</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLCACertificatePath <em>directory-path</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLCACertificatePath" id="SSLCACertificatePath">SSLCACertificatePath</a> <a name="sslcacertificatepath" id="sslcacertificatepath">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directory of PEM-encoded CA Certificates for
+Client Auth</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLCACertificatePath <em>directory-path</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_ssl</td></tr>
+</table>
<p>
This directive sets the directory where you keep the Certificates of
Certification Authorities (CAs) whose clients you deal with. These are used to
@@ -157,13 +196,18 @@
<div class="example"><h3>Example</h3><p><code>
SSLCACertificatePath /usr/local/apache/conf/ssl.crt/
</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="SSLCARevocationFile" id="SSLCARevocationFile">SSLCARevocationFile</a> <a name="sslcarevocationfile" id="sslcarevocationfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>File of concatenated PEM-encoded CA CRLs for
-Client Auth</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLCARevocationFile <em>file-path</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLCARevocationFile" id="SSLCARevocationFile">SSLCARevocationFile</a> <a name="sslcarevocationfile" id="sslcarevocationfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File of concatenated PEM-encoded CA CRLs for
+Client Auth</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLCARevocationFile <em>file-path</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_ssl</td></tr>
+</table>
<p>
This directive sets the <em>all-in-one</em> file where you can
assemble the Certificate Revocation Lists (CRL) of Certification
@@ -174,13 +218,18 @@
<div class="example"><h3>Example</h3><p><code>
SSLCARevocationFile /usr/local/apache/conf/ssl.crl/ca-bundle-client.crl
</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="SSLCARevocationPath" id="SSLCARevocationPath">SSLCARevocationPath</a> <a name="sslcarevocationpath" id="sslcarevocationpath">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Directory of PEM-encoded CA CRLs for
-Client Auth</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLCARevocationPath <em>directory-path</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLCARevocationPath" id="SSLCARevocationPath">SSLCARevocationPath</a> <a name="sslcarevocationpath" id="sslcarevocationpath">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directory of PEM-encoded CA CRLs for
+Client Auth</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLCARevocationPath <em>directory-path</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_ssl</td></tr>
+</table>
<p>
This directive sets the directory where you keep the Certificate Revocation
Lists (CRL) of Certification Authorities (CAs) whose clients you deal with.
@@ -195,12 +244,17 @@
<div class="example"><h3>Example</h3><p><code>
SSLCARevocationPath /usr/local/apache/conf/ssl.crl/
</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="SSLCertificateChainFile" id="SSLCertificateChainFile">SSLCertificateChainFile</a> <a name="sslcertificatechainfile" id="sslcertificatechainfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>File of PEM-encoded Server CA Certificates</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLCertificateChainFile <em>file-path</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLCertificateChainFile" id="SSLCertificateChainFile">SSLCertificateChainFile</a> <a name="sslcertificatechainfile" id="sslcertificatechainfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File of PEM-encoded Server CA Certificates</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLCertificateChainFile <em>file-path</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_ssl</td></tr>
+</table>
<p>
This directive sets the optional <em>all-in-one</em> file where you can
assemble the certificates of Certification Authorities (CA) which form the
@@ -227,12 +281,17 @@
<div class="example"><h3>Example</h3><p><code>
SSLCertificateChainFile /usr/local/apache/conf/ssl.crt/ca.crt
</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="SSLCertificateFile" id="SSLCertificateFile">SSLCertificateFile</a> <a name="sslcertificatefile" id="sslcertificatefile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Server PEM-encoded X.509 Certificate file</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLCertificateFile <em>file-path</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLCertificateFile" id="SSLCertificateFile">SSLCertificateFile</a> <a name="sslcertificatefile" id="sslcertificatefile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Server PEM-encoded X.509 Certificate file</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLCertificateFile <em>file-path</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_ssl</td></tr>
+</table>
<p>
This directive points to the PEM-encoded Certificate file for the server and
optionally also to the corresponding RSA or DSA Private Key file for it
@@ -243,12 +302,17 @@
<div class="example"><h3>Example</h3><p><code>
SSLCertificateFile /usr/local/apache/conf/ssl.crt/server.crt
</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="SSLCertificateKeyFile" id="SSLCertificateKeyFile">SSLCertificateKeyFile</a> <a name="sslcertificatekeyfile" id="sslcertificatekeyfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Server PEM-encoded Private Key file</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLCertificateKeyFile <em>file-path</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLCertificateKeyFile" id="SSLCertificateKeyFile">SSLCertificateKeyFile</a> <a name="sslcertificatekeyfile" id="sslcertificatekeyfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Server PEM-encoded Private Key file</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLCertificateKeyFile <em>file-path</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_ssl</td></tr>
+</table>
<p>
This directive points to the PEM-encoded Private Key file for the
server. If the Private Key is not combined with the Certificate in the
@@ -265,15 +329,20 @@
<div class="example"><h3>Example</h3><p><code>
SSLCertificateKeyFile /usr/local/apache/conf/ssl.key/server.key
</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="SSLCipherSuite" id="SSLCipherSuite">SSLCipherSuite</a> <a name="sslciphersuite" id="sslciphersuite">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Cipher Suite available for negotiation in SSL
-handshake</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLCipherSuite <em>cipher-spec</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLCipherSuite ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLCipherSuite" id="SSLCipherSuite">SSLCipherSuite</a> <a name="sslciphersuite" id="sslciphersuite">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cipher Suite available for negotiation in SSL
+handshake</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLCipherSuite <em>cipher-spec</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLCipherSuite ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP</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_ssl</td></tr>
+</table>
<p>
This complex directive uses a colon-separated <em>cipher-spec</em> string
consisting of OpenSSL cipher specifications to configure the Cipher Suite the
@@ -416,13 +485,18 @@
<tr><td><code>EXP-ADH-DES-CBC-SHA</code></td> <td>SSLv3</td> <td>DH(512)</td> <td>None</td> <td>DES(40)</td> <td>SHA1</td> <td> export</td> </tr>
<tr><td><code>EXP-ADH-RC4-MD5</code></td> <td>SSLv3</td> <td>DH(512)</td> <td>None</td> <td>RC4(40)</td> <td>MD5</td> <td> export</td> </tr>
</table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="SSLEngine" id="SSLEngine">SSLEngine</a> <a name="sslengine" id="sslengine">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>SSL Engine Operation Switch</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLEngine on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLEngine 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLEngine" id="SSLEngine">SSLEngine</a> <a name="sslengine" id="sslengine">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>SSL Engine Operation Switch</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLEngine on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLEngine 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ssl</td></tr>
+</table>
<p>
This directive toggles the usage of the SSL/TLS Protocol Engine. This
is usually used inside a <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> section to enable SSL/TLS for a
@@ -434,14 +508,19 @@
...<br />
</VirtualHost>
</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="SSLMutex" id="SSLMutex">SSLMutex</a> <a name="sslmutex" id="sslmutex">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Semaphore for internal mutual exclusion of
-operations</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLMutex <em>type</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLMutex 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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLMutex" id="SSLMutex">SSLMutex</a> <a name="sslmutex" id="sslmutex">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Semaphore for internal mutual exclusion of
+operations</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLMutex <em>type</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLMutex 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_ssl</td></tr>
+</table>
<p>
This configures the SSL engine's semaphore (aka. lock) which is used for mutual
exclusion of operations which have to be done in a synchronized way between the
@@ -478,13 +557,18 @@
<div class="example"><h3>Example</h3><p><code>
SSLMutex file:/usr/local/apache/logs/ssl_mutex
</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="SSLOptions" id="SSLOptions">SSLOptions</a> <a name="ssloptions" id="ssloptions">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configure various SSL engine run-time options</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLOptions [+|-]<em>option</em> ...</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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLOptions" id="SSLOptions">SSLOptions</a> <a name="ssloptions" id="ssloptions">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure various SSL engine run-time options</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLOptions [+|-]<em>option</em> ...</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ssl</td></tr>
+</table>
<p>
This directive can be used to control various run-time options on a
per-directory basis. Normally, if multiple <code>SSLOptions</code>
@@ -572,14 +656,19 @@
SSLOptions +StdEnvVars +CompatEnvVars -ExportCertData<br />
<Files>
</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="SSLPassPhraseDialog" id="SSLPassPhraseDialog">SSLPassPhraseDialog</a> <a name="sslpassphrasedialog" id="sslpassphrasedialog">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Type of pass phrase dialog for encrypted private
-keys</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLPassPhraseDialog <em>type</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLPassPhraseDialog builtin</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLPassPhraseDialog" id="SSLPassPhraseDialog">SSLPassPhraseDialog</a> <a name="sslpassphrasedialog" id="sslpassphrasedialog">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Type of pass phrase dialog for encrypted private
+keys</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLPassPhraseDialog <em>type</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLPassPhraseDialog builtin</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_ssl</td></tr>
+</table>
<p>
When Apache starts up it has to read the various Certificate (see
<code class="directive"><a href="#sslcertificatefile">SSLCertificateFile</a></code>) and
@@ -636,14 +725,19 @@
<div class="example"><p><code>
SSLPassPhraseDialog exec:/usr/local/apache/sbin/pp-filter
</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="SSLProtocol" id="SSLProtocol">SSLProtocol</a> <a name="sslprotocol" id="sslprotocol">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configure usable SSL protocol flavors</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLProtocol [+|-]<em>protocol</em> ...</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLProtocol all</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>Options</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProtocol" id="SSLProtocol">SSLProtocol</a> <a name="sslprotocol" id="sslprotocol">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure usable SSL protocol flavors</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProtocol [+|-]<em>protocol</em> ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLProtocol all</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>Options</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_ssl</td></tr>
+</table>
<p>
This directive can be used to control the SSL protocol flavors mod_ssl should
use when establishing its server environment. Clients then can only connect
@@ -681,13 +775,18 @@
# enable SSLv3 and TLSv1, but not SSLv2<br />
SSLProtocol all -SSLv2
</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="SSLProxyCACertificateFile" id="SSLProxyCACertificateFile">SSLProxyCACertificateFile</a> <a name="sslproxycacertificatefile" id="sslproxycacertificatefile">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
-for Remote Server Auth</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLProxyCACertificateFile <em>file-path</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyCACertificateFile" id="SSLProxyCACertificateFile">SSLProxyCACertificateFile</a> <a name="sslproxycacertificatefile" id="sslproxycacertificatefile">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
+for Remote Server Auth</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyCACertificateFile <em>file-path</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_ssl</td></tr>
+</table>
<p>
This directive sets the <em>all-in-one</em> file where you can assemble the
Certificates of Certification Authorities (CA) whose <em>remote servers</em> you deal
@@ -698,13 +797,18 @@
<div class="example"><h3>Example</h3><p><code>
SSLProxyCACertificateFile /usr/local/apache/conf/ssl.crt/ca-bundle-remote-server.crt
</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="SSLProxyCACertificatePath" id="SSLProxyCACertificatePath">SSLProxyCACertificatePath</a> <a name="sslproxycacertificatepath" id="sslproxycacertificatepath">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Directory of PEM-encoded CA Certificates for
-Remote Server Auth</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLProxyCACertificatePath <em>directory-path</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyCACertificatePath" id="SSLProxyCACertificatePath">SSLProxyCACertificatePath</a> <a name="sslproxycacertificatepath" id="sslproxycacertificatepath">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directory of PEM-encoded CA Certificates for
+Remote Server Auth</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyCACertificatePath <em>directory-path</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_ssl</td></tr>
+</table>
<p>
This directive sets the directory where you keep the Certificates of
Certification Authorities (CAs) whose remote servers you deal with. These are used to
@@ -719,13 +823,18 @@
<div class="example"><h3>Example</h3><p><code>
SSLProxyCACertificatePath /usr/local/apache/conf/ssl.crt/
</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="SSLProxyCARevocationFile" id="SSLProxyCARevocationFile">SSLProxyCARevocationFile</a> <a name="sslproxycarevocationfile" id="sslproxycarevocationfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>File of concatenated PEM-encoded CA CRLs for
-Remote Server Auth</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLProxyCARevocationFile <em>file-path</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyCARevocationFile" id="SSLProxyCARevocationFile">SSLProxyCARevocationFile</a> <a name="sslproxycarevocationfile" id="sslproxycarevocationfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File of concatenated PEM-encoded CA CRLs for
+Remote Server Auth</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyCARevocationFile <em>file-path</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_ssl</td></tr>
+</table>
<p>
This directive sets the <em>all-in-one</em> file where you can
assemble the Certificate Revocation Lists (CRL) of Certification
@@ -736,13 +845,18 @@
<div class="example"><h3>Example</h3><p><code>
SSLProxyCARevocationFile /usr/local/apache/conf/ssl.crl/ca-bundle-remote-server.crl
</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="SSLProxyCARevocationPath" id="SSLProxyCARevocationPath">SSLProxyCARevocationPath</a> <a name="sslproxycarevocationpath" id="sslproxycarevocationpath">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Directory of PEM-encoded CA CRLs for
-Remote Server Auth</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLProxyCARevocationPath <em>directory-path</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyCARevocationPath" id="SSLProxyCARevocationPath">SSLProxyCARevocationPath</a> <a name="sslproxycarevocationpath" id="sslproxycarevocationpath">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directory of PEM-encoded CA CRLs for
+Remote Server Auth</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyCARevocationPath <em>directory-path</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_ssl</td></tr>
+</table>
<p>
This directive sets the directory where you keep the Certificate Revocation
Lists (CRL) of Certification Authorities (CAs) whose remote servers you deal with.
@@ -757,25 +871,35 @@
<div class="example"><h3>Example</h3><p><code>
SSLProxyCARevocationPath /usr/local/apache/conf/ssl.crl/
</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="SSLProxyCipherSuite" id="SSLProxyCipherSuite">SSLProxyCipherSuite</a> <a name="sslproxyciphersuite" id="sslproxyciphersuite">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Cipher Suite available for negotiation in SSL
-proxy handshake</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLProxyCipherSuite <em>cipher-spec</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLProxyCipherSuite ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyCipherSuite" id="SSLProxyCipherSuite">SSLProxyCipherSuite</a> <a name="sslproxyciphersuite" id="sslproxyciphersuite">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Cipher Suite available for negotiation in SSL
+proxy handshake</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyCipherSuite <em>cipher-spec</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLProxyCipherSuite ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP</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_ssl</td></tr>
+</table>
<p>Equivalent to <code>SSLCipherSuite</code>, but for the proxy connection.
Please refer to <code class="directive"><a href="#sslciphersuite">SSLCipherSuite</a></code>
for additional 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="SSLProxyEngine" id="SSLProxyEngine">SSLProxyEngine</a> <a name="sslproxyengine" id="sslproxyengine">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>SSL Proxy Engine Operation Switch</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLProxyEngine on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLProxyEngine 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyEngine" id="SSLProxyEngine">SSLProxyEngine</a> <a name="sslproxyengine" id="sslproxyengine">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>SSL Proxy Engine Operation Switch</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyEngine on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLProxyEngine 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ssl</td></tr>
+</table>
<p>
This directive toggles the usage of the SSL/TLS Protocol Engine for proxy. This
is usually used inside a <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> section to enable SSL/TLS for proxy
@@ -787,14 +911,19 @@
...<br />
</VirtualHost>
</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="SSLProxyMachineCertificateFile" id="SSLProxyMachineCertificateFile">SSLProxyMachineCertificateFile</a> <a name="sslproxymachinecertificatefile" id="sslproxymachinecertificatefile">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 for proxy server client certificates</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLProxyMachineCertificateFile <em>filename</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#Override">Override:
- </a></th><td>Not applicable</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyMachineCertificateFile" id="SSLProxyMachineCertificateFile">SSLProxyMachineCertificateFile</a> <a name="sslproxymachinecertificatefile" id="sslproxymachinecertificatefile">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 for proxy server client certificates</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyMachineCertificateFile <em>filename</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#Override">Override:</a></th><td>Not applicable</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_ssl</td></tr>
+</table>
<p>
This directive sets the all-in-one file where you keep the certificates of
Certification Authorities (CAs) whose proxy client certificates are used for
@@ -810,14 +939,19 @@
<div class="example"><p><code>
SSLProxyMachineCertificatePath /usr/local/apache/conf/ssl.crt/
</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="SSLProxyMachineCertificatePath" id="SSLProxyMachineCertificatePath">SSLProxyMachineCertificatePath</a> <a name="sslproxymachinecertificatepath" id="sslproxymachinecertificatepath">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Directory of PEM-encoded CA certificates for proxy server client certificates</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLProxyMachineCertificatePath <em>directory</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#Override">Override:
- </a></th><td>Not applicable</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyMachineCertificatePath" id="SSLProxyMachineCertificatePath">SSLProxyMachineCertificatePath</a> <a name="sslproxymachinecertificatepath" id="sslproxymachinecertificatepath">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directory of PEM-encoded CA certificates for proxy server client certificates</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyMachineCertificatePath <em>directory</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#Override">Override:</a></th><td>Not applicable</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_ssl</td></tr>
+</table>
<p>
This directive sets the directory where you keep the certificates of
Certification Authorities (CAs) whose proxy client certificates are used for
@@ -834,14 +968,19 @@
<div class="example"><p><code>
SSLProxyMachineCertificatePath /usr/local/apache/conf/ssl.crt/
</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="SSLProxyProtocol" id="SSLProxyProtocol">SSLProxyProtocol</a> <a name="sslproxyprotocol" id="sslproxyprotocol">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configure usable SSL protocol flavors for proxy usage</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLProxyProtocol [+|-]<em>protocol</em> ...</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLProxyProtocol all</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>Options</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyProtocol" id="SSLProxyProtocol">SSLProxyProtocol</a> <a name="sslproxyprotocol" id="sslproxyprotocol">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure usable SSL protocol flavors for proxy usage</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyProtocol [+|-]<em>protocol</em> ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLProxyProtocol all</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>Options</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_ssl</td></tr>
+</table>
<p>
This directive can be used to control the SSL protocol flavors mod_ssl should
@@ -850,14 +989,19 @@
<p>Please refer to <code class="directive"><a href="#sslprotocol">SSLProtocol</a></code>
for additional 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="SSLProxyVerify" id="SSLProxyVerify">SSLProxyVerify</a> <a name="sslproxyverify" id="sslproxyverify">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Type of remote server Certificate verification</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLProxyVerify <em>level</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLProxyVerify 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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyVerify" id="SSLProxyVerify">SSLProxyVerify</a> <a name="sslproxyverify" id="sslproxyverify">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Type of remote server Certificate verification</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLProxyVerify <em>level</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLProxyVerify 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_ssl</td></tr>
+</table>
<p>
This directive sets the Certificate verification level for the remote server
Authentication. Notice that this directive can be used both in per-server and
@@ -887,15 +1031,20 @@
<div class="example"><h3>Example</h3><p><code>
SSLProxyVerify require
</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="SSLProxyVerifyDepth" id="SSLProxyVerifyDepth">SSLProxyVerifyDepth</a> <a name="sslproxyverifydepth" id="sslproxyverifydepth">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maximum depth of CA Certificates in Remote Server
-Certificate verification</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLVerifyDepth <em>number</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLVerifyDepth 1</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLProxyVerifyDepth" id="SSLProxyVerifyDepth">SSLProxyVerifyDepth</a> <a name="sslproxyverifydepth" id="sslproxyverifydepth">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum depth of CA Certificates in Remote Server
+Certificate verification</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLVerifyDepth <em>number</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLVerifyDepth 1</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_ssl</td></tr>
+</table>
<p>
This directive sets how deeply mod_ssl should verify before deciding that the
remote server does not have a valid certificate. Notice that this directive can be
@@ -915,14 +1064,19 @@
<div class="example"><h3>Example</h3><p><code>
SSLProxyVerifyDepth 10
</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="SSLRandomSeed" id="SSLRandomSeed">SSLRandomSeed</a> <a name="sslrandomseed" id="sslrandomseed">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Pseudo Random Number Generator (PRNG) seeding
-source</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLRandomSeed <em>context</em> <em>source</em>
-[<em>bytes</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLRandomSeed" id="SSLRandomSeed">SSLRandomSeed</a> <a name="sslrandomseed" id="sslrandomseed">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Pseudo Random Number Generator (PRNG) seeding
+source</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLRandomSeed <em>context</em> <em>source</em>
+[<em>bytes</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_ssl</td></tr>
+</table>
<p>
This configures one or more sources for seeding the Pseudo Random Number
Generator (PRNG) in OpenSSL at startup time (<em>context</em> is
@@ -1005,14 +1159,19 @@
SSLRandomSeed connect file:/dev/random<br />
SSLRandomSeed connect file:/dev/urandom 1024<br />
</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="SSLRequire" id="SSLRequire">SSLRequire</a> <a name="sslrequire" id="sslrequire">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Allow access only when an arbitrarily complex
-boolean expression is true</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLRequire <em>expression</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLRequire" id="SSLRequire">SSLRequire</a> <a name="sslrequire" id="sslrequire">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Allow access only when an arbitrarily complex
+boolean expression is true</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLRequire <em>expression</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_ssl</td></tr>
+</table>
<p>
This directive specifies a general access requirement which has to be
fulfilled in order to allow access. It's a very powerful directive because the
@@ -1136,14 +1295,19 @@
SSL_CLIENT_VERIFY
</pre>
</td></tr></table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="SSLRequireSSL" id="SSLRequireSSL">SSLRequireSSL</a> <a name="sslrequiressl" id="sslrequiressl">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Deny access when SSL is not used for the
-HTTP request</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLRequireSSL</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLRequireSSL" id="SSLRequireSSL">SSLRequireSSL</a> <a name="sslrequiressl" id="sslrequiressl">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Deny access when SSL is not used for the
+HTTP request</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLRequireSSL</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_ssl</td></tr>
+</table>
<p>
This directive forbids access unless HTTP over SSL (i.e. HTTPS) is enabled for
the current connection. This is very handy inside the SSL-enabled virtual
@@ -1153,14 +1317,19 @@
<div class="example"><h3>Example</h3><p><code>
SSLRequireSSL
</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="SSLSessionCache" id="SSLSessionCache">SSLSessionCache</a> <a name="sslsessioncache" id="sslsessioncache">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Type of the global/inter-process SSL Session
-Cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLSessionCache <em>type</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLSessionCache 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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLSessionCache" id="SSLSessionCache">SSLSessionCache</a> <a name="sslsessioncache" id="sslsessioncache">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Type of the global/inter-process SSL Session
+Cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLSessionCache <em>type</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLSessionCache 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_ssl</td></tr>
+</table>
<p>
This configures the storage type of the global/inter-process SSL Session
Cache. This cache is an optional facility which speeds up parallel request
@@ -1196,14 +1365,19 @@
SSLSessionCache dbm:/usr/local/apache/logs/ssl_gcache_data<br />
SSLSessionCache shm:/usr/local/apache/logs/ssl_gcache_data(512000)
</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="SSLSessionCacheTimeout" id="SSLSessionCacheTimeout">SSLSessionCacheTimeout</a> <a name="sslsessioncachetimeout" id="sslsessioncachetimeout">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Number of seconds before an SSL session expires
-in the Session Cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLSessionCacheTimeout <em>seconds</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLSessionCacheTimeout 300</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLSessionCacheTimeout" id="SSLSessionCacheTimeout">SSLSessionCacheTimeout</a> <a name="sslsessioncachetimeout" id="sslsessioncachetimeout">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Number of seconds before an SSL session expires
+in the Session Cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLSessionCacheTimeout <em>seconds</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLSessionCacheTimeout 300</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_ssl</td></tr>
+</table>
<p>
This directive sets the timeout in seconds for the information stored in the
global/inter-process SSL Session Cache and the OpenSSL internal memory cache.
@@ -1212,14 +1386,19 @@
<div class="example"><h3>Example</h3><p><code>
SSLSessionCacheTimeout 600
</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="SSLVerifyClient" id="SSLVerifyClient">SSLVerifyClient</a> <a name="sslverifyclient" id="sslverifyclient">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Type of Client Certificate verification</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLVerifyClient <em>level</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLVerifyClient 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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLVerifyClient" id="SSLVerifyClient">SSLVerifyClient</a> <a name="sslverifyclient" id="sslverifyclient">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Type of Client Certificate verification</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLVerifyClient <em>level</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLVerifyClient 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_ssl</td></tr>
+</table>
<p>
This directive sets the Certificate verification level for the Client
Authentication. Notice that this directive can be used both in per-server and
@@ -1249,15 +1428,20 @@
<div class="example"><h3>Example</h3><p><code>
SSLVerifyClient require
</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="SSLVerifyDepth" id="SSLVerifyDepth">SSLVerifyDepth</a> <a name="sslverifydepth" id="sslverifydepth">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maximum depth of CA Certificates in Client
-Certificate verification</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SSLVerifyDepth <em>number</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>SSLVerifyDepth 1</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_ssl</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLVerifyDepth" id="SSLVerifyDepth">SSLVerifyDepth</a> <a name="sslverifydepth" id="sslverifydepth">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum depth of CA Certificates in Client
+Certificate verification</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLVerifyDepth <em>number</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SSLVerifyDepth 1</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_ssl</td></tr>
+</table>
<p>
This directive sets how deeply mod_ssl should verify before deciding that the
clients don't have a valid certificate. Notice that this directive can be
@@ -1277,4 +1461,10 @@
<div class="example"><h3>Example</h3><p><code>
SSLVerifyDepth 10
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_status.html.en b/docs/manual/mod/mod_status.html.en
index 439ff1e..5711ece 100644
--- a/docs/manual/mod/mod_status.html.en
+++ b/docs/manual/mod/mod_status.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_status - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_status</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Provides information on server activity and
-performance</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>status_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_status.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_status - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_status</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Provides information on server activity and
+performance</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>status_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_status.c</td></tr></table>
+<h3>Summary</h3>
+
<div class="note">
<strong>Warning:</strong> This document has not been updated
@@ -54,8 +71,20 @@
<p>A compile-time option must be used to display the details
marked "(*)" as the instrumentation required for obtaining
these statistics does not exist within standard Apache.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#extendedstatus">ExtendedStatus</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> Enabling Status Support</li><li><img alt="" src="../images/down.gif" /> Automatic Updates</li><li><img alt="" src="../images/down.gif" /> Machine Readable Status File</li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Enabling Status Support</h2>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#extendedstatus">ExtendedStatus</a></li>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> Enabling Status Support</li>
+<li><img alt="" src="../images/down.gif" /> Automatic Updates</li>
+<li><img alt="" src="../images/down.gif" /> Machine Readable Status File</li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Enabling Status Support</h2>
<p>To enable status reports only for browsers from the foo.com
@@ -78,7 +107,9 @@
<div class="note"><p>Note that <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> will only work
when you are running Apache in <a href="core.html#servertype">standalone</a> mode and not
<a href="core.html#servertype">inetd</a> mode.</p></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Automatic Updates</h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Automatic Updates</h2>
<p>You can get the status page to update itself automatically if
@@ -86,7 +117,9 @@
<code>http://your.server.name/server-status?refresh=N</code> to
refresh the page every N seconds.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Machine Readable Status File</h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Machine Readable Status File</h2>
<p>A machine-readable version of the status file is available by
@@ -105,18 +138,28 @@
ramifications for your site.</strong>
</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="ExtendedStatus" id="ExtendedStatus">ExtendedStatus</a> <a name="extendedstatus" id="extendedstatus">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Keep track of extended status information for each
-request</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ExtendedStatus On|Off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ExtendedStatus 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_status</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>ExtendedStatus is only available in Apache 1.3.2 and
-later.</td></tr></table>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExtendedStatus" id="ExtendedStatus">ExtendedStatus</a> <a name="extendedstatus" id="extendedstatus">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Keep track of extended status information for each
+request</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ExtendedStatus On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ExtendedStatus 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_status</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>ExtendedStatus is only available in Apache 1.3.2 and
+later.</td></tr>
+</table>
<p>This setting applies to the entire server, and cannot be
enabled or disabled on a virtualhost-by-virtualhost basis.
The collection of extended status information can slow down
the server.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_suexec.html.en b/docs/manual/mod/mod_suexec.html.en
index 4bafc8e..866145e 100644
--- a/docs/manual/mod/mod_suexec.html.en
+++ b/docs/manual/mod/mod_suexec.html.en
@@ -4,24 +4,53 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_suexec - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_suexec</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Allows CGI scripts to run as a specified user
-and Group</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>suexec_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_suexec.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in Apache 2.0 and later</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_suexec - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_suexec</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Allows CGI scripts to run as a specified user
+and Group</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>suexec_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_suexec.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.0 and later</td></tr></table>
+<h3>Summary</h3>
+
<p>This module, in combination with the <a href="../programs/suexec.html">suexec support program</a> allows
CGI scripts to run as a specified user and Group.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#suexecusergroup">SuexecUserGroup</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><a href="../suexec.html">SuEXEC support</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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>User and group permissions for CGI programs</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SuexecUserGroup <em>User Group</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_suexec</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>SuexecUserGroup is only available in 2.0 and
-later.</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#suexecusergroup">SuexecUserGroup</a></li>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><a href="../suexec.html">SuEXEC support</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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>User and group permissions for CGI programs</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SuexecUserGroup <em>User Group</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_suexec</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>SuexecUserGroup is only available in 2.0 and
+later.</td></tr>
+</table>
<p>The <code class="directive">SuexecUserGroup</code> directive allows you
to specify a user and group for CGI programs to run as. Non-CGI
requests are still processes with the user specified in the User
@@ -33,4 +62,10 @@
SuexecUserGroup nobody nogroup
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_suexec.html.ja.jis b/docs/manual/mod/mod_suexec.html.ja.jis
index 88944ba..78bd877 100644
--- a/docs/manual/mod/mod_suexec.html.ja.jis
+++ b/docs/manual/mod/mod_suexec.html.ja.jis
@@ -4,32 +4,67 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_suexec - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_suexec</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B;XDj$5$l$?%f!<%6$H%0%k!<%W$G(B CGI $B%9%/%j%W%H$r<B9T$9$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B3HD%(B</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>suexec_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_suexec.c</td></tr><tr><th><a href="module-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>Apache 2.0 $B0J9_$G;HMQ2DG=(B</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_suexec - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_suexec</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B;XDj$5$l$?%f!<%6$H%0%k!<%W$G(B CGI $B%9%/%j%W%H$r<B9T$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B3HD%(B</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>suexec_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_suexec.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">$B8_49@-(B:</a></th><td>Apache 2.0 $B0J9_$G;HMQ2DG=(B</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$B$3$N%b%8%e!<%k$H(B <a href="../programs/suexec.html">suexec $B%5%]!<%H%W%m%0%i%`(B</a>
$B$K$h$j!"(BCGI $B%9%/%j%W%H$,;XDj$5$l$?%f!<%6$H%0%k!<%W$G(B
$B<B9T$5$l$k$h$&$K$G$-$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#suexecusergroup">SuexecUserGroup</a></li>
-</ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><a href="../suexec.html">SuEXEC $B%5%]!<%H(B</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>CGI $B%W%m%0%i%`$N%f!<%6%Q!<%_%C%7%g%s!"%0%k!<%W%Q!<%_%C%7%g%s(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>SuexecUserGroup <em>User Group</em></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>$B3HD%(B</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_suexec</td></tr><tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:
- </a></th><td>SuexecUserGroup $B$O(B 2.0 $B0J9_$G$N$_;HMQ2DG=!#(B</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#suexecusergroup">SuexecUserGroup</a></li>
+</ul>
+<h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><a href="../suexec.html">SuEXEC $B%5%]!<%H(B</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>CGI $B%W%m%0%i%`$N%f!<%6%Q!<%_%C%7%g%s!"%0%k!<%W%Q!<%_%C%7%g%s(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>SuexecUserGroup <em>User Group</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>$B3HD%(B</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_suexec</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">$B8_49@-(B:</a></th><td>SuexecUserGroup $B$O(B 2.0 $B0J9_$G$N$_;HMQ2DG=!#(B</td></tr>
+</table>
<p><code class="directive">SuexecUserGroup</code> $B%G%#%l%/%F%#%V$O(B CGI $B%W%m%0%i%`(B
- $B$,<B9T$5$l$k%f!<%6(B$B$H%0%k!<%W$r;XDj$G$-$k$h$&$K$7$^$9!#(BCGI $B0J30$N(B
+ $B$,<B9T$5$l$k%f!<%6$H%0%k!<%W$r;XDj$G$-$k$h$&$K$7$^$9!#(BCGI $B0J30$N(B
$B%j%/%(%9%H$O(B User $B%G%#%l%/%F%#%V$G;XDj$5$l$?%f!<%6$N$^$^$G=hM}$5$l$^$9!#(B
$B$3$N%G%#%l%/%F%#%V$O(B Apache 1.3 $B$K$*$1$k(B VirtualHosts $B$NCf$G(B
- User $B%G(B$B%#%l%/%F%#%V$H(B Group $B%G%#%l%/%F%#%V$r;H$&MQK!$NBe$o$j$K$J$j$^$9!#(B</p>
+ User $B%G%#%l%/%F%#%V$H(B Group $B%G%#%l%/%F%#%V$r;H$&MQK!$NBe$o$j$K$J$j$^$9!#(B</p>
<div class="example"><h3>$BNc(B</h3><p><code>
SuexecUserGroup nobody nogroup
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_unique_id.html.en b/docs/manual/mod/mod_unique_id.html.en
index 47527a8..4fd79e2 100644
--- a/docs/manual/mod/mod_unique_id.html.en
+++ b/docs/manual/mod/mod_unique_id.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_unique_id - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_unique_id</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Provides an environment variable with a unique
-identifier for each request</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>unique_id_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_unique_id.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_unique_id - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_unique_id</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Provides an environment variable with a unique
+identifier for each request</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>unique_id_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_unique_id.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module provides a magic token for each request which is
guaranteed to be unique across "all" requests under very
@@ -19,7 +36,16 @@
set to the identifier for each request. Unique identifiers are
useful for various reasons which are beyond the scope of this
document.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><p>This module provides no directives.</p><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> Theory</li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Theory</h2>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<p>This module provides no directives.</p>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> Theory</li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Theory</h2>
<p>First a brief recap of how the Apache server works on Unix
@@ -172,4 +198,9 @@
shortened, but more information needs to be assumed (for
example the 32-bit IP address is overkill for any site, but
there is no portable shorter replacement for it). </p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_unique_id.html.ja.jis b/docs/manual/mod/mod_unique_id.html.ja.jis
index 9ef8956..775b5a8 100644
--- a/docs/manual/mod/mod_unique_id.html.ja.jis
+++ b/docs/manual/mod/mod_unique_id.html.ja.jis
@@ -4,29 +4,55 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_unique_id - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_unique_id</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B$=$l$>$l$N%j%/%(%9%H$KBP$9$k0l(B$B0U$J<1JL;R$NF~$C$?4D6-JQ?t$r(B
-$BDs6!$9$k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>unique_id_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_unique_id.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_unique_id - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_unique_id</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B$=$l$>$l$N%j%/%(%9%H$KBP$9$k0l0U$J<1JL;R$NF~$C$?4D6-JQ?t$r(B
+$BDs6!$9$k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>unique_id_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_unique_id.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$B$3$N%b%8%e!<%k$OHs>o$K@)8B$5$l$?>r7o2<$G!"(B
$B$=$l$>$l$N%j%/%(%9%H$K!V$9$Y$F!W$N%j%/%(%9%H$KBP$7$F(B
$B0l0U$K7h$^$k$3$H$,J]>Z$5$l$F$$$kKbK!$N%H!<%/%s$rDs6!$7$^$9!#(B
$B$3$N0l0U$J<1JL;R$O!"E,@Z$K@_Dj$5$l$?%/%i%9%?$G$OJ#?t$N(B
- $B%^%7%s$N4V$G$5$($b0l0U$K$J$j$^$9!#$=$l$>$l$N%j%/%(%9%H$KBP$7(B$B$F4D6-JQ?t(B
+ $B%^%7%s$N4V$G$5$($b0l0U$K$J$j$^$9!#$=$l$>$l$N%j%/%(%9%H$KBP$7$F4D6-JQ?t(B
<code>UNIQUE_ID</code> $B$K<1JL;R$,@_Dj$5$l$^$9!#(B
$B0l0U$J<1JL;R$,JXMx$JM}M3$O$$$m$$$m$"$j$^$9$,!"(B
$B$3$N%I%-%e%a%s%H$NL\E*$+$i$O30$l$k$?$a!"$3$3$G$O@bL@$7$^$;$s!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><p>$B$3$N%b%8%e!<%k$K%G%#%l%/%F%#%V$O$"$j$^$;$s!#(B</p><h3>$B%H%T%C%/(B</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> $BM}O@(B</li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>$BM}O@(B</h2>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<p>$B$3$N%b%8%e!<%k$K%G%#%l%/%F%#%V$O$"$j$^$;$s!#(B</p>
+<h3>$B%H%T%C%/(B</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> $BM}O@(B</li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>$BM}O@(B</h2>
- <p>$B$^$:$O$8$a$K!"(BApache $B%5!<(B$B%P$,(B Unix
+ <p>$B$^$:$O$8$a$K!"(BApache $B%5!<%P$,(B Unix
$B%^%7%s$G$I$N$h$&$KF0:n$r$9$k$+$r4JC1$K@bL@$7$^$9!#(B
$B$3$N5!G=$O8=;~E@$G$O(B Windows NT $B$G$O%5%]!<%H$5$l$F$$$^$;$s!#(B
Unix $B%^%7%s$G$O(B Apache $B$O$$$/$D$+$N;R%W%m%;%9$r:n@.$7!"(B
- $B$=$N;R%W%m%;(B$B%9$,0l$D$:$D%j%/%(%9%H$r=hM}$7$^$9!#$=$l$>$l$N;R%W%m%;%9$O!"(B
+ $B$=$N;R%W%m%;%9$,0l$D$:$D%j%/%(%9%H$r=hM}$7$^$9!#$=$l$>$l$N;R%W%m%;%9$O!"(B
$B@8B84|4VCf$KJ#?t$N%j%/%(%9%H$r07$&$3$H$,$G$-$^$9!#(B
$B$3$N5DO@$G$O;R%W%m%;%94V$G$O0l@Z%G!<%?$r6&M-$7$J$$$3$H$K$7$^$9!#(B
$B0J8e!"$3$N;R%W%m%;%9$N$3$H$r(B httpd $B%W%m%;%9$H8F$S$^$9!#(B</p>
@@ -65,7 +91,7 @@
<p>$B;~9o$r6hJL$9$k$?$a$K!"(BUnix $B$N%?%$%`%9%?%s%W(B (UTC $B$N(B 1970 $BG/(B
1 $B7n(B 1 $BF|$+$i$NIC?t(B) $B$H!"(B16 $B%S%C%H$N%+%&%s%?$r;H$$$^$9!#(B
- $B%?%$%`%9%?%s%W$NN3EY$O0lIC(B$B$G$9$N$G!"0lIC4V$N(B 65536
+ $B%?%$%`%9%?%s%W$NN3EY$O0lIC$G$9$N$G!"0lIC4V$N(B 65536
$B$^$G$NCM$rI=8=$9$k$?$a$K%+%&%s%?$r;HMQ$7$^$9!#;M$D$NCM(B
<em>( ip_addr, pid, time_stamp, counter )</em> $B$G3F(B httpd
$B%W%m%;%9$G0lIC$N4V$K(B 65536 $B%j%/%(%9%H$r?t$($"$2$k$3$H$,$G$-$^$9!#(B
@@ -82,7 +108,7 @@
($B$"$U$l$?>l9g$O(B 0 $B$KLa$j$^$9(B)$B!#(B</p>
<p>$B%+!<%M%k$O%W%m%;%9$r%U%)!<%/$9$k$H!"$=$l$>$l$N%W%m%;%9$N$?$a$K(B
- pid $B$r@8@.$7$^$9(B$B!#(Bpid $B$O7+$jJV$5$l$k$3$H$,5v2D$5$l$F$$$^$9(B
+ pid $B$r@8@.$7$^$9!#(Bpid $B$O7+$jJV$5$l$k$3$H$,5v2D$5$l$F$$$^$9(B
(pid $B$NCM$OB?$/$N(B Unix $B$G$O(B 16 $B%S%C%H$G$9$,!"?7$7$$%7%9%F%`$G$O(B
32 $B%S%C%H$K3HD%$5$l$F$$$^$9(B)$B!#(B
$B$G$9$+$i!"$"$kDxEY$N;~4V$,7P2a$9$k$HF1$8(B pid $B$,:F$S;HMQ$5$l$^$9!#(B
@@ -148,7 +174,7 @@
$B$H$NEy2A@-$rD4$Y$k$?$a$@$1$K$N$_;HMQ$G$-$^$9!#(B</p>
<p>$B$3$N=gHV$O>-Mh!"4{B8$N(B <code>UNIQUE_ID</code>
- $B$N%G!<%?%Y(B$B!<%9$H$N>WFM$r?4G[$9$k$3$H$J$/Id9f$rJQ99$9$k$3$H$,(B
+ $B$N%G!<%?%Y!<%9$H$N>WFM$r?4G[$9$k$3$H$J$/Id9f$rJQ99$9$k$3$H$,(B
$B2DG=$K$J$k$h$&$KA*Br$7$F$$$^$9!#(B
$B?7$7$$Id9f$O%?%$%`%9%?%s%W$r:G=i$NMWAG$H$7$F;D$9$N$,K>$^$7$/!"(B
$B$=$l0J30$OF1$8%"%k%U%!%Y%C%H$H%S%C%HD9$r;H$&$3$H$,$G$-$^$9!#(B
@@ -171,4 +197,9 @@
$B$h$jB?$/$N>pJs$r2>Dj$9$kI,MW$,$G$F$-$^$9(B ($BNc$($P!"(B32 $B%S%C%H(B
IP $B%"%I%l%9$O$I$N%5%$%H$K$*$$$F$b2a>j$J>pJs$G$9$,!"(B
$B$=$l$NBe$o$j$K$J$k0\?"@-$N$"$k$b$N$O$"$j$^$;$s(B)$B!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_userdir.html.en b/docs/manual/mod/mod_userdir.html.en
index 878b9e1..f4fec87 100644
--- a/docs/manual/mod/mod_userdir.html.en
+++ b/docs/manual/mod/mod_userdir.html.en
@@ -4,23 +4,53 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_userdir - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_userdir</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>User-specific directories</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>userdir_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_userdir.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_userdir - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_userdir</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>User-specific directories</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>userdir_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_userdir.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module allows user-specific directories to be accessed using the
<code>http://example.com/~user/</code> syntax.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#userdir">UserDir</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><a href="../urlmapping.html">Mapping URLs to the
-Filesystem</a></li><li><a href="../howto/public_html.html">public_html
-tutorial</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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Location of the user-specific directories</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>UserDir <em>directory-filename</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>UserDir public_html</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_userdir</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#userdir">UserDir</a></li>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><a href="../urlmapping.html">Mapping URLs to the
+Filesystem</a></li>
+<li><a href="../howto/public_html.html">public_html
+tutorial</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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location of the user-specific directories</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>UserDir <em>directory-filename</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>UserDir public_html</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_userdir</td></tr>
+</table>
<p>The <code class="directive">UserDir</code> directive sets the real
directory in a user's home directory to use when a request for a
@@ -118,5 +148,15 @@
the redirect earlier in the list, that will always be the alternative
that is used.</p>
-<h3>See also</h3><ul><li><a href="../howto/public_html.html">public_html
-tutorial</a></li></ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+<h3>See also</h3>
+<ul>
+<li><a href="../howto/public_html.html">public_html
+tutorial</a></li>
+</ul>
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_userdir.html.ja.jis b/docs/manual/mod/mod_userdir.html.ja.jis
index d4147db..f5567f7 100644
--- a/docs/manual/mod/mod_userdir.html.ja.jis
+++ b/docs/manual/mod/mod_userdir.html.ja.jis
@@ -4,25 +4,55 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_userdir - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_userdir</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%f!<%6@lMQ$N%G%#%l%/%H%j$rDs6!(B
- </td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>userdir_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mod_userdir.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>mod_userdir - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mod_userdir</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%f!<%6@lMQ$N%G%#%l%/%H%j$rDs6!(B
+ </td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>userdir_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mod_userdir.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$B$3$N%b%8%e!<%k$O!"(B
<code>http://example.com/~user/</code>
-$B9=J8$r;H$C$F%f!<%6@lMQ%G%#%l%/%H%j$K%"%/%;%9$G(B$B$-$k$h$&$K$7$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#userdir">UserDir</a></li>
-</ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><a href="../urlmapping.html">URL $B$+$i(B
-$B%U%!%$%k%7%9%F%`$X$N%^%C%T%s%0(B</a></li><li><a href="../howto/public_html.html">public_html
-$B%A%e!<%H%j%"%k(B</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%f!<%6@lMQ%G%#%l%/%H%j$N0LCV(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>UserDir <em>directory-filename</em></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>UserDir public_html</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>mod_userdir</td></tr></table>
+$B9=J8$r;H$C$F%f!<%6@lMQ%G%#%l%/%H%j$K%"%/%;%9$G$-$k$h$&$K$7$^$9!#(B</p>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#userdir">UserDir</a></li>
+</ul>
+<h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><a href="../urlmapping.html">URL $B$+$i(B
+$B%U%!%$%k%7%9%F%`$X$N%^%C%T%s%0(B</a></li>
+<li><a href="../howto/public_html.html">public_html
+$B%A%e!<%H%j%"%k(B</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%f!<%6@lMQ%G%#%l%/%H%j$N0LCV(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>UserDir <em>directory-filename</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>UserDir public_html</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>mod_userdir</td></tr>
+</table>
<p><code class="directive">UserDir</code> $B%G%#%l%/%F%#%V$O!"(B
$B%f!<%6$N%I%-%e%a%s%H$X$N%j%/%(%9%H$r<u$1$?;~$K;H$&(B
@@ -128,5 +158,15 @@
$B%j%9%H$NA0$NJ}$K%j%@%$%l%/%H$r=q$/$H!"$=$l$,I,$:;HMQ$5$l$kA*Br;h$K(B
$B$J$C$F$7$^$$$^$9!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><a href="../howto/public_html.html">public_html
-$B%A%e!<%H%j%"%k(B</a></li></ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><a href="../howto/public_html.html">public_html
+$B%A%e!<%H%j%"%k(B</a></li>
+</ul>
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_usertrack.html.en b/docs/manual/mod/mod_usertrack.html.en
index 83e2565..bc60dc3 100644
--- a/docs/manual/mod/mod_usertrack.html.en
+++ b/docs/manual/mod/mod_usertrack.html.en
@@ -4,25 +4,53 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_usertrack - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_usertrack</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>
+ -->
+<title>mod_usertrack - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_usertrack</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>
<em>Clickstream</em> logging of user activity on a site
-</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>usertrack_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_usertrack.c</td></tr></table><h3>Summary</h3>
+</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>usertrack_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_usertrack.c</td></tr></table>
+<h3>Summary</h3>
+
<p>Previous releases of Apache have included a module which
generates a 'clickstream' log of user activity on a site using
cookies. This was called the "cookies" module, mod_cookies. In
Apache 1.2 and later this module has been renamed the "user
tracking" module, mod_usertrack. This module has been
simplified and new directives added.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cookiedomain">CookieDomain</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cookiedomain">CookieDomain</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cookieexpires">CookieExpires</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cookiename">CookieName</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cookiestyle">CookieStyle</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cookietracking">CookieTracking</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> Logging</li><li><img alt="" src="../images/down.gif" /> 2-digit or 4-digit dates for cookies?</li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>Logging</h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> Logging</li>
+<li><img alt="" src="../images/down.gif" /> 2-digit or 4-digit dates for cookies?</li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Logging</h2>
<p>Previously, the cookies module (now the user tracking
@@ -40,7 +68,9 @@
<p>For backward compatibility the configurable log module
implements the old <code class="directive"><a href="../mod/mod_log_config.html#cookielog">CookieLog</a></code> directive, but this
should be upgraded to the above <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> directive. </p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2>2-digit or 4-digit dates for cookies?</h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>2-digit or 4-digit dates for cookies?</h2>
<p>(the following is from message
@@ -79,13 +109,17 @@
time late in the year "37".
</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><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CookieDomain <em>domain</em></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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_usertrack</td></tr></table>
+</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>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CookieDomain <em>domain</em></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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_usertrack</td></tr>
+</table>
<p>This directive controls the setting of the domain to which
the tracking cookie applies. If not present, no domain is
@@ -94,13 +128,18 @@
<p>The domain string <strong>must</strong> begin with a dot, and
<strong>must</strong> include at least one embedded dot. That is,
".foo.com" is legal, but "foo.bar.com" and ".com" are not.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="CookieExpires" id="CookieExpires">CookieExpires</a> <a name="cookieexpires" id="cookieexpires">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Expiry time for the tracking cookie</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CookieExpires <em>expiry-period</em></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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_usertrack</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CookieExpires" id="CookieExpires">CookieExpires</a> <a name="cookieexpires" id="cookieexpires">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Expiry time for the tracking cookie</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CookieExpires <em>expiry-period</em></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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_usertrack</td></tr>
+</table>
<p>When used, this directive sets an expiry time on the cookie
generated by the usertrack module. The <em>expiry-period</em>
can be given either as a number of seconds, or in the format
@@ -111,14 +150,19 @@
<p>If this directive is not used, cookies last only for the
current browser 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="CookieName" id="CookieName">CookieName</a> <a name="cookiename" id="cookiename">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Name of the tracking cookie</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CookieName <em>token</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CookieName Apache</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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_usertrack</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CookieName" id="CookieName">CookieName</a> <a name="cookiename" id="cookiename">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Name of the tracking cookie</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CookieName <em>token</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CookieName Apache</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_usertrack</td></tr>
+</table>
<p>This directive allows you to change the name of the cookie
this module uses for its tracking purposes. By default the
cookie is named "<code>Apache</code>".</p>
@@ -126,15 +170,20 @@
<p>You must specify a valid cookie name; results are
unpredictable if you use a name containing unusual characters.
Valid characters include A-Z, a-z, 0-9, "_", and "-".</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="CookieStyle" id="CookieStyle">CookieStyle</a> <a name="cookiestyle" id="cookiestyle">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Format of the cookie header field</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CookieStyle
- <em>Netscape|Cookie|Cookie2|RFC2109|RFC2965</em></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CookieStyle Netscape</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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_usertrack</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CookieStyle" id="CookieStyle">CookieStyle</a> <a name="cookiestyle" id="cookiestyle">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Format of the cookie header field</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CookieStyle
+ <em>Netscape|Cookie|Cookie2|RFC2109|RFC2965</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CookieStyle Netscape</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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_usertrack</td></tr>
+</table>
<p>This directive controls the format of the cookie header
field. The three formats allowed are:</p>
@@ -153,14 +202,19 @@
<p>Not all clients can understand all of these formats. but you
should use the newest one that is generally acceptable to your
users' browsers.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="CookieTracking" id="CookieTracking">CookieTracking</a> <a name="cookietracking" id="cookietracking">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enables tracking cookie</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CookieTracking on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>CookieTracking 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>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_usertrack</td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CookieTracking" id="CookieTracking">CookieTracking</a> <a name="cookietracking" id="cookietracking">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables tracking cookie</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CookieTracking on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CookieTracking 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>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_usertrack</td></tr>
+</table>
<p>When the user track module is compiled in, and
"CookieTracking on" is set, Apache will start sending a
user-tracking cookie for all new requests. This directive can
@@ -168,4 +222,10 @@
per-directory basis. By default, compiling mod_usertrack will
not activate cookies. </p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_vhost_alias.html.en b/docs/manual/mod/mod_vhost_alias.html.en
index 5161ffc..d408838 100644
--- a/docs/manual/mod/mod_vhost_alias.html.en
+++ b/docs/manual/mod/mod_vhost_alias.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_vhost_alias - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_vhost_alias</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Provides for dynamically configured mass virtual
-hosting</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>vhost_alias_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_vhost_alias.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mod_vhost_alias - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_vhost_alias</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Provides for dynamically configured mass virtual
+hosting</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>vhost_alias_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_vhost_alias.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This module creates dynamically configured virtual hosts, by
allowing the IP address and/or the <code>Host:</code> header of
the HTTP request to be used as part of the pathname to
@@ -29,12 +46,27 @@
VirtualScriptAlias /never/found/%0/cgi-bin/
</code></p></div>
</div>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#virtualdocumentroot">VirtualDocumentRoot</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#virtualdocumentroot">VirtualDocumentRoot</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#virtualdocumentrootip">VirtualDocumentRootIP</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#virtualscriptalias">VirtualScriptAlias</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#virtualscriptaliasip">VirtualScriptAliasIP</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#interpol">Directory Name Interpolation</a></li><li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li></ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code></li><li><a href="../vhosts/mass.html">Dynamically configured mass
- virtual hosting</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="interpol" id="interpol">Directory Name Interpolation</a></h2>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#interpol">Directory Name Interpolation</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#examples">Examples</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code></li>
+<li><a href="../vhosts/mass.html">Dynamically configured mass
+ virtual hosting</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="interpol" id="interpol">Directory Name Interpolation</a></h2>
<p>All the directives in this module interpolate a string into
@@ -95,7 +127,9 @@
<p>If <code>N</code> or <code>M</code> is greater than the number
of parts available a single underscore is interpolated. </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>
+</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>For simple name-based virtual hosts you might use the
@@ -182,14 +216,18 @@
<p>The <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code>
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>
+</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 will find your documents based on the
@@ -200,28 +238,38 @@
<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><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>
+
+</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>
+
+</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 will find CGI scripts in a similar
@@ -229,14 +277,19 @@
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>
+
+</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>
@@ -244,4 +297,10 @@
of the connection for directory interpolation instead of the server
name.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/module-dict.html.en b/docs/manual/mod/module-dict.html.en
index 586923e..1b938b0 100644
--- a/docs/manual/mod/module-dict.html.en
+++ b/docs/manual/mod/module-dict.html.en
@@ -4,13 +4,36 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Terms Used to Describe Modules - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Terms Used to Describe Modules</h1>
+ -->
+<title>Terms Used to Describe Modules - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Terms Used to Describe Modules</h1>
<p>This document describes the terms that are used to describe
each Apache <a href="./">module</a>.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">Description</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Status">Status</a></li><li><img alt="" src="../images/down.gif" /> <a href="#SourceFile">Source File</a></li><li><img alt="" src="../images/down.gif" /> <a href="#ModuleIdentifier">Module Identifier</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">Compatibility</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="Description" id="Description">Description</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">Description</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Status">Status</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#SourceFile">Source File</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ModuleIdentifier">Module Identifier</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">Compatibility</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="Description" id="Description">Description</a></h2>
<p>A brief description of the purpose of the 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="Status" id="Status">Status</a></h2>
+</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">Status</a></h2>
<p>This indicates how tightly bound into the Apache Web server
the module is; in other words, you may need to recompile the
@@ -53,22 +76,32 @@
status. We are not responsible for, nor do we support such
modules.</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="SourceFile" id="SourceFile">Source File</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="SourceFile" id="SourceFile">Source File</a></h2>
<p>This quite simply lists the name of the source file which
contains the code for the module. This is also the name used by
the <code class="directive"><a href="../mod/core.html#ifmodule"><IfModule></a></code>
directive.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="ModuleIdentifier" id="ModuleIdentifier">Module Identifier</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ModuleIdentifier" id="ModuleIdentifier">Module Identifier</a></h2>
<p>This is a string which identifies the module for use in the
<code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code> directive when
dynamically loading modules. In particular, it is the name of
the external variable of type module in the source file.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="Compatibility" id="Compatibility">Compatibility</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Compatibility" id="Compatibility">Compatibility</a></h2>
<p>If the module was not part of the original Apache version 2
distribution, the version in which it was introduced should be
listed here. In addition, if the module is limited to
particular platforms, the details will be listed here.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/module-dict.html.ja.jis b/docs/manual/mod/module-dict.html.ja.jis
index 7ca6979..5f0a621 100644
--- a/docs/manual/mod/module-dict.html.ja.jis
+++ b/docs/manual/mod/module-dict.html.ja.jis
@@ -4,19 +4,42 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache $B%b%8%e!<%k$N2r@b$G;HMQ$9$kMQ8l(B - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k$N2r@b$G;HMQ$9$kMQ8l(B</h1>
- <p>$B$3$NJ8=q$O(B Apache $B$N3F(B <a href="./">$B%b%8%e!<%k(B</a> $B$r@bL@$9$k$?(B$B$a$K(B
+ -->
+<title>Apache $B%b%8%e!<%k$N2r@b$G;HMQ$9$kMQ8l(B - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k$N2r@b$G;HMQ$9$kMQ8l(B</h1>
+ <p>$B$3$NJ8=q$O(B Apache $B$N3F(B <a href="./">$B%b%8%e!<%k(B</a> $B$r@bL@$9$k$?$a$K(B
$B;H$o$l$F$$$kMQ8l$r@bL@$7$^$9!#(B</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">$B@bL@(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Status">$B%9%F!<%?%9(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#SourceFile">$B%=!<%9%U%!%$%k(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B</a></li><li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">$B8_49@-(B</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="Description" id="Description">$B@bL@(B</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">$B@bL@(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Status">$B%9%F!<%?%9(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#SourceFile">$B%=!<%9%U%!%$%k(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">$B8_49@-(B</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="Description" id="Description">$B@bL@(B</a></h2>
-<p>$B%b%8%e(B$B!<%k$NL\E*$NC;$$@bL@!#(B</p>
-</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">$B%9%F!<%?%9(B</a></h2>
+<p>$B%b%8%e!<%k$NL\E*$NC;$$@bL@!#(B</p>
+</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">$B%9%F!<%?%9(B</a></h2>
- <p>$B$3$l$O!"$=$N%b(B$B%8%e!<%k$,(B Apache
+ <p>$B$3$l$O!"$=$N%b%8%e!<%k$,(B Apache
$B%&%'%V%5!<%P$K$I$l$/$i$$L)@\$KAH$_9~$^$l$F$$$k$+$r<($7$^$9!#(B
$B8@$$49$($l$P!"%b%8%e!<%k$rAH$_9~$_!"$=$N5!G=$rMxMQ$9$k$?$a$K!"(B
$B%5!<%P$r:F%3%s%Q%$%k$9$kI,MW$,$"$k$+$b$7$l$J$$$H$$$&$3$H$r<($7$^$9!#(B
- $B$3(B$B$NB0@-$,<h$jF@$kCM$O0J2<$N$b$N$G$9(B:</p>
+ $B$3$NB0@-$,<h$jF@$kCM$O0J2<$N$b$N$G$9(B:</p>
<dl>
<dt>MPM</dt>
@@ -51,26 +74,36 @@
<dd>$B%9%F!<%?%9$,(B "External" $B$N%b%8%e!<%k$O!"4pK\(B Apache
$BG[I[$KF1:-$5$l$^$;$s(B ("$B%5!<%I%Q!<%F%#!<%b%8%e!<%k(B")$B!#(B
$B$=$N$?$a!"2f!9$K@UG$$O$"$j$^$;$s$7!"(B
- $B$=(B$B$N%b%8%e!<%k$N%5%]!<%H$b$7$F$$$^$;$s!#(B</dd>
+ $B$=$N%b%8%e!<%k$N%5%]!<%H$b$7$F$$$^$;$s!#(B</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="SourceFile" id="SourceFile">$B%=!<%9%U%!%$%k(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="SourceFile" id="SourceFile">$B%=!<%9%U%!%$%k(B</a></h2>
<p>$B$3$l$OC1=c$K!"(B
$B$=$N%b%8%e!<%k$KI,MW$J%3!<%I$r4^$`%=!<%9%U%!%$%k$NL>A0$rNs5s$7$?$b$N$G$9!#(B
$B$3$l$O!"(B<code class="directive"><a href="../mod/core.html#ifmodule"><IfModule></a></code>
$B%G%#%l%/%F%#%V$G;HMQ$5$l$kL>A0$G$b$"$j$^$9!#(B
</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="ModuleIdentifier" id="ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ModuleIdentifier" id="ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B</a></h2>
<p>$B$3$NJ8;zNs$O!"%b%8%e!<%k$NF0E*FI$_9~$_$r9T$J$&$H$-$K;HMQ$9$k(B <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
$B%G%#%l%/%F%#%V$K$*$$$F;HMQ$5$l$k%b%8%e!<%k$N<1JL;R$G$9!#(B
$B>\$7$/=q$/$H!"%=!<%9%U%!%$%kFb$N(B module $B%?%$%W$N30ItJQ?t$NL>A0$G$9!#(B
</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="Compatibility" id="Compatibility">$B8_49@-(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Compatibility" id="Compatibility">$B8_49@-(B</a></h2>
<p>$B$"$k%b%8%e!<%k$,(B Apache $B%P!<%8%g%s(B 2
$B$NG[I[$K4^$^$l$F$$$J$+$C$?>l9g!"(B
$B$=$N%b%8%e!<%k$,F3F~$5$l$?%P!<%8%g%s$,$3$3$K=q$+$l$F$$$^$9!#(B
$B$^$?!"%b%8%e!<%k$,FCDj$N%W%i%C%H%U%)!<%`$K$N$_B8:_$9$k$H$-$b(B
$B>\:Y$O$3$3$K=q$+$l$F$$$^$9!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 674a814..ba6638a 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -4,10 +4,31 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mpm_common - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mpm_common</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>A collection of directives that are implemented by
-more than one multi-processing module (MPM)</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>MPM</td></tr></table></div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#coredumpdirectory">CoreDumpDirectory</a></li>
+ -->
+<title>mpm_common - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM Common Directives</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>A collection of directives that are implemented by
+more than one multi-processing module (MPM)</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>MPM</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#acceptmutex">AcceptMutex</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#bs2000account">BS2000Account</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#coredumpdirectory">CoreDumpDirectory</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#group">Group</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#listen">Listen</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#listenbacklog">ListenBackLog</a></li>
@@ -16,9 +37,7 @@
<li><img alt="" src="../images/down.gif" /> <a href="#maxmemfree">MaxMemFree</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#maxrequestsperchild">MaxRequestsPerChild</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#maxsparethreads">MaxSpareThreads</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#maxthreadsperchild">MaxThreadsPerChild</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#minsparethreads">MinSpareThreads</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#numservers">NumServers</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#pidfile">PidFile</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#scoreboardfile">ScoreBoardFile</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sendbuffersize">SendBufferSize</a></li>
@@ -28,15 +47,99 @@
<li><img alt="" src="../images/down.gif" /> <a href="#threadlimit">ThreadLimit</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#threadsperchild">ThreadsPerChild</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#user">User</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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Directory where Apache attempts to
-switch before dumping core</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>CoreDumpDirectory <var>directory</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>See usage for the default setting</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><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+</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="AcceptMutex" id="AcceptMutex">AcceptMutex</a> <a name="acceptmutex" id="acceptmutex">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Method that Apache uses to serialize multiple children
+accepting requests on network sockets</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AcceptMutex Default|<var>method</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AcceptMutex Default</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><code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+ <p>The <code class="directive">AcceptMutex</code> directives sets the
+ method that Apache uses to serialize multiple children accepting
+ requests on network sockets. Prior to Apache 2.0, the method was
+ selectable only at compile time. The optimal method to use is
+ highly architecture and platform dependent. For further details,
+ see the <a href="../misc/perf-tuning.html">performance tuning</a>
+ documentation.</p>
+
+ <p>If this directive is set to <code>Default</code>, then the
+ compile-time selected default will be used. Other possible
+ methods are listed below. Note that not all methods are
+ available on all platforms. If a method is specified which is
+ not available, a message will be written to the error log
+ listing the available methods.</p>
+
+ <dl>
+ <dt><code>flock</code></dt>
+ <dd>uses the <code>flock(2)</code> system call to lock the
+ file defined by the <code class="directive"><a href="#lockfile">LockFile</a></code> directive.</dd>
+
+ <dt><code>fcntl</code></dt>
+ <dd>uses the <code>fnctl(2)</code> system call to lock the
+ file defined by the <code class="directive"><a href="#lockfile">LockFile</a></code> directive.</dd>
+
+ <dt><code>posixsem</code></dt>
+ <dd>uses POSIX compatible semaphores to implement the mutex.</dd>
+
+ <dt><code>pthread</code></dt>
+ <dd>uses POSIX mutexes as implemented by the POSIX Threads
+ (PThreads) specification.</dd>
+
+ <dt><code>sysvsem</code></dt>
+ <dd>uses SySV-style semaphores to implement the mutex.</dd>
+ </dl>
+
+ <p>If you want to find out the compile time chosen default
+ for your system, you may set your <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> to <code>debug</code>. Then the default <code class="directive">AcceptMutex</code> will be written into the <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</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="BS2000Account" id="BS2000Account">BS2000Account</a> <a name="bs2000account" id="bs2000account">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define the non-privileged account on BS2000
+machines</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>BS2000Account <var>account</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>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td><code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Only available for BS2000 machines</td></tr>
+</table>
+ <p>The <code class="directive">BS2000Account</code> directive is available for
+ BS2000 hosts only. It must be used to define the account number for
+ the non-privileged apache server user (which was configured using the
+ <code class="directive"><a href="#user">User</a></code> directive). This is
+ required by the BS2000 POSIX subsystem (to change the underlying BS2000
+ task environment by performing a sub-LOGON) to prevent CGI scripts
+ from accessing resources of the privileged account which started the
+ server, usually <code>SYSROOT</code>.</p>
+
+ <div class="note"><h3>Note</h3>
+ <p>Only one <code>BS2000Account</code> directive can be used.</p>
+ </div>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../platform/ebcdic.html">Apache EBCDIC port</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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Directory where Apache attempts to
+switch before dumping core</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CoreDumpDirectory <var>directory</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>See usage for the default setting</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><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>This controls the directory to which Apache attempts to
switch before dumping core. The default is in the
<code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> directory, however
@@ -44,67 +147,89 @@
as, core dumps won't normally get written. If you want a core
dump for debugging, you can use this directive to place it in a
different location.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="Group" id="Group">Group</a> <a name="group" id="group">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Group under which the server will answer
-requests</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Group <var>unix-group</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Group #-1</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Group" id="Group">Group</a> <a name="group" id="group">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Group under which the server will answer
+requests</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Group <var>unix-group</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Group #-1</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><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Only valid in global server config since Apache
+2.0</td></tr>
+</table>
<p>The <code class="directive">Group</code> directive sets the group under
which the server will answer requests. In order to use this
- directive, the stand-alone server must be run initially as root.
- <var>Unix-group</var> is one of:</p>
+ directive, the server must be run initially as root. If you start the
+ server as a non-root user, it will fail to change to the specified
+ group, and will instead continue to run as the group of the original
+ user. <var>Unix-group</var> is one of:</p>
<dl>
<dt>A group name</dt>
-
<dd>Refers to the given group by name.</dd>
- <dt># followed by a group number.</dt>
-
+ <dt><code>#</code> followed by a group number.</dt>
<dd>Refers to a group by its number.</dd>
</dl>
+
+ <div class="example"><h3>Example</h3><p><code>
+ Group www-group
+ </code></p></div>
+
<p>It is recommended that you set up a new group specifically for
running the server. Some admins use user <code>nobody</code>,
but this is not always possible or desirable.</p>
- <div class="example"><p><code>Group www-group</code></p></div>
+ <div class="warning"><h3>Security</h3>
+ <p>Don't set <code class="directive">Group</code> (or <code class="directive"><a href="#user">User</a></code>) to <code>root</code> unless
+ you know exactly what you are doing, and what the dangers are.</p>
+ </div>
- <p>Note: if you start the server as a non-root user, it will
- fail to change to the specified group, and will instead
- continue to run as the group of the original user.</p>
+ <p>Special note: Use of this directive in <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> is no longer supported. To
+ configure your server for <a href="mod_suexec.html">suexec</a> use
+ <code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code>.</p>
- <p>Special note: Use of this directive in <VirtualHost> is
- no longer supported. To implement the <a href="../suexec.html">suEXEC wrapper</a> with Apache 2.0, use the
- <code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code>
- directive. SECURITY: See <code class="directive"><a href="#user">User</a></code> for a discussion of the
- security considerations.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="Listen" id="Listen">Listen</a> <a name="listen" id="listen">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>IP addresses and ports that the server
-listens to</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Listen [<var>IP-address</var>:]<var>portnumber</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+ <div class="note"><h3>Note</h3>
+ <p>Although the <code class="directive">Group</code> directive is present
+ in the <code class="module"><a href="../mod/beos.html">beos</a></code> and <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> MPMs,
+ it is actually a no-op there and only exists for compatibility
+ reasons.</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="Listen" id="Listen">Listen</a> <a name="listen" id="listen">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>IP addresses and ports that the server
+listens to</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Listen [<var>IP-address</var>:]<var>portnumber</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>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Required directive since Apache 2.0</td></tr>
+</table>
<p>The <code class="directive">Listen</code> directive instructs Apache to
listen to only specific IP addresses or ports; by default it
- responds to requests on all IP interfaces. The Listen directive is
- now a required directive. If it is not in the config file, the
+ responds to requests on all IP interfaces. <code class="directive">Listen</code>
+ is now a required directive. If it is not in the config file, the
server will fail to start. This is a change from previous versions
of Apache.</p>
- <p>The Listen directive tells the server to accept incoming
- requests on the specified port or address-and-port combination.
- If only a port number is specified, the server listens to the
- given port on all interfaces. If an IP address is given as well
+ <p>The <code class="directive">Listen</code> directive tells the server to
+ accept incoming requests on the specified port or address-and-port
+ combination. If only a port number is specified, the server listens to
+ the given port on all interfaces. If an IP address is given as well
as a port, the server will listen on the given port and
interface.</p>
- <p>Multiple Listen directives may be used to specify a number
- of addresses and ports to listen to. The server will respond to
- requests from any of the listed addresses and ports.</p>
+ <p>Multiple <code class="directive">Listen</code> directives may be used to
+ specify a number of addresses and ports to listen to. The server will
+ respond to requests from any of the listed addresses and ports.</p>
<p>For example, to make the server accept connections on both
port 80 and port 8000, use:</p>
@@ -128,14 +253,24 @@
<div class="example"><p><code>
Listen [fe80::a00:20ff:fea7:ccea]:80
</code></p></div>
-<h3>See also</h3><ul><li><a href="../dns-caveats.html">DNS Issues</a></li><li><a href="../bind.html">Setting
- which addresses and ports Apache uses</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="ListenBackLog" id="ListenBackLog">ListenBackLog</a> <a name="listenbacklog" id="listenbacklog">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maximum length of the queue of pending connections</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ListenBacklog <var>backlog</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ListenBacklog 511</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><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../dns-caveats.html">DNS Issues</a></li>
+<li><a href="../bind.html">Setting which addresses and ports Apache
+uses</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="ListenBackLog" id="ListenBackLog">ListenBackLog</a> <a name="listenbacklog" id="listenbacklog">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum length of the queue of pending connections</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ListenBacklog <var>backlog</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ListenBacklog 511</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><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>The maximum length of the queue of pending connections.
Generally no tuning is needed or desired, however on some
systems it is desirable to increase this when under a TCP SYN
@@ -147,36 +282,51 @@
many OSes do not use exactly what is specified as the backlog,
but use a number based on (but normally larger than) what is
set.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="LockFile" id="LockFile">LockFile</a> <a name="lockfile" id="lockfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Location of the accept serialization lock file</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>LockFile <var>filename</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>LockFile logs/accept.lock</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><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LockFile" id="LockFile">LockFile</a> <a name="lockfile" id="lockfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location of the accept serialization lock file</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LockFile <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LockFile logs/accept.lock</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><code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>The <code class="directive">LockFile</code> directive sets the path to
- the lockfile used when Apache is compiled with either
- USE_FCNTL_SERIALIZED_ACCEPT or USE_FLOCK_SERIALIZED_ACCEPT. This
- directive should normally be left at its default value. The main
- reason for changing it is if the <code>logs</code> directory is
- NFS mounted, since <strong>the lockfile must be stored on a local
- disk</strong>. The PID of the main server process is
- automatically appended to the filename.</p>
+ the lockfile used when Apache is used with an <code class="directive"><a href="#acceptmutex">AcceptMutex</a></code> value of either
+ <code>fcntl</code> or <code>flock</code>. This directive should
+ normally be left at its default value. The main reason for changing
+ it is if the <code>logs</code> directory is NFS mounted, since
+ <strong>the lockfile must be stored on a local disk</strong>. The PID
+ of the main server process is automatically appended to the
+ filename.</p>
<div class="warning"><h3>Security:</h3>
- <p>It is best to avoid putting this file in a world writable directory
- such as <code>/var/tmp</code> because someone could create a denial of
- service attack and prevent the server from starting by creating
- a lockfile with the same name as the one the server will try to
- create.</p>
+ <p>It is best to <em>avoid</em> putting this file in a world writable
+ directory such as <code>/var/tmp</code> because someone could create
+ a denial of service attack and prevent the server from starting by
+ creating a lockfile with the same name as the one the server will try
+ to create.</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="MaxClients" id="MaxClients">MaxClients</a> <a name="maxclients" id="maxclients">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maximum number of child processes that will be created
-to serve requests</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MaxClients <var>number</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#acceptmutex">AcceptMutex</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="MaxClients" id="MaxClients">MaxClients</a> <a name="maxclients" id="maxclients">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum number of child processes that will be created
+to serve requests</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MaxClients <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>See usage for details</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><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>The <code class="directive">MaxClients</code> directive sets the limit
on the number of simultaneous requests that will be served. Any
connection attempts over the <code class="directive">MaxClients</code>
@@ -185,45 +335,60 @@
directive. Once a child process is freed at the end of a different
request, the connection will then be serviced.</p>
- <p>For non-threaded servers (i.e., <code class="module"><a href="../mod/prefork.html">prefork</a></code>),
+ <p>For non-threaded servers (<em>i.e.</em>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>),
<code class="directive">MaxClients</code> translates into the maximum
number of child processes that will be launched to serve requests.
The default value is 256; to increase it, you must also raise
<code class="directive"><a href="#serverlimit">ServerLimit</a></code>.</p>
- <p>For threaded servers (i.e., <code class="module"><a href="../mod/worker.html">worker</a></code>),
- <code class="directive">MaxClients</code> restricts the total
- number of threads that will be available to serve clients.
- The default value is 16 multiplied by the value of
- <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>.
- To increase <code class="directive">MaxClients</code> to a value
- that requires more than 16 processes, you must also
- raise <code class="directive"><a href="#serverlimit">ServerLimit</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="MaxMemFree" id="MaxMemFree">MaxMemFree</a> <a name="maxmemfree" id="maxmemfree">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maximum amount of memory that the main allocator is allowed
-to hold without calling free()</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MaxMemFree <var>number</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code></td></tr></table>
+ <p>For threaded and hybrid servers (<em>e.g.</em> <code class="module"><a href="../mod/beos.html">beos</a></code>
+ or <code class="module"><a href="../mod/worker.html">worker</a></code>) <code class="directive">MaxClients</code> restricts
+ the total number of threads that will be available to serve clients.
+ The default value for <code class="module"><a href="../mod/beos.html">beos</a></code> is <code>50</code>. For
+ hybrid MPMs the default value is <code>16</code> (<code class="directive"><a href="#serverlimit">ServerLimit</a></code>) multiplied by the value of
+ <code>25</code> (<code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>). Therefore, to increase <code class="directive">MaxClients</code> to a value that requires more than 16 processes,
+ you must also raise <code class="directive"><a href="#serverlimit">ServerLimit</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="MaxMemFree" id="MaxMemFree">MaxMemFree</a> <a name="maxmemfree" id="maxmemfree">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum amount of memory that the main allocator is allowed
+to hold without calling free()</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MaxMemFree <var>KBytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MaxMemFree 0</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><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>The <code class="directive">MaxMemFree</code> directive sets the
maximum number of free Kbytes that the main allocator is allowed
- to hold without calling free(). When not set, or when set to
- zero, the threshold will be set to unlimited.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="MaxRequestsPerChild" id="MaxRequestsPerChild">MaxRequestsPerChild</a> <a name="maxrequestsperchild" id="maxrequestsperchild">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Limit on the number of requests that an individual child server
-will handle during its life</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MaxRequestsPerChild <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MaxRequestsPerChild 10000</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><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+ to hold without calling <code>free()</code>. When not set, or when set
+ to zero, the threshold will be set to unlimited.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxRequestsPerChild" id="MaxRequestsPerChild">MaxRequestsPerChild</a> <a name="maxrequestsperchild" id="maxrequestsperchild">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limit on the number of requests that an individual child server
+will handle during its life</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MaxRequestsPerChild <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MaxRequestsPerChild 10000</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><code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>The <code class="directive">MaxRequestsPerChild</code> directive sets
the limit on the number of requests that an individual child
server process will handle. After
<code class="directive">MaxRequestsPerChild</code> requests, the child
process will die. If <code class="directive">MaxRequestsPerChild</code> is
- 0, then the process will never expire.</p>
+ <code>0</code>, then the process will never expire.</p>
+
+ <div class="note"><h3>Different default values:</h3>
+ <p>The default value for <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> and
+ <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> is <code>0</code>.</p>
+ </div>
<p>Setting <code class="directive">MaxRequestsPerChild</code> to a
non-zero limit has two beneficial effects:</p>
@@ -237,55 +402,80 @@
</ul>
<div class="note"><h3>Note:</h3>
- <p>For <em>KeepAlive</em> requests, only the first request is counted
- towards this limit. In effect, it changes the behavior to limit the
- number of <em>connections</em> per child.</p>
+ <p>For <code class="directive"><a href="../mod/core.html#keepalive">KeepAlive</a></code> requests, only
+ the first request is counted towards this limit. In effect, it
+ changes the behavior to limit the number of <em>connections</em> per
+ child.</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="MaxSpareThreads" id="MaxSpareThreads">MaxSpareThreads</a> <a name="maxsparethreads" id="maxsparethreads">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maximum number of idle threads</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MaxSpareThreads <var>number</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxSpareThreads" id="MaxSpareThreads">MaxSpareThreads</a> <a name="maxsparethreads" id="maxsparethreads">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum number of idle threads</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MaxSpareThreads <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>See usage for details</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><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>Maximum number of idle threads. Different MPMs deal with this
directive differently.</p>
<p>For <code class="module"><a href="../mod/perchild.html">perchild</a></code> the default is
- <code>MaxSpareThreads 10</code>. This MPM monitors the number of
+ <code>MaxSpareThreads 10</code>. This MPM monitors the number of
idle threads on a per-child basis. If there are too many idle
threads in that child, the server will begin to kill threads
within that child.</p>
- <p>For <code class="module"><a href="../mod/worker.html">worker</a></code> the default is
- <code>MaxSpareThreads 500</code>. This MPM deals with idle threads
- on a server-wide basis. If there are too many idle threads in the
- server then child processes are killed until the number of idle
- threads is less than this number.</p>
+ <p>For <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code> and <code class="module"><a href="../mod/threadpool.html">threadpool</a></code> the default is <code>MaxSpareThreads 250</code>.
+ These MPMs deal with idle threads on a server-wide basis. If there
+ are too many idle threads in the server then child processes are
+ killed until the number of idle threads is less than this number.</p>
<p>For <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> the default is
- <code>MaxSpareThreads 100</code>. Since this MPM runs a
+ <code>MaxSpareThreads 100</code>. Since this MPM runs a
single-process, the spare thread count is also server-wide.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code></li><li><code class="directive"><a href="#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="directive-section"><h2><a name="MaxThreadsPerChild" id="MaxThreadsPerChild">MaxThreadsPerChild</a> <a name="maxthreadsperchild" id="maxthreadsperchild">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Maximum number of threads per child process</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MaxThreadsPerChild <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MaxThreadsPerChild 64</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><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code></td></tr></table>
- <p>Maximum number of threads per child. For MPMs with a
- variable number of threads per child, this directive sets the
- maximum number of threads that will be created in each child
- process. To increase this value beyond its default, it is
- necessary to change the value of the compile-time define
- <code>HARD_THREAD_LIMIT</code> and recompile 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="MinSpareThreads" id="MinSpareThreads">MinSpareThreads</a> <a name="minsparethreads" id="minsparethreads">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Minimum number of idle threads available to handle request
-spikes</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MinSpareThreads <var>number</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr></table>
+ <p><code class="module"><a href="../mod/beos.html">beos</a></code> and <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> work
+ similar to <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>. The default for
+ <code class="module"><a href="../mod/beos.html">beos</a></code> is <code>MaxSpareThreads 50</code>. For
+ <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> the default value is <code>10</code>.</p>
+
+ <div class="note"><h3>Restrictions</h3>
+ <p>The range of the <code class="directive">MaxSpareThreads</code> value
+ is restricted. Apache will correct the given value automatically
+ according to the following rules:</p>
+ <ul>
+ <li><code class="module"><a href="../mod/perchild.html">perchild</a></code> requires <code class="directive">MaxSpareThreads</code> to be less or equal than <code class="directive"><a href="#threadlimit">ThreadLimit</a></code>.</li>
+
+ <li><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> wants the value to be greater than
+ <code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code>.</li>
+
+ <li>For <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code> and
+ <code class="module"><a href="../mod/worker.html">worker</a></code> the value must be greater or equal than
+ the sum of <code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code>
+ and <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>.</li>
+ </ul>
+ </div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code></li>
+<li><code class="directive"><a href="#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="directive-section"><h2><a name="MinSpareThreads" id="MinSpareThreads">MinSpareThreads</a> <a name="minsparethreads" id="minsparethreads">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Minimum number of idle threads available to handle request
+spikes</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MinSpareThreads <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>See usage for details</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><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>Minimum number of idle threads to handle request spikes.
Different MPMs deal with this directive
differently.</p>
@@ -294,10 +484,12 @@
<code>MinSpareThreads 5</code> and monitors the number of idle
threads on a per-child basis. If there aren't enough idle threads
in that child, the server will begin to create new threads within
- that child.</p>
+ that child. Thus, if you set <code class="directive"><a href="../mod/perchild.html#numservers">NumServers</a></code> to <code>10</code> and a <code class="directive">MinSpareThreads</code> value of <code>5</code>, you'll have
+ at least 50 idle threads on your system.</p>
- <p><code class="module"><a href="../mod/worker.html">worker</a></code> uses a default of <code>MinSpareThreads
- 250</code> and deals with idle threads on a server-wide basis. If
+ <p><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code> and
+ <code class="module"><a href="../mod/threadpool.html">threadpool</a></code> use a default of <code>MinSpareThreads
+ 75</code> and deal with idle threads on a server-wide basis. If
there aren't enough idle threads in the server then child
processes are created until the number of idle threads is greater
than number.</p>
@@ -306,50 +498,63 @@
<code>MinSpareThreads 10</code> and, since it is a single-process
MPM, tracks this on a server-wide bases.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#maxsparethreads">MaxSpareThreads</a></code></li><li><code class="directive"><a href="#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="directive-section"><h2><a name="NumServers" id="NumServers">NumServers</a> <a name="numservers" id="numservers">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Total number of children alive at the same time</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>NumServers <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>NumServers 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><code class="module"><a href="../mod/perchild.html">perchild</a></code></td></tr></table>
- <p>Number of children alive at the same time. MPMs that use
- this directive do not dynamically create new child processes so
- this number should be large enough to handle the requests for
- the entire site.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="PidFile" id="PidFile">PidFile</a> <a name="pidfile" id="pidfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>File where the server records the process ID
-of the daemon</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>PidFile <var>filename</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>PidFile logs/httpd.pid</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><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+ <p><code class="module"><a href="../mod/beos.html">beos</a></code> and <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> work
+ similar to <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>. The default for
+ <code class="module"><a href="../mod/beos.html">beos</a></code> is <code>MinSpareThreads 1</code>. For
+ <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> the default value is <code>5</code>.</p>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#maxsparethreads">MaxSpareThreads</a></code></li>
+<li><code class="directive"><a href="#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="directive-section"><h2><a name="PidFile" id="PidFile">PidFile</a> <a name="pidfile" id="pidfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File where the server records the process ID
+of the daemon</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>PidFile <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>PidFile logs/httpd.pid</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><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>The <code class="directive">PidFile</code> directive sets the file to
which the server records the process id of the daemon. If the
- filename does not begin with a slash (/) then it is assumed to be
- relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</p>
+ filename is not absolute then it is assumed to be relative to the
+ <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</p>
<div class="example"><h3>Example</h3><p><code>
PidFile /var/run/apache.pid
</code></p></div>
<p>It is often useful to be able to send the server a signal,
- so that it closes and then reopens its <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code> and TransferLog, and
+ so that it closes and then re-opens its <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code> and <code class="directive"><a href="../mod/mod_log_config.html#transferlog">TransferLog</a></code>, and
re-reads its configuration files. This is done by sending a
SIGHUP (kill -1) signal to the process id listed in the
- PidFile.</p>
+ <code class="directive">PidFile</code>.</p>
<p>The PidFile is subject to the same warnings about log file
placement and <a href="../misc/security_tips.html#serverroot">security</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="ScoreBoardFile" id="ScoreBoardFile">ScoreBoardFile</a> <a name="scoreboardfile" id="scoreboardfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Location of the file used to store coordination data for
-the child processes</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ScoreBoardFile <var>file-path</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ScoreBoardFile logs/apache_status</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><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
+
+ <div class="note"><h3>Note</h3>
+ As of Apache 2 it is recommended to use only the <a href="../programs/apachectl.html">apachectl</a> script for
+ (re-)starting or stopping the server.
+ </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="ScoreBoardFile" id="ScoreBoardFile">ScoreBoardFile</a> <a name="scoreboardfile" id="scoreboardfile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location of the file used to store coordination data for
+the child processes</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ScoreBoardFile <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ScoreBoardFile logs/apache_status</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><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>Apache uses a scoreboard to communicate between its parent
and child processes. Some architectures require a file to facilitate
this communication. If the file is left unspecified, Apache first
@@ -369,23 +574,42 @@
you may see improved speed by placing it on a RAM disk. But be
careful that you heed the same warnings about log file placement
and <a href="../misc/security_tips.html">security</a>.</p>
-<h3>See also</h3><ul><li><a href="../stopping.html">Stopping and Restarting Apache</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="SendBufferSize" id="SendBufferSize">SendBufferSize</a> <a name="sendbuffersize" id="sendbuffersize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>TCP buffer size</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>SendBufferSize <var>bytes</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../stopping.html">Stopping and Restarting
+Apache</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="SendBufferSize" id="SendBufferSize">SendBufferSize</a> <a name="sendbuffersize" id="sendbuffersize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>TCP buffer size</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SendBufferSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SendBufferSize 0</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><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>The server will set the TCP buffer size to the number of bytes
specified. Very useful to increase past standard OS defaults on
high speed high latency (<em>i.e.</em>, 100ms or so, such as
transcontinental fast pipes).</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ServerLimit" id="ServerLimit">ServerLimit</a> <a name="serverlimit" id="serverlimit">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Upper limit on configurable number of processes</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ServerLimit <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ServerLimit 256 (prefork), ServerLimit 16 (worker)</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><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
+
+ <p>If set to the value of <code>0</code>, the server will use the
+ OS deault.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerLimit" id="ServerLimit">ServerLimit</a> <a name="serverlimit" id="serverlimit">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Upper limit on configurable number of processes</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ServerLimit <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>See usage for details</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><code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>For the <code class="module"><a href="../mod/prefork.html">prefork</a></code> MPM, this directive sets the
maximum configured value for <code class="directive"><a href="#maxclients">MaxClients</a></code> for the lifetime of the
Apache process. For the worker MPM, this directive in combination
@@ -403,33 +627,64 @@
system may become unstable.</p>
<p>With the <code class="module"><a href="../mod/prefork.html">prefork</a></code> MPM, use this directive only
- if you need to set <code class="directive"><a href="#maxclients">MaxClients</a></code> higher than 256.
+ if you need to set <code class="directive"><a href="#maxclients">MaxClients</a></code> higher than 256 (default).
Do not set the value of this directive any higher than what you
might want to set <code class="directive"><a href="#maxclients">MaxClients</a></code> to.</p>
- <p>With the <code class="module"><a href="../mod/worker.html">worker</a></code> MPM, use this directive only
+ <p>With <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/leader.html">leader</a></code> and
+ <code class="module"><a href="../mod/threadpool.html">threadpool</a></code> use this directive only
if your <code class="directive"><a href="#maxclients">MaxClients</a></code> and
<code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
- settings require more than 16 server processes. Do not set the
- value of this directive any higher than the number of server
+ settings require more than 16 server processes (default). Do not set
+ the value of this directive any higher than the number of server
processes required by what you may want for <code class="directive"><a href="#maxclients ">MaxClients </a></code> and <code class="directive"><a href="#threadsperchild">ThreadsPerChild</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="StartServers" id="StartServers">StartServers</a> <a name="startservers" id="startservers">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Number of child server processes created at startup</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>StartServers <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>StartServers 5</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><code class="module"><a href="../mod/worker.html">worker</a></code></td></tr></table>
+
+ <p>With the <code class="module"><a href="../mod/perchild.html">perchild</a></code> MPM, use this directive only
+ if you need to set <code class="directive"><a href="../mod/perchild.html#numservers">NumServers</a></code> higher than 8 (default).</p>
+
+ <div class="note"><h3>Note</h3>
+ <p>There is a hard limit of <code>ServerLimit 20000</code> compiled
+ into the server. This is intended to avoid nasty effects caused by
+ typos.</p>
+ </div>
+
+<h3>See also</h3>
+<ul>
+<li><a href="../stopping.html">Stopping and Restarting Apache</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="StartServers" id="StartServers">StartServers</a> <a name="startservers" id="startservers">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Number of child server processes created at startup</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>StartServers <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>See usage for details</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><code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>The <code class="directive">StartServers</code> directive sets the
number of child server processes created on startup. As the number
of processes is dynamically controlled depending on the load,
there is usually little reason to adjust this parameter.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code></li><li><code class="directive"><a href="#maxsparethreads">MaxSpareThreads</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="StartThreads" id="StartThreads">StartThreads</a> <a name="startthreads" id="startthreads">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Nubmer of threads created on startup</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>StartThreads <var>number</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code></td></tr></table>
+
+ <p>The default value differs from MPM to MPM. For
+ <code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code> and
+ <code class="module"><a href="../mod/worker.html">worker</a></code> the default is <code>StartServers 3</code>.
+ For <code class="module"><a href="../mod/prefork.html">prefork</a></code> defaults to <code>5</code> and for
+ <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> to <code>2</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="StartThreads" id="StartThreads">StartThreads</a> <a name="startthreads" id="startthreads">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Number of threads created on startup</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>StartThreads <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>See usage for details</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><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code></td></tr>
+</table>
<p>Number of threads created on startup. As the
number of threads is dynamically controlled depending on the
load, there is usually little reason to adjust this
@@ -444,13 +699,24 @@
process, this is the total number of threads created at startup to
serve 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="ThreadLimit" id="ThreadLimit">ThreadLimit</a> <a name="threadlimit" id="threadlimit">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the upper limit on the configurable number of threads
-per child process</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ThreadLimit <var>number</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr></table>
+ <p>For <code class="module"><a href="../mod/beos.html">beos</a></code> the default is <code>StartThreads
+ 10</code>. It also reflects the total number of threads created
+ at startup to serve 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="ThreadLimit" id="ThreadLimit">ThreadLimit</a> <a name="threadlimit" id="threadlimit">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the upper limit on the configurable number of threads
+per child process</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ThreadLimit <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>See usage for details</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><code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available for <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> in Apache 2.0.41
+and later</td></tr>
+</table>
<p>This directive sets the maximum configured value for <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> for the lifetime
of the Apache process. Any attempts to change this directive
during a restart will be ignored, but <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> can be modified
@@ -467,72 +733,105 @@
current run of Apache.</p>
<p>The default value for <code class="directive">ThreadLimit</code> is
- 64 when used with <code class="module"><a href="../mod/worker.html">worker</a></code> and 1920 when used
- with <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>.</p>
+ <code>1920</code> when used with <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> and
+ <code>64</code> when used with the others.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ThreadsPerChild" id="ThreadsPerChild">ThreadsPerChild</a> <a name="threadsperchild" id="threadsperchild">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Number of threads created by each child process</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ThreadsPerChild <var>number</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+ <div class="note"><h3>Note</h3>
+ <p>There is a hard limit of <code>ThreadLimit 20000</code> (or
+ <code>ThreadLimit 15000</code> with <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>)
+ compiled into the server. This is intended to avoid nasty effects
+ caused by typos.</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="ThreadsPerChild" id="ThreadsPerChild">ThreadsPerChild</a> <a name="threadsperchild" id="threadsperchild">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Number of threads created by each child process</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ThreadsPerChild <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>See usage for details</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><code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>This directive sets the number of threads created by each
child process. The child creates these threads at startup and
- never creates more. If using an MPM like mpmt_winnt, where
- there is only one child process, this number should be high
+ never creates more. If using an MPM like <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>,
+ where there is only one child process, this number should be high
enough to handle the entire load of the server. If using an MPM
- like worker, where there are multiple child processes, the
- total number of threads should be high enough to handle the
- common load on the server.</p>
+ like <code class="module"><a href="../mod/worker.html">worker</a></code>, where there are multiple child processes,
+ the <em>total</em> number of threads should be high enough to handle
+ the common load on the server.</p>
- <p>The default value for this directive is 25 when used with
- <code class="module"><a href="../mod/worker.html">worker</a></code> and 64 when used with
- <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>.</p>
+ <p>The default value for <code class="directive">ThreadsPerChild</code> is
+ <code>64</code> when used with <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> and
+ <code>25</code> when used with the others.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="User" id="User">User</a> <a name="user" id="user">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>The userid under which the server will answer
-requests</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>User <var>unix-userid</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>User #-1</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
- <p>The <code class="directive">User</code> directive sets the userid as
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="User" id="User">User</a> <a name="user" id="user">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The userid under which the server will answer
+requests</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>User <var>unix-userid</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>User #-1</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><code class="module"><a href="../mod/leader.html">leader</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/threadpool.html">threadpool</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Only valid in global server config since Apache
+2.0</td></tr>
+</table>
+ <p>The <code class="directive">User</code> directive sets the user ID as
which the server will answer requests. In order to use this
- directive, the standalone server must be run initially as
- root. <var>Unix-userid</var> is one of:</p>
+ directive, the server must be run initially as <code>root</code>.
+ If you start the server as a non-root user, it will fail to change
+ to the lesser privileged user, and will instead continue to run as
+ that original user. If you do start the server as <code>root</code>,
+ then it is normal for the parent process to remain running as root.
+ <var>Unix-userid</var> is one of:</p>
<dl>
<dt>A username</dt>
-
<dd>Refers to the given user by name.</dd>
<dt># followed by a user number.</dt>
-
- <dd>Refers to a user by their number.</dd>
+ <dd>Refers to a user by its number.</dd>
</dl>
<p>The user should have no privileges that result in it being
able to access files that are not intended to be visible to the
outside world, and similarly, the user should not be able to
- execute code that is not meant for httpd requests. It is
+ execute code that is not meant for HTTP requests. It is
recommended that you set up a new user and group specifically for
running the server. Some admins use user <code>nobody</code>, but
this is not always desirable, since the <code>nobody</code> user
can have other uses on the system.</p>
- <p>Notes: If you start the server as a non-root user, it will
- fail to change to the lesser privileged user, and will instead
- continue to run as that original user. If you do start the
- server as root, then it is normal for the parent process to
- remain running as root.</p>
+ <div class="warning"><h3>Security</h3>
+ <p>Don't set <code class="directive">User</code> (or <code class="directive"><a href="#group">Group</a></code>) to <code>root</code> unless
+ you know exactly what you are doing, and what the dangers are.</p>
+ </div>
+
+ <p>With the <code class="module"><a href="../mod/perchild.html">perchild</a></code> MPM, which is intended to
+ server virtual hosts run under different user IDs, the
+ <code class="directive">User</code> directive defines the user ID for the
+ main server and the fallback for <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> sections without an
+ <code class="directive"><a href="../mod/perchild.html#assignuserid">AssignUserID</a></code> directive.</p>
<p>Special note: Use of this directive in <code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code> is no longer supported. To
- configure your server for <a href="mod_suexec.html">suexec</a> use
+ configure your server for <a href="../suexec.html">suexec</a> use
<code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code>.</p>
-<div class="note"><h3>Security</h3> <p>Don't set <code class="directive">User</code>
-(or <code class="directive"><a href="#group">Group</a></code>) to
-<code>root</code> unless you know exactly what you are doing, and what
-the dangers are.</p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ <div class="note"><h3>Note</h3>
+ <p>Although the <code class="directive">User</code> directive is present
+ in the <code class="module"><a href="../mod/beos.html">beos</a></code> and <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> MPMs,
+ it is actually a no-op there and only exists for compatibility
+ reasons.</p>
+ </div>
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_common.html.ja.jis b/docs/manual/mod/mpm_common.html.ja.jis
index 87e550f..b7889c0 100644
--- a/docs/manual/mod/mpm_common.html.ja.jis
+++ b/docs/manual/mod/mpm_common.html.ja.jis
@@ -4,10 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mpm_common - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mpm_common</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$BFs$D0J>e$N%^%k%A%W%m%;%C%7%s%0%b%8%e(B$B!<%k(B (MPM)
-$B$G<BAu$5$l$F$$$k%G%#%l%/%F%#%V$N%3%l%/%7%g%s(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr></table></div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#coredumpdirectory">CoreDumpDirectory</a></li>
+ -->
+<title>mpm_common - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mpm_common</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$BFs$D0J>e$N%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)
+$B$G<BAu$5$l$F$$$k%G%#%l%/%F%#%V$N%3%l%/%7%g%s(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#coredumpdirectory">CoreDumpDirectory</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#group">Group</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#listen">Listen</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#listenbacklog">ListenBackLog</a></li>
@@ -28,28 +47,39 @@
<li><img alt="" src="../images/down.gif" /> <a href="#threadlimit">ThreadLimit</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#threadsperchild">ThreadsPerChild</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#user">User</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">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>Apache $B$,(B$B%3%"%@%s%W$9$kA0$K0\F0$r;n$_$k%G%#%l%/%H%j(B
-</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>CoreDumpDirectory <var>directory</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>$B%G%U%)%k%H$N@_Dj$O@bL@J8$rFI$s$G$/$@$5$$(B</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+</ul>
+</div>
- <p>Apache $B$,%3%"%@%s%W$9$kA0$K0\F0$r;n$_$k%G%#%l%/%H%j$r@)8f$7$^(B$B$9!#(B
+<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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>Apache $B$,%3%"%@%s%W$9$kA0$K0\F0$r;n$_$k%G%#%l%/%H%j(B
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>CoreDumpDirectory <var>directory</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>$B%G%U%)%k%H$N@_Dj$O@bL@J8$rFI$s$G$/$@$5$$(B</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
+</table>
+
+ <p>Apache $B$,%3%"%@%s%W$9$kA0$K0\F0$r;n$_$k%G%#%l%/%H%j$r@)8f$7$^$9!#(B
$B%G%U%)%k%HCM$O(B <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
$B%G%#%l%/%H%j$G$9$,!"$3$N%G%#%l%/%H%j$O%5!<%P$N<B9T$5$l$F$$$k%f!<%68"8B$G(B
$B=q$-9~$_2DG=$G$"$k$Y$-$G$O$J$$$N$G!"DL>o$O%3%"%@%s%W$O=q$-9~$^$l$^$;$s!#(B
- $B%G%P%C%0$N$?$a$K%3%"%@%s%W$,I,MW(B$B$G$"$l$P!"(B
+ $B%G%P%C%0$N$?$a$K%3%"%@%s%W$,I,MW$G$"$l$P!"(B
$B$3$N%G%#%l%/%F%#%V$r;H$C$FB>$N0LCV$K%3%"%@%s%W$r=q$-=P$9$h$&$K$G$-$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="Group" id="Group">Group</a> <a name="group" id="group">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%j%/%(%9%H$K1~Ez$9$k:]$K=jB0$9$k%0%k!<%W(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>Group <var>unix-group</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>Group #-1</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Group" id="Group">Group</a> <a name="group" id="group">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%j%/%(%9%H$K1~Ez$9$k:]$K=jB0$9$k%0%k!<%W(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>Group <var>unix-group</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>Group #-1</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr>
+</table>
<p><code class="directive">Group</code> $B%G%#%l%/%F%#%V$G!"(B
$B%j%/%(%9%H$K1~Ez$9$k:]$K=jB0$7$F$*$/%0%k!<%W$r@_Dj$7$^$9!#(B
$B$3$N%G%#%l%/%F%#%V$r;HMQ$9$k$?$a$K$O!"%9%?%s%I%"%m%s7?$N(B
@@ -83,18 +113,23 @@
$B%;%-%e%j%F%#(B: $B%;%-%e%j%F%#>e$NCm0UE@$K4X$7$F$O!"(B
<code class="directive"><a href="#user">User</a></code>
$B$r$4Mw2<$5$$!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="Listen" id="Listen">Listen</a> <a name="listen" id="listen">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%5!<%P$,(B listen $B$9$k(BIP $B%"%I%l%9$H%]!<%HHV9f(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>Listen [<var>IP-address</var>:]<var>portnumber</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Listen" id="Listen">Listen</a> <a name="listen" id="listen">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%5!<%P$,(B listen $B$9$k(BIP $B%"%I%l%9$H%]!<%HHV9f(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>Listen [<var>IP-address</var>:]<var>portnumber</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
+</table>
<p><code class="directive">Listen</code> $B%G%#%l%/%F%#%V$O(B Apache
$B$,FCDj$N(B IP $B%"%I%l%9$d%]!<%HHV9f$@$1$r(B listen $B$9$k$h$&$K;XDj$7$^$9!#(B
$B%G%U%)%k%H$G$OA4$F$N(B IP $B%$%s%?!<%U%'!<%9$N%j%/%(%9%H$K1~Ez$7$^$9!#(B
Listen $B%G%#%l%/%F%#%V$O8=:_$G$OI,?\$N%G%#%l%/%F%#%V$H$J$j$^$7$?!#(B
$B$b$7@_Dj%U%!%$%k$K$J$1$l$P!"%5!<%P$O5/F0$K<:GT$7$^$9!#(B
- $B$3$l$O0JA0$N%P!<%8%g%s(B$B$N(B Apache $B$+$iJQ99$N$"$C$?ItJ,$G$9!#(B</p>
+ $B$3$l$O0JA0$N%P!<%8%g%s$N(B Apache $B$+$iJQ99$N$"$C$?ItJ,$G$9!#(B</p>
<p>Listen $B%G%#%l%/%F%#%V$G$O!"FCDj$N%]!<%H$"$k$$$O(B
$B%"%I%l%9$H%]!<%H$NAH$_9g$o$;$+$iF~$C$F$/$k%j%/%(%9%H$KBP$7$F(B
@@ -132,14 +167,24 @@
<div class="example"><p><code>
Listen [fe80::a00:20ff:fea7:ccea]:80
</code></p></div>
-<h3>$B;2(B$B>H(B</h3><ul><li><a href="../dns-caveats.html">DNS $B$NLdBj(B</a></li><li><a href="../bind.html">Apache
- $B$,;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj(B</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="ListenBackLog" id="ListenBackLog">ListenBackLog</a> <a name="listenbacklog" id="listenbacklog">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$BJ]N1>uBV$N%3%M%/%7%g%s$N%-%e!<$N:GBgD9(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ListenBacklog <var>backlog</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>ListenBacklog 511</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><a href="../dns-caveats.html">DNS $B$NLdBj(B</a></li>
+<li><a href="../bind.html">Apache
+ $B$,;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj(B</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="ListenBackLog" id="ListenBackLog">ListenBackLog</a> <a name="listenbacklog" id="listenbacklog">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BJ]N1>uBV$N%3%M%/%7%g%s$N%-%e!<$N:GBgD9(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ListenBacklog <var>backlog</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>ListenBacklog 511</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
+</table>
<p>$BJ]N1>uBV$N%3%M%/%7%g%s$N%-%e!<$N:GBgD9$G$9!#(B
$B0lHLE*$K$OD4@0$9$kI,MW$O$"$j$^$;$s$7!"D4@0$OK>$^$7$/$"$j$^$;$s!#(B
$B$7$+$7!"(BTCP SYN $B%U%i%C%I%"%?%C%/$N>u672<$K$*$+$l$k>l9g$K!"(B
@@ -152,13 +197,18 @@
$B%P%C%/%m%0$H$7$F;XDj$5$l$F$$$kCM$A$g$&$I$^$G;H$C$F$$$k$o$1$G$O$J$/!"(B
$B@_Dj$5$l$F$$$kCM$K4p$E$$$F(B ($BDL>o$O@_DjCM$h$j$bBg$-$JCM$r(B)
$B;H$C$F$$$k$3$H$KCm0U$7$F$/$@$5$$!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="LockFile" id="LockFile">LockFile</a> <a name="lockfile" id="lockfile">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B<uIU$rD>Ns2=$9$k$?$a$N%m%C%/%U%!%$%k$N0LCV(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>LockFile <var>filename</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>LockFile logs/accept.lock</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LockFile" id="LockFile">LockFile</a> <a name="lockfile" id="lockfile">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B<uIU$rD>Ns2=$9$k$?$a$N%m%C%/%U%!%$%k$N0LCV(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>LockFile <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>LockFile logs/accept.lock</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr>
+</table>
<p>USE_FCNTL_SERIALIZED_ACCEPT $B$^$?$O(B USE_FLOCK_SERIALIZED_ACCEPT
$B$N$$$:$l$+$r;H$C$F(B Apache $B$r%3%s%Q%$%k$7$?:]$K;HMQ$9$k$3$H$K$J$k!"(B
$B%m%C%/%U%!%$%k$N%Q%9$r(B <code class="directive">LockFile</code>
@@ -177,13 +227,18 @@
$B%m%C%/%U%!%$%k$N:n@.<+BN$rK832$9$k$3$H$K$h$C$F!"(B
$BC/$G$b%5!<%S%95qH]%"%?%C%/$r0z$-5/$3$9$3$H$,$G$-$k$+$i$G$9!#(B</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="MaxClients" id="MaxClients">MaxClients</a> <a name="maxclients" id="maxclients">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%j%/%(%9%H$K1~Ez$9$k$?$a$K:n@.$5$l$k(B
-$B;R%W%m%;%9$N:GBg8D?t(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>MaxClients <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxClients" id="MaxClients">MaxClients</a> <a name="maxclients" id="maxclients">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%j%/%(%9%H$K1~Ez$9$k$?$a$K:n@.$5$l$k(B
+$B;R%W%m%;%9$N:GBg8D?t(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>MaxClients <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr>
+</table>
<p><code class="directive">MaxClients</code> $B%G%#%l%/%F%#%V$O!"(B
$B1~Ez$9$k$3$H$N$G$-$kF1;~%j%/%(%9%H?t$r@_Dj$7$^$9!#(B
<code class="directive">MaxClients</code> $B@)8B?t$r1[$($k%3%M%/%7%g%s$ODL>o!"(B
@@ -209,23 +264,33 @@
$B$r(B 16 $B%W%m%;%90J>eI,MW$JCM$^$GA}2C$5$;$?$$>l9g$O!"(B
<code class="directive"><a href="#serverlimit">ServerLimit</a></code>
$B$bA}2C$5$;$kI,MW$,$"$j$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="MaxMemFree" id="MaxMemFree">MaxMemFree</a> <a name="maxmemfree" id="maxmemfree">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B<g%a%b%j%"%m%1!<%?$,(B free() $B$r8F$P$:$KJ];}$7B3$1$i$l$k%a%b%j$N(B
-$B:GBgNL(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>MaxMemFree <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxMemFree" id="MaxMemFree">MaxMemFree</a> <a name="maxmemfree" id="maxmemfree">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B<g%a%b%j%"%m%1!<%?$,(B free() $B$r8F$P$:$KJ];}$7B3$1$i$l$k%a%b%j$N(B
+$B:GBgNL(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>MaxMemFree <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code></td></tr>
+</table>
<p><code class="directive">MaxMemFree</code> $B%G%#%l%/%F%#%V$O(B free() $B$r8F$P$:$K(B
$B<g%"%m%1!<%?$,J];}$G$-$k6u$N%a%b%j$N:GBgCM$r%-%m%P%$%HC10L$G@_Dj$7$^$9!#(B
$B@_Dj$5$l$F$$$J$$$+!"Nm$K@_Dj$5$l$F$$$k$H$-$O!"L5@)8B$K$J$j$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="MaxRequestsPerChild" id="MaxRequestsPerChild">MaxRequestsPerChild</a> <a name="maxrequestsperchild" id="maxrequestsperchild">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B8D!9$N;R%5!<%P$,2TF/Cf$K07$&%j%/%(%9%H?t$N>e8B(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>MaxRequestsPerChild <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>MaxRequestsPerChild 10000</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxRequestsPerChild" id="MaxRequestsPerChild">MaxRequestsPerChild</a> <a name="maxrequestsperchild" id="maxrequestsperchild">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B8D!9$N;R%5!<%P$,2TF/Cf$K07$&%j%/%(%9%H?t$N>e8B(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>MaxRequestsPerChild <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>MaxRequestsPerChild 10000</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
+</table>
<p><code class="directive">MaxRequestsPerChild</code> $B%G%#%l%/%F%#%V$O!"(B
$B8D!9$N;R%5!<%P%W%m%;%9$,07$&$3$H$N$G$-$k%j%/%(%9%H$N@)8B?t$r(B
$B@_Dj$7$^$9!#(B<code class="directive">MaxRequestsPerChild</code>
@@ -250,12 +315,17 @@
$B<B8zE*$K$O!"0l$D$N;R%W%m%;%9$"$?$j$N(B<em>$B%3%M%/%7%g%s(B</em>$B?t$r(B
$B@)8B$9$k$h$&$K5sF0$,JQ2=$7$^$9!#(B</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="MaxSpareThreads" id="MaxSpareThreads">MaxSpareThreads</a> <a name="maxsparethreads" id="maxsparethreads">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%"%$%I%k%9%l%C%I$N:GBg?t(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>MaxSpareThreads <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxSpareThreads" id="MaxSpareThreads">MaxSpareThreads</a> <a name="maxsparethreads" id="maxsparethreads">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%"%$%I%k%9%l%C%I$N:GBg?t(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>MaxSpareThreads <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>$B%"%$%I%k$J%9%l%C%I$N:GBg?t$G$9!#0[$J$k(B MPM $B$G$O$=$l$>$l!"(B
$B$3$N%G%#%l%/%F%#%V$O0[$J$k<h$j07$o$lJ}$r$5$l$^$9!#(B</p>
@@ -276,26 +346,41 @@
$B$3$N(B MPM $B$O%7%s%0%k%W%m%;%9$G<B9T$5$l$^$9$N$G!"(B
$B%9%Z%"%9%l%C%I?t$b%5!<%PA4BN$G4*Dj$7$^$9!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code></li><li><code class="directive"><a href="#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="directive-section"><h2><a name="MaxThreadsPerChild" id="MaxThreadsPerChild">MaxThreadsPerChild</a> <a name="maxthreadsperchild" id="maxthreadsperchild">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B;R%W%m%;%9Kh$N%9%l%C%I?t$N:GBg?t(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>MaxThreadsPerChild <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>MaxThreadsPerChild 64</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code></td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code></li>
+<li><code class="directive"><a href="#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="directive-section"><h2><a name="MaxThreadsPerChild" id="MaxThreadsPerChild">MaxThreadsPerChild</a> <a name="maxthreadsperchild" id="maxthreadsperchild">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B;R%W%m%;%9Kh$N%9%l%C%I?t$N:GBg?t(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>MaxThreadsPerChild <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>MaxThreadsPerChild 64</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code></td></tr>
+</table>
<p>$B;R%W%m%;%9Kh$K4^$^$l$k%9%l%C%I?t$N:GBgCM$G$9!#(B
$B;R%W%m%;%9Kh$K%9%l%C%I?tJQ2=$9$k(B MPM $B$G$O!"(B
$B$3$N%G%#%l%/%F%#%V$O!";R%W%m%;%9Fb$K@8@.$5$l$k%9%l%C%I?t$N(B
$B:GBgCM$r@_Dj$7$^$9!#%G%U%)%k%HCM$h$j$bBg$-$$CM$K$9$k$N$G$"$l$P!"(B
$B%3%s%Q%$%k;~$KDj5A$5$l$?(B <code>HARD_THREAD_LIMIT</code>
$B$rJQ99$7$F!"%5!<%P$r:F%3%s%Q%$%k$9$kI,MW$,$"$j$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="MinSpareThreads" id="MinSpareThreads">MinSpareThreads</a> <a name="minsparethreads" id="minsparethreads">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%j%/%(%9%H$K1~Ez$9$k$3$H$N$G$-$k(B
-$B%"%$%I%k%9%l%C%I?t$N:G>.?t(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>MinSpareServers <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MinSpareThreads" id="MinSpareThreads">MinSpareThreads</a> <a name="minsparethreads" id="minsparethreads">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%j%/%(%9%H$K1~Ez$9$k$3$H$N$G$-$k(B
+$B%"%$%I%k%9%l%C%I?t$N:G>.?t(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>MinSpareServers <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>$B%j%/%(%9%H$K1~Ez$9$k%9%l%C%I?t$N:G>.CM$G$9!#(B
$B0[$J$k(B MPM $B$G$O$=$l$>$l!"(B
$B$3$N%G%#%l%/%F%#%V$O0[$J$k<h$j07$o$lJ}$r$7$^$9!#(B</p>
@@ -317,25 +402,40 @@
$B%G%U%)%k%H$O(B <code>MinSpareThreads 10</code> $B$G!"(B
$B%7%s%0%k%W%m%;%9(B MPM $B$G$9$N$G!"%5!<%PA4BN$G4IM}$5$l$^$9!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="directive"><a href="#maxsparethreads">MaxSpareThreads</a></code></li><li><code class="directive"><a href="#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="directive-section"><h2><a name="NumServers" id="NumServers">NumServers</a> <a name="numservers" id="numservers">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$BF1;~$K5/F0$7$F$$$k;R%W%m%;%9$NAm?t(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>NumServers <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>NumServers 2</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/perchild.html">perchild</a></code></td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="directive"><a href="#maxsparethreads">MaxSpareThreads</a></code></li>
+<li><code class="directive"><a href="#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="directive-section"><h2><a name="NumServers" id="NumServers">NumServers</a> <a name="numservers" id="numservers">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BF1;~$K5/F0$7$F$$$k;R%W%m%;%9$NAm?t(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>NumServers <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>NumServers 2</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/perchild.html">perchild</a></code></td></tr>
+</table>
<p>$BF1;~$K5/F0$7$F$$$k;R%W%m%;%9$N?t$G$9!#(B
$B$3$N%G%#%l%/%F%#%V$r;HMQ$9$k(B MPM $B$OF0E*$K?7$7$$;R%W%m%;%9$r(B
$B@8@.$9$k$3$H$O9T$o$J$$$N$G!"%5%$%HA4BN$KMh$k%j%/%(%9%HA4$F$r(B
$B==J,07$($kDxEY$KBg$-$J?t$K@_Dj$7$F$*$/I,MW$,$"$j$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="PidFile" id="PidFile">PidFile</a> <a name="pidfile" id="pidfile">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%G!<%b%s$N%W%m%;%9(B ID
-$B$r%5!<%P$,5-O?$9$k$?$a$N%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>PidFile <var>filename</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>PidFile logs/httpd.pid</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="PidFile" id="PidFile">PidFile</a> <a name="pidfile" id="pidfile">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%G!<%b%s$N%W%m%;%9(B ID
+$B$r%5!<%P$,5-O?$9$k$?$a$N%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>PidFile <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>PidFile logs/httpd.pid</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
+</table>
<p><code class="directive">PidFile</code> $B%G%#%l%/%F%#%V$G!"(B
$B%G!<%b%s$N%W%m%;%9(B ID $B$r%5!<%P$,5-O?$9$k%U%!%$%k$r@_Dj$7$^$9!#(B
$B$b$7%U%!%$%kL>$,%9%i%C%7%e(B (/) $B$G;O$^$i$J$$>l9g$O!"(B
@@ -347,7 +447,7 @@
</code></p></div>
<p>$B%5!<%P$,(B <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code>
- $B$d(B TransferLog $B$rJD$8$F3+$-D>(B$B$7$?$j!"@_Dj%U%!%$%k$r(B
+ $B$d(B TransferLog $B$rJD$8$F3+$-D>$7$?$j!"@_Dj%U%!%$%k$r(B
$B:FFI9~$7$?$j$5$;$k$?$a$K!"%5!<%P$K%7%0%J%k$rAw$k$3$H$,$G$-$k$H(B
$BJXMx$J$3$H$,$"$j$^$9!#(B
$B$3$l$O(B SIGHUP (kill -1) $B%7%0%J%k$r(B PidFile
@@ -356,14 +456,19 @@
<p>PidFile $B$K$O!"%m%0%U%!%$%k$N@_CV0LCV$d(B
<a href="../misc/security_tips.html#serverroot">$B%;%-%e%j%F%#(B</a>
$B$HA4$/F1$8Cm0UE@$,$"$j$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ScoreBoardFile" id="ScoreBoardFile">ScoreBoardFile</a> <a name="scoreboardfile" id="scoreboardfile">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B;R%W%m%;%9$HO"7H$9$k$?$a$N%G!<%?$rJ]B8$9$k(B
-$B%U%!%$%k$N0LCV(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ScoreBoardFile <var>file-path</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>ScoreBoardFile logs/apache_status</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScoreBoardFile" id="ScoreBoardFile">ScoreBoardFile</a> <a name="scoreboardfile" id="scoreboardfile">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B;R%W%m%;%9$HO"7H$9$k$?$a$N%G!<%?$rJ]B8$9$k(B
+$B%U%!%$%k$N0LCV(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ScoreBoardFile <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>ScoreBoardFile logs/apache_status</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr>
+</table>
<p>Apache $B$O?F%W%m%;%9$H;R%W%m%;%94V$NDL?.$K%9%3%"%\!<%I$rMQ$$$^$9!#(B
$B$3$NDL?.5!G=$K%U%!%$%k$rI,MW$H$9$k%"!<%-%F%/%A%c$b$"$j$^$9!#(B
$B%U%!%$%k$,;XDj$5$l$F$$$J$1$l$P!"(BApache $B$O$^$:%a%b%j>e(B
@@ -384,23 +489,37 @@
$B$7$+$7!"%m%0%U%!%$%k$N@_CV0LCV$d(B
<a href="../misc/security_tips.html">$B%;%-%e%j%F%#(B</a>
$B$HF1MM$NCm0UE@$,$"$k$N$G!"Cm0U$7$F$/$@$5$$!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><a href="../stopping.html">Apache $B$NDd;_$H:F5/F0(B</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="SendBufferSize" id="SendBufferSize">SendBufferSize</a> <a name="sendbuffersize" id="sendbuffersize">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>TCP $B%P%C%U%!%5%$%:(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>SendBufferSize <var>bytes</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><a href="../stopping.html">Apache $B$NDd;_$H:F5/F0(B</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="SendBufferSize" id="SendBufferSize">SendBufferSize</a> <a name="sendbuffersize" id="sendbuffersize">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>TCP $B%P%C%U%!%5%$%:(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>SendBufferSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
+</table>
<p>$B%5!<%P$O(B TCP $B%P%C%U%!%5%$%:$r;XDj$5$l$?%P%$%H?t$K@_Dj$7$^$9!#(B
$B9bB.$G9b%l%$%F%s%7$J4D6-$G(B
(<em>$BNc(B</em> 100ms $BDxEY!"BgN&2#CG9bB.DL?.O)$J$I(B)
$B8E$$0lHLE*$J(B OS $B$N%G%U%)%k%HCM$rA}$d$9$N$KHs>o$KJXMx$G$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ServerLimit" id="ServerLimit">ServerLimit</a> <a name="serverlimit" id="serverlimit">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B@_Dj2DG=$J%5!<%P%W%m%;%9?t$N>e8B(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ServerLimit <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>ServerLimit 256 (prefork), ServerLimit 16 (worker)</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerLimit" id="ServerLimit">ServerLimit</a> <a name="serverlimit" id="serverlimit">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B@_Dj2DG=$J%5!<%P%W%m%;%9?t$N>e8B(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ServerLimit <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>ServerLimit 256 (prefork), ServerLimit 16 (worker)</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr>
+</table>
<p><code class="module"><a href="../mod/prefork.html">prefork</a></code> MPM $B$N>l9g$O(B$B!"$3$N%G%#%l%/%F%#%V$O(B
Apache $B%W%m%;%92TF/Cf$K$*$1$k(B
<code class="directive"><a href="#maxclients">MaxClients</a></code>
@@ -439,23 +558,38 @@
<code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
$B$H$/$i$Y$F!"I,MW$H$J$k%5!<%P%W%m%;%9?t0J>e$KBg$-$JCM$r(B
$B@_Dj$9$k$3$H$OHr$1$F$/$@$5$$!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="StartServers" id="StartServers">StartServers</a> <a name="startservers" id="startservers">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B5/F0;~$K@8@.$5$l$k;R%5!<%P%W%m%;%9$N?t(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>StartServers <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>StartServers 5</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="StartServers" id="StartServers">StartServers</a> <a name="startservers" id="startservers">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B5/F0;~$K@8@.$5$l$k;R%5!<%P%W%m%;%9$N?t(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>StartServers <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>StartServers 5</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p><code class="directive">StartServers</code> $B%G%#%l%/%F%#%V$O!"(B
$B5/F0;~$K@8@.$5$l$k;R%5!<%P%W%m%;%9$N?t$r@_Dj$7$^$9!#(B
$B%W%m%;%9?t$OIi2Y$K1~$8$FF0E*$K@)8f$5$l$^$9$N$G!"(B
$BDL>o$O$3$NCM$rD4@0$9$kM}M3$O$"$^$j$J$$$G$7$g$&!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code></li><li><code class="directive"><a href="#maxsparethreads">MaxSpareThreads</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="StartThreads" id="StartThreads">StartThreads</a> <a name="startthreads" id="startthreads">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B5/F0;~$K@8@.$5$l$k%9%l%C%I$N?t(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>StartThreads <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code></td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code></li>
+<li><code class="directive"><a href="#maxsparethreads">MaxSpareThreads</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="StartThreads" id="StartThreads">StartThreads</a> <a name="startthreads" id="startthreads">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B5/F0;~$K@8@.$5$l$k%9%l%C%I$N?t(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>StartThreads <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code></td></tr>
+</table>
<p>$B5/F0;~$K@8@.$5$l$k%9%l%C%I$N?t$G$9!#(B
$B%9%l%C%I?t$OIi2Y$K1~$8$FF0E*$K@)8f$5$l$^$9$N$G!"(B
$BDL>o$O$3$NCM$rD4@0$9$kM}M3$O$"$^$j$J$$$G$7$g$&!#(B</p>
@@ -469,13 +603,18 @@
$B$3$N>l9g%W%m%;%9$O0l$D$7$+$J$$$N$G!"(B
$B5/F0;~$K%j%/%(%9%H$K1~Ez$9$k%9%l%C%I$NAm?t$H$J$j$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ThreadLimit" id="ThreadLimit">ThreadLimit</a> <a name="threadlimit" id="threadlimit">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B@_Dj2DG=$J;R%W%m%;%9Kh$N%9%l%C%I?t$N>e8B$r(B
-$B@_Dj$7$^$9(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ThreadLimit <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ThreadLimit" id="ThreadLimit">ThreadLimit</a> <a name="threadlimit" id="threadlimit">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B@_Dj2DG=$J;R%W%m%;%9Kh$N%9%l%C%I?t$N>e8B$r(B
+$B@_Dj$7$^$9(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ThreadLimit <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O(B
Apache $B%W%m%;%92TF/Cf$K$*$1$k(B
<code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
@@ -502,13 +641,18 @@
<code class="module"><a href="../mod/worker.html">worker</a></code> $B$N$H$-$O(B 64 $B$G!"(B<code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> $B$N$H$-$O(B
1920 $B$G$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ThreadsPerChild" id="ThreadsPerChild">ThreadsPerChild</a> <a name="threadsperchild" id="threadsperchild">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B;R%W%m%;%9$=$l$>$l$K@8@.$5$l$k%9%l%C%I?t(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>ThreadsPerChild <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>ThreadsPerChild 50</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ThreadsPerChild" id="ThreadsPerChild">ThreadsPerChild</a> <a name="threadsperchild" id="threadsperchild">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B;R%W%m%;%9$=$l$>$l$K@8@.$5$l$k%9%l%C%I?t(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>ThreadsPerChild <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>ThreadsPerChild 50</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
+</table>
<p>$B$3$N%G%#%l%/%F%#%V$O!"$=$l$>$l$N;R%W%m%;%9$G@8@.$5$l$k(B
$B%9%l%C%I?t$r@_Dj$7$^$9!#(B
$B;R%W%m%;%9$O3+;O;~$K$3$l$i$N%9%l%C%I$r@8@.$7$F!"(B
@@ -519,13 +663,18 @@
$B;R%W%m%;%9$,J#?t$"$k$h$&$J(B MPM $B$rMxMQ$7$F$$$k$N$G$"$l$P!"(B
$B%5!<%P$NDL>oIi2Y$r==J,07$($kDxEY$K!"(B
$B%9%l%C%IAm?t$,B?$/$J$1$l$P$J$j$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="User" id="User">User</a> <a name="user" id="user">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%j%/%(%9%H$K1~Ez$9$k:]$KMQ$$$k%f!<%6(B ID</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>User <var>unix-userid</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>User #-1</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr></table>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="User" id="User">User</a> <a name="user" id="user">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%j%/%(%9%H$K1~Ez$9$k:]$KMQ$$$k%f!<%6(B ID</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>User <var>unix-userid</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>User #-1</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B, $B%P!<%A%c%k%[%9%H(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td><code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/perchild.html">perchild</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code></td></tr>
+</table>
<p><code class="directive">User</code> $B%G%#%l%/%F%#%V$O(B
$B%5!<%P$,%j%/%(%9%H$K1~Ez$9$k:]$KMQ$$$k%f!<%6(B ID $B$r@_Dj$7$^$9!#(B
$B$3$N%G%#%l%/%F%#%V$r;HMQ$9$k$?$a$K$O!"%9%?%s%I%"%m%s7?$N(B
@@ -572,4 +721,10 @@
<code class="directive">User</code>
($B$d(B <code class="directive"><a href="#group">Group</a></code>)
$B$r(B <code>root</code> $B$K@_Dj$7$J$$$G$/$@$5$$!#(B</p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index 2248917..ac61a4d 100644
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -9,18 +9,100 @@
<status>MPM</status>
<directivesynopsis>
+<name>AcceptMutex</name>
+<description>Method that Apache uses to serialize multiple children
+accepting requests on network sockets</description>
+<syntax>AcceptMutex Default|<var>method</var></syntax>
+<default>AcceptMutex Default</default>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>leader</module><module>perchild</module>
+<module>prefork</module><module>threadpool</module><module>worker</module>
+</modulelist>
+
+<usage>
+ <p>The <directive>AcceptMutex</directive> directives sets the
+ method that Apache uses to serialize multiple children accepting
+ requests on network sockets. Prior to Apache 2.0, the method was
+ selectable only at compile time. The optimal method to use is
+ highly architecture and platform dependent. For further details,
+ see the <a href="../misc/perf-tuning.html">performance tuning</a>
+ documentation.</p>
+
+ <p>If this directive is set to <code>Default</code>, then the
+ compile-time selected default will be used. Other possible
+ methods are listed below. Note that not all methods are
+ available on all platforms. If a method is specified which is
+ not available, a message will be written to the error log
+ listing the available methods.</p>
+
+ <dl>
+ <dt><code>flock</code></dt>
+ <dd>uses the <code>flock(2)</code> system call to lock the
+ file defined by the <directive module="mpm_common"
+ >LockFile</directive> directive.</dd>
+
+ <dt><code>fcntl</code></dt>
+ <dd>uses the <code>fnctl(2)</code> system call to lock the
+ file defined by the <directive module="mpm_common"
+ >LockFile</directive> directive.</dd>
+
+ <dt><code>posixsem</code></dt>
+ <dd>uses POSIX compatible semaphores to implement the mutex.</dd>
+
+ <dt><code>pthread</code></dt>
+ <dd>uses POSIX mutexes as implemented by the POSIX Threads
+ (PThreads) specification.</dd>
+
+ <dt><code>sysvsem</code></dt>
+ <dd>uses SySV-style semaphores to implement the mutex.</dd>
+ </dl>
+
+ <p>If you want to find out the compile time chosen default
+ for your system, you may set your <directive module="core"
+ >LogLevel</directive> to <code>debug</code>. Then the default <directive
+ >AcceptMutex</directive> will be written into the <directive
+ module="core">ErrorLog</directive>.</p>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>BS2000Account</name>
+<description>Define the non-privileged account on BS2000
+machines</description>
+<syntax>BS2000Account <var>account</var></syntax>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>perchild</module><module>prefork</module></modulelist>
+<compatibility>Only available for BS2000 machines</compatibility>
+
+<usage>
+ <p>The <directive>BS2000Account</directive> directive is available for
+ BS2000 hosts only. It must be used to define the account number for
+ the non-privileged apache server user (which was configured using the
+ <directive module="mpm_common">User</directive> directive). This is
+ required by the BS2000 POSIX subsystem (to change the underlying BS2000
+ task environment by performing a sub-LOGON) to prevent CGI scripts
+ from accessing resources of the privileged account which started the
+ server, usually <code>SYSROOT</code>.</p>
+
+ <note><title>Note</title>
+ <p>Only one <code>BS2000Account</code> directive can be used.</p>
+ </note>
+</usage>
+<seealso><a href="../platform/ebcdic.html">Apache EBCDIC port</a></seealso>
+</directivesynopsis>
+
+<directivesynopsis>
<name>CoreDumpDirectory</name>
<description>Directory where Apache attempts to
switch before dumping core</description>
<syntax>CoreDumpDirectory <var>directory</var></syntax>
<default>See usage for the default setting</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_winnt</module><module>perchild</module><module>prefork</module>
+<module>threadpool</module><module>worker</module></modulelist>
<usage>
-
<p>This controls the directory to which Apache attempts to
switch before dumping core. The default is in the
<directive module="core">ServerRoot</directive> directory, however
@@ -37,43 +119,54 @@
requests</description>
<syntax>Group <var>unix-group</var></syntax>
<default>Group #-1</default>
-<contextlist><context>server config</context><context>virtual host</context>
-</contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module></modulelist>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpmt_os2</module><module>perchild</module><module>prefork</module>
+<module>threadpool</module><module>worker</module></modulelist>
+<compatibility>Only valid in global server config since Apache
+2.0</compatibility>
<usage>
<p>The <directive>Group</directive> directive sets the group under
which the server will answer requests. In order to use this
- directive, the stand-alone server must be run initially as root.
- <var>Unix-group</var> is one of:</p>
+ directive, the server must be run initially as root. If you start the
+ server as a non-root user, it will fail to change to the specified
+ group, and will instead continue to run as the group of the original
+ user. <var>Unix-group</var> is one of:</p>
<dl>
<dt>A group name</dt>
-
<dd>Refers to the given group by name.</dd>
- <dt># followed by a group number.</dt>
-
+ <dt><code>#</code> followed by a group number.</dt>
<dd>Refers to a group by its number.</dd>
</dl>
+
+ <example><title>Example</title>
+ Group www-group
+ </example>
+
<p>It is recommended that you set up a new group specifically for
running the server. Some admins use user <code>nobody</code>,
but this is not always possible or desirable.</p>
- <example>Group www-group</example>
+ <note type="warning"><title>Security</title>
+ <p>Don't set <directive>Group</directive> (or <directive
+ module="mpm_common">User</directive>) to <code>root</code> unless
+ you know exactly what you are doing, and what the dangers are.</p>
+ </note>
- <p>Note: if you start the server as a non-root user, it will
- fail to change to the specified group, and will instead
- continue to run as the group of the original user.</p>
+ <p>Special note: Use of this directive in <directive module="core"
+ type="section">VirtualHost</directive> is no longer supported. To
+ configure your server for <a href="mod_suexec.html">suexec</a> use
+ <directive module="mod_suexec">SuexecUserGroup</directive>.</p>
- <p>Special note: Use of this directive in <VirtualHost> is
- no longer supported. To implement the <a
- href="../suexec.html">suEXEC wrapper</a> with Apache 2.0, use the
- <directive module="mod_suexec">SuexecUserGroup</directive>
- directive. SECURITY: See <directive
- module="mpm_common">User</directive> for a discussion of the
- security considerations.</p>
+ <note><title>Note</title>
+ <p>Although the <directive>Group</directive> directive is present
+ in the <module>beos</module> and <module>mpmt_os2</module> MPMs,
+ it is actually a no-op there and only exists for compatibility
+ reasons.</p>
+ </note>
</usage>
</directivesynopsis>
@@ -84,30 +177,38 @@
<syntax>PidFile <var>filename</var></syntax>
<default>PidFile logs/httpd.pid</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_winnt</module><module>mpmt_os2</module>
+<module>perchild</module><module>prefork</module>
+<module>threadpool</module><module>worker</module></modulelist>
<usage>
<p>The <directive>PidFile</directive> directive sets the file to
which the server records the process id of the daemon. If the
- filename does not begin with a slash (/) then it is assumed to be
- relative to the <directive module="core">ServerRoot</directive>.</p>
+ filename is not absolute then it is assumed to be relative to the
+ <directive module="core">ServerRoot</directive>.</p>
<example><title>Example</title>
PidFile /var/run/apache.pid
</example>
<p>It is often useful to be able to send the server a signal,
- so that it closes and then reopens its <directive
- module="core">ErrorLog</directive> and TransferLog, and
+ so that it closes and then re-opens its <directive
+ module="core">ErrorLog</directive> and <directive
+ module="mod_log_config">TransferLog</directive>, and
re-reads its configuration files. This is done by sending a
SIGHUP (kill -1) signal to the process id listed in the
- PidFile.</p>
+ <directive>PidFile</directive>.</p>
<p>The PidFile is subject to the same warnings about log file
placement and <a
href="../misc/security_tips.html#serverroot">security</a>.</p>
+
+ <note><title>Note</title>
+ As of Apache 2 it is recommended to use only the <a
+ href="../programs/apachectl.html">apachectl</a> script for
+ (re-)starting or stopping the server.
+ </note>
</usage>
</directivesynopsis>
@@ -117,28 +218,31 @@
listens to</description>
<syntax>Listen [<var>IP-address</var>:]<var>portnumber</var></syntax>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_netware</module><module>mpm_winnt</module>
+<module>mpmt_os2</module><module>perchild</module>
+<module>prefork</module><module>threadpool</module><module>worker</module>
</modulelist>
+<compatibility>Required directive since Apache 2.0</compatibility>
<usage>
<p>The <directive>Listen</directive> directive instructs Apache to
listen to only specific IP addresses or ports; by default it
- responds to requests on all IP interfaces. The Listen directive is
- now a required directive. If it is not in the config file, the
+ responds to requests on all IP interfaces. <directive>Listen</directive>
+ is now a required directive. If it is not in the config file, the
server will fail to start. This is a change from previous versions
of Apache.</p>
- <p>The Listen directive tells the server to accept incoming
- requests on the specified port or address-and-port combination.
- If only a port number is specified, the server listens to the
- given port on all interfaces. If an IP address is given as well
+ <p>The <directive>Listen</directive> directive tells the server to
+ accept incoming requests on the specified port or address-and-port
+ combination. If only a port number is specified, the server listens to
+ the given port on all interfaces. If an IP address is given as well
as a port, the server will listen on the given port and
interface.</p>
- <p>Multiple Listen directives may be used to specify a number
- of addresses and ports to listen to. The server will respond to
- requests from any of the listed addresses and ports.</p>
+ <p>Multiple <directive>Listen</directive> directives may be used to
+ specify a number of addresses and ports to listen to. The server will
+ respond to requests from any of the listed addresses and ports.</p>
<p>For example, to make the server accept connections on both
port 80 and port 8000, use:</p>
@@ -163,10 +267,9 @@
Listen [fe80::a00:20ff:fea7:ccea]:80
</example>
</usage>
-
<seealso><a href="../dns-caveats.html">DNS Issues</a></seealso>
-<seealso><a href="../bind.html">Setting
- which addresses and ports Apache uses</a></seealso>
+<seealso><a href="../bind.html">Setting which addresses and ports Apache
+uses</a></seealso>
</directivesynopsis>
<directivesynopsis>
@@ -175,9 +278,10 @@
<syntax>ListenBacklog <var>backlog</var></syntax>
<default>ListenBacklog 511</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_netware</module><module>mpm_winnt</module>
+<module>mpmt_os2</module><module>perchild</module><module>prefork</module>
+<module>threadpool</module><module>worker</module></modulelist>
<usage>
<p>The maximum length of the queue of pending connections.
@@ -200,27 +304,30 @@
<syntax>LockFile <var>filename</var></syntax>
<default>LockFile logs/accept.lock</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module></modulelist>
+<modulelist><module>leader</module><module>perchild</module>
+<module>prefork</module><module>threadpool</module><module>worker</module>
+</modulelist>
<usage>
<p>The <directive>LockFile</directive> directive sets the path to
- the lockfile used when Apache is compiled with either
- USE_FCNTL_SERIALIZED_ACCEPT or USE_FLOCK_SERIALIZED_ACCEPT. This
- directive should normally be left at its default value. The main
- reason for changing it is if the <code>logs</code> directory is
- NFS mounted, since <strong>the lockfile must be stored on a local
- disk</strong>. The PID of the main server process is
- automatically appended to the filename.</p>
+ the lockfile used when Apache is used with an <directive
+ module="mpm_common">AcceptMutex</directive> value of either
+ <code>fcntl</code> or <code>flock</code>. This directive should
+ normally be left at its default value. The main reason for changing
+ it is if the <code>logs</code> directory is NFS mounted, since
+ <strong>the lockfile must be stored on a local disk</strong>. The PID
+ of the main server process is automatically appended to the
+ filename.</p>
<note type="warning"><title>Security:</title>
- <p>It is best to avoid putting this file in a world writable directory
- such as <code>/var/tmp</code> because someone could create a denial of
- service attack and prevent the server from starting by creating
- a lockfile with the same name as the one the server will try to
- create.</p>
+ <p>It is best to <em>avoid</em> putting this file in a world writable
+ directory such as <code>/var/tmp</code> because someone could create
+ a denial of service attack and prevent the server from starting by
+ creating a lockfile with the same name as the one the server will try
+ to create.</p>
</note>
</usage>
+<seealso><directive module="mpm_common">AcceptMutex</directive></seealso>
</directivesynopsis>
<directivesynopsis>
@@ -228,8 +335,10 @@
<description>Maximum number of child processes that will be created
to serve requests</description>
<syntax>MaxClients <var>number</var></syntax>
+<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>prefork</module>
+<modulelist><module>beos</module><module>leader</module>
+<module>prefork</module><module>threadpool</module><module>worker</module>
</modulelist>
<usage>
@@ -241,38 +350,42 @@
directive. Once a child process is freed at the end of a different
request, the connection will then be serviced.</p>
- <p>For non-threaded servers (i.e., <module>prefork</module>),
+ <p>For non-threaded servers (<em>i.e.</em>, <module>prefork</module>),
<directive>MaxClients</directive> translates into the maximum
number of child processes that will be launched to serve requests.
The default value is 256; to increase it, you must also raise
<directive module="mpm_common">ServerLimit</directive>.</p>
- <p>For threaded servers (i.e., <module>worker</module>),
- <directive>MaxClients</directive> restricts the total
- number of threads that will be available to serve clients.
- The default value is 16 multiplied by the value of
- <directive module="mpm_common">ThreadsPerChild</directive>.
- To increase <directive>MaxClients</directive> to a value
- that requires more than 16 processes, you must also
- raise <directive module="mpm_common">ServerLimit</directive>.</p>
+ <p>For threaded and hybrid servers (<em>e.g.</em> <module>beos</module>
+ or <module>worker</module>) <directive>MaxClients</directive> restricts
+ the total number of threads that will be available to serve clients.
+ The default value for <module>beos</module> is <code>50</code>. For
+ hybrid MPMs the default value is <code>16</code> (<directive
+ module="mpm_common">ServerLimit</directive>) multiplied by the value of
+ <code>25</code> (<directive module="mpm_common"
+ >ThreadsPerChild</directive>). Therefore, to increase <directive
+ >MaxClients</directive> to a value that requires more than 16 processes,
+ you must also raise <directive module="mpm_common"
+ >ServerLimit</directive>.</p>
</usage>
</directivesynopsis>
<directivesynopsis>
<name>MaxMemFree</name>
<description>Maximum amount of memory that the main allocator is allowed
-to hold without calling free()</description>
-<syntax>MaxMemFree <var>number</var></syntax>
+to hold without calling <code>free()</code></description>
+<syntax>MaxMemFree <var>KBytes</var></syntax>
+<default>MaxMemFree 0</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>prefork</module>
-<module>mpm_netware</module>
-</modulelist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_netware</module><module>prefork</module>
+<module>threadpool</module><module>worker</module></modulelist>
<usage>
<p>The <directive>MaxMemFree</directive> directive sets the
maximum number of free Kbytes that the main allocator is allowed
- to hold without calling free(). When not set, or when set to
- zero, the threshold will be set to unlimited.</p>
+ to hold without calling <code>free()</code>. When not set, or when set
+ to zero, the threshold will be set to unlimited.</p>
</usage>
</directivesynopsis>
@@ -283,9 +396,10 @@
<syntax>MaxRequestsPerChild <var>number</var></syntax>
<default>MaxRequestsPerChild 10000</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>leader</module><module>mpm_netware</module>
+<module>mpm_winnt</module><module>mpmt_os2</module>
+<module>perchild</module><module>prefork</module>
+<module>threadpool</module><module>worker</module></modulelist>
<usage>
<p>The <directive>MaxRequestsPerChild</directive> directive sets
@@ -293,7 +407,12 @@
server process will handle. After
<directive>MaxRequestsPerChild</directive> requests, the child
process will die. If <directive>MaxRequestsPerChild</directive> is
- 0, then the process will never expire.</p>
+ <code>0</code>, then the process will never expire.</p>
+
+ <note><title>Different default values:</title>
+ <p>The default value for <module>mpm_netware</module> and
+ <module>mpm_winnt</module> is <code>0</code>.</p>
+ </note>
<p>Setting <directive>MaxRequestsPerChild</directive> to a
non-zero limit has two beneficial effects:</p>
@@ -307,9 +426,10 @@
</ul>
<note><title>Note:</title>
- <p>For <em>KeepAlive</em> requests, only the first request is counted
- towards this limit. In effect, it changes the behavior to limit the
- number of <em>connections</em> per child.</p>
+ <p>For <directive module="core">KeepAlive</directive> requests, only
+ the first request is counted towards this limit. In effect, it
+ changes the behavior to limit the number of <em>connections</em> per
+ child.</p>
</note>
</usage>
</directivesynopsis>
@@ -318,9 +438,11 @@
<name>MaxSpareThreads</name>
<description>Maximum number of idle threads</description>
<syntax>MaxSpareThreads <var>number</var></syntax>
+<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>mpm_netware</module>
-<module>perchild</module><module>worker</module>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_netware</module><module>mpmt_os2</module>
+<module>perchild</module><module>threadpool</module><module>worker</module>
</modulelist>
<usage>
@@ -328,53 +450,59 @@
directive differently.</p>
<p>For <module>perchild</module> the default is
- <code>MaxSpareThreads 10</code>. This MPM monitors the number of
+ <code>MaxSpareThreads 10</code>. This MPM monitors the number of
idle threads on a per-child basis. If there are too many idle
threads in that child, the server will begin to kill threads
within that child.</p>
- <p>For <module>worker</module> the default is
- <code>MaxSpareThreads 500</code>. This MPM deals with idle threads
- on a server-wide basis. If there are too many idle threads in the
- server then child processes are killed until the number of idle
- threads is less than this number.</p>
+ <p>For <module>worker</module>, <module>leader</module> and <module
+ >threadpool</module> the default is <code>MaxSpareThreads 250</code>.
+ These MPMs deal with idle threads on a server-wide basis. If there
+ are too many idle threads in the server then child processes are
+ killed until the number of idle threads is less than this number.</p>
<p>For <module>mpm_netware</module> the default is
- <code>MaxSpareThreads 100</code>. Since this MPM runs a
+ <code>MaxSpareThreads 100</code>. Since this MPM runs a
single-process, the spare thread count is also server-wide.</p>
+ <p><module>beos</module> and <module>mpmt_os2</module> work
+ similar to <module>mpm_netware</module>. The default for
+ <module>beos</module> is <code>MaxSpareThreads 50</code>. For
+ <module>mpmt_os2</module> the default value is <code>10</code>.</p>
+
+ <note><title>Restrictions</title>
+ <p>The range of the <directive>MaxSpareThreads</directive> value
+ is restricted. Apache will correct the given value automatically
+ according to the following rules:</p>
+ <ul>
+ <li><module>perchild</module> requires <directive
+ >MaxSpareThreads</directive> to be less or equal than <directive
+ module="mpm_common">ThreadLimit</directive>.</li>
+
+ <li><module>mpm_netware</module> wants the value to be greater than
+ <directive module="mpm_common">MinSpareThreads</directive>.</li>
+
+ <li>For <module>leader</module>, <module>threadpool</module> and
+ <module>worker</module> the value must be greater or equal than
+ the sum of <directive module="mpm_common">MinSpareThreads</directive>
+ and <directive module="mpm_common">ThreadsPerChild</directive>.</li>
+ </ul>
+ </note>
</usage>
<seealso><directive module="mpm_common">MinSpareThreads</directive></seealso>
<seealso><directive module="mpm_common">StartServers</directive></seealso>
</directivesynopsis>
<directivesynopsis>
-<name>MaxThreadsPerChild</name>
-<description>Maximum number of threads per child process</description>
-<syntax>MaxThreadsPerChild <var>number</var></syntax>
-<default>MaxThreadsPerChild 64</default>
-<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-</modulelist>
-
-<usage>
- <p>Maximum number of threads per child. For MPMs with a
- variable number of threads per child, this directive sets the
- maximum number of threads that will be created in each child
- process. To increase this value beyond its default, it is
- necessary to change the value of the compile-time define
- <code>HARD_THREAD_LIMIT</code> and recompile the server.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
<name>MinSpareThreads</name>
<description>Minimum number of idle threads available to handle request
spikes</description>
<syntax>MinSpareThreads <var>number</var></syntax>
+<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>mpm_netware</module>
-<module>perchild</module><module>worker</module>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_netware</module><module>mpmt_os2</module>
+<module>perchild</module><module>threadpool</module><module>worker</module>
</modulelist>
<usage>
@@ -386,10 +514,14 @@
<code>MinSpareThreads 5</code> and monitors the number of idle
threads on a per-child basis. If there aren't enough idle threads
in that child, the server will begin to create new threads within
- that child.</p>
+ that child. Thus, if you set <directive module="perchild"
+ >NumServers</directive> to <code>10</code> and a <directive
+ >MinSpareThreads</directive> value of <code>5</code>, you'll have
+ at least 50 idle threads on your system.</p>
- <p><module>worker</module> uses a default of <code>MinSpareThreads
- 250</code> and deals with idle threads on a server-wide basis. If
+ <p><module>worker</module>, <module>leader</module> and
+ <module>threadpool</module> use a default of <code>MinSpareThreads
+ 75</code> and deal with idle threads on a server-wide basis. If
there aren't enough idle threads in the server then child
processes are created until the number of idle threads is greater
than number.</p>
@@ -398,36 +530,25 @@
<code>MinSpareThreads 10</code> and, since it is a single-process
MPM, tracks this on a server-wide bases.</p>
+ <p><module>beos</module> and <module>mpmt_os2</module> work
+ similar to <module>mpm_netware</module>. The default for
+ <module>beos</module> is <code>MinSpareThreads 1</code>. For
+ <module>mpmt_os2</module> the default value is <code>5</code>.</p>
</usage>
<seealso><directive module="mpm_common">MaxSpareThreads</directive></seealso>
<seealso><directive module="mpm_common">StartServers</directive></seealso>
</directivesynopsis>
<directivesynopsis>
-<name>NumServers</name>
-<description>Total number of children alive at the same time</description>
-<syntax>NumServers <var>number</var></syntax>
-<default>NumServers 2</default>
-<contextlist><context>server config</context></contextlist>
-<modulelist><module>perchild</module></modulelist>
-
-<usage>
- <p>Number of children alive at the same time. MPMs that use
- this directive do not dynamically create new child processes so
- this number should be large enough to handle the requests for
- the entire site.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
<name>ScoreBoardFile</name>
<description>Location of the file used to store coordination data for
the child processes</description>
<syntax>ScoreBoardFile <var>file-path</var></syntax>
<default>ScoreBoardFile logs/apache_status</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module></modulelist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_winnt</module><module>perchild</module><module>prefork</module>
+<module>threadpool</module><module>worker</module></modulelist>
<usage>
<p>Apache uses a scoreboard to communicate between its parent
@@ -450,24 +571,29 @@
careful that you heed the same warnings about log file placement
and <a href="../misc/security_tips.html">security</a>.</p>
</usage>
-<seealso><a
- href="../stopping.html">Stopping and Restarting Apache</a></seealso>
+<seealso><a href="../stopping.html">Stopping and Restarting
+Apache</a></seealso>
</directivesynopsis>
<directivesynopsis>
<name>SendBufferSize</name>
<description>TCP buffer size</description>
<syntax>SendBufferSize <var>bytes</var></syntax>
+<default>SendBufferSize 0</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>beos</module><module>leader</module>
+<module>mpm_netware</module><module>mpm_winnt</module>
+<module>mpmt_os2</module><module>perchild</module><module>prefork</module>
+<module>threadpool</module><module>worker</module></modulelist>
<usage>
<p>The server will set the TCP buffer size to the number of bytes
specified. Very useful to increase past standard OS defaults on
high speed high latency (<em>i.e.</em>, 100ms or so, such as
transcontinental fast pipes).</p>
+
+ <p>If set to the value of <code>0</code>, the server will use the
+ OS deault.</p>
</usage>
</directivesynopsis>
@@ -475,9 +601,10 @@
<name>ServerLimit</name>
<description>Upper limit on configurable number of processes</description>
<syntax>ServerLimit <var>number</var></syntax>
-<default>ServerLimit 256 (prefork), ServerLimit 16 (worker)</default>
+<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>prefork</module>
+<modulelist><module>leader</module><module>perchild</module>
+<module>prefork</module><module>threadpool</module><module>worker</module>
</modulelist>
<usage>
@@ -503,46 +630,66 @@
<p>With the <module>prefork</module> MPM, use this directive only
if you need to set <directive
- module="mpm_common">MaxClients</directive> higher than 256.
+ module="mpm_common">MaxClients</directive> higher than 256 (default).
Do not set the value of this directive any higher than what you
might want to set <directive
module="mpm_common">MaxClients</directive> to.</p>
- <p>With the <module>worker</module> MPM, use this directive only
+ <p>With <module>worker</module>, <module>leader</module> and
+ <module>threadpool</module> use this directive only
if your <directive module="mpm_common">MaxClients</directive> and
<directive module="mpm_common">ThreadsPerChild</directive>
- settings require more than 16 server processes. Do not set the
- value of this directive any higher than the number of server
+ settings require more than 16 server processes (default). Do not set
+ the value of this directive any higher than the number of server
processes required by what you may want for <directive
module="mpm_common">MaxClients </directive> and <directive
module="mpm_common">ThreadsPerChild</directive>.</p>
+
+ <p>With the <module>perchild</module> MPM, use this directive only
+ if you need to set <directive
+ module="perchild">NumServers</directive> higher than 8 (default).</p>
+
+ <note><title>Note</title>
+ <p>There is a hard limit of <code>ServerLimit 20000</code> compiled
+ into the server. This is intended to avoid nasty effects caused by
+ typos.</p>
+ </note>
</usage>
+<seealso><a href="../stopping.html">Stopping and Restarting Apache</a></seealso>
</directivesynopsis>
<directivesynopsis>
<name>StartServers</name>
<description>Number of child server processes created at startup</description>
<syntax>StartServers <var>number</var></syntax>
-<default>StartServers 5</default>
+<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module></modulelist>
+<modulelist><module>leader</module><module>mpmt_os2</module>
+<module>prefork</module><module>threadpool</module><module>worker</module>
+</modulelist>
<usage>
<p>The <directive>StartServers</directive> directive sets the
number of child server processes created on startup. As the number
of processes is dynamically controlled depending on the load,
there is usually little reason to adjust this parameter.</p>
+
+ <p>The default value differs from MPM to MPM. For
+ <module>leader</module>, <module>threadpool</module> and
+ <module>worker</module> the default is <code>StartServers 3</code>.
+ For <module>prefork</module> defaults to <code>5</code> and for
+ <module>mpmt_os2</module> to <code>2</code>.</p>
</usage>
-<seealso><directive module="mpm_common">MinSpareThreads</directive></seealso>
-<seealso><directive module="mpm_common">MaxSpareThreads</directive></seealso>
</directivesynopsis>
<directivesynopsis>
<name>StartThreads</name>
-<description>Nubmer of threads created on startup</description>
+<description>Number of threads created on startup</description>
<syntax>StartThreads <var>number</var></syntax>
+<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>mpm_netware</module><module>perchild</module></modulelist>
+<modulelist><module>beos</module><module>mpm_netware</module>
+<module>perchild</module></modulelist>
<usage>
<p>Number of threads created on startup. As the
@@ -559,6 +706,9 @@
process, this is the total number of threads created at startup to
serve requests.</p>
+ <p>For <module>beos</module> the default is <code>StartThreads
+ 10</code>. It also reflects the total number of threads created
+ at startup to serve requests.</p>
</usage>
</directivesynopsis>
@@ -567,8 +717,13 @@
<description>Sets the upper limit on the configurable number of threads
per child process</description>
<syntax>ThreadLimit <var>number</var></syntax>
+<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>mpm_winnt</module><module>worker</module></modulelist>
+<modulelist><module>leader</module><module>mpm_winnt</module>
+<module>perchild</module><module>threadpool</module><module>worker</module>
+</modulelist>
+<compatibility>Available for <module>mpm_winnt</module> in Apache 2.0.41
+and later</compatibility>
<usage>
<p>This directive sets the maximum configured value for <directive
@@ -591,9 +746,15 @@
current run of Apache.</p>
<p>The default value for <directive>ThreadLimit</directive> is
- 64 when used with <module>worker</module> and 1920 when used
- with <module>mpm_winnt</module>.</p>
+ <code>1920</code> when used with <module>mpm_winnt</module> and
+ <code>64</code> when used with the others.</p>
+ <note><title>Note</title>
+ <p>There is a hard limit of <code>ThreadLimit 20000</code> (or
+ <code>ThreadLimit 15000</code> with <module>mpm_winnt</module>)
+ compiled into the server. This is intended to avoid nasty effects
+ caused by typos.</p>
+ </note>
</usage>
</directivesynopsis>
@@ -601,24 +762,24 @@
<name>ThreadsPerChild</name>
<description>Number of threads created by each child process</description>
<syntax>ThreadsPerChild <var>number</var></syntax>
+<default>See usage for details</default>
<contextlist><context>server config</context></contextlist>
-<modulelist><module>worker</module><module>mpm_winnt</module>
-</modulelist>
+<modulelist><module>leader</module><module>mpm_winnt</module>
+<module>threadpool</module><module>worker</module></modulelist>
<usage>
<p>This directive sets the number of threads created by each
child process. The child creates these threads at startup and
- never creates more. If using an MPM like mpmt_winnt, where
- there is only one child process, this number should be high
+ never creates more. If using an MPM like <module>mpm_winnt</module>,
+ where there is only one child process, this number should be high
enough to handle the entire load of the server. If using an MPM
- like worker, where there are multiple child processes, the
- total number of threads should be high enough to handle the
- common load on the server.</p>
+ like <module>worker</module>, where there are multiple child processes,
+ the <em>total</em> number of threads should be high enough to handle
+ the common load on the server.</p>
- <p>The default value for this directive is 25 when used with
- <module>worker</module> and 64 when used with
- <module>mpm_winnt</module>.</p>
-
+ <p>The default value for <directive>ThreadsPerChild</directive> is
+ <code>64</code> when used with <module>mpm_winnt</module> and
+ <code>25</code> when used with the others.</p>
</usage>
</directivesynopsis>
@@ -628,51 +789,64 @@
requests</description>
<syntax>User <var>unix-userid</var></syntax>
<default>User #-1</default>
-<contextlist><context>server config</context><context>virtual host</context>
-</contextlist>
-<modulelist><module>worker</module><module>perchild</module>
-<module>prefork</module></modulelist>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>leader</module><module>perchild</module>
+<module>prefork</module><module>threadpool</module><module>worker</module>
+</modulelist>
+<compatibility>Only valid in global server config since Apache
+2.0</compatibility>
<usage>
- <p>The <directive>User</directive> directive sets the userid as
+ <p>The <directive>User</directive> directive sets the user ID as
which the server will answer requests. In order to use this
- directive, the standalone server must be run initially as
- root. <var>Unix-userid</var> is one of:</p>
+ directive, the server must be run initially as <code>root</code>.
+ If you start the server as a non-root user, it will fail to change
+ to the lesser privileged user, and will instead continue to run as
+ that original user. If you do start the server as <code>root</code>,
+ then it is normal for the parent process to remain running as root.
+ <var>Unix-userid</var> is one of:</p>
<dl>
<dt>A username</dt>
-
<dd>Refers to the given user by name.</dd>
<dt># followed by a user number.</dt>
-
- <dd>Refers to a user by their number.</dd>
+ <dd>Refers to a user by its number.</dd>
</dl>
<p>The user should have no privileges that result in it being
able to access files that are not intended to be visible to the
outside world, and similarly, the user should not be able to
- execute code that is not meant for httpd requests. It is
+ execute code that is not meant for HTTP requests. It is
recommended that you set up a new user and group specifically for
running the server. Some admins use user <code>nobody</code>, but
this is not always desirable, since the <code>nobody</code> user
can have other uses on the system.</p>
- <p>Notes: If you start the server as a non-root user, it will
- fail to change to the lesser privileged user, and will instead
- continue to run as that original user. If you do start the
- server as root, then it is normal for the parent process to
- remain running as root.</p>
+ <note type="warning"><title>Security</title>
+ <p>Don't set <directive>User</directive> (or <directive
+ module="mpm_common">Group</directive>) to <code>root</code> unless
+ you know exactly what you are doing, and what the dangers are.</p>
+ </note>
+
+ <p>With the <module>perchild</module> MPM, which is intended to
+ server virtual hosts run under different user IDs, the
+ <directive>User</directive> directive defines the user ID for the
+ main server and the fallback for <directive type="section"
+ module="core">VirtualHost</directive> sections without an
+ <directive module="perchild">AssignUserID</directive> directive.</p>
<p>Special note: Use of this directive in <directive module="core"
type="section">VirtualHost</directive> is no longer supported. To
- configure your server for <a href="mod_suexec.html">suexec</a> use
+ configure your server for <a href="../suexec.html">suexec</a> use
<directive module="mod_suexec">SuexecUserGroup</directive>.</p>
-<note><title>Security</title> <p>Don't set <directive>User</directive>
-(or <directive module="mpm_common">Group</directive>) to
-<code>root</code> unless you know exactly what you are doing, and what
-the dangers are.</p></note>
+ <note><title>Note</title>
+ <p>Although the <directive>User</directive> directive is present
+ in the <module>beos</module> and <module>mpmt_os2</module> MPMs,
+ it is actually a no-op there and only exists for compatibility
+ reasons.</p>
+ </note>
</usage>
</directivesynopsis>
diff --git a/docs/manual/mod/mpm_netware.html.en b/docs/manual/mod/mpm_netware.html.en
index 0fd4991..c5e967e 100644
--- a/docs/manual/mod/mpm_netware.html.en
+++ b/docs/manual/mod/mpm_netware.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mpm_netware - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mpm_netware</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Multi-Processing Module implementing an exclusively threaded web
- server optimized for Novell NetWare</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>MPM</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>mpm_netware_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mpm_netware.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mpm_netware - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM netware</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Multi-Processing Module implementing an exclusively threaded web
+ server optimized for Novell NetWare</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mpm_netware_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mpm_netware.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This Multi-Processing Module (MPM) implements an exclusively
threaded web server that has been optimized for Novell
NetWare.</p>
@@ -29,12 +46,9 @@
regulate how the main thread creates worker threads to serve
requests. In general, Apache 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 250 simultaneous
- requests may need to increase <code class="directive">MaxThreads</code>, while
- sites with limited memory may need to decrease
- <code class="directive">MaxThreads</code> to keep the server from thrashing
- (spawning and terminating idle threads). More information about
- tuning process creation is provided in the <a href="../misc/perf-tuning.html">performance hints</a>
+ values. Sites with limited memory may need to decrease <code class="directive"><a href="#maxthreads">MaxThreads</a></code> to keep the server from
+ thrashing (spawning and terminating idle threads). More information
+ about tuning process creation is provided in the <a href="../misc/perf-tuning.html">performance hints</a>
documentation.</p>
<p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
@@ -42,7 +56,10 @@
ones and launching new ones. On the NetWare OS it is highly
recommended that this directive remain set to 0. This allows worker
threads to continue servicing requests indefinitely.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
@@ -52,25 +69,51 @@
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startthreads">StartThreads</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#threadstacksize">ThreadStackSize</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><a href="../bind.html">Setting which addresses and
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><a href="../bind.html">Setting which addresses and
ports Apache uses</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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MaxThreads <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MaxThreads 250</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>mpm_netware</td></tr></table>
-<p>The MaxThreads directive sets the desired maximum
- number worker threads allowable.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ThreadStackSize" id="ThreadStackSize">ThreadStackSize</a> <a name="threadstacksize" id="threadstacksize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ThreadStackSize <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>ThreadStackSize 65536</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>mpm_netware</td></tr></table>
+</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">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Set the maximum number of worker threads</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MaxThreads <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MaxThreads 2048</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>mpm_netware</td></tr>
+</table>
+ <p>The <code class="directive">MaxThreads</code> directive sets the desired
+ maximum number worker threads allowable. The default value is
+ also the compiled in hard limit. Therefore it can only be lowered,
+ for example:</p>
+
+ <div class="example"><p><code>
+ MaxThreads 512
+ </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="ThreadStackSize" id="ThreadStackSize">ThreadStackSize</a> <a name="threadstacksize" id="threadstacksize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determine the stack size for each thread</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ThreadStackSize <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ThreadStackSize 65536</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>mpm_netware</td></tr>
+</table>
<p>This directive tells the server what stack size to use for
each of the running threads. If you ever get a stack overflow
you will need to bump this number to a higher setting.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_netware.xml b/docs/manual/mod/mpm_netware.xml
index 5888640..622d393 100644
--- a/docs/manual/mod/mpm_netware.xml
+++ b/docs/manual/mod/mpm_netware.xml
@@ -29,12 +29,10 @@
regulate how the main thread creates worker threads to serve
requests. In general, Apache 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 250 simultaneous
- requests may need to increase <directive>MaxThreads</directive>, while
- sites with limited memory may need to decrease
- <directive>MaxThreads</directive> to keep the server from thrashing
- (spawning and terminating idle threads). More information about
- tuning process creation is provided in the <a
+ values. Sites with limited memory may need to decrease <directive
+ module="mpm_netware">MaxThreads</directive> to keep the server from
+ thrashing (spawning and terminating idle threads). More information
+ about tuning process creation is provided in the <a
href="../misc/perf-tuning.html">performance hints</a>
documentation.</p>
@@ -58,33 +56,35 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxSpareThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MinSpareThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>StartThreads</name>
+</directivesynopsis>
<directivesynopsis>
<name>MaxThreads</name>
+<description>Set the maximum number of worker threads</description>
<syntax>MaxThreads <var>number</var></syntax>
-<default>MaxThreads 250</default>
+<default>MaxThreads 2048</default>
<contextlist><context>server config</context></contextlist>
<usage>
-<p>The MaxThreads directive sets the desired maximum
- number worker threads allowable.</p>
+ <p>The <directive>MaxThreads</directive> directive sets the desired
+ maximum number worker threads allowable. The default value is
+ also the compiled in hard limit. Therefore it can only be lowered,
+ for example:</p>
+
+ <example>
+ MaxThreads 512
+ </example>
</usage>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>MaxSpareThreads</name>
-</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>MinSpareThreads</name>
-</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>StartThreads</name>
-</directivesynopsis>
-
<directivesynopsis>
<name>ThreadStackSize</name>
+<description>Determine the stack size for each thread</description>
<syntax>ThreadStackSize <var>number</var></syntax>
<default>ThreadStackSize 65536</default>
<contextlist><context>server config</context></contextlist>
diff --git a/docs/manual/mod/mpm_winnt.html.en b/docs/manual/mod/mpm_winnt.html.en
index cbd0938..29d9dab 100644
--- a/docs/manual/mod/mpm_winnt.html.en
+++ b/docs/manual/mod/mpm_winnt.html.en
@@ -4,22 +4,50 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mpm_winnt - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mpm_winnt</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>This Multi-Processing Module is optimized for Windows
- NT.</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>MPM</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>mpm_winnt_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mpm_winnt.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>mpm_winnt - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM winnt</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>This Multi-Processing Module is optimized for Windows
+NT.</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mpm_winnt_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mpm_winnt.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This Multi-Processing Module (MPM) is the default for the
Windows NT operating systems. It uses a single control process
which launches a single child process which in turn creates
threads to handle requests</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
-</ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</ul>
+</div>
+
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_winnt.html.ja.jis b/docs/manual/mod/mpm_winnt.html.ja.jis
index c64e1bd..a3b85e3 100644
--- a/docs/manual/mod/mpm_winnt.html.ja.jis
+++ b/docs/manual/mod/mpm_winnt.html.ja.jis
@@ -4,18 +4,38 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mpm_winnt - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B mpm_winnt</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>Windows NT
-$B8~$1$K:GE,2=$5$l$?(B$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>mpm_winnt_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>mpm_winnt.c</td></tr></table><h3>$B35MW(B</h3>
- <p>$B$3$N%^%k%A%W%m%;%C(B$B%7%s%0%b%8%e!<%k(B (MPM)
+ -->
+<title>mpm_winnt - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B mpm_winnt</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>Windows NT
+$B8~$1$K:GE,2=$5$l$?%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>mpm_winnt_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>mpm_winnt.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
+ <p>$B$3$N%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)
$B$O(B Windows NT $B$G$N%G%U%)%k%H$K$J$j$^$9!#(B
$B0l$D$N@)8fMQ%W%m%;%9$rMQ$$!"$3$l$,0l$D$N;R%W%m%;%9$r5/F0$7!"(B
$B$=$7$F;R%W%m%;%9$,%j%/%(%9%H$r<h$j07$&$?$a$K%9%l%C%I$r(B
$B5/F0$7$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
@@ -23,4 +43,11 @@
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
-</ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+</ul>
+</div>
+
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_winnt.xml b/docs/manual/mod/mpm_winnt.xml
index ec75530..ed22955 100644
--- a/docs/manual/mod/mpm_winnt.xml
+++ b/docs/manual/mod/mpm_winnt.xml
@@ -5,7 +5,7 @@
<name>mpm_winnt</name>
<description>This Multi-Processing Module is optimized for Windows
- NT.</description>
+NT.</description>
<status>MPM</status>
<sourcefile>mpm_winnt.c</sourcefile>
<identifier>mpm_winnt_module</identifier>
@@ -27,6 +27,8 @@
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>ThreadLimit</name>
diff --git a/docs/manual/mod/mpmt_os2.html.en b/docs/manual/mod/mpmt_os2.html.en
new file mode 100644
index 0000000..f9829c4
--- /dev/null
+++ b/docs/manual/mod/mpmt_os2.html.en
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mpmt_os2 - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM os2</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Hybrid multi-process, multi-threaded MPM for OS/2</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mpm_mpmt_os2_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mpmt_os2.c</td></tr></table>
+<h3>Summary</h3>
+
+ <p>The Server consists of a main, parent process and a small, static
+ number of child processes.</p>
+
+ <p>The parent process's job is to manage the child processes. This
+ involves spawning children as required to ensure there are always
+ <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code> processes
+ accepting connections.</p>
+
+ <p>Each child process consists of a a pool of worker threads and a
+ main thread that accepts connections and passes them to the workers via
+ a work queue. The worker thread pool is dynamic, managed by a
+ maintenance thread so that the number of idle threads is kept between
+ <code class="directive"><a href="../mod/mpm_common.html#minsparethreads">MinSpareThreads</a></code> and
+ <code class="directive"><a href="../mod/mpm_common.html#maxsparethreads">MaxSpareThreads</a></code>.</p>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><a href="../bind.html">Setting which addresses and ports Apache
+uses</a></li>
+</ul></div>
+
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpmt_os2.xml b/docs/manual/mod/mpmt_os2.xml
new file mode 100644
index 0000000..567c657
--- /dev/null
+++ b/docs/manual/mod/mpmt_os2.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
+<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
+
+<modulesynopsis>
+
+<name>mpmt_os2</name>
+<description>Hybrid multi-process, multi-threaded MPM for OS/2</description>
+<status>MPM</status>
+<sourcefile>mpmt_os2.c</sourcefile>
+<identifier>mpm_mpmt_os2_module</identifier>
+
+<summary>
+ <p>The Server consists of a main, parent process and a small, static
+ number of child processes.</p>
+
+ <p>The parent process's job is to manage the child processes. This
+ involves spawning children as required to ensure there are always
+ <directive module="mpm_common">StartServers</directive> processes
+ accepting connections.</p>
+
+ <p>Each child process consists of a a pool of worker threads and a
+ main thread that accepts connections and passes them to the workers via
+ a work queue. The worker thread pool is dynamic, managed by a
+ maintenance thread so that the number of idle threads is kept between
+ <directive module="mpm_common">MinSpareThreads</directive> and
+ <directive module="mpm_common">MaxSpareThreads</directive>.</p>
+</summary>
+<seealso><a href="../bind.html">Setting which addresses and ports Apache
+uses</a></seealso>
+
+<directivesynopsis location="mpm_common"><name>User</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>Group</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>Listen</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ListenBacklog</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxSpareThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MinSpareThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>PidFile</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>StartServers</name>
+</directivesynopsis>
+
+</modulesynopsis>
diff --git a/docs/manual/mod/obs_mod_access.html.en b/docs/manual/mod/obs_mod_access.html.en
deleted file mode 100644
index 58fe845..0000000
--- a/docs/manual/mod/obs_mod_access.html.en
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_access - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Obsolete Apache Module mod_access</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Provides access control based on client hostname, IP
-address, or other characteristics of the client request.</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Obsolete<em> (replaced by <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> since 2.0.44)</em><br /></td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>access_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_access.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available only in versions up to 2.0.43</td></tr></table><h3>Summary</h3>
- <div class="warning"><h3>This module is obsolete!</h3>
- <p>Note, that this module has been marked as obsolete. A bunch
- of modules was introduced in Apache version 2.0.44 that
- support the new Authentication/Authorization provider mechnism.</p>
-
- <p>If you want to use host based access control, you have to invoke the
- <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> module now.</p>
-
- <p>This document is kept only for historical reasons and no
- longer maintained.</p>
- </div>
-
- <p>The directives provided by mod_access are used in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, and <code class="directive"><a href="../mod/core.html#location"><Location></a></code> sections as well as
- <code><a href="core.html#accessfilename">.htaccess</a></code>
- files to control access to particular parts of the server. Access
- can be controlled based on the client hostname, IP address, or
- other characteristics of the client request, as captured in <a href="../env.html">environment variables</a>. The <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives are used to
- specify which clients are or are not allowed access to the server,
- while the <code class="directive"><a href="#order">Order</a></code>
- directive sets the default access state, and configures how the
- <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives interact with each
- other.</p>
-
- <p>Both host-based access restrictions and password-based
- authentication may be implemented simultaneously. In that case,
- the <code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code> directive is used
- to determine how the two sets of restrictions interact.</p>
-
- <p>In general, access restriction directives apply to all
- access methods (<code>GET</code>, <code>PUT</code>,
- <code>POST</code>, etc). This is the desired behavior in most
- cases. However, it is possible to restrict some methods, while
- leaving other methods unrestricted, by enclosing the directives
- in a <code class="directive"><a href="../mod/core.html#limit"><Limit></a></code> section.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#allow">Allow</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#deny">Deny</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#order">Order</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li><li><code class="directive"><a href="../mod/core.html#require">Require</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="Allow" id="Allow">Allow</a> <a name="allow" id="allow">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Controls which hosts can access an area of the
-server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code> Allow from
- all|<var>host</var>|env=<var>env-variable</var>
- [<var>host</var>|env=<var>env-variable</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#Override">Override:
- </a></th><td>Limit</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_access</td></tr></table>
-
- <p>The <code class="directive">Allow</code> directive affects which hosts can
- access an area of the server. Access can be controlled by
- hostname, IP Address, IP Address range, or by other
- characteristics of the client request captured in environment
- variables.</p>
-
- <p>The first argument to this directive is always
- <code>from</code>. The subsequent arguments can take three
- different forms. If <code>Allow from all</code> is specified, then
- all hosts are allowed access, subject to the configuration of the
- <code class="directive"><a href="#deny">Deny</a></code> and <code class="directive"><a href="#order">Order</a></code> directives as discussed
- below. To allow only particular hosts or groups of hosts to access
- the server, the <var>host</var> can be specified in any of the
- following formats:</p>
-
- <dl>
- <dt>A (partial) domain-name</dt>
-
- <dd>Example: <code>Allow from apache.org</code><br />
- Hosts whose names match, or end in, this string are allowed
- access. Only complete components are matched, so the above
- example will match <code>foo.apache.org</code> but it will
- not match <code>fooapache.org</code>. This configuration will
- cause the server to perform a reverse DNS lookup on the
- client IP address, regardless of the setting of the <code class="directive"><a href="../mod/core.html#hostnamelookups">HostnameLookups</a></code>
- directive.</dd>
-
- <dt>A full IP address</dt>
-
- <dd>Example: <code>Allow from 10.1.2.3</code><br />
- An IP address of a host allowed access</dd>
-
- <dt>A partial IP address</dt>
-
- <dd>Example: <code>Allow from 10.1</code><br />
- The first 1 to 3 bytes of an IP address, for subnet
- restriction.</dd>
-
- <dt>A network/netmask pair</dt>
-
- <dd>Example: <code>Allow from
- 10.1.0.0/255.255.0.0</code><br />
- A network a.b.c.d, and a netmask w.x.y.z. For more
- fine-grained subnet restriction.</dd>
-
- <dt>A network/nnn CIDR specification</dt>
-
- <dd>Example: <code>Allow from 10.1.0.0/16</code><br />
- Similar to the previous case, except the netmask consists of
- nnn high-order 1 bits.</dd>
- </dl>
-
- <p>Note that the last three examples above match exactly the
- same set of hosts.</p>
-
- <p>IPv6 addresses and IPv6 subnets can be specified as shown
- below:</p>
-
- <div class="example"><p><code>
- Allow from fe80::a00:20ff:fea7:ccea<br />
- Allow from fe80::a00:20ff:fea7:ccea/10
- </code></p></div>
-
- <p>The third format of the arguments to the
- <code class="directive">Allow</code> directive allows access to the server
- to be controlled based on the existence of an <a href="../env.html">environment variable</a>. When <code>Allow from
- 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>
-
- <div class="example"><h3>Example:</h3><p><code>
- SetEnvIf User-Agent ^KnockKnock/2.0 let_me_in<br />
- <Directory /docroot><br />
- <span class="indent">
- Order Deny,Allow<br />
- Deny from all<br />
- Allow from env=let_me_in<br />
- </span>
- </Directory>
- </code></p></div>
-
- <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>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="Deny" id="Deny">Deny</a> <a name="deny" id="deny">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Controls which hosts are denied access to the
-server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code> Deny from
- all|<var>host</var>|env=<var>env-variable</var>
- [<var>host</var>|env=<var>env-variable</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#Override">Override:
- </a></th><td>Limit</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_access</td></tr></table>
- <p>This directive allows access to the server to be restricted
- based on hostname, IP address, or environment variables. The
- arguments for the <code class="directive">Deny</code> directive are
- identical to the arguments for the <code class="directive"><a href="#allow">Allow</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="Order" id="Order">Order</a> <a name="order" id="order">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Controls the default access state and the order in which
-Allow and Deny are
-evaluated.</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code> Order <var>ordering</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Order Deny,Allow</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>Limit</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_access</td></tr></table>
-
- <p>The <code class="directive">Order</code> directive controls the default
- access state and the order in which <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives are evaluated.
- <var>Ordering</var> is one of</p>
-
- <dl>
- <dt>Deny,Allow</dt>
-
- <dd>The <code class="directive"><a href="#deny">Deny</a></code> directives
- are evaluated before the <code class="directive"><a href="#allow">Allow</a></code> directives. Access is
- allowed by default. Any client which does not match a
- <code class="directive"><a href="#deny">Deny</a></code> directive or does
- match an <code class="directive"><a href="#allow">Allow</a></code>
- directive will be allowed access to the server.</dd>
-
- <dt>Allow,Deny</dt>
-
- <dd>The <code class="directive"><a href="#allow">Allow</a></code>
- directives are evaluated before the <code class="directive"><a href="#deny">Deny</a></code> directives. Access is denied
- by default. Any client which does not match an <code class="directive"><a href="#allow">Allow</a></code> directive or does match a
- <code class="directive"><a href="#deny">Deny</a></code> directive will be
- denied access to the server.</dd>
-
- <dt>Mutual-failure</dt>
-
- <dd>Only those hosts which appear on the <code class="directive"><a href="#allow">Allow</a></code> list and do not appear on
- the <code class="directive"><a href="#deny">Deny</a></code> list are
- granted access. This ordering has the same effect as <code>Order
- Allow,Deny</code> and is deprecated in favor of that
- configuration.</dd>
- </dl>
-
- <p>Keywords may only be separated by a comma; no whitespace is
- allowed between them. Note that in all cases every <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> statement is evaluated.</p>
-
- <p>In the following example, all hosts in the apache.org domain
- are allowed access; all other hosts are denied access.</p>
-
- <div class="example"><p><code>
- Order Deny,Allow<br />
- Deny from all<br />
- Allow from apache.org
- </code></p></div>
-
- <p>In the next example, all hosts in the apache.org domain are
- allowed access, except for the hosts which are in the
- foo.apache.org subdomain, who are denied access. All hosts not
- in the apache.org domain are denied access because the default
- state is to deny access to the server.</p>
-
- <div class="example"><p><code>
- Order Allow,Deny<br />
- Allow from apache.org<br />
- Deny from foo.apache.org
- </code></p></div>
-
- <p>On the other hand, if the <code class="directive">Order</code> in the last
- example is changed to <code>Deny,Allow</code>, all hosts will
- be allowed access. This happens because, regardless of the
- actual ordering of the directives in the configuration file,
- the <code>Allow from apache.org</code> will be evaluated last
- and will override the <code>Deny from foo.apache.org</code>.
- All hosts not in the <code>apache.org</code> domain will also
- be allowed access because the default state will change to
- <var>allow</var>.</p>
-
- <p>The presence of an <code class="directive">Order</code> directive can affect
- access to a part of the server even in the absence of accompanying
- <code class="directive"><a href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code> directives because of its effect
- on the default access state. For example,</p>
-
- <div class="example"><p><code>
- <Directory /www><br />
- <span class="indent">
- Order Allow,Deny<br />
- </span>
- </Directory>
- </code></p></div>
-
- <p>will deny all access to the <code>/www</code> directory
- because the default access state will be set to
- <var>deny</var>.</p>
-
- <p>The <code class="directive">Order</code> directive controls the order of access
- directive processing only within each phase of the server's
- configuration processing. This implies, for example, that an
- <code class="directive"><a href="#allow">Allow</a></code> or <code class="directive"><a href="#deny">Deny</a></code> directive occurring in a
- <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section will
- always be evaluated after an <code class="directive"><a href="#allow">Allow</a></code> or <code class="directive"><a href="#deny">Deny</a></code> directive occurring in a
- <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> section or
- <code>.htaccess</code> file, regardless of the setting of the
- <code class="directive">Order</code> directive. For details on the merging
- of configuration sections, see the documentation on <a href="../sections.html">How Directory, Location and Files sections
- work</a>.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/obs_mod_auth.html.en b/docs/manual/mod/obs_mod_auth.html.en
deleted file mode 100644
index 5ddf603..0000000
--- a/docs/manual/mod/obs_mod_auth.html.en
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_auth - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Obsolete Apache Module mod_auth</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>User authentication using text files</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Obsolete<em> (obsolete since 2.0.44)</em><br /></td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>auth_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_auth.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available only in versions up to 2.0.43</td></tr></table><h3>Summary</h3>
- <div class="warning"><h3>This module is obsolete!</h3>
- <p>Note, that this module has been marked as obsolete. A bunch
- of modules was introduced in Apache version 2.0.44 that
- support the new Authentication/Authorization provider mechnism.</p>
-
- <p>In order to get the ability of HTTP Basic Authentication, you have
- to use the <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> module that implements
- the HTTP part. <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code> provides for user
- authentication based on plain text files. File based group
- authorization is now done by the <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code>
- module.</p>
-
- <p>This document is kept only for historical reasons and no
- longer maintained.</p>
- </div>
-
- <p>This module allows the use of HTTP Basic Authentication to
- restrict access by looking up users in plain text password and
- group files. Similar functionality and greater scalability is
- provided by <code class="module"><a href="../mod/obs_mod_auth_dbm.html">mod_auth_dbm</a></code>. HTTP Digest
- Authentication is provided by
- <code class="module"><a href="../mod/obs_mod_auth_digest.html">mod_auth_digest</a></code>.</p>
-
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authauthoritative">AuthAuthoritative</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authgroupfile">AuthGroupFile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authuserfile">AuthUserFile</a></li>
-</ul><h3>See also</h3><ul class="seealso"><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><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></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthAuthoritative" id="AuthAuthoritative">AuthAuthoritative</a> <a name="authauthoritative" id="authauthoritative">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 lower level modules</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthAuthoritative on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthAuthoritative 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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth</td></tr></table>
- <div class="note">This information has not been updated for Apache 2.0, which
- uses a different system for module ordering.</div>
-
- <p>Setting the <code class="directive">AuthAuthoritative</code> directive
- explicitly to <strong>'off'</strong> allows for both
- authentication and authorization to be passed on to lower level
- modules (as defined in the <code>Configuration</code> and
- <code>modules.c</code> files) if there is <strong>no
- userID</strong> or <strong>rule</strong> matching the supplied
- userID. If there is a userID and/or rule specified; the usual
- password and access checks will be applied and a failure will give
- an Authorization Required reply.</p>
-
- <p>So if a userID appears in the database of more than one module;
- or if a valid <code class="directive"><a href="../mod/core.html#require">Require</a></code>
- directive applies to more than one module; then the first module
- will verify the credentials; and no access is passed on;
- regardless of the AuthAuthoritative setting.</p>
-
- <p>A common use for this is in conjunction with one of the
- database modules; such as <code class="module"><a href="../mod/obs_mod_auth_dbm.html">mod_auth_dbm</a></code>,
- <code>mod_auth_msql</code>, and <code class="module"><a href="../mod/obs_mod_auth_anon.html">mod_auth_anon</a></code>.
- These modules supply the bulk of the user credential checking; but
- a few (administrator) related accesses fall through to a lower
- level with a well protected <code class="directive"><a href="#authuserfile">AuthUserFile</a></code>.</p>
-
- <p>By default; control is not passed on; and an unknown userID or
- rule will result in an Authorization Required reply. Not setting
- it thus keeps the system secure; and forces an NCSA compliant
- behaviour.</p>
-
- <div class="note"><h3>Security</h3> Do consider the implications of
- allowing a user to allow fall-through in his .htaccess file; and
- verify that this is really what you want; Generally it is easier
- to just secure a single .htpasswd file, than it is to secure a
- database such as mSQL. Make sure that the <code class="directive"><a href="#authuserfile">AuthUserFile</a></code> and the <code class="directive"><a href="#authgroupfile">AuthGroupFile</a></code> are stored outside the
- document tree of the web-server; do <em>not</em> put them in the
- directory that they protect. Otherwise, clients will be able to
- download the <code class="directive"><a href="#authuserfile">AuthUserFile</a></code>
- and the <code class="directive"><a href="#authgroupfile">AuthGroupFile</a></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="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
-of user groups for authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthGroupFile <var>file-path</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#Override">Override:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth</td></tr></table>
- <p>The <code class="directive">AuthGroupFile</code> directive sets the
- name of a textual file containing the list of user groups for user
- authentication. <var>File-path</var> is the path to the group
- file. If it is not absolute (<em>i.e.</em>, if it doesn't begin
- with a slash), it is treated as relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</p>
-
- <p>Each line of the group file contains a groupname followed by a
- colon, followed by the member usernames separated by spaces.
- Example:</p>
-
- <div class="example"><p><code>mygroup: bob joe anne</code></p></div>
-
- <p>Note that searching large text files is <em>very</em>
- inefficient; <code class="directive"><a href="../mod/obs_mod_auth_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code> should be used
- instead.</p>
-
- <div class="note"><h3>Security</h3>
- <p>Make sure that the <code class="directive">AuthGroupFile</code> is
- stored outside the document tree of the web-server; do <em>not</em>
- put it in the directory that it protects. Otherwise, clients will
- be able to download the <code class="directive">AuthGroupFile</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="AuthUserFile" id="AuthUserFile">AuthUserFile</a> <a name="authuserfile" id="authuserfile">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 of users and
-passwords for authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthUserFile <var>file-path</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#Override">Override:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth</td></tr></table>
- <p>The <code class="directive">AuthUserFile</code> directive sets the name
- of a textual file containing the list of users and passwords for
- user authentication. <var>File-path</var> is the path to the user
- file. If it is not absolute (<em>i.e.</em>, if it doesn't begin
- with a slash), it is treated as relative to the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>.</p>
-
- <p>Each line of the user file contains a username followed by
- a colon, followed by the <code>crypt()</code> encrypted
- password. The behavior of multiple occurrences of the same user is
- undefined.</p>
-
- <p>The utility <a href="../programs/htpasswd.html">htpasswd</a>
- which is installed as part of the binary distribution, or which
- can be found in <code>src/support</code>, is used to maintain
- this password file. See the <code>man</code> page for more
- details. In short:</p>
-
- <p>Create a password file 'Filename' with 'username' as the
- initial ID. It will prompt for the password:</p>
-
- <div class="example"><p><code>htpasswd -c Filename username</code></p></div>
-
- <p>Add or modify 'username2' in the password file 'Filename':</p>
-
- <div class="example"><p><code>htpasswd Filename username2</code></p></div>
-
- <p>Note that searching large text files is <em>very</em>
- inefficient; <code class="directive"><a href="../mod/obs_mod_auth_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code> should be used
- instead.</p>
-
- <div class="note"><h3>Security</h3>
- <p>Make sure that the <code class="directive">AuthUserFile</code> is
- stored outside the document tree of the web-server; do <em>not</em>
- put it in the directory that it protects. Otherwise, clients will
- be able to download the <code class="directive">AuthUserFile</code>.</p>
- </div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/obs_mod_auth.xml b/docs/manual/mod/obs_mod_auth.xml
deleted file mode 100644
index 9085ccf..0000000
--- a/docs/manual/mod/obs_mod_auth.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<modulesynopsis>
-
-<name>mod_auth</name>
-<description>User authentication using text files</description>
-<status>Obsolete</status>
-<hint>obsolete since 2.0.44</hint>
-<sourcefile>mod_auth.c</sourcefile>
-<identifier>auth_module</identifier>
-<compatibility>Available only in versions up to 2.0.43</compatibility>
-
-<summary>
- <note type="warning"><title>This module is obsolete!</title>
- <p>Note, that this module has been marked as obsolete. A bunch
- of modules was introduced in Apache version 2.0.44 that
- support the new Authentication/Authorization provider mechnism.</p>
-
- <p>In order to get the ability of HTTP Basic Authentication, you have
- to use the <module>mod_auth_basic</module> module that implements
- the HTTP part. <module>mod_authn_file</module> provides for user
- authentication based on plain text files. File based group
- authorization is now done by the <module>mod_authz_groupfile</module>
- module.</p>
-
- <p>This document is kept only for historical reasons and no
- longer maintained.</p>
- </note>
-
- <p>This module allows the use of HTTP Basic Authentication to
- restrict access by looking up users in plain text password and
- group files. Similar functionality and greater scalability is
- provided by <module status="obsolete">mod_auth_dbm</module>. HTTP Digest
- Authentication is provided by
- <module status="obsolete">mod_auth_digest</module>.</p>
-
-</summary>
-<seealso><directive module="core">Require</directive></seealso>
-<seealso><directive module="core">Satisfy</directive></seealso>
-<seealso><directive module="core">AuthName</directive></seealso>
-<seealso><directive module="core">AuthType</directive></seealso>
-
-<directivesynopsis>
-<name>AuthGroupFile</name>
-<description>Sets the name of a text file containing the list
-of user groups for authentication</description>
-<syntax>AuthGroupFile <var>file-path</var></syntax>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthGroupFile</directive> directive sets the
- name of a textual file containing the list of user groups for user
- authentication. <var>File-path</var> is the path to the group
- file. If it is not absolute (<em>i.e.</em>, if it doesn't begin
- with a slash), it is treated as relative to the <directive
- module="core">ServerRoot</directive>.</p>
-
- <p>Each line of the group file contains a groupname followed by a
- colon, followed by the member usernames separated by spaces.
- Example:</p>
-
- <example>mygroup: bob joe anne</example>
-
- <p>Note that searching large text files is <em>very</em>
- inefficient; <directive
- module="mod_auth_dbm" status="obsolete">AuthDBMGroupFile</directive> should be used
- instead.</p>
-
- <note><title>Security</title>
- <p>Make sure that the <directive>AuthGroupFile</directive> is
- stored outside the document tree of the web-server; do <em>not</em>
- put it in the directory that it protects. Otherwise, clients will
- be able to download the <directive>AuthGroupFile</directive>.</p>
- </note>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthUserFile</name>
-<description>Sets the name of a text file containing the list of users and
-passwords for authentication</description>
-<syntax>AuthUserFile <var>file-path</var></syntax>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthUserFile</directive> directive sets the name
- of a textual file containing the list of users and passwords for
- user authentication. <var>File-path</var> is the path to the user
- file. If it is not absolute (<em>i.e.</em>, if it doesn't begin
- with a slash), it is treated as relative to the <directive
- module="core">ServerRoot</directive>.</p>
-
- <p>Each line of the user file contains a username followed by
- a colon, followed by the <code>crypt()</code> encrypted
- password. The behavior of multiple occurrences of the same user is
- undefined.</p>
-
- <p>The utility <a href="../programs/htpasswd.html">htpasswd</a>
- which is installed as part of the binary distribution, or which
- can be found in <code>src/support</code>, is used to maintain
- this password file. See the <code>man</code> page for more
- details. In short:</p>
-
- <p>Create a password file 'Filename' with 'username' as the
- initial ID. It will prompt for the password:</p>
-
- <example>htpasswd -c Filename username</example>
-
- <p>Add or modify 'username2' in the password file 'Filename':</p>
-
- <example>htpasswd Filename username2</example>
-
- <p>Note that searching large text files is <em>very</em>
- inefficient; <directive
- module="mod_auth_dbm" status="obsolete">AuthDBMUserFile</directive> should be used
- instead.</p>
-
- <note><title>Security</title>
- <p>Make sure that the <directive>AuthUserFile</directive> is
- stored outside the document tree of the web-server; do <em>not</em>
- put it in the directory that it protects. Otherwise, clients will
- be able to download the <directive>AuthUserFile</directive>.</p>
- </note>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthAuthoritative</name>
-<description>Sets whether authorization and authentication are
-passed to lower level modules</description>
-<syntax>AuthAuthoritative on|off</syntax>
-<default>AuthAuthoritative on</default>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <note>This information has not been updated for Apache 2.0, which
- uses a different system for module ordering.</note>
-
- <p>Setting the <directive>AuthAuthoritative</directive> directive
- explicitly to <strong>'off'</strong> allows for both
- authentication and authorization to be passed on to lower level
- modules (as defined in the <code>Configuration</code> and
- <code>modules.c</code> files) if there is <strong>no
- userID</strong> or <strong>rule</strong> matching the supplied
- userID. If there is a userID and/or rule specified; the usual
- password and access checks will be applied and a failure will give
- an Authorization Required reply.</p>
-
- <p>So if a userID appears in the database of more than one module;
- or if a valid <directive module="core">Require</directive>
- directive applies to more than one module; then the first module
- will verify the credentials; and no access is passed on;
- regardless of the AuthAuthoritative setting.</p>
-
- <p>A common use for this is in conjunction with one of the
- database modules; such as <module status="obsolete">mod_auth_dbm</module>,
- <code>mod_auth_msql</code>, and <module status="obsolete">mod_auth_anon</module>.
- These modules supply the bulk of the user credential checking; but
- a few (administrator) related accesses fall through to a lower
- level with a well protected <directive
- module="mod_auth" status="obsolete">AuthUserFile</directive>.</p>
-
- <p>By default; control is not passed on; and an unknown userID or
- rule will result in an Authorization Required reply. Not setting
- it thus keeps the system secure; and forces an NCSA compliant
- behaviour.</p>
-
- <note><title>Security</title> Do consider the implications of
- allowing a user to allow fall-through in his .htaccess file; and
- verify that this is really what you want; Generally it is easier
- to just secure a single .htpasswd file, than it is to secure a
- database such as mSQL. Make sure that the <directive
- module="mod_auth" status="obsolete">AuthUserFile</directive> and the <directive
- module="mod_auth" status="obsolete">AuthGroupFile</directive> are stored outside the
- document tree of the web-server; do <em>not</em> put them in the
- directory that they protect. Otherwise, clients will be able to
- download the <directive module="mod_auth" status="obsolete">AuthUserFile</directive>
- and the <directive module="mod_auth" status="obsolete">AuthGroupFile</directive>.
- </note>
-</usage>
-</directivesynopsis>
-
-</modulesynopsis>
diff --git a/docs/manual/mod/obs_mod_auth_anon.html.en b/docs/manual/mod/obs_mod_auth_anon.html.en
deleted file mode 100644
index 6dcb4ad..0000000
--- a/docs/manual/mod/obs_mod_auth_anon.html.en
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_auth_anon - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Obsolete Apache Module mod_auth_anon</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Allows "anonymous" user access to authenticated
- areas</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Obsolete<em> (replaced by <code class="module"><a href="../mod/mod_authn_anon.html">mod_authn_anon</a></code> since 2.0.44)</em><br /></td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>auth_anon_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_auth_anon.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available only in versions up to 2.0.43</td></tr></table><h3>Summary</h3>
- <div class="warning"><h3>This module is obsolete!</h3>
- <p>Note, that this module has been marked as obsolete. A bunch
- of modules was introduced in Apache version 2.0.44 that
- support the new Authentication/Authorization provider mechnism.</p>
-
- <p>In order to get the same functionality, you have to invoke the
- <code class="module"><a href="../mod/mod_authn_anon.html">mod_authn_anon</a></code> module now.</p>
-
-
-
-
- <p>This document is kept only for historical reasons and no
- longer maintained.</p>
- </div>
-
- <p>This module does access control in a manner similar to
- anonymous-ftp sites; <em>i.e.</em> have a 'magic' user id
- 'anonymous' and the email address as a password. These email
- addresses can be logged.</p>
-
- <p>Combined with other (database) access control methods, this
- allows for effective user tracking and customization according
- to a user profile while still keeping the site open for
- 'unregistered' users. One advantage of using Auth-based user
- tracking is that, unlike magic-cookies and funny URL
- pre/postfixes, it is completely browser independent and it
- allows users to share URLs.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#anonymous">Anonymous</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_authoritative">Anonymous_Authoritative</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_logemail">Anonymous_LogEmail</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_nouserid">Anonymous_NoUserID</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#example">Example</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 (when combined with the Auth directives of a
- htpasswd-file based (or GDM, mSQL etc.) base access
- control system allows users in as 'guests' with the following
- properties:</p>
-
- <ul>
- <li>It insists that the user enters a userId.
- (<code>Anonymous_NoUserId</code>)</li>
-
- <li>It insists that the user enters a password.
- (<code>Anonymous_MustGiveEmail</code>)</li>
-
- <li>The password entered must be a valid email address, ie.
- contain at least one '@' and a '.'.
- (<code>Anonymous_VerifyEmail</code>)</li>
-
- <li>The userID must be one of <code>anonymous guest www test
- welcome</code> and comparison is <strong>not</strong> case
- sensitive.</li>
-
- <li>And the Email addresses entered in the passwd field are
- logged to the error log file
- (<code>Anonymous_LogEmail</code>)</li>
- </ul>
-
- <p>Excerpt of httpd.conf:</p>
-
- <div class="example"><p><code>
- Anonymous_NoUserId off<br />
- Anonymous_MustGiveEmail on<br />
- Anonymous_VerifyEmail on<br />
- Anonymous_LogEmail on<br />
- Anonymous anonymous guest www test welcome<br />
- <br />
- AuthName "Use 'anonymous' & Email address for guest entry"<br />
- AuthType basic<br />
- <br />
- # An
- AuthUserFile/AuthDBUserFile/AuthDBMUserFile<br />
- # directive must be specified, or use<br />
- # Anonymous_Authoritative for public access.<br />
- # In the .htaccess for the public directory, add:<br />
- <Files *><br />
- <span class="indent">
- Order Deny,Allow<br />
- Allow from all<br />
- <br />
- Require valid-user<br />
- </span>
- </Files>
- </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">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Specifies userIDs that areallowed access without
-password verification</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous <var>user</var> [<var>user</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#Override">Override:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_anon</td></tr></table>
- <p>A list of one or more 'magic' userIDs which are allowed
- access without password verification. The userIDs are space
- separated. It is possible to use the ' and " quotes to allow a
- space in a userID as well as the \ escape character.</p>
-
- <p>Please note that the comparison is
- <strong>case-IN-sensitive</strong>.<br />
- I strongly suggest that the magic username
- '<code>anonymous</code>' is always one of the allowed
- userIDs.</p>
-
- <div class="example"><h3>Example:</h3><p><code>
- Anonymous anonymous "Not Registered" 'I don\'t know'
- </code></p></div>
-
- <p>This would allow the user to enter without password
- verification by using the userId's 'anonymous',
- 'AnonyMous','Not Registered' and 'I Don't Know'.</p>
-</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_Authoritative" id="Anonymous_Authoritative">Anonymous_Authoritative</a> <a name="anonymous_authoritative" id="anonymous_authoritative">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Configures if authorization will fall-through
-to other methods</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous_Authoritative on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Anonymous_Authoritative 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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_anon</td></tr></table>
- <p>When set 'on', there is no fall-through to other authorization
- methods. So if a userID does not match the values specified in the
- <code class="directive"><a href="#anonymous">Anonymous</a></code> directive,
- access is denied.</p>
-
- <p>Be sure you know what you are doing when you decide to
- switch it on. And remember that it is the linking order of the
- modules (in the Configuration / Make file) which details the
- order in which the Authorization modules are queried.</p>
-</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_LogEmail" id="Anonymous_LogEmail">Anonymous_LogEmail</a> <a name="anonymous_logemail" id="anonymous_logemail">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets whether the password entered will be logged in the
-error log</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous_LogEmail on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Anonymous_LogEmail 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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_anon</td></tr></table>
- <p>When set <code>on</code>, the default, the 'password' entered
- (which hopefully contains a sensible email address) is logged in
- the 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="Anonymous_MustGiveEmail" id="Anonymous_MustGiveEmail">Anonymous_MustGiveEmail</a> <a name="anonymous_mustgiveemail" id="anonymous_mustgiveemail">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Specifies whether blank passwords are allowed</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous_MustGiveEmail on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Anonymous_MustGiveEmail 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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_anon</td></tr></table>
- <p>Specifies whether the user must specify an email address as
- the password. This prohibits blank passwords.</p>
-</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_NoUserID" id="Anonymous_NoUserID">Anonymous_NoUserID</a> <a name="anonymous_nouserid" id="anonymous_nouserid">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets whether the userID field may be empty</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous_NoUserID on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Anonymous_NoUserID 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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_anon</td></tr></table>
- <p>When set <code>on</code>, users can leave the userID (and
- perhaps the password field) empty. This can be very convenient for
- MS-Explorer users who can just hit return or click directly on the
- OK button; which seems a natural reaction.</p>
-</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_VerifyEmail" id="Anonymous_VerifyEmail">Anonymous_VerifyEmail</a> <a name="anonymous_verifyemail" id="anonymous_verifyemail">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets whether to check the password field for a correctly
-formatted email address</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>Anonymous_VerifyEmail on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>Anonymous_VerifyEmail 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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_anon</td></tr></table>
- <p>When set <code>on</code> the 'password' entered is checked for
- at least one '@' and a '.' to encourage users to enter valid email
- addresses (see the above <code class="directive"><a href="#auth_logemail">Auth_LogEmail</a></code>).</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/obs_mod_auth_dbm.html.en b/docs/manual/mod/obs_mod_auth_dbm.html.en
deleted file mode 100644
index 0fe3d2d..0000000
--- a/docs/manual/mod/obs_mod_auth_dbm.html.en
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_auth_dbm - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Obsolete Apache Module mod_auth_dbm</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Provides for user authentication using DBM
- files</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Obsolete<em> (obsolete since 2.0.44)</em><br /></td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>auth_dbm_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_auth_dbm.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available only in versions up to 2.0.43</td></tr></table><h3>Summary</h3>
- <div class="warning"><h3>This module is obsolete!</h3>
- <p>Note, that this module has been marked as obsolete. A bunch
- of modules was introduced in Apache version 2.0.44 that
- support the new Authentication/Authorization provider mechnism.</p>
-
- <p>In order to get the ability of HTTP Basic Authentication, you have
- to use the <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> module that implements
- the HTTP part. <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code> provides for user
- authentication based on DBM-files. DBM-File based group
- authorization is now done by the <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>
- module.</p>
-
- <p>This document is kept only for historical reasons and no
- longer maintained.</p>
- </div>
-
- <p>This module provides for HTTP Basic Authentication, where
- the usernames and passwords are stored in DBM type database
- files. It is an alternative to the plain text password files
- provided by <code class="module"><a href="../mod/obs_mod_auth.html">mod_auth</a></code>.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authdbmauthoritative">AuthDBMAuthoritative</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdbmgroupfile">AuthDBMGroupFile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdbmtype">AuthDBMType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdbmuserfile">AuthDBMUserFile</a></li>
-</ul><h3>See also</h3><ul class="seealso"><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><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></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthDBMAuthoritative" id="AuthDBMAuthoritative">AuthDBMAuthoritative</a> <a name="authdbmauthoritative" id="authdbmauthoritative">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets whether authentication and authorization will be
-passwed on to lower level modules</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDBMAuthoritative on|off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthDBMAuthoritative 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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_dbm</td></tr></table>
-
-<div class="note">This information has not been updated to take into account the
-new module ordering techniques in Apache 2.0</div>
-
- <p>Setting the <code class="directive">AuthDBMAuthoritative</code>
- directive explicitly to <strong>'off'</strong> allows for both
- authentication and authorization to be passed on to lower level
- modules (as defined in the <code>Configuration</code> and
- <code>modules.c</code> file if there is <strong>no userID</strong>
- or <strong>rule</strong> matching the supplied userID. If there is
- a userID and/or rule specified; the usual password and access
- checks will be applied and a failure will give an Authorization
- Required reply.</p>
-
- <p>So if a userID appears in the database of more than one module;
- or if a valid <code class="directive"><a href="../mod/core.html#require">Require</a></code>
- directive applies to more than one module; then the first module
- will verify the credentials; and no access is passed on;
- regardless of the <code class="directive">AuthAuthoritative</code> setting.</p>
-
- <p>A common use for this is in conjunction with one of the
- basic auth modules; such as <code class="module"><a href="../mod/obs_mod_auth.html">mod_auth</a></code>. Whereas this
- DBM module supplies the bulk of the user credential checking; a
- few (administrator) related accesses fall through to a lower
- level with a well protected .htpasswd file.</p>
-
- <p>By default, control is not passed on and an unknown userID
- or rule will result in an Authorization Required reply. Not
- setting it thus keeps the system secure and forces an NCSA
- compliant behaviour.</p>
-
- <p>Security: Do consider the implications of allowing a user to
- allow fall-through in his .htaccess file; and verify that this
- is really what you want; Generally it is easier to just secure
- a single .htpasswd file, than it is to secure a database which
- might have more access interfaces.</p>
-</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
-of user groups for authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDBMGroupFile <var>file-path</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#Override">Override:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_dbm</td></tr></table>
- <p>The <code class="directive">AuthDBMGroupFile</code> directive sets the
- name of a DBM file containing the list of user groups for user
- authentication. <var>File-path</var> is the absolute path to the
- group file.</p>
-
- <p>The group file is keyed on the username. The value for a
- user is a comma-separated list of the groups to which the users
- belongs. There must be no whitespace within the value, and it
- must never contain any colons.</p>
-
- <p>Security: make sure that the
- <code class="directive">AuthDBMGroupFile</code> is stored outside the
- document tree of the web-server; do <em>not</em> put it in the
- directory that it protects. Otherwise, clients will be able to
- download the <code class="directive">AuthDBMGroupFile</code> unless
- otherwise protected.</p>
-
- <p>Combining Group and Password DBM files: In some cases it is
- easier to manage a single database which contains both the
- password and group details for each user. This simplifies any
- support programs that need to be written: they now only have to
- deal with writing to and locking a single DBM file. This can be
- accomplished by first setting the group and password files to
- point to the same DBM:</p>
-
- <div class="example"><p><code>
- AuthDBMGroupFile /www/userbase<br />
- AuthDBMUserFile /www/userbase
- </code></p></div>
-
- <p>The key for the single DBM is the username. The value consists
- of</p>
-
- <div class="example"><p><code>
- <var>Unix Crypt-ed Password</var>:<var>List of Groups</var>[:(ignored)]
- </code></p></div>
-
- <p>The password section contains the Unix <code>crypt()</code>
- password as before. This is followed by a colon and the comma
- separated list of groups. Other data may optionally be left in the
- DBM file after another colon; it is ignored by the authentication
- module. This is what www.telescope.org uses for its combined
- password and group database.</p>
-</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"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets the type of database file that is used to
-store passwords</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDBMType default|SDBM|GDBM|NDBM|DB</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthDBMType default</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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_dbm</td></tr><tr><th><a href="directive-dict.html#Compatibility">Compatibility:
- </a></th><td>Available in version 2.0.30 and later.</td></tr></table>
-
-<p>Sets the type of database file that is used to store the passwords.
-The default database type is determined at compile time. The
-availability of other types of database files also depends on
-<a href="../install.html#dbm">compile-time settings</a>.</p>
-
-<p>It is crucial that whatever program you use to create your password
-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="directive-section"><h2><a name="AuthDBMUserFile" id="AuthDBMUserFile">AuthDBMUserFile</a> <a name="authdbmuserfile" id="authdbmuserfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Sets thename of a database file containing the list of users and
-passwords for authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDBMUserFile <var>file-path</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#Override">Override:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_dbm</td></tr></table>
- <p>The <code class="directive">AuthDBMUserFile</code> directive sets the
- name of a DBM file containing the list of users and passwords for
- user authentication. <var>File-path</var> is the absolute path to
- the user file.</p>
-
- <p>The user file is keyed on the username. The value for a user is
- the <code>crypt()</code> encrypted password, optionally followed
- by a colon and arbitrary data. The colon and the data following it
- will be ignored by the server.</p>
-
- <p>Security: make sure that the
- <code class="directive">AuthDBMUserFile</code> is stored outside the
- document tree of the web-server; do <em>not</em> put it in the
- directory that it protects. Otherwise, clients will be able to
- download the <code class="directive">AuthDBMUserFile</code>.</p>
-
- <p>Important compatibility note: The implementation of
- "dbmopen" in the apache modules reads the string length of the
- hashed values from the DBM data structures, rather than relying
- upon the string being NULL-appended. Some applications, such as
- the Netscape web server, rely upon the string being
- NULL-appended, so if you are having trouble using DBM files
- interchangeably between applications this may be a part of the
- problem.</p>
-
- <p>A perl script called
- <a href="../programs/dbmmanage.html">dbmmanage</a> is included with
- Apache. This program can be used to create and update DBM
- format password files for use with this module.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/obs_mod_auth_digest.html.en b/docs/manual/mod/obs_mod_auth_digest.html.en
deleted file mode 100644
index be2c1e0..0000000
--- a/docs/manual/mod/obs_mod_auth_digest.html.en
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>mod_auth_digest - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Obsolete Apache Module mod_auth_digest</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>User authentication using MD5
- Digest Authentication.</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>Obsolete<em> (obsolete since 2.0.44)</em><br /></td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>auth_digest_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>mod_auth_digest.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility:
- </a></th><td>Available only in versions up to 2.0.43. The new module
-that unfortunately is also named <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
-includes support for the auth provider mechanism introduced
-in 2.0.44.</td></tr></table><h3>Summary</h3>
- <div class="warning"><h3>This module is obsolete!</h3>
- <p>Note, that this module has been marked as obsolete. A bunch
- of modules was introduced in Apache version 2.0.44 that
- support the new Authentication/Authorization provider mechnism.</p>
-
- <p>In order to get the ability of HTTP Digest Authentication, you have
- to use the new <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> module that implements
- the HTTP part. The user and group data management is provided by the
- <code>mod_authn_*</code> and <code>mod_authz_*</code> modules. If you
- want to use your existing user files, have a look at <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>.</p>
-
- <p>This document is kept only for historical reasons and no
- longer maintained.</p>
- </div>
-
- <p>This module implements HTTP Digest Authentication. However, it
- has not been extensively tested and is therefore marked
- experimental.</p>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#authdigestalgorithm">AuthDigestAlgorithm</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdigestdomain">AuthDigestDomain</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdigestfile">AuthDigestFile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdigestgroupfile">AuthDigestGroupFile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdigestnccheck">AuthDigestNcCheck</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdigestnonceformat">AuthDigestNonceFormat</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdigestnoncelifetime">AuthDigestNonceLifetime</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdigestqop">AuthDigestQop</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#using">Using Digest Authentication</a></li></ul><h3>See also</h3><ul class="seealso"><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><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></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>Using MD5 Digest authentication is very simple. Simply set
- up authentication normally, using "AuthType Digest" and
- "AuthDigestFile" instead of the normal "AuthType Basic" and
- "AuthUserFile"; also, replace any "AuthGroupFile" with
- "AuthDigestGroupFile". Then add a "AuthDigestDomain" directive
- containing at least the root URI(s) for this protection space.
- Example:</p>
-
- <div class="example"><p><code>
- <Location /private/><br />
- <span class="indent">
- AuthType Digest<br />
- AuthName "private area"<br />
- AuthDigestDomain /private/ http://mirror.my.dom/private2/<br />
- AuthDigestFile /web/auth/.digest_pw<br />
- Require valid-user<br />
- </span>
- </Location>
- </code></p></div>
-
- <div class="note"><h3>Note</h3>
- <p>Digest authentication provides a more secure password system
- than Basic authentication, but only works with supporting
- browsers. As of July 2002, the major browsers that support digest
- authentication are <a href="http://www.opera.com/">Opera</a>, <a href="http://www.microsoft.com/windows/ie/">MS Internet
- Explorer</a> (fails when used with a query string), <a href="http://www.w3.org/Amaya/">Amaya</a> and <a href="http://www.mozilla.org">Mozilla</a>. Since digest
- authentication is not as widely implemented as basic
- authentication, you should use it only in controlled settings.</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
-response hases in digest authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestAlgorithm MD5|MD5-sess</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthDigestAlgorithm MD5</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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
- <p>The <code class="directive">AuthDigestAlgorithm</code> directive
- selects the algorithm used to calculate the challenge and response
- hashes.</p>
-
- <div class="note">
- <code>MD5-sess</code> is not correctly implemented yet.
- </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="AuthDigestDomain" id="AuthDigestDomain">AuthDigestDomain</a> <a name="authdigestdomain" id="authdigestdomain">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>URIs that are in the same protection space for digest
-authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestDomain <var>URI</var> [<var>URI</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#Override">Override:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
- <p>The <code class="directive">AuthDigestDomain</code> directive allows
- you to specify one or more URIs which are in the same protection
- space (i.e. use the same realm and username/password info). The
- specified URIs are prefixes, i.e. the client will assume that all
- URIs "below" these are also protected by the same
- username/password. The URIs may be either absolute URIs
- (i.e. inluding a scheme, host, port, etc) or relative URIs.</p>
-
- <p>This directive <em>should</em> always be specified and
- contain at least the (set of) root URI(s) for this space.
- Omitting to do so will cause the client to send the
- Authorization header for <em>every request</em> sent to this
- server. Apart from increasing the size of the request, it may
- also have a detrimental effect on performance if
- "AuthDigestNcCheck" is on.</p>
-
- <p>The URIs specified can also point to different servers, in
- which case clients (which understand this) will then share
- username/password info across multiple servers without
- prompting the user each time. </p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthDigestFile" id="AuthDigestFile">AuthDigestFile</a> <a name="authdigestfile" id="authdigestfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Location of the text file containing the list
-of users and encoded passwords for digest authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestFile <var>file-path</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#Override">Override:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
- <p>The <code class="directive">AuthDigestFile</code> directive sets the
- name of a textual file containing the list of users and encoded
- passwords for digest authentication. <var>File-path</var> is the
- absolute path to the user file.</p>
-
- <p>The digest file uses a special format. Files in this format
- can be created using the <a href="../programs/htdigest.html">htdigest</a> utility found in
- the support/ subdirectory of the Apache distribution.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthDigestGroupFile" id="AuthDigestGroupFile">AuthDigestGroupFile</a> <a name="authdigestgroupfile" id="authdigestgroupfile">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Name of the text file containing the list of groups
-for digest authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestGroupFile <var>file-path</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#Override">Override:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
- <p>The <code class="directive">AuthDigestGroupFile</code> directive sets
- the name of a textual file containing the list of groups and their
- members (user names). <var>File-path</var> is the absolute path to
- the group file.</p>
-
- <p>Each line of the group file contains a groupname followed by
- a colon, followed by the member usernames separated by spaces.
- Example:</p>
-
- <div class="example"><p><code>mygroup: bob joe anne</code></p></div>
-
- <p>Note that searching large text files is <em>very</em>
- inefficient.</p>
-
- <p>Security: make sure that the AuthGroupFile is stored outside
- the document tree of the web-server; do <em>not</em> put it in
- the directory that it protects. Otherwise, clients will be able
- to download the AuthGroupFile.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthDigestNcCheck" id="AuthDigestNcCheck">AuthDigestNcCheck</a> <a name="authdigestnccheck" id="authdigestnccheck">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Enables or disables checking of the nonce-count sent by the
-server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestNcCheck On|Off</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthDigestNcCheck 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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
- <div class="note">
- Not implemented yet.
- </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="AuthDigestNonceFormat" id="AuthDigestNonceFormat">AuthDigestNonceFormat</a> <a name="authdigestnonceformat" id="authdigestnonceformat">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Determines how the nonce is generated</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestNonceFormat <var>format</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#Override">Override:
- </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status:
- </a></th><td>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
- <p><strong>Not implemented yet.</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="AuthDigestNonceLifetime" id="AuthDigestNonceLifetime">AuthDigestNonceLifetime</a> <a name="authdigestnoncelifetime" id="authdigestnoncelifetime">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>How long the server nonce is valid</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestNonceLifetime <var>seconds</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthDigestNonceLifetime 300</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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
- <p>The <code class="directive">AuthDigestNonceLifetime</code> directive
- controls how long the server nonce is valid. When the client
- contacts the server using an expired nonce the server will send
- back a 401 with <code>stale=true</code>. If <var>seconds</var> is
- greater than 0 then it specifies the amount of time for which the
- nonce is valid; this should probably never be set to less than 10
- seconds. If <var>seconds</var> is less than 0 then the nonce never
- expires.
- </p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AuthDigestQop" id="AuthDigestQop">AuthDigestQop</a> <a name="authdigestqop" id="authdigestqop">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Determines the quality-of-protection to use in digest
-authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AuthDigestQop none|auth|auth-int [auth|auth-int]</code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AuthDigestQop auth</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>Obsolete</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>mod_auth_digest</td></tr></table>
- <p>The <code class="directive">AuthDigestQop</code> directive determines
- the quality-of-protection to use. <code>auth</code> will only do
- authentication (username/password); <code>auth-int</code> is
- authentication plus integrity checking (an MD5 hash of the entity
- is also computed and checked); <code>none</code> will cause the module
- to use the old RFC-2069 digest algorithm (which does not include
- integrity checking). Both <code>auth</code> and <code>auth-int</code> may
- be specified, in which the case the browser will choose which of
- these to use. <code>none</code> should only be used if the browser for
- some reason does not like the challenge it receives otherwise.</p>
-
- <div class="note">
- <code>auth-int</code> is not implemented yet.
- </div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/obs_mod_auth_digest.xml b/docs/manual/mod/obs_mod_auth_digest.xml
deleted file mode 100644
index ad4b82e..0000000
--- a/docs/manual/mod/obs_mod_auth_digest.xml
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<modulesynopsis>
-<name>mod_auth_digest</name>
-<description>User authentication using MD5
- Digest Authentication.</description>
-<status>Obsolete</status>
-<hint>obsolete since 2.0.44</hint>
-<sourcefile>mod_auth_digest.c</sourcefile>
-<identifier>auth_digest_module</identifier>
-<compatibility>Available only in versions up to 2.0.43. The new module
-that unfortunately is also named <module>mod_auth_digest</module>
-includes support for the auth provider mechanism introduced
-in 2.0.44.</compatibility>
-
-<summary>
- <note type="warning"><title>This module is obsolete!</title>
- <p>Note, that this module has been marked as obsolete. A bunch
- of modules was introduced in Apache version 2.0.44 that
- support the new Authentication/Authorization provider mechnism.</p>
-
- <p>In order to get the ability of HTTP Digest Authentication, you have
- to use the new <module>mod_auth_digest</module> module that implements
- the HTTP part. The user and group data management is provided by the
- <code>mod_authn_*</code> and <code>mod_authz_*</code> modules. If you
- want to use your existing user files, have a look at <module
- >mod_authn_file</module>.</p>
-
- <p>This document is kept only for historical reasons and no
- longer maintained.</p>
- </note>
-
- <p>This module implements HTTP Digest Authentication. However, it
- has not been extensively tested and is therefore marked
- experimental.</p>
-</summary>
-
-<seealso><directive module="core">AuthName</directive></seealso>
-<seealso><directive module="core">AuthType</directive></seealso>
-<seealso><directive module="core">Require</directive></seealso>
-<seealso><directive module="core">Satisfy</directive></seealso>
-
-<section id="using"><title>Using Digest Authentication</title>
-
- <p>Using MD5 Digest authentication is very simple. Simply set
- up authentication normally, using "AuthType Digest" and
- "AuthDigestFile" instead of the normal "AuthType Basic" and
- "AuthUserFile"; also, replace any "AuthGroupFile" with
- "AuthDigestGroupFile". Then add a "AuthDigestDomain" directive
- containing at least the root URI(s) for this protection space.
- Example:</p>
-
- <example>
- <Location /private/><br />
- <indent>
- AuthType Digest<br />
- AuthName "private area"<br />
- AuthDigestDomain /private/ http://mirror.my.dom/private2/<br />
- AuthDigestFile /web/auth/.digest_pw<br />
- Require valid-user<br />
- </indent>
- </Location>
- </example>
-
- <note><title>Note</title>
- <p>Digest authentication provides a more secure password system
- than Basic authentication, but only works with supporting
- browsers. As of July 2002, the major browsers that support digest
- authentication are <a href="http://www.opera.com/">Opera</a>, <a
- href="http://www.microsoft.com/windows/ie/">MS Internet
- Explorer</a> (fails when used with a query string), <a
- href="http://www.w3.org/Amaya/">Amaya</a> and <a
- href="http://www.mozilla.org">Mozilla</a>. Since digest
- authentication is not as widely implemented as basic
- authentication, you should use it only in controlled settings.</p>
- </note>
-</section>
-
-<directivesynopsis>
-<name>AuthDigestFile</name>
-<description>Location of the text file containing the list
-of users and encoded passwords for digest authentication</description>
-<syntax>AuthDigestFile <var>file-path</var></syntax>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthDigestFile</directive> directive sets the
- name of a textual file containing the list of users and encoded
- passwords for digest authentication. <var>File-path</var> is the
- absolute path to the user file.</p>
-
- <p>The digest file uses a special format. Files in this format
- can be created using the <a
- href="../programs/htdigest.html">htdigest</a> utility found in
- the support/ subdirectory of the Apache distribution.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthDigestGroupFile</name>
-<description>Name of the text file containing the list of groups
-for digest authentication</description>
-<syntax>AuthDigestGroupFile <var>file-path</var></syntax>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthDigestGroupFile</directive> directive sets
- the name of a textual file containing the list of groups and their
- members (user names). <var>File-path</var> is the absolute path to
- the group file.</p>
-
- <p>Each line of the group file contains a groupname followed by
- a colon, followed by the member usernames separated by spaces.
- Example:</p>
-
- <example>mygroup: bob joe anne</example>
-
- <p>Note that searching large text files is <em>very</em>
- inefficient.</p>
-
- <p>Security: make sure that the AuthGroupFile is stored outside
- the document tree of the web-server; do <em>not</em> put it in
- the directory that it protects. Otherwise, clients will be able
- to download the AuthGroupFile.</p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthDigestQop</name>
-<description>Determines the quality-of-protection to use in digest
-authentication</description>
-<syntax>AuthDigestQop none|auth|auth-int [auth|auth-int]</syntax>
-<default>AuthDigestQop auth</default>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthDigestQop</directive> directive determines
- the quality-of-protection to use. <code>auth</code> will only do
- authentication (username/password); <code>auth-int</code> is
- authentication plus integrity checking (an MD5 hash of the entity
- is also computed and checked); <code>none</code> will cause the module
- to use the old RFC-2069 digest algorithm (which does not include
- integrity checking). Both <code>auth</code> and <code>auth-int</code> may
- be specified, in which the case the browser will choose which of
- these to use. <code>none</code> should only be used if the browser for
- some reason does not like the challenge it receives otherwise.</p>
-
- <note>
- <code>auth-int</code> is not implemented yet.
- </note>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthDigestNonceLifetime</name>
-<description>How long the server nonce is valid</description>
-<syntax>AuthDigestNonceLifetime <var>seconds</var></syntax>
-<default>AuthDigestNonceLifetime 300</default>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthDigestNonceLifetime</directive> directive
- controls how long the server nonce is valid. When the client
- contacts the server using an expired nonce the server will send
- back a 401 with <code>stale=true</code>. If <var>seconds</var> is
- greater than 0 then it specifies the amount of time for which the
- nonce is valid; this should probably never be set to less than 10
- seconds. If <var>seconds</var> is less than 0 then the nonce never
- expires. <!-- Not implemented yet If <var>seconds</var> is 0 then
- the nonce may be used exactly once by the client. Note that while
- one-time-nonces provide higher security against replay attacks,
- they also have significant performance implications, as the
- browser cannot pipeline or multiple connections for the
- requests. Because browsers cannot easily detect that
- one-time-nonces are being used, this may lead to browsers trying
- to pipeline requests and receiving 401 responses for all but the
- first request, requiring the browser to resend the requests. Note
- also that the protection against reply attacks only makes sense
- for dynamically generated content and things like POST requests;
- for static content the attacker may already have the complete
- response, so one-time-nonces do not make sense here. -->
- </p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthDigestNonceFormat</name>
-<description>Determines how the nonce is generated</description>
-<syntax>AuthDigestNonceFormat <var>format</var></syntax>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p><strong>Not implemented yet.</strong> <!--
- <P>The AuthDigestNonceFormat directive determines how the nonce is
- generated.
- -->
- </p>
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthDigestNcCheck</name>
-<description>Enables or disables checking of the nonce-count sent by the
-server</description>
-<syntax>AuthDigestNcCheck On|Off</syntax>
-<default>AuthDigestNcCheck Off</default>
-<contextlist><context>server config</context></contextlist>
-
-<usage>
- <note>
- Not implemented yet.
- </note>
- <!--
- <P>The AuthDigestNcCheck directive enables or disables the checking of the
- nonce-count sent by the server.
-
- <P>While recommended from a security standpoint, turning this directive
- On has one important performance implication. To check the nonce-count
- *all* requests (which have an Authorization header, irrespective of
- whether they require digest authentication) must be serialized through
- a critical section. If the server is handling a large number of
- requests which contain the Authorization header then this may noticeably
- impact performance.
- -->
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthDigestAlgorithm</name>
-<description>Selects the algorithm used to calculate the challenge and
-response hases in digest authentication</description>
-<syntax>AuthDigestAlgorithm MD5|MD5-sess</syntax>
-<default>AuthDigestAlgorithm MD5</default>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthDigestAlgorithm</directive> directive
- selects the algorithm used to calculate the challenge and response
- hashes.</p>
-
- <note>
- <code>MD5-sess</code> is not correctly implemented yet.
- </note>
- <!--
- <P>To use <EM>MD5-sess</EM> you must first code up the
- <VAR>get_userpw_hash()</VAR> function in <VAR>mod_auth_digest.c</VAR> .
- -->
-</usage>
-</directivesynopsis>
-
-<directivesynopsis>
-<name>AuthDigestDomain</name>
-<description>URIs that are in the same protection space for digest
-authentication</description>
-<syntax>AuthDigestDomain <var>URI</var> [<var>URI</var>] ...</syntax>
-<contextlist><context>directory</context><context>.htaccess</context>
-</contextlist>
-<override>AuthConfig</override>
-
-<usage>
- <p>The <directive>AuthDigestDomain</directive> directive allows
- you to specify one or more URIs which are in the same protection
- space (i.e. use the same realm and username/password info). The
- specified URIs are prefixes, i.e. the client will assume that all
- URIs "below" these are also protected by the same
- username/password. The URIs may be either absolute URIs
- (i.e. inluding a scheme, host, port, etc) or relative URIs.</p>
-
- <p>This directive <em>should</em> always be specified and
- contain at least the (set of) root URI(s) for this space.
- Omitting to do so will cause the client to send the
- Authorization header for <em>every request</em> sent to this
- server. Apart from increasing the size of the request, it may
- also have a detrimental effect on performance if
- "AuthDigestNcCheck" is on.</p>
-
- <p>The URIs specified can also point to different servers, in
- which case clients (which understand this) will then share
- username/password info across multiple servers without
- prompting the user each time. </p>
-</usage>
-</directivesynopsis>
-
-</modulesynopsis>
-
-
-
diff --git a/docs/manual/mod/perchild.html.en b/docs/manual/mod/perchild.html.en
index b18ec28..da62cae 100644
--- a/docs/manual/mod/perchild.html.en
+++ b/docs/manual/mod/perchild.html.en
@@ -4,28 +4,79 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>perchild - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module perchild</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Multi-Processing Module allowing for daemon processes
- serving requests to be assigned a variety of different
- userids</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>MPM</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>mpm_perchild_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>perchild.c</td></tr></table><h3>Summary</h3>
-<div class="warning">
-This MPM does not currently work on most platforms. Work is ongoing to
-make it functional.
-</div>
+ -->
+<title>perchild - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM perchild</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Multi-Processing Module allowing for daemon processes serving
+requests to be assigned a variety of different userids</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mpm_perchild_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>perchild.c</td></tr></table>
+<h3>Summary</h3>
+
+ <div class="warning">
+ This MPM does not currently work on most platforms. Work is ongoing
+ to make it functional.
+ </div>
<p>This Multi-Processing Module (MPM) implements a hybrid
multi-process, multi-threaded web server. A fixed number of
processes create threads to handle requests. Fluctuations in
load are handled by increasing or decreasing the number of
threads in each process.</p>
-
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#acceptmutex">AcceptMutex</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#assignuserid">AssignUserID</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#bs2000account">BS2000Account</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#childperuserid">ChildPerUserID</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#lockfile">LockFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxthreadsperchild">MaxThreadsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#numservers">NumServers</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#serverlimit">ServerLimit</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startthreads">StartThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">How it works</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><a href="../bind.html">Setting which addresses and ports Apache
+uses</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 launches the number of child processes
- indicated by the <code class="directive"><a href="../mod/mpm_common.html#numservers">NumServers</a></code> directive at server
- startup. Each child process creates threads as specified in the
- <code class="directive"><a href="../mod/mpm_common.html#startthreads">StartThreads</a></code> directive.
+ indicated by the <code class="directive"><a href="#numservers">NumServers</a></code>
+ directive at server startup. Each child process creates threads as
+ specified in the <code class="directive"><a href="../mod/mpm_common.html#startthreads">StartThreads</a></code> directive.
The individual threads then
listen for connections and serve them when they arrive.</p>
@@ -41,7 +92,7 @@
necessary to modify these directives from their default values.
The maximum number of clients that may be served simultaneously
is determined by multiplying the number of server processes
- that will be created (<code class="directive"><a href="../mod/mpm_common.html#numservers">NumServers</a></code>) by the maximum
+ that will be created (<code class="directive"><a href="#numservers">NumServers</a></code>) by the maximum
number of threads created in each process
(<code class="directive"><a href="../mod/mpm_common.html#maxthreadsperchild">MaxThreadsPerChild</a></code>).</p>
@@ -60,51 +111,146 @@
server recycles processes by killing old ones and launching new
ones.</p>
- <p>In addition it adds the extra ability to specify that
- specific processes should serve requests under different
- userids. These processes can then be associated with specific
- virtual hosts.</p>
+ <h3><a name="user-ids" id="user-ids">Working with different user-IDs</a></h3>
+ <p>The <code class="module"><a href="../mod/perchild.html">perchild</a></code> MPM adds the extra ability to
+ specify that particular processes should serve requests under
+ different user-IDs. These user-IDs can then be associated with
+ specific virtual hosts. You have to use one <code class="directive"><a href="#childperuserid">ChildPerUserID</a></code> directive for
+ every user/group combination you want to be run. Then you can tie
+ particular virtual hosts to that user and group IDs.</p>
+
+ <p>The following example runs 7 child processes. Two of them are run
+ under <code>user1</code>/<code>group1</code>. The next four are run
+ under <code>user2</code>/<code>group2</code> and the remaining
+ process uses the <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> and <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code>
+ of the main server:</p>
+
+ <div class="example"><h3>Global config</h3><p><code>
+ NumServers 7<br />
+ ChildPerUserID user1 group1 2<br />
+ ChildPerUserID user2 group2 4
+ </code></p></div>
+
+ <p>Using unbalanced numbers of processes as above is useful, if the
+ particular virtual hosts produce different load. The assignment to
+ the virtual hosts is easily done as in the example below. In
+ conclusion with the example above the following assumes, that
+ <code>server2</code> has to serve about twice of the hits of
+ <code>server1</code>.</p>
+
+ <div class="example"><h3>Example</h3><p><code>
+ NameVirtualHost *<br />
+ <br />
+ <VirtualHost *><br />
+ <span class="indent">
+ ServerName fallbackhost<br />
+ # no assignment; use fallback<br />
+ </span>
+ </VirtualHost><br />
+ <br />
+ <VirtualHost *><br />
+ <span class="indent">
+ ServerName server1<br />
+ AssignUserID user1 group1<br />
+ </span>
+ </VirtualHost><br />
+ <br />
+ <VirtualHost *><br />
+ <span class="indent">
+ ServerName server2<br />
+ AssignUserID user2 group2<br />
+ </span>
+ </VirtualHost>
+ </code></p></div>
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#assignuserid">AssignUserId</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#childperuserid">ChildPerUserId</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#lockfile">LockFile</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxthreadsperchild">MaxThreadsPerChild</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#numservers">NumServers</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startthreads">StartThreads</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><a href="../bind.html">Setting which addresses and
- ports Apache uses</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="AssignUserId" id="AssignUserId">AssignUserId</a> <a name="assignuserid" id="assignuserid">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AssignUserID <var>user_id</var> <var>group_id</var></code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
- </a></th><td>virtual host</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>perchild</td></tr></table>
- <p>Tie a virtual host to a specific child process. Requests addressed to
-the virtual host where this directive appears will be served by the process
-running with the specified user and group id.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ChildPerUserId" id="ChildPerUserId">ChildPerUserId</a> <a name="childperuserid" id="childperuserid">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>ChildPerUserID <var>user_id</var>
-<var>group_id</var> <var>num_children</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>MPM</td></tr><tr><th><a href="directive-dict.html#Module">Module:
- </a></th><td>perchild</td></tr></table>
-<p>Specify a user id and group id for a number of child processes. The third
-argument, num_children, is the number of child processes to start with the
-specified user and group. It does <strong>not</strong> represent a specific
-child number. If the total number of child processes, found by totaling all of
-the third arguments to all ChildPerUserId directives in the config file, is
-less than <code class="directive"><a href="../mod/mpm_common.html#numservers">NumServers</a></code>, then all
-remaining children will inherit the <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> and <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> settings from the main server </p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AssignUserID" id="AssignUserID">AssignUserID</a> <a name="assignuserid" id="assignuserid">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Tie a virtual host to a user and group ID</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>AssignUserID <var>user-id</var> <var>group-id</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>virtual host</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>perchild</td></tr>
+</table>
+ <p>Tie a virtual host to a specific user/group combination. Requests
+ addressed to the virtual host where this directive appears will be
+ served by a process running with the specified user and group ID.</p>
+
+ <p>The user and group ID has to be assigned to a number of children
+ in the global server config using the <code class="directive"><a href="#childperuserid">ChildPerUserID</a></code> directive. See the section above for a
+ <a href="#user-ids">configuration example</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="ChildPerUserID" id="ChildPerUserID">ChildPerUserID</a> <a name="childperuserid" id="childperuserid">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specify user ID and group ID for a number of child
+processes</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ChildPerUserID <var>user-id</var> <var>group-id</var>
+<var>num-children</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>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>perchild</td></tr>
+</table>
+ <p>Specify a user ID and group ID for a number of child processes.
+ The third argument, <var>num-children</var>, is the number of child
+ processes to start with the specified user and group. It does
+ <em>not</em> represent a specific child number. In order to use this
+ directive, the server must be run initially as <code>root</code>.
+ If you start the server as a non-root user, it will fail to change
+ to the lesser privileged user.</p>
+
+ <p>If the total number of child processes, found by totaling all of the
+ third arguments to all <code class="directive">ChildPerUserID</code> directives
+ in the config file, is less than <code class="directive"><a href="#numservers">NumServers</a></code>, then all remaining children will inherit the
+ <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> and <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> settings from the main server.
+ See the section above for a <a href="#user-ids">configuration
+ example</a>.</p>
+
+ <div class="warning"><h3>Security</h3>
+ <p>Don't set <var>user-id</var> (or <var>group-id</var>) to
+ <code>root</code> unless you know exactly what you are doing, and
+ what the dangers are.</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="MaxThreadsPerChild" id="MaxThreadsPerChild">MaxThreadsPerChild</a> <a name="maxthreadsperchild" id="maxthreadsperchild">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum number of threads per child process</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MaxThreadsPerChild <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MaxThreadsPerChild 64</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>perchild</td></tr>
+</table>
+ <p>This directive sets the maximum number of threads that will be
+ created in each child process. To increase this value beyond its
+ default, it is necessary to change the value of the <code class="directive"><a href="../mod/mpm_common.html#threadlimit">ThreadLimit</a></code> directive and stop and
+ re-start 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="NumServers" id="NumServers">NumServers</a> <a name="numservers" id="numservers">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Total number of children alive at the same time</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>NumServers <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>NumServers 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>perchild</td></tr>
+</table>
+ <p>The <code class="directive">NumServers</code> directive determines the number
+ of children alive at the same time. This number should be large enough to
+ handle the requests for the entire site. To increase this value beyond the
+ value of <code>8</code>, it is necessary to change the value of the
+ <code class="directive"><a href="../mod/mpm_common.html#serverlimit">ServerLimit</a></code> directive and stop
+ and re-start the server. See the section above for a <a href="#user-ids">configuration example</a>.</p>
+
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/perchild.xml b/docs/manual/mod/perchild.xml
index ff26f53..ca1dd0e 100644
--- a/docs/manual/mod/perchild.xml
+++ b/docs/manual/mod/perchild.xml
@@ -4,30 +4,32 @@
<modulesynopsis>
<name>perchild</name>
-<description>Multi-Processing Module allowing for daemon processes
- serving requests to be assigned a variety of different
- userids</description>
+<description>Multi-Processing Module allowing for daemon processes serving
+requests to be assigned a variety of different userids</description>
<status>MPM</status>
<sourcefile>perchild.c</sourcefile>
<identifier>mpm_perchild_module</identifier>
<summary>
-<note type="warning">
-This MPM does not currently work on most platforms. Work is ongoing to
-make it functional.
-</note>
+ <note type="warning">
+ This MPM does not currently work on most platforms. Work is ongoing
+ to make it functional.
+ </note>
<p>This Multi-Processing Module (MPM) implements a hybrid
multi-process, multi-threaded web server. A fixed number of
processes create threads to handle requests. Fluctuations in
load are handled by increasing or decreasing the number of
threads in each process.</p>
+</summary>
+<seealso><a href="../bind.html">Setting which addresses and ports Apache
+uses</a></seealso>
+<section id="how-it-works"><title>How it works</title>
<p>A single control process launches the number of child processes
- indicated by the <directive
- module="mpm_common">NumServers</directive> directive at server
- startup. Each child process creates threads as specified in the
- <directive module="mpm_common">StartThreads</directive> directive.
+ indicated by the <directive module="perchild">NumServers</directive>
+ directive at server startup. Each child process creates threads as
+ specified in the <directive module="mpm_common">StartThreads</directive> directive.
The individual threads then
listen for connections and serve them when they arrive.</p>
@@ -44,7 +46,7 @@
The maximum number of clients that may be served simultaneously
is determined by multiplying the number of server processes
that will be created (<directive
- module="mpm_common">NumServers</directive>) by the maximum
+ module="perchild">NumServers</directive>) by the maximum
number of threads created in each process
(<directive module="mpm_common">MaxThreadsPerChild</directive>).</p>
@@ -65,92 +67,181 @@
server recycles processes by killing old ones and launching new
ones.</p>
- <p>In addition it adds the extra ability to specify that
- specific processes should serve requests under different
- userids. These processes can then be associated with specific
- virtual hosts.</p>
- <!-- XXX: This desperately needs more explanation. -->
-</summary>
-<seealso><a href="../bind.html">Setting which addresses and
- ports Apache uses</a>
-</seealso>
+ <section id="user-ids"><title>Working with different user-IDs</title>
+ <p>The <module>perchild</module> MPM adds the extra ability to
+ specify that particular processes should serve requests under
+ different user-IDs. These user-IDs can then be associated with
+ specific virtual hosts. You have to use one <directive
+ module="perchild">ChildPerUserID</directive> directive for
+ every user/group combination you want to be run. Then you can tie
+ particular virtual hosts to that user and group IDs.</p>
-<directivesynopsis location="mpm_common">
-<name>CoreDumpDirectory</name>
+ <p>The following example runs 7 child processes. Two of them are run
+ under <code>user1</code>/<code>group1</code>. The next four are run
+ under <code>user2</code>/<code>group2</code> and the remaining
+ process uses the <directive module="mpm_common"
+ >User</directive> and <directive module="mpm_common">Group</directive>
+ of the main server:</p>
+
+ <example><title>Global config</title>
+ NumServers 7<br />
+ ChildPerUserID user1 group1 2<br />
+ ChildPerUserID user2 group2 4
+ </example>
+
+ <p>Using unbalanced numbers of processes as above is useful, if the
+ particular virtual hosts produce different load. The assignment to
+ the virtual hosts is easily done as in the example below. In
+ conclusion with the example above the following assumes, that
+ <code>server2</code> has to serve about twice of the hits of
+ <code>server1</code>.</p>
+
+ <example><title>Example</title>
+ NameVirtualHost *<br />
+ <br />
+ <VirtualHost *><br />
+ <indent>
+ ServerName fallbackhost<br />
+ # no assignment; use fallback<br />
+ </indent>
+ </VirtualHost><br />
+ <br />
+ <VirtualHost *><br />
+ <indent>
+ ServerName server1<br />
+ AssignUserID user1 group1<br />
+ </indent>
+ </VirtualHost><br />
+ <br />
+ <VirtualHost *><br />
+ <indent>
+ ServerName server2<br />
+ AssignUserID user2 group2<br />
+ </indent>
+ </VirtualHost>
+ </example>
+ </section>
+</section>
+
+<directivesynopsis location="mpm_common"><name>AcceptMutex</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>Group</name>
+<directivesynopsis location="mpm_common"><name>BS2000Account</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>PidFile</name>
+<directivesynopsis location="mpm_common"><name>CoreDumpDirectory</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>Listen</name>
+<directivesynopsis location="mpm_common"><name>Group</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>ListenBacklog</name>
+<directivesynopsis location="mpm_common"><name>PidFile</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>LockFile</name>
+<directivesynopsis location="mpm_common"><name>Listen</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>MaxRequestsPerChild</name>
+<directivesynopsis location="mpm_common"><name>ListenBacklog</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>MaxSpareThreads</name>
+<directivesynopsis location="mpm_common"><name>LockFile</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>MaxThreadsPerChild</name>
+<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>MinSpareThreads</name>
+<directivesynopsis location="mpm_common"><name>MaxSpareThreads</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>NumServers</name>
+<directivesynopsis location="mpm_common"><name>MinSpareThreads</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>ScoreBoardFile</name>
+<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>SendBufferSize</name>
+<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>StartThreads</name>
+<directivesynopsis location="mpm_common"><name>ServerLimit</name>
</directivesynopsis>
-<directivesynopsis location="mpm_common">
-<name>User</name>
+<directivesynopsis location="mpm_common"><name>StartThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ThreadLimit</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>User</name>
</directivesynopsis>
<directivesynopsis>
-<name>AssignUserId</name>
-<syntax>AssignUserID <var>user_id</var> <var>group_id</var></syntax>
+<name>AssignUserID</name>
+<description>Tie a virtual host to a user and group ID</description>
+<syntax>AssignUserID <var>user-id</var> <var>group-id</var></syntax>
<contextlist><context>virtual host</context></contextlist>
<usage>
- <p>Tie a virtual host to a specific child process. Requests addressed to
-the virtual host where this directive appears will be served by the process
-running with the specified user and group id.</p>
+ <p>Tie a virtual host to a specific user/group combination. Requests
+ addressed to the virtual host where this directive appears will be
+ served by a process running with the specified user and group ID.</p>
+
+ <p>The user and group ID has to be assigned to a number of children
+ in the global server config using the <directive module="perchild"
+ >ChildPerUserID</directive> directive. See the section above for a
+ <a href="#user-ids">configuration example</a>.</p>
</usage>
</directivesynopsis>
<directivesynopsis>
-<name>ChildPerUserId</name>
-<syntax>ChildPerUserID <var>user_id</var>
-<var>group_id</var> <var>num_children</var></syntax>
+<name>ChildPerUserID</name>
+<description>Specify user ID and group ID for a number of child
+processes</description>
+<syntax>ChildPerUserID <var>user-id</var> <var>group-id</var>
+<var>num-children</var></syntax>
<contextlist><context>server config</context></contextlist>
<usage>
-<p>Specify a user id and group id for a number of child processes. The third
-argument, num_children, is the number of child processes to start with the
-specified user and group. It does <strong>not</strong> represent a specific
-child number. If the total number of child processes, found by totaling all of
-the third arguments to all ChildPerUserId directives in the config file, is
-less than <directive module="mpm_common">NumServers</directive>, then all
-remaining children will inherit the <directive
-module="mpm_common">User</directive> and <directive
-module="mpm_common">Group</directive> settings from the main server </p>
+ <p>Specify a user ID and group ID for a number of child processes.
+ The third argument, <var>num-children</var>, is the number of child
+ processes to start with the specified user and group. It does
+ <em>not</em> represent a specific child number. In order to use this
+ directive, the server must be run initially as <code>root</code>.
+ If you start the server as a non-root user, it will fail to change
+ to the lesser privileged user.</p>
+
+ <p>If the total number of child processes, found by totaling all of the
+ third arguments to all <directive>ChildPerUserID</directive> directives
+ in the config file, is less than <directive module="perchild"
+ >NumServers</directive>, then all remaining children will inherit the
+ <directive module="mpm_common">User</directive> and <directive
+ module="mpm_common">Group</directive> settings from the main server.
+ See the section above for a <a href="#user-ids">configuration
+ example</a>.</p>
+
+ <note type="warning"><title>Security</title>
+ <p>Don't set <var>user-id</var> (or <var>group-id</var>) to
+ <code>root</code> unless you know exactly what you are doing, and
+ what the dangers are.</p>
+ </note>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>MaxThreadsPerChild</name>
+<description>Maximum number of threads per child process</description>
+<syntax>MaxThreadsPerChild <var>number</var></syntax>
+<default>MaxThreadsPerChild 64</default>
+<contextlist><context>server config</context></contextlist>
+
+<usage>
+ <p>This directive sets the maximum number of threads that will be
+ created in each child process. To increase this value beyond its
+ default, it is necessary to change the value of the <directive
+ module="mpm_common">ThreadLimit</directive> directive and stop and
+ re-start the server.</p>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>NumServers</name>
+<description>Total number of children alive at the same time</description>
+<syntax>NumServers <var>number</var></syntax>
+<default>NumServers 2</default>
+<contextlist><context>server config</context></contextlist>
+
+<usage>
+ <p>The <directive>NumServers</directive> directive determines the number
+ of children alive at the same time. This number should be large enough to
+ handle the requests for the entire site. To increase this value beyond the
+ value of <code>8</code>, it is necessary to change the value of the
+ <directive module="mpm_common">ServerLimit</directive> directive and stop
+ and re-start the server. See the section above for a <a href="#user-ids"
+ >configuration example</a>.</p>
</usage>
</directivesynopsis>
</modulesynopsis>
-
diff --git a/docs/manual/mod/prefork.html.en b/docs/manual/mod/prefork.html.en
index 443c720..e50eee7 100644
--- a/docs/manual/mod/prefork.html.en
+++ b/docs/manual/mod/prefork.html.en
@@ -4,11 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>prefork - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module prefork</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Implements a non-threaded, pre-forking web server</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>MPM</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>mpm_prefork_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>prefork.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>prefork - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM prefork</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Implements a non-threaded, pre-forking web server</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mpm_prefork_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>prefork.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This Multi-Processing Module (MPM) implements a non-threaded,
pre-forking web server that handles requests in a manner similar
to Apache 1.3. It is appropriate for sites that need to avoid
@@ -22,8 +39,11 @@
handle as many simultaneous requests as you expect to receive, but
small enough to assure that there is enough physical RAM for all
processes.</p>
-
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#acceptmutex">AcceptMutex</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#acceptmutex">AcceptMutex</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#bs2000account">BS2000Account</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
@@ -40,8 +60,18 @@
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#serverlimit">ServerLimit</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">How it Works</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../bind.html">Setting which addresses and
- ports Apache uses</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>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">How it Works</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><a href="../bind.html">Setting which addresses and ports Apache
+uses</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 always tries to maintain several <dfn>spare</dfn>
@@ -64,9 +94,9 @@
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 root under Unix
- in order to bind to port 80, the child processes are launched by
- Apache as a less-privileged user. The <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> and <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> directives are used to set
+ <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 as a less-privileged user. The <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> and <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> directives are used to set
the privileges of the Apache 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>
@@ -74,79 +104,63 @@
<p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
controls how frequently the server recycles processes by killing
old ones and launching new ones.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AcceptMutex" id="AcceptMutex">AcceptMutex</a> <a name="acceptmutex" id="acceptmutex">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Method that Apache uses to serialize multiple children
-accepting requests on network sockets</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>AcceptMutex default|<var>method</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>AcceptMutex default</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>prefork</td></tr></table>
- <p>The <code class="directive">AcceptMutex</code> directives sets the
- method that Apache uses to serialize multiple children accepting
- requests on network sockets. Prior to Apache 2.0, the method was
- selectable only at compile time. The optimal method to use is
- highly architecture and platform dependent. For further details,
- see the <a href="../misc/perf-tuning.html">performance tuning</a>
- documentation.</p>
-
- <p>If this directive is set to <code>default</code>, then the
- compile-time selected default will be used. Other possible
- methods are listed below. Note that not all methods are
- available on all platforms. If a method is specified which is
- not available, a message will be written to the error log
- listing the available methods.</p>
-
- <dl>
- <dt><code>flock</code></dt>
-
- <dd>uses the <code>flock(2)</code> system call to lock the
- file defined by the <code class="directive"><a href="../mod/mpm_common.html#lockfile">LockFile</a></code> directive.</dd>
-
- <dt><code>fcntl</code></dt>
-
- <dd>uses the <code>fnctl(2)</code> system call to lock the
- file defined by the <code class="directive"><a href="../mod/mpm_common.html#lockfile">LockFile</a></code> directive.</dd>
-
- <dt><code>sysvsem</code></dt>
-
- <dd>uses SySV-style semaphores to implement the mutex.</dd>
-
- <dt><code>pthread</code></dt>
-
- <dd>uses POSIX mutexes as implemented by the POSIX Threads
- (PThreads) specification.</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="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><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MaxSpareServers <var>number</var><br /></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MaxSpareServers 10</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>prefork</td></tr></table>
+</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>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MaxSpareServers <var>number</var><br /></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MaxSpareServers 10</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>prefork</td></tr>
+</table>
<p>The <code class="directive">MaxSpareServers</code> directive sets the
desired maximum number of <em>idle</em> child server processes. An
idle process is one which is not handling a request. If there are
- more than MaxSpareServers idle, then the parent process will kill
- off the excess processes.</p>
+ more than <code class="directive">MaxSpareServers</code> idle, then the
+ parent process will kill off the excess processes.</p>
<p>Tuning of this parameter should only be necessary on very
busy sites. Setting this parameter to a large number is almost
- always a bad idea.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#minspareservers">MinSpareServers</a></code></li><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="directive-section"><h2><a name="MinSpareServers" id="MinSpareServers">MinSpareServers</a> <a name="minspareservers" id="minspareservers">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description:
- </a></th><td>Minimum number of idle child server processes</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
- </a></th><td><code>MinSpareServers <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">Default:
- </a></th><td><code>MinSpareServers 5</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>prefork</td></tr></table>
+ always a bad idea. If you are trying to set the value lower than
+ <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>, Apache
+ will automatically adjust it to <code class="directive">MinSpareServers</code><code> + 1</code>.</p>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#minspareservers">MinSpareServers</a></code></li>
+<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="directive-section"><h2><a name="MinSpareServers" id="MinSpareServers">MinSpareServers</a> <a name="minspareservers" id="minspareservers">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Minimum number of idle child server processes</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MinSpareServers <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MinSpareServers 5</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>prefork</td></tr>
+</table>
<p>The <code class="directive">MinSpareServers</code> directive sets the
desired minimum number of <em>idle</em> child server processes. An
idle process is one which is not handling a request. If there are
- fewer than MinSpareServers idle, then the parent process creates
- new children at a maximum rate of 1 per second.</p>
+ fewer than <code class="directive">MinSpareServers</code> idle, then the parent
+ process creates new children at a maximum rate of 1 per second.</p>
<p>Tuning of this parameter should only be necessary on very
busy sites. Setting this parameter to a large number is almost
always a bad idea.</p>
-<h3>See also</h3><ul><li><code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code></li><li><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code></li></ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code></li>
+<li><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code></li>
+</ul>
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/prefork.html.ja.jis b/docs/manual/mod/prefork.html.ja.jis
index 77786ab..525a7b7 100644
--- a/docs/manual/mod/prefork.html.ja.jis
+++ b/docs/manual/mod/prefork.html.ja.jis
@@ -4,18 +4,35 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>prefork - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B prefork</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%9%l%C%I$r;H$o$:!"@h9T$7$F(B fork $B$r9T(B$B$J$&%&%'%V%5!<%P$r<BAu(B
-</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>mpm_prefork_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>prefork.c</td></tr></table><h3>$B35MW(B</h3>
- <p>$B$3$N%^%k%A%W%m%;%C%7%s%0(B$B%b%8%e!<%k(B (MPM) $B$O!"(B
+ -->
+<title>prefork - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B prefork</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%9%l%C%I$r;H$o$:!"@h9T$7$F(B fork $B$r9T$J$&%&%'%V%5!<%P$r<BAu(B
+</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>mpm_prefork_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>prefork.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
+ <p>$B$3$N%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM) $B$O!"(B
Unix $B>e$G$N(B Apache 1.3 $B$N%G%U%)%k%H$N5sF0$HHs>o$K$h$/;w$?J}K!$G(B
$B%j%/%(%9%H$r=hM}$9$k!"%9%l%C%I$r;H$o$:!"@h9T$7$F(B fork $B$r9T$J$&(B
$B%&%'%V%5!<%P$r<BAu$7$F$$$^$9!#(B
$B%9%l%C%I%;!<%U$G$J$$%i%$%V%i%j$H$N8_49@-$r$H$k$?$a$K!"(B
- $B%9%l%C%I$r(B$BHr$1$kI,MW$N$"$k%5%$%H$G$O!"$3$N%b%8%e!<%k$N;HMQ$,E,@Z$G$7$g$&!#(B
+ $B%9%l%C%I$rHr$1$kI,MW$N$"$k%5%$%H$G$O!"$3$N%b%8%e!<%k$N;HMQ$,E,@Z$G$7$g$&!#(B
$B$"$k%j%/%(%9%H$GH/@8$7$?LdBj$,B>$N%j%/%(%9%H$K1F6A$7$J$$$h$&$K!"(B
$B8D!9$N%j%/%(%9%H$rC1N%$9$k$N$K$b!":GE,$J(B MPM $B$G$9!#(B</p>
@@ -23,10 +40,13 @@
$BD4@0$9$kI,MW$O$[$H$s$I$J$$$G$7$g$&!#$b$C$H$b=EMW$J$3$H$O!"(B
<code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
$B$,!"M=A[$5$l$kF1;~%j%/%(%9%H?t$r==J,07$($k$0$i$$$OBg$-$$$1$l$I$b!"(B
- $BA4%W%m%;%9$K==J,$JJ*M}%a%b%j$,3N<B$K9T$-(B$BEO$kDxEY$K$O>.$5$$CM$K$9$k!"(B
+ $BA4%W%m%;%9$K==J,$JJ*M}%a%b%j$,3N<B$K9T$-EO$kDxEY$K$O>.$5$$CM$K$9$k!"(B
$B$H$$$&$3$H$G$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#acceptmutex">AcceptMutex</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#acceptmutex">AcceptMutex</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
@@ -43,8 +63,18 @@
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#serverlimit">ServerLimit</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
-</ul><h3>$B%H%T%C%/(B</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">$BF0:nJ}K!(B</a></li></ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><a href="../bind.html">Apache
-$B$,;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj(B</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">$BF0:nJ}K!(B</a></h2>
+</ul>
+<h3>$B%H%T%C%/(B</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">$BF0:nJ}K!(B</a></li>
+</ul><h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><a href="../bind.html">Apache
+$B$,;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj(B</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">$BF0:nJ}K!(B</a></h2>
<p>$B0l$D$N%3%s%H%m!<%k%W%m%;%9$,!"(B
$B%3%M%/%7%g%s$KBP$7$F(B listen $B$7$F!"$7$+$k$Y$-;~$K1~Ez$9$k(B
$B;R%W%m%;%9$r5/F0$7$^$9!#(BApache $B$O>o$K4v$D$+$N(B<dfn>$B%9%Z%"(B</dfn>
@@ -84,20 +114,24 @@
$B2DG=$J8B$jI,MW:G>.8B$N8"8B$N$_$r;}$C$F$$$k$h$&$K$9$k$Y$-$G$9!#(B</p>
<p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
- $B$O!"8E$$%W%m%;%9$rDd;_$7$F?7$7$$%W%m%;(B$B%9$r5/F0$9$k$3$H$K$h$C$F!"(B
+ $B$O!"8E$$%W%m%;%9$rDd;_$7$F?7$7$$%W%m%;%9$r5/F0$9$k$3$H$K$h$C$F!"(B
$B$I$NDxEY$NIQEY$G%5!<%P$,%W%m%;%9$r%j%5%$%/%k$9$k$+$r@)8f$7$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="AcceptMutex" id="AcceptMutex">AcceptMutex</a> <a name="acceptmutex" id="acceptmutex">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$BJ#?t$N;R%W%m%;%9$,%M%C%H%o!<%/%=%1%C%H$G%j%/%(%9%H$r(B
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AcceptMutex" id="AcceptMutex">AcceptMutex</a> <a name="acceptmutex" id="acceptmutex">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$BJ#?t$N;R%W%m%;%9$,%M%C%H%o!<%/%=%1%C%H$G%j%/%(%9%H$r(B
accept $B$7$h$&$H$7$F$$$k$H$-$K!"(BApache $B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$?$a$K(B
-$B;H$&J}K!(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>AcceptMutex default|<var>method</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>AcceptMutex default</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>prefork</td></tr></table>
+$B;H$&J}K!(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>AcceptMutex default|<var>method</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>AcceptMutex default</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>prefork</td></tr>
+</table>
<p><code class="directive">AcceptMutex</code> $B%G%#%l%/%F%#%V$O!"(B
$B%M%C%H%o!<%/%=%1%C%H$N%j%/%(%9%H$r(B accept $B$7$h$&$H$7$F$$$kJ#?t$N;R%W%m%;%9$r(B
- Apache $B$,D>Ns2=$9$k$?$a$K;H$&J}K!$r@_(B$BDj$7$^$9!#(B
+ Apache $B$,D>Ns2=$9$k$?$a$K;H$&J}K!$r@_Dj$7$^$9!#(B
Apache 2.0 $B$h$jA0$G$O!"$3$N%a%=%C%I$O%3%s%Q%$%k;~$K$N$_A*Br$G$-$^$7$?!#(B
$B:GE,$JJ}K!$O!"%"!<%-%F%/%A%c$d%W%i%C%H%[!<%`$KBg$-$/0MB8$7$^$9!#(B
$B>\:Y$K4X$7$F$O!"(B<a href="../misc/perf-tuning.html">$B@-G=$N%A%e!<%K%s%0(B</a>
@@ -134,13 +168,18 @@
<dd>POSIX Threads (PThreads) $B5,3J$G<BAu$5$l$F$$$k(B
POSIX $BGSB>=hM}$r;H$$$^$9!#(B</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="MaxSpareServers" id="MaxSpareServers">MaxSpareServers</a> <a name="maxspareservers" id="maxspareservers">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%"%$%I%k$J;R%5!<%P%W%m%;%9$N:GBg8D?t(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>MaxSpareServers <var>number</var><br /></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>MaxSpareServers 10</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>prefork</td></tr></table>
+
+</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">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%"%$%I%k$J;R%5!<%P%W%m%;%9$N:GBg8D?t(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>MaxSpareServers <var>number</var><br /></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>MaxSpareServers 10</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>prefork</td></tr>
+</table>
<p><code class="directive">MaxSpareServers</code> $B%G%#%l%/%F%#%V$O!"(B
<em>$B%"%$%I%k$J(B</em>$B;R%5!<%P%W%m%;%9$N4uK>:GBg8D?t$r@_Dj$7$^$9!#(B
$B%"%$%I%k%W%m%;%9$H$O!"%j%/%(%9%H$r07$C$F$$$J$$%W%m%;%9$G$9!#(B
@@ -149,13 +188,23 @@
<p>$BHs>o$K:.$s$G$$$k%5%$%H$G$N$_!"$3$N%Q%i%a!<%?$r%A%e!<%K%s%0$9$k$Y$-$G$9!#(B
$B$3$N%Q%i%a!<%?$rBg$-$/$9$k$H$$$&$3$H$O!"BgDq$N>l9g$O0-$$H/A[$G$9!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="directive"><a href="#minspareservers">MinSpareServers</a></code></li><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="directive-section"><h2><a name="MinSpareServers" id="MinSpareServers">MinSpareServers</a> <a name="minspareservers" id="minspareservers">$B%G(B$B%#%l%/%F%#%V(B</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%"%$%I%k$J;R%5!<%P%W%m%;%9$N:G>.8D?t(B</td></tr><tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:
- </a></th><td><code>MinSpareServers <var>number</var></code></td></tr><tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:
- </a></th><td><code>MinSpareServers 5</code></td></tr><tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:
- </a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr><tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:
- </a></th><td>prefork</td></tr></table>
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="directive"><a href="#minspareservers">MinSpareServers</a></code></li>
+<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="directive-section"><h2><a name="MinSpareServers" id="MinSpareServers">MinSpareServers</a> <a name="minspareservers" id="minspareservers">$B%G%#%l%/%F%#%V(B</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">$B@bL@(B:</a></th><td>$B%"%$%I%k$J;R%5!<%P%W%m%;%9$N:G>.8D?t(B</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">$B9=J8(B:</a></th><td><code>MinSpareServers <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">$B%G%U%)%k%H(B:</a></th><td><code>MinSpareServers 5</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">$B%3%s%F%-%9%H(B:</a></th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
+<tr><th><a href="directive-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">$B%b%8%e!<%k(B:</a></th><td>prefork</td></tr>
+</table>
<p><code class="directive">MaxSpareServers</code> $B%G%#%l%/%F%#%V$O!"(B
<em>$B%"%$%I%k$J(B</em>$B;R%5!<%P%W%m%;%9$N4uK>:G>.8D?t$r@_Dj$7$^$9!#(B
$B%"%$%I%k%W%m%;%9$H$O!"%j%/%(%9%H$r07$C$F$$$J$$%W%m%;%9$G$9!#(B
@@ -164,4 +213,15 @@
<p>$BHs>o$K:.$s$G$$$k%5%$%H$G$N$_!"$3$N%Q%i%a!<%?$r%A%e!<%K%s%0$9$k$Y$-$G$9!#(B
$B$3$N%Q%i%a!<%?$rBg$-$/$9$k$H$$$&$3$H$O!"BgDq$N>l9g$O0-$$H/A[$G$9!#(B</p>
-<h3>$B;2(B$B>H(B</h3><ul><li><code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code></li><li><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code></li></ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+
+<h3>$B;2>H(B</h3>
+<ul>
+<li><code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code></li>
+<li><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code></li>
+</ul>
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/prefork.xml b/docs/manual/mod/prefork.xml
index d4dbf44..374f5a0 100644
--- a/docs/manual/mod/prefork.xml
+++ b/docs/manual/mod/prefork.xml
@@ -23,10 +23,9 @@
handle as many simultaneous requests as you expect to receive, but
small enough to assure that there is enough physical RAM for all
processes.</p>
-
</summary>
-<seealso><a href="../bind.html">Setting which addresses and
- ports Apache uses</a></seealso>
+<seealso><a href="../bind.html">Setting which addresses and ports Apache
+uses</a></seealso>
<section id="how-it-works"><title>How it Works</title>
<p>A single control process is responsible for launching child
@@ -53,9 +52,9 @@
href="../misc/perf-tuning.html">performance hints</a>
documentation.</p>
- <p>While the parent process is usually started as root under Unix
- in order to bind to port 80, the child processes are launched by
- Apache as a less-privileged user. The <directive
+ <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 as a less-privileged user. The <directive
module="mpm_common">User</directive> and <directive
module="mpm_common">Group</directive> directives are used to set
the privileges of the Apache child processes. The child processes
@@ -67,109 +66,37 @@
old ones and launching new ones.</p>
</section>
-<directivesynopsis location="mpm_common">
-<name>CoreDumpDirectory</name>
+<directivesynopsis location="mpm_common"><name>BS2000Account</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>PidFile</name>
+<directivesynopsis location="mpm_common"><name>CoreDumpDirectory</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>Listen</name>
+<directivesynopsis location="mpm_common"><name>PidFile</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>ListenBacklog</name>
+<directivesynopsis location="mpm_common"><name>Listen</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>LockFile</name>
+<directivesynopsis location="mpm_common"><name>ListenBacklog</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>MaxClients</name>
+<directivesynopsis location="mpm_common"><name>LockFile</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>MaxMemFree</name>
+<directivesynopsis location="mpm_common"><name>MaxClients</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>MaxRequestsPerChild</name>
+<directivesynopsis location="mpm_common"><name>MaxMemFree</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>ScoreBoardFile</name>
+<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>SendBufferSize</name>
+<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>ServerLimit</name>
+<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>StartServers</name>
+<directivesynopsis location="mpm_common"><name>ServerLimit</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>User</name>
+<directivesynopsis location="mpm_common"><name>StartServers</name>
</directivesynopsis>
-
-<directivesynopsis location="mpm_common">
-<name>Group</name>
+<directivesynopsis location="mpm_common"><name>User</name>
</directivesynopsis>
-
-<directivesynopsis>
-<name>AcceptMutex</name>
-<description>Method that Apache uses to serialize multiple children
-accepting requests on network sockets</description>
-<syntax>AcceptMutex default|<var>method</var></syntax>
-<default>AcceptMutex default</default>
-<contextlist><context>server config</context></contextlist>
-
-<usage>
- <p>The <directive>AcceptMutex</directive> directives sets the
- method that Apache uses to serialize multiple children accepting
- requests on network sockets. Prior to Apache 2.0, the method was
- selectable only at compile time. The optimal method to use is
- highly architecture and platform dependent. For further details,
- see the <a href="../misc/perf-tuning.html">performance tuning</a>
- documentation.</p>
-
- <p>If this directive is set to <code>default</code>, then the
- compile-time selected default will be used. Other possible
- methods are listed below. Note that not all methods are
- available on all platforms. If a method is specified which is
- not available, a message will be written to the error log
- listing the available methods.</p>
-
- <dl>
- <dt><code>flock</code></dt>
-
- <dd>uses the <code>flock(2)</code> system call to lock the
- file defined by the <directive module="mpm_common"
- >LockFile</directive> directive.</dd>
-
- <dt><code>fcntl</code></dt>
-
- <dd>uses the <code>fnctl(2)</code> system call to lock the
- file defined by the <directive module="mpm_common"
- >LockFile</directive> directive.</dd>
-
- <dt><code>sysvsem</code></dt>
-
- <dd>uses SySV-style semaphores to implement the mutex.</dd>
-
- <dt><code>pthread</code></dt>
-
- <dd>uses POSIX mutexes as implemented by the POSIX Threads
- (PThreads) specification.</dd>
- </dl>
-</usage>
+<directivesynopsis location="mpm_common"><name>Group</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>AcceptMutex</name>
</directivesynopsis>
<directivesynopsis>
@@ -183,12 +110,15 @@
<p>The <directive>MaxSpareServers</directive> directive sets the
desired maximum number of <em>idle</em> child server processes. An
idle process is one which is not handling a request. If there are
- more than MaxSpareServers idle, then the parent process will kill
- off the excess processes.</p>
+ more than <directive>MaxSpareServers</directive> idle, then the
+ parent process will kill off the excess processes.</p>
<p>Tuning of this parameter should only be necessary on very
busy sites. Setting this parameter to a large number is almost
- always a bad idea.</p>
+ always a bad idea. If you are trying to set the value lower than
+ <directive module="prefork">MinSpareServers</directive>, Apache
+ will automatically adjust it to <directive
+ >MinSpareServers</directive><code> + 1</code>.</p>
</usage>
<seealso><directive module="prefork">MinSpareServers</directive></seealso>
<seealso><directive module="mpm_common">StartServers</directive></seealso>
@@ -198,15 +128,15 @@
<name>MinSpareServers</name>
<description>Minimum number of idle child server processes</description>
<syntax>MinSpareServers <var>number</var></syntax>
-<default>MinSpareServers 5</default>
+<default>MinSpareServers 5</default>
<contextlist><context>server config</context></contextlist>
<usage>
<p>The <directive>MinSpareServers</directive> directive sets the
desired minimum number of <em>idle</em> child server processes. An
idle process is one which is not handling a request. If there are
- fewer than MinSpareServers idle, then the parent process creates
- new children at a maximum rate of 1 per second.</p>
+ fewer than <directive>MinSpareServers</directive> idle, then the parent
+ process creates new children at a maximum rate of 1 per second.</p>
<p>Tuning of this parameter should only be necessary on very
busy sites. Setting this parameter to a large number is almost
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
new file mode 100644
index 0000000..a116c36
--- /dev/null
+++ b/docs/manual/mod/quickreference.html.de
@@ -0,0 +1,679 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>Kurzreferenz der Direktiven - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="directive-index">
+<div id="page-header">
+<p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="../">Version 2.0</a> > <a href="./">Module</a></div>
+<div id="preamble"><h1>Kurzreferenz der Direktiven</h1>
+
+ <p>Die Kurzreferenz der Direktiven zeigt die Verwendung,
+ Voreinstellung, den Status und den Kontext aller
+ Apache-Konfigurationsanweisungen. Für weitergehende Informationen
+ schauen Sie bitte im <a href="directive-dict.html">Verzeichnis der Direktiven</a>.</p>
+
+ <p>Die erste Spalte enthält den Namen und die Verwendung.
+ Die zweite Spalte zeigt die Voreinstellung der Direktive, sofern
+ eine Voreinstellung existiert. Wenn die Voreinstellung zu breit
+ für die Anzeige ist, werden die ersten Buchstaben angegeben,
+ gefolgt von einem "+".</p>
+
+ <p>Die dritte und vierte Spalte geben den Kontext an, in dem die
+ Direktive erlaubt ist, sowie den Status der Direktive entsprechend
+ der Legende.</p>
+ </div>
+<div id="directive-ref"><table id="legend">
+<tr><td class="letters"><span><a href="#A"> A </a> | <a href="#B"> B </a> | <a href="#C"> C </a> | <a href="#D"> D </a> | <a href="#E"> E </a> | <a href="#F"> F </a> | <a href="#G"> G </a> | <a href="#H"> H </a> | <a href="#I"> I </a> | <a href="#K"> K </a> | <a href="#L"> L </a> | <a href="#M"> M </a> | <a href="#N"> N </a> | <a href="#O"> O </a> | <a href="#P"> P </a> | <a href="#R"> R </a> | <a href="#S"> S </a> | <a href="#T"> T </a> | <a href="#U"> U </a> | <a href="#V"> V </a> | <a href="#X"> X </a></span></td>
+<td><table>
+ <tr><th>s</th><td>Serverkonfiguration</td></tr>
+ <tr><th>v</th><td>Virtual Host</td></tr>
+ <tr><th>d</th><td>Verzeichnis</td></tr>
+ <tr><th>h</th><td>.htaccess</td></tr>
+ </table></td>
+<td><table>
+ <tr><th>C</th><td>Core</td></tr>
+ <tr><th>M</th><td>MPM</td></tr>
+ <tr><th>B</th><td>Basis</td></tr>
+ <tr><th>E</th><td>Erweiterung</td></tr>
+ <tr><th>X</th><td>experimentell</td></tr>
+ </table></td></tr>
+</table>
+<table class="qref">
+<tr><td><a href="mpm_common.html#acceptmutex" id="A" name="A">AcceptMutex Default|<var>method</var></a></td><td> Default </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Method that Apache uses to serialize multiple children
+accepting requests on network sockets</td></tr>
+<tr class="odd"><td><a href="core.html#acceptpathinfo">AcceptPathInfo On|Off|Default</a></td><td> Default </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Resources accept trailing pathname information</td></tr>
+<tr><td><a href="core.html#accessfilename">AccessFileName <var>filename</var> [<var>filename</var>] ...</a></td><td> .htaccess </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Name of the distributed configuration file</td></tr>
+<tr class="odd"><td><a href="mod_actions.html#action">Action <var>action-type</var> <var>cgi-script</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Activates a CGI script for a particular handler or
+content-type</td></tr>
+<tr><td><a href="mod_autoindex.html#addalt">AddAlt <var>string</var> <var>file</var> [<var>file</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Alternate text to display for a file, instead of an
+icon selected by filename</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#addaltbyencoding">AddAltByEncoding <var>string</var> <var>MIME-encoding</var>
+[<var>MIME-encoding</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Alternate text to display for a file instead of an icon
+selected by MIME-encoding</td></tr>
+<tr><td><a href="mod_autoindex.html#addaltbytype">AddAltByType <var>string</var> <var>MIME-type</var>
+[<var>MIME-type</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Alternate text to display for a file, instead of an
+icon selected by MIME content-type</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addcharset">AddCharset <var>charset</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the given filename extensions to the specified content
+charset</td></tr>
+<tr><td><a href="core.html#adddefaultcharset">AddDefaultCharset On|Off|<var>charset</var></a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Default character set to be added for a
+response without an explicit character set</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#adddescription">AddDescription <var>string file</var> [<var>file</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Description to display for a file</td></tr>
+<tr><td><a href="mod_mime.html#addencoding">AddEncoding <var>MIME-enc</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extensions to the specified encoding
+type</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addhandler">AddHandler <var>handler-name</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the filename extensions to the specified
+handler</td></tr>
+<tr><td><a href="mod_autoindex.html#addicon">AddIcon <var>icon</var> <var>name</var> [<var>name</var>]
+...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Icon to display for a file selected by name</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#addiconbyencoding">AddIconByEncoding <var>icon</var> <var>MIME-encoding</var>
+[<var>MIME-encoding</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Icon to display next to files selected by MIME
+content-encoding</td></tr>
+<tr><td><a href="mod_autoindex.html#addiconbytype">AddIconByType <var>icon</var> <var>MIME-type</var>
+[<var>MIME-type</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Icon to display next to files selected by MIME
+content-type</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addinputfilter">AddInputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps filename extensions to the filters that will process
+client requests</td></tr>
+<tr><td><a href="mod_mime.html#addlanguage">AddLanguage <var>MIME-lang</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extension to the specified content
+language</td></tr>
+<tr class="odd"><td><a href="mod_info.html#addmoduleinfo">AddModuleInfo <var>module-name</var> <var>string</var></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adds additional information to the module
+information displayed by the server-info handler</td></tr>
+<tr><td><a href="mod_mime.html#addoutputfilter">AddOutputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps filename extensions to the filters that will process
+responses from the server</td></tr>
+<tr class="odd"><td><a href="core.html#addoutputfilterbytype">AddOutputFilterByType <var>filter</var>[;<var>filter</var>...]
+<var>MIME-type</var> [<var>MIME-type</var>] ...</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">assigns an output filter to a particular MIME-type</td></tr>
+<tr><td><a href="mod_mime.html#addtype">AddType <var>MIME-type</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extensions onto the specified content
+type</td></tr>
+<tr class="odd"><td><a href="mod_alias.html#alias">Alias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps URLs to filesystem locations</td></tr>
+<tr><td><a href="mod_alias.html#aliasmatch">AliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps URLs to filesystem locations using regular
+expressions</td></tr>
+<tr class="odd"><td><a href="mod_access.html#allow"> Allow from
+ all|<var>host</var>|env=<var>env-variable</var>
+ [<var>host</var>|env=<var>env-variable</var>] ...</a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Controls which hosts can access an area of the
+server</td></tr>
+<tr><td><a href="mod_proxy.html#allowconnect">AllowCONNECT <em>port</em> [<em>port</em>] ...</a></td><td> 443 563 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Ports that are allowed to <code>CONNECT</code> through
+the proxy</td></tr>
+<tr class="odd"><td><a href="core.html#allowoverride">AllowOverride All|None|<var>directive-type</var>
+[<var>directive-type</var>] ...</a></td><td> All </td><td>d</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Types of directives that are allowed in
+<code>.htaccess</code> files</td></tr>
+<tr><td><a href="mod_auth_anon.html#anonymous">Anonymous <var>user</var> [<var>user</var>] ...</a></td><td /><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Specifies userIDs that areallowed access without
+password verification</td></tr>
+<tr class="odd"><td><a href="mod_auth_anon.html#anonymous_authoritative">Anonymous_Authoritative On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configures if authorization will fall-through
+to other methods</td></tr>
+<tr><td><a href="mod_auth_anon.html#anonymous_logemail">Anonymous_LogEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether the password entered will be logged in the
+error log</td></tr>
+<tr class="odd"><td><a href="mod_auth_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Specifies whether blank passwords are allowed</td></tr>
+<tr><td><a href="mod_auth_anon.html#anonymous_nouserid">Anonymous_NoUserID On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether the userID field may be empty</td></tr>
+<tr class="odd"><td><a href="mod_auth_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether to check the password field for a correctly
+formatted email address</td></tr>
+<tr><td><a href="perchild.html#assignuserid">AssignUserID <var>user-id</var> <var>group-id</var></a></td><td /><td>v</td><td>M</td></tr><tr><td class="descr" colspan="4">Tie a virtual host to a user and group ID</td></tr>
+<tr class="odd"><td><a href="mod_auth.html#authauthoritative">AuthAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether authorization and authentication are
+passed to lower level modules</td></tr>
+<tr><td><a href="mod_auth_dbm.html#authdbmauthoritative">AuthDBMAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether authentication and authorization will be
+passwed on to lower level modules</td></tr>
+<tr class="odd"><td><a href="mod_auth_dbm.html#authdbmgroupfile">AuthDBMGroupFile <var>file-path</var></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the database file containing the list
+of user groups for authentication</td></tr>
+<tr><td><a href="mod_auth_dbm.html#authdbmtype">AuthDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the type of database file that is used to
+store passwords</td></tr>
+<tr class="odd"><td><a href="mod_auth_dbm.html#authdbmuserfile">AuthDBMUserFile <var>file-path</var></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets thename of a database file containing the list of users and
+passwords for authentication</td></tr>
+<tr><td><a href="mod_auth_digest.html#authdigestalgorithm">AuthDigestAlgorithm MD5|MD5-sess</a></td><td> MD5 </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Selects the algorithm used to calculate the challenge and
+response hases in digest authentication</td></tr>
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestdomain">AuthDigestDomain <var>URI</var> [<var>URI</var>] ...</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">URIs that are in the same protection space for digest
+authentication</td></tr>
+<tr><td><a href="mod_auth_digest.html#authdigestfile">AuthDigestFile <var>file-path</var></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Location of the text file containing the list
+of users and encoded passwords for digest authentication</td></tr>
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestgroupfile">AuthDigestGroupFile <var>file-path</var></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the text file containing the list of groups
+for digest authentication</td></tr>
+<tr><td><a href="mod_auth_digest.html#authdigestnccheck">AuthDigestNcCheck On|Off</a></td><td> Off </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Enables or disables checking of the nonce-count sent by the
+server</td></tr>
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestnonceformat">AuthDigestNonceFormat <var>format</var></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Determines how the nonce is generated</td></tr>
+<tr><td><a href="mod_auth_digest.html#authdigestnoncelifetime">AuthDigestNonceLifetime <var>seconds</var></a></td><td> 300 </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">How long the server nonce is valid</td></tr>
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestqop">AuthDigestQop none|auth|auth-int [auth|auth-int]</a></td><td> auth </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Determines the quality-of-protection to use in digest
+authentication</td></tr>
+<tr><td><a href="mod_auth_digest.html#authdigestshmemsize">AuthDigestShmemSize <var>size</var></a></td><td> 1000 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">The amount of shared memory to allocate for keeping track
+of clients</td></tr>
+<tr class="odd"><td><a href="mod_auth.html#authgroupfile">AuthGroupFile <var>file-path</var></a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of a text file containing the list
+of user groups for authentication</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapauthoritative">AuthLDAPAuthoritative on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Prevent other authentication modules from
+authenticating the user if this one fails</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapbinddn">AuthLDAPBindDN <em>distinguished-name</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Optional DN to use in binding to the LDAP server</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapbindpassword">AuthLDAPBindPassword <em>password</em></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Password used in conjuction with the bind DN</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapcomparednonserver">AuthLDAPCompareDNOnServer on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Use the LDAP server to compare the DNs</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapdereferencealiases">AuthLDAPDereferenceAliases never|searching|finding|always</a></td><td> Always </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">When will the module de-reference aliases</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapenabled"> AuthLDAPEnabled on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn on or off LDAP authentication</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapfrontpagehack">AuthLDAPFrontPageHack on|off</a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Allow LDAP authentication to work with MS FrontPage</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapgroupattribute">AuthLDAPGroupAttribute <em>attribute</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">LDAP attributes used to check for group membership</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Use the DN of the client username when checking for
+group membership</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN on|off</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Use the DN of the client username to set the REMOTE_USER
+environment variable</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapstarttls">AuthLDAPStartTLS on|off</a></td><td> off </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Use a secure TLS connection to the LDAP server</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapurl">AuthLDAPUrl <em>url</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">URL specifying the LDAP search parameters</td></tr>
+<tr><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td /><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Authorization realm for use in HTTP
+authentication</td></tr>
+<tr class="odd"><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Type of user authentication</td></tr>
+<tr><td><a href="mod_auth.html#authuserfile">AuthUserFile <var>file-path</var></a></td><td /><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets the name of a text file containing the list of users and
+passwords for authentication</td></tr>
+<tr class="odd"><td><a href="mod_setenvif.html#browsermatch" id="B" name="B">BrowserMatch <em>regex [!]env-variable</em>[=<em>value</em>]
+[[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables conditional on HTTP User-Agent
+</td></tr>
+<tr><td><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase <em>regex [!]env-variable</em>[=<em>value</em>]
+ [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables conditional on User-Agent without
+respect to case</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#bs2000account">BS2000Account <var>account</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Define the non-privileged account on BS2000
+machines</td></tr>
+<tr><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (one hour) </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The default duration to cache a document when no expiry date is specified.</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
+<tr><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 3 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The number of levels of subdirectories in the
+cache.</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachedisable">CacheDisable <var> url-string</var></a></td><td /><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Disable caching of specified URLs</td></tr>
+<tr><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td /><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
+manager</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cacheexpirycheck">CacheExpiryCheck On|Off</a></td><td> On </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Indicates if the cache observes Expires dates when seeking
+files</td></tr>
+<tr><td><a href="mod_file_cache.html#cachefile">CacheFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Cache a list of file handles at startup time</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cacheforcecompletion">CacheForceCompletion <var>Percentage</var></a></td><td> 60 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Percentage of document served, after which the server
+will complete caching the file even if the request is cancelled.</td></tr>
+<tr><td><a href="mod_disk_cache.html#cachegcclean">CacheGcClean <var>hours</var> <var>url-string</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The time to retain unchanged cached files that match a
+URL</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachegcdaily">CacheGcDaily <var>time</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The recurring time each day for garbage collection to be run.
+(24 hour clock)</td></tr>
+<tr><td><a href="mod_disk_cache.html#cachegcinterval">CacheGcInterval <var>hours</var></a></td><td /><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The interval between garbage collection attempts.</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachegcmemusage">CacheGcMemUsage <var>KBytes</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum kilobytes of memory used for garbage
+collection</td></tr>
+<tr><td><a href="mod_disk_cache.html#cachegcunused">CacheGcUnused <var>hours</var> <var>url-string</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The time to retain unreferenced cached files that match a
+URL.</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore the fact that the client requested the content not be
+cached.</td></tr>
+<tr><td><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Ignore the fact that a response has no Last Modified
+header.</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor <var>float</var></a></td><td> 0.1 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The factor used to compute an expiry date based on the
+LastModified date.</td></tr>
+<tr><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (one day) </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The maximum time in seconds to cache a document</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
+cache</td></tr>
+<tr><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
+cache</td></tr>
+<tr class="odd"><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Allows content-negotiated documents to be
+cached by proxy servers</td></tr>
+<tr><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td /><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The directory root under which cache files are
+stored</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachesize">CacheSize <var>KBytes</var></a></td><td> 1000000 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum amount of disk space that will be used by the
+cache in KBytes</td></tr>
+<tr><td><a href="mod_disk_cache.html#cachetimemargin">CacheTimeMargin <var>?</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The minimum time margin to cache a document</td></tr>
+<tr class="odd"><td><a href="core.html#cgimapextension">CGIMapExtension <var>cgi-path</var> <var>.extension</var></a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Technique for locating the interpreter for CGI
+scripts</td></tr>
+<tr><td><a href="mod_charset_lite.html#charsetdefault">CharsetDefault <var>charset</var></a></td><td /><td>svdh</td><td>X</td></tr><tr><td class="descr" colspan="4">Charset to translate into</td></tr>
+<tr class="odd"><td><a href="mod_charset_lite.html#charsetoptions">CharsetOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoImpl +</td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Configures charset translation behavior</td></tr>
+<tr><td><a href="mod_charset_lite.html#charsetsourceenc">CharsetSourceEnc <var>charset</var></a></td><td /><td>svdh</td><td>X</td></tr><tr><td class="descr" colspan="4">Source charset of files</td></tr>
+<tr class="odd"><td><a href="mod_speling.html#checkspelling">CheckSpelling on|off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables the spelling
+module</td></tr>
+<tr><td><a href="perchild.html#childperuserid">ChildPerUserID <var>user-id</var> <var>group-id</var>
+<var>num-children</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Specify user ID and group ID for a number of child
+processes</td></tr>
+<tr class="odd"><td><a href="core.html#contentdigest">ContentDigest On|Off</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enables the generation of <code>Content-MD5</code> HTTP Response
+headers</td></tr>
+<tr><td><a href="mod_usertrack.html#cookiedomain">CookieDomain <em>domain</em></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The domain to which the tracking cookie applies</td></tr>
+<tr class="odd"><td><a href="mod_usertrack.html#cookieexpires">CookieExpires <em>expiry-period</em></a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Expiry time for the tracking cookie</td></tr>
+<tr><td><a href="mod_log_config.html#cookielog">CookieLog <var>filename</var></a></td><td /><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets filename for the logging of cookies</td></tr>
+<tr class="odd"><td><a href="mod_usertrack.html#cookiename">CookieName <em>token</em></a></td><td> Apache </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the tracking cookie</td></tr>
+<tr><td><a href="mod_usertrack.html#cookiestyle">CookieStyle
+ <em>Netscape|Cookie|Cookie2|RFC2109|RFC2965</em></a></td><td> Netscape </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Format of the cookie header field</td></tr>
+<tr class="odd"><td><a href="mod_usertrack.html#cookietracking">CookieTracking on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables tracking cookie</td></tr>
+<tr><td><a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory <var>directory</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Directory where Apache attempts to
+switch before dumping core</td></tr>
+<tr class="odd"><td><a href="mod_log_config.html#customlog">CustomLog <var>file</var>|<var>pipe</var>
+<var>format</var>|<var>nickname</var>
+[env=[!]<var>environment-variable</var>]</a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets filename and format of log file</td></tr>
+<tr><td><a href="mod_dav.html#dav" id="D" name="D">Dav On|Off|<var>provider-name</var></a></td><td> Off </td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable WebDAV HTTP methods</td></tr>
+<tr class="odd"><td><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity on|off</a></td><td> off </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Allow PROPFIND, Depth: Infinity requests</td></tr>
+<tr><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
+<tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
+a DAV resource</td></tr>
+<tr><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Icon to display for files when no specific icon is
+configured</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets all files in the given scope to the specified
+language</td></tr>
+<tr><td><a href="core.html#defaulttype">DefaultType <var>MIME-type</var></a></td><td> text/plain </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">MIME content-type that will be sent if the
+server cannot determine a type in any other way</td></tr>
+<tr class="odd"><td><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize <var>value</var></a></td><td> 8096 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Fragment size to be compressed at one time by zlib</td></tr>
+<tr><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote <var>notename</var></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Places the compression ratio in a note for logging</td></tr>
+<tr class="odd"><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">How much memory should be used by zlib for compression</td></tr>
+<tr><td><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize <var>value</var></a></td><td> 15 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Zlib compression window size</td></tr>
+<tr class="odd"><td><a href="mod_access.html#deny"> Deny from all|<var>host</var>|env=<var>env-variable</var>
+[<var>host</var>|env=<var>env-variable</var>] ...</a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Controls which hosts are denied access to the
+server</td></tr>
+<tr><td><a href="core.html#directory"><Directory <var>directory-path</var>>
+... </Directory></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that apply only to the
+named file-system directory and sub-directories</td></tr>
+<tr class="odd"><td><a href="mod_dir.html#directoryindex">DirectoryIndex
+ <var>local-url</var> [<var>local-url</var>] ...</a></td><td> index.html </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">List of resources to look for when the client requests
+a directory</td></tr>
+<tr><td><a href="core.html#directorymatch"><DirectoryMatch <var>regex</var>>
+... </DirectoryMatch></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Enclose directives that apply to
+file-system directories matching a regular expression and their
+subdirectories</td></tr>
+<tr class="odd"><td><a href="core.html#documentroot">DocumentRoot <var>directory-path</var></a></td><td> /usr/local/apache/h +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Directory that forms the main document tree visible
+from the web</td></tr>
+<tr><td><a href="core.html#enablemmap" id="E" name="E">EnableMMAP On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Use memory-mapping to read files during delivery</td></tr>
+<tr class="odd"><td><a href="core.html#enablesendfile">EnableSendfile On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Use the kernel sendfile support to deliver files to the client</td></tr>
+<tr><td><a href="core.html#errordocument">ErrorDocument <var>error-code</var> <var>document</var></a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">What the server will return to the client
+in case of an error</td></tr>
+<tr class="odd"><td><a href="core.html#errorlog"> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Location where the server will log errors</td></tr>
+<tr><td><a href="mod_example.html#example">Example</a></td><td /><td>svdh</td><td>X</td></tr><tr><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
+API</td></tr>
+<tr class="odd"><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables generation of <code>Expires</code>
+headers</td></tr>
+<tr><td><a href="mod_expires.html#expiresbytype">ExpiresByType <var>MIME-type</var>
+<var><code>seconds</var></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Value of the <code>Expires</code> header configured
+by MIME type</td></tr>
+<tr class="odd"><td><a href="mod_expires.html#expiresdefault">ExpiresDefault <var><code>seconds</var></a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Default algorithm for calculating expiration time</td></tr>
+<tr><td><a href="mod_status.html#extendedstatus">ExtendedStatus On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Keep track of extended status information for each
+request</td></tr>
+<tr class="odd"><td><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine <var>filtername</var> <var>parameters</var></a></td><td /><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Define an external filter</td></tr>
+<tr><td><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoLogS +</td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> options</td></tr>
+<tr class="odd"><td><a href="core.html#fileetag" id="F" name="F">FileETag <var>component</var> ...</a></td><td> INode MTime Size </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">File attributes used to create the ETag
+HTTP response header</td></tr>
+<tr><td><a href="core.html#files"><Files <var>filename</var>> ... </Files></a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Contains directives that apply to matched
+filenames</td></tr>
+<tr class="odd"><td><a href="core.html#filesmatch"><FilesMatch <var>regex</var>> ... </FilesMatch></a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Contains directives that apply to regular-expression matched
+filenames</td></tr>
+<tr><td><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</a></td><td> Prefer </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Action to take if a single acceptable document is not
+found</td></tr>
+<tr class="odd"><td><a href="core.html#forcetype">ForceType <var>MIME-type</var>|none</a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be served with the specified
+MIME content-type</td></tr>
+<tr><td><a href="mpm_common.html#group" id="G" name="G">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
+requests</td></tr>
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header set|append|add|unset|echo <var>header</var>
+[<var>value</var> [env=[!]<var>variable</var>]]</a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
+<tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
+of the index listing</td></tr>
+<tr class="odd"><td><a href="core.html#hostnamelookups">HostnameLookups On|Off|Double</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enables DNS lookups on client IP addresses</td></tr>
+<tr><td><a href="core.html#identitycheck" id="I" name="I">IdentityCheck On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Enables logging of the RFC1413 identity of the remote
+user</td></tr>
+<tr class="odd"><td><a href="core.html#ifdefine"><IfDefine [!]<var>parameter-name</var>> ...
+ </IfDefine></a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Encloses directives that will be processed only
+if a test is true at startup</td></tr>
+<tr><td><a href="core.html#ifmodule"><IfModule [!]<var>module-name</var>> ...
+ </IfModule></a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Encloses directives that are processed conditional on the
+presence or absence of a specific module</td></tr>
+<tr class="odd"><td><a href="mod_imap.html#imapbase">ImapBase map|referer|<var>URL</var></a></td><td> http://servername/ </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Default <code>base</code> for imagemap files</td></tr>
+<tr><td><a href="mod_imap.html#imapdefault">ImapDefault error|nocontent|map|referer|<var>URL</var></a></td><td> nocontent </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Default action when an imagemap is called with coordinates
+that are not explicitly mapped</td></tr>
+<tr class="odd"><td><a href="mod_imap.html#imapmenu">ImapMenu none|formatted|semiformatted|unformatted</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Action if no coordinates are given when calling
+an imagemap</td></tr>
+<tr><td><a href="core.html#include">Include <var>file-path</var>|<var>directory-path</var></a></td><td /><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Includes other configuration files from within
+the server configuration files</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#indexignore">IndexIgnore <var>file</var> [<var>file</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Adds to the list of files to hide when listing
+a directory</td></tr>
+<tr><td><a href="mod_autoindex.html#indexoptions">IndexOptions [+|-]<var>option</var> [[+|-]<var>option</var>]
+...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Various configuration settings for directory
+indexing</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#indexorderdefault">IndexOrderDefault Ascending|Descending
+Name|Date|Size|Description</a></td><td> Ascending Name </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the default ordering of the directory index</td></tr>
+<tr><td><a href="mod_isapi.html#isapiappendlogtoerrors">ISAPIAppendLogToErrors on|off</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
+ISAPI extensions to the error log</td></tr>
+<tr class="odd"><td><a href="mod_isapi.html#isapiappendlogtoquery">ISAPIAppendLogToQuery on|off</a></td><td> on </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
+ISAPI extensions to the query field</td></tr>
+<tr><td><a href="mod_isapi.html#isapicachefile">ISAPICacheFile <var>file-path</var> [<var>file-path</var>]
+...</a></td><td /><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">ISAPI .dll files to be loaded at startup</td></tr>
+<tr class="odd"><td><a href="mod_isapi.html#isapifakeasync">ISAPIFakeAsync on|off</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Fake asynchronous support for ISAPI callbacks</td></tr>
+<tr><td><a href="mod_isapi.html#isapilognotsupported">ISAPILogNotSupported on|off</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Log unsupported feature requests from ISAPI
+extensions</td></tr>
+<tr class="odd"><td><a href="mod_isapi.html#isapireadaheadbuffer">ISAPIReadAheadBuffer <var>size</var></a></td><td> 49152 </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Size of the Read Ahead Buffer sent to ISAPI
+extensions</td></tr>
+<tr><td><a href="core.html#keepalive" id="K" name="K">KeepAlive On|Off</a></td><td> On </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Enables HTTP persistent connections</td></tr>
+<tr class="odd"><td><a href="core.html#keepalivetimeout">KeepAliveTimeout <var>seconds</var></a></td><td> 15 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for subsequent
+requests on a persistent connection</td></tr>
+<tr><td><a href="mod_negotiation.html#languagepriority" id="L" name="L">LanguagePriority <var>MIME-lang</var> [<var>MIME-lang</var>]
+...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">The precendence of language variants for cases where
+the client does not express a preference</td></tr>
+<tr class="odd"><td><a href="mod_ldap.html#ldapcacheentries">LDAPCacheEntries <var>number</var></a></td><td> 1024 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of entires in the primary LDAP cache</td></tr>
+<tr><td><a href="mod_ldap.html#ldapcachettl">LDAPCacheTTL <var>seconds</var></a></td><td> 600 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Time that cached items remain valid</td></tr>
+<tr class="odd"><td><a href="mod_ldap.html#ldapcertdbpath">LDAPCertDBPath <var>directory-path</var></a></td><td /><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Directory containing certificates for SSL support</td></tr>
+<tr><td><a href="mod_ldap.html#ldapopcacheentries">LDAPOpCacheEntries <var>number</var></a></td><td> 1024 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Number of entries used to cache LDAP compare
+operations</td></tr>
+<tr class="odd"><td><a href="mod_ldap.html#ldapopcachettl">LDAPOpCacheTTL <var>seconds</var></a></td><td> 600 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Time that entries in the operation cache remain
+valid</td></tr>
+<tr><td><a href="mod_ldap.html#ldapsharedcachesize">LDAPSharedCacheSize <var>bytes</var></a></td><td> 102400 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Size in bytes of the shared-memory cache</td></tr>
+<tr class="odd"><td><a href="core.html#limit"><Limit <var>method</var> [<var>method</var>] ... > ...
+ </Limit></a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Restrict enclosed access controls to only certain HTTP
+methods</td></tr>
+<tr><td><a href="core.html#limitexcept"><LimitExcept <var>method</var> [<var>method</var>] ... > ...
+ </LimitExcept></a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Restrict access controls to all HTTP methods
+except the named ones</td></tr>
+<tr class="odd"><td><a href="core.html#limitrequestbody">LimitRequestBody <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Restricts the total size of the HTTP request body sent
+from the client</td></tr>
+<tr><td><a href="core.html#limitrequestfields">LimitRequestFields <var>number</var></a></td><td> 100 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of HTTP request header fields that
+will be accepted from the client</td></tr>
+<tr class="odd"><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldsize <var>bytes</var></a></td><td /><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
+client</td></tr>
+<tr><td><a href="core.html#limitrequestline">LimitRequestLine <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limit the size of the HTTP request line that will be accepted
+from the client</td></tr>
+<tr class="odd"><td><a href="core.html#limitxmlrequestbody">LimitXMLRequestBody <var>bytes</var></a></td><td> 1000000 </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the size of an XML-based request body</td></tr>
+<tr><td><a href="mpm_common.html#listen">Listen [<var>IP-address</var>:]<var>portnumber</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">IP addresses and ports that the server
+listens to</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#listenbacklog">ListenBacklog <var>backlog</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum length of the queue of pending connections</td></tr>
+<tr><td><a href="mod_so.html#loadfile">LoadFile <em>filename</em> [<em>filename</em>] ...</a></td><td /><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Link in the named object file or library</td></tr>
+<tr class="odd"><td><a href="mod_so.html#loadmodule">LoadModule <em>module filename</em></a></td><td /><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Links in the object file or library, and adds to the list
+of active modules</td></tr>
+<tr><td><a href="core.html#location"><Location
+ <var>URL-path</var>|<var>URL</var>> ... </Location></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Applies the enclosed directives only to matching
+URLs</td></tr>
+<tr class="odd"><td><a href="core.html#locationmatch"><LocationMatch
+ <var>regex</var>> ... </LocationMatch></a></td><td /><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Applies the enclosed directives only to regular-expression
+matching URLs</td></tr>
+<tr><td><a href="mpm_common.html#lockfile">LockFile <var>filename</var></a></td><td> logs/accept.lock </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Location of the accept serialization lock file</td></tr>
+<tr class="odd"><td><a href="mod_log_config.html#logformat">LogFormat <var>format</var>|<var>nickname</var>
+[<var>nickname</var>]</a></td><td> "%h %l %u %t \"%r\" +</td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Describes a format for use in a log file</td></tr>
+<tr><td><a href="core.html#loglevel">LogLevel <var>level</var></a></td><td> warn </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Controls the verbosity of the ErrorLog</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of child processes that will be created
+to serve requests</td></tr>
+<tr><td><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests <var>number</var></a></td><td> 100 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Number of requests allowed on a persistent
+connection</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#maxmemfree">MaxMemFree <var>KBytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum amount of memory that the main allocator is allowed
+to hold without calling <code>free()</code></td></tr>
+<tr><td><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild <var>number</var></a></td><td> 10000 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Limit on the number of requests that an individual child server
+will handle during its life</td></tr>
+<tr class="odd"><td><a href="beos.html#maxrequestsperthread">MaxRequestsPerThread <var>number</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Limit on the number of requests that an individual thread
+will handle during its life</td></tr>
+<tr><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var><br /></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Maximum number of idle child server processes</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of idle threads</td></tr>
+<tr><td><a href="mpm_netware.html#maxthreads">MaxThreads <var>number</var></a></td><td> 2048 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Set the maximum number of worker threads</td></tr>
+<tr class="odd"><td><a href="perchild.html#maxthreadsperchild">MaxThreadsPerChild <var>number</var></a></td><td> 64 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of threads per child process</td></tr>
+<tr><td><a href="mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount <var>value</var></a></td><td> 1009 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">The maximum number of objects allowed to be placed in the
+cache</td></tr>
+<tr class="odd"><td><a href="mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize <var>bytes</var></a></td><td> 10000 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum size (in bytes) of a document allowed in the
+cache</td></tr>
+<tr><td><a href="mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer <var>size_in_bytes</var></a></td><td> the smaller of 1000 +</td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Maximum amount of a streamed response to buffer in memory
+before declaring the response uncacheable</td></tr>
+<tr class="odd"><td><a href="mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of a document to be allowed in the
+cache</td></tr>
+<tr><td><a href="mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm LRU|GDSF</a></td><td> GDSF </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">The algorithm used to select documents for removal from the
+cache</td></tr>
+<tr class="odd"><td><a href="mod_mem_cache.html#mcachesize">MCacheSize <var>KBytes</var></a></td><td> 100 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum amount of memory used by the cache in
+KBytes</td></tr>
+<tr><td><a href="mod_cern_meta.html#metadir">MetaDir <var>directory</var></a></td><td> .web </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Name of the directory to find CERN-style meta information
+files</td></tr>
+<tr class="odd"><td><a href="mod_cern_meta.html#metafiles">MetaFiles on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Activates CERN meta-file processing</td></tr>
+<tr><td><a href="mod_cern_meta.html#metasuffix">MetaSuffix <var>suffix</var></a></td><td> .meta </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">File name suffix for the file containg CERN-style
+meta information</td></tr>
+<tr class="odd"><td><a href="mod_mime_magic.html#mimemagicfile">MimeMagicFile <var>file-path</var></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable MIME-type determination based on file contents
+using the specified magic file</td></tr>
+<tr><td><a href="prefork.html#minspareservers">MinSpareServers <var>number</var></a></td><td> 5 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Minimum number of idle child server processes</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#minsparethreads">MinSpareThreads <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of idle threads available to handle request
+spikes</td></tr>
+<tr><td><a href="mod_file_cache.html#mmapfile">MMapFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Map a list of files into memory at startup time</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo On|Off</a></td><td> Off </td><td>d</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Tells <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> to treat <code>path_info</code>
+components as part of the filename</td></tr>
+<tr><td><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
+[Handlers|Filters]</a></td><td> NegotiatedOnly </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">The types of files that will be included when searching for
+a matching file with MultiViews</td></tr>
+<tr class="odd"><td><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost <var>addr</var>[:<var>port</var>]</a></td><td /><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Designates an IP address for name-virtual
+hosting</td></tr>
+<tr><td><a href="mod_proxy.html#noproxy">NoProxy <em>host</em> [<em>host</em>] ...</a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Hosts, domains, or networks that will be connected
+to directly</td></tr>
+<tr class="odd"><td><a href="perchild.html#numservers">NumServers <var>number</var></a></td><td> 2 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Total number of children alive at the same time</td></tr>
+<tr><td><a href="core.html#options" id="O" name="O">Options
+ [+|-]<var>option</var> [[+|-]<var>option</var>] ...</a></td><td> All </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures what features are available in a particular
+directory</td></tr>
+<tr class="odd"><td><a href="mod_access.html#order"> Order <var>ordering</var></a></td><td> Deny,Allow </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Controls the default access state and the order in which
+<code class="directive">Allow</code> and <code class="directive">Deny</code> are
+evaluated.</td></tr>
+<tr><td><a href="mod_env.html#passenv" id="P" name="P">PassEnv <var>env-variable</var> [<var>env-variable</var>]
+...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Passes environment variables from the shell</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#pidfile">PidFile <var>filename</var></a></td><td> logs/httpd.pid </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">File where the server records the process ID
+of the daemon</td></tr>
+<tr><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td /><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Turn the echo server on or off</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxy"><Proxy <em>wildcard-url</em>> ...</Proxy></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Container for directives applied to proxied
+resources</td></tr>
+<tr><td><a href="mod_proxy.html#proxyblock">ProxyBlock *|<em>word|host|domain</em>
+[<em>word|host|domain</em>] ...</a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Words, hosts, or domains that are banned from being
+proxied</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxydomain">ProxyDomain <em>Domain</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Default domain name for proxied requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyerroroverride">ProxyErrorOverride On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Override error pages for proxied content</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyiobuffersize">ProxyIOBufferSize <em>bytes</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">IO buffer size for outgoing HTTP and FTP
+connections</td></tr>
+<tr><td><a href="mod_proxy.html#proxymatch"><Proxy <em>regex</em>> ...</Proxy></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Container for directives applied to regular-expression-matched
+proxied resources</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards <em>number</em></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximium number of proxies that a request can be forwarded
+through</td></tr>
+<tr><td><a href="mod_proxy.html#proxypass">ProxyPass [<em>path</em>] !|<em>url</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maps remote servers into the local server
+URL-space</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<em>path</em>] <em>url</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from
+a reverse proxied server</td></tr>
+<tr><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost on|off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Use incoming Host HTTP request header for
+proxy request</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <em>bytes</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network buffer size for outgoing HTTP and FTP
+connections</td></tr>
+<tr><td><a href="mod_proxy.html#proxyremote">ProxyRemote <em>match remote-server</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyremotematch">ProxyRemote <em>regex remote-server</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle requests
+matched by regular expressions</td></tr>
+<tr><td><a href="mod_proxy.html#proxyrequests">ProxyRequests on|off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyvia">ProxyVia on|off|full|block</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
+header for proxied requests</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the file that will be inserted at the end
+of the index listing</td></tr>
+<tr><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
+<var>URL</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external redirect asking the client to fetch
+a different URL</td></tr>
+<tr class="odd"><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
+<var>URL</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external redirect based on a regular expression match
+of the current URL</td></tr>
+<tr><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external permanent redirect asking the client to fetch
+a different URL</td></tr>
+<tr class="odd"><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external temporary redirect asking the client to fetch
+a different URL</td></tr>
+<tr><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any character set associations for a set of file
+extensions</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content encoding associations for a set of file
+extensions</td></tr>
+<tr><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any handler associations for a set of file
+extensions</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any input filter associations for a set of file
+extensions</td></tr>
+<tr><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any language associations for a set of file
+extensions</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any output filter associations for a set of file
+extensions</td></tr>
+<tr><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
+extensions</td></tr>
+<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset <var>header</var>
+[<var>value</var>]</a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
+<tr><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td /><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Selects which authenticated users can access
+a resource</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
+ <em>TestString</em> <em>CondPattern</em></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a condition under which rewriting will take place
+</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td /><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
+synchronization</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
+processing</td></tr>
+<tr><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
+engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
+</a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
+<tr><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <em>Options</em></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriterule">RewriteRule
+ <em>Pattern</em> <em>Substitution</em></a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
+<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the CPU consumption of processes launched
+by Apache children</td></tr>
+<tr class="odd"><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the memory consumption of processes launched
+by Apache children</td></tr>
+<tr><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of processes that can be launched by
+processes launched by Apache children</td></tr>
+<tr class="odd"><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Interaction between host-level access control and
+user authentication</td></tr>
+<tr><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Location of the file used to store coordination data for
+the child processes</td></tr>
+<tr class="odd"><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td /><td>svd</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Activates a CGI script for a particular request
+method.</td></tr>
+<tr><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps a URL to a filesystem location and designates the
+target as a CGI script</td></tr>
+<tr class="odd"><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression
+and designates the target as a CGI script</td></tr>
+<tr><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technique for locating the interpreter for CGI
+scripts</td></tr>
+<tr class="odd"><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the CGI script error logfile</td></tr>
+<tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
+in the scriptlog</td></tr>
+<tr class="odd"><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
+<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">The name of the socket to use for communication with
+the cgi daemon</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP buffer size</td></tr>
+<tr><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Email address that the server includes in error
+messages sent to the client</td></tr>
+<tr class="odd"><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td /><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Alternate names for a host used when matching requests
+to name-virtual hosts</td></tr>
+<tr><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Upper limit on configurable number of processes</td></tr>
+<tr class="odd"><td><a href="core.html#servername">ServerName <var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td /><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Hostname and port that the server uses to identify
+itself</td></tr>
+<tr><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td /><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Legacy URL pathname for a name-based virtual host that
+is accessed by an incompatible browser</td></tr>
+<tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Base directory for the server installation</td></tr>
+<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
+<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
+header</td></tr>
+<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables</td></tr>
+<tr class="odd"><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
+ regex [!]env-variable</em>[=<em>value</em>]
+ [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+</td></tr>
+<tr><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex
+ [!]env-variable</em>[=<em>value</em>]
+ [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+without respect to case</td></tr>
+<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be processed by a
+handler</td></tr>
+<tr><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Sets the filters that will process client requests and POST
+input</td></tr>
+<tr class="odd"><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the filters that will process responses from the
+server</td></tr>
+<tr><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "-->" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that ends an include element</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Error message displayed when there is an SSI
+error</td></tr>
+<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "<!--" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that starts an include element</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the format in which date strings are
+displayed</td></tr>
+<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates
+for Client Auth</td></tr>
+<tr><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for
+Client Auth</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for
+Client Auth</td></tr>
+<tr><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for
+Client Auth</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
+<tr><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
+<tr><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL
+handshake</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslengine">SSLEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
+<tr><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Semaphore for internal mutual exclusion of
+operations</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
+<tr><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private
+keys</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates
+for Remote Server Auth</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for
+Remote Server Auth</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for
+Remote Server Auth</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for
+Remote Server Auth</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL
+proxy handshake</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td /><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA certificates for proxy server client certificates</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td /><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA certificates for proxy server client certificates</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxyverifydepth">SSLVerifyDepth <em>number</em></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
+Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em>
+[<em>bytes</em>]</a></td><td /><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding
+source</td></tr>
+<tr><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td /><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Allow access only when an arbitrarily complex
+boolean expression is true</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Deny access when SSL is not used for the
+HTTP request</td></tr>
+<tr><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of the global/inter-process SSL Session
+Cache</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Number of seconds before an SSL session expires
+in the Session Cache</td></tr>
+<tr><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Client
+Certificate verification</td></tr>
+<tr><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created on startup</td></tr>
+<tr><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">User and group permissions for CGI programs</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the upper limit on the configurable number of threads
+per child process</td></tr>
+<tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
+<tr class="odd"><td><a href="mpm_netware.html#threadstacksize">ThreadStackSize <var>number</var></a></td><td> 65536 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Determine the stack size for each thread</td></tr>
+<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
+certain events before failing a request</td></tr>
+<tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Specifly location of a log file</td></tr>
+<tr><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
+<tr class="odd"><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
+...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes variables from the environment</td></tr>
+<tr><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> On </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
+port</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The userid under which the server will answer
+requests</td></tr>
+<tr><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em></a></td><td> public_html </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Location of the user-specific directories</td></tr>
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
+for a given virtual host</td></tr>
+<tr><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
+for a given virtual host</td></tr>
+<tr class="odd"><td><a href="core.html#virtualhost"><VirtualHost
+ <var>addr</var>[:<var>port</var>] [<var>addr</var>[:<var>port</var>]]
+ ...> ... </VirtualHost></a></td><td /><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Contains directives that apply only to a specific
+hostname or IP address</td></tr>
+<tr><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
+a given virtual host</td></tr>
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
+a given virtual host</td></tr>
+<tr><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
+set</td></tr>
+</table></div>
+<div id="footer">
+<p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 8111776..d28579a 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -4,7 +4,22 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Directive Quick Reference - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="directive-index"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="preamble"><h1>Directive Quick Reference</h1>
+ -->
+<title>Directive Quick Reference - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="directive-index">
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="preamble"><h1>Directive Quick Reference</h1>
+
<p>The directive quick reference shows the usage, default, status,
and context of each Apache configuration directive. For more
information about each of these, see the <a href="directive-dict.html">Directive Dictionary</a>.</p>
@@ -18,20 +33,24 @@
is allowed and the status of the directive according to the legend
tables below.</p>
</div>
-<div id="directive-ref"><table id="legend"><tr><td class="letters"><span><a href="#A"> A </a> | <a href="#B"> B </a> | <a href="#C"> C </a> | <a href="#D"> D </a> | <a href="#E"> E </a> | <a href="#F"> F </a> | <a href="#G"> G </a> | <a href="#H"> H </a> | <a href="#I"> I </a> | <a href="#K"> K </a> | <a href="#L"> L </a> | <a href="#M"> M </a> | <a href="#N"> N </a> | <a href="#O"> O </a> | <a href="#P"> P </a> | <a href="#R"> R </a> | <a href="#S"> S </a> | <a href="#T"> T </a> | <a href="#U"> U </a> | <a href="#V"> V </a> | <a href="#X"> X </a></span></td>
+<div id="directive-ref"><table id="legend">
+<tr><td class="letters"><span><a href="#A"> A </a> | <a href="#B"> B </a> | <a href="#C"> C </a> | <a href="#D"> D </a> | <a href="#E"> E </a> | <a href="#F"> F </a> | <a href="#G"> G </a> | <a href="#H"> H </a> | <a href="#I"> I </a> | <a href="#K"> K </a> | <a href="#L"> L </a> | <a href="#M"> M </a> | <a href="#N"> N </a> | <a href="#O"> O </a> | <a href="#P"> P </a> | <a href="#R"> R </a> | <a href="#S"> S </a> | <a href="#T"> T </a> | <a href="#U"> U </a> | <a href="#V"> V </a> | <a href="#X"> X </a></span></td>
<td><table>
<tr><th>s</th><td>server config</td></tr>
<tr><th>v</th><td>virtual host</td></tr>
<tr><th>d</th><td>directory</td></tr>
<tr><th>h</th><td>.htaccess</td></tr>
- </table></td><td><table>
+ </table></td>
+<td><table>
<tr><th>C</th><td>Core</td></tr>
<tr><th>M</th><td>MPM</td></tr>
<tr><th>B</th><td>Base</td></tr>
<tr><th>E</th><td>Extension</td></tr>
<tr><th>X</th><td>Experimental</td></tr>
- </table></td></tr></table>
-<table class="qref"><tr><td><a href="prefork.html#acceptmutex" id="A" name="A">AcceptMutex default|<var>method</var></a></td><td> default </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Method that Apache uses to serialize multiple children
+ </table></td></tr>
+</table>
+<table class="qref">
+<tr><td><a href="mpm_common.html#acceptmutex" id="A" name="A">AcceptMutex Default|<var>method</var></a></td><td> Default </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Method that Apache uses to serialize multiple children
accepting requests on network sockets</td></tr>
<tr class="odd"><td><a href="core.html#acceptpathinfo">AcceptPathInfo On|Off|Default</a></td><td> Default </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Resources accept trailing pathname information</td></tr>
<tr><td><a href="core.html#accessfilename">AccessFileName <var>filename</var> [<var>filename</var>] ...</a></td><td> .htaccess </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Name of the distributed configuration file</td></tr>
@@ -45,177 +64,173 @@
<tr><td><a href="mod_autoindex.html#addaltbytype">AddAltByType <var>string</var> <var>MIME-type</var>
[<var>MIME-type</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Alternate text to display for a file, instead of an
icon selected by MIME content-type</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#addcharset">AddCharset <em>charset extension</em>
-[<em>extension</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the given filename extensions
- to the specified content charset</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addcharset">AddCharset <var>charset</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the given filename extensions to the specified content
+charset</td></tr>
<tr><td><a href="core.html#adddefaultcharset">AddDefaultCharset On|Off|<var>charset</var></a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Default character set to be added for a
response without an explicit character set</td></tr>
<tr class="odd"><td><a href="mod_autoindex.html#adddescription">AddDescription <var>string file</var> [<var>file</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Description to display for a file</td></tr>
-<tr><td><a href="mod_mime.html#addencoding">AddEncoding
- <em>MIME-enc extension</em> [<em>extension</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extensions
- to the specified encoding type</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#addhandler">AddHandler
- <em>handler-name extension</em> [<em>extension</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the filename extensions
-to the specified handler</td></tr>
+<tr><td><a href="mod_mime.html#addencoding">AddEncoding <var>MIME-enc</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extensions to the specified encoding
+type</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addhandler">AddHandler <var>handler-name</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the filename extensions to the specified
+handler</td></tr>
<tr><td><a href="mod_autoindex.html#addicon">AddIcon <var>icon</var> <var>name</var> [<var>name</var>]
...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Icon to display for a file selected by name</td></tr>
-<tr class="odd"><td><a href="mod_autoindex.html#addiconbyencoding">AddIconByEncoding <var>icon MIME-encoding</var>
+<tr class="odd"><td><a href="mod_autoindex.html#addiconbyencoding">AddIconByEncoding <var>icon</var> <var>MIME-encoding</var>
[<var>MIME-encoding</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Icon to display next to files selected by MIME
content-encoding</td></tr>
<tr><td><a href="mod_autoindex.html#addiconbytype">AddIconByType <var>icon</var> <var>MIME-type</var>
[<var>MIME-type</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Icon to display next to files selected by MIME
content-type</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#addinputfilter">AddInputFilter
- <em>filter</em>[<em>;filter</em>...] extension
- [<em>extension</em> ...]</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps filename extensions
- to the filters that will process
- client requests</td></tr>
-<tr><td><a href="mod_mime.html#addlanguage">AddLanguage
- <em>MIME-lang extension</em> [<em>extension</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extension
-to the specified content language</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addinputfilter">AddInputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps filename extensions to the filters that will process
+client requests</td></tr>
+<tr><td><a href="mod_mime.html#addlanguage">AddLanguage <var>MIME-lang</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extension to the specified content
+language</td></tr>
<tr class="odd"><td><a href="mod_info.html#addmoduleinfo">AddModuleInfo <var>module-name</var> <var>string</var></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adds additional information to the module
information displayed by the server-info handler</td></tr>
-<tr><td><a href="mod_mime.html#addoutputfilter">AddOutputFilter
- <em>filter</em>[<em>;filter</em>...] extension
- [<em>extension</em> ...]</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps filename
-extensions to the filters that will process
+<tr><td><a href="mod_mime.html#addoutputfilter">AddOutputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps filename extensions to the filters that will process
responses from the server</td></tr>
-<tr class="odd"><td><a href="core.html#addoutputfilterbytype">AddOutputFilterByType <var>filter</var>[;<var>filter</var>...] <var>MIME-type</var>
-[<var>MIME-type</var>] ...</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">assigns an output filter to a particular MIME-type</td></tr>
-<tr><td><a href="mod_mime.html#addtype">AddType <em>MIME-type
- extension</em> [<em>extension</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extensions
-onto the specified content type</td></tr>
+<tr class="odd"><td><a href="core.html#addoutputfilterbytype">AddOutputFilterByType <var>filter</var>[;<var>filter</var>...]
+<var>MIME-type</var> [<var>MIME-type</var>] ...</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">assigns an output filter to a particular MIME-type</td></tr>
+<tr><td><a href="mod_mime.html#addtype">AddType <var>MIME-type</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extensions onto the specified content
+type</td></tr>
<tr class="odd"><td><a href="mod_alias.html#alias">Alias <var>URL-path</var>
<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps URLs to filesystem locations</td></tr>
<tr><td><a href="mod_alias.html#aliasmatch">AliasMatch <var>regex</var>
<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps URLs to filesystem locations using regular
expressions</td></tr>
-<tr class="odd"><td><a href="mod_authz_host.html#allow"> Allow from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</em>] ...</a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Controls which hosts can access an area of the
+<tr class="odd"><td><a href="mod_access.html#allow"> Allow from
+ all|<var>host</var>|env=<var>env-variable</var>
+ [<var>host</var>|env=<var>env-variable</var>] ...</a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Controls which hosts can access an area of the
server</td></tr>
<tr><td><a href="mod_proxy.html#allowconnect">AllowCONNECT <em>port</em> [<em>port</em>] ...</a></td><td> 443 563 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Ports that are allowed to <code>CONNECT</code> through
the proxy</td></tr>
-<tr class="odd"><td><a href="core.html#allowoverride">AllowOverride All|None|<var>directive-type</var>
+<tr class="odd"><td><a href="core.html#allowoverride">AllowOverride All|None|<var>directive-type</var>
[<var>directive-type</var>] ...</a></td><td> All </td><td>d</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Types of directives that are allowed in
-.htaccess files</td></tr>
-<tr><td><a href="mod_authn_anon.html#anonymous">Anonymous <em>user</em> [<em>user</em>] ...</a></td><td /><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Specifies userIDs that areallowed access without
+<code>.htaccess</code> files</td></tr>
+<tr><td><a href="mod_auth_anon.html#anonymous">Anonymous <var>user</var> [<var>user</var>] ...</a></td><td /><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Specifies userIDs that areallowed access without
password verification</td></tr>
-<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_authoritative">Anonymous_Authoritative on|off</a></td><td> off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configures if authorization will fall-through
+<tr class="odd"><td><a href="mod_auth_anon.html#anonymous_authoritative">Anonymous_Authoritative On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configures if authorization will fall-through
to other methods</td></tr>
-<tr><td><a href="mod_authn_anon.html#anonymous_logemail">Anonymous_LogEmail on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether the password entered will be logged in the
+<tr><td><a href="mod_auth_anon.html#anonymous_logemail">Anonymous_LogEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether the password entered will be logged in the
error log</td></tr>
-<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Specifies whether blank passwords are allowed</td></tr>
-<tr><td><a href="mod_authn_anon.html#anonymous_nouserid">Anonymous_NoUserID on|off</a></td><td> off </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether the userID field may be empty</td></tr>
-<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail on|off</a></td><td> off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether to check the password field for a correctly
+<tr class="odd"><td><a href="mod_auth_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Specifies whether blank passwords are allowed</td></tr>
+<tr><td><a href="mod_auth_anon.html#anonymous_nouserid">Anonymous_NoUserID On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether the userID field may be empty</td></tr>
+<tr class="odd"><td><a href="mod_auth_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether to check the password field for a correctly
formatted email address</td></tr>
-<tr><td><a href="perchild.html#assignuserid">AssignUserID <var>user_id</var> <var>group_id</var></a></td><td /><td>v</td><td>M</td></tr><tr><td class="descr" colspan="4">-</td></tr>
-<tr class="odd"><td><a href="mod_auth_basic.html#authbasicauthoritative">AuthBasicAuthoritative on|off</a></td><td> on </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether authorization and authentication are
+<tr><td><a href="perchild.html#assignuserid">AssignUserID <var>user-id</var> <var>group-id</var></a></td><td /><td>v</td><td>M</td></tr><tr><td class="descr" colspan="4">Tie a virtual host to a user and group ID</td></tr>
+<tr class="odd"><td><a href="mod_auth.html#authauthoritative">AuthAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether authorization and authentication are
passed to lower level modules</td></tr>
-<tr><td><a href="mod_auth_basic.html#authbasicprovider">AuthBasicProvider <em>provider-name</em></a></td><td /><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets the authentication provider(s) for this location</td></tr>
-<tr class="odd"><td><a href="mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile <em>file-path</em></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the database file containing the list
+<tr><td><a href="mod_auth_dbm.html#authdbmauthoritative">AuthDBMAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether authentication and authorization will be
+passwed on to lower level modules</td></tr>
+<tr class="odd"><td><a href="mod_auth_dbm.html#authdbmgroupfile">AuthDBMGroupFile <var>file-path</var></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the database file containing the list
of user groups for authentication</td></tr>
-<tr><td><a href="mod_authn_dbm.html#authdbmtype">AuthDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the type of database file that is used to
+<tr><td><a href="mod_auth_dbm.html#authdbmtype">AuthDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the type of database file that is used to
store passwords</td></tr>
-<tr class="odd"><td><a href="mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile <em>file-path</em></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of a database file containing the list of users and
+<tr class="odd"><td><a href="mod_auth_dbm.html#authdbmuserfile">AuthDBMUserFile <var>file-path</var></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets thename of a database file containing the list of users and
passwords for authentication</td></tr>
<tr><td><a href="mod_auth_digest.html#authdigestalgorithm">AuthDigestAlgorithm MD5|MD5-sess</a></td><td> MD5 </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Selects the algorithm used to calculate the challenge and
response hases in digest authentication</td></tr>
-<tr class="odd"><td><a href="mod_auth_digest.html#authdigestdomain">AuthDigestDomain <em>URI</em> [<em>URI</em>] ...</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">URIs that are in the same protection space for digest
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestdomain">AuthDigestDomain <var>URI</var> [<var>URI</var>] ...</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">URIs that are in the same protection space for digest
authentication</td></tr>
-<tr><td><a href="mod_auth_digest.html#authdigestfile">AuthDigestFile <em>file-path</em></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Location of the text file containing the list
+<tr><td><a href="mod_auth_digest.html#authdigestfile">AuthDigestFile <var>file-path</var></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Location of the text file containing the list
of users and encoded passwords for digest authentication</td></tr>
-<tr class="odd"><td><a href="mod_auth_digest.html#authdigestgroupfile">AuthDigestGroupFile <em>file-path</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the text file containing the list of groups
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestgroupfile">AuthDigestGroupFile <var>file-path</var></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the text file containing the list of groups
for digest authentication</td></tr>
<tr><td><a href="mod_auth_digest.html#authdigestnccheck">AuthDigestNcCheck On|Off</a></td><td> Off </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Enables or disables checking of the nonce-count sent by the
server</td></tr>
-<tr class="odd"><td><a href="mod_auth_digest.html#authdigestnonceformat">AuthDigestNonceFormat <em>format</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Determines how the nonce is generated</td></tr>
-<tr><td><a href="mod_auth_digest.html#authdigestnoncelifetime">AuthDigestNonceLifetime <em>seconds</em></a></td><td> 300 </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">How long the server nonce is valid</td></tr>
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestnonceformat">AuthDigestNonceFormat <var>format</var></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Determines how the nonce is generated</td></tr>
+<tr><td><a href="mod_auth_digest.html#authdigestnoncelifetime">AuthDigestNonceLifetime <var>seconds</var></a></td><td> 300 </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">How long the server nonce is valid</td></tr>
<tr class="odd"><td><a href="mod_auth_digest.html#authdigestqop">AuthDigestQop none|auth|auth-int [auth|auth-int]</a></td><td> auth </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Determines the quality-of-protection to use in digest
authentication</td></tr>
-<tr><td><a href="mod_authz_groupfile.html#authgroupfile">AuthGroupFile <em>file-path</em></a></td><td /><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of a text file containing the list
+<tr><td><a href="mod_auth_digest.html#authdigestshmemsize">AuthDigestShmemSize <var>size</var></a></td><td> 1000 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">The amount of shared memory to allocate for keeping track
+of clients</td></tr>
+<tr class="odd"><td><a href="mod_auth.html#authgroupfile">AuthGroupFile <var>file-path</var></a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of a text file containing the list
of user groups for authentication</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapauthoritative">AuthLDAPAuthoritative on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Prevent other authentication modules from
+<tr><td><a href="mod_auth_ldap.html#authldapauthoritative">AuthLDAPAuthoritative on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Prevent other authentication modules from
authenticating the user if this one fails</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapbinddn">AuthLDAPBindDN <em>distinguished-name</em></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Optional DN to use in binding to the LDAP server</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapbindpassword">AuthLDAPBindPassword <em>password</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Password used in conjuction with the bind DN</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapcomparednonserver">AuthLDAPCompareDNOnServer on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Use the LDAP server to compare the DNs</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapdereferencealiases">AuthLDAPDereferenceAliases never|searching|finding|always</a></td><td> Always </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">When will the module de-reference aliases</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapenabled"> AuthLDAPEnabled on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Turn on or off LDAP authentication</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapfrontpagehack">AuthLDAPFrontPageHack on|off</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Allow LDAP authentication to work with MS FrontPage</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapgroupattribute">AuthLDAPGroupAttribute <em>attribute</em></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">LDAP attributes used to check for group membership</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Use the DN of the client username when checking for
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapbinddn">AuthLDAPBindDN <em>distinguished-name</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Optional DN to use in binding to the LDAP server</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapbindpassword">AuthLDAPBindPassword <em>password</em></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Password used in conjuction with the bind DN</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapcomparednonserver">AuthLDAPCompareDNOnServer on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Use the LDAP server to compare the DNs</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapdereferencealiases">AuthLDAPDereferenceAliases never|searching|finding|always</a></td><td> Always </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">When will the module de-reference aliases</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapenabled"> AuthLDAPEnabled on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn on or off LDAP authentication</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapfrontpagehack">AuthLDAPFrontPageHack on|off</a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Allow LDAP authentication to work with MS FrontPage</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapgroupattribute">AuthLDAPGroupAttribute <em>attribute</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">LDAP attributes used to check for group membership</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Use the DN of the client username when checking for
group membership</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN on|off</a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Use the DN of the client username to set the REMOTE_USER
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN on|off</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Use the DN of the client username to set the REMOTE_USER
environment variable</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapstarttls directive">AuthLDAPStartTLS on|off</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Use a secure TLS connection to the LDAP server</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapurl">AuthLDAPUrl <em>url</em></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">URL specifying the LDAP search parameters</td></tr>
-<tr class="odd"><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Authorization realm for use in HTTP
+<tr><td><a href="mod_auth_ldap.html#authldapstarttls">AuthLDAPStartTLS on|off</a></td><td> off </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Use a secure TLS connection to the LDAP server</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapurl">AuthLDAPUrl <em>url</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">URL specifying the LDAP search parameters</td></tr>
+<tr><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td /><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Authorization realm for use in HTTP
authentication</td></tr>
-<tr><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td /><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Type of user authentication</td></tr>
-<tr class="odd"><td><a href="mod_authn_file.html#authuserfile">AuthUserFile <em>file-path</em></a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of a text file containing the list of users and
+<tr class="odd"><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Type of user authentication</td></tr>
+<tr><td><a href="mod_auth.html#authuserfile">AuthUserFile <var>file-path</var></a></td><td /><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets the name of a text file containing the list of users and
passwords for authentication</td></tr>
-<tr><td><a href="mod_authz_dbm.html#authzdbmauthoritative">AuthzDBMAuthoritative on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether authorization will be passed on to lower level modules</td></tr>
-<tr class="odd"><td><a href="mod_authz_dbm.html#authzdbmtype">AuthzDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the type of database file that is used to
-store passwords</td></tr>
-<tr><td><a href="mod_authz_groupfile.html#authzgroupfileauthoritative">AuthzGroupFileAuthoritative on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether authorization will be passed on to lower level modules</td></tr>
<tr class="odd"><td><a href="mod_setenvif.html#browsermatch" id="B" name="B">BrowserMatch <em>regex [!]env-variable</em>[=<em>value</em>]
[[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables conditional on HTTP User-Agent
</td></tr>
<tr><td><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase <em>regex [!]env-variable</em>[=<em>value</em>]
[[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables conditional on User-Agent without
respect to case</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (one hour) </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The default duration to cache a document when no expiry date is specified.</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 3 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The number of levels of subdirectories in the
+<tr class="odd"><td><a href="mpm_common.html#bs2000account">BS2000Account <var>account</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Define the non-privileged account on BS2000
+machines</td></tr>
+<tr><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (one hour) </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The default duration to cache a document when no expiry date is specified.</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
+<tr><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 3 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The number of levels of subdirectories in the
cache.</td></tr>
-<tr><td><a href="mod_cache.html#cachedisable">CacheDisable <var> url-string</var></a></td><td /><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Disable caching of specified URLs</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td /><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
+<tr class="odd"><td><a href="mod_cache.html#cachedisable">CacheDisable <var> url-string</var></a></td><td /><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Disable caching of specified URLs</td></tr>
+<tr><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td /><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
manager</td></tr>
-<tr><td><a href="mod_disk_cache.html#cacheexpirycheck">CacheExpiryCheck On|Off</a></td><td> On </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Indicates if the cache observes Expires dates when seeking
+<tr class="odd"><td><a href="mod_disk_cache.html#cacheexpirycheck">CacheExpiryCheck On|Off</a></td><td> On </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Indicates if the cache observes Expires dates when seeking
files</td></tr>
-<tr class="odd"><td><a href="mod_file_cache.html#cachefile">CacheFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td /><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Cache a list of file handles at startup time</td></tr>
-<tr><td><a href="mod_cache.html#cacheforcecompletion">CacheForceCompletion <var>Percentage</var></a></td><td> 60 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Percentage of document served, after which the server
+<tr><td><a href="mod_file_cache.html#cachefile">CacheFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Cache a list of file handles at startup time</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cacheforcecompletion">CacheForceCompletion <var>Percentage</var></a></td><td> 60 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Percentage of document served, after which the server
will complete caching the file even if the request is cancelled.</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachegcclean">CacheGcClean <var>hours</var> <var>url-string</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The time to retain unchanged cached files that match a
+<tr><td><a href="mod_disk_cache.html#cachegcclean">CacheGcClean <var>hours</var> <var>url-string</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The time to retain unchanged cached files that match a
URL</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachegcdaily">CacheGcDaily <var>time</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The recurring time each day for garbage collection to be run.
+<tr class="odd"><td><a href="mod_disk_cache.html#cachegcdaily">CacheGcDaily <var>time</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The recurring time each day for garbage collection to be run.
(24 hour clock)</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachegcinterval">CacheGcInterval <var>hours</var></a></td><td /><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The interval between garbage collection attempts.</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachegcmemusage">CacheGcMemUsage <var>KBytes</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The maximum kilobytes of memory used for garbage
+<tr><td><a href="mod_disk_cache.html#cachegcinterval">CacheGcInterval <var>hours</var></a></td><td /><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The interval between garbage collection attempts.</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachegcmemusage">CacheGcMemUsage <var>KBytes</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum kilobytes of memory used for garbage
collection</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachegcunused">CacheGcUnused <var>hours</var> <var>url-string</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The time to retain unreferenced cached files that match a
+<tr><td><a href="mod_disk_cache.html#cachegcunused">CacheGcUnused <var>hours</var> <var>url-string</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The time to retain unreferenced cached files that match a
URL.</td></tr>
-<tr><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Ignore the fact that the client requested the content not be
+<tr class="odd"><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore the fact that the client requested the content not be
cached.</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore the fact that a response has no Last Modified
+<tr><td><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Ignore the fact that a response has no Last Modified
header.</td></tr>
-<tr><td><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor <var>float</var></a></td><td> 0.1 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The factor used to compute an expiry date based on the
+<tr class="odd"><td><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor <var>float</var></a></td><td> 0.1 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The factor used to compute an expiry date based on the
LastModified date.</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (one day) </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum time in seconds to cache a document</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
+<tr><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (one day) </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The maximum time in seconds to cache a document</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
cache</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cachemaxstreamingbuffer">CacheMaxStreamingBuffer <var>size_in_bytes</var></a></td><td> 0 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum amount of a streamed response to buffer in memory
-before declaring the response uncacheable</td></tr>
<tr><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
cache</td></tr>
-<tr class="odd"><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs on|off</a></td><td> off </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Allows content-negotiated documents to be
+<tr class="odd"><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Allows content-negotiated documents to be
cached by proxy servers</td></tr>
<tr><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td /><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The directory root under which cache files are
stored</td></tr>
<tr class="odd"><td><a href="mod_disk_cache.html#cachesize">CacheSize <var>KBytes</var></a></td><td> 1000000 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum amount of disk space that will be used by the
cache in KBytes</td></tr>
<tr><td><a href="mod_disk_cache.html#cachetimemargin">CacheTimeMargin <var>?</var></a></td><td> ? </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The minimum time margin to cache a document</td></tr>
-<tr class="odd"><td><a href="core.html#cgimapextension">CGIMapExtension cgi-path .extension</a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Technique for locating the interpreter for CGI
+<tr class="odd"><td><a href="core.html#cgimapextension">CGIMapExtension <var>cgi-path</var> <var>.extension</var></a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Technique for locating the interpreter for CGI
scripts</td></tr>
<tr><td><a href="mod_charset_lite.html#charsetdefault">CharsetDefault <var>charset</var></a></td><td /><td>svdh</td><td>X</td></tr><tr><td class="descr" colspan="4">Charset to translate into</td></tr>
<tr class="odd"><td><a href="mod_charset_lite.html#charsetoptions">CharsetOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoImpl +</td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Configures charset translation behavior</td></tr>
<tr><td><a href="mod_charset_lite.html#charsetsourceenc">CharsetSourceEnc <var>charset</var></a></td><td /><td>svdh</td><td>X</td></tr><tr><td class="descr" colspan="4">Source charset of files</td></tr>
<tr class="odd"><td><a href="mod_speling.html#checkspelling">CheckSpelling on|off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables the spelling
module</td></tr>
-<tr><td><a href="perchild.html#childperuserid">ChildPerUserID <var>user_id</var>
-<var>group_id</var> <var>num_children</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">-</td></tr>
-<tr class="odd"><td><a href="core.html#contentdigest">ContentDigest on|off</a></td><td> off </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enables the generation of Content-MD5 HTTP Response
+<tr><td><a href="perchild.html#childperuserid">ChildPerUserID <var>user-id</var> <var>group-id</var>
+<var>num-children</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Specify user ID and group ID for a number of child
+processes</td></tr>
+<tr class="odd"><td><a href="core.html#contentdigest">ContentDigest On|Off</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enables the generation of <code>Content-MD5</code> HTTP Response
headers</td></tr>
<tr><td><a href="mod_usertrack.html#cookiedomain">CookieDomain <em>domain</em></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The domain to which the tracking cookie applies</td></tr>
<tr class="odd"><td><a href="mod_usertrack.html#cookieexpires">CookieExpires <em>expiry-period</em></a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Expiry time for the tracking cookie</td></tr>
@@ -236,18 +251,16 @@
a DAV resource</td></tr>
<tr><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Icon to display for files when no specific icon is
configured</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage
- <em>MIME-lang</em></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets all files in the given scope to the
-specified language</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets all files in the given scope to the specified
+language</td></tr>
<tr><td><a href="core.html#defaulttype">DefaultType <var>MIME-type</var></a></td><td> text/plain </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">MIME content-type that will be sent if the
server cannot determine a type in any other way</td></tr>
<tr class="odd"><td><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize <var>value</var></a></td><td> 8096 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Fragment size to be compressed at one time by zlib</td></tr>
<tr><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote <var>notename</var></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Places the compression ratio in a note for logging</td></tr>
<tr class="odd"><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">How much memory should be used by zlib for compression</td></tr>
<tr><td><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize <var>value</var></a></td><td> 15 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Zlib compression window size</td></tr>
-<tr class="odd"><td><a href="mod_authz_host.html#deny"> Deny from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</em>] ...</a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Controls which hosts are denied access to the
+<tr class="odd"><td><a href="mod_access.html#deny"> Deny from all|<var>host</var>|env=<var>env-variable</var>
+[<var>host</var>|env=<var>env-variable</var>] ...</a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Controls which hosts are denied access to the
server</td></tr>
<tr><td><a href="core.html#directory"><Directory <var>directory-path</var>>
... </Directory></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Enclose a group of directives that apply only to the
@@ -256,13 +269,13 @@
<var>local-url</var> [<var>local-url</var>] ...</a></td><td> index.html </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">List of resources to look for when the client requests
a directory</td></tr>
<tr><td><a href="core.html#directorymatch"><DirectoryMatch <var>regex</var>>
-... </DirectoryMatch></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Enclose directives that apply to
+... </DirectoryMatch></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Enclose directives that apply to
file-system directories matching a regular expression and their
subdirectories</td></tr>
<tr class="odd"><td><a href="core.html#documentroot">DocumentRoot <var>directory-path</var></a></td><td> /usr/local/apache/h +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Directory that forms the main document tree visible
from the web</td></tr>
-<tr><td><a href="core.html#enablemmap" id="E" name="E">EnableMMAP on|off</a></td><td> on </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Use memory-mapping to read files during delivery</td></tr>
-<tr class="odd"><td><a href="core.html#enablesendfile">EnableSendfile on|off</a></td><td> on </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Use the kernel sendfile support to deliver files to the client</td></tr>
+<tr><td><a href="core.html#enablemmap" id="E" name="E">EnableMMAP On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Use memory-mapping to read files during delivery</td></tr>
+<tr class="odd"><td><a href="core.html#enablesendfile">EnableSendfile On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Use the kernel sendfile support to deliver files to the client</td></tr>
<tr><td><a href="core.html#errordocument">ErrorDocument <var>error-code</var> <var>document</var></a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">What the server will return to the client
in case of an error</td></tr>
<tr class="odd"><td><a href="core.html#errorlog"> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Location where the server will log errors</td></tr>
@@ -288,14 +301,14 @@
found</td></tr>
<tr class="odd"><td><a href="core.html#forcetype">ForceType <var>MIME-type</var>|none</a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be served with the specified
MIME content-type</td></tr>
-<tr><td><a href="mpm_common.html#group" id="G" name="G">Group <var>unix-group</var></a></td><td> #-1 </td><td>sv</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
+<tr><td><a href="mpm_common.html#group" id="G" name="G">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
requests</td></tr>
<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header set|append|add|unset|echo <var>header</var>
[<var>value</var> [env=[!]<var>variable</var>]]</a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
<tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
of the index listing</td></tr>
-<tr class="odd"><td><a href="core.html#hostnamelookups">HostnameLookups on|off|double</a></td><td> off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enables DNS lookups on client IP addresses</td></tr>
-<tr><td><a href="core.html#identitycheck" id="I" name="I">IdentityCheck on|off</a></td><td> off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Enables logging of the RFC1413 identity of the remote
+<tr class="odd"><td><a href="core.html#hostnamelookups">HostnameLookups On|Off|Double</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enables DNS lookups on client IP addresses</td></tr>
+<tr><td><a href="core.html#identitycheck" id="I" name="I">IdentityCheck On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Enables logging of the RFC1413 identity of the remote
user</td></tr>
<tr class="odd"><td><a href="core.html#ifdefine"><IfDefine [!]<var>parameter-name</var>> ...
</IfDefine></a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Encloses directives that will be processed only
@@ -328,10 +341,11 @@
extensions</td></tr>
<tr class="odd"><td><a href="mod_isapi.html#isapireadaheadbuffer">ISAPIReadAheadBuffer <var>size</var></a></td><td> 49152 </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Size of the Read Ahead Buffer sent to ISAPI
extensions</td></tr>
-<tr><td><a href="core.html#keepalive" id="K" name="K">KeepAlive on|off</a></td><td> On </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Enables HTTP persistent connections</td></tr>
+<tr><td><a href="core.html#keepalive" id="K" name="K">KeepAlive On|Off</a></td><td> On </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Enables HTTP persistent connections</td></tr>
<tr class="odd"><td><a href="core.html#keepalivetimeout">KeepAliveTimeout <var>seconds</var></a></td><td> 15 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for subsequent
requests on a persistent connection</td></tr>
-<tr><td><a href="mod_negotiation.html#languagepriority" id="L" name="L">LanguagePriority <em>MIME-lang</em> [<em>MIME-lang</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">The precendence of language variants for cases where
+<tr><td><a href="mod_negotiation.html#languagepriority" id="L" name="L">LanguagePriority <var>MIME-lang</var> [<var>MIME-lang</var>]
+...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">The precendence of language variants for cases where
the client does not express a preference</td></tr>
<tr class="odd"><td><a href="mod_ldap.html#ldapcacheentries">LDAPCacheEntries <var>number</var></a></td><td> 1024 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of entires in the primary LDAP cache</td></tr>
<tr><td><a href="mod_ldap.html#ldapcachettl">LDAPCacheTTL <var>seconds</var></a></td><td> 600 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Time that cached items remain valid</td></tr>
@@ -349,13 +363,13 @@
except the named ones</td></tr>
<tr class="odd"><td><a href="core.html#limitrequestbody">LimitRequestBody <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Restricts the total size of the HTTP request body sent
from the client</td></tr>
-<tr><td><a href="core.html#limitrequestfields">LimitRequestFields <var>number</var></a></td><td> 100 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of HTTP request header fields that
+<tr><td><a href="core.html#limitrequestfields">LimitRequestFields <var>number</var></a></td><td> 100 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of HTTP request header fields that
will be accepted from the client</td></tr>
<tr class="odd"><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldsize <var>bytes</var></a></td><td /><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
client</td></tr>
<tr><td><a href="core.html#limitrequestline">LimitRequestLine <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limit the size of the HTTP request line that will be accepted
from the client</td></tr>
-<tr class="odd"><td><a href="core.html#limitxmlrequestbody">LimitXMLRequestBody <var>number</var></a></td><td> 1000000 </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the size of an XML-based request body</td></tr>
+<tr class="odd"><td><a href="core.html#limitxmlrequestbody">LimitXMLRequestBody <var>bytes</var></a></td><td> 1000000 </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the size of an XML-based request body</td></tr>
<tr><td><a href="mpm_common.html#listen">Listen [<var>IP-address</var>:]<var>portnumber</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">IP addresses and ports that the server
listens to</td></tr>
<tr class="odd"><td><a href="mpm_common.html#listenbacklog">ListenBacklog <var>backlog</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum length of the queue of pending connections</td></tr>
@@ -363,10 +377,10 @@
<tr class="odd"><td><a href="mod_so.html#loadmodule">LoadModule <em>module filename</em></a></td><td /><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Links in the object file or library, and adds to the list
of active modules</td></tr>
<tr><td><a href="core.html#location"><Location
- URL-path|URL> ... </Location></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Applies the enclosed directives only to matching
+ <var>URL-path</var>|<var>URL</var>> ... </Location></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Applies the enclosed directives only to matching
URLs</td></tr>
<tr class="odd"><td><a href="core.html#locationmatch"><LocationMatch
- <var>regex</var>> ... </LocationMatch></a></td><td /><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Applies the enclosed directives only to regular-expression
+ <var>regex</var>> ... </LocationMatch></a></td><td /><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Applies the enclosed directives only to regular-expression
matching URLs</td></tr>
<tr><td><a href="mpm_common.html#lockfile">LockFile <var>filename</var></a></td><td> logs/accept.lock </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Location of the accept serialization lock file</td></tr>
<tr class="odd"><td><a href="mod_log_config.html#logformat">LogFormat <var>format</var>|<var>nickname</var>
@@ -374,48 +388,55 @@
<tr><td><a href="core.html#loglevel">LogLevel <var>level</var></a></td><td> warn </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Controls the verbosity of the ErrorLog</td></tr>
<tr class="odd"><td><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of child processes that will be created
to serve requests</td></tr>
-<tr><td><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests <var>number</var></a></td><td> 100 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Number of requests allowed on a persistent
+<tr><td><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests <var>number</var></a></td><td> 100 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Number of requests allowed on a persistent
connection</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#maxmemfree">MaxMemFree <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum amount of memory that the main allocator is allowed
-to hold without calling free()</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#maxmemfree">MaxMemFree <var>KBytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum amount of memory that the main allocator is allowed
+to hold without calling <code>free()</code></td></tr>
<tr><td><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild <var>number</var></a></td><td> 10000 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Limit on the number of requests that an individual child server
will handle during its life</td></tr>
-<tr class="odd"><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var><br /></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of idle child server processes</td></tr>
-<tr><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Maximum number of idle threads</td></tr>
-<tr class="odd"><td><a href="mpm_netware.html#maxthreads">MaxThreads <var>number</var></a></td><td> 250 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">-</td></tr>
-<tr><td><a href="mpm_common.html#maxthreadsperchild">MaxThreadsPerChild <var>number</var></a></td><td> 64 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Maximum number of threads per child process</td></tr>
-<tr class="odd"><td><a href="mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount <var>value</var></a></td><td> 1009 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum number of objects allowed to be placed in the cache</td></tr>
-<tr><td><a href="mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize <var>bytes</var></a></td><td> 10000 </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The maximum size (in bytes) of a document allowed in the
+<tr class="odd"><td><a href="beos.html#maxrequestsperthread">MaxRequestsPerThread <var>number</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Limit on the number of requests that an individual thread
+will handle during its life</td></tr>
+<tr><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var><br /></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Maximum number of idle child server processes</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of idle threads</td></tr>
+<tr><td><a href="mpm_netware.html#maxthreads">MaxThreads <var>number</var></a></td><td> 2048 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Set the maximum number of worker threads</td></tr>
+<tr class="odd"><td><a href="perchild.html#maxthreadsperchild">MaxThreadsPerChild <var>number</var></a></td><td> 64 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of threads per child process</td></tr>
+<tr><td><a href="mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount <var>value</var></a></td><td> 1009 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">The maximum number of objects allowed to be placed in the
cache</td></tr>
-<tr class="odd"><td><a href="mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of a document to be allowed in the
+<tr class="odd"><td><a href="mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize <var>bytes</var></a></td><td> 10000 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum size (in bytes) of a document allowed in the
cache</td></tr>
-<tr><td><a href="mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm <code>LRU|GDSF</code></a></td><td> GDSF </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">The algorithm used to select documents for removal from the
+<tr><td><a href="mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer <var>size_in_bytes</var></a></td><td> the smaller of 1000 +</td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Maximum amount of a streamed response to buffer in memory
+before declaring the response uncacheable</td></tr>
+<tr class="odd"><td><a href="mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of a document to be allowed in the
cache</td></tr>
-<tr class="odd"><td><a href="mod_mem_cache.html#mcachesize">MCacheSize <var>KBytes</var></a></td><td> 100 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum amount of memory used by the cache in KBytes</td></tr>
+<tr><td><a href="mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm LRU|GDSF</a></td><td> GDSF </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">The algorithm used to select documents for removal from the
+cache</td></tr>
+<tr class="odd"><td><a href="mod_mem_cache.html#mcachesize">MCacheSize <var>KBytes</var></a></td><td> 100 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum amount of memory used by the cache in
+KBytes</td></tr>
<tr><td><a href="mod_cern_meta.html#metadir">MetaDir <var>directory</var></a></td><td> .web </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Name of the directory to find CERN-style meta information
files</td></tr>
<tr class="odd"><td><a href="mod_cern_meta.html#metafiles">MetaFiles on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Activates CERN meta-file processing</td></tr>
<tr><td><a href="mod_cern_meta.html#metasuffix">MetaSuffix <var>suffix</var></a></td><td> .meta </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">File name suffix for the file containg CERN-style
meta information</td></tr>
-<tr class="odd"><td><a href="mod_mime_magic.html#mimemagicfile">MimeMagicFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable MIME-type determination based on file contents
+<tr class="odd"><td><a href="mod_mime_magic.html#mimemagicfile">MimeMagicFile <var>file-path</var></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable MIME-type determination based on file contents
using the specified magic file</td></tr>
-<tr><td><a href="prefork.html#minspareservers">MinSpareServers <var>number</var></a></td><td> 5 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Minimum number of idle child server processes</td></tr>
+<tr><td><a href="prefork.html#minspareservers">MinSpareServers <var>number</var></a></td><td> 5 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Minimum number of idle child server processes</td></tr>
<tr class="odd"><td><a href="mpm_common.html#minsparethreads">MinSpareThreads <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of idle threads available to handle request
spikes</td></tr>
<tr><td><a href="mod_file_cache.html#mmapfile">MMapFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Map a list of files into memory at startup time</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo On|Off</a></td><td /><td>d</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Tells mod_mime to treat path_info components as part of the filename</td></tr>
-<tr><td><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch
- <em>[NegotiatedOnly] [Handlers] [Filters] [Any]</em></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">The types of files that will be included when
-searching for a matching file with MultiViews</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo On|Off</a></td><td> Off </td><td>d</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Tells <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> to treat <code>path_info</code>
+components as part of the filename</td></tr>
+<tr><td><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
+[Handlers|Filters]</a></td><td> NegotiatedOnly </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">The types of files that will be included when searching for
+a matching file with MultiViews</td></tr>
<tr class="odd"><td><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost <var>addr</var>[:<var>port</var>]</a></td><td /><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Designates an IP address for name-virtual
hosting</td></tr>
<tr><td><a href="mod_proxy.html#noproxy">NoProxy <em>host</em> [<em>host</em>] ...</a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Hosts, domains, or networks that will be connected
to directly</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#numservers">NumServers <var>number</var></a></td><td> 2 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Total number of children alive at the same time</td></tr>
+<tr class="odd"><td><a href="perchild.html#numservers">NumServers <var>number</var></a></td><td> 2 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Total number of children alive at the same time</td></tr>
<tr><td><a href="core.html#options" id="O" name="O">Options
[+|-]<var>option</var> [[+|-]<var>option</var>] ...</a></td><td> All </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures what features are available in a particular
directory</td></tr>
-<tr class="odd"><td><a href="mod_authz_host.html#order"> Order <em>ordering</em></a></td><td> Deny,Allow </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Controls the default access state and the order in which
+<tr class="odd"><td><a href="mod_access.html#order"> Order <var>ordering</var></a></td><td> Deny,Allow </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Controls the default access state and the order in which
<code class="directive">Allow</code> and <code class="directive">Deny</code> are
evaluated.</td></tr>
<tr><td><a href="mod_env.html#passenv" id="P" name="P">PassEnv <var>env-variable</var> [<var>env-variable</var>]
@@ -463,26 +484,26 @@
a different URL</td></tr>
<tr class="odd"><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external temporary redirect asking the client to fetch
a different URL</td></tr>
-<tr><td><a href="mod_mime.html#removecharset">RemoveCharset
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any character set associations for a set of file
+<tr><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any character set associations for a set of file
extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeencoding">RemoveEncoding
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content encoding associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content encoding associations for a set of file
extensions</td></tr>
-<tr><td><a href="mod_mime.html#removehandler">RemoveHandler
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any handler associations for a set of file
+<tr><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any handler associations for a set of file
extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any input filter associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any input filter associations for a set of file
extensions</td></tr>
-<tr><td><a href="mod_mime.html#removelanguage">RemoveLanguage
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any language associations for a set of file
+<tr><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any language associations for a set of file
extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any output filter associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any output filter associations for a set of file
extensions</td></tr>
-<tr><td><a href="mod_mime.html#removetype">RemoveType
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
+<tr><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
extensions</td></tr>
<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset <var>header</var>
[<var>value</var>]</a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
@@ -504,13 +525,13 @@
<tr><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <em>Options</em></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
<tr class="odd"><td><a href="mod_rewrite.html#rewriterule">RewriteRule
<em>Pattern</em> <em>Substitution</em></a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
-<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>number</var>|max [<var>number</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the CPU consumption of processes launched
+<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the CPU consumption of processes launched
by Apache children</td></tr>
-<tr class="odd"><td><a href="core.html#rlimitmem">RLimitMEM <var>number</var>|max [<var>number</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the memory consumption of processes launched
+<tr class="odd"><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the memory consumption of processes launched
by Apache children</td></tr>
-<tr><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of processes that can be launched by
+<tr><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of processes that can be launched by
processes launched by Apache children</td></tr>
-<tr class="odd"><td><a href="core.html#satisfy" id="S" name="S">Satisfy any|all</a></td><td> all </td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Interaction between host-level access control and
+<tr class="odd"><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Interaction between host-level access control and
user authentication</td></tr>
<tr><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Location of the file used to store coordination data for
the child processes</td></tr>
@@ -522,7 +543,7 @@
<tr class="odd"><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression
and designates the target as a CGI script</td></tr>
-<tr><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource registry|script</a></td><td> script </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technique for locating the interpreter for CGI
+<tr><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technique for locating the interpreter for CGI
scripts</td></tr>
<tr class="odd"><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the CGI script error logfile</td></tr>
<tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
@@ -530,19 +551,20 @@
<tr class="odd"><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">The name of the socket to use for communication with
the cgi daemon</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP buffer size</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP buffer size</td></tr>
<tr><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Email address that the server includes in error
messages sent to the client</td></tr>
<tr class="odd"><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td /><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Alternate names for a host used when matching requests
to name-virtual hosts</td></tr>
-<tr><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td> 256 (prefork), Serv +</td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Upper limit on configurable number of processes</td></tr>
+<tr><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Upper limit on configurable number of processes</td></tr>
<tr class="odd"><td><a href="core.html#servername">ServerName <var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td /><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Hostname and port that the server uses to identify
itself</td></tr>
-<tr><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td /><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Legacy URL pathname for a name-virtual host that
+<tr><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td /><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Legacy URL pathname for a name-based virtual host that
is accessed by an incompatible browser</td></tr>
<tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Base directory for the server installation</td></tr>
<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
-<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Minimal|ProductOnly|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the Server HTTP response header</td></tr>
+<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
+header</td></tr>
<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables</td></tr>
<tr class="odd"><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
regex [!]env-variable</em>[=<em>value</em>]
@@ -552,7 +574,7 @@
[!]env-variable</em>[=<em>value</em>]
[[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on attributes of the request
without respect to case</td></tr>
-<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|none</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be processed by a
+<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be processed by a
handler</td></tr>
<tr><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Sets the filters that will process client requests and POST
input</td></tr>
@@ -616,22 +638,22 @@
<tr><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
<tr class="odd"><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Client
Certificate verification</td></tr>
-<tr><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td> 5 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Nubmer of threads created on startup</td></tr>
+<tr><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created on startup</td></tr>
<tr><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">User and group permissions for CGI programs</td></tr>
<tr class="odd"><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the upper limit on the configurable number of threads
per child process</td></tr>
<tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
-<tr class="odd"><td><a href="mpm_netware.html#threadstacksize">ThreadStackSize <var>number</var></a></td><td> 65536 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">-</td></tr>
-<tr><td><a href="core.html#timeout">TimeOut <var>number</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
+<tr class="odd"><td><a href="mpm_netware.html#threadstacksize">ThreadStackSize <var>number</var></a></td><td> 65536 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Determine the stack size for each thread</td></tr>
+<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
certain events before failing a request</td></tr>
<tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Specifly location of a log file</td></tr>
-<tr><td><a href="mod_mime.html#typesconfig">TypesConfig <em>file-path</em></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The location of the mime.types file</td></tr>
+<tr><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
<tr class="odd"><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes variables from the environment</td></tr>
-<tr><td><a href="core.html#usecanonicalname">UseCanonicalName on|off|dns</a></td><td> on </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
+<tr><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> On </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
port</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>sv</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The userid under which the server will answer
+<tr class="odd"><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The userid under which the server will answer
requests</td></tr>
<tr><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em></a></td><td> public_html </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Location of the user-specific directories</td></tr>
<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
@@ -648,4 +670,8 @@
a given virtual host</td></tr>
<tr><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
set</td></tr>
-</table></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</table></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/quickreference.html.ja.jis b/docs/manual/mod/quickreference.html.ja.jis
index 4fc63b2..bc92320 100644
--- a/docs/manual/mod/quickreference.html.ja.jis
+++ b/docs/manual/mod/quickreference.html.ja.jis
@@ -4,62 +4,81 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>$B%G%#%l%/%F%#%V(B $B%/%$%C%/%j%U%!%l%s%9(B - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="directive-index"><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="preamble"><h1>$B%G%#%l%/%F%#%V(B $B%/%$%C%/%j%U%!%l%s%9(B</h1>
- <p>$B%G%#%l(B$B%/%F%#%V(B $B%/%$%C%/%j%U%!%l%s%9$G$O!"3F(B Apache $B@_Dj%G%#%l(B$B%/%F%#%V$N(B
- $B;HMQJ}K!!"%G%U%)%k%HCM!"%9%F!<%?%9$H%3%s%F%-(B$B%9%H$r<($7$F$$$^$9!#(B
- $B3F%G%#%l%/%F%#%V$N!"$h$j>\$7$$>pJs(B$B$K4X$7$F$O(B
+ -->
+<title>$B%G%#%l%/%F%#%V(B $B%/%$%C%/%j%U%!%l%s%9(B - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="directive-index">
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="preamble"><h1>$B%G%#%l%/%F%#%V(B $B%/%$%C%/%j%U%!%l%s%9(B</h1>
+
+ <p>$B%G%#%l%/%F%#%V(B $B%/%$%C%/%j%U%!%l%s%9$G$O!"3F(B Apache $B@_Dj%G%#%l%/%F%#%V$N(B
+ $B;HMQJ}K!!"%G%U%)%k%HCM!"%9%F!<%?%9$H%3%s%F%-%9%H$r<($7$F$$$^$9!#(B
+ $B3F%G%#%l%/%F%#%V$N!"$h$j>\$7$$>pJs$K4X$7$F$O(B
<a href="directive-dict.html">$B%G%#%l%/%F%#%V<-=q(B</a>$B$r(B
$B$4Mw2<$5$$!#(B</p>
<p>$BBh(B 1 $BNsL\$O%G%#%l%/%F%#%V$NL>A0$H;HMQJ}K!$G$9!#(B
$BBh(B 2 $BNsL\$O(B ($B$b$7$"$l$P(B) $B%G%U%)%k%HCM$H$J$C$F$$$^$9!#(B
- $B%G%U%)%k%HCM$,D9$9$.$FI=<($7$-$l$J$$>l9g$O!":G=i$NJ8(B$B;zNs$N8e$m$K(B
+ $B%G%U%)%k%HCM$,D9$9$.$FI=<($7$-$l$J$$>l9g$O!":G=i$NJ8;zNs$N8e$m$K(B
$B!V(B + $B!W$,B3$-$^$9!#(B</p>
<p>$BBh(B 3, 4 $BNs$O!"2<$NI=$NCm<a$K=>$C$F!"(B
$B%G%#%l%/%F%#%V$N;HMQ$G$-$k%3%s%F%-%9%H$H!"(B
$B%G%#%l%/%F%#%V$N%9%F!<%?%9$,<($5$l$F$$$^$9!#(B</p>
</div>
-<div id="directive-ref"><table id="legend"><tr><td class="letters"><span><a href="#A"> A </a> | <a href="#B"> B </a> | <a href="#C"> C </a> | <a href="#D"> D </a> | <a href="#E"> E </a> | <a href="#F"> F </a> | <a href="#G"> G </a> | <a href="#H"> H </a> | <a href="#I"> I </a> | <a href="#K"> K </a> | <a href="#L"> L </a> | <a href="#M"> M </a> | <a href="#N"> N </a> | <a href="#O"> O </a> | <a href="#P"> P </a> | <a href="#R"> R </a> | <a href="#S"> S </a> | <a href="#T"> T </a> | <a href="#U"> U </a> | <a href="#V"> V </a> | <a href="#X"> X </a></span></td>
+<div id="directive-ref"><table id="legend">
+<tr><td class="letters"><span><a href="#A">?A?</a> | <a href="#B">?B?</a> | <a href="#C">?C?</a> | <a href="#D">?D?</a> | <a href="#E">?E?</a> | <a href="#F">?F?</a> | <a href="#G">?G?</a> | <a href="#H">?H?</a> | <a href="#I">?I?</a> | <a href="#K">?K?</a> | <a href="#L">?L?</a> | <a href="#M">?M?</a> | <a href="#N">?N?</a> | <a href="#O">?O?</a> | <a href="#P">?P?</a> | <a href="#R">?R?</a> | <a href="#S">?S?</a> | <a href="#T">?T?</a> | <a href="#U">?U?</a> | <a href="#V">?V?</a> | <a href="#X">?X?</a></span></td>
<td><table>
<tr><th>s</th><td>$B%5!<%P@_Dj%U%!%$%k(B</td></tr>
- <tr><th>v</th><td>$B%P!<%A%c%k%[%9(B$B%H(B</td></tr>
+ <tr><th>v</th><td>$B%P!<%A%c%k%[%9%H(B</td></tr>
<tr><th>d</th><td>$B%G%#%l%/%H%j(B</td></tr>
<tr><th>h</th><td>.htaccess</td></tr>
- </table></td><td><table>
+ </table></td>
+<td><table>
<tr><th>C</th><td>Core</td></tr>
<tr><th>M</th><td>MPM</td></tr>
<tr><th>B</th><td>Base</td></tr>
<tr><th>E</th><td>Extension</td></tr>
<tr><th>X</th><td>Experimental</td></tr>
- </table></td></tr></table>
-<table class="qref"><tr><td><a href="prefork.html#acceptmutex" id="A" name="A">AcceptMutex default|<var>method</var></a></td><td> default </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">$BJ#?t$N;R%W%m%;%9$,%M%C%H%o!<%/%=%1%C%H$G%j%/%(%9%H$r(B
-accept $B$7$h$&$H$7$F$$$k$H$-$K!"(BApache $B$,$=$l$i$N;R%W%m%;%9$r(B$BD>Ns2=$9$k$?$a$K(B
+ </table></td></tr>
+</table>
+<table class="qref">
+<tr><td><a href="prefork.html#acceptmutex" id="A" name="A">AcceptMutex default|<var>method</var></a></td><td> default </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">$BJ#?t$N;R%W%m%;%9$,%M%C%H%o!<%/%=%1%C%H$G%j%/%(%9%H$r(B
+accept $B$7$h$&$H$7$F$$$k$H$-$K!"(BApache $B$,$=$l$i$N;R%W%m%;%9$rD>Ns2=$9$k$?$a$K(B
$B;H$&J}K!(B</td></tr>
<tr class="odd"><td><a href="core.html#acceptpathinfo">AcceptPathInfo On|Off|Default</a></td><td> Default </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Resources accept trailing pathname information</td></tr>
<tr><td><a href="core.html#accessfilename">AccessFileName <var>filename</var> [<var>filename</var>] ...</a></td><td> .htaccess </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Name of the distributed configuration file</td></tr>
-<tr class="odd"><td><a href="mod_actions.html#action">Action <var>action-type</var> <var>cgi-script</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$BFCDj$N%O%s%I%i$d%3%s%F%s%H%?%$%W$KBP$7$F(B CGI $B$r<B9T$9$k$h$&(B$B$K(B
+<tr class="odd"><td><a href="mod_actions.html#action">Action <var>action-type</var> <var>cgi-script</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$BFCDj$N%O%s%I%i$d%3%s%F%s%H%?%$%W$KBP$7$F(B CGI $B$r<B9T$9$k$h$&$K(B
$B@_Dj(B</td></tr>
<tr><td><a href="mod_autoindex.html#addalt">AddAlt <var>string</var> <var>file</var> [<var>file</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%"%$%3%s$NBe$o$j$K(B
-$BI=<($5$l$k!"%U%!%$%kL>$GA*Br$5$l$?BeBX%F%-%9(B$B%H(B</td></tr>
+$BI=<($5$l$k!"%U%!%$%kL>$GA*Br$5$l$?BeBX%F%-%9%H(B</td></tr>
<tr class="odd"><td><a href="mod_autoindex.html#addaltbyencoding">AddAltByEncoding <var>string</var> <var>MIME-encoding</var>
[<var>MIME-encoding</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$B%"%$%3%s$NBe$o$j$KI=<($5$l$k!"(BMIME $BId9f2=J}K!$GA*Br$5$l$?(B
$BBeBX%F%-%9%H(B</td></tr>
<tr><td><a href="mod_autoindex.html#addaltbytype">AddAltByType <var>string</var> <var>MIME-type</var>
[<var>MIME-type</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%"%$%3%s$NBe$o$j$K(B
-$BI=<($5$l$k!"(BMIME $B%?%$%W$GA*Br$5$l$?BeBX(B$B%F%-%9%H(B</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#addcharset">AddCharset <em>charset extension</em>
-[<em>extension</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the given filename extensions
- to the specified content charset</td></tr>
+$BI=<($5$l$k!"(BMIME $B%?%$%W$GA*Br$5$l$?BeBX%F%-%9%H(B</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addcharset">AddCharset <var>charset</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the given filename extensions to the specified content
+charset</td></tr>
<tr><td><a href="core.html#adddefaultcharset">AddDefaultCharset On|Off|<var>charset</var></a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Default character set to be added for a
response without an explicit character set</td></tr>
<tr class="odd"><td><a href="mod_autoindex.html#adddescription">AddDescription <var>string</var> <var>file</var> [<var>file</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$B%U%!%$%k$KBP$7$FI=<($9$k@bL@(B</td></tr>
-<tr><td><a href="mod_mime.html#addencoding">AddEncoding
- <em>MIME-enc extension</em> [<em>extension</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extensions
- to the specified encoding type</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#addhandler">AddHandler
- <em>handler-name extension</em> [<em>extension</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the filename extensions
-to the specified handler</td></tr>
+<tr><td><a href="mod_mime.html#addencoding">AddEncoding <var>MIME-enc</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extensions to the specified encoding
+type</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addhandler">AddHandler <var>handler-name</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the filename extensions to the specified
+handler</td></tr>
<tr><td><a href="mod_autoindex.html#addicon">AddIcon <var>icon</var> <var>name</var>
[<var>name</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%U%!%$%k$KI=<($9$k%"%$%3%s$rL>A0$GA*Br(B</td></tr>
<tr class="odd"><td><a href="mod_autoindex.html#addiconbyencoding">AddIconByEncoding <var>icon</var> <var>MIME-encoding</var>
@@ -68,110 +87,104 @@
<tr><td><a href="mod_autoindex.html#addiconbytype">AddIconByType <var>icon</var> <var>MIME-type</var>
[<var>MIME-type</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%U%!%$%k$NNY$KI=<($9$k%"%$%3%s$r(B
MIME $B%?%$%W$K$h$C$FA*Br(B</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#addinputfilter">AddInputFilter
- <em>filter</em>[<em>;filter</em>...] extension
- [<em>extension</em> ...]</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps filename extensions
- to the filters that will process
- client requests</td></tr>
-<tr><td><a href="mod_mime.html#addlanguage">AddLanguage
- <em>MIME-lang extension</em> [<em>extension</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extension
-to the specified content language</td></tr>
-<tr class="odd"><td><a href="mod_info.html#addmoduleinfo">AddModuleInfo <em>module-name string</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">server-info $B%O%s%I%i$K$h$jI=<($5$l$k%b%8%e!<%k$N>pJs(B$B$K(B
+<tr class="odd"><td><a href="mod_mime.html#addinputfilter">AddInputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps filename extensions to the filters that will process
+client requests</td></tr>
+<tr><td><a href="mod_mime.html#addlanguage">AddLanguage <var>MIME-lang</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extension to the specified content
+language</td></tr>
+<tr class="odd"><td><a href="mod_info.html#addmoduleinfo">AddModuleInfo <em>module-name string</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">server-info $B%O%s%I%i$K$h$jI=<($5$l$k%b%8%e!<%k$N>pJs$K(B
$BDI2C$N>pJs$rIU$12C$($k(B</td></tr>
-<tr><td><a href="mod_mime.html#addoutputfilter">AddOutputFilter
- <em>filter</em>[<em>;filter</em>...] extension
- [<em>extension</em> ...]</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps filename
-extensions to the filters that will process
+<tr><td><a href="mod_mime.html#addoutputfilter">AddOutputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps filename extensions to the filters that will process
responses from the server</td></tr>
<tr class="odd"><td><a href="core.html#addoutputfilterbytype">AddOutputFilterByType <var>filter</var>[;<var>filter</var>...] <var>MIME-type</var>
[<var>MIME-type</var>] ...</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">assigns an output filter to a particular MIME-type</td></tr>
-<tr><td><a href="mod_mime.html#addtype">AddType <em>MIME-type
- extension</em> [<em>extension</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extensions
-onto the specified content type</td></tr>
+<tr><td><a href="mod_mime.html#addtype">AddType <var>MIME-type</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps the given filename extensions onto the specified content
+type</td></tr>
<tr class="odd"><td><a href="mod_alias.html#alias">Alias <var>URL-path</var>
<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">URL $B$r%U%!%$%k%7%9%F%`$N0LCV$K%^%C%W$9$k(B</td></tr>
<tr><td><a href="mod_alias.html#aliasmatch">AliasMatch <var>regex</var>
<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">$B@55,I=8=$r;H$C$F(B URL $B$r%U%!%$%k%7%9%F%`$N0LCV$K%^%C%W$9$k(B</td></tr>
-<tr class="odd"><td><a href="mod_authz_host.html#allow"> Allow from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</em>] ...</a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$B%5!<%P$N$"$kNN0h$K%"%/%;%9$G$-$k%[%9%H$r@)8f$9$k(B</td></tr>
+<tr class="odd"><td><a href="mod_access.html#allow"> Allow from
+ all|<var>host</var>|env=<var>env-variable</var>
+ [<var>host</var>|env=<var>env-variable</var>] ...</a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$B%5!<%P$N$"$kNN0h$K%"%/%;%9$G$-$k%[%9%H$r@)8f$9$k(B</td></tr>
<tr><td><a href="mod_proxy.html#allowconnect">AllowCONNECT <em>port</em> [<em>port</em>] ...</a></td><td> 443 563 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Ports that are allowed to <code>CONNECT</code> through
the proxy</td></tr>
<tr class="odd"><td><a href="core.html#allowoverride">AllowOverride All|None|<var>directive-type</var>
[<var>directive-type</var>] ...</a></td><td> All </td><td>d</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Types of directives that are allowed in
.htaccess files</td></tr>
-<tr><td><a href="mod_authn_anon.html#anonymous">Anonymous <em>user</em> [<em>user</em>] ...</a></td><td /><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Specifies userIDs that areallowed access without
+<tr><td><a href="mod_auth_anon.html#anonymous">Anonymous <var>user</var> [<var>user</var>] ...</a></td><td /><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Specifies userIDs that areallowed access without
password verification</td></tr>
-<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_authoritative">Anonymous_Authoritative on|off</a></td><td> off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configures if authorization will fall-through
+<tr class="odd"><td><a href="mod_auth_anon.html#anonymous_authoritative">Anonymous_Authoritative On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configures if authorization will fall-through
to other methods</td></tr>
-<tr><td><a href="mod_authn_anon.html#anonymous_logemail">Anonymous_LogEmail on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether the password entered will be logged in the
+<tr><td><a href="mod_auth_anon.html#anonymous_logemail">Anonymous_LogEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether the password entered will be logged in the
error log</td></tr>
-<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Specifies whether blank passwords are allowed</td></tr>
-<tr><td><a href="mod_authn_anon.html#anonymous_nouserid">Anonymous_NoUserID on|off</a></td><td> off </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether the userID field may be empty</td></tr>
-<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail on|off</a></td><td> off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether to check the password field for a correctly
+<tr class="odd"><td><a href="mod_auth_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Specifies whether blank passwords are allowed</td></tr>
+<tr><td><a href="mod_auth_anon.html#anonymous_nouserid">Anonymous_NoUserID On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether the userID field may be empty</td></tr>
+<tr class="odd"><td><a href="mod_auth_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether to check the password field for a correctly
formatted email address</td></tr>
<tr><td><a href="perchild.html#assignuserid">AssignUserID <var>user_id</var> <var>group_id</var></a></td><td /><td>v</td><td>M</td></tr><tr><td class="descr" colspan="4">-</td></tr>
-<tr class="odd"><td><a href="mod_auth_basic.html#authbasicauthoritative">AuthBasicAuthoritative on|off</a></td><td> on </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$BG'>Z$H>5G'$r!"$h$jDc$$%l%Y%k$N%b%8%e!<%k$K0\9T$5$;$k$+$r(B
-$B@_Dj$7(B$B$^$9!#(B</td></tr>
-<tr><td><a href="mod_auth_basic.html#authbasicprovider">AuthBasicProvider <em>provider-name</em></a></td><td /><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B$3$N0LCV$KBP$9$kG'>Z%W%m%P%$%@$r@_Dj$7$^$9!#(B</td></tr>
-<tr class="odd"><td><a href="mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile <em>file-path</em></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the database file containing the list
+<tr class="odd"><td><a href="mod_auth.html#authauthoritative">AuthAuthoritative on|off</a></td><td> on </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$BG'>Z$H>5G'%W%m%;%9$r!"(B
+$B$h$jDc$$%l%Y%k$N%b%8%e!<%k$K0\9T$5$;$k$+$I$&$+$r@_Dj$9$k(B</td></tr>
+<tr><td><a href="mod_auth_dbm.html#authdbmauthoritative">AuthDBMAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether authentication and authorization will be
+passwed on to lower level modules</td></tr>
+<tr class="odd"><td><a href="mod_auth_dbm.html#authdbmgroupfile">AuthDBMGroupFile <var>file-path</var></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the database file containing the list
of user groups for authentication</td></tr>
-<tr><td><a href="mod_authn_dbm.html#authdbmtype">AuthDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the type of database file that is used to
+<tr><td><a href="mod_auth_dbm.html#authdbmtype">AuthDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the type of database file that is used to
store passwords</td></tr>
-<tr class="odd"><td><a href="mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile <em>file-path</em></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of a database file containing the list of users and
+<tr class="odd"><td><a href="mod_auth_dbm.html#authdbmuserfile">AuthDBMUserFile <var>file-path</var></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets thename of a database file containing the list of users and
passwords for authentication</td></tr>
<tr><td><a href="mod_auth_digest.html#authdigestalgorithm">AuthDigestAlgorithm MD5|MD5-sess</a></td><td> MD5 </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Selects the algorithm used to calculate the challenge and
response hases in digest authentication</td></tr>
-<tr class="odd"><td><a href="mod_auth_digest.html#authdigestdomain">AuthDigestDomain <em>URI</em> [<em>URI</em>] ...</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">URIs that are in the same protection space for digest
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestdomain">AuthDigestDomain <var>URI</var> [<var>URI</var>] ...</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">URIs that are in the same protection space for digest
authentication</td></tr>
-<tr><td><a href="mod_auth_digest.html#authdigestfile">AuthDigestFile <em>file-path</em></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Location of the text file containing the list
+<tr><td><a href="mod_auth_digest.html#authdigestfile">AuthDigestFile <var>file-path</var></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Location of the text file containing the list
of users and encoded passwords for digest authentication</td></tr>
-<tr class="odd"><td><a href="mod_auth_digest.html#authdigestgroupfile">AuthDigestGroupFile <em>file-path</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the text file containing the list of groups
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestgroupfile">AuthDigestGroupFile <var>file-path</var></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the text file containing the list of groups
for digest authentication</td></tr>
<tr><td><a href="mod_auth_digest.html#authdigestnccheck">AuthDigestNcCheck On|Off</a></td><td> Off </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Enables or disables checking of the nonce-count sent by the
server</td></tr>
-<tr class="odd"><td><a href="mod_auth_digest.html#authdigestnonceformat">AuthDigestNonceFormat <em>format</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Determines how the nonce is generated</td></tr>
-<tr><td><a href="mod_auth_digest.html#authdigestnoncelifetime">AuthDigestNonceLifetime <em>seconds</em></a></td><td> 300 </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">How long the server nonce is valid</td></tr>
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestnonceformat">AuthDigestNonceFormat <var>format</var></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Determines how the nonce is generated</td></tr>
+<tr><td><a href="mod_auth_digest.html#authdigestnoncelifetime">AuthDigestNonceLifetime <var>seconds</var></a></td><td> 300 </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">How long the server nonce is valid</td></tr>
<tr class="odd"><td><a href="mod_auth_digest.html#authdigestqop">AuthDigestQop none|auth|auth-int [auth|auth-int]</a></td><td> auth </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Determines the quality-of-protection to use in digest
authentication</td></tr>
-<tr><td><a href="mod_authz_groupfile.html#authgroupfile">AuthGroupFile <em>file-path</em></a></td><td /><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of a text file containing the list
-of user groups for authentication</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapauthoritative">AuthLDAPAuthoritative on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Prevent other authentication modules from
+<tr><td><a href="mod_auth_digest.html#authdigestshmemsize">AuthDigestShmemSize <var>size</var></a></td><td> 1000 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">The amount of shared memory to allocate for keeping track
+of clients</td></tr>
+<tr class="odd"><td><a href="mod_auth.html#authgroupfile">AuthGroupFile <var>file-path</var></a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$BG'>Z$K;HMQ$9$k%f!<%6%0%k!<%W$N0lMw$,3JG<$5$l$F$$$k!"(B
+$B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$9$k(B</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapauthoritative">AuthLDAPAuthoritative on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Prevent other authentication modules from
authenticating the user if this one fails</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapbinddn">AuthLDAPBindDN <em>distinguished-name</em></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Optional DN to use in binding to the LDAP server</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapbindpassword">AuthLDAPBindPassword <em>password</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Password used in conjuction with the bind DN</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapcomparednonserver">AuthLDAPCompareDNOnServer on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Use the LDAP server to compare the DNs</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapdereferencealiases">AuthLDAPDereferenceAliases never|searching|finding|always</a></td><td> Always </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">When will the module de-reference aliases</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapenabled"> AuthLDAPEnabled on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Turn on or off LDAP authentication</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapfrontpagehack">AuthLDAPFrontPageHack on|off</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Allow LDAP authentication to work with MS FrontPage</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapgroupattribute">AuthLDAPGroupAttribute <em>attribute</em></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">LDAP attributes used to check for group membership</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Use the DN of the client username when checking for
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapbinddn">AuthLDAPBindDN <em>distinguished-name</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Optional DN to use in binding to the LDAP server</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapbindpassword">AuthLDAPBindPassword <em>password</em></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Password used in conjuction with the bind DN</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapcomparednonserver">AuthLDAPCompareDNOnServer on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Use the LDAP server to compare the DNs</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapdereferencealiases">AuthLDAPDereferenceAliases never|searching|finding|always</a></td><td> Always </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">When will the module de-reference aliases</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapenabled"> AuthLDAPEnabled on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn on or off LDAP authentication</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapfrontpagehack">AuthLDAPFrontPageHack on|off</a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Allow LDAP authentication to work with MS FrontPage</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapgroupattribute">AuthLDAPGroupAttribute <em>attribute</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">LDAP attributes used to check for group membership</td></tr>
+<tr><td><a href="mod_auth_ldap.html#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN on|off</a></td><td> on </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Use the DN of the client username when checking for
group membership</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN on|off</a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Use the DN of the client username to set the REMOTE_USER
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN on|off</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Use the DN of the client username to set the REMOTE_USER
environment variable</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapstarttls directive">AuthLDAPStartTLS on|off</a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Use a secure TLS connection to the LDAP server</td></tr>
-<tr><td><a href="mod_auth_ldap.html#authldapurl">AuthLDAPUrl <em>url</em></a></td><td /><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">URL specifying the LDAP search parameters</td></tr>
-<tr class="odd"><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Authorization realm for use in HTTP
+<tr><td><a href="mod_auth_ldap.html#authldapstarttls">AuthLDAPStartTLS on|off</a></td><td> off </td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">Use a secure TLS connection to the LDAP server</td></tr>
+<tr class="odd"><td><a href="mod_auth_ldap.html#authldapurl">AuthLDAPUrl <em>url</em></a></td><td /><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">URL specifying the LDAP search parameters</td></tr>
+<tr><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td /><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Authorization realm for use in HTTP
authentication</td></tr>
-<tr><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td /><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Type of user authentication</td></tr>
-<tr class="odd"><td><a href="mod_authn_file.html#authuserfile">AuthUserFile <em>file-path</em></a></td><td /><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$BG'>Z$K;HMQ$9$k%f!<%6$H%Q%9%o!<%I$N0lMw$,3JG<$5$l$F$$$k!"(B
-$B%F%-%9(B$B%H%U%!%$%k$NL>A0$r@_Dj$9$k(B</td></tr>
-<tr><td><a href="mod_authz_dbm.html#authzdbmauthoritative">AuthzDBMAuthoritative on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether authorization will be passed on to lower level modules</td></tr>
-<tr class="odd"><td><a href="mod_authz_dbm.html#authzdbmtype">AuthzDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the type of database file that is used to
-store passwords</td></tr>
-<tr><td><a href="mod_authz_groupfile.html#authzgroupfileauthoritative">AuthzGroupFileAuthoritative on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether authorization will be passed on to lower level modules</td></tr>
+<tr class="odd"><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Type of user authentication</td></tr>
+<tr><td><a href="mod_auth.html#authuserfile">AuthUserFile <var>file-path</var></a></td><td /><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">$BG'>Z$K;HMQ$9$k%f!<%6$H%Q%9%o!<%I$N0lMw$,3JG<$5$l$F$$$k!"(B
+$B%F%-%9%H%U%!%$%k$NL>A0$r@_Dj$9$k(B</td></tr>
<tr class="odd"><td><a href="mod_setenvif.html#browsermatch" id="B" name="B">BrowserMatch <em>regex [!]env-variable</em>[=<em>value</em>]
[[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">HTTP User-Agent $B$K4p$E$$$F4D6-JQ?t$r@_Dj$9$k(B
</td></tr>
<tr><td><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase <em>regex [!]env-variable</em>[=<em>value</em>]
- [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">HTTP User-Agent $B$K4p$E$$$FBgJ8;z>.J8;z$r6hJL$;$:(B$B$K(B
+ [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">HTTP User-Agent $B$K4p$E$$$FBgJ8;z>.J8;z$r6hJL$;$:$K(B
$B4D6-JQ?t$r@_Dj$9$k(B</td></tr>
<tr class="odd"><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (one hour) </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">The default duration to cache a document when no expiry date is specified.</td></tr>
<tr><td><a href="mod_cache.html#cachedisable">CacheDisable <var> url-string</var></a></td><td /><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Disable caching of specified URLs</td></tr>
<tr class="odd"><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td /><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
manager</td></tr>
-<tr><td><a href="mod_file_cache.html#cachefile">CacheFile
- <em>file-path</em> [<em>file-path</em>] ...</a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">-</td></tr>
+<tr><td><a href="mod_file_cache.html#cachefile">CacheFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Cache a list of file handles at startup time</td></tr>
<tr class="odd"><td><a href="mod_cache.html#cacheforcecompletion">CacheForceCompletion <var>Percentage</var></a></td><td> 60 </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Percentage of document served, after which the server
will complete caching the file even if the request is cancelled.</td></tr>
<tr><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Ignore the fact that the client requested the content not be
@@ -197,41 +210,40 @@
headers</td></tr>
<tr class="odd"><td><a href="mod_usertrack.html#cookiedomain">CookieDomain <em>domain</em></a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The domain to which the tracking cookie applies</td></tr>
<tr><td><a href="mod_usertrack.html#cookieexpires">CookieExpires <em>expiry-period</em></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Expiry time for the tracking cookie</td></tr>
-<tr class="odd"><td><a href="mod_log_config.html#cookielog">CookieLog <em>filename</em></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets filename for the logging of cookies</td></tr>
+<tr class="odd"><td><a href="mod_log_config.html#cookielog">CookieLog <var>filename</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets filename for the logging of cookies</td></tr>
<tr><td><a href="mod_usertrack.html#cookiename">CookieName <em>token</em></a></td><td> Apache </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Name of the tracking cookie</td></tr>
<tr class="odd"><td><a href="mod_usertrack.html#cookiestyle">CookieStyle
<em>Netscape|Cookie|Cookie2|RFC2109|RFC2965</em></a></td><td> Netscape </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Format of the cookie header field</td></tr>
<tr><td><a href="mod_usertrack.html#cookietracking">CookieTracking on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables tracking cookie</td></tr>
<tr class="odd"><td><a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory <var>directory</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Apache $B$,%3%"%@%s%W$9$kA0$K0\F0$r;n$_$k%G%#%l%/%H%j(B
</td></tr>
-<tr><td><a href="mod_log_config.html#customlog">CustomLog
- <em>file</em>|<em>pipe</em> <em>format</em>|<em>nickname</em>
- [env=[!]<em>environment-variable</em>]</a></td><td /><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets filename and format of log file</td></tr>
+<tr><td><a href="mod_log_config.html#customlog">CustomLog <var>file</var>|<var>pipe</var>
+<var>format</var>|<var>nickname</var>
+[env=[!]<var>environment-variable</var>]</a></td><td /><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets filename and format of log file</td></tr>
<tr class="odd"><td><a href="mod_dav.html#dav" id="D" name="D">Dav on|off</a></td><td> off </td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">WebDAV HTTP $B%a%=%C%I$rM-8z$K$7$^$9(B</td></tr>
-<tr><td><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity on|off</a></td><td> off </td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">PROPFIND, Depth: Infinity $B%j%/%(%9%H$r(B$B5v2D$7$^$9(B</td></tr>
+<tr><td><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity on|off</a></td><td> off </td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">PROPFIND, Depth: Infinity $B%j%/%(%9%H$r5v2D$7$^$9(B</td></tr>
<tr class="odd"><td><a href="mod_dav.html#davlockdb">DavLockDB <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">DAV $B%m%C%/%G!<%?%Y!<%9$N0LCV$G$9(B</td></tr>
<tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <em>seconds</em></a></td><td> 0 </td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">$B%5!<%P$,(B DAV $B%j%=!<%9$N%m%C%/$r0];}$9$k:G>.;~4V$G$9!#(B
</td></tr>
<tr class="odd"><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$BFCDj$N%"%$%3%s$,2?$b@_Dj$5$l$F$$$J$$;~$K(B
-$B%U%!%$%k$KI=<($9$k%"%$(B$B%3%s(B</td></tr>
-<tr><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage
- <em>MIME-lang</em></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets all files in the given scope to the
-specified language</td></tr>
+$B%U%!%$%k$KI=<($9$k%"%$%3%s(B</td></tr>
+<tr><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets all files in the given scope to the specified
+language</td></tr>
<tr class="odd"><td><a href="core.html#defaulttype">DefaultType <var>MIME-type</var></a></td><td> text/plain </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">MIME content-type that will be sent if the
server cannot determine a type in any other way</td></tr>
<tr><td><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize <em>value</em></a></td><td> 8096 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">zlib $B$,0lEY$K05=L$9$k2t$NBg$-$5(B</td></tr>
<tr class="odd"><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote <em>notename</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">$B%m%.%s%0MQ$K05=LHf$r%a%b$KDI2C(B</td></tr>
<tr><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <em>value</em></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">zlib $B$,05=L$K;H$&%a%b%j$N%l%Y%k$r;XDj(B</td></tr>
<tr class="odd"><td><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize <em>value</em></a></td><td> 15 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Zlib $B$N05=LMQ%&%#%s%I%&$NBg$-$5(B</td></tr>
-<tr><td><a href="mod_authz_host.html#deny"> Deny from
- all|<em>host</em>|env=<em>env-variable</em>
- [<em>host</em>|env=<em>env-variable</em>] ...</a></td><td /><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%5!<%P$,%"%/%;%9$r5qH]$9$k%[%9%H$r@)8f$9$k(B</td></tr>
+<tr><td><a href="mod_access.html#deny"> Deny from
+ all|<var>host</var>|env=<var>env-variable</var>
+ [<var>host</var>|env=<var>env-variable</var>] ...</a></td><td /><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%5!<%P$,%"%/%;%9$r5qH]$9$k%[%9%H$r@)8f$9$k(B</td></tr>
<tr class="odd"><td><a href="core.html#directory"><Directory <var>directory-path</var>>
... </Directory></a></td><td /><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enclose a group of directives that apply only to the
named file-system directory and sub-directories</td></tr>
<tr><td><a href="mod_dir.html#directoryindex">DirectoryIndex
<em>local-url</em> [<em>local-url</em>] ...</a></td><td> index.html </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%/%i%$%"%s%H$,%G%#%l%/%H%j$r%j%/%(%9%H$7$?$H$-$KD4$Y$k(B
-$B%j%=!<%9(B$B$N%j%9%H(B</td></tr>
+$B%j%=!<%9$N%j%9%H(B</td></tr>
<tr class="odd"><td><a href="core.html#directorymatch"><DirectoryMatch <var>regex</var>>
... </DirectoryMatch></a></td><td /><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enclose directives that apply to
file-system directories matching a regular expression and their
@@ -253,22 +265,21 @@
<tr><td><a href="mod_expires.html#expiresdefault">ExpiresDefault <var><code>seconds</var></a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Default algorithm for calculating expiration time</td></tr>
<tr class="odd"><td><a href="mod_status.html#extendedstatus">ExtendedStatus On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Keep track of extended status information for each
request</td></tr>
-<tr><td><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine <em>filtername</em> <em>parameters</em></a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">-</td></tr>
-<tr class="odd"><td><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions
- <em>option</em> [<em>option</em>] ...</a></td><td> DebugLevel=0 NoLogS +</td><td>d</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">-</td></tr>
+<tr><td><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine <var>filtername</var> <var>parameters</var></a></td><td /><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Define an external filter</td></tr>
+<tr class="odd"><td><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoLogS +</td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> options</td></tr>
<tr><td><a href="core.html#fileetag" id="F" name="F">FileETag <var>component</var> ...</a></td><td> INode MTime Size </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">File attributes used to create the ETag
HTTP response header</td></tr>
<tr class="odd"><td><a href="core.html#files"><Files <var>filename</var>> ... </Files></a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Contains directives that apply to matched
filenames</td></tr>
<tr><td><a href="core.html#filesmatch"><FilesMatch <var>regex</var>> ... </FilesMatch></a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Contains directives that apply to regular-expression matched
filenames</td></tr>
-<tr class="odd"><td><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</a></td><td> Prefer </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$BMW5a$K9g$&C1FH$N%I%-%e%a%s%H$,8+$D$+$i$J$+$C$?$H$-$K9T$J$&$3$H$r(B$B;XDj(B
+<tr class="odd"><td><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</a></td><td> Prefer </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$BMW5a$K9g$&C1FH$N%I%-%e%a%s%H$,8+$D$+$i$J$+$C$?$H$-$K9T$J$&$3$H$r;XDj(B
</td></tr>
<tr><td><a href="core.html#forcetype">ForceType <var>MIME-type</var>|none</a></td><td /><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Forces all matching files to be served with the specified
MIME content-type</td></tr>
<tr class="odd"><td><a href="mpm_common.html#group" id="G" name="G">Group <var>unix-group</var></a></td><td> #-1 </td><td>sv</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">$B%j%/%(%9%H$K1~Ez$9$k:]$K=jB0$9$k%0%k!<%W(B</td></tr>
-<tr><td><a href="mod_headers.html#header" id="H" name="H">Header set|append|add|unset|echo <em>header</em>
-[<em>value</em>]</a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
+<tr><td><a href="mod_headers.html#header" id="H" name="H">Header set|append|add|unset|echo <var>header</var>
+[<var>value</var> [env=[!]<var>variable</var>]]</a></td><td /><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
<tr class="odd"><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">
$B%$%s%G%C%/%90lMw$N@hF,$KA^F~$5$l$k%U%!%$%k$NL>A0(B</td></tr>
<tr><td><a href="core.html#hostnamelookups">HostnameLookups on|off|double</a></td><td> off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Enables DNS lookups on client IP addresses</td></tr>
@@ -280,11 +291,10 @@
<tr class="odd"><td><a href="core.html#ifmodule"><IfModule [!]<var>module-name</var>> ...
</IfModule></a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Encloses directives that are processed conditional on the
presence or absence of a specific module</td></tr>
-<tr><td><a href="mod_imap.html#imapbase">ImapBase map|referer|<em>URL</em></a></td><td> http://servername/ </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Default <code>base</code> for imagemap files</td></tr>
-<tr class="odd"><td><a href="mod_imap.html#imapdefault">ImapDefault error|nocontent|map|referer|<em>URL</em></a></td><td> nocontent </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Default action when an imagemap is called with coordinates
+<tr><td><a href="mod_imap.html#imapbase">ImapBase map|referer|<var>URL</var></a></td><td> http://servername/ </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Default <code>base</code> for imagemap files</td></tr>
+<tr class="odd"><td><a href="mod_imap.html#imapdefault">ImapDefault error|nocontent|map|referer|<var>URL</var></a></td><td> nocontent </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Default action when an imagemap is called with coordinates
that are not explicitly mapped</td></tr>
-<tr><td><a href="mod_imap.html#imapmenu">ImapMenu
- none|formatted|semiformatted|unformatted</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Action if no coordinates are given when calling
+<tr><td><a href="mod_imap.html#imapmenu">ImapMenu none|formatted|semiformatted|unformatted</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Action if no coordinates are given when calling
an imagemap</td></tr>
<tr class="odd"><td><a href="core.html#include">Include <var>file-path</var>|<var>directory-path</var></a></td><td /><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Includes other configuration files from within
the server configuration files</td></tr>
@@ -295,29 +305,30 @@
<tr><td><a href="mod_autoindex.html#indexorderdefault">IndexOrderDefault Ascending|Descending
Name|Date|Size|Description</a></td><td> Ascending Name </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">
$B%G%#%l%/%H%j%$%s%G%C%/%9$NI8=`$N=gHVIU$1$r@_Dj(B</td></tr>
-<tr class="odd"><td><a href="mod_isapi.html#isapiappendlogtoerrors">ISAPIAppendLogToErrors on|off</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Record HSE_APPEND_LOG_PARAMETER requests from ISAPI
-extensions to the error log</td></tr>
-<tr><td><a href="mod_isapi.html#isapiappendlogtoquery">ISAPIAppendLogToQuery on|off</a></td><td> on </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Record HSE_APPEND_LOG_PARAMETER requests from ISAPI
-extensions to the query field</td></tr>
-<tr class="odd"><td><a href="mod_isapi.html#isapicachefile">ISAPICacheFile <em>file-path</em> [<em>file-path</em>] ...</a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ISAPI .dll files to be loaded at startup</td></tr>
-<tr><td><a href="mod_isapi.html#isapifakeasync">ISAPIFakeAsync on|off</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Fake asynchronous support for isapi callbacks</td></tr>
+<tr class="odd"><td><a href="mod_isapi.html#isapiappendlogtoerrors">ISAPIAppendLogToErrors on|off</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
+ISAPI extensions to the error log</td></tr>
+<tr><td><a href="mod_isapi.html#isapiappendlogtoquery">ISAPIAppendLogToQuery on|off</a></td><td> on </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
+ISAPI extensions to the query field</td></tr>
+<tr class="odd"><td><a href="mod_isapi.html#isapicachefile">ISAPICacheFile <var>file-path</var> [<var>file-path</var>]
+...</a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ISAPI .dll files to be loaded at startup</td></tr>
+<tr><td><a href="mod_isapi.html#isapifakeasync">ISAPIFakeAsync on|off</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Fake asynchronous support for ISAPI callbacks</td></tr>
<tr class="odd"><td><a href="mod_isapi.html#isapilognotsupported">ISAPILogNotSupported on|off</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Log unsupported feature requests from ISAPI
extensions</td></tr>
-<tr><td><a href="mod_isapi.html#isapireadaheadbuffer">ISAPIReadAheadBuffer <em>size</em></a></td><td> 49152 </td><td>sdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Size of the Read Ahead Buffer sent to ISAPI
+<tr><td><a href="mod_isapi.html#isapireadaheadbuffer">ISAPIReadAheadBuffer <var>size</var></a></td><td> 49152 </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Size of the Read Ahead Buffer sent to ISAPI
extensions</td></tr>
<tr class="odd"><td><a href="core.html#keepalive" id="K" name="K">KeepAlive on|off</a></td><td> On </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enables HTTP persistent connections</td></tr>
<tr><td><a href="core.html#keepalivetimeout">KeepAliveTimeout <var>seconds</var></a></td><td> 15 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for subsequent
requests on a persistent connection</td></tr>
<tr class="odd"><td><a href="mod_negotiation.html#languagepriority" id="L" name="L">LanguagePriority <em>MIME-lang</em> [<em>MIME-lang</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$B%/%i%$%"%s%H$,M%@hEY$r<($5$J$+$C$?$H$-$N8@8l$N(B variant $B$NM%@hEY$r(B
$B;XDj(B</td></tr>
-<tr><td><a href="mod_ldap.html#ldapcacheentries">LDAPCacheEntries <em>number</em></a></td><td> 1024 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Maximum number of entires in the primary LDAP cache</td></tr>
-<tr class="odd"><td><a href="mod_ldap.html#ldapcachettl">LDAPCacheTTL <em>seconds</em></a></td><td> 600 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Time that cached items remain valid</td></tr>
-<tr><td><a href="mod_ldap.html#ldapcertdbpath">LDAPCertDBPath <em>directory-path</em></a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Directory containing certificates for SSL support</td></tr>
-<tr class="odd"><td><a href="mod_ldap.html#ldapopcacheentries">LDAPOpCacheEntries <em>number</em></a></td><td> 1024 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Number of entries used to cache LDAP compare
+<tr><td><a href="mod_ldap.html#ldapcacheentries">LDAPCacheEntries <var>number</var></a></td><td> 1024 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Maximum number of entires in the primary LDAP cache</td></tr>
+<tr class="odd"><td><a href="mod_ldap.html#ldapcachettl">LDAPCacheTTL <var>seconds</var></a></td><td> 600 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Time that cached items remain valid</td></tr>
+<tr><td><a href="mod_ldap.html#ldapcertdbpath">LDAPCertDBPath <var>directory-path</var></a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Directory containing certificates for SSL support</td></tr>
+<tr class="odd"><td><a href="mod_ldap.html#ldapopcacheentries">LDAPOpCacheEntries <var>number</var></a></td><td> 1024 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Number of entries used to cache LDAP compare
operations</td></tr>
-<tr><td><a href="mod_ldap.html#ldapopcachettl">LDAPOpCacheTTL <em>seconds</em></a></td><td> 600 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Time that entries in the operation cache remain
+<tr><td><a href="mod_ldap.html#ldapopcachettl">LDAPOpCacheTTL <var>seconds</var></a></td><td> 600 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Time that entries in the operation cache remain
valid</td></tr>
-<tr class="odd"><td><a href="mod_ldap.html#ldapsharedcachesize">LDAPSharedCacheSize <em>bytes</em></a></td><td> 102400 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Size in bytes of the shared-memory cache</td></tr>
+<tr class="odd"><td><a href="mod_ldap.html#ldapsharedcachesize">LDAPSharedCacheSize <var>bytes</var></a></td><td> 102400 </td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Size in bytes of the shared-memory cache</td></tr>
<tr><td><a href="core.html#limit"><Limit <var>method</var> [<var>method</var>] ... > ...
</Limit></a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Restrict enclosed access controls to only certain HTTP
methods</td></tr>
@@ -337,7 +348,7 @@
<tr><td><a href="mpm_common.html#listenbacklog">ListenBacklog <var>backlog</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">$BJ]N1>uBV$N%3%M%/%7%g%s$N%-%e!<$N:GBgD9(B</td></tr>
<tr class="odd"><td><a href="mod_so.html#loadfile">LoadFile <em>filename</em> [<em>filename</em>] ...</a></td><td /><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">$B;XDj$5$l$?%*%V%8%'%/%H%U%!%$%k$d%i%$%V%i%j$r%j%s%/$9$k(B</td></tr>
<tr><td><a href="mod_so.html#loadmodule">LoadModule <em>module filename</em></a></td><td /><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">$B%*%V%8%'%/%H%U%!%$%k$d%i%$%V%i%j$r%j%s%/$7!";HMQ%b%8%e!<%k$N(B
-$B%j(B$B%9%H$KDI2C$9$k(B</td></tr>
+$B%j%9%H$KDI2C$9$k(B</td></tr>
<tr class="odd"><td><a href="core.html#location"><Location
URL-path|URL> ... </Location></a></td><td /><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Applies the enclosed directives only to matching
URLs</td></tr>
@@ -345,14 +356,14 @@
<var>regex</var>> ... </LocationMatch></a></td><td /><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Applies the enclosed directives only to regular-expression
matching URLs</td></tr>
<tr class="odd"><td><a href="mpm_common.html#lockfile">LockFile <var>filename</var></a></td><td> logs/accept.lock </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">$B<uIU$rD>Ns2=$9$k$?$a$N%m%C%/%U%!%$%k$N0LCV(B</td></tr>
-<tr><td><a href="mod_log_config.html#logformat">LogFormat
- <em>format</em>|<em>nickname</em> [<em>nickname</em>]</a></td><td> "%h %l %u %t \"%r\" +</td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Describes a format for use in a log file</td></tr>
+<tr><td><a href="mod_log_config.html#logformat">LogFormat <var>format</var>|<var>nickname</var>
+[<var>nickname</var>]</a></td><td> "%h %l %u %t \"%r\" +</td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Describes a format for use in a log file</td></tr>
<tr class="odd"><td><a href="core.html#loglevel">LogLevel <var>level</var></a></td><td> warn </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Controls the verbosity of the ErrorLog</td></tr>
<tr><td><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">$B%j%/%(%9%H$K1~Ez$9$k$?$a$K:n@.$5$l$k(B
$B;R%W%m%;%9$N:GBg8D?t(B</td></tr>
<tr class="odd"><td><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests <var>number</var></a></td><td> 100 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Number of requests allowed on a persistent
connection</td></tr>
-<tr><td><a href="mpm_common.html#maxmemfree">MaxMemFree <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">$B<g%a%b%j%"%m%1!<%?$,(B free() $B$r8F$P$:$KJ];}$7B3$1$i$l$k%a(B$B%b%j$N(B
+<tr><td><a href="mpm_common.html#maxmemfree">MaxMemFree <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">$B<g%a%b%j%"%m%1!<%?$,(B free() $B$r8F$P$:$KJ];}$7B3$1$i$l$k%a%b%j$N(B
$B:GBgNL(B</td></tr>
<tr class="odd"><td><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild <var>number</var></a></td><td> 10000 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">$B8D!9$N;R%5!<%P$,2TF/Cf$K07$&%j%/%(%9%H?t$N>e8B(B</td></tr>
<tr><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var><br /></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">$B%"%$%I%k$J;R%5!<%P%W%m%;%9$N:GBg8D?t(B</td></tr>
@@ -364,16 +375,17 @@
<tr class="odd"><td><a href="mod_cern_meta.html#metafiles">MetaFiles on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Activates CERN meta-file processing</td></tr>
<tr><td><a href="mod_cern_meta.html#metasuffix">MetaSuffix <var>suffix</var></a></td><td> .meta </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">File name suffix for the file containg CERN-style
meta information</td></tr>
-<tr class="odd"><td><a href="mod_mime_magic.html#mimemagicfile">MimeMagicFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable MIME-type determination based on file contents
+<tr class="odd"><td><a href="mod_mime_magic.html#mimemagicfile">MimeMagicFile <var>file-path</var></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable MIME-type determination based on file contents
using the specified magic file</td></tr>
<tr><td><a href="prefork.html#minspareservers">MinSpareServers <var>number</var></a></td><td> 5 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">$B%"%$%I%k$J;R%5!<%P%W%m%;%9$N:G>.8D?t(B</td></tr>
<tr class="odd"><td><a href="mpm_common.html#minsparethreads">MinSpareServers <var>number</var></a></td><td /><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">$B%j%/%(%9%H$K1~Ez$9$k$3$H$N$G$-$k(B
$B%"%$%I%k%9%l%C%I?t$N:G>.?t(B</td></tr>
-<tr><td><a href="mod_file_cache.html#mmapfile">MMapFile <em>file-path</em> [<em>file-path</em>] ...</a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">-</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo On|Off</a></td><td /><td>d</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Tells mod_mime to treat path_info components as part of the filename</td></tr>
-<tr><td><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch
- <em>[NegotiatedOnly] [Handlers] [Filters] [Any]</em></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">The types of files that will be included when
-searching for a matching file with MultiViews</td></tr>
+<tr><td><a href="mod_file_cache.html#mmapfile">MMapFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td /><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Map a list of files into memory at startup time</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo On|Off</a></td><td> Off </td><td>d</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Tells <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> to treat <code>path_info</code>
+components as part of the filename</td></tr>
+<tr><td><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
+[Handlers|Filters]</a></td><td> NegotiatedOnly </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">The types of files that will be included when searching for
+a matching file with MultiViews</td></tr>
<tr class="odd"><td><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost <var>addr</var>[:<var>port</var>]</a></td><td /><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Designates an IP address for name-virtual
hosting</td></tr>
<tr><td><a href="mod_proxy.html#noproxy">NoProxy <em>host</em> [<em>host</em>] ...</a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Hosts, domains, or networks that will be connected
@@ -382,8 +394,8 @@
<tr><td><a href="core.html#options" id="O" name="O">Options
[+|-]<var>option</var> [[+|-]<var>option</var>] ...</a></td><td> All </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures what features are available in a particular
directory</td></tr>
-<tr class="odd"><td><a href="mod_authz_host.html#order"> Order <em>ordering</em></a></td><td> Deny,Allow </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$B%G%U%)%k%H$N%"%/%;%92DG=$J>uBV$H!"(B<code class="directive">Allow</code> $B$H(B
-<code class="directive">Deny</code> $B$,I>(B$B2A$5$l$k=gHV$r@)8f$9$k(B</td></tr>
+<tr class="odd"><td><a href="mod_access.html#order"> Order <var>ordering</var></a></td><td> Deny,Allow </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$B%G%U%)%k%H$N%"%/%;%92DG=$J>uBV$H!"(B<code class="directive">Allow</code> $B$H(B
+<code class="directive">Deny</code> $B$,I>2A$5$l$k=gHV$r@)8f$9$k(B</td></tr>
<tr><td><a href="mod_env.html#passenv" id="P" name="P">PassEnv
<em>env-variable</em> [<em>env-variable</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%7%'%k$+$i$N4D6-JQ?t$rEO$9(B</td></tr>
<tr class="odd"><td><a href="mpm_common.html#pidfile">PidFile <var>filename</var></a></td><td> logs/httpd.pid </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">$B%G!<%b%s$N%W%m%;%9(B ID
@@ -419,38 +431,38 @@
header for proxied requests</td></tr>
<tr class="odd"><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$B%$%s%G%C%/%90lMw$N:G8e$KA^F~$5$l$k%U%!%$%k$NL>A0(B</td></tr>
<tr><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
-<var>URL</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%/%i%$%"%s%H$,0c$&(B URL $B$r<hF@$9$k$h$&$K30It$X$N%j%@%$%l%/%H(B$B$r(B
+<var>URL</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%/%i%$%"%s%H$,0c$&(B URL $B$r<hF@$9$k$h$&$K30It$X$N%j%@%$%l%/%H$r(B
$BAw$k(B</td></tr>
<tr class="odd"><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
<var>URL</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$B8=:_$N(B URL $B$X$N@55,I=8=$N%^%C%A$K$h$j(B
-$B30It$X$N%j%@%$%l%/%H(B$B$rAw$k(B</td></tr>
+$B30It$X$N%j%@%$%l%/%H$rAw$k(B</td></tr>
<tr><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%/%i%$%"%s%H$,0c$&(B URL $B$r<hF@$9$k$h$&$K30It$X$N1J5WE*$J(B
-$B%j(B$B%@%$%l%/%H$rAw$k(B</td></tr>
+$B%j%@%$%l%/%H$rAw$k(B</td></tr>
<tr class="odd"><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$B%/%i%$%"%s%H$,0c$&(B URL $B$r<hF@$9$k$h$&$K30It$X$N0l;~E*$J(B
-$B%j(B$B%@%$%l%/%H$rAw$k(B</td></tr>
-<tr><td><a href="mod_mime.html#removecharset">RemoveCharset
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any character set associations for a set of file
+$B%j%@%$%l%/%H$rAw$k(B</td></tr>
+<tr><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any character set associations for a set of file
extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeencoding">RemoveEncoding
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content encoding associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content encoding associations for a set of file
extensions</td></tr>
-<tr><td><a href="mod_mime.html#removehandler">RemoveHandler
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any handler associations for a set of file
+<tr><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any handler associations for a set of file
extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any input filter associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any input filter associations for a set of file
extensions</td></tr>
-<tr><td><a href="mod_mime.html#removelanguage">RemoveLanguage
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any language associations for a set of file
+<tr><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any language associations for a set of file
extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any output filter associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any output filter associations for a set of file
extensions</td></tr>
-<tr><td><a href="mod_mime.html#removetype">RemoveType
- <em>extension</em> [<em>extension</em>] ...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
+<tr><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
+...</a></td><td /><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
extensions</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset <em>header</em>
-[<em>value</em>]</a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
+<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset <var>header</var>
+[<var>value</var>]</a></td><td /><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
<tr><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td /><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Selects which authenticated users can access
a resource</td></tr>
<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td /><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
@@ -480,17 +492,17 @@
<tr><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">$B;R%W%m%;%9$HO"7H$9$k$?$a$N%G!<%?$rJ]B8$9$k(B
$B%U%!%$%k$N0LCV(B</td></tr>
<tr class="odd"><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td /><td>svd</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$BFCDj$N%j%/%(%9%H%a%=%C%I$KBP$7$F(B CGI $B%9%/%j%W%H$r(B
-$B<B9T$9$k(B$B$h$&$K@_Dj(B</td></tr>
+$B<B9T$9$k$h$&$K@_Dj(B</td></tr>
<tr><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">URL $B$r%U%!%$%k%7%9%F%`$N0LCV$X%^%C%W$7!"%^%C%W@h$r(B
CGI $B%9%/%j%W%H$K;XDj(B</td></tr>
<tr class="odd"><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">URL $B$r@55,I=8=$r;H$C$F%U%!%$%k%7%9%F%`$N0LCV$X%^%C%W$7!"%^%C(B$B%W@h$r(B
+<var>file-path</var>|<var>directory-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">URL $B$r@55,I=8=$r;H$C$F%U%!%$%k%7%9%F%`$N0LCV$X%^%C%W$7!"%^%C%W@h$r(B
CGI $B%9%/%j%W%H$K;XDj(B</td></tr>
<tr><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource registry|script</a></td><td> script </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technique for locating the interpreter for CGI
scripts</td></tr>
<tr class="odd"><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">CGI $B%9%/%j%W%H$N%(%i!<%m%0%U%!%$%k$N>l=j(B</td></tr>
-<tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <em>bytes</em></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%9%/%j%W%H%m%0$K5-O?$5$l$k(B PUT $B$d(B POST $B%j%/%(%9%H$NFb(B$BMF$N>e8B(B</td></tr>
+<tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <em>bytes</em></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%9%/%j%W%H%m%0$K5-O?$5$l$k(B PUT $B$d(B POST $B%j%/%(%9%H$NFbMF$N>e8B(B</td></tr>
<tr class="odd"><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">CGI $B%9%/%j%W%H$N%m%0%U%!%$%k$NBg$-$5$N>e8B(B</td></tr>
<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">The name of the socket to use for communication with
the cgi daemon</td></tr>
@@ -514,21 +526,20 @@
</td></tr>
<tr><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex
[!]env-variable</em>[=<em>value</em>]
- [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%j%/%(%9%H$NB0@-$K4p$E$$$FBgJ8;z>.J8;z$r6hJL$;$:$K4D6-JQ?t$r@_Dj(B$B$9$k(B</td></tr>
+ [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">$B%j%/%(%9%H$NB0@-$K4p$E$$$FBgJ8;z>.J8;z$r6hJL$;$:$K4D6-JQ?t$r@_Dj$9$k(B</td></tr>
<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|none</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be processed by a
handler</td></tr>
<tr><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Sets the filters that will process client requests and POST
input</td></tr>
<tr class="odd"><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the filters that will process responses from the
server</td></tr>
-<tr><td><a href="mod_include.html#ssiendtag">SSIEndTag <em>tag</em></a></td><td> "-->" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that ends an include element</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <em>message</em></a></td><td>
-"[an error occurre +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Error message displayed when there is an SSI error</td></tr>
-<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <em>tag</em></a></td><td> "<!--" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that starts an include element</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <em>formatstring</em></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the format in which date strings are
+<tr><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "-->" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that ends an include element</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Error message displayed when there is an SSI
+error</td></tr>
+<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "<!--" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that starts an include element</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the format in which date strings are
displayed</td></tr>
-<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <em>tag</em></a></td><td> "(none)" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when
-an unset variable is echoed</td></tr>
+<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates
for Client Auth</td></tr>
<tr><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td /><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for
@@ -589,8 +600,8 @@
<tr class="odd"><td><a href="mpm_netware.html#threadstacksize">ThreadStackSize <var>number</var></a></td><td> 65536 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">-</td></tr>
<tr><td><a href="core.html#timeout">TimeOut <var>number</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
certain events before failing a request</td></tr>
-<tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <em>file</em>|<em>pipe</em></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Specifly location of a log file</td></tr>
-<tr><td><a href="mod_mime.html#typesconfig">TypesConfig <em>file-path</em></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The location of the mime.types file</td></tr>
+<tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td /><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Specifly location of a log file</td></tr>
+<tr><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
<tr class="odd"><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <em>env-variable</em> [<em>env-variable</em>] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">$B4D6-$+$iJQ?t$r<h$j=|$/(B</td></tr>
<tr><td><a href="core.html#usecanonicalname">UseCanonicalName on|off|dns</a></td><td> on </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
port</td></tr>
@@ -608,6 +619,10 @@
a given virtual host</td></tr>
<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
a given virtual host</td></tr>
-<tr><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Parse SSI directives in files with the execute
-bit set</td></tr>
-</table></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+<tr><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
+set</td></tr>
+</table></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/quickreference.xml.de b/docs/manual/mod/quickreference.xml.de
new file mode 100644
index 0000000..426e6a0
--- /dev/null
+++ b/docs/manual/mod/quickreference.xml.de
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!DOCTYPE quickreference SYSTEM "../style/modulesynopsis.dtd"
+ [ <!ENTITY sitemap SYSTEM "../sitemap.xml.de"> ]
+>
+<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
+<!-- English revision: 1.4 -->
+
+<quickreference>
+ <title>Kurzreferenz der Direktiven</title>
+ <summary>
+ <p>Die Kurzreferenz der Direktiven zeigt die Verwendung,
+ Voreinstellung, den Status und den Kontext aller
+ Apache-Konfigurationsanweisungen. Für weitergehende Informationen
+ schauen Sie bitte im <a
+ href="directive-dict.html">Verzeichnis der Direktiven</a>.</p>
+
+ <p>Die erste Spalte enthält den Namen und die Verwendung.
+ Die zweite Spalte zeigt die Voreinstellung der Direktive, sofern
+ eine Voreinstellung existiert. Wenn die Voreinstellung zu breit
+ für die Anzeige ist, werden die ersten Buchstaben angegeben,
+ gefolgt von einem "+".</p>
+
+ <p>Die dritte und vierte Spalte geben den Kontext an, in dem die
+ Direktive erlaubt ist, sowie den Status der Direktive entsprechend
+ der Legende.</p>
+ </summary>
+
+ <legend>
+ <table>
+ <tr><th>s</th><td>Serverkonfiguration</td></tr>
+ <tr><th>v</th><td>Virtual Host</td></tr>
+ <tr><th>d</th><td>Verzeichnis</td></tr>
+ <tr><th>h</th><td>.htaccess</td></tr>
+ </table>
+
+ <table>
+ <tr><th>C</th><td>Core</td></tr>
+ <tr><th>M</th><td>MPM</td></tr>
+ <tr><th>B</th><td>Basis</td></tr>
+ <tr><th>E</th><td>Erweiterung</td></tr>
+ <tr><th>X</th><td>experimentell</td></tr>
+ </table>
+ </legend>
+
+ &sitemap;
+</quickreference>
\ No newline at end of file
diff --git a/docs/manual/mod/threadpool.html.en b/docs/manual/mod/threadpool.html.en
new file mode 100644
index 0000000..3da6511
--- /dev/null
+++ b/docs/manual/mod/threadpool.html.en
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>threadpool - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM threadpool</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Yet another experimental variant of the standard
+<code class="module"><a href="../mod/worker.html">worker</a></code> MPM</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mpm_threadpool_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>threadpool.c</td></tr></table>
+<h3>Summary</h3>
+
+ <div class="warning"><h3>Warning</h3>
+ <p>This MPM is a developer playground and highly experimental, so it
+ may or may not work as expected.</p>
+ </div>
+
+ <p>This is an experimental variant of the standard worker MPM.
+ Rather than queuing connections like the worker MPM, the
+ <code class="module"><a href="../mod/threadpool.html">threadpool</a></code> MPM queues idle worker threads and
+ hands each accepted connection to the next available worker.</p>
+
+ <p>The <code class="module"><a href="../mod/threadpool.html">threadpool</a></code> MPM can't match the performance of
+ the <code class="module"><a href="../mod/worker.html">worker</a></code> MPM in benchmark testing. As of 2.0.39,
+ some of the key load-throtting concepts from the <code class="module"><a href="../mod/threadpool.html">threadpool</a></code> MPM have been incorporated into the <code class="module"><a href="../mod/worker.html">worker</a></code> MPM. The <code class="module"><a href="../mod/threadpool.html">threadpool</a></code> code is useful
+ primarily as a research platform. For general-purpose use and for any
+ production environments, use <code class="module"><a href="../mod/worker.html">worker</a></code> instead.</p>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#acceptmutex">AcceptMutex</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#lockfile">LockFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxclients">MaxClients</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#serverlimit">ServerLimit</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
+</ul>
+</div>
+
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/threadpool.xml b/docs/manual/mod/threadpool.xml
new file mode 100644
index 0000000..b43dc41
--- /dev/null
+++ b/docs/manual/mod/threadpool.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
+<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
+
+<modulesynopsis>
+<name>threadpool</name>
+<description>Yet another experimental variant of the standard
+<module>worker</module> MPM</description>
+<status>MPM</status>
+<sourcefile>threadpool.c</sourcefile>
+<identifier>mpm_threadpool_module</identifier>
+
+<summary>
+ <note type="warning"><title>Warning</title>
+ <p>This MPM is a developer playground and highly experimental, so it
+ may or may not work as expected.</p>
+ </note>
+
+ <p>This is an experimental variant of the standard worker MPM.
+ Rather than queuing connections like the worker MPM, the
+ <module>threadpool</module> MPM queues idle worker threads and
+ hands each accepted connection to the next available worker.</p>
+
+ <p>The <module>threadpool</module> MPM can't match the performance of
+ the <module>worker</module> MPM in benchmark testing. As of 2.0.39,
+ some of the key load-throtting concepts from the <module
+ >threadpool</module> MPM have been incorporated into the <module
+ >worker</module> MPM. The <module>threadpool</module> code is useful
+ primarily as a research platform. For general-purpose use and for any
+ production environments, use <module>worker</module> instead.</p>
+</summary>
+
+<directivesynopsis location="mpm_common"><name>AcceptMutex</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>CoreDumpDirectory</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>Group</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>Listen</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ListenBacklog</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>SendBufferSize</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>LockFile</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxClients</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxMemFree</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MaxSpareThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>MinSpareThreads</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>PidFile</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ServerLimit</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>StartServers</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ThreadLimit</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>ThreadsPerChild</name>
+</directivesynopsis>
+<directivesynopsis location="mpm_common"><name>User</name>
+</directivesynopsis>
+
+</modulesynopsis>
diff --git a/docs/manual/mod/worker.html.en b/docs/manual/mod/worker.html.en
index 6c0e856..ad8a7fb 100644
--- a/docs/manual/mod/worker.html.en
+++ b/docs/manual/mod/worker.html.en
@@ -4,12 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>worker - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module worker</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description:
- </a></th><td>Multi-Processing Module implementing a hybrid
- multi-threaded multi-process web server</td></tr><tr><th><a href="module-dict.html#Status">Status:
- </a></th><td>MPM</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:
- </a></th><td>mpm_worker_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File:
- </a></th><td>worker.c</td></tr></table><h3>Summary</h3>
+ -->
+<title>worker - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM worker</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Multi-Processing Module implementing a hybrid
+ multi-threaded multi-process web server</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>mpm_worker_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>worker.c</td></tr></table>
+<h3>Summary</h3>
+
<p>This Multi-Processing Module (MPM) implements a hybrid
multi-process multi-threaded server. By using threads to serve
requests, it is able to serve a large number of requests with
@@ -23,8 +40,11 @@
<code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>, which
controls the maximum total number of threads that may be
launched.</p>
-
-</div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#acceptmutex">AcceptMutex</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
@@ -42,8 +62,18 @@
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
-</ul><h3>Topics</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">How it Works</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../bind.html">Setting which addresses and
- ports Apache uses</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>
+</ul>
+<h3>Topics</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">How it Works</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><a href="../bind.html">Setting which addresses and ports Apache
+uses</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>Each process has a fixed
number of threads. The server adjusts to handle load by
increasing or decreasing the number of processes.</p>
@@ -99,4 +129,9 @@
<p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
controls how frequently the server recycles processes by killing
old ones and launching new ones.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/worker.html.ja.jis b/docs/manual/mod/worker.html.ja.jis
index 86c9d6d..3b89e07 100644
--- a/docs/manual/mod/worker.html.ja.jis
+++ b/docs/manual/mod/worker.html.ja.jis
@@ -4,18 +4,35 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>worker - Apache HTTP $B%5!<%P(B</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div><div id="page-content"><div id="preamble"><h1>Apache $B%b%8%e!<%k(B worker</h1><table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:
- </a></th><td>$B%^%k%A%9%l%C%I$H%^%k%A%W%m%;%9$N%O%$%V%j%C%I7?(B
-$B%&%'%V%5!<%P$r<BAu$7$?%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B</td></tr><tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:
- </a></th><td>MPM</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:
- </a></th><td>mpm_worker_module</td></tr><tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$(B$B%k(B:
- </a></th><td>worker.c</td></tr></table><h3>$B35MW(B</h3>
+ -->
+<title>worker - Apache HTTP $B%5!<%P(B</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="../">$B%P!<%8%g%s(B 2.0</a> > <a href="./">$B%b%8%e!<%k(B</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache $B%b%8%e!<%k(B worker</h1>
+<table class="module"><tr><th><a href="module-dict.html#Description">$B@bL@(B:</a></th><td>$B%^%k%A%9%l%C%I$H%^%k%A%W%m%;%9$N%O%$%V%j%C%I7?(B
+$B%&%'%V%5!<%P$r<BAu$7$?%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B</td></tr>
+<tr><th><a href="module-dict.html#Status">$B%9%F!<%?%9(B:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">$B%b%8%e!<%k<1JL;R(B:</a></th><td>mpm_worker_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">$B%=!<%9%U%!%$%k(B:</a></th><td>worker.c</td></tr></table>
+<h3>$B35MW(B</h3>
+
<p>$B$3$N%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)
- $B$O!"%^(B$B%k%A%9%l%C%I$H%^%k%A%W%m%;%9$N%O%$%V%j%C%I7?%5!<%P$r(B
+ $B$O!"%^%k%A%9%l%C%I$H%^%k%A%W%m%;%9$N%O%$%V%j%C%I7?%5!<%P$r(B
$B<BAu$7$F$$$^$9!#%j%/%(%9%H$N1~Ez$K%9%l%C%I$r;H$&$H!"(B
$B%W%m%;%9%Y!<%9$N%5!<%P$h$j$b>/$J$$%7%9%F%`;q8;$G!"(B
$BB?$/$N%j%/%(%9%H$K1~Ez$9$k$3$H$,$G$-$^$9!#(B
- $B$5$i$K!"B?$/$N%9%l%C(B$B%I$r;}$C$?J#?t$N%W%m%;%9$r0];}$9$k$3$H$G!"(B
+ $B$5$i$K!"B?$/$N%9%l%C%I$r;}$C$?J#?t$N%W%m%;%9$r0];}$9$k$3$H$G!"(B
$B%W%m%;%9%Y!<%9$N%5!<%P$N;}$D0BDj@-$rJ];}$7$F$$$^$9!#(B</p>
<p>$B$3$N(B MPM $B$r@)8f$9$k$N$K;H$o$l$k:G$b=EMW$J%G%#%l%/%F%#%V$O!"(B
@@ -26,7 +43,10 @@
<code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> $B$O(B
$B5/F0$5$l$k%9%l%C%I$NAm?t$N:GBgCM$r@)8B$7$^$9!#(B</p>
-</div><div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3><ul id="toc"><li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+</div>
+<div id="quickview"><h3 class="directives">$B%G%#%l%/%F%#%V(B</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
@@ -44,8 +64,18 @@
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
-</ul><h3>$B%H%T%C%/(B</h3><ul id="topics"><li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">$BF0(B$B:nJ}K!(B</a></li></ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><a href="../bind.html">Apache
-$B$N;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj(B</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">$BF0(B$B:nJ}K!(B</a></h2>
+</ul>
+<h3>$B%H%T%C%/(B</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">$BF0:nJ}K!(B</a></li>
+</ul><h3>$B;2>H(B</h3>
+<ul class="seealso">
+<li><a href="../bind.html">Apache
+$B$N;HMQ$9$k%"%I%l%9$H%]!<%H$N@_Dj(B</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">$BF0:nJ}K!(B</a></h2>
<p>$B%W%m%;%9$O7h$^$C$??t$N%9%l%C%I$r;}$A$^$9!#(B
$BIi2Y$X$NE,1~$O%W%m%;%9$N?t$rA}8:$K$h$jBP1~$7$^$9!#(B</p>
@@ -110,5 +140,10 @@
<p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
$B$O!"8E$$%W%m%;%9$rDd;_$7$F?7$7$$%W%m%;%9$r5/F0$9$k$3$H$K$h$C$F!"(B
- $B$I$NDxEY$NIQEY$G%5!<%P$,%W%m%;%9$r(B$B%j%5%$%/%k$9$k$+$r@)8f$7$^$9!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+ $B$I$NDxEY$NIQEY$G%5!<%P$,%W%m%;%9$r%j%5%$%/%k$9$k$+$r@)8f$7$^$9!#(B</p>
+</div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">$B%b%8%e!<%k(B</a> | <a href="../mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">$BMQ8l(B</a> | <a href="../sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/worker.xml b/docs/manual/mod/worker.xml
index f3b73ed..5b00d89 100644
--- a/docs/manual/mod/worker.xml
+++ b/docs/manual/mod/worker.xml
@@ -23,10 +23,9 @@
<directive module="mpm_common">MaxClients</directive>, which
controls the maximum total number of threads that may be
launched.</p>
-
</summary>
-<seealso><a href="../bind.html">Setting which addresses and
- ports Apache uses</a></seealso>
+<seealso><a href="../bind.html">Setting which addresses and ports Apache
+uses</a></seealso>
<section id="how-it-works"><title>How it Works</title>
<p>Each process has a fixed
@@ -93,7 +92,8 @@
old ones and launching new ones.</p>
</section>
-
+<directivesynopsis location="mpm_common"><name>AcceptMutex</name>
+</directivesynopsis>
<directivesynopsis location="mpm_common"><name>CoreDumpDirectory</name>
</directivesynopsis>
<directivesynopsis location="mpm_common"><name>Group</name>
diff --git a/docs/manual/mpm.html.en b/docs/manual/mpm.html.en
index 468a3f1..9cfcab5 100644
--- a/docs/manual/mpm.html.en
+++ b/docs/manual/mpm.html.en
@@ -4,10 +4,29 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Multi-Processing Modules (MPMs) - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Multi-Processing Modules (MPMs)</h1>
+ -->
+<title>Multi-Processing Modules (MPMs) - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Multi-Processing Modules (MPMs)</h1>
<p>This document describes what a Multi-Processing Module is and
how they are using by the Apache HTTP Server.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">Introduction</a></li><li><img alt="" src="./images/down.gif" /> <a href="#choosing">Choosing an MPM</a></li><li><img alt="" src="./images/down.gif" /> <a href="#defaults">MPM Defaults</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="introduction" id="introduction">Introduction</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">Introduction</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#choosing">Choosing an MPM</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#defaults">MPM Defaults</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="introduction" id="introduction">Introduction</a></h2>
<p>The Apache HTTP Server is designed to be a powerful and
flexible web server that can work on a very wide variety of
@@ -54,7 +73,9 @@
be loaded into the server at any time. The list of available
MPMs appears on the <a href="mod/">module index page</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="choosing" id="choosing">Choosing an MPM</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="choosing" id="choosing">Choosing an MPM</a></h2>
<p>MPMs must be chosen during configuration, and compiled into
the server. Compilers are capable of optimizing a lot of
@@ -71,7 +92,9 @@
determine which MPM was chosen by using <code>./httpd
-l</code>. This command will list every module that is compiled
into the server, including the MPM.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="defaults" id="defaults">MPM Defaults</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="defaults" id="defaults">MPM Defaults</a></h2>
<p>The following table lists the default MPMs for various operating
systems. This will be the MPM selected if you do not make another
@@ -79,8 +102,13 @@
<table>
<tr><td>BeOS</td><td><code class="module"><a href="./mod/beos.html">beos</a></code></td></tr>
+<tr><td>Netware</td><td><code class="module"><a href="./mod/mpm_netware.html">mpm_netware</a></code></td></tr>
<tr><td>OS/2</td><td><code class="module"><a href="./mod/mpmt_os2.html">mpmt_os2</a></code></td></tr>
<tr><td>Unix</td><td><code class="module"><a href="./mod/prefork.html">prefork</a></code></td></tr>
<tr><td>Windows</td><td><code class="module"><a href="./mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
</table>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mpm.html.ja.jis b/docs/manual/mpm.html.ja.jis
index baf1e23..1a6982f 100644
--- a/docs/manual/mpm.html.ja.jis
+++ b/docs/manual/mpm.html.ja.jis
@@ -4,25 +4,44 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM) - Apache HTTP $B%5!<%P(B</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)</h1>
-<p>$B$3$N(B$BJ8=q$G$O%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k$,$I$N$h$&$J$b$N$G!"(B
-Apache HTTP $B%5!<%P$G$I$N$h$&$K;HMQ$5$l$k$+$K$D$$$F2r@b$7(B$B$F$$$^$9!#(B</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">$B$O$8$a$K(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#choosing">MPM $B$rA*$V(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#defaults">MPM $B%G%U%)%k%HCM(B</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="introduction" id="introduction">$B$O$8$a$K(B</a></h2>
+ -->
+<title>$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM) - Apache HTTP $B%5!<%P(B</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)</h1>
+<p>$B$3$NJ8=q$G$O%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k$,$I$N$h$&$J$b$N$G!"(B
+Apache HTTP $B%5!<%P$G$I$N$h$&$K;HMQ$5$l$k$+$K$D$$$F2r@b$7$F$$$^$9!#(B</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">$B$O$8$a$K(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#choosing">MPM $B$rA*$V(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#defaults">MPM $B%G%U%)%k%HCM(B</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="introduction" id="introduction">$B$O$8$a$K(B</a></h2>
- <p>Apache HTTP $B%5!<(B$B%P$O0[$J$kI}9-$$4D6-!"B?<oB?MM$J%W%i%C%H%[!<%`$G(B
+ <p>Apache HTTP $B%5!<%P$O0[$J$kI}9-$$4D6-!"B?<oB?MM$J%W%i%C%H%[!<%`$G(B
$BF0:n$9$k$h$&$K!"%Q%o%U%k$G=@Fp@-$KIY$s$@@_7W$K$J$C$F$$$^$9!#(B
$B0[$J$k%W%i%C%H%[!<%`!&0[$J$k4D6-$G$O$7$P$7$P!"(B
$B0[$J$k5!G=$,I,MW$K$J$C$?$j!"(B
- $BF1$85!G=$G$b8zN($N$?$a$K0[$J$k<BAu(B$B$,I,MW$K$J$C$?$j$7$^$9!#(B
+ $BF1$85!G=$G$b8zN($N$?$a$K0[$J$k<BAu$,I,MW$K$J$C$?$j$7$^$9!#(B
Apache $B$G$O%b%8%e!<%k2=$5$l$?@_7W$K$h$jI}9-$$4D6-$KE,1~$7$F$-$^$7$?!#(B
$B$3$N@_7W$N$*$+$2$G!"4IM}<T$O(B
$B%3%s%Q%$%k;~$^$?$O<B9T;~$K$I$N%b%8%e!<%k$r%m!<%I$9$k$+A*$V$3$H$K$h$C$F!"(B
- $B$I$N5!G=$r%5!<%P(B$B$K<h$j9~$`$+A*Br$9$k$3$H$,$,$G$-$^$9!#(B</p>
+ $B$I$N5!G=$r%5!<%P$K<h$j9~$`$+A*Br$9$k$3$H$,$,$G$-$^$9!#(B</p>
<p>Apache 2.0 $B$G$O!"(B
$B$3$N%b%8%e!<%k2=$5$l$?@_7W$r%5!<%P$N4pK\5!G=$K$^$G3HD%$7$^$7$?!#(B
$B%5!<%P$K$O@:A*$5$l$?%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)
- $B$,IU$$$F$-$F!"$3$l$i(B$B$O%^%7%s$N%M%C%H%o!<%/%]!<%H$r%P%$%s%I$7$?$j!"(B
+ $B$,IU$$$F$-$F!"$3$l$i$O%^%7%s$N%M%C%H%o!<%/%]!<%H$r%P%$%s%I$7$?$j!"(B
$B%j%/%(%9%H$r<u$1IU$1$?$j!"%j%/%(%9%H$r07$&$h$&;R%W%m%;%9$K3d$jEv$F$?$j!"(B
$B$H$$$C$?Lr3d$r;}$A$^$9!#(B</p>
@@ -43,7 +62,7 @@
<li>$B%5!<%P$OFCDj$N%5%$%H8~$1$K!"$h$j>e<j$K%+%9%?%^%$%:$G$-$^$9!#(B
$BNc$($P!"Hs>o$KBg$-$J%9%1!<%i%S%j%F%#$rI,MW$H$9$k%5%$%H$G$O!"(B
- <code class="module"><a href="./mod/worker.html">worker</a></code> $B$H$$$C$?%9%l%C%I2=(B$B$5$l$?(B
+ <code class="module"><a href="./mod/worker.html">worker</a></code> $B$H$$$C$?%9%l%C%I2=$5$l$?(B
MPM $B$rMxMQ$G$-$k0lJ}$G!"0BDj@-$d8E$$%=%U%H%&%'%"$H$N8_49@-$r(B
$BI,MW$H$9$k%5%$%H$G$O(B <code class="module"><a href="./mod/prefork.html">prefork</a></code>
$B$,MxMQ$G$-$^$9!#$^$?!"(B
@@ -59,7 +78,9 @@
$BMxMQ2DG=$J(B MPM $B$O(B
<a href="mod/">module $B%$%s%G%C%/%9(B</a>$B$K$"$j$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="choosing" id="choosing">MPM $B$rA*$V(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="choosing" id="choosing">MPM $B$rA*$V(B</a></h2>
<p>MPM $B$O@_DjCf$KA*Br$7$F!"%5!<%PFbIt$K%3%s%Q%$%k$5$l$J$1$l$P(B
$B$J$j$^$;$s!#(B
@@ -67,7 +88,7 @@
$B$=$b$=$b%9%l%C%I$,;H$o$l$F$$$k$H$$$&$3$H$rCN$kI,MW$,$"$j$^$9!#(B
MPM $B$K$O(B Unix $B>e$G%9%l%C%I$rMQ$$$k$b$N$d!"%9%l%C%I$r$^$C$?$/(B
$B;H$o$J$$$b$N$,$"$k$N$G!"(B
- Apache $B$O!"(BMPM $B$,(B$B@_DjCf$KA*Br$5$l$F(B Apache $BFbIt$KAH$_9~$^$l$?>l9g$NJ}$,(B
+ Apache $B$O!"(BMPM $B$,@_DjCf$KA*Br$5$l$F(B Apache $BFbIt$KAH$_9~$^$l$?>l9g$NJ}$,(B
$B>o$K$h$jNI$$%Q%U%)!<%^%s%9$rH/4x$7$^$9!#(B</p>
<p>$BK>$_$N(B MPM $B$r<B:]$KA*$V$?$a$K$O!"(B./configure $B%9%/%j%W%H$G(B
@@ -79,7 +100,9 @@
$B$3$N%3%^%s%I$O!"(BMPM
$B$r4^$a!"%5!<%P$K%3%s%Q%$%k$GAH$_9~$^$l$?%b%8%e!<%kA4$F$r(B
$BNs5s$7$^$9!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="defaults" id="defaults">MPM $B%G%U%)%k%HCM(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="defaults" id="defaults">MPM $B%G%U%)%k%HCM(B</a></h2>
<p>$B<!I=$KMM!9$J(B OS $B8~$1$N%G%U%)%k%H$N(B MPM $B0lMw$r7G:\$7$F$$$^$9!#(B
$B%3%s%Q%$%k;~$K0U?^E*$KB>$rA*Br$7$J$1$l$P!"<+F0E*$K$3$l$i$N(B MPM
@@ -87,8 +110,13 @@
<table>
<tr><td>BeOS</td><td><code class="module"><a href="./mod/beos.html">beos</a></code></td></tr>
+<tr><td>Netware</td><td><code class="module"><a href="./mod/mpm_netware.html">mpm_netware</a></code></td></tr>
<tr><td>OS/2</td><td><code class="module"><a href="./mod/mpmt_os2.html">mpmt_os2</a></code></td></tr>
<tr><td>Unix</td><td><code class="module"><a href="./mod/prefork.html">prefork</a></code></td></tr>
<tr><td>Windows</td><td><code class="module"><a href="./mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
</table>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mpm.xml.ja b/docs/manual/mpm.xml.ja
index 3390f29..cde7d4e 100644
--- a/docs/manual/mpm.xml.ja
+++ b/docs/manual/mpm.xml.ja
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
<manualpage>
<relativepath href="."/>
-<!-- English revision: 1.1 -->
+<!-- English revision: 1.2 -->
<title>$B%^%k%A%W%m%;%C%7%s%0%b%8%e!<%k(B (MPM)</title>
@@ -96,6 +96,7 @@
<table>
<tr><td>BeOS</td><td><module>beos</module></td></tr>
+<tr><td>Netware</td><td><module>mpm_netware</module></td></tr>
<tr><td>OS/2</td><td><module>mpmt_os2</module></td></tr>
<tr><td>Unix</td><td><module>prefork</module></td></tr>
<tr><td>Windows</td><td><module>mpm_winnt</module></td></tr>
diff --git a/docs/manual/new_features_2_0.html.de b/docs/manual/new_features_2_0.html.de
index 493e7bf..6da8755 100644
--- a/docs/manual/new_features_2_0.html.de
+++ b/docs/manual/new_features_2_0.html.de
@@ -4,10 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Übersicht der neuen Funktionen in Apache 2.0 - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Übersicht der neuen Funktionen in Apache 2.0</h1>
+ -->
+<title>Übersicht der neuen Funktionen in Apache 2.0 - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Übersicht der neuen Funktionen in Apache 2.0</h1>
<p>Dieses Dokument beschreibt einige der wichtigsten Änderungen
des Apache HTTP Servers 2.0 gegenüber der Version 1.3.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">Core-Erweiterungen</a></li><li><img alt="" src="./images/down.gif" /> <a href="#module">Modul-Erweiterungen</a></li></ul><h3>Siehe auch</h3><ul class="seealso"><li><a href="upgrading.html">Upgrade auf Apache 2.0</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="core" id="core">Core-Erweiterungen</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">Core-Erweiterungen</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#module">Modul-Erweiterungen</a></li>
+</ul><h3>Siehe auch</h3><ul class="seealso"><li><a href="upgrading.html">Upgrade von 1.3 auf 2.0</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="core" id="core">Core-Erweiterungen</a></h2>
<dl>
@@ -112,7 +130,9 @@
die leistungsfähigere Syntax von Perl 5 verwendet.</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="module" id="module">Modul-Erweiterungen</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="module" id="module">Modul-Erweiterungen</a></h2>
<dl>
@@ -218,4 +238,8 @@
<dd>DBM-ähnliche Datenbanken werden jetzt durch die
Konfigurationsaweisung <code class="directive"><a href="./mod/mod_auth_dbm.html#authdbmtype">AuthDBMType</a></code> unterstützt.</dd>
</dl>
- </div></div><div id="footer"><p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_0.html.en b/docs/manual/new_features_2_0.html.en
index 841cc79..3ec0097 100644
--- a/docs/manual/new_features_2_0.html.en
+++ b/docs/manual/new_features_2_0.html.en
@@ -4,10 +4,28 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Overview of new features in Apache 2.0 - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Overview of new features in Apache 2.0</h1>
+ -->
+<title>Overview of new features in Apache 2.0 - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Overview of new features in Apache 2.0</h1>
<p>This document describes some of the major changes between the
1.3 and 2.0 versions of the Apache HTTP Server.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">Core Enhancements</a></li><li><img alt="" src="./images/down.gif" /> <a href="#module">Module Enhancements</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="upgrading.html">Upgrading to Apache 2.0</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="core" id="core">Core Enhancements</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">Core Enhancements</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#module">Module Enhancements</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="upgrading.html">Upgrading to 2.0 from 1.3</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="core" id="core">Core Enhancements</a></h2>
<dl>
@@ -101,7 +119,9 @@
syntax.</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="module" id="module">Module Enhancements</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="module" id="module">Module Enhancements</a></h2>
<dl>
@@ -198,4 +218,8 @@
directive.</dd>
</dl>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_0.html.ru.koi8-r b/docs/manual/new_features_2_0.html.ru.koi8-r
index 3de9cc1..3819789 100644
--- a/docs/manual/new_features_2_0.html.ru.koi8-r
+++ b/docs/manual/new_features_2_0.html.ru.koi8-r
@@ -4,9 +4,27 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>ïÂÚÏÒ ÎÏ×ÙÈ ×ÏÚÍÏÖÎÏÓÔÅÊ × Apache 2.0 - HTTP ÓÅÒ×ÅÒ Apache</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p><p class="apache">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP ÓÅÒ×ÅÒ</a> > <a href="http://httpd.apache.org/docs-project/">äÏËÕÍÅÎÔÁÃÉÑ</a> > <a href="./">÷ÅÒÓÉÑ 2.0</a></div><div id="page-content"><div id="preamble"><h1>ïÂÚÏÒ ÎÏ×ÙÈ ×ÏÚÍÏÖÎÏÓÔÅÊ × Apache 2.0</h1>
+ -->
+<title>ïÂÚÏÒ ÎÏ×ÙÈ ×ÏÚÍÏÖÎÏÓÔÅÊ × Apache 2.0 - HTTP ÓÅÒ×ÅÒ Apache</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p>
+<p class="apache">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP ÓÅÒ×ÅÒ</a> > <a href="http://httpd.apache.org/docs-project/">äÏËÕÍÅÎÔÁÃÉÑ</a> > <a href="./">÷ÅÒÓÉÑ 2.0</a></div><div id="page-content"><div id="preamble"><h1>ïÂÚÏÒ ÎÏ×ÙÈ ×ÏÚÍÏÖÎÏÓÔÅÊ × Apache 2.0</h1>
<p>üÔÏÔ ÄÏËÕÍÅÎÔ ÏÐÉÓÙ×ÁÅÔ ÏÓÎÏ×ÎÙÅ ÒÁÚÌÉÞÉÑ ÍÅÖÄÕ ×ÅÒÓÉÑÍÉ 1.3 É 2.0 HTTP ÓÅÒ×ÅÒÁ Apache</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">õÌÕÞÛÅÎÉÑ × ÑÄÒÅ ÓÅÒ×ÅÒÁ</a></li><li><img alt="" src="./images/down.gif" /> <a href="#module">õÌÕÞÛÅÎÉÑ × ÍÏÄÕÌÑÈ ÓÅÒ×ÅÒÁ</a></li></ul><h3>óÍ. ÔÁËÖÅ</h3><ul class="seealso"><li><a href="upgrading.html">ðÅÒÅÈÏÄ ÏÔ ×ÅÒÓÉÉ 1.3 Ë ×ÅÒÓÉÉ 2.0</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="core" id="core">õÌÕÞÛÅÎÉÑ × ÑÄÒÅ ÓÅÒ×ÅÒÁ</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">õÌÕÞÛÅÎÉÑ × ÑÄÒÅ ÓÅÒ×ÅÒÁ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#module">õÌÕÞÛÅÎÉÑ × ÍÏÄÕÌÑÈ ÓÅÒ×ÅÒÁ</a></li>
+</ul><h3>óÍ. ÔÁËÖÅ</h3><ul class="seealso"><li><a href="upgrading.html">ðÅÒÅÈÏÄ ÏÔ ×ÅÒÓÉÉ 1.3 Ë ×ÅÒÓÉÉ 2.0</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="core" id="core">õÌÕÞÛÅÎÉÑ × ÑÄÒÅ ÓÅÒ×ÅÒÁ</a></h2>
<dl>
@@ -109,7 +127,9 @@
÷ÓÅ ÒÅÇÕÌÑÒÎÙÅ ×ÙÒÁÖÅÎÉÑ ÔÅÐÅÒØ ÉÓÐÏÌØÚÕÀÔ ÂÏÌÅÅ ÍÏÝÎÙÊ ÓÉÎÔÁËÓÉÓ Perl 5.</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="module" id="module">õÌÕÞÛÅÎÉÑ × ÍÏÄÕÌÑÈ ÓÅÒ×ÅÒÁ</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="module" id="module">õÌÕÞÛÅÎÉÑ × ÍÏÄÕÌÑÈ ÓÅÒ×ÅÒÁ</a></h2>
<dl>
@@ -205,4 +225,8 @@
ÄÉÒÅËÔÉ×Ù <code class="directive"><a href="./mod/mod_auth_dbm.html#authdbmtype">AuthDBMType</a></code>.</dd>
</dl>
- </div></div><div id="footer"><p class="apache">ðÏÄÄÅÒÖËÁ ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">ðÏÄÄÅÒÖËÁ ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_0.xml b/docs/manual/new_features_2_0.xml
index 5cbab79..ffbe6ba 100644
--- a/docs/manual/new_features_2_0.xml
+++ b/docs/manual/new_features_2_0.xml
@@ -11,7 +11,7 @@
1.3 and 2.0 versions of the Apache HTTP Server.</p>
</summary>
-<seealso><a href="upgrading.html">Upgrading to Apache 2.0</a></seealso>
+<seealso><a href="upgrading.html">Upgrading to 2.0 from 1.3</a></seealso>
<section id="core">
<title>Core Enhancements</title>
@@ -214,4 +214,3 @@
</dl>
</section>
</manualpage>
-
diff --git a/docs/manual/new_features_2_0.xml.de b/docs/manual/new_features_2_0.xml.de
index 7a749f0..c57a084 100644
--- a/docs/manual/new_features_2_0.xml.de
+++ b/docs/manual/new_features_2_0.xml.de
@@ -1,6 +1,8 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
+<!-- English revision: 1.4.2.1 -->
+
<manualpage>
<relativepath href="."/>
@@ -11,7 +13,7 @@
des Apache HTTP Servers 2.0 gegenüber der Version 1.3.</p>
</summary>
-<seealso><a href="upgrading.html">Upgrade auf Apache 2.0</a></seealso>
+<seealso><a href="upgrading.html">Upgrade von 1.3 auf 2.0</a></seealso>
<section id="core">
<title>Core-Erweiterungen</title>
diff --git a/docs/manual/platform/ebcdic.html.en b/docs/manual/platform/ebcdic.html.en
index bb7a3c9..6015090 100644
--- a/docs/manual/platform/ebcdic.html.en
+++ b/docs/manual/platform/ebcdic.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>The Apache EBCDIC Port - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>The Apache EBCDIC Port</h1>
+ -->
+<title>The Apache EBCDIC Port - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>The Apache EBCDIC Port</h1>
<div class="warning"><strong>Warning:</strong> This document
has not been updated to take into account changes made in
@@ -12,7 +24,18 @@
information may still be relevant, but please use it with care.
</div>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#overview">Overview of the Apache EBCDIC Port</a></li><li><img alt="" src="../images/down.gif" /> <a href="#design">Design Goals</a></li><li><img alt="" src="../images/down.gif" /> <a href="#technical">Technical Solution</a></li><li><img alt="" src="../images/down.gif" /> <a href="#porting">Porting Notes</a></li><li><img alt="" src="../images/down.gif" /> <a href="#document">Document Storage Notes</a></li><li><img alt="" src="../images/down.gif" /> <a href="#modules">Apache Modules' Status</a></li><li><img alt="" src="../images/down.gif" /> <a href="#third-party">Third Party Modules' Status</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="overview" id="overview">Overview of the Apache EBCDIC Port</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#overview">Overview of the Apache EBCDIC Port</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#design">Design Goals</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#technical">Technical Solution</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#porting">Porting Notes</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#document">Document Storage Notes</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#modules">Apache Modules' Status</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#third-party">Third Party Modules' Status</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="overview" id="overview">Overview of the Apache EBCDIC Port</a></h2>
@@ -42,7 +65,9 @@
<p>This document serves as a rationale to describe some of the
design decisions of the port to this machine.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="design" id="design">Design Goals</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="design" id="design">Design Goals</a></h2>
@@ -60,7 +85,9 @@
might solve the problem by defining an "ebcdic-handler" for all
documents which must be converted.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="technical" id="technical">Technical Solution</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="technical" id="technical">Technical Solution</a></h2>
@@ -91,7 +118,9 @@
the response body may contain text or a binary file)</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="porting" id="porting">Porting Notes</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="porting" id="porting">Porting Notes</a></h2>
@@ -230,7 +259,9 @@
</ol>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="document" id="document">Document Storage Notes</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="document" id="document">Document Storage Notes</a></h2>
@@ -274,7 +305,9 @@
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="modules" id="modules">Apache Modules' Status</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="modules" id="modules">Apache Modules' Status</a></h2>
@@ -496,7 +529,9 @@
</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="third-party" id="third-party">Third Party Modules' Status</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="third-party" id="third-party">Third Party Modules' Status</a></h2>
@@ -534,4 +569,8 @@
</tr>
</table>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/index.html.en b/docs/manual/platform/index.html.en
index 9393a14..a98ecfe 100644
--- a/docs/manual/platform/index.html.en
+++ b/docs/manual/platform/index.html.en
@@ -4,7 +4,25 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Platform Specific Notes - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="../"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Platform Specific Notes</h1></div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#win">Microsoft Windows</a></li><li><img alt="" src="../images/down.gif" /> <a href="#other">Other Platforms</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="win" id="win">Microsoft Windows</a></h2>
+ -->
+<title>Platform Specific Notes - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="../"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Platform Specific Notes</h1></div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#win">Microsoft Windows</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#other">Other Platforms</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="win" id="win">Microsoft Windows</a></h2>
@@ -19,15 +37,6 @@
</dl>
<dl>
- <dt>Running Apache as a Service</dt>
- <dd>
- <p>Apache can be run as a service on Windows NT/2000.</p>
-
- <p>See: <a href="win_service.html">Running Apache for Windows as a Service</a></p>
- </dd>
- </dl>
-
- <dl>
<dt>Compiling Apache</dt>
<dd>
<p>There are many important points before you begin compiling Apache.
@@ -37,7 +46,9 @@
</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="other" id="other">Other Platforms</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="other" id="other">Other Platforms</a></h2>
@@ -68,4 +79,8 @@
</dd>
</dl>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/index.xml b/docs/manual/platform/index.xml
index 91b3d0b..9a69c00 100644
--- a/docs/manual/platform/index.xml
+++ b/docs/manual/platform/index.xml
@@ -23,16 +23,6 @@
</dl>
<dl>
- <dt>Running Apache as a Service</dt>
- <dd>
- <p>Apache can be run as a service on Windows NT/2000.</p>
-
- <p>See: <a href="win_service.html"
- >Running Apache for Windows as a Service</a></p>
- </dd>
- </dl>
-
- <dl>
<dt>Compiling Apache</dt>
<dd>
<p>There are many important points before you begin compiling Apache.
diff --git a/docs/manual/platform/netware.html.en b/docs/manual/platform/netware.html.en
index edc246a..1d82f19 100644
--- a/docs/manual/platform/netware.html.en
+++ b/docs/manual/platform/netware.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Using Apache With Novell NetWare - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Using Apache With Novell NetWare</h1>
+ -->
+<title>Using Apache With Novell NetWare - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Using Apache With Novell NetWare</h1>
<p>This document explains how to install, configure and run
Apache 2.0 under Novell NetWare 5.1 and above. If you find any bugs,
@@ -27,7 +39,17 @@
bugs), see the section on <a href="#comp">Compiling Apache for
NetWare</a> below.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#req">Requirements</a></li><li><img alt="" src="../images/down.gif" /> <a href="#down">Downloading Apache for NetWare</a></li><li><img alt="" src="../images/down.gif" /> <a href="#inst">Installing Apache for NetWare</a></li><li><img alt="" src="../images/down.gif" /> <a href="#run">Running Apache for NetWare</a></li><li><img alt="" src="../images/down.gif" /> <a href="#use">Configuring Apache for NetWare</a></li><li><img alt="" src="../images/down.gif" /> <a href="#comp">Compiling Apache for NetWare</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="req" id="req">Requirements</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#req">Requirements</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#down">Downloading Apache for NetWare</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#inst">Installing Apache for NetWare</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#run">Running Apache for NetWare</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#use">Configuring Apache for NetWare</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#comp">Compiling Apache for NetWare</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="req" id="req">Requirements</a></h2>
@@ -41,7 +63,9 @@
<p>NetWare service packs are available <a href="http://support.novell.com/misc/patlst.htm#nw">here</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="down" id="down">Downloading Apache for NetWare</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="down" id="down">Downloading Apache for NetWare</a></h2>
@@ -51,7 +75,9 @@
beta-test releases, together with details of mirror web and
anonymous ftp sites.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="inst" id="inst">Installing Apache for NetWare</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="inst" id="inst">Installing Apache for NetWare</a></h2>
@@ -131,7 +157,9 @@
<p>Apache may be installed to other volumes besides the default <code>SYS</code> volume.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="run" id="run">Running Apache for NetWare</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="run" id="run">Running Apache for NetWare</a></h2>
@@ -257,7 +285,9 @@
web server.</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="use" id="use">Configuring Apache for NetWare</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="use" id="use">Configuring Apache for NetWare</a></h2>
@@ -348,7 +378,9 @@
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="comp" id="comp">Compiling Apache for NetWare</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="comp" id="comp">Compiling Apache for NetWare</a></h2>
@@ -580,4 +612,8 @@
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/perf-hp.html.en b/docs/manual/platform/perf-hp.html.en
index cb70beb..d32048a 100644
--- a/docs/manual/platform/perf-hp.html.en
+++ b/docs/manual/platform/perf-hp.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Running a High-Performance Web Server on HPUX - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Running a High-Performance Web Server on HPUX</h1>
+ -->
+<title>Running a High-Performance Web Server on HPUX - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Running a High-Performance Web Server on HPUX</h1>
<pre>
Date: Wed, 05 Nov 1997 16:59:34 -0800
@@ -77,4 +89,9 @@
<p><a href="http://www.cup.hp.com/netperf/NetperfPage.html">http://www.cup.hp.com/netperf/NetperfPage.html</a></p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div>
+</div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/win_compiling.html.en b/docs/manual/platform/win_compiling.html.en
index e65fcf6..dd4d793 100644
--- a/docs/manual/platform/win_compiling.html.en
+++ b/docs/manual/platform/win_compiling.html.en
@@ -4,13 +4,33 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Compiling Apache for Microsoft Windows - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Compiling Apache for Microsoft Windows</h1>
+ -->
+<title>Compiling Apache for Microsoft Windows - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Compiling Apache for Microsoft Windows</h1>
<p>There are many important points before you begin compiling
Apache. See <a href="windows.html">Using Apache with Microsoft
Windows</a> before you begin.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">Requirements</a></li><li><img alt="" src="../images/down.gif" /> <a href="#commandbuild">Command-Line Build</a></li><li><img alt="" src="../images/down.gif" /> <a href="#workspacebuild">Developer Studio Workspace IDE Build</a></li><li><img alt="" src="../images/down.gif" /> <a href="#projectcomponents">Project Components</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="requirements" id="requirements">Requirements</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">Requirements</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#commandbuild">Command-Line Build</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#workspacebuild">Developer Studio Workspace IDE Build</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#projectcomponents">Project Components</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="requirements" id="requirements">Requirements</a></h2>
@@ -133,7 +153,9 @@
</ul>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="commandbuild" id="commandbuild">Command-Line Build</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="commandbuild" id="commandbuild">Command-Line Build</a></h2>
@@ -156,7 +178,9 @@
debugging information in the resulting files, making it easier
to find bugs and track down problems.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="workspacebuild" id="workspacebuild">Developer Studio Workspace IDE Build</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="workspacebuild" id="workspacebuild">Developer Studio Workspace IDE Build</a></h2>
@@ -222,7 +246,9 @@
should be simple, with minimal compilation and linkage flags that
will be recognized by all VC++ 5.0 through 7.0 environments.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="projectcomponents" id="projectcomponents">Project Components</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="projectcomponents" id="projectcomponents">Project Components</a></h2>
@@ -383,4 +409,8 @@
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/win_service.html.en b/docs/manual/platform/win_service.html.en
deleted file mode 100644
index ad58d65..0000000
--- a/docs/manual/platform/win_service.html.en
+++ /dev/null
@@ -1,371 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from xml source: DO NOT EDIT
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Running Apache for Windows as a Service - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Running Apache for Windows as a Service</h1>
-
- <p>Apache can be run as a service on Windows NT/2000. (There is
- also some HIGHLY EXPERIMENTAL support for similar behavior on
- <a href="#win95svc">Windows 95/98</a>, introduced with Apache
- 1.3.13).</p>
-
- <p>Installing Apache as a service should only be done once you
- can successfully run it in a console window. See <a href="windows.html">Using Apache with Microsoft Windows</a>
- before you attempt to install or run Apache as a service.
- Changes to the <code>httpd.conf</code> file should always be
- followed by starting Apache as a console window. If this
- succeeds, the service should succeed.</p>
-
- <div class="note"><strong>Prior to version 1.3.13, the configuration was
- <em>not tested</em> prior to performing the
- installation</strong>, and a lack of service dependencies often
- caused the console window to succeed, but the service would
- still fail. See <a href="#service">below</a> if you are having
- problems running a version of Apache prior to 1.3.13 to resolve
- the issue. If you have this problem with version 1.3.13 or
- greater, first try uninstalling (<code>-u</code>) and re-installing
- (<code>-i</code>) the Apache service.</div>
-
- <p>To start Apache as a service, you first need to install it
- as a service. Multiple Apache services can be installed, each
- with a different name and configuration. To install the default
- Apache service named "Apache", run the "Install Apache as
- Service (NT only)" option from the Start menu. Once this is
- done you can start the "Apache" service by opening the Services
- window (in the Control Panel), selecting Apache, then clicking
- on Start. Apache will now be running, hidden in the background.
- You can later stop Apache by clicking on Stop. As an
- alternative to using the Services window, you can start and
- stop the "Apache" service from the command line with</p>
-
- <div class="example"><p><code>
- NET START APACHE<br />
- NET STOP APACHE
- </code></p></div>
-
- <p>See <a href="#signal">Controlling Apache as a Service</a>
- for more information on installing and controlling Apache
- services.</p>
-
- <div class="note"><h3>Note</h3>
- Apache, unlike many other Windows NT/2000 services,
- logs any errors to its own error.log file in the logs folder
- within the Apache server root folder. You will <em>not</em>
- find Apache error details in the Windows NT Event
- Log.</div>
-
- <p>After starting Apache as a service (or if you have trouble
- starting it) you can test it using the same <a href="windows.html#cmdline">procedure</a> as for running in a
- console window. Remember to use the command:</p>
-
- <div class="example"><p><code>
- apache -n "service name"
- </code></p></div>
-
- <p>to assure you are using the service's configuration.</p>
-
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#service">Running Apache for Windows as a Service</a></li><li><img alt="" src="../images/down.gif" /> <a href="#depends">Important Note on service dependencies:</a></li><li><img alt="" src="../images/down.gif" /> <a href="#account">User Account for Apache Service to Run As (NT/2000)</a></li><li><img alt="" src="../images/down.gif" /> <a href="#trouble">Troubleshooting Apache for Windows as a Service</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cmdline">Running Apache for Windows from the Command Line</a></li><li><img alt="" src="../images/down.gif" /> <a href="#signal">Controlling Apache as a Service</a></li><li><img alt="" src="../images/down.gif" /> <a href="#win95svc">HIGHLY EXPERIMENTAL Windows 95/98 Service</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="service" id="service">Running Apache for Windows as a Service</a></h2>
-
-
-
- <div class="note"><strong>The <code>-n</code> option to specify a service
- name is only available with Apache 1.3.7 and later.</strong>
- Earlier versions of Apache only support the default service name
- "Apache".</div>
-
- <p>You can install Apache as a Windows NT service as
- follows:</p>
-
- <div class="example"><p><code>
- apache -i -n "service name"
- </code></p></div>
-
- <p>To install a service to use a particular configuration,
- specify the configuration file when the service is
- installed:</p>
-
- <div class="example"><p><code>
- apache -i -n "service name" -f "\my server\conf\my.conf"
- </code></p></div>
-
- <p>To remove an Apache service, use:</p>
-
- <div class="example"><p><code>
- apache -u -n "service name"
- </code></p></div>
-
- <p>The default "service name", if one is not specified, is
- "Apache".</p>
-
- <p>Once a service is installed, you can use the <code>-n</code>
- option, in conjunction with other options, to refer to a
- service's configuration file. For example:</p>
-
- <p>To test a service's configuration file:</p>
-
- <div class="example"><p><code>
- apache -n "service name" -t
- </code></p></div>
-
- <p>To start a console Apache using a service's configuration
- file:</p>
-
- <div class="example"><p><code>
- apache -n "service name"
- </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="depends" id="depends">Important Note on service dependencies:</a></h2>
-
-
-
- <p>Prior to Apache release 1.3.13, the dependencies required to
- successfully start an installed service were not configured.
- After installing a service using earlier versions of Apache,
- you must follow these steps:</p>
-
- <div class="example"><p><code>
- Run regedt32 <br />
- Select Window - "HKEY_LOCAL_MACHINE on Local Machine" from the menu <br />
- Double-click to open the SYSTEM, then the CurrentControlSet keys <br />
- Scroll down and click on the Apache servicename <br />
- Select Edit - Add Value... from the menu <br />
- Fill in the Add Value dialog with <br />
- Value Name: DependOnGroup <br />
- Data Type: REG_MULTI_SZ <br />
- and click OK <br />
- Leave the Multi-String Editor dialog empty and click OK <br />
- Select Edit - Add Value... from the menu <br />
- Fill in the Add Value dialog with <br />
- Value Name: DependOnService <br />
- Data Type: REG_MULTI_SZ <br />
- and click OK <br />
- Type the following list (one per line) in the Multi-String Editor dialog <br />
- Tcpip <br />
- Afd <br />
- and click OK <br />
- </code></p></div>
-
- <p>If you are using COM or DCOM components from a third party
- module, ISAPI, or other add-in scripting technologies such as
- ActiveState Perl, you may also need to add the entry Rpcss to
- the DependOnService list. To avoid exposing the TCP port 135
- when it is unnecessary, Apache does not create that entry upon
- installation. Follow the directions above to find or create the
- DependOnService value, double click that value if it already
- exists, and add the Rpcss entry to the list.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="account" id="account">User Account for Apache Service to Run As (NT/2000)</a></h2>
-
-
-
- <p>When Apache is first installed as a service (e.g. with the
- <code>-i</code> option) it will run as user "System" (the LocalSystem
- account). There should be few issues if all resources for the
- web server reside on the local system, but it has broad
- security privileges to affect the local machine!</p>
-
- <div class="note">LocalSystem is a very privileged account locally, so you
- shouldn't run any shareware applications there. However, it
- has no network privileges and cannot leave the machine via
- any NT-secured mechanism, including file system, named pipes,
- DCOM, or secure RPC.</div>
-
- <p><strong>NEVER grant network privileges to the SYSTEM
- account!</strong> Create a new user account instead, grant the
- appropriate privileges to that user, and use the the "Log On
- As:" option. Select the Start Menu -> Settings -> Control
- Panel -> Services -> apache service ... and click the
- "Startup" button to access this setting.</p>
-
- <div class="note">A service that runs in the context of the LocalSystem account
- inherits the security context of the SCM. It is not
- associated with any logged-on user account and does not have
- credentials (domain name, user name, and password) to be used
- for verification.</div>
-
- <p>The SYSTEM account has no privileges to the network, so
- shared pages or a shared installation of Apache is invisible to
- the service. If you intend to use <em>any</em> network
- resources, the following steps should help:</p>
-
- <ul>
- <li>Select Apache from the Control Panel's Service dialog and
- click Startup.</li>
-
- <li>Verify that the service account is correct. You may wish
- to create an account for your Apache services.</li>
-
- <li>Retype the password and password confirmation.</li>
-
- <li>Go to User Manager for Domains.</li>
-
- <li>Click on Policies from the title bar menu, and select
- User Rights.</li>
-
- <li>Select the option for Advanced User Rights.</li>
-
- <li>
- In the drop-down list, verify that the following rights
- have been granted to the selected account:
-
- <ul>
- <li>Act as part of the operating system</li>
-
- <li>Back up files and directories</li>
-
- <li>Log on as a service</li>
-
- <li>Restore files and directories</li>
- </ul>
- </li>
-
- <li>Confirm that the selected account is a member of the
- Users group.</li>
-
- <li>Confirm the selected account has access to all
- <code>document</code> and <code>script</code>
- directories (minimally read and browse access).</li>
-
- <li>Confirm the selected account has read/write/delete access
- to the Apache <code>logs</code> directory!</li>
- </ul>
-
- <p>If you allow the account to log in as a user, then you can
- log in yourself and test that the account has the privileges to
- execute the scripts, read the web pages, and that you can start
- Apache in a console window. If this works, and you have
- followed the steps above, Apache should execute as a service
- with no problems.</p>
-
- <div class="note"><strong>Error code 2186</strong> is a good indication
- that you need to review the "Log On As" configuration, since
- the server can't access a required network resource.</div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="trouble" id="trouble">Troubleshooting Apache for Windows as a Service</a></h2>
-
-
-
- <p>When starting Apache as a service you may encounter an error
- message from Windows service manager. For example if you try to
- start Apache using the Services applet in Windows Control Panel
- you may get the following message:</p>
-
- <div class="example"><p><code>
- Could not start the apache service on \\COMPUTER <br />
- Error 1067; The process terminated unexpectedly.
- </code></p></div>
-
- <p>You will get this error if there is any problem starting
- Apache. In order to see what is causing the problem you should
- follow the instructions for <a href="windows.html#cmdline">Running Apache for Windows from the
- Command Line</a>.</p>
-
- <p>Also, Apache 1.3.13 now records startup errors in the
- Application Event Log under Windows NT/2000, if Apache is run
- as a service. Run the Event Viewer and select Log ...
- Application to see these events.</p>
-
- <div class="note"><strong>Check the Application Event Log with the Event
- Viewer in case of any problems, even if no error message pops
- up to warn you that an error occured.</strong></div>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="cmdline" id="cmdline">Running Apache for Windows from the Command Line</a></h2>
-
-
-
- <p>For details on controlling Apache service from the command
- line, please refer to <a href="windows.html#cmdline">console
- command line</a> section.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="signal" id="signal">Controlling Apache as a Service</a></h2>
-
-
-
- <p>Multiple instances of Apache can be installed and run as
- services. Signal an installed Apache service to start, restart,
- or shutdown/stop as follows:</p>
-
- <div class="example"><p><code>
- apache -n "service name" -k start <br />
- apache -n "service name" -k restart <br />
- apache -n "service name" -k shutdown <br />
- apache -n "service name" -k stop
- </code></p></div>
-
- <p>For the default "Apache" service, the <code>-n</code> Apache
- option is still required, since the <code>-k</code> commands without
- the <code>-n</code> option are directed at Apache running in a console
- window. The quotes are only required if the service name contains spaces.</p>
-
- <div class="note"><strong>Note the <code>-k stop</code> alias for the
- <code>-k shutdown</code> command was introduced in Apache version
- 1.3.13.</strong> Earlier versions of Apache will only recognize the
- <code>-k shutdown</code> option. Prior to 1.3.3, Apache did not
- recognize <em>any</em> <code>-k</code> options at all!</div>
-
- <p>In addition, you can use the native NT <code>NET</code> command
- to start and stop Apache services as follows:</p>
-
- <div class="example"><p><code>
- NET START "service name" <br />
- NET STOP "service name"
- </code></p></div>
-
- <p>Again, quotes are only required if the service name contains
- spaces.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="win95svc" id="win95svc">HIGHLY EXPERIMENTAL Windows 95/98 Service</a></h2>
-
-
-
- <div class="note"><strong>The service options for Windows 95 and 98 are
- only available with Apache 1.3.13 and later.</strong> Earlier
- versions of Apache only supported Apache in a console window
- for Windows 95/98.</div>
-
- <p>There is some support for Apache on Windows 95/98 to behave
- in a similar manner as a service on Windows NT/2000. It is
- <em>highly experimental</em>, if it works (at all) the Apache
- Sofware Foundation will not attest to its reliability or
- future support. Proceed at your own risk!</p>
-
- <p>Once you have confirmed that Apache runs correctly at the <a href="windows.html#cmdline">Command Prompt</a> you can install,
- control and uninstall it with the same commands as the Windows
- NT/2000 version.</p>
-
- <p>There are, however, significant differences that you should
- note:</p>
-
- <p>Apache will attempt to start and if successful it will run
- in the background. If you run the command</p>
-
- <div class="example"><p><code>
- Apache -n "service name" -k start
- </code></p></div>
-
- <p>via a shortcut on your desktop, for example, then if the
- service starts successfully a console window will flash up but
- immediately disappears. If Apache detects any errors on startup
- such as a incorrect entries in the <code>httpd.conf</code> file,
- then the console window will remain visible. This will display
- an error message which will be useful in tracking down the cause
- of the problem.</p>
-
- <p>Windows 95/98 does not support <code>NET START</code> or
- <code>NET STOP</code> commands so you must use Apache's Service
- Control options at a command prompt. You may wish to set up a
- shortcut for each of these commands so that you can just choose
- it from the start menu or desktop to perform the required action.</p>
-
- <p>Apache and Windows 95/98 offer no support for running the
- Apache service as a specific user with network privileges. In
- fact, Windows 95/98 offers no security on the local machine,
- either. This is the simple reason that the Apache Software
- Foundation never endorses the use of Windows 95/98 as a public
- httpd server. These facilities exist only to assist the user in
- developing web content and learning the Apache server, and
- perhaps as a intranet server on a secured, private network.</p>
-
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/win_service.xml b/docs/manual/platform/win_service.xml
deleted file mode 100644
index f6fced5..0000000
--- a/docs/manual/platform/win_service.xml
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-
-<manualpage>
- <relativepath href=".." />
- <parentdocument href="./">Platform Specific Notes</parentdocument>
-
- <title>Running Apache for Windows as a Service</title>
-
- <summary>
-
- <p>Apache can be run as a service on Windows NT/2000. (There is
- also some HIGHLY EXPERIMENTAL support for similar behavior on
- <a href="#win95svc">Windows 95/98</a>, introduced with Apache
- 1.3.13).</p>
-
- <p>Installing Apache as a service should only be done once you
- can successfully run it in a console window. See <a
- href="windows.html">Using Apache with Microsoft Windows</a>
- before you attempt to install or run Apache as a service.
- Changes to the <code>httpd.conf</code> file should always be
- followed by starting Apache as a console window. If this
- succeeds, the service should succeed.</p>
-
- <note><strong>Prior to version 1.3.13, the configuration was
- <em>not tested</em> prior to performing the
- installation</strong>, and a lack of service dependencies often
- caused the console window to succeed, but the service would
- still fail. See <a href="#service">below</a> if you are having
- problems running a version of Apache prior to 1.3.13 to resolve
- the issue. If you have this problem with version 1.3.13 or
- greater, first try uninstalling (<code>-u</code>) and re-installing
- (<code>-i</code>) the Apache service.</note>
-
- <p>To start Apache as a service, you first need to install it
- as a service. Multiple Apache services can be installed, each
- with a different name and configuration. To install the default
- Apache service named "Apache", run the "Install Apache as
- Service (NT only)" option from the Start menu. Once this is
- done you can start the "Apache" service by opening the Services
- window (in the Control Panel), selecting Apache, then clicking
- on Start. Apache will now be running, hidden in the background.
- You can later stop Apache by clicking on Stop. As an
- alternative to using the Services window, you can start and
- stop the "Apache" service from the command line with</p>
-
- <example>
- NET START APACHE<br />
- NET STOP APACHE
- </example>
-
- <p>See <a href="#signal">Controlling Apache as a Service</a>
- for more information on installing and controlling Apache
- services.</p>
-
- <note><title>Note</title>
- Apache, unlike many other Windows NT/2000 services,
- logs any errors to its own error.log file in the logs folder
- within the Apache server root folder. You will <em>not</em>
- find Apache error details in the Windows NT Event
- Log.</note>
-
- <p>After starting Apache as a service (or if you have trouble
- starting it) you can test it using the same <a
- href="windows.html#cmdline">procedure</a> as for running in a
- console window. Remember to use the command:</p>
-
- <example>
- apache -n "service name"
- </example>
-
- <p>to assure you are using the service's configuration.</p>
-
- </summary>
-
- <section id="service">
-
- <title>Running Apache for Windows as a Service</title>
-
- <note><strong>The <code>-n</code> option to specify a service
- name is only available with Apache 1.3.7 and later.</strong>
- Earlier versions of Apache only support the default service name
- "Apache".</note>
-
- <p>You can install Apache as a Windows NT service as
- follows:</p>
-
- <example>
- apache -i -n "service name"
- </example>
-
- <p>To install a service to use a particular configuration,
- specify the configuration file when the service is
- installed:</p>
-
- <example>
- apache -i -n "service name" -f "\my server\conf\my.conf"
- </example>
-
- <p>To remove an Apache service, use:</p>
-
- <example>
- apache -u -n "service name"
- </example>
-
- <p>The default "service name", if one is not specified, is
- "Apache".</p>
-
- <p>Once a service is installed, you can use the <code>-n</code>
- option, in conjunction with other options, to refer to a
- service's configuration file. For example:</p>
-
- <p>To test a service's configuration file:</p>
-
- <example>
- apache -n "service name" -t
- </example>
-
- <p>To start a console Apache using a service's configuration
- file:</p>
-
- <example>
- apache -n "service name"
- </example>
-
- </section>
-
- <section id="depends">
-
- <title>Important Note on service dependencies:</title>
-
- <p>Prior to Apache release 1.3.13, the dependencies required to
- successfully start an installed service were not configured.
- After installing a service using earlier versions of Apache,
- you must follow these steps:</p>
-
- <example>
- Run regedt32 <br />
- Select Window - "HKEY_LOCAL_MACHINE on Local Machine" from the menu <br />
- Double-click to open the SYSTEM, then the CurrentControlSet keys <br />
- Scroll down and click on the Apache servicename <br />
- Select Edit - Add Value... from the menu <br />
- Fill in the Add Value dialog with <br />
-     Value Name: DependOnGroup <br />
-     Data Type: REG_MULTI_SZ <br />
-     and click OK <br />
- Leave the Multi-String Editor dialog empty and click OK <br />
- Select Edit - Add Value... from the menu <br />
- Fill in the Add Value dialog with <br />
-     Value Name: DependOnService <br />
-     Data Type: REG_MULTI_SZ <br />
-     and click OK <br />
- Type the following list (one per line) in the Multi-String Editor dialog <br />
-     Tcpip <br />
-     Afd <br />
-     and click OK <br />
- </example>
-
- <p>If you are using COM or DCOM components from a third party
- module, ISAPI, or other add-in scripting technologies such as
- ActiveState Perl, you may also need to add the entry Rpcss to
- the DependOnService list. To avoid exposing the TCP port 135
- when it is unnecessary, Apache does not create that entry upon
- installation. Follow the directions above to find or create the
- DependOnService value, double click that value if it already
- exists, and add the Rpcss entry to the list.</p>
-
- </section>
-
- <section id="account">
-
- <title>User Account for Apache Service to Run As (NT/2000)</title>
-
- <p>When Apache is first installed as a service (e.g. with the
- <code>-i</code> option) it will run as user "System" (the LocalSystem
- account). There should be few issues if all resources for the
- web server reside on the local system, but it has broad
- security privileges to affect the local machine!</p>
-
- <note>LocalSystem is a very privileged account locally, so you
- shouldn't run any shareware applications there. However, it
- has no network privileges and cannot leave the machine via
- any NT-secured mechanism, including file system, named pipes,
- DCOM, or secure RPC.</note>
-
- <p><strong>NEVER grant network privileges to the SYSTEM
- account!</strong> Create a new user account instead, grant the
- appropriate privileges to that user, and use the the "Log On
- As:" option. Select the Start Menu -> Settings -> Control
- Panel -> Services -> apache service ... and click the
- "Startup" button to access this setting.</p>
-
- <note>A service that runs in the context of the LocalSystem account
- inherits the security context of the SCM. It is not
- associated with any logged-on user account and does not have
- credentials (domain name, user name, and password) to be used
- for verification.</note>
-
- <p>The SYSTEM account has no privileges to the network, so
- shared pages or a shared installation of Apache is invisible to
- the service. If you intend to use <em>any</em> network
- resources, the following steps should help:</p>
-
- <ul>
- <li>Select Apache from the Control Panel's Service dialog and
- click Startup.</li>
-
- <li>Verify that the service account is correct. You may wish
- to create an account for your Apache services.</li>
-
- <li>Retype the password and password confirmation.</li>
-
- <li>Go to User Manager for Domains.</li>
-
- <li>Click on Policies from the title bar menu, and select
- User Rights.</li>
-
- <li>Select the option for Advanced User Rights.</li>
-
- <li>
- In the drop-down list, verify that the following rights
- have been granted to the selected account:
-
- <ul>
- <li>Act as part of the operating system</li>
-
- <li>Back up files and directories</li>
-
- <li>Log on as a service</li>
-
- <li>Restore files and directories</li>
- </ul>
- </li>
-
- <li>Confirm that the selected account is a member of the
- Users group.</li>
-
- <li>Confirm the selected account has access to all
- <code>document</code> and <code>script</code>
- directories (minimally read and browse access).</li>
-
- <li>Confirm the selected account has read/write/delete access
- to the Apache <code>logs</code> directory!</li>
- </ul>
-
- <p>If you allow the account to log in as a user, then you can
- log in yourself and test that the account has the privileges to
- execute the scripts, read the web pages, and that you can start
- Apache in a console window. If this works, and you have
- followed the steps above, Apache should execute as a service
- with no problems.</p>
-
- <note><strong>Error code 2186</strong> is a good indication
- that you need to review the "Log On As" configuration, since
- the server can't access a required network resource.</note>
-
- </section>
-
- <section id="trouble">
-
- <title>Troubleshooting Apache for Windows as a Service</title>
-
- <p>When starting Apache as a service you may encounter an error
- message from Windows service manager. For example if you try to
- start Apache using the Services applet in Windows Control Panel
- you may get the following message:</p>
-
- <example>
- Could not start the apache service on \\COMPUTER <br />
- Error 1067; The process terminated unexpectedly.
- </example>
-
- <p>You will get this error if there is any problem starting
- Apache. In order to see what is causing the problem you should
- follow the instructions for <a
- href="windows.html#cmdline">Running Apache for Windows from the
- Command Line</a>.</p>
-
- <p>Also, Apache 1.3.13 now records startup errors in the
- Application Event Log under Windows NT/2000, if Apache is run
- as a service. Run the Event Viewer and select Log ...
- Application to see these events.</p>
-
- <note><strong>Check the Application Event Log with the Event
- Viewer in case of any problems, even if no error message pops
- up to warn you that an error occured.</strong></note>
-
- </section>
-
- <section id="cmdline">
-
- <title>Running Apache for Windows from the Command Line</title>
-
- <p>For details on controlling Apache service from the command
- line, please refer to <a href="windows.html#cmdline">console
- command line</a> section.</p>
-
- </section>
-
- <section id="signal">
-
- <title>Controlling Apache as a Service</title>
-
- <p>Multiple instances of Apache can be installed and run as
- services. Signal an installed Apache service to start, restart,
- or shutdown/stop as follows:</p>
-
- <example>
- apache -n "service name" -k start <br />
- apache -n "service name" -k restart <br />
- apache -n "service name" -k shutdown <br />
- apache -n "service name" -k stop
- </example>
-
- <p>For the default "Apache" service, the <code>-n</code> Apache
- option is still required, since the <code>-k</code> commands without
- the <code>-n</code> option are directed at Apache running in a console
- window. The quotes are only required if the service name contains spaces.</p>
-
- <note><strong>Note the <code>-k stop</code> alias for the
- <code>-k shutdown</code> command was introduced in Apache version
- 1.3.13.</strong> Earlier versions of Apache will only recognize the
- <code>-k shutdown</code> option. Prior to 1.3.3, Apache did not
- recognize <em>any</em> <code>-k</code> options at all!</note>
-
- <p>In addition, you can use the native NT <code>NET</code> command
- to start and stop Apache services as follows:</p>
-
- <example>
- NET START "service name" <br />
- NET STOP "service name"
- </example>
-
- <p>Again, quotes are only required if the service name contains
- spaces.</p>
-
- </section>
-
- <section id="win95svc">
-
- <title>HIGHLY EXPERIMENTAL Windows 95/98 Service</title>
-
- <note><strong>The service options for Windows 95 and 98 are
- only available with Apache 1.3.13 and later.</strong> Earlier
- versions of Apache only supported Apache in a console window
- for Windows 95/98.</note>
-
- <p>There is some support for Apache on Windows 95/98 to behave
- in a similar manner as a service on Windows NT/2000. It is
- <em>highly experimental</em>, if it works (at all) the Apache
- Sofware Foundation will not attest to its reliability or
- future support. Proceed at your own risk!</p>
-
- <p>Once you have confirmed that Apache runs correctly at the <a
- href="windows.html#cmdline">Command Prompt</a> you can install,
- control and uninstall it with the same commands as the Windows
- NT/2000 version.</p>
-
- <p>There are, however, significant differences that you should
- note:</p>
-
- <p>Apache will attempt to start and if successful it will run
- in the background. If you run the command</p>
-
- <example>
- Apache -n "service name" -k start
- </example>
-
- <p>via a shortcut on your desktop, for example, then if the
- service starts successfully a console window will flash up but
- immediately disappears. If Apache detects any errors on startup
- such as a incorrect entries in the <code>httpd.conf</code> file,
- then the console window will remain visible. This will display
- an error message which will be useful in tracking down the cause
- of the problem.</p>
-
- <p>Windows 95/98 does not support <code>NET START</code> or
- <code>NET STOP</code> commands so you must use Apache's Service
- Control options at a command prompt. You may wish to set up a
- shortcut for each of these commands so that you can just choose
- it from the start menu or desktop to perform the required action.</p>
-
- <p>Apache and Windows 95/98 offer no support for running the
- Apache service as a specific user with network privileges. In
- fact, Windows 95/98 offers no security on the local machine,
- either. This is the simple reason that the Apache Software
- Foundation never endorses the use of Windows 95/98 as a public
- httpd server. These facilities exist only to assist the user in
- developing web content and learning the Apache server, and
- perhaps as a intranet server on a secured, private network.</p>
-
- </section>
-
-</manualpage>
-
diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index dfbeb4e..21c1821 100644
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -4,568 +4,538 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Using Apache with Microsoft Windows - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Using Apache with Microsoft Windows</h1>
+ -->
+<title>Using Apache with Microsoft Windows - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Platform Specific Notes</a></div><div id="page-content"><div id="preamble"><h1>Using Apache with Microsoft Windows</h1>
<p>This document explains how to install, configure and run
Apache 2.0 under Microsoft Windows. If you find any bugs, or
- wish to contribute in other ways, please use our <a href="http://httpd.apache.org/bug_report.html">bug reporting page.</a></p>
+ wish to contribute in other ways, please use our <a href="http://httpd.apache.org/bug_report.html">bug reporting
+ page</a>.</p>
- <p>Most of this document assumes that you are installing
- Windows from a binary distribution. If you want to compile
- Apache yourself (possibly to help with development, or to track
- down bugs), see <a href="win_compiling.html">Compiling Apache
- for Microsoft Windows</a>.</p>
+ <p>This document assumes that you are installing a binary
+ distribution of Apache. If you want to compile Apache yourself
+ (possibly to help with development or tracking down bugs),
+ see <a href="win_compiling.html">Compiling Apache for Microsoft
+ Windows</a>.</p>
- <p><strong>Abbreviations and their meanings used in this
- document include:</strong></p>
+ <p><strong>Because of the current versioning policies on Microsoft
+ Windows operating system families, this document assumes the
+ following:</strong></p>
<ul>
<li><strong>Windows NT:</strong> This means all versions of
- Microsoft Windows that are based on the NT kernel,
- including Windows NT, Windows 2000, Windows XP and Windows
- .NET Server 2003 or later.</li>
- <li><strong>Windows 9x:</strong> This means all versions of
- Microsoft Windows targeted at home use, including Windows 95,
- Windows 98 and Windows ME.</li>
+ Windows that are based on the Windows NT kernel. Includes Windows
+ NT, Windows 2000, Windows XP and Windows .Net Server 2003.</li>
+ <li><strong>Windows 9x:</strong> This means older,
+ consumer-oriented versions of Windows. Includes Windows 95 (also
+ OSR2), Windows 98 and Windows ME.</li>
</ul>
- <p><strong>At this time, support for Windows 9x is
- incomplete. Apache 2.0 is not expected to work on those
- platforms at this time.</strong> If you are interested in
- helping with that effort, please see the developer's site for
- information on <a href="http://dev.apache.org/">how to get
- involved</a>. Support will likely be provided at some point in
- the future, and patches to allow Apache to work on 9x are
- welcome!</p>
-
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#req">Requirements</a></li><li><img alt="" src="../images/down.gif" /> <a href="#down">Downloading Apache for Windows</a></li><li><img alt="" src="../images/down.gif" /> <a href="#inst">Installing Apache for Windows</a></li><li><img alt="" src="../images/down.gif" /> <a href="#run">Running Apache for Windows</a></li><li><img alt="" src="../images/down.gif" /> <a href="#use">Configuring Apache for Windows</a></li><li><img alt="" src="../images/down.gif" /> <a href="#service">Running Apache for Windows as a Service</a></li><li><img alt="" src="../images/down.gif" /> <a href="#cmdline">Running Apache for Windows from the Command Line</a></li><li><img alt="" src="../images/down.gif" /> <a href="#signalsrv">Signalling Apache when running as a Service</a></li><li><img alt="" src="../images/down.gif" /> <a href="#signal">Signalling Apache when running as a console application</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="req" id="req">Requirements</a></h2>
-
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#req">Operating System Requirements</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#down">Downloading Apache for Windows</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#inst">Installing Apache for Windows</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cust">Customizing Apache for Windows</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#winsvc">Running Apache as a Service</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#wincons">Running Apache as a Console Application</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#test">Testing the Installation</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="req" id="req">Operating System Requirements</a></h2>
- <p>Apache 2.0 is designed to run on Windows NT 4.0 and Windows
- 2000. The binary installer will only work with the x86 family
- of processors, such as Intel's. Apache may also run on Windows
- 9x, but it is not tested, and is never recommended for production
- servers. In all cases TCP/IP networking must be installed.</p>
+ <p>The primary Windows platform for running Apache 2.0 is Windows
+ NT. The binary installer only works with the x86 family of
+ processors, such as Intel and AMD processors. Running Apache on
+ Windows 9x is not thoroughly tested, and it is never recommended on
+ production systems.
+ </p>
- <p>If running on Windows 95, the "Winsock2" upgrade MUST BE
- INSTALLED. "Winsock2" for Windows 95 is available <a href="http://www.microsoft.com/windows95/downloads/">here</a>.</p>
+ <p>On all operating systems, TCP/IP networking must be installed
+ and working. If running on Windows 95, the Winsock 2 upgrade must
+ be installed. Winsock 2 for Windows 95 can be downloaded from <a href="http://www.microsoft.com/windows95/downloads/contents/WUAdminTools/S_WUNetworkingTools/W95Sockets2/Default.asp">here</a>.
+ </p>
- <p>If running on NT 4.0, installing Service Pack 6 is
+ <p>On Windows NT 4.0, installing Service Pack 6 is strongly
recommended, as Service Pack 4 created known issues with TCP/IP
- and WinSock integrity that were resolved in later Service
- Packs.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="down" id="down">Downloading Apache for Windows</a></h2>
-
+ and Winsock integrity that were resolved in later Service Packs.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="down" id="down">Downloading Apache for Windows</a></h2>
- <p>Information on the latest version of Apache can be found on
- the Apache web server at <a href="http://httpd.apache.org/">http://httpd.apache.org/</a>.
- This will list the current release, any more recent alpha or
- beta-test releases, together with details of mirror web and
- anonymous ftp sites.</p>
+ <p>Information on the latest versions of Apache can be found on the
+ web site of the Apache web server at
+ <a href="http://httpd.apache.org/download.cgi">http://httpd.apache.org/download.cgi</a>.
+ There you will find the current release, as well as more recent alpha
+ or beta test versions, and a list of HTTP and FTP mirrors from which
+ you can download the Apache web server. Please use a mirror near to
+ you for a fast and reliable download.</p>
- <p>You should download the version of Apache for Windows with
- the <code>.msi</code> extension. This is a single Microsoft
- Installer file containing Apache, ready to install and run.
- There is a seperate <code>.zip</code> file containing <em>only</em>
- the source code, to compile Apache yourself with the Microsoft
- Visual C++ (Visual Studio) tools.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="inst" id="inst">Installing Apache for Windows</a></h2>
-
+ <p>For Windows installations you should download the version of
+ Apache for Windows with the <code>.msi</code> extension. This is a
+ single Microsoft Installer file, which contains a ready-to-run
+ version of Apache. There is a separate <code>.zip</code> file,
+ which contains only the source code. You can compile Apache
+ yourself with the Microsoft Visual C++ (Visual Studio) tools.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="inst" id="inst">Installing Apache for Windows</a></h2>
- <p>Run the Apache <code>.msi</code> file you downloaded above.
- This will ask for:</p>
+ <p>You need Microsoft Installer 1.2 or above for the installation
+ to work. On Windows 9x you can update your Microsoft Installer to
+ version 2.0 <a href="http://www.microsoft.com/downloads/release.asp?ReleaseID=32831">here</a>
+ and on Windows NT 4.0 and 2000 the version 2.0 update can be found
+ <a href="http://www.microsoft.com/downloads/release.asp?ReleaseID=32832">here</a>.
+ Windows XP does not need this update.</p>
- <ul>
- <li>the directory to install Apache into (the default is
- <code>\Program Files\Apache Group\Apache</code> although you
- can change this to any other directory)</li>
+ <p>Note that you cannot install two versions of Apache 2.0 on the
+ same computer with the binary installer. You can, however, install
+ a version of the 1.3 series <strong>and</strong> a version of the
+ 2.0 series on the same computer without problems. If you need to
+ have two different 2.0 versions on the same computer, you have to
+ <a href="win_compiling.html">compile and install Apache from the
+ source</a>.</p>
- <li>the start menu name (default is "Apache Web Server")</li>
+ <p>Run the Apache <code>.msi</code> file you downloaded above. The
+ installation will ask you for these things:</p>
- <li>the installation type. The "Typical" option installs
- everything except the source code. The "Minimum" option does
- not install the manuals or source code. Choose the "Custom"
- install if you want to install the source code.</li>
- </ul>
+ <ol>
+ <li><p><strong>Network Domain.</strong> Enter the DNS domain in which
+ your server is or will be registered in. For example, if your
+ server's full DNS name is <code>server.mydomain.net</code>, you would
+ type <code>mydomain.net</code> here.</p></li>
- <p>During the installation, Apache will configure the files in
- the <code>conf</code> directory for your chosen installation
- directory. However if any of the files in this directory
- already exist they will <em>not</em> be overwritten.
- Instead the new copy of the corresponding file will be left
- with the extension <code>.default</code>. So, for example, if
- <code>conf\httpd.conf</code> already exists it will not be
- altered, but the version which would have been installed will
- be left in <code>conf\httpd.conf.default</code>. After the
- installation has finished you should manually check to see what is
- in new in the <code>.default</code> file, and if necessary
- update your existing configuration files.</p>
+ <li><p><strong>Server Name.</strong> Your server's full DNS name.
+ From the example above, you would type <code>server.mydomain.net</code>
+ here.</p></li>
- <p>Also, if you already have a file called
- <code>htdocs\index.html</code> then it will not be overwritten
- (no <code>index.html.default</code> file will be installed
- either). This should mean it a safe to install Apache over an
- existing installation (but you will have to stop the existing
- server running before doing the installation, then start the
- new one after the installation is finished).</p>
+ <li><p><strong>Administrator's Email Address.</strong> Enter the
+ server administrator's or webmaster's email address here. This
+ address will be displayed along with error messages to the client
+ by default.</p></li>
- <p>After installing Apache, you should edit the configuration
- files in the <code>conf</code> directory as required. These
- files will be configured during the install ready for Apache to
- be run from the directory where it was installed, with the
- documents served from the subdirectory <code>htdocs</code>.
- There are lots of other options which should be set before you
- start really using Apache. However to get started quickly the
- files should work as installed.</p>
+ <li><p><strong>For whom to install Apache</strong> Select <code>for
+ All Users, on Port 80, as a Service - Recommended</code> if you'd
+ like your new Apache to listen at port 80 for incoming traffic.
+ It will run as a service (that is, Apache will run even if no one
+ is logged in on the server at the moment) Select <code>only for
+ the Current User, on Port 8080, when started Manually</code> if
+ you'd like to install Apache for your personal experimenting or
+ if you already have another WWW server running on port 80.</p></li>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="run" id="run">Running Apache for Windows</a></h2>
+ <li><p><strong>The installation type.</strong> Select <code>Typical</code>
+ for everything except the source code and libraries for module
+ development. With <code>Custom</code> you can specify what to
+ install. A full install will require about 13 megabytes of free
+ disk space. This does <em>not</em> include the size of your web
+ site(s).</p></li>
+ <li><p><strong>Where to install.</strong> The default path is
+ <code>C:\Program Files\Apache Group</code> under which a directory
+ called <code>Apache2</code> will be created by default.</p></li>
+ </ol>
+
+ <p>During the installation, Apache will configure the files in the
+ <code>conf</code> subdirectory to reflect the chosen installation
+ directory. However, if any of the configuration files in this
+ directory already exist, they will not be overwritten. Instead, the
+ new copy of the corresponding file will be left with the extension
+ <code>.default</code>. So, for example, if <code>conf\httpd.conf</code>
+ already exists, it will be renamed as <code>conf\httpd.conf.default</code>.
+ After the installation you should manually check to see what new
+ settings are in the <code>.default</code> file, and if necessary,
+ update your existing configuration file.</p>
+
+ <p>Also, if you already have a file called <code>htdocs\index.html</code>,
+ it will not be overwritten (and no <code>index.html.default</code>
+ will be installed either). This means it should be safe to install
+ Apache over an existing installation, although you would have to
+ stop the existing running server before doing the installation, and
+ then start the new one after the installation is finished.</p>
+
+ <p>After installing Apache, you must edit the configuration files
+ in the <code>conf</code> subdirectory as required. These files
+ will be configured during the installation so that Apache is ready
+ to be run from the directory it was installed into, with the
+ documents server from the subdirectory <code>htdocs</code>. There
+ are lots of other options which you should set before you really
+ start using Apache. However, to get started quickly, the files
+ should work as installed.</p>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cust" id="cust">Customizing Apache for Windows</a></h2>
- <p>There are two ways you can run Apache:</p>
-
- <ul>
- <li><p>As a <a href="win_service.html#service">"service"</a>
- (available on Windows NT, or a pseudo-service on Windows
- 9x). This is the best option if you want Apache to
- automatically start when you machine boots, and to keep
- Apache running when you log-off.</p></li>
-
- <li><p>From a <a href="#cmdline">console window</a>. This MUST
- be used by any administrator to test before attempting to
- run as a service.</p></li>
- </ul>
-
- <p>To run Apache from a console window, select the "Start
- Apache as console app" option from the Start menu (in Apache
- 1.3.4 and earlier, this option was called "Apache Server").
- This will open a console window and start Apache running inside
- it. The window will remain active until you stop Apache. To
- stop Apache running, either select the "Shutdown Apache console
- app" icon option from the Start menu (this is not available in
- Apache 1.3.4 or earlier), or see <a href="#signal">Signalling
- Console Apache when Running</a> for how to control Apache from
- the command line.</p>
-
- <p>If the Apache console window closes immediately (or
- unexpectedly), run the "Command Prompt" from the Start Menu -
- Programs list. Change to the folder to which you installed
- Apache, type the command apache, and read the error message.
- Then change to the <code>logs</code> folder, and review the
- <code>error.log</code> file for configuration mistakes.
- If you accepted the defaults when you installed Apache,
- the commands would be:</p>
-
- <div class="example"><p><code>
- c: <br />
- cd "\program files\apache group\apache" <br />
- apache <br />
- Wait for Apache to exit, or press Ctrl+C <br />
- cd logs <br />
- more <error.log
- </code></p></div>
-
- <p><strong>Complete the steps above before you proceed
- to attempt to start Apache as a Windows NT service!</strong></p>
-
- <p>To start Apache as a service, you first need to install it
- as a service. Multiple Apache services can be installed, each
- with a different name and configuration. To install the default
- Apache service named "Apache", run the "Install Apache as
- Service (NT only)" option from the Start menu. Once this is
- done you can start the "Apache" service by opening the Services
- window (in the Control Panel), selecting Apache, then clicking
- on Start. Apache will now be running in the background. You can
- later stop Apache by clicking on Stop. As an alternative to
- using the Services window, you can start and stop the "Apache"
- service from the control line with:</p>
-
- <div class="example"><p><code>
- NET START APACHE <br />
- NET STOP APACHE
- </code></p></div>
-
- <p>See <a href="#signalsrv">Signalling Service Apache when
- Running</a> for more information on installing and controlling
- Apache services.</p>
-
- <div class="note"><strong>Apache, unlike many other Windows NT services,
- logs any errors to its own <code>error.log</code> file in the
- <code>logs</code> folder within the Apache server root folder.
- You will <em>not</em> find Apache error details in the Windows
- Event Log.</strong></div>
-
- <p>After starting Apache running (either in a console window or
- as a service) it will be listening on port 80 (unless you
- changed the <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> directive in the configuration
- files). To connect to the server and access the default page,
- launch a browser and enter this URL:</p>
-
- <div class="example"><p><code>
- http://localhost/
- </code></p></div>
-
- <p>This should respond with a welcome page, and a link to the
- Apache manual. If nothing happens or you get an error, look in
- the <code>error_log</code> file in the <code>logs</code>
- directory. If your host isn't connected to the net, you may
- have to use this URL:</p>
-
- <div class="example"><p><code>
- http://127.0.0.1/
- </code></p></div>
-
- <p>Once your basic installation is working, you should
- configure it properly by editing the files in the
- <code>conf</code> directory. Again, if you change the
- configuration of the Windows NT service for Apache, first
- attempt to start it from the command line to assure that the
- service starts with no errors.</p>
-
- <p>Because Apache <em>CANNOT</em> share the same port with
- another TCP/IP application, you may need to stop or uninstall
- certain services first. These include (but are not limited to)
- other web servers, and firewall products such as BlackIce. If
- you can only start Apache with these services disabled,
- reconfigure either Apache or the other product so that they do
- not listen on the same TCP/IP ports.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="use" id="use">Configuring Apache for Windows</a></h2>
-
-
-
- <p>Apache is configured by files in the <code>conf</code>
- directory. These are the same as files used to configure the
- Unix version, but there are a few different directives for
- Apache on Windows. See the <a href="../">Apache
- documentation</a> for all the available directives.</p>
+ <p>Apache is configured by the files in the <code>conf</code>
+ subdirectory. These are the same files used to configure the Unix
+ version, but there are a few different directives for Apache on
+ Windows. See the <a href="../mod/directives.html">directive index</a>
+ for all the available directives.</p>
<p>The main differences in Apache for Windows are:</p>
-
<ul>
- <li>
- <p>Because Apache for Windows is multithreaded, it does not
- use a separate process for each request, as Apache does
- with Unix. Instead there are usually only two Apache
- processes running: a parent process, and a child which
- handles the requests. Within the child each request is
- handled by a separate thread.</p>
+ <li><p>Because Apache for Windows is multithreaded, it does not
+ use a separate process for each request, as Apache does on Unix.
+ Instead there are usually only two Apache processes running: a
+ parent process, and a child which handles the requests. Within
+ the child process each request is handled by a separate thread.
+ </p>
- <p>So the "process"-management directives are
- different:</p>
+ <p>The process management directives are also different:</p>
- <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
- - Like the Unix directive, this controls how many requests
- a process will serve before exiting. However, unlike Unix,
- a process serves all the requests at once, not just one, so
- if this is set, it is recommended that a very high number
- is used. The recommended default, <code>MaxRequestsPerChild
- 0</code>, does not cause the process to ever exit.</p>
-
- <div class="warning"><strong>Warning: The server configuration
- file is reread when the new child process is started. If you
- have modified <code>httpd.conf</code>, the new child may not
- start or you may receive unexpected results.</strong></div>
+ <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>:
+ Like the Unix directive, this controls how many requests a single
+ child process will serve before exiting. However, unlike on Unix,
+ a single process serves all the requests at once, not just one.
+ If this is set, it is recommended that a very high number is
+ used. The recommended default, <code>MaxRequestsPerChild 0</code>,
+ causes the child process to never exit.</p>
- <p><code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code>
- - This directive is new, and tells the server how many
- threads it should use. This is the maximum number of
- connections the server can handle at once; be sure and set
- this number high enough for your site if you get a lot of
- hits. The recommended default is <code>ThreadsPerChild
- 50</code>.</p>
- </li>
+ <div class="warning"><strong>Warning: The server configuration
+ file is reread when a new child process is started. If you have
+ modified <code>httpd.conf</code>, the new child may not start or
+ you may receive unexpected results.</strong></div>
- <li>
- <p>The directives that accept filenames as arguments now
- must use Windows filenames instead of Unix ones. However,
- because Apache uses Unix-style names internally, you must
- use forward slashes, not backslashes. Drive letters can be
- used; if omitted, the drive with the Apache executable will
- be assumed.</p>
- </li>
+ <p><code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code>:
+ This directive is new. It tells the server how many threads it
+ should use. This is the maximum number of connections the server
+ can handle at once, so be sure to set this number high enough for
+ your site if you get a lot of hits. The recommended default is
+ <code>ThreadsPerChild 50</code>.</p></li>
- <li>
- <p>Apache for Windows contains the ability to load modules
- at runtime, without recompiling the server. If Apache is
- compiled normally, it will install a number of optional
- modules in the <code>\Apache\modules</code> directory. To
- activate these, or other modules, the new <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
- directive must be used. For example, to active the status
- module, use the following (in addition to the
- status-activating directives in
- <code>access.conf</code>):</p>
+ <li><p>The directives that accept filenames as arguments must use
+ Windows filenames instead of Unix ones. However, because Apache
+ uses Unix-style names internally, you must use forward slashes,
+ not backslashes. Drive letters can be used; if omitted, the drive
+ with the Apache executable will be assumed.</p></li>
- <div class="example"><p><code>
- LoadModule status_module modules/mod_status.so
- </code></p></div>
+ <li><p>Apache for Windows contains the ability to load modules at
+ runtime, without recompiling the server. If Apache is compiled
+ normally, it will install a number of optional modules in the
+ <code>\Apache2\modules</code> directory. To activate these or
+ other modules, the new <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
+ directive must be used. For example, to activate the status
+ module, use the following (in addition to the status-activating
+ directives in <code>access.conf</code>):</p>
- <p>Information on <a href="../mod/mod_so.html#creating">creating loadable
- modules</a> is also available.</p>
- </li>
+ <div class="example"><p><code>
+ LoadModule status_module modules/mod_status.so
+ </code></p></div>
- <li>
- <p>Apache can also load ISAPI Extensions (<em>i.e.</em>,
- Internet Server Applications), such as those used by
- Microsoft's IIS, and other Windows servers. <a href="../mod/mod_isapi.html">More information is
- available.</a> Note that Apache <em>CANNOT</em> load ISAPI
- Filters.</p>
- </li>
+ <p>Information on <a href="../mod/mod_so.html#creating">creating
+ loadable modules</a> is also available.</p></li>
- <li>
- <p>When running CGI scripts, the method Apache uses to find
- the interpreter for the script is configurable using the
- <code class="directive"><a href="../mod/core.html#scriptinterpretersource">ScriptInterpreterSource</a></code>
- directive.</p>
- </li>
+ <li><p>Apache can also load ISAPI (Internet Server Application
+ Programming Interface) extensions (i.e. internet server
+ applications), such as those used by Microsoft IIS and other
+ Windows servers. <a href="../mod/mod_isapi.html">More information
+ is available</a>. Note that Apache <strong>cannot</strong> load
+ ISAPI Filters.</p></li>
- <li>
- <p>Since it is often difficult to manage files with names
- like <code>.htaccess</code> under windows, you may find it
- useful to change the name of this configuration file using
- the <code class="directive"><a href="../mod/core.html#accessfilename">AccessFilename</a></code>
- directive.</p>
- </li>
+ <li><p>When running CGI scripts, the method Apache uses to find
+ the interpreter for the script is configurable using the
+ <code class="directive"><a href="../mod/core.html#scriptinterpretersource">ScriptInterpreterSource</a></code>
+ directive.</p></li>
+
+ <li><p>Since it is often difficult to manage files with names
+ like <code>.htaccess</code> in Windows, you may find it useful to
+ change the name of this per-directory configuration file using
+ the <code class="directive"><a href="../mod/core.html#accessfilename">AccessFilename</a></code>
+ directive.</p></li>
+
+ <li><p>Any errors during Apache startup are logged into the
+ Windows event log when running on Windows NT. This mechanism
+ acts as a backup for those situations where Apache cannot even
+ access the normally used <code>error.log</code> file. You can
+ view the Windows event log by using the Event Viewer application
+ on Windows NT 4.0, and the Event Viewer MMC snap-in on newer
+ versions of Windows.</p>
+
+ <div class="note"><strong>Note that there is no startup error logging on
+ Windows 9x because no Windows event log exists on those operating
+ systems.</strong></div></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="service" id="service">Running Apache for Windows as a Service</a></h2>
-
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="winsvc" id="winsvc">Running Apache as a Service</a></h2>
- <div class="note"><strong>The <code>-n</code> option to specify a service name
- is only available with Apache 1.3.7 and later. Earlier versions of
- Apache only support the default service name
- "Apache".</strong></div>
+ <p>Apache can be run as a service on Windows NT. There is some
+ highly experimental support for similar behavior on Windows 9x.</p>
- <p>You can install Apache as a Windows NT service as
- follows:</p>
+ <p>You can install Apache as a service automatically during the
+ installation. If you chose to install for all users, the
+ installation will create an Apache service for you. If you specify
+ to install for yourself only, you can manually register Apache as a
+ service after the installation. You have to be a member of the
+ Administrators group for the service installation to succeed.</p>
+
+ <p>Apache comes with a utility called the Apache Service Monitor.
+ With it you can see and manage the state of all installed Apache
+ services on any machine on your network. To be able to manage an
+ Apache service with the monitor, you have to first install the
+ service (either automatically via the installation or manually).
+ </p>
+
+ <p>You can install Apache as a Windows NT service as follows from
+ the command prompt at the Apache <code>bin</code> subdirectory:</p>
<div class="example"><p><code>
- apache -k install -n "service name"
+ apache -k install
</code></p></div>
- <p>To install a service to use a particular configuration,
- specify the configuration file when the service is
- installed:</p>
+ <p>If you need to specify the name of the service you want to
+ install, use the following command. You have to do this if you
+ have several different service installations of Apache on your
+ computer.</p>
<div class="example"><p><code>
- apache -k install -n "service name" -f "\my server\conf\my.conf"
+ apache -k install -n "MyServiceName"
</code></p></div>
- <p>To remove an Apache service, use</p>
+ <p>If you need to have specifically named configuration files for
+ different services, you must use this:</p>
<div class="example"><p><code>
- apache -k uninstall -n "service name"
+ apache -k install -n "MyServiceName" -f "c:\files\my.conf"
</code></p></div>
- <p>The default "service name", if one is not specified, is
- "Apache".</p>
+ <p>If you use the first command without any special parameters except
+ <code>-k install</code>, the service will be called <code>Apache2</code>
+ and the configuration will be assumed to be <code>conf\httpd.conf</code>.
+ </p>
- <p>Once a service is installed, you can use the <code>-n</code>
- option, in conjunction with other options, to refer to a
- service's configuration file. For example:</p>
-
- <p>To test a service's configuration file:</p>
+ <p>Removing an Apache service is easy. Just use:</p>
<div class="example"><p><code>
- apache -n "service name" -t
+ apache -k uninstall
</code></p></div>
- <p>To start a console Apache using a service's configuration
- file:</p>
+ <p>The specific Apache service to be uninstalled can be specified by using:</p>
<div class="example"><p><code>
- apache -n "service name"
+ apache -k uninstall -n "MyServiceName"
</code></p></div>
- <p><strong>Important Note on service dependencies:</strong></p>
-
- <p>Prior to Apache release 1.3.13, the dependencies required to
- successfully start an installed service were not configured.
- After installing a service using earlier versions of Apache,
- you must follow these steps:</p>
+ <p>Normal starting, restarting and shutting down of an Apache
+ service is usually done via the Apache Service Monitor, by using
+ commands like <code>NET START Apache2</code> and <code>NET STOP
+ Apache2</code> or via normal Windows service management. Before
+ starting Apache as a service by any means, you should test the
+ service's configuration file by using:</p>
<div class="example"><p><code>
- Run regedt32 <br />
- Select Window - "HKEY_LOCAL_MACHINE on Local Machine" from the menu <br />
- Double-click to open the SYSTEM, then the CurrentControlSet keys <br />
- Scroll down and click on the Apache servicename <br />
- Select Edit - Add Value... from the menu <br />
- Fill in the Add Value dialog with <br />
- Value Name: DependOnGroup <br />
- Data Type: REG_MULTI_SZ <br />
- and click OK <br />
- Leave the Multi-String Editor dialog empty and click OK <br />
- Select Edit - Add Value... from the menu <br />
- Fill in the Add Value dialog with <br />
- Value Name: DependOnService <br />
- Data Type: REG_MULTI_SZ <br />
- and click OK <br />
- Type the following list (one per line) in the Multi-String Editor dialog <br />
- Tcpip <br />
- Afd <br />
- and click OK
+ apache -n "MyServiceName" -t
</code></p></div>
- <p>If you are using COM or DCOM components from a third party
- module, ISAPI, or other add-in scripting technologies such as
- ActiveState Perl, you may also need to add the entry Rpcss to
- the DependOnService list. To avoid exposing the TCP port 135
- when it is unnecessary, Apache does not create that entry upon
- installation. Follow the directions above to find or create the
- DependOnService value, double click that value if it already
- exists, and add the Rpcss entry to the list.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="cmdline" id="cmdline">Running Apache for Windows from the Command Line</a></h2>
-
-
-
- <p>The Start menu icons and the Windows Service manager can provide
- a simple interface for administering Apache. But in some cases
- it is easier to work from the command line.</p>
-
- <p>When working with Apache it is important to know how it will
- find the configuration files. You can specify a configuration
- file on the command line in two ways:</p>
-
- <ul>
- <li><code>-f</code> specifies a path to a particular
- configuration file</li>
- </ul>
+ <p>You can control an Apache service by its command line switches,
+ too. To start an installed Apache service you'll use this:</p>
<div class="example"><p><code>
- apache -f "c:\my server\conf\my.conf" <br />
- apache -f test\test.conf
+ apache -k start
</code></p></div>
- <ul>
- <li><code>-n</code> specifies the configuration file of
- an installed Apache service (Apache 1.3.7 and later)</li>
- </ul>
+ <p>To stop an Apache service via the command line switches, use
+ this:</p>
<div class="example"><p><code>
- apache -n "service name"
+ apache -k stop
</code></p></div>
- <p>In these cases, the proper <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> should be set in the configuration file.</p>
-
- <p>If you don't specify a configuration file name with <code>-f</code> or
- <code>-n</code>, Apache will use the file name compiled into the server,
- usually "<code>conf/httpd.conf</code>". Invoking Apache with the
- <code>-V</code> switch will display this value labeled as
- <code>SERVER_CONFIG_FILE</code>. Apache
- will then determine its <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> by trying the following, in
- this order:</p>
-
- <ul>
- <li>A <code>ServerRoot</code> directive via a
- <code>-C</code> switch.</li>
-
- <li>The <code>-d</code> switch on the command line.</li>
-
- <li>Current working directory</li>
-
- <li>A registry entry, created if you did a binary
- install.</li>
-
- <li>The server root compiled into the server.</li>
- </ul>
-
- <p>The server root compiled into the server is usually
- "<code>/apache</code>". invoking apache with the <code>-V</code> switch
- will display this value labeled as <code>HTTPD_ROOT</code>.</p>
-
- <p>When invoked from the start menu, Apache is usually passed
- no arguments, so using the registry entry is the preferred
- technique for console Apache.</p>
-
- <p>During a binary installation, a version-specific registry
- key is created in the Windows registry:</p>
-
- <div class="example"><p><code>
- HKEY_LOCAL_MACHINE\Software\Apache Group\Apache\1.3.7 <br />
- <br />
- HKEY_LOCAL_MACHINE\Software\Apache Group\Apache\2.0a3
- </code></p></div>
-
- <p>This key is compiled into the server and can enable you to
- test new versions without affecting the current version. Of
- course you must take care not to install the new version on top
- of the old version in the file system.</p>
-
- <p>If you did not do a binary install then Apache will in some
- scenarios complain that about the missing registry key. This
- warning can be ignored if it otherwise was able to find its
- configuration files.</p>
-
- <p>The value of this key is the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> directory, containing the <code>conf</code>
- directory. When Apache starts it will read the <code>httpd.conf</code>
- file from this directory. If this file contains a
- <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> directive which
- is different from the directory obtained from the registry key above,
- Apache will forget the registry key and use the directory from the
- configuration file. If you copy the Apache directory or configuration
- files to a new location it is vital that you update the
- <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> directory
- in the <code>httpd.conf</code> file to the new location.</p>
-
- <p>To run Apache from the command line as a console
- application, use the following command:</p>
-
- <div class="example"><p><code>
- apache
- </code></p></div>
-
- <p>Apache will execute, and will remain running until it is
- stopped by pressing control-C.</p>
-
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="signalsrv" id="signalsrv">Signalling Apache when running as a Service</a></h2>
-
-
-
- <p>On Windows NT, multiple instances of Apache can be run as
- services. Signal an Apache service to start, restart, or
- shutdown as follows:</p>
-
- <div class="example"><p><code>
- apache -n "service name" -k start <br />
- apache -n "service name" -k restart <br />
- apache -n "service name" -k shutdown
- </code></p></div>
-
- <p>In addition, when running on Windows NT, you can use the
- native <code>NET</code> command to start and stop Apache services
- as follows:</p>
-
- <div class="example"><p><code>
- NET START "service name" <br />
- NET STOP "service name"
- </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="signal" id="signal">Signalling Apache when running as a console application</a></h2>
-
-
-
- <p>On Windows 9x, Apache runs as a console application. You can
- tell a running Apache to stop by opening another console window
- and typing:</p>
+ <p>or</p>
<div class="example"><p><code>
apache -k shutdown
</code></p></div>
- <p>This should be used instead of pressing Control-C in the
- running Apache console window, because it lets Apache end any
- current transactions and cleanup gracefully.</p>
+ <p>You can also restart a running service and force it to reread
+ its configuration file by using:</p>
- <p>You can also tell Apache to restart. This makes it re-read
- the configuration files. Any transactions in progress are
- allowed to complete without interruption. To restart Apache,
- run</p>
+ <div class="example"><p><code>
+ apache -k restart
+ </code></p></div>
+
+ <p>By default, all Apache services are registered to run as the
+ system user (the <code>LocalSystem</code> account). The
+ <code>LocalSystem</code> account has no privileges to your network
+ via any Windows-secured mechanism, including the file system, named
+ pipes, DCOM, or secure RPC. It has, however, wide privileges locally.
+ </p>
+
+ <div class="warning"><strong>Never grant any network privileges to
+ the <code>LocalSystem</code> account! If you need Apache to be able
+ to access network resources, create a separate account for Apache as
+ noted below.</strong></div>
+
+ <p>You may want to create a separate account for running Apache
+ service(s). Especially, if you have to access network resources
+ via Apache, this is strongly recommended.</p>
+
+ <ol>
+ <li>Create a normal domain user account, and be sure to
+ memorize its password.</li>
+
+ <li>Grant the newly-created user a privilege of <code>Log on
+ as a service</code> and <code>Act as part of the operating
+ system</code>. On Windows NT 4.0 these privileges are granted via
+ User Manager for Domains, but on Windows 2000 and XP you probably
+ want to use Group Policy for propagating these settings. You can
+ also manually set these via the Local Security Policy MMC snap-in.
+ </li>
+
+ <li>Confirm that the created account is a member of the Users
+ group.</li>
+
+ <li>Grant the account read and execute (RX) rights to all document
+ and script folders (<code>htdocs</code> and <code>cgi-bin</code>
+ for example).</li>
+
+ <li>Grant the account change (RWXD) rights to the
+ Apache <code>logs</code> directory.</li>
+
+ <li>Grant the account read and execute (RX) rights to the
+ <code>Apache.exe</code> binary executable.</li>
+ </ol>
+
+ <div class="note">It is usually a good practice to grant the user the Apache
+ service runs as read and execute (RX) access to the whole Apache2
+ directory, except the <code>logs</code> subdirectory, where the
+ user has to have at least change (RWXD) rights.</div>
+
+ <p>If you allow the account to log in as a user and as a service,
+ then you can log on with that account and test that the account has the
+ privileges to execute the scripts, read the web pages, and that
+ you can start Apache in a console window. If this works, and you
+ have followed the steps above, Apache should execute as a service
+ with no problems.</p>
+
+ <div class="note"><strong>Error code 2186</strong> is a good indication that
+ you need to review the "Log On As" configuration for the service,
+ since Apache cannot access a required network resource. Also, pay
+ close attention to the privileges of the user Apache is
+ configured to run as.</div>
+
+ <p>When starting Apache as a service you may encounter an error
+ message from the Windows Service Control Manager. For example,
+ if you try to start Apache by using the Services applet in the
+ Windows Control Panel, you may get the following message:</p>
+
+ <div class="example"><p><code>
+ Could not start the Apache2 service on \\COMPUTER <br />
+ Error 1067; The process terminated unexpectedly.
+ </code></p></div>
+
+ <p>You will get this generic error if there is any problem with
+ starting the Apache service. In order to see what is really causing
+ the problem you should follow the instructions for Running Apache
+ for Windows from the Command Prompt.</p>
+
+ <p>There is some support for Apache on Windows 9x to behave in a
+ similar manner as a service on Windows NT. It is <strong>highly
+ experimental</strong>. It is not of production-class reliability,
+ and its future is not guaranteed. It can be mostly regarded as
+ a risky thing to play with - proceed with caution!</p>
+
+ <p>There are some differences between the two kinds of services
+ you should be aware of:</p>
+
+ <ul>
+ <li><p>Apache will attempt to start and if successful it will run
+ in the background. If you run the command</p>
+
+ <div class="example"><p><code>
+ apache -n "MyServiceName" -k start
+ </code></p></div>
+
+ <p>via a shortcut on your desktop, for example, then if the
+ service starts successfully, a console window will flash up but
+ it immediately disappears. If Apache detects any errors on startup
+ such as incorrect entries in the httpd.conf configuration file,
+ the console window will remain visible. This will display an error
+ message which will be useful in tracking down the cause of the
+ problem.</p></li>
+
+ <li><p>Windows 9x does not support <code>NET START</code> or
+ <code>NET STOP</code> commands. You must control the Apache
+ service on the command prompt via the <code>-k</code> switches.
+ </p></li>
+
+ <li><p>Apache and Windows 9x offer no support for running Apache
+ as a specific user with network privileges. In fact, Windows 9x
+ offers no security on the local machine, either. This is the
+ simple reason because of which the Apache Software Foundation
+ never endorses use of a Windows 9x -based system as a public
+ Apache server. The primitive support for Windows 9x exists only
+ to assist the user in developing web content and learning the
+ Apache server, and perhaps as an intranet server on a secured,
+ private network.</p></li>
+
+ </ul>
+
+ <p>Once you have confirmed that Apache runs correctly as a
+ console application you can install, control and uninstall the
+ pseudo-service with the same commands as on Windows NT. You can
+ also use the Apache Service Monitor to manage Windows 9x
+ pseudo-services.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="wincons" id="wincons">Running Apache as a Console Application</a></h2>
+
+
+ <p>Running Apache as a service is usually the recommended way to
+ use it, but it is sometimes easier to work from the command line
+ (on Windows 9x running Apache from the command line is the
+ recommended way due to the lack of reliable service support.)</p>
+
+ <p>To run Apache from the command line as a console application,
+ use the following command:</p>
+
+ <div class="example"><p><code>
+ apache
+ </code></p></div>
+
+ <p>Apache will execute, and will remain running until it is stopped
+ by pressing Control-C.</p>
+
+ <p>You can also run Apache via the shortcut Start Apache in Console
+ placed to <code>Start Menu --> Programs --> Apache HTTP Server
+ 2.0.xx --> Control Apache Server</code> during the installation.
+ This will open a console window and start Apache inside it. If you
+ don't have Apache installed as a service, the window will remain
+ visible until you stop Apache by pressing Control-C in the console
+ window where Apache is running in. The server will exit in a few
+ seconds. However, if you do have Apache installed as a service, the
+ shortcut starts the service. If the Apache service is running
+ already, the shortcut doesn't do anything.</p>
+
+ <p>You can tell a running Apache to stop by opening another console
+ window and entering:</p>
+
+ <div class="example"><p><code>
+ apache -k shutdown
+ </code></p></div>
+
+ <p>This should be preferred over pressing Control-C because this
+ lets Apache end any current operations and clean up gracefully.</p>
+
+ <p>You can also tell Apache to restart. This forces it to reread
+ the configuration file. Any operations in progress are allowed to
+ complete without interruption. To restart Apache, use:</p>
<div class="example"><p><code>
apache -k restart
@@ -573,8 +543,179 @@
<div class="note">Note for people familiar with the Unix version of Apache:
these commands provide a Windows equivalent to <code>kill -TERM
- <em>pid</em></code> and <code>kill -USR1 <em>pid</em></code>.
- The command line option used, <code>-k</code>, was chosen as a
- reminder of the "<code>kill</code>" command used on Unix.</div>
+ <em>pid</em></code> and <code>kill -USR1 <em>pid</em></code>. The
+ command line option used, <code>-k</code>, was chosen as a reminder
+ of the <code>kill</code> command used on Unix.</div>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ <p>If the Apache console window closes immediately or unexpectedly
+ after startup, open the Command Prompt from the Start Menu -->
+ Programs. Change to the folder to which you installed Apache, type
+ the command <code>apache</code>, and read the error message. Then
+ change to the logs folder, and review the <code>error.log</code>
+ file for configuration mistakes. If you accepted the defaults when
+ you installed Apache, the commands would be:</p>
+
+ <div class="example"><p><code>
+ c: <br />
+ cd "\Program Files\Apache Group\Apache2\bin" <br />
+ apache
+ </code></p></div>
+
+ <p>Then wait for Apache to stop, or press Control-C. Then enter the
+ following:</p>
+
+ <div class="example"><p><code>
+ cd ..\logs <br />
+ more < error.log
+ </code></p></div>
+
+ <p>When working with Apache it is important to know how it will
+ find the configuration file. You can specify a configuration file
+ on the command line in two ways:</p>
+
+ <ul>
+ <li><p><code>-f</code> specifies an absolute or relative path to
+ a particular configuration file:</p>
+
+ <div class="example"><p><code>
+ apache -f "c:\my server files\anotherconfig.conf"
+ </code></p></div>
+
+ <p>or</p>
+
+ <div class="example"><p><code>
+ apache -f files\anotherconfig.conf
+ </code></p></div></li>
+
+ <li><p><code>-n</code> specifies the installed Apache service
+ whose configuration file is to be used:</p>
+
+ <div class="example"><p><code>
+ apache -n "MyServiceName"
+ </code></p></div>
+ </li>
+ </ul>
+
+ <p>In both of these cases, the proper
+ <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> should be set in
+ the configuration file.</p>
+
+ <p>If you don't specify a configuration file with <code>-f</code>
+ or <code>-n</code>, Apache will use the file name compiled into the
+ server, such as <code>conf\httpd.conf</code>. This built-in path
+ is relative to the installation directory. You can verify the compiled
+ file name from a value labelled as <code>SERVER_CONFIG_FILE</code> when
+ invoking Apache with the <code>-V</code> switch, like this:</p>
+
+ <div class="example"><p><code>
+ apache -V
+ </code></p></div>
+
+ <p>Apache will then try to determine its <code class="directive"><a href="../mod/core.html# serverroot">
+ ServerRoot</a></code> by trying the following, in this order:</p>
+
+ <ol>
+ <li>A <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> directive
+ via the <code>-C</code> command line switch.</li>
+
+ <li>The <code>-d</code> switch on the command line.</li>
+
+ <li>Current working directory.</li>
+
+ <li>A registry entry which was created if you did a binary
+ installation.</li>
+
+ <li>The server root compiled into the server. This is <code>
+ /apache</code> by default, you can verify it by using <code>
+ apache -V</code> and looking for a value labelled as
+ <code>HTTPD_ROOT</code>.</li>
+ </ol>
+
+ <p>During the installation, a version-specific registry key is
+ created in the Windows registry. The location of this key depends
+ on the type of the installation. If you chose to install Apache
+ for all users, the key is located under the
+ <code>HKEY_LOCAL_MACHINE</code> hive, like this (the version
+ numbers will of course vary between different versions of Apache:
+ </p>
+
+ <div class="example"><p><code>
+ HKEY_LOCAL_MACHINE\SOFTWARE\Apache Group\Apache\2.0.43
+ </code></p></div>
+
+ <p>Correspondingly, if you chose to install Apache for the current
+ user only, the key is located under the <code>HKEY_CURRENT_USER</code>
+ hive, the contents of which are dependent of the user currently
+ logged on:</p>
+
+ <div class="example"><p><code>
+ HKEY_CURRENT_USER\SOFTWARE\Apache Group\Apache\2.0.43
+ </code></p></div>
+
+ <p>This key is compiled into the server and can enable you to test
+ new versions without affecting the current version. Of course, you
+ must take care not to install the new version in the same
+ directory as another version.</p>
+
+ <p>If you did not do a binary install, Apache will in some
+ scenarios complain about the missing registry key. This warning can
+ be ignored if the server was otherwise able to find its
+ configuration file.</p>
+
+ <p>The value of this key is the
+ <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> directory which
+ contains the <code>conf</code> subdirectory. When Apache starts it
+ reads the <code>httpd.conf</code> file from that directory. If
+ this file contains a <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
+ directive which contains a different directory from the one
+ obtained from the registry key above, Apache will forget the
+ registry key and use the directory from the configuration file. If
+ you copy the Apache directory or configuration files to a new
+ location it is vital that you update the
+ <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> directive in the
+ <code>httpd.conf</code> file to reflect the new location.</p>
+
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="test" id="test">Testing the Installation</a></h2>
+
+
+ <p>After starting Apache (either in a console window or as a
+ service) it will be listening on port 80 (unless you changed the
+ <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> directive in the
+ configuration files or installed Apache only for the current user).
+ To connect to the server and access the default page, launch a
+ browser and enter this URL:</p>
+
+ <div class="example"><p><code>
+ http://localhost/
+ </code></p></div>
+
+ <p>Apache should respond with a welcome page and a link to the
+ Apache manual. If nothing happens or you get an error, look in the
+ <code>error.log</code> file in the <code>logs</code> subdirectory.
+ If your host is not connected to the net, or if you have serious
+ problems with your DNS (Domain Name Service) configuration, you
+ may have to use this URL:</p>
+
+ <div class="example"><p><code>
+ http://127.0.0.1/
+ </code></p></div>
+
+ <p>Once your basic installation is working, you should configure it
+ properly by editing the files in the <code>conf</code> subdirectory.
+ Again, if you change the configuration of the Windows NT service
+ for Apache, first attempt to start it from the command line to
+ make sure that the service starts with no errors.</p>
+
+ <p>Because Apache <strong>cannot</strong> share the same port with
+ another TCP/IP application, you may need to stop, uninstall or reconfigure
+ certain other services before running Apache. These conflicting
+ services include other WWW servers and some firewall implementations.
+ </p>
+
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml
index 34b2b7f..495f100 100644
--- a/docs/manual/platform/windows.xml
+++ b/docs/manual/platform/windows.xml
@@ -13,590 +13,515 @@
<p>This document explains how to install, configure and run
Apache 2.0 under Microsoft Windows. If you find any bugs, or
wish to contribute in other ways, please use our <a
- href="http://httpd.apache.org/bug_report.html">bug reporting page.</a></p>
+ href="http://httpd.apache.org/bug_report.html">bug reporting
+ page</a>.</p>
- <p>Most of this document assumes that you are installing
- Windows from a binary distribution. If you want to compile
- Apache yourself (possibly to help with development, or to track
- down bugs), see <a href="win_compiling.html">Compiling Apache
- for Microsoft Windows</a>.</p>
+ <p>This document assumes that you are installing a binary
+ distribution of Apache. If you want to compile Apache yourself
+ (possibly to help with development or tracking down bugs),
+ see <a href="win_compiling.html">Compiling Apache for Microsoft
+ Windows</a>.</p>
- <p><strong>Abbreviations and their meanings used in this
- document include:</strong></p>
+ <p><strong>Because of the current versioning policies on Microsoft
+ Windows operating system families, this document assumes the
+ following:</strong></p>
<ul>
<li><strong>Windows NT:</strong> This means all versions of
- Microsoft Windows that are based on the NT kernel,
- including Windows NT, Windows 2000, Windows XP and Windows
- .NET Server 2003 or later.</li>
- <li><strong>Windows 9x:</strong> This means all versions of
- Microsoft Windows targeted at home use, including Windows 95,
- Windows 98 and Windows ME.</li>
+ Windows that are based on the Windows NT kernel. Includes Windows
+ NT, Windows 2000, Windows XP and Windows .Net Server 2003.</li>
+ <li><strong>Windows 9x:</strong> This means older,
+ consumer-oriented versions of Windows. Includes Windows 95 (also
+ OSR2), Windows 98 and Windows ME.</li>
</ul>
- <p><strong>At this time, support for Windows 9x is
- incomplete. Apache 2.0 is not expected to work on those
- platforms at this time.</strong> If you are interested in
- helping with that effort, please see the developer's site for
- information on <a href="http://dev.apache.org/">how to get
- involved</a>. Support will likely be provided at some point in
- the future, and patches to allow Apache to work on 9x are
- welcome!</p>
-
</summary>
<section id="req">
+ <title>Operating System Requirements</title>
- <title>Requirements</title>
+ <p>The primary Windows platform for running Apache 2.0 is Windows
+ NT. The binary installer only works with the x86 family of
+ processors, such as Intel and AMD processors. Running Apache on
+ Windows 9x is not thoroughly tested, and it is never recommended on
+ production systems.
+ </p>
- <p>Apache 2.0 is designed to run on Windows NT 4.0 and Windows
- 2000. The binary installer will only work with the x86 family
- of processors, such as Intel's. Apache may also run on Windows
- 9x, but it is not tested, and is never recommended for production
- servers. In all cases TCP/IP networking must be installed.</p>
+ <p>On all operating systems, TCP/IP networking must be installed
+ and working. If running on Windows 95, the Winsock 2 upgrade must
+ be installed. Winsock 2 for Windows 95 can be downloaded from <a
+ href="http://www.microsoft.com/windows95/downloads/contents/WUAdminTools/S_WUNetworkingTools/W95Sockets2/Default.asp">here</a>.
+ </p>
- <p>If running on Windows 95, the "Winsock2" upgrade MUST BE
- INSTALLED. "Winsock2" for Windows 95 is available <a
- href="http://www.microsoft.com/windows95/downloads/">here</a>.</p>
-
- <p>If running on NT 4.0, installing Service Pack 6 is
+ <p>On Windows NT 4.0, installing Service Pack 6 is strongly
recommended, as Service Pack 4 created known issues with TCP/IP
- and WinSock integrity that were resolved in later Service
- Packs.</p>
-
+ and Winsock integrity that were resolved in later Service Packs.</p>
</section>
<section id="down">
-
<title>Downloading Apache for Windows</title>
- <p>Information on the latest version of Apache can be found on
- the Apache web server at <a
- href="http://httpd.apache.org/">http://httpd.apache.org/</a>.
- This will list the current release, any more recent alpha or
- beta-test releases, together with details of mirror web and
- anonymous ftp sites.</p>
+ <p>Information on the latest versions of Apache can be found on the
+ web site of the Apache web server at
+ <a href="http://httpd.apache.org/download.cgi">http://httpd.apache.org/download.cgi</a>.
+ There you will find the current release, as well as more recent alpha
+ or beta test versions, and a list of HTTP and FTP mirrors from which
+ you can download the Apache web server. Please use a mirror near to
+ you for a fast and reliable download.</p>
- <p>You should download the version of Apache for Windows with
- the <code>.msi</code> extension. This is a single Microsoft
- Installer file containing Apache, ready to install and run.
- There is a seperate <code>.zip</code> file containing <em>only</em>
- the source code, to compile Apache yourself with the Microsoft
- Visual C++ (Visual Studio) tools.</p>
-
+ <p>For Windows installations you should download the version of
+ Apache for Windows with the <code>.msi</code> extension. This is a
+ single Microsoft Installer file, which contains a ready-to-run
+ version of Apache. There is a separate <code>.zip</code> file,
+ which contains only the source code. You can compile Apache
+ yourself with the Microsoft Visual C++ (Visual Studio) tools.</p>
</section>
<section id="inst">
-
<title>Installing Apache for Windows</title>
- <p>Run the Apache <code>.msi</code> file you downloaded above.
- This will ask for:</p>
+ <p>You need Microsoft Installer 1.2 or above for the installation
+ to work. On Windows 9x you can update your Microsoft Installer to
+ version 2.0 <a
+ href="http://www.microsoft.com/downloads/release.asp?ReleaseID=32831">here</a>
+ and on Windows NT 4.0 and 2000 the version 2.0 update can be found
+ <a href="http://www.microsoft.com/downloads/release.asp?ReleaseID=32832">here</a>.
+ Windows XP does not need this update.</p>
- <ul>
- <li>the directory to install Apache into (the default is
- <code>\Program Files\Apache Group\Apache</code> although you
- can change this to any other directory)</li>
+ <p>Note that you cannot install two versions of Apache 2.0 on the
+ same computer with the binary installer. You can, however, install
+ a version of the 1.3 series <strong>and</strong> a version of the
+ 2.0 series on the same computer without problems. If you need to
+ have two different 2.0 versions on the same computer, you have to
+ <a href="win_compiling.html">compile and install Apache from the
+ source</a>.</p>
- <li>the start menu name (default is "Apache Web Server")</li>
+ <p>Run the Apache <code>.msi</code> file you downloaded above. The
+ installation will ask you for these things:</p>
- <li>the installation type. The "Typical" option installs
- everything except the source code. The "Minimum" option does
- not install the manuals or source code. Choose the "Custom"
- install if you want to install the source code.</li>
- </ul>
+ <ol>
+ <li><p><strong>Network Domain.</strong> Enter the DNS domain in which
+ your server is or will be registered in. For example, if your
+ server's full DNS name is <code>server.mydomain.net</code>, you would
+ type <code>mydomain.net</code> here.</p></li>
- <p>During the installation, Apache will configure the files in
- the <code>conf</code> directory for your chosen installation
- directory. However if any of the files in this directory
- already exist they will <em>not</em> be overwritten.
- Instead the new copy of the corresponding file will be left
- with the extension <code>.default</code>. So, for example, if
- <code>conf\httpd.conf</code> already exists it will not be
- altered, but the version which would have been installed will
- be left in <code>conf\httpd.conf.default</code>. After the
- installation has finished you should manually check to see what is
- in new in the <code>.default</code> file, and if necessary
- update your existing configuration files.</p>
+ <li><p><strong>Server Name.</strong> Your server's full DNS name.
+ From the example above, you would type <code>server.mydomain.net</code>
+ here.</p></li>
- <p>Also, if you already have a file called
- <code>htdocs\index.html</code> then it will not be overwritten
- (no <code>index.html.default</code> file will be installed
- either). This should mean it a safe to install Apache over an
- existing installation (but you will have to stop the existing
- server running before doing the installation, then start the
- new one after the installation is finished).</p>
+ <li><p><strong>Administrator's Email Address.</strong> Enter the
+ server administrator's or webmaster's email address here. This
+ address will be displayed along with error messages to the client
+ by default.</p></li>
- <p>After installing Apache, you should edit the configuration
- files in the <code>conf</code> directory as required. These
- files will be configured during the install ready for Apache to
- be run from the directory where it was installed, with the
- documents served from the subdirectory <code>htdocs</code>.
- There are lots of other options which should be set before you
- start really using Apache. However to get started quickly the
- files should work as installed.</p>
+ <li><p><strong>For whom to install Apache</strong> Select <code>for
+ All Users, on Port 80, as a Service - Recommended</code> if you'd
+ like your new Apache to listen at port 80 for incoming traffic.
+ It will run as a service (that is, Apache will run even if no one
+ is logged in on the server at the moment) Select <code>only for
+ the Current User, on Port 8080, when started Manually</code> if
+ you'd like to install Apache for your personal experimenting or
+ if you already have another WWW server running on port 80.</p></li>
+ <li><p><strong>The installation type.</strong> Select <code>Typical</code>
+ for everything except the source code and libraries for module
+ development. With <code>Custom</code> you can specify what to
+ install. A full install will require about 13 megabytes of free
+ disk space. This does <em>not</em> include the size of your web
+ site(s).</p></li>
+
+ <li><p><strong>Where to install.</strong> The default path is
+ <code>C:\Program Files\Apache Group</code> under which a directory
+ called <code>Apache2</code> will be created by default.</p></li>
+ </ol>
+
+ <p>During the installation, Apache will configure the files in the
+ <code>conf</code> subdirectory to reflect the chosen installation
+ directory. However, if any of the configuration files in this
+ directory already exist, they will not be overwritten. Instead, the
+ new copy of the corresponding file will be left with the extension
+ <code>.default</code>. So, for example, if <code>conf\httpd.conf</code>
+ already exists, it will be renamed as <code>conf\httpd.conf.default</code>.
+ After the installation you should manually check to see what new
+ settings are in the <code>.default</code> file, and if necessary,
+ update your existing configuration file.</p>
+
+ <p>Also, if you already have a file called <code>htdocs\index.html</code>,
+ it will not be overwritten (and no <code>index.html.default</code>
+ will be installed either). This means it should be safe to install
+ Apache over an existing installation, although you would have to
+ stop the existing running server before doing the installation, and
+ then start the new one after the installation is finished.</p>
+
+ <p>After installing Apache, you must edit the configuration files
+ in the <code>conf</code> subdirectory as required. These files
+ will be configured during the installation so that Apache is ready
+ to be run from the directory it was installed into, with the
+ documents server from the subdirectory <code>htdocs</code>. There
+ are lots of other options which you should set before you really
+ start using Apache. However, to get started quickly, the files
+ should work as installed.</p>
</section>
- <section id="run">
+ <section id="cust">
+ <title>Customizing Apache for Windows</title>
- <title>Running Apache for Windows</title>
-
- <p>There are two ways you can run Apache:</p>
-
- <ul>
- <li><p>As a <a href="win_service.html#service">"service"</a>
- (available on Windows NT, or a pseudo-service on Windows
- 9x). This is the best option if you want Apache to
- automatically start when you machine boots, and to keep
- Apache running when you log-off.</p></li>
-
- <li><p>From a <a href="#cmdline">console window</a>. This MUST
- be used by any administrator to test before attempting to
- run as a service.</p></li>
- </ul>
-
- <p>To run Apache from a console window, select the "Start
- Apache as console app" option from the Start menu (in Apache
- 1.3.4 and earlier, this option was called "Apache Server").
- This will open a console window and start Apache running inside
- it. The window will remain active until you stop Apache. To
- stop Apache running, either select the "Shutdown Apache console
- app" icon option from the Start menu (this is not available in
- Apache 1.3.4 or earlier), or see <a href="#signal">Signalling
- Console Apache when Running</a> for how to control Apache from
- the command line.</p>
-
- <p>If the Apache console window closes immediately (or
- unexpectedly), run the "Command Prompt" from the Start Menu -
- Programs list. Change to the folder to which you installed
- Apache, type the command apache, and read the error message.
- Then change to the <code>logs</code> folder, and review the
- <code>error.log</code> file for configuration mistakes.
- If you accepted the defaults when you installed Apache,
- the commands would be:</p>
-
- <example>
- c: <br />
- cd "\program files\apache group\apache" <br />
- apache <br />
- Wait for Apache to exit, or press Ctrl+C <br />
- cd logs <br />
- more <error.log
- </example>
-
- <p><strong>Complete the steps above before you proceed
- to attempt to start Apache as a Windows NT service!</strong></p>
-
- <p>To start Apache as a service, you first need to install it
- as a service. Multiple Apache services can be installed, each
- with a different name and configuration. To install the default
- Apache service named "Apache", run the "Install Apache as
- Service (NT only)" option from the Start menu. Once this is
- done you can start the "Apache" service by opening the Services
- window (in the Control Panel), selecting Apache, then clicking
- on Start. Apache will now be running in the background. You can
- later stop Apache by clicking on Stop. As an alternative to
- using the Services window, you can start and stop the "Apache"
- service from the control line with:</p>
-
- <example>
- NET START APACHE <br />
- NET STOP APACHE
- </example>
-
- <p>See <a href="#signalsrv">Signalling Service Apache when
- Running</a> for more information on installing and controlling
- Apache services.</p>
-
- <note><strong>Apache, unlike many other Windows NT services,
- logs any errors to its own <code>error.log</code> file in the
- <code>logs</code> folder within the Apache server root folder.
- You will <em>not</em> find Apache error details in the Windows
- Event Log.</strong></note>
-
- <p>After starting Apache running (either in a console window or
- as a service) it will be listening on port 80 (unless you
- changed the <directive module="mpm_common">Listen</directive> directive in the configuration
- files). To connect to the server and access the default page,
- launch a browser and enter this URL:</p>
-
- <example>
- http://localhost/
- </example>
-
- <p>This should respond with a welcome page, and a link to the
- Apache manual. If nothing happens or you get an error, look in
- the <code>error_log</code> file in the <code>logs</code>
- directory. If your host isn't connected to the net, you may
- have to use this URL:</p>
-
- <example>
- http://127.0.0.1/
- </example>
-
- <p>Once your basic installation is working, you should
- configure it properly by editing the files in the
- <code>conf</code> directory. Again, if you change the
- configuration of the Windows NT service for Apache, first
- attempt to start it from the command line to assure that the
- service starts with no errors.</p>
-
- <p>Because Apache <em>CANNOT</em> share the same port with
- another TCP/IP application, you may need to stop or uninstall
- certain services first. These include (but are not limited to)
- other web servers, and firewall products such as BlackIce. If
- you can only start Apache with these services disabled,
- reconfigure either Apache or the other product so that they do
- not listen on the same TCP/IP ports.</p>
-
- </section>
-
- <section id="use">
-
- <title>Configuring Apache for Windows</title>
-
- <p>Apache is configured by files in the <code>conf</code>
- directory. These are the same as files used to configure the
- Unix version, but there are a few different directives for
- Apache on Windows. See the <a href="../">Apache
- documentation</a> for all the available directives.</p>
+ <p>Apache is configured by the files in the <code>conf</code>
+ subdirectory. These are the same files used to configure the Unix
+ version, but there are a few different directives for Apache on
+ Windows. See the <a href="../mod/directives.html">directive index</a>
+ for all the available directives.</p>
<p>The main differences in Apache for Windows are:</p>
-
<ul>
- <li>
- <p>Because Apache for Windows is multithreaded, it does not
- use a separate process for each request, as Apache does
- with Unix. Instead there are usually only two Apache
- processes running: a parent process, and a child which
- handles the requests. Within the child each request is
- handled by a separate thread.</p>
+ <li><p>Because Apache for Windows is multithreaded, it does not
+ use a separate process for each request, as Apache does on Unix.
+ Instead there are usually only two Apache processes running: a
+ parent process, and a child which handles the requests. Within
+ the child process each request is handled by a separate thread.
+ </p>
- <p>So the "process"-management directives are
- different:</p>
+ <p>The process management directives are also different:</p>
- <p><directive module="mpm_common">MaxRequestsPerChild</directive>
- - Like the Unix directive, this controls how many requests
- a process will serve before exiting. However, unlike Unix,
- a process serves all the requests at once, not just one, so
- if this is set, it is recommended that a very high number
- is used. The recommended default, <code>MaxRequestsPerChild
- 0</code>, does not cause the process to ever exit.</p>
-
- <note type="warning"><strong>Warning: The server configuration
- file is reread when the new child process is started. If you
- have modified <code>httpd.conf</code>, the new child may not
- start or you may receive unexpected results.</strong></note>
+ <p><directive module="mpm_common">MaxRequestsPerChild</directive>:
+ Like the Unix directive, this controls how many requests a single
+ child process will serve before exiting. However, unlike on Unix,
+ a single process serves all the requests at once, not just one.
+ If this is set, it is recommended that a very high number is
+ used. The recommended default, <code>MaxRequestsPerChild 0</code>,
+ causes the child process to never exit.</p>
- <p><directive module="mpm_common">ThreadsPerChild</directive>
- - This directive is new, and tells the server how many
- threads it should use. This is the maximum number of
- connections the server can handle at once; be sure and set
- this number high enough for your site if you get a lot of
- hits. The recommended default is <code>ThreadsPerChild
- 50</code>.</p>
- </li>
+ <note type="warning"><strong>Warning: The server configuration
+ file is reread when a new child process is started. If you have
+ modified <code>httpd.conf</code>, the new child may not start or
+ you may receive unexpected results.</strong></note>
- <li>
- <p>The directives that accept filenames as arguments now
- must use Windows filenames instead of Unix ones. However,
- because Apache uses Unix-style names internally, you must
- use forward slashes, not backslashes. Drive letters can be
- used; if omitted, the drive with the Apache executable will
- be assumed.</p>
- </li>
+ <p><directive module="mpm_common">ThreadsPerChild</directive>:
+ This directive is new. It tells the server how many threads it
+ should use. This is the maximum number of connections the server
+ can handle at once, so be sure to set this number high enough for
+ your site if you get a lot of hits. The recommended default is
+ <code>ThreadsPerChild 50</code>.</p></li>
- <li>
- <p>Apache for Windows contains the ability to load modules
- at runtime, without recompiling the server. If Apache is
- compiled normally, it will install a number of optional
- modules in the <code>\Apache\modules</code> directory. To
- activate these, or other modules, the new <directive
- module="mod_so">LoadModule</directive>
- directive must be used. For example, to active the status
- module, use the following (in addition to the
- status-activating directives in
- <code>access.conf</code>):</p>
+ <li><p>The directives that accept filenames as arguments must use
+ Windows filenames instead of Unix ones. However, because Apache
+ uses Unix-style names internally, you must use forward slashes,
+ not backslashes. Drive letters can be used; if omitted, the drive
+ with the Apache executable will be assumed.</p></li>
- <example>
- LoadModule status_module modules/mod_status.so
- </example>
+ <li><p>Apache for Windows contains the ability to load modules at
+ runtime, without recompiling the server. If Apache is compiled
+ normally, it will install a number of optional modules in the
+ <code>\Apache2\modules</code> directory. To activate these or
+ other modules, the new <directive module="mod_so">LoadModule</directive>
+ directive must be used. For example, to activate the status
+ module, use the following (in addition to the status-activating
+ directives in <code>access.conf</code>):</p>
- <p>Information on <a
- href="../mod/mod_so.html#creating">creating loadable
- modules</a> is also available.</p>
- </li>
+ <example>
+ LoadModule status_module modules/mod_status.so
+ </example>
- <li>
- <p>Apache can also load ISAPI Extensions (<em>i.e.</em>,
- Internet Server Applications), such as those used by
- Microsoft's IIS, and other Windows servers. <a
- href="../mod/mod_isapi.html">More information is
- available.</a> Note that Apache <em>CANNOT</em> load ISAPI
- Filters.</p>
- </li>
+ <p>Information on <a href="../mod/mod_so.html#creating">creating
+ loadable modules</a> is also available.</p></li>
- <li>
- <p>When running CGI scripts, the method Apache uses to find
- the interpreter for the script is configurable using the
- <directive module="core">ScriptInterpreterSource</directive>
- directive.</p>
- </li>
+ <li><p>Apache can also load ISAPI (Internet Server Application
+ Programming Interface) extensions (i.e. internet server
+ applications), such as those used by Microsoft IIS and other
+ Windows servers. <a href="../mod/mod_isapi.html">More information
+ is available</a>. Note that Apache <strong>cannot</strong> load
+ ISAPI Filters.</p></li>
- <li>
- <p>Since it is often difficult to manage files with names
- like <code>.htaccess</code> under windows, you may find it
- useful to change the name of this configuration file using
- the <directive module="core">AccessFilename</directive>
- directive.</p>
- </li>
+ <li><p>When running CGI scripts, the method Apache uses to find
+ the interpreter for the script is configurable using the
+ <directive module="core">ScriptInterpreterSource</directive>
+ directive.</p></li>
+
+ <li><p>Since it is often difficult to manage files with names
+ like <code>.htaccess</code> in Windows, you may find it useful to
+ change the name of this per-directory configuration file using
+ the <directive module="core">AccessFilename</directive>
+ directive.</p></li>
+
+ <li><p>Any errors during Apache startup are logged into the
+ Windows event log when running on Windows NT. This mechanism
+ acts as a backup for those situations where Apache cannot even
+ access the normally used <code>error.log</code> file. You can
+ view the Windows event log by using the Event Viewer application
+ on Windows NT 4.0, and the Event Viewer MMC snap-in on newer
+ versions of Windows.</p>
+
+ <note><strong>Note that there is no startup error logging on
+ Windows 9x because no Windows event log exists on those operating
+ systems.</strong></note></li>
</ul>
</section>
- <section id="service">
+ <section id="winsvc">
+ <title>Running Apache as a Service</title>
- <title>Running Apache for Windows as a Service</title>
+ <p>Apache can be run as a service on Windows NT. There is some
+ highly experimental support for similar behavior on Windows 9x.</p>
- <note><strong>The <code>-n</code> option to specify a service name
- is only available with Apache 1.3.7 and later. Earlier versions of
- Apache only support the default service name
- "Apache".</strong></note>
+ <p>You can install Apache as a service automatically during the
+ installation. If you chose to install for all users, the
+ installation will create an Apache service for you. If you specify
+ to install for yourself only, you can manually register Apache as a
+ service after the installation. You have to be a member of the
+ Administrators group for the service installation to succeed.</p>
- <p>You can install Apache as a Windows NT service as
- follows:</p>
+ <p>Apache comes with a utility called the Apache Service Monitor.
+ With it you can see and manage the state of all installed Apache
+ services on any machine on your network. To be able to manage an
+ Apache service with the monitor, you have to first install the
+ service (either automatically via the installation or manually).
+ </p>
+
+ <p>You can install Apache as a Windows NT service as follows from
+ the command prompt at the Apache <code>bin</code> subdirectory:</p>
<example>
- apache -k install -n "service name"
+ apache -k install
</example>
- <p>To install a service to use a particular configuration,
- specify the configuration file when the service is
- installed:</p>
+ <p>If you need to specify the name of the service you want to
+ install, use the following command. You have to do this if you
+ have several different service installations of Apache on your
+ computer.</p>
<example>
- apache -k install -n "service name" -f "\my server\conf\my.conf"
+ apache -k install -n "MyServiceName"
</example>
- <p>To remove an Apache service, use</p>
+ <p>If you need to have specifically named configuration files for
+ different services, you must use this:</p>
<example>
- apache -k uninstall -n "service name"
+ apache -k install -n "MyServiceName" -f "c:\files\my.conf"
</example>
- <p>The default "service name", if one is not specified, is
- "Apache".</p>
+ <p>If you use the first command without any special parameters except
+ <code>-k install</code>, the service will be called <code>Apache2</code>
+ and the configuration will be assumed to be <code>conf\httpd.conf</code>.
+ </p>
- <p>Once a service is installed, you can use the <code>-n</code>
- option, in conjunction with other options, to refer to a
- service's configuration file. For example:</p>
-
- <p>To test a service's configuration file:</p>
+ <p>Removing an Apache service is easy. Just use:</p>
<example>
- apache -n "service name" -t
+ apache -k uninstall
</example>
- <p>To start a console Apache using a service's configuration
- file:</p>
+ <p>The specific Apache service to be uninstalled can be specified by using:</p>
<example>
- apache -n "service name"
+ apache -k uninstall -n "MyServiceName"
</example>
- <p><strong>Important Note on service dependencies:</strong></p>
-
- <p>Prior to Apache release 1.3.13, the dependencies required to
- successfully start an installed service were not configured.
- After installing a service using earlier versions of Apache,
- you must follow these steps:</p>
+ <p>Normal starting, restarting and shutting down of an Apache
+ service is usually done via the Apache Service Monitor, by using
+ commands like <code>NET START Apache2</code> and <code>NET STOP
+ Apache2</code> or via normal Windows service management. Before
+ starting Apache as a service by any means, you should test the
+ service's configuration file by using:</p>
<example>
- Run regedt32 <br />
- Select Window - "HKEY_LOCAL_MACHINE on Local Machine" from the menu <br />
- Double-click to open the SYSTEM, then the CurrentControlSet keys <br />
- Scroll down and click on the Apache servicename <br />
- Select Edit - Add Value... from the menu <br />
- Fill in the Add Value dialog with <br />
-     Value Name: DependOnGroup <br />
-     Data Type: REG_MULTI_SZ <br />
-     and click OK <br />
- Leave the Multi-String Editor dialog empty and click OK <br />
- Select Edit - Add Value... from the menu <br />
- Fill in the Add Value dialog with <br />
-     Value Name: DependOnService <br />
-     Data Type: REG_MULTI_SZ <br />
-     and click OK <br />
- Type the following list (one per line) in the Multi-String Editor dialog <br />
-     Tcpip <br />
-     Afd <br />
-     and click OK
+ apache -n "MyServiceName" -t
</example>
- <p>If you are using COM or DCOM components from a third party
- module, ISAPI, or other add-in scripting technologies such as
- ActiveState Perl, you may also need to add the entry Rpcss to
- the DependOnService list. To avoid exposing the TCP port 135
- when it is unnecessary, Apache does not create that entry upon
- installation. Follow the directions above to find or create the
- DependOnService value, double click that value if it already
- exists, and add the Rpcss entry to the list.</p>
-
- </section>
-
- <section id="cmdline">
-
- <title>Running Apache for Windows from the Command Line</title>
-
- <p>The Start menu icons and the Windows Service manager can provide
- a simple interface for administering Apache. But in some cases
- it is easier to work from the command line.</p>
-
- <p>When working with Apache it is important to know how it will
- find the configuration files. You can specify a configuration
- file on the command line in two ways:</p>
-
- <ul>
- <li><code>-f</code> specifies a path to a particular
- configuration file</li>
- </ul>
+ <p>You can control an Apache service by its command line switches,
+ too. To start an installed Apache service you'll use this:</p>
<example>
- apache -f "c:\my server\conf\my.conf" <br />
- apache -f test\test.conf
+ apache -k start
</example>
- <ul>
- <li><code>-n</code> specifies the configuration file of
- an installed Apache service (Apache 1.3.7 and later)</li>
- </ul>
+ <p>To stop an Apache service via the command line switches, use
+ this:</p>
<example>
- apache -n "service name"
+ apache -k stop
</example>
- <p>In these cases, the proper <directive module="core"
- >ServerRoot</directive> should be set in the configuration file.</p>
-
- <p>If you don't specify a configuration file name with <code>-f</code> or
- <code>-n</code>, Apache will use the file name compiled into the server,
- usually "<code>conf/httpd.conf</code>". Invoking Apache with the
- <code>-V</code> switch will display this value labeled as
- <code>SERVER_CONFIG_FILE</code>. Apache
- will then determine its <directive module="core"
- >ServerRoot</directive> by trying the following, in
- this order:</p>
-
- <ul>
- <li>A <code>ServerRoot</code> directive via a
- <code>-C</code> switch.</li>
-
- <li>The <code>-d</code> switch on the command line.</li>
-
- <li>Current working directory</li>
-
- <li>A registry entry, created if you did a binary
- install.</li>
-
- <li>The server root compiled into the server.</li>
- </ul>
-
- <p>The server root compiled into the server is usually
- "<code>/apache</code>". invoking apache with the <code>-V</code> switch
- will display this value labeled as <code>HTTPD_ROOT</code>.</p>
-
- <p>When invoked from the start menu, Apache is usually passed
- no arguments, so using the registry entry is the preferred
- technique for console Apache.</p>
-
- <p>During a binary installation, a version-specific registry
- key is created in the Windows registry:</p>
-
- <example>
- HKEY_LOCAL_MACHINE\Software\Apache Group\Apache\1.3.7 <br />
- <br />
- HKEY_LOCAL_MACHINE\Software\Apache Group\Apache\2.0a3
- </example>
-
- <p>This key is compiled into the server and can enable you to
- test new versions without affecting the current version. Of
- course you must take care not to install the new version on top
- of the old version in the file system.</p>
-
- <p>If you did not do a binary install then Apache will in some
- scenarios complain that about the missing registry key. This
- warning can be ignored if it otherwise was able to find its
- configuration files.</p>
-
- <p>The value of this key is the <directive module="core"
- >ServerRoot</directive> directory, containing the <code>conf</code>
- directory. When Apache starts it will read the <code>httpd.conf</code>
- file from this directory. If this file contains a
- <directive module="core">ServerRoot</directive> directive which
- is different from the directory obtained from the registry key above,
- Apache will forget the registry key and use the directory from the
- configuration file. If you copy the Apache directory or configuration
- files to a new location it is vital that you update the
- <directive module="core">ServerRoot</directive> directory
- in the <code>httpd.conf</code> file to the new location.</p>
-
- <p>To run Apache from the command line as a console
- application, use the following command:</p>
-
- <example>
- apache
- </example>
-
- <p>Apache will execute, and will remain running until it is
- stopped by pressing control-C.</p>
-
- </section>
-
- <section id="signalsrv">
-
- <title>Signalling Apache when running as a Service</title>
-
- <p>On Windows NT, multiple instances of Apache can be run as
- services. Signal an Apache service to start, restart, or
- shutdown as follows:</p>
-
- <example>
- apache -n "service name" -k start <br />
- apache -n "service name" -k restart <br />
- apache -n "service name" -k shutdown
- </example>
-
- <p>In addition, when running on Windows NT, you can use the
- native <code>NET</code> command to start and stop Apache services
- as follows:</p>
-
- <example>
- NET START "service name" <br />
- NET STOP "service name"
- </example>
-
- </section>
-
- <section id="signal">
-
- <title>Signalling Apache when running as a console application</title>
-
- <p>On Windows 9x, Apache runs as a console application. You can
- tell a running Apache to stop by opening another console window
- and typing:</p>
+ <p>or</p>
<example>
apache -k shutdown
</example>
- <p>This should be used instead of pressing Control-C in the
- running Apache console window, because it lets Apache end any
- current transactions and cleanup gracefully.</p>
+ <p>You can also restart a running service and force it to reread
+ its configuration file by using:</p>
- <p>You can also tell Apache to restart. This makes it re-read
- the configuration files. Any transactions in progress are
- allowed to complete without interruption. To restart Apache,
- run</p>
+ <example>
+ apache -k restart
+ </example>
+
+ <p>By default, all Apache services are registered to run as the
+ system user (the <code>LocalSystem</code> account). The
+ <code>LocalSystem</code> account has no privileges to your network
+ via any Windows-secured mechanism, including the file system, named
+ pipes, DCOM, or secure RPC. It has, however, wide privileges locally.
+ </p>
+
+ <note type="warning"><strong>Never grant any network privileges to
+ the <code>LocalSystem</code> account! If you need Apache to be able
+ to access network resources, create a separate account for Apache as
+ noted below.</strong></note>
+
+ <p>You may want to create a separate account for running Apache
+ service(s). Especially, if you have to access network resources
+ via Apache, this is strongly recommended.</p>
+
+ <ol>
+ <li>Create a normal domain user account, and be sure to
+ memorize its password.</li>
+
+ <li>Grant the newly-created user a privilege of <code>Log on
+ as a service</code> and <code>Act as part of the operating
+ system</code>. On Windows NT 4.0 these privileges are granted via
+ User Manager for Domains, but on Windows 2000 and XP you probably
+ want to use Group Policy for propagating these settings. You can
+ also manually set these via the Local Security Policy MMC snap-in.
+ </li>
+
+ <li>Confirm that the created account is a member of the Users
+ group.</li>
+
+ <li>Grant the account read and execute (RX) rights to all document
+ and script folders (<code>htdocs</code> and <code>cgi-bin</code>
+ for example).</li>
+
+ <li>Grant the account change (RWXD) rights to the
+ Apache <code>logs</code> directory.</li>
+
+ <li>Grant the account read and execute (RX) rights to the
+ <code>Apache.exe</code> binary executable.</li>
+ </ol>
+
+ <note>It is usually a good practice to grant the user the Apache
+ service runs as read and execute (RX) access to the whole Apache2
+ directory, except the <code>logs</code> subdirectory, where the
+ user has to have at least change (RWXD) rights.</note>
+
+ <p>If you allow the account to log in as a user and as a service,
+ then you can log on with that account and test that the account has the
+ privileges to execute the scripts, read the web pages, and that
+ you can start Apache in a console window. If this works, and you
+ have followed the steps above, Apache should execute as a service
+ with no problems.</p>
+
+ <note><strong>Error code 2186</strong> is a good indication that
+ you need to review the "Log On As" configuration for the service,
+ since Apache cannot access a required network resource. Also, pay
+ close attention to the privileges of the user Apache is
+ configured to run as.</note>
+
+ <p>When starting Apache as a service you may encounter an error
+ message from the Windows Service Control Manager. For example,
+ if you try to start Apache by using the Services applet in the
+ Windows Control Panel, you may get the following message:</p>
+
+ <example>
+ Could not start the Apache2 service on \\COMPUTER <br />
+ Error 1067; The process terminated unexpectedly.
+ </example>
+
+ <p>You will get this generic error if there is any problem with
+ starting the Apache service. In order to see what is really causing
+ the problem you should follow the instructions for Running Apache
+ for Windows from the Command Prompt.</p>
+
+ <p>There is some support for Apache on Windows 9x to behave in a
+ similar manner as a service on Windows NT. It is <strong>highly
+ experimental</strong>. It is not of production-class reliability,
+ and its future is not guaranteed. It can be mostly regarded as
+ a risky thing to play with - proceed with caution!</p>
+
+ <p>There are some differences between the two kinds of services
+ you should be aware of:</p>
+
+ <ul>
+ <li><p>Apache will attempt to start and if successful it will run
+ in the background. If you run the command</p>
+
+ <example>
+ apache -n "MyServiceName" -k start
+ </example>
+
+ <p>via a shortcut on your desktop, for example, then if the
+ service starts successfully, a console window will flash up but
+ it immediately disappears. If Apache detects any errors on startup
+ such as incorrect entries in the httpd.conf configuration file,
+ the console window will remain visible. This will display an error
+ message which will be useful in tracking down the cause of the
+ problem.</p></li>
+
+ <li><p>Windows 9x does not support <code>NET START</code> or
+ <code>NET STOP</code> commands. You must control the Apache
+ service on the command prompt via the <code>-k</code> switches.
+ </p></li>
+
+ <li><p>Apache and Windows 9x offer no support for running Apache
+ as a specific user with network privileges. In fact, Windows 9x
+ offers no security on the local machine, either. This is the
+ simple reason because of which the Apache Software Foundation
+ never endorses use of a Windows 9x -based system as a public
+ Apache server. The primitive support for Windows 9x exists only
+ to assist the user in developing web content and learning the
+ Apache server, and perhaps as an intranet server on a secured,
+ private network.</p></li>
+
+ </ul>
+
+ <p>Once you have confirmed that Apache runs correctly as a
+ console application you can install, control and uninstall the
+ pseudo-service with the same commands as on Windows NT. You can
+ also use the Apache Service Monitor to manage Windows 9x
+ pseudo-services.</p>
+
+ </section>
+
+ <section id="wincons">
+ <title>Running Apache as a Console Application</title>
+
+ <p>Running Apache as a service is usually the recommended way to
+ use it, but it is sometimes easier to work from the command line
+ (on Windows 9x running Apache from the command line is the
+ recommended way due to the lack of reliable service support.)</p>
+
+ <p>To run Apache from the command line as a console application,
+ use the following command:</p>
+
+ <example>
+ apache
+ </example>
+
+ <p>Apache will execute, and will remain running until it is stopped
+ by pressing Control-C.</p>
+
+ <p>You can also run Apache via the shortcut Start Apache in Console
+ placed to <code>Start Menu --> Programs --> Apache HTTP Server
+ 2.0.xx --> Control Apache Server</code> during the installation.
+ This will open a console window and start Apache inside it. If you
+ don't have Apache installed as a service, the window will remain
+ visible until you stop Apache by pressing Control-C in the console
+ window where Apache is running in. The server will exit in a few
+ seconds. However, if you do have Apache installed as a service, the
+ shortcut starts the service. If the Apache service is running
+ already, the shortcut doesn't do anything.</p>
+
+ <p>You can tell a running Apache to stop by opening another console
+ window and entering:</p>
+
+ <example>
+ apache -k shutdown
+ </example>
+
+ <p>This should be preferred over pressing Control-C because this
+ lets Apache end any current operations and clean up gracefully.</p>
+
+ <p>You can also tell Apache to restart. This forces it to reread
+ the configuration file. Any operations in progress are allowed to
+ complete without interruption. To restart Apache, use:</p>
<example>
apache -k restart
@@ -604,9 +529,176 @@
<note>Note for people familiar with the Unix version of Apache:
these commands provide a Windows equivalent to <code>kill -TERM
- <em>pid</em></code> and <code>kill -USR1 <em>pid</em></code>.
- The command line option used, <code>-k</code>, was chosen as a
- reminder of the "<code>kill</code>" command used on Unix.</note>
+ <em>pid</em></code> and <code>kill -USR1 <em>pid</em></code>. The
+ command line option used, <code>-k</code>, was chosen as a reminder
+ of the <code>kill</code> command used on Unix.</note>
+
+ <p>If the Apache console window closes immediately or unexpectedly
+ after startup, open the Command Prompt from the Start Menu -->
+ Programs. Change to the folder to which you installed Apache, type
+ the command <code>apache</code>, and read the error message. Then
+ change to the logs folder, and review the <code>error.log</code>
+ file for configuration mistakes. If you accepted the defaults when
+ you installed Apache, the commands would be:</p>
+
+ <example>
+ c: <br />
+ cd "\Program Files\Apache Group\Apache2\bin" <br />
+ apache
+ </example>
+
+ <p>Then wait for Apache to stop, or press Control-C. Then enter the
+ following:</p>
+
+ <example>
+ cd ..\logs <br />
+ more < error.log
+ </example>
+
+ <p>When working with Apache it is important to know how it will
+ find the configuration file. You can specify a configuration file
+ on the command line in two ways:</p>
+
+ <ul>
+ <li><p><code>-f</code> specifies an absolute or relative path to
+ a particular configuration file:</p>
+
+ <example>
+ apache -f "c:\my server files\anotherconfig.conf"
+ </example>
+
+ <p>or</p>
+
+ <example>
+ apache -f files\anotherconfig.conf
+ </example></li>
+
+ <li><p><code>-n</code> specifies the installed Apache service
+ whose configuration file is to be used:</p>
+
+ <example>
+ apache -n "MyServiceName"
+ </example>
+ </li>
+ </ul>
+
+ <p>In both of these cases, the proper
+ <directive module="core">ServerRoot</directive> should be set in
+ the configuration file.</p>
+
+ <p>If you don't specify a configuration file with <code>-f</code>
+ or <code>-n</code>, Apache will use the file name compiled into the
+ server, such as <code>conf\httpd.conf</code>. This built-in path
+ is relative to the installation directory. You can verify the compiled
+ file name from a value labelled as <code>SERVER_CONFIG_FILE</code> when
+ invoking Apache with the <code>-V</code> switch, like this:</p>
+
+ <example>
+ apache -V
+ </example>
+
+ <p>Apache will then try to determine its <directive module="core">
+ ServerRoot</directive> by trying the following, in this order:</p>
+
+ <ol>
+ <li>A <directive module="core">ServerRoot</directive> directive
+ via the <code>-C</code> command line switch.</li>
+
+ <li>The <code>-d</code> switch on the command line.</li>
+
+ <li>Current working directory.</li>
+
+ <li>A registry entry which was created if you did a binary
+ installation.</li>
+
+ <li>The server root compiled into the server. This is <code>
+ /apache</code> by default, you can verify it by using <code>
+ apache -V</code> and looking for a value labelled as
+ <code>HTTPD_ROOT</code>.</li>
+ </ol>
+
+ <p>During the installation, a version-specific registry key is
+ created in the Windows registry. The location of this key depends
+ on the type of the installation. If you chose to install Apache
+ for all users, the key is located under the
+ <code>HKEY_LOCAL_MACHINE</code> hive, like this (the version
+ numbers will of course vary between different versions of Apache:
+ </p>
+
+ <example>
+ HKEY_LOCAL_MACHINE\SOFTWARE\Apache Group\Apache\2.0.43
+ </example>
+
+ <p>Correspondingly, if you chose to install Apache for the current
+ user only, the key is located under the <code>HKEY_CURRENT_USER</code>
+ hive, the contents of which are dependent of the user currently
+ logged on:</p>
+
+ <example>
+ HKEY_CURRENT_USER\SOFTWARE\Apache Group\Apache\2.0.43
+ </example>
+
+ <p>This key is compiled into the server and can enable you to test
+ new versions without affecting the current version. Of course, you
+ must take care not to install the new version in the same
+ directory as another version.</p>
+
+ <p>If you did not do a binary install, Apache will in some
+ scenarios complain about the missing registry key. This warning can
+ be ignored if the server was otherwise able to find its
+ configuration file.</p>
+
+ <p>The value of this key is the
+ <directive module="core">ServerRoot</directive> directory which
+ contains the <code>conf</code> subdirectory. When Apache starts it
+ reads the <code>httpd.conf</code> file from that directory. If
+ this file contains a <directive module="core">ServerRoot</directive>
+ directive which contains a different directory from the one
+ obtained from the registry key above, Apache will forget the
+ registry key and use the directory from the configuration file. If
+ you copy the Apache directory or configuration files to a new
+ location it is vital that you update the
+ <directive module="core">ServerRoot</directive> directive in the
+ <code>httpd.conf</code> file to reflect the new location.</p>
+
+ </section>
+
+ <section id="test">
+ <title>Testing the Installation</title>
+
+ <p>After starting Apache (either in a console window or as a
+ service) it will be listening on port 80 (unless you changed the
+ <directive module="mpm_common">Listen</directive> directive in the
+ configuration files or installed Apache only for the current user).
+ To connect to the server and access the default page, launch a
+ browser and enter this URL:</p>
+
+ <example>
+ http://localhost/
+ </example>
+
+ <p>Apache should respond with a welcome page and a link to the
+ Apache manual. If nothing happens or you get an error, look in the
+ <code>error.log</code> file in the <code>logs</code> subdirectory.
+ If your host is not connected to the net, or if you have serious
+ problems with your DNS (Domain Name Service) configuration, you
+ may have to use this URL:</p>
+
+ <example>
+ http://127.0.0.1/
+ </example>
+
+ <p>Once your basic installation is working, you should configure it
+ properly by editing the files in the <code>conf</code> subdirectory.
+ Again, if you change the configuration of the Windows NT service
+ for Apache, first attempt to start it from the command line to
+ make sure that the service starts with no errors.</p>
+
+ <p>Because Apache <strong>cannot</strong> share the same port with
+ another TCP/IP application, you may need to stop, uninstall or reconfigure
+ certain other services before running Apache. These conflicting
+ services include other WWW servers and some firewall implementations.
+ </p>
</section>
diff --git a/docs/manual/programs/apachectl.html.en b/docs/manual/programs/apachectl.html.en
index 4964819..a8ce430 100644
--- a/docs/manual/programs/apachectl.html.en
+++ b/docs/manual/programs/apachectl.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>apachectl - Apache HTTP Server Control Interface - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Programs</a></div><div id="page-content"><div id="preamble"><h1>apachectl - Apache HTTP Server Control Interface</h1>
+ -->
+<title>apachectl - Apache HTTP Server Control Interface - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Programs</a></div><div id="page-content"><div id="preamble"><h1>apachectl - Apache HTTP Server Control Interface</h1>
<p><code>apachectl</code> is a front end to the Apache HyperText
Transfer Protocol (HTTP) server. It is designed to help the
administrator control the functioning of the Apache
@@ -28,7 +40,13 @@
<p>The <code>apachectl</code> script returns a 0 exit value on
success, and >0 if an error occurs. For more details, view
the comments in the script.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#synopsis">Synopsis</a></li><li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../invoking.html">Starting Apache</a></li><li><a href="../stopping.html">Stopping Apache</a></li><li><a href="../configuring.html">Configuration Files</a></li><li><a href="../platform/">Platform Docs</a></li><li><a href="httpd.html">httpd</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="synopsis" id="synopsis">Synopsis</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#synopsis">Synopsis</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="../invoking.html">Starting Apache</a></li><li><a href="../stopping.html">Stopping Apache</a></li><li><a href="../configuring.html">Configuration Files</a></li><li><a href="../platform/">Platform Docs</a></li><li><a href="httpd.html">httpd</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="synopsis" id="synopsis">Synopsis</a></h2>
<p>When acting in pass-through mode, <code>apachectl</code> can take
all the arguments available for the <a href="httpd.html">httpd</a>
@@ -41,7 +59,9 @@
<p><code><strong>apachectl </strong> <var>command</var></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="options" id="options">Options</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="options" id="options">Options</a></h2>
<p>Only the SysV init-style options are defined here. Other arguments
are defined on the <a href="httpd.html">httpd</a> manual page.</p>
@@ -117,4 +137,8 @@
</dl>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/httpd.html.en b/docs/manual/programs/httpd.html.en
index 4773065..efa5e1a 100644
--- a/docs/manual/programs/httpd.html.en
+++ b/docs/manual/programs/httpd.html.en
@@ -4,16 +4,35 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>httpd - Apache Hypertext Transfer Protocol Server - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Programs</a></div><div id="page-content"><div id="preamble"><h1>httpd - Apache Hypertext Transfer Protocol Server</h1>
+ -->
+<title>httpd - Apache Hypertext Transfer Protocol Server - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Programs</a></div><div id="page-content"><div id="preamble"><h1>httpd - Apache Hypertext Transfer Protocol Server</h1>
<p><code>httpd</code> is the Apache HyperText Transfer Protocol
(HTTP) server program. It is designed to be run as a standalone
daemon process. When used like this it will create a pool of
child processes or threads to handle requests.</p>
<p>In general, <code>httpd</code> should not be invoked directly,
- but rather should be invoked via <a href="apachectl.html">apachectl</a> on unix systems or as an NT
- service under win32.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#synopsis">Synopsis</a></li><li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="../invoking.html">Starting Apache</a></li><li><a href="../stopping.html">Stopping Apache</a></li><li><a href="../configuring.html">Configuration Files</a></li><li><a href="../platform/">Platform Docs</a></li><li><a href="apachectl.html">apachectl</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="synopsis" id="synopsis">Synopsis</a></h2>
+ but rather should be invoked via <a href="apachectl.html">apachectl</a> on Unix-based systems or <a href="../platform/windows.html#winsvc">as a service on Windows NT,
+ 2000 and XP</a> and <a href="../platform/windows.html#wincons">as
+ a console application on Windows 9x and ME</a>.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#synopsis">Synopsis</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="../invoking.html">Starting Apache</a></li><li><a href="../stopping.html">Stopping Apache</a></li><li><a href="../configuring.html">Configuration Files</a></li><li><a href="../platform/">Platform Docs</a></li><li><a href="apachectl.html">apachectl</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="synopsis" id="synopsis">Synopsis</a></h2>
<p><code><strong>httpd </strong>[ -<strong>d </strong><var>serverroot
</var>] [ -<strong>f </strong><var>config </var>] [ -<strong>C
@@ -34,7 +53,9 @@
<code>install|config|uninstall</code> ] [ -<strong>n </strong>
<var>name</var> ] [ -<strong>w</strong> ]</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="options" id="options">Options</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="options" id="options">Options</a></h2>
<dl>
<dt><code>-d <var>serverroot</var></code></dt>
@@ -154,4 +175,8 @@
</dl>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/httpd.xml b/docs/manual/programs/httpd.xml
index 13d0fc8..19eb7b1 100644
--- a/docs/manual/programs/httpd.xml
+++ b/docs/manual/programs/httpd.xml
@@ -15,8 +15,10 @@
<p>In general, <code>httpd</code> should not be invoked directly,
but rather should be invoked via <a
- href="apachectl.html">apachectl</a> on unix systems or as an NT
- service under win32.</p>
+ href="apachectl.html">apachectl</a> on Unix-based systems or <a
+ href="../platform/windows.html#winsvc">as a service on Windows NT,
+ 2000 and XP</a> and <a href="../platform/windows.html#wincons">as
+ a console application on Windows 9x and ME</a>.</p>
</summary>
<seealso><a href="../invoking.html">Starting Apache</a></seealso>
diff --git a/docs/manual/programs/index.html.en b/docs/manual/programs/index.html.en
new file mode 100644
index 0000000..82ca9d4
--- /dev/null
+++ b/docs/manual/programs/index.html.en
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>Server and Supporting Programs - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="../"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Server and Supporting Programs</h1>
+ <p>This page documents all the executable programs included
+ with the Apache HTTP 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="index" id="index">Index</a></h2>
+
+ <dl>
+ <dt><a href="httpd.html">httpd</a></dt>
+
+ <dd>Apache hypertext transfer protocol server</dd>
+
+ <dt><a href="apachectl.html">apachectl</a></dt>
+
+ <dd>Apache HTTP server control interface</dd>
+
+ <dt><a href="ab.html">ab</a></dt>
+
+ <dd>Apache HTTP server benchmarking tool</dd>
+
+ <dt><a href="apxs.html">apxs</a></dt>
+
+ <dd>APache eXtenSion tool</dd>
+
+ <dt><a href="dbmmanage.html">dbmmanage</a></dt>
+
+ <dd>Create and update user authentication files in DBM format
+ for basic authentication</dd>
+
+ <dt><a href="htdigest.html">htdigest</a></dt>
+
+ <dd>Create and update user authentication files for digest
+ authentication</dd>
+
+ <dt><a href="htpasswd.html">htpasswd</a></dt>
+
+ <dd>Create and update user authentication files for basic
+ authentication</dd>
+
+ <dt><a href="logresolve.html">logresolve</a></dt>
+
+ <dd>Resolve hostnames for IP-addresses in Apache
+ logfiles</dd>
+
+ <dt><a href="rotatelogs.html">rotatelogs</a></dt>
+
+ <dd>Rotate Apache logs without having to kill the server</dd>
+
+ <dt><a href="suexec.html">suexec</a></dt>
+
+ <dd>Switch User For Exec</dd>
+
+ <dt><a href="other.html">Other Programs</a></dt>
+ </dl>
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/index.html b/docs/manual/programs/index.xml
old mode 100755
new mode 100644
similarity index 67%
rename from docs/manual/programs/index.html
rename to docs/manual/programs/index.xml
index 2cb298a..2fd843e
--- a/docs/manual/programs/index.html
+++ b/docs/manual/programs/index.xml
@@ -1,22 +1,18 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
+<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
+<manualpage>
+<relativepath href=".."/>
+<parentdocument href="../"/>
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta name="generator" content="HTML Tidy, see www.w3.org" />
+ <title>Server and Supporting Programs</title>
- <title>Apache HTTP Server and Supporting Programs</title>
- </head>
- <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
-
- <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
- vlink="#000080" alink="#FF0000">
- <!--#include virtual="header.html" -->
-
- <h1 align="center">Server and Supporting Programs</h1>
-
+<summary>
<p>This page documents all the executable programs included
with the Apache HTTP Server.</p>
+</summary>
+
+<section id="index"><title>Index</title>
<dl>
<dt><a href="httpd.html">httpd</a></dt>
@@ -65,7 +61,6 @@
<dt><a href="other.html">Other Programs</a></dt>
</dl>
- <!--#include virtual="footer.html" -->
- </body>
-</html>
+</section>
+</manualpage>
\ No newline at end of file
diff --git a/docs/manual/programs/rotatelogs.html b/docs/manual/programs/rotatelogs.html
index 45f233b..7bf88d1 100644
--- a/docs/manual/programs/rotatelogs.html
+++ b/docs/manual/programs/rotatelogs.html
@@ -7,20 +7,23 @@
<!--#include virtual="header.html" -->
<h1 align="center">Manual Page: rotatelogs</h1>
<!-- This document was autogenerated from the man page -->
-<pre>
-<strong>NAME</strong>
+<pre><strong>NAME</strong>
rotatelogs - rotate Apache logs without having to kill the
server
<strong>SYNOPSIS</strong>
- <strong>rotatelogs </strong><em>logfile rotationtime </em>[<em>offset</em>]
+ <strong>rotatelogs </strong><em>logfile </em>[<em>rotationtime </em>[<em>offset</em>]] | [<em>filesize</em>M]
<strong>DESCRIPTION</strong>
<strong>rotatelogs </strong>is a simple program for use in conjunction with
Apache's piped logfile feature, which can be used like this:
CustomLog "|bin/rotatelogs /var/logs/logfile 86400" common
-
+
+ or
+
+ CustomLog "|bin/rotatelogs /var/logs/logfile 5M" common
+
This creates the files /var/logs/logfile.nnnn where nnnn is
the system time at which the log nominally starts (this time
will always be a multiple of the rotation time, so you can
@@ -43,6 +46,13 @@
zero is assumed and UTC is used. For example, to use
local time in the zone UTC -5 hours, specify a value of
-<em>300 </em>for this argument.
+
+ or
+
+ <em>filesize</em>M
+ The maximum file size in megabytes followed by the
+ letter 'M' to specify size rather than time. Use this
+ parameter in place of both rotationtime and offset.
<strong>PORTABILITY</strong>
The following logfile format string substitutions should be
diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index f553646..2f0c0de 100644
--- a/docs/manual/sections.html.en
+++ b/docs/manual/sections.html.en
@@ -4,12 +4,34 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Configuration Sections - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Configuration Sections</h1> <p>Directives in the <a href="configuring.html">configuration files</a> may apply to the
+ -->
+<title>Configuration Sections - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Configuration Sections</h1> <p>Directives in the <a href="configuring.html">configuration files</a> may apply to the
entire server, or they may be restricted to apply only to particular
directories, files, hosts, or URLs. This document describes how to
use configuration section containers or <code>.htaccess</code> files
to change the scope of other configuration directives.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#types">Types of Configuration Section Containers</a></li><li><img alt="" src="./images/down.gif" /> <a href="#file-and-web">Filesystem and Webspace</a></li><li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">Virtual Hosts</a></li><li><img alt="" src="./images/down.gif" /> <a href="#proxy">Proxy</a></li><li><img alt="" src="./images/down.gif" /> <a href="#whatwhere">What Directives are Allowed?</a></li><li><img alt="" src="./images/down.gif" /> <a href="#mergin">How the sections are merged</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="types" id="types">Types of Configuration Section Containers</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#types">Types of Configuration Section Containers</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#file-and-web">Filesystem and Webspace</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">Virtual Hosts</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#proxy">Proxy</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#whatwhere">What Directives are Allowed?</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#mergin">How the sections are merged</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="types" id="types">Types of Configuration Section Containers</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/core.html">core</a></code></li><li><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#directory"><Directory></a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch"><DirectoryMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#files"><Files></a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch"><FilesMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code></li><li><code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code></li><li><code class="directive"><a href="./mod/core.html#location"><Location></a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch"><LocationMatch></a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxy"><Proxy></a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxymatch"><ProxyMatch></a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code></li></ul></td></tr></table>
@@ -59,7 +81,9 @@
can apply negative conditions by preceding their test with "!".
Also, these sections can be nested to achieve more complex
restrictions.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="file-and-web" id="file-and-web">Filesystem and Webspace</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="file-and-web" id="file-and-web">Filesystem and Webspace</a></h2>
<p>The most commonly used configuration section containers are the
ones that change the configuration of particular places in the
@@ -246,14 +270,18 @@
to all requests regardless of the specific URL.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="virtualhost" id="virtualhost">Virtual Hosts</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="virtualhost" id="virtualhost">Virtual Hosts</a></h2>
<p>The <code class="directive"><a href="./mod/core.html#virtualhost"><VirtualHost></a></code>
container encloses directives that apply to specific hosts.
This is useful when serving multiple hosts from the same machine
with a different configuration for each. For more information,
see the <a href="vhosts/">Virtual Host Documentation</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="proxy" id="proxy">Proxy</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="proxy" id="proxy">Proxy</a></h2>
<p>The <code class="directive"><a href="./mod/mod_proxy.html#proxy"><Proxy></a></code>
and <code class="directive"><a href="./mod/mod_proxy.html#proxymatch"><ProxyMatch></a></code>
@@ -269,7 +297,9 @@
Deny from all<br />
</Proxy>
</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="whatwhere" id="whatwhere">What Directives are Allowed?</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="whatwhere" id="whatwhere">What Directives are Allowed?</a></h2>
<p>To find out what directives are allowed in what types of
configuration sections, check the <a href="mod/directive-dict.html#Context">Context</a> of the directive.
@@ -299,7 +329,9 @@
and <code class="directive"><a href="./mod/core.html#filesmatch"><FilesMatch></a></code>
sections.</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="mergin" id="mergin">How the sections are merged</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="mergin" id="mergin">How the sections are merged</a></h2>
<p>The configuration sections are applied in a very particular order.
Since this can have important effects on how configuration directives
@@ -403,4 +435,8 @@
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/server-wide.html.en b/docs/manual/server-wide.html.en
index a51a758..18d471d 100644
--- a/docs/manual/server-wide.html.en
+++ b/docs/manual/server-wide.html.en
@@ -4,11 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Server-Wide Configuration - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Server-Wide Configuration</h1>
+ -->
+<title>Server-Wide Configuration - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Server-Wide Configuration</h1>
<p>This document explains some of the directives provided by
the <code class="module"><a href="./mod/core.html">core</a></code> server which are used to configure
the basic operations of the server.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#identification">Server Identification</a></li><li><img alt="" src="./images/down.gif" /> <a href="#locations">File Locations</a></li><li><img alt="" src="./images/down.gif" /> <a href="#resource">Limiting Resource Usage</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="identification" id="identification">Server Identification</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#identification">Server Identification</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#locations">File Locations</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#resource">Limiting Resource Usage</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="identification" id="identification">Server Identification</a></h2>
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#servername">ServerName</a></code></li><li><code class="directive"><a href="./mod/core.html#serveradmin">ServerAdmin</a></code></li><li><code class="directive"><a href="./mod/core.html#serversignature">ServerSignature</a></code></li><li><code class="directive"><a href="./mod/core.html#servertokens">ServerTokens</a></code></li><li><code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code></li></ul></td></tr></table>
@@ -28,7 +47,9 @@
directory name, Apache must redirect the client to the full
name including the trailing slash so that the client will
correctly resolve relative references in the 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="locations" id="locations">File Locations</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="locations" id="locations">File Locations</a></h2>
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></code></li><li><code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#lockfile">LockFile</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code></li><li><code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code></li></ul></td></tr></table>
@@ -40,7 +61,9 @@
about locating files in paths which are writable by non-root users.
See the <a href="misc/security_tips.html#serverroot">security tips</a>
documentation for more details.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="resource" id="resource">Limiting Resource Usage</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="resource" id="resource">Limiting Resource Usage</a></h2>
<table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#limitrequestbody">LimitRequestBody</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestfields">LimitRequestFields</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestfieldsize">LimitRequestFieldsize</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestline">LimitRequestLine</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitcpu">RLimitCPU</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitmem">RLimitMEM</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitnproc">RLimitNPROC</a></code></li><li><code class="directive"><a href="./mod/mpm_netware.html#threadstacksize">ThreadStackSize</a></code></li></ul></td></tr></table>
@@ -59,4 +82,8 @@
<p>The <code class="directive"><a href="./mod/mpm_netware.html#threadstacksize">ThreadStackSize</a></code> directive
is used only on Netware to control the stack size.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.html.de b/docs/manual/sitemap.html.de
new file mode 100644
index 0000000..3287893
--- /dev/null
+++ b/docs/manual/sitemap.html.de
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>Seitenindex - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page">
+<div id="page-header">
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="./">Version 2.0</a></div>
+<div id="page-content"><div id="preamble"><h1>Seitenindex</h1>
+
+<p>Diese Seite verzeichnet die zur Zeit verfügbaren Dokumente der
+<a href="./">Dokumentation zum Apache HTTP Server Version 2.0</a>.</p>
+</div>
+<div id="quickview"><ul id="toc">
+<li><img alt="" src="./images/down.gif" /> <a href="#release">Hinweise zur Version</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#using">Bedienung des Apache HTTP Servers</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#vhosts">Virtual-Host-Dokumentation des Apache</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#faq">Häufig gestellte Fragen (FAQ)</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#ssl">SSL/TLS-Verschlüsselung des Apache</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#howto">Praxis / Anleitungen</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#platform">Plattform-spezifische Anmerkungen</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#programs">Apache HTTP Server und Hilfsprogramme</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#misc">Weitere Apache-Dokumentationen</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#modules">Apache-Module</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#developer">Dokumentation für Entwickler</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#descriptive">Beschreibende Informationen</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="release" id="release">Hinweise zur Version</a></h2>
+<ul><li><a href="upgrading.html">Upgrade von 1.3 auf 2.0</a></li>
+<li><a href="new_features_2_0.html">Neue Funktionen in Version 2.0</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">Bedienung des Apache HTTP Servers</a></h2>
+<ul><li><a href="install.html">Kompilieren und Installieren</a></li>
+<li><a href="invoking.html">Apache starten</a></li>
+<li><a href="stopping.html">Beenden und Neustarten des Servers</a></li>
+<li><a href="configuring.html">Konfigurationsdateien</a></li>
+<li><a href="sections.html">Konfigurationsabschnitte</a></li>
+<li><a href="server-wide.html">Serverweite Konfiguration</a></li>
+<li><a href="logs.html">Log-Dateien</a></li>
+<li><a href="urlmapping.html">URLs auf das Dateisystem abbilden</a></li>
+<li><a href="misc/security_tips.html">Tipps zur Sicherheit</a></li>
+<li><a href="dso.html">Dynamic Shared Object (DSO)</a></li>
+<li><a href="content-negotiation.html">Content Negotiation</a></li>
+<li><a href="custom-error.html">Individuelle Fehlermeldungen</a></li>
+<li><a href="bind.html">Bestimmen der vom Apache verwendeten Adressen und Ports</a></li>
+<li><a href="mpm.html">Multi-Processing-Module (MPMs)</a></li>
+<li><a href="env.html">Umgebungsvariablen</a></li>
+<li><a href="handler.html">Handler</a></li>
+<li><a href="filter.html">Filter</a></li>
+<li><a href="suexec.html">suEXEC Unterstützung</a></li>
+<li><a href="misc/perf-tuning.html">Performance-Hinweise</a></li>
+<li><a href="misc/rewriteguide.html">Einführung in die URL-Manipulation</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="vhosts" id="vhosts">Virtual-Host-Dokumentation des Apache</a></h2>
+<ul><li class="separate"><a href="vhosts/">Übersicht</a></li>
+<li><a href="vhosts/name-based.html">Namensbasierte Virtual Hosts</a></li>
+<li><a href="vhosts/ip-based.html">IP-basierte Virtual Hosts</a></li>
+<li><a href="vhosts/mass.html">Dynamisch konfiguriertes Massen-Virtual-Hosting</a></li>
+<li><a href="vhosts/examples.html">Virtual-Host-Beispiele</a></li>
+<li><a href="vhosts/details.html">Tiefergehende Erörterung des Virtual-Hosts-Matchings</a></li>
+<li><a href="vhosts/fd-limits.html">Datei-Deskriptor-Begrenzungen</a></li>
+<li><a href="dns-caveats.html">Probleme bezüglich DNS und Apache</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="faq" id="faq">Häufig gestellte Fragen (FAQ)</a></h2>
+<ul><li class="separate"><a href="faq/">Übersicht</a></li>
+<li><a href="faq/support.html">Support</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="ssl" id="ssl">SSL/TLS-Verschlüsselung des Apache</a></h2>
+<ul><li class="separate"><a href="ssl/">Übersicht</a></li>
+<li><a href="ssl/ssl_intro.html">SSL/TLS-Verschlüsselung: Einführung</a></li>
+<li><a href="ssl/ssl_compat.html">SSL/TLS-Verschlüsselung: Kompatibilität</a></li>
+<li><a href="ssl/ssl_howto.html">SSL/TLS-Verschlüsselung: Praxis</a></li>
+<li><a href="ssl/ssl_faq.html">SSL/TLS-Verschlüsselung: FAQ</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="howto" id="howto">Praxis / Anleitungen</a></h2>
+<ul><li class="separate"><a href="howto/">Übersicht</a></li>
+<li><a href="howto/auth.html">Authentisierung, Autorisierung und Zugriffskontrolle</a></li>
+<li><a href="howto/cgi.html">Dynamische Inhalte mit CGI</a></li>
+<li><a href="howto/ssi.html">Einführung in Server Side Includes</a></li>
+<li><a href="howto/htaccess.html">.htaccess-Dateien</a></li>
+<li><a href="howto/public_html.html">Web-Verzeichnisse für Benutzer</a></li>
+<li><a href="misc/tutorials.html">Apache-Tutorials</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="platform" id="platform">Plattform-spezifische Anmerkungen</a></h2>
+<ul><li class="separate"><a href="platform/">Übersicht</a></li>
+<li><a href="platform/windows.html">Apache unter Microsoft
+Windows einsetzen</a></li>
+<li><a href="platform/win_compiling.html">Kompilieren des Apache für
+Microsoft Windows</a></li>
+<li><a href="platform/netware.html">Apache unter Novell NetWare einsetzen</a></li>
+<li><a href="platform/perf-hp.html">Einen Hochleistungs-Web-Server auf
+HPUX betreiben</a></li>
+<li><a href="platform/ebcdic.html">Die Apache EBCDIC-Portierung</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="programs" id="programs">Apache HTTP Server und Hilfsprogramme</a></h2>
+<ul><li class="separate"><a href="programs/">Übersicht</a></li>
+<li><a href="programs/httpd.html">httpd</a></li>
+<li><a href="programs/ab.html">ab</a></li>
+<li><a href="programs/apachectl.html">apachectl</a></li>
+<li><a href="programs/apxs.html">apxs</a></li>
+<li><a href="programs/dbmmanage.html">dbmmanage</a></li>
+<li><a href="programs/htdigest.html">htdigest</a></li>
+<li><a href="programs/htpasswd.html">htpasswd</a></li>
+<li><a href="programs/logresolve.html">logresolve</a></li>
+<li><a href="programs/rotatelogs.html">rotatelogs</a></li>
+<li><a href="programs/suexec.html">suexec</a></li>
+<li><a href="programs/other.html">Sonstige Programme</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="misc" id="misc">Weitere Apache-Dokumentationen</a></h2>
+<ul><li class="separate"><a href="misc/">Übersicht</a></li>
+<li><a href="misc/custom_errordocs.html">International angepaßte Server-Fehlermeldungen</a></li>
+<li><a href="misc/fin_wait_2.html">Verbindungen im FIN_WAIT_2 und Apache</a></li>
+<li><a href="misc/known_client_problems.html">Bekannte Client-Probleme</a></li>
+<li><a href="misc/descriptors.html">Deskriptoren und Apache</a></li>
+<li><a href="cgi_path.html">PATH_INFO-Änderungen in der CGI-Umgebung</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="modules" id="modules">Apache-Module</a></h2>
+<ul><li><a href="mod/">Modul-Index</a></li>
+<li><a href="mod/directives.html">Direktiven-Index</a></li>
+<li><a href="mod/quickreference.html">Kurzreferenz der Direktiven</a></li>
+</ul><ul><li><a href="mod/core.html">Apache-Kernfunktionen</a></li>
+<li><a href="mod/mpm_common.html">Allgemeine Direktiven der Apache-MPMs</a></li>
+<li><a href="mod/beos.html">Apache-MPM beos</a></li>
+<li><a href="mod/leader.html">Apache-MPM leader</a></li>
+<li><a href="mod/mpm_netware.html">Apache-MPM netware</a></li>
+<li><a href="mod/mpmt_os2.html">Apache-MPM os2</a></li>
+<li><a href="mod/perchild.html">Apache-MPM perchild</a></li>
+<li><a href="mod/prefork.html">Apache-MPM prefork</a></li>
+<li><a href="mod/threadpool.html">Apache-MPM threadpool</a></li>
+<li><a href="mod/mpm_winnt.html">Apache-MPM winnt</a></li>
+<li><a href="mod/worker.html">Apache-MPM worker</a></li>
+</ul><ul><li><a href="mod/mod_access.html">Apache-Modul mod_access</a></li>
+<li><a href="mod/mod_actions.html">Apache-Modul mod_actions</a></li>
+<li><a href="mod/mod_alias.html">Apache-Modul mod_alias</a></li>
+<li><a href="mod/mod_asis.html">Apache-Modul mod_asis</a></li>
+<li><a href="mod/mod_auth.html">Apache-Modul mod_auth</a></li>
+<li><a href="mod/mod_auth_anon.html">Apache-Modul mod_auth_anon</a></li>
+<li><a href="mod/mod_auth_dbm.html">Apache-Modul mod_auth_dbm</a></li>
+<li><a href="mod/mod_auth_digest.html">Apache-Modul mod_auth_digest</a></li>
+<li><a href="mod/mod_auth_ldap.html">Apache-Modul mod_auth_ldap</a></li>
+<li><a href="mod/mod_autoindex.html">Apache-Modul mod_autoindex</a></li>
+<li><a href="mod/mod_cache.html">Apache-Modul mod_cache</a></li>
+<li><a href="mod/mod_cern_meta.html">Apache-Modul mod_cern_meta</a></li>
+<li><a href="mod/mod_cgi.html">Apache-Modul mod_cgi</a></li>
+<li><a href="mod/mod_cgid.html">Apache-Modul mod_cgid</a></li>
+<li><a href="mod/mod_charset_lite.html">Apache-Modul mod_charset_lite</a></li>
+<li><a href="mod/mod_dav.html">Apache-Modul mod_dav</a></li>
+<li><a href="mod/mod_dav_fs.html">Apache-Modul mod_dav_fs</a></li>
+<li><a href="mod/mod_deflate.html">Apache-Modul mod_deflate</a></li>
+<li><a href="mod/mod_dir.html">Apache-Modul mod_dir</a></li>
+<li><a href="mod/mod_disk_cache.html">Apache-Modul mod_disk_cache</a></li>
+<li><a href="mod/mod_echo.html">Apache-Modul mod_echo</a></li>
+<li><a href="mod/mod_env.html">Apache-Modul mod_env</a></li>
+<li><a href="mod/mod_example.html">Apache-Modul mod_example</a></li>
+<li><a href="mod/mod_expires.html">Apache-Modul mod_expires</a></li>
+<li><a href="mod/mod_ext_filter.html">Apache-Modul mod_ext_filter</a></li>
+<li><a href="mod/mod_file_cache.html">Apache-Modul mod_file_cache</a></li>
+<li><a href="mod/mod_headers.html">Apache-Modul mod_headers</a></li>
+<li><a href="mod/mod_imap.html">Apache-Modul mod_imap</a></li>
+<li><a href="mod/mod_include.html">Apache-Modul mod_include</a></li>
+<li><a href="mod/mod_info.html">Apache-Modul mod_info</a></li>
+<li><a href="mod/mod_isapi.html">Apache-Modul mod_isapi</a></li>
+<li><a href="mod/mod_ldap.html">Apache-Modul mod_ldap</a></li>
+<li><a href="mod/mod_log_config.html">Apache-Modul mod_log_config</a></li>
+<li><a href="mod/mod_logio.html">Apache-Modul mod_logio</a></li>
+<li><a href="mod/mod_mem_cache.html">Apache-Modul mod_mem_cache</a></li>
+<li><a href="mod/mod_mime.html">Apache-Modul mod_mime</a></li>
+<li><a href="mod/mod_mime_magic.html">Apache-Modul mod_mime_magic</a></li>
+<li><a href="mod/mod_negotiation.html">Apache-Modul mod_negotiation</a></li>
+<li><a href="mod/mod_proxy.html">Apache-Modul mod_proxy</a></li>
+<li><a href="mod/mod_proxy_connect.html">Apache-Modul mod_proxy_connect</a></li>
+<li><a href="mod/mod_proxy_ftp.html">Apache-Modul mod_proxy_ftp</a></li>
+<li><a href="mod/mod_proxy_http.html">Apache-Modul mod_proxy_http</a></li>
+<li><a href="mod/mod_rewrite.html">Apache-Modul mod_rewrite</a></li>
+<li><a href="mod/mod_setenvif.html">Apache-Modul mod_setenvif</a></li>
+<li><a href="mod/mod_so.html">Apache-Modul mod_so</a></li>
+<li><a href="mod/mod_speling.html">Apache-Modul mod_speling</a></li>
+<li><a href="mod/mod_ssl.html">Apache-Modul mod_ssl</a></li>
+<li><a href="mod/mod_status.html">Apache-Modul mod_status</a></li>
+<li><a href="mod/mod_suexec.html">Apache-Modul mod_suexec</a></li>
+<li><a href="mod/mod_unique_id.html">Apache-Modul mod_unique_id</a></li>
+<li><a href="mod/mod_userdir.html">Apache-Modul mod_userdir</a></li>
+<li><a href="mod/mod_usertrack.html">Apache-Modul mod_usertrack</a></li>
+<li><a href="mod/mod_vhost_alias.html">Apache-Modul mod_vhost_alias</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="developer" id="developer">Dokumentation für Entwickler</a></h2>
+<ul><li class="separate"><a href="developer/">Übersicht</a></li>
+<li><a href="developer/API.html">Anmerkungen zur Apache-API</a></li>
+<li><a href="developer/debugging.html">Debuggen der Speicher-Belegung in der APR </a></li>
+<li><a href="developer/documenting.html">Apache 2.0 dokumentieren</a></li>
+<li><a href="developer/hooks.html">Hook-Funktionen des Apache 2.0 </a></li>
+<li><a href="developer/layeredio.html">Gestaffelte E/A des Apache 2.0</a></li>
+<li><a href="developer/modules.html">Module von Apache 1.3 nach Apache 2.0 konvertieren</a></li>
+<li><a href="developer/request.html">Verarbeitung der Anfragen im Apache 2.0</a></li>
+<li><a href="developer/filters.html">Wie Filter im Apache 2.0 arbeiten</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="descriptive" id="descriptive">Beschreibende Informationen</a></h2>
+<ul><li><a href="mod/module-dict.html">Erklärung der Fachbegriffe zu Apache-Modulen</a></li>
+<li><a href="mod/directive-dict.html">Erklärung der Fachbegriffe zu Apache-Direktiven</a></li>
+<li><a href="glossary.html">Glossar</a></li>
+<li>Seitenindex (dieses Dokument)</li>
+</ul>
+</div></div>
+<div id="footer">
+<p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index 1c77101..9b455d3 100644
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -4,12 +4,48 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Site Map - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Site Map</h1>
+ -->
+<title>Site Map - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page">
+<div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div>
+<div id="page-content"><div id="preamble"><h1>Site Map</h1>
+
<p>This page lists the currently available documents of the
<a href="./">Apache HTTP Server Version 2.0 Documentation</a>.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#release">Release Notes</a></li><li><img alt="" src="./images/down.gif" /> <a href="#using">Using the Apache HTTP Server</a></li><li><img alt="" src="./images/down.gif" /> <a href="#vhosts">Apache Virtual Host documentation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#faq">Apache Server Frequently Asked Questions</a></li><li><img alt="" src="./images/down.gif" /> <a href="#ssl">Apache SSL/TLS Encryption</a></li><li><img alt="" src="./images/down.gif" /> <a href="#howto">Guides, Tutorials, and HowTos</a></li><li><img alt="" src="./images/down.gif" /> <a href="#platform">Platform-specific Notes</a></li><li><img alt="" src="./images/down.gif" /> <a href="#programs">Apache HTTP Server and Supporting Programs</a></li><li><img alt="" src="./images/down.gif" /> <a href="#misc">Apache Miscellaneous Documentation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#modules">Apache modules</a></li><li><img alt="" src="./images/down.gif" /> <a href="#developer">Developer Documentation</a></li><li><img alt="" src="./images/down.gif" /> <a href="#descriptive">Descriptive Information</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="release" id="release">Release Notes</a></h2><ul><li><a href="upgrading.html">Upgrading to 2.0 from 1.3</a></li>
+</div>
+<div id="quickview"><ul id="toc">
+<li><img alt="" src="./images/down.gif" /> <a href="#release">Release Notes</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#using">Using the Apache HTTP Server</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#vhosts">Apache Virtual Host documentation</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#faq">Apache Server Frequently Asked Questions</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#ssl">Apache SSL/TLS Encryption</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#howto">Guides, Tutorials, and HowTos</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#platform">Platform-specific Notes</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#programs">Apache HTTP Server and Supporting Programs</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#misc">Apache Miscellaneous Documentation</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#modules">Apache modules</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#developer">Developer Documentation</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#descriptive">Descriptive Information</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="release" id="release">Release Notes</a></h2>
+<ul><li><a href="upgrading.html">Upgrading to 2.0 from 1.3</a></li>
<li><a href="new_features_2_0.html">New features with Apache 2.0</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 the Apache HTTP Server</a></h2><ul><li><a href="install.html">Compiling and Installing Apache</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 the Apache HTTP Server</a></h2>
+<ul><li><a href="install.html">Compiling and Installing Apache</a></li>
<li><a href="invoking.html">Starting Apache</a></li>
<li><a href="stopping.html">Stopping and Restarting the Server</a></li>
<li><a href="configuring.html">Configuration Files</a></li>
@@ -29,7 +65,10 @@
<li><a href="suexec.html">suEXEC Support</a></li>
<li><a href="misc/perf-tuning.html">Performance Hints</a></li>
<li><a href="misc/rewriteguide.html">URL Rewriting Guide</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="vhosts" id="vhosts">Apache Virtual Host documentation</a></h2><ul><li class="separate"><a href="vhosts/">Overview</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="vhosts" id="vhosts">Apache Virtual Host documentation</a></h2>
+<ul><li class="separate"><a href="vhosts/">Overview</a></li>
<li><a href="vhosts/name-based.html">Name-based Virtual Hosts</a></li>
<li><a href="vhosts/ip-based.html">IP-based Virtual Host Support</a></li>
<li><a href="vhosts/mass.html">Dynamically configured mass virtual hosting</a></li>
@@ -37,30 +76,45 @@
<li><a href="vhosts/details.html">An In-Depth Discussion of Virtual Host Matching</a></li>
<li><a href="vhosts/fd-limits.html">File descriptor limitations</a></li>
<li><a href="dns-caveats.html">Issues Regarding DNS and Apache</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="faq" id="faq">Apache Server Frequently Asked Questions</a></h2><ul><li class="separate"><a href="faq/">Overview</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="faq" id="faq">Apache Server Frequently Asked Questions</a></h2>
+<ul><li class="separate"><a href="faq/">Overview</a></li>
<li><a href="faq/support.html">Support</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="ssl" id="ssl">Apache SSL/TLS Encryption</a></h2><ul><li class="separate"><a href="ssl/">Overview</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="ssl" id="ssl">Apache SSL/TLS Encryption</a></h2>
+<ul><li class="separate"><a href="ssl/">Overview</a></li>
<li><a href="ssl/ssl_intro.html">SSL/TLS Encryption: An Introduction</a></li>
<li><a href="ssl/ssl_compat.html">SSL/TLS Encryption: Compatibility</a></li>
<li><a href="ssl/ssl_howto.html">SSL/TLS Encryption: How-To</a></li>
<li><a href="ssl/ssl_faq.html">SSL/TLS Encryption: FAQ</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="howto" id="howto">Guides, Tutorials, and HowTos</a></h2><ul><li><a href="howto/auth.html">Authentication</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="howto" id="howto">Guides, Tutorials, and HowTos</a></h2>
+<ul><li class="separate"><a href="howto/">Overview</a></li>
+<li><a href="howto/auth.html">Authentication</a></li>
<li><a href="howto/cgi.html">Dynamic Content with CGI</a></li>
<li><a href="howto/ssi.html">Introduction to Server Side Includes</a></li>
<li><a href="howto/htaccess.html">.htaccess files</a></li>
<li><a href="howto/public_html.html">Per-user web directories</a></li>
<li><a href="misc/tutorials.html">Apache Tutorials</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="platform" id="platform">Platform-specific Notes</a></h2><ul><li><a href="platform/windows.html">Using Apache with Microsoft
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="platform" id="platform">Platform-specific Notes</a></h2>
+<ul><li class="separate"><a href="platform/">Overview</a></li>
+<li><a href="platform/windows.html">Using Apache with Microsoft
Windows</a></li>
<li><a href="platform/win_compiling.html">Compiling Apache for
Microsoft Windows</a></li>
-<li><a href="platform/win_service.html">Running Apache for Windows as
-a Service</a></li>
<li><a href="platform/netware.html">Using Apache with Novell NetWare</a></li>
<li><a href="platform/perf-hp.html">Running a High-Performance Web
Server on HPUX</a></li>
<li><a href="platform/ebcdic.html">The Apache EBCDIC Port</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="programs" id="programs">Apache HTTP Server and Supporting Programs</a></h2><ul><li class="separate"><a href="programs/">Overview</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="programs" id="programs">Apache HTTP Server and Supporting Programs</a></h2>
+<ul><li class="separate"><a href="programs/">Overview</a></li>
<li><a href="programs/httpd.html">Manual Page: httpd</a></li>
<li><a href="programs/ab.html">Manual Page: ab</a></li>
<li><a href="programs/apachectl.html">Manual Page: apachectl</a></li>
@@ -72,34 +126,41 @@
<li><a href="programs/rotatelogs.html">Manual Page: rotatelogs</a></li>
<li><a href="programs/suexec.html">Manual Page: suexec</a></li>
<li><a href="programs/other.html">Other Programs</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="misc" id="misc">Apache Miscellaneous Documentation</a></h2><ul><li class="separate"><a href="misc/">Overview</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="misc" id="misc">Apache Miscellaneous Documentation</a></h2>
+<ul><li class="separate"><a href="misc/">Overview</a></li>
<li><a href="misc/custom_errordocs.html">International Customized Server Error Messages</a></li>
<li><a href="misc/fin_wait_2.html">Connections in FIN_WAIT_2 and Apache</a></li>
<li><a href="misc/known_client_problems.html">Known Client Problems</a></li>
<li><a href="misc/descriptors.html">Descriptors and Apache</a></li>
<li><a href="cgi_path.html">PATH_INFO Changes in the CGI Environment</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="modules" id="modules">Apache modules</a></h2><ul><li><a href="mod/">Module index</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="modules" id="modules">Apache modules</a></h2>
+<ul><li><a href="mod/">Module index</a></li>
<li><a href="mod/directives.html">Directive index</a></li>
<li><a href="mod/quickreference.html">Directive Quick-Reference</a></li>
</ul><ul><li><a href="mod/core.html">Apache Core Features</a></li>
<li><a href="mod/mpm_common.html">Apache MPM Common Directives</a></li>
+<li><a href="mod/beos.html">Apache MPM beos</a></li>
+<li><a href="mod/leader.html">Apache MPM leader</a></li>
<li><a href="mod/mpm_netware.html">Apache MPM netware</a></li>
-<li><a href="mod/mpm_winnt.html">Apache MPM winnt</a></li>
+<li><a href="mod/mpmt_os2.html">Apache MPM os2</a></li>
<li><a href="mod/perchild.html">Apache MPM perchild</a></li>
<li><a href="mod/prefork.html">Apache MPM prefork</a></li>
+<li><a href="mod/threadpool.html">Apache MPM threadpool</a></li>
+<li><a href="mod/mpm_winnt.html">Apache MPM winnt</a></li>
<li><a href="mod/worker.html">Apache MPM worker</a></li>
+</ul><ul><li><a href="mod/mod_access.html">Apache Module mod_access</a></li>
<li><a href="mod/mod_actions.html">Apache Module mod_actions</a></li>
<li><a href="mod/mod_alias.html">Apache Module mod_alias</a></li>
<li><a href="mod/mod_asis.html">Apache Module mod_asis</a></li>
-<li><a href="mod/mod_auth_basic.html">Apache Module mod_auth_basic</a></li>
+<li><a href="mod/mod_auth.html">Apache Module mod_auth</a></li>
+<li><a href="mod/mod_auth_anon.html">Apache Module mod_auth_anon</a></li>
+<li><a href="mod/mod_auth_dbm.html">Apache Module mod_auth_dbm</a></li>
<li><a href="mod/mod_auth_digest.html">Apache Module mod_auth_digest</a></li>
<li><a href="mod/mod_auth_ldap.html">Apache Module mod_auth_ldap</a></li>
-<li><a href="mod/mod_authn_anon.html">Apache Module mod_authn_anon</a></li>
-<li><a href="mod/mod_authn_dbm.html">Apache Module mod_authn_dbm</a></li>
-<li><a href="mod/mod_authn_file.html">Apache Module mod_authn_file</a></li>
-<li><a href="mod/mod_authz_dbm.html">Apache Module mod_authz_dbm</a></li>
-<li><a href="mod/mod_authz_groupfile.html">Apache Module mod_authz_groupfile</a></li>
-<li><a href="mod/mod_authz_host.html">Apache Module mod_authz_host</a></li>
<li><a href="mod/mod_autoindex.html">Apache Module mod_autoindex</a></li>
<li><a href="mod/mod_cache.html">Apache Module mod_cache</a></li>
<li><a href="mod/mod_cern_meta.html">Apache Module mod_cern_meta</a></li>
@@ -130,6 +191,9 @@
<li><a href="mod/mod_mime_magic.html">Apache Module mod_mime_magic</a></li>
<li><a href="mod/mod_negotiation.html">Apache Module mod_negotiation</a></li>
<li><a href="mod/mod_proxy.html">Apache Module mod_proxy</a></li>
+<li><a href="mod/mod_proxy_connect.html">Apache Module mod_proxy_connect</a></li>
+<li><a href="mod/mod_proxy_ftp.html">Apache Module mod_proxy_ftp</a></li>
+<li><a href="mod/mod_proxy_http.html">Apache Module mod_proxy_http</a></li>
<li><a href="mod/mod_rewrite.html">Apache Module mod_rewrite</a></li>
<li><a href="mod/mod_setenvif.html">Apache Module mod_setenvif</a></li>
<li><a href="mod/mod_so.html">Apache Module mod_so</a></li>
@@ -141,12 +205,10 @@
<li><a href="mod/mod_userdir.html">Apache Module mod_userdir</a></li>
<li><a href="mod/mod_usertrack.html">Apache Module mod_usertrack</a></li>
<li><a href="mod/mod_vhost_alias.html">Apache Module mod_vhost_alias</a></li>
-</ul><ul><li><a href="mod/obs_mod_access.html">Obsolete Apache Module mod_access</a></li>
-<li><a href="mod/obs_mod_auth.html">Obsolete Apache Module mod_auth</a></li>
-<li><a href="mod/obs_mod_auth_anon.html">Obsolete Apache Module mod_auth_anon</a></li>
-<li><a href="mod/obs_mod_auth_dbm.html">Obsolete Apache Module mod_auth_dbm</a></li>
-<li><a href="mod/obs_mod_auth_digest.html">Obsolete Apache Module mod_auth_digest</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="developer" id="developer">Developer Documentation</a></h2><ul><li class="separate"><a href="developer/">Overview</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="developer" id="developer">Developer Documentation</a></h2>
+<ul><li class="separate"><a href="developer/">Overview</a></li>
<li><a href="developer/API.html">Apache API notes</a></li>
<li><a href="developer/debugging.html">Debugging Memory Allocation in APR</a></li>
<li><a href="developer/documenting.html">Documenting Apache 2.0</a></li>
@@ -155,8 +217,16 @@
<li><a href="developer/modules.html">Converting Modules from Apache 1.3 to Apache 2.0</a></li>
<li><a href="developer/request.html">Request Processing in Apache 2.0</a></li>
<li><a href="developer/filters.html">How Filters Work in Apache 2.0</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="descriptive" id="descriptive">Descriptive Information</a></h2><ul><li><a href="mod/module-dict.html">Definitions of terms used to describe Apache modules</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="descriptive" id="descriptive">Descriptive Information</a></h2>
+<ul><li><a href="mod/module-dict.html">Definitions of terms used to describe Apache modules</a></li>
<li><a href="mod/directive-dict.html">Definitions of terms used to describe Apache directives</a></li>
<li><a href="glossary.html">Glossary</a></li>
<li>Sitemap (this document)</li>
-</ul></div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</ul>
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.html.ja.jis b/docs/manual/sitemap.html.ja.jis
index 285fb4b..70fec6e 100644
--- a/docs/manual/sitemap.html.ja.jis
+++ b/docs/manual/sitemap.html.ja.jis
@@ -5,8 +5,8 @@
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
--><title>Site Map - Apache HTTP $B%5!<%P(B</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>Site Map</h1>
-<p>$B$3$N%Z!<%8$O8=;~E@$GMxMQ2DG=(B$B$J(B
-<a href="./">Apache HTTP $B%5!<%P%P!<%8%g%s(B 2.0 $B$N%I%-%e%a(B$B%s%F!<%7%g%s(B</a>
+<p>$B$3$N%Z!<%8$O8=;~E@$GMxMQ2DG=$J(B
+<a href="./">Apache HTTP $B%5!<%P%P!<%8%g%s(B 2.0 $B$N%I%-%e%a%s%F!<%7%g%s(B</a>
$B$N0lMw$G$9!#(B
</p>
</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#release">$B%j%j!<%9$N%a%b(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#using">Apache HTTP $B%5!<%P$N;HMQ(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#vhosts">Apache $B%P!<%A%c%k%[%9%H%I%-%e%a%s%H(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#faq">Apache $B%5!<%P$N$h$/$"$k<ALd(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#ssl">Apache $B$N(B SSL/TLS $B0E9f2=(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#howto">$B%,%$%I!"%A%e!<%H%j%"%k!"%O%&%D!<(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#platform">$B%W%i%C%H%U%)!<%`8GM-$N>pJs(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#programs">Apache HTTP $B%5!<%P$H%5%]!<%H%W%m%0%i%`(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#misc">Apache $B$=$NB>(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#modules">Apache $B%b%8%e!<%k(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#developer">$B3+H/<T$N$?$a$N%I%-%e%a%s%H(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#descriptive">$B@bL@MQ$N>pJs(B</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="release" id="release">$B%j%j!<%9$N%a%b(B</a></h2><ul><li><a href="upgrading.html">1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B</a></li>
@@ -15,7 +15,7 @@
<li><a href="invoking.html">Apache $B$N5/F0(B</a></li>
<li><a href="stopping.html">$B%5!<%P$NDd;_$H:F5/F0(B</a></li>
<li><a href="configuring.html">$B@_Dj%U%!%$%k(B</a></li>
-<li><a href="sections.html">Directory, Location, Files $B%;%/%7%g%s(B$B$NF0:nJ}K!(B</a></li>
+<li><a href="sections.html">Directory, Location, Files $B%;%/%7%g%s$NF0:nJ}K!(B</a></li>
<li><a href="server-wide.html">$B%5!<%PA4BN$N@_Dj(B</a></li>
<li><a href="logs.html">$B%m%0%U%!%$%k(B</a></li>
<li><a href="urlmapping.html">URL $B$+$i%U%!%$%k%7%9%F%`>e$N0LCV$X$N%^%C%W(B</a></li>
@@ -46,15 +46,17 @@
<li><a href="ssl/ssl_compat.html">SSL/TLS $B0E9f2=(B: $B8_49@-(B</a></li>
<li><a href="ssl/ssl_howto.html">SSL/TLS $B0E9f2=(B: $B%O%&%D!<(B</a></li>
<li><a href="ssl/ssl_faq.html">SSL/TLS $B0E9f2=(B: FAQ</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="howto" id="howto">$B%,%$%I!"%A%e!<%H%j%"%k!"%O%&%D!<(B</a></h2><ul><li><a href="howto/auth.html">$BG'>Z(B</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="howto" id="howto">$B%,%$%I!"%A%e!<%H%j%"%k!"%O%&%D!<(B</a></h2><ul><li class="separate"><a href="howto/">$B35N,(B</a></li>
+<li><a href="howto/auth.html">$BG'>Z(B</a></li>
<li><a href="howto/cgi.html">CGI $B$K$h$kF0E*%3%s%F%s%D(B</a></li>
<li><a href="howto/ssi.html">Server Side Includes $BF~Lg(B</a></li>
<li><a href="howto/htaccess.html">.htaccess $B%U%!%$%k(B</a></li>
<li><a href="howto/public_html.html">$B%f!<%6Kh$N%&%'%V%G%#%l%/%H%j(B</a></li>
<li><a href="misc/tutorials.html">$B$$$m$$$m$J(B Apache $B$N%A%e!<%H%j%"%k(B</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="platform" id="platform">$B%W%i%C%H%U%)!<%`8GM-$N>pJs(B</a></h2><ul><li><a href="platform/windows.html">Microsoft Windows $B$G$N(B Apache $B$N;HMQ(B</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="platform" id="platform">$B%W%i%C%H%U%)!<%`8GM-$N>pJs(B</a></h2><ul><li class="separate"><a href="platform/">$B35N,(B</a></li>
+<li><a href="platform/windows.html">Microsoft Windows $B$G$N(B Apache $B$N;HMQ(B</a></li>
<li><a href="platform/win_compiling.html">Microsoft Windows $B$G$N(B Apache
-$B$N%3%s%Q(B$B%$%k(B</a></li>
+$B$N%3%s%Q%$%k(B</a></li>
<li><a href="platform/win_service.html">Windows $BMQ$N(B Apache
$B$r%5!<%S%9$H$7$F<B9T(B</a></li>
<li><a href="platform/netware.html">Novell NetWare $B$G(B Apache $B$r;H$&(B</a></li>
@@ -89,18 +91,15 @@
<li><a href="mod/perchild.html">Apache MPM perchild</a></li>
<li><a href="mod/prefork.html">Apache MPM prefork</a></li>
<li><a href="mod/worker.html">Apache MPM worker</a></li>
+<li><a href="mod/mod_access.html">Apache $B%b%8%e!<%k(B mod_access</a></li>
<li><a href="mod/mod_actions.html">Apache $B%b%8%e!<%k(B mod_actions</a></li>
<li><a href="mod/mod_alias.html">Apache $B%b%8%e!<%k(B mod_alias</a></li>
<li><a href="mod/mod_asis.html">Apache $B%b%8%e!<%k(B mod_asis</a></li>
-<li><a href="mod/mod_auth_basic.html">Apache $B%b%8%e!<%k(B mod_auth_basic</a></li>
+<li><a href="mod/mod_auth.html">Apache $B%b%8%e!<%k(B mod_auth</a></li>
+<li><a href="mod/mod_auth_anon.html">Apache $B%b%8%e!<%k(B mod_auth_anon</a></li>
+<li><a href="mod/mod_auth_dbm.html">Apache $B%b%8%e!<%k(B mod_auth_dbm</a></li>
<li><a href="mod/mod_auth_digest.html">Apache $B%b%8%e!<%k(B mod_auth_digest</a></li>
<li><a href="mod/mod_auth_ldap.html">Apache $B%b%8%e!<%k(B mod_auth_ldap</a></li>
-<li><a href="mod/mod_authn_anon.html">Apache $B%b%8%e!<%k(B mod_authn_anon</a></li>
-<li><a href="mod/mod_authn_dbm.html">Apache $B%b%8%e!<%k(B mod_authn_dbm</a></li>
-<li><a href="mod/mod_authn_file.html">Apache $B%b%8%e!<%k(B mod_authn_file</a></li>
-<li><a href="mod/mod_authz_dbm.html">Apache $B%b%8%e!<%k(B mod_authz_dbm</a></li>
-<li><a href="mod/mod_authz_groupfile.html">Apache $B%b%8%e!<%k(B mod_authz_groupfile</a></li>
-<li><a href="mod/mod_authz_host.html">Apache $B%b%8%e!<%k(B mod_authz_host</a></li>
<li><a href="mod/mod_autoindex.html">Apache $B%b%8%e!<%k(B mod_autoindex</a></li>
<li><a href="mod/mod_cache.html">Apache $B%b%8%e!<%k(B mod_cache</a></li>
<li><a href="mod/mod_cern_meta.html">Apache $B%b%8%e!<%k(B mod_cern_meta</a></li>
@@ -139,11 +138,6 @@
<li><a href="mod/mod_userdir.html">Apache $B%b%8%e!<%k(B mod_userdir</a></li>
<li><a href="mod/mod_usertrack.html">Apache $B%b%8%e!<%k(B mod_usertrack</a></li>
<li><a href="mod/mod_vhost_alias.html">Apache $B%b%8%e!<%k(B mod_vhost_alias</a></li>
-</ul><ul><li><a href="mod/obs_mod_access.html"> mod_access</a></li>
-<li><a href="mod/obs_mod_auth.html"> mod_auth</a></li>
-<li><a href="mod/obs_mod_auth_anon.html"> mod_auth_anon</a></li>
-<li><a href="mod/obs_mod_auth_dbm.html"> mod_auth_dbm</a></li>
-<li><a href="mod/obs_mod_auth_digest.html"> mod_auth_digest</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="developer" id="developer">$B3+H/<T$N$?$a$N%I%-%e%a%s%H(B</a></h2><ul><li class="separate"><a href="developer/">$B35N,(B</a></li>
<li><a href="developer/API.html">Apache API $B%a%b(B</a></li>
<li><a href="developer/debugging.html">APR
diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index 00193f0..0059fb8 100644
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -70,6 +70,7 @@
<category id="howto">
<title>Guides, Tutorials, and HowTos</title>
+<page separate="yes" href="howto/">Overview</page>
<page href="howto/auth.html">Authentication</page>
<page href="howto/cgi.html">Dynamic Content with CGI</page>
<page href="howto/ssi.html">Introduction to Server Side Includes</page>
@@ -80,12 +81,11 @@
<category id="platform">
<title>Platform-specific Notes</title>
+<page separate="yes" href="platform/">Overview</page>
<page href="platform/windows.html">Using Apache with Microsoft
Windows</page>
<page href="platform/win_compiling.html">Compiling Apache for
Microsoft Windows</page>
-<page href="platform/win_service.html">Running Apache for Windows as
-a Service</page>
<page href="platform/netware.html">Using Apache with Novell NetWare</page>
<page href="platform/perf-hp.html">Running a High-Performance Web
Server on HPUX</page>
@@ -128,14 +128,11 @@
<modulefile>mod_actions.xml</modulefile>
<modulefile>mod_alias.xml</modulefile>
<modulefile>mod_asis.xml</modulefile>
- <modulefile>mod_auth_basic.xml</modulefile>
+ <modulefile>mod_access.xml</modulefile>
+ <modulefile>mod_auth.xml</modulefile>
+ <modulefile>mod_auth_anon.xml</modulefile>
+ <modulefile>mod_auth_dbm.xml</modulefile>
<modulefile>mod_auth_digest.xml</modulefile>
- <modulefile>mod_authn_anon.xml</modulefile>
- <modulefile>mod_authn_dbm.xml</modulefile>
- <modulefile>mod_authn_file.xml</modulefile>
- <modulefile>mod_authz_dbm.xml</modulefile>
- <modulefile>mod_authz_groupfile.xml</modulefile>
- <modulefile>mod_authz_host.xml</modulefile>
<modulefile>mod_auth_ldap.xml</modulefile>
<modulefile>mod_autoindex.xml</modulefile>
<modulefile>mod_cache.xml</modulefile>
@@ -167,6 +164,9 @@
<modulefile>mod_mime_magic.xml</modulefile>
<modulefile>mod_negotiation.xml</modulefile>
<modulefile>mod_proxy.xml</modulefile>
+ <modulefile>mod_proxy_connect.xml</modulefile>
+ <modulefile>mod_proxy_ftp.xml</modulefile>
+ <modulefile>mod_proxy_http.xml</modulefile>
<modulefile>mod_rewrite.xml</modulefile>
<modulefile>mod_setenvif.xml</modulefile>
<modulefile>mod_so.xml</modulefile>
@@ -178,18 +178,17 @@
<modulefile>mod_userdir.xml</modulefile>
<modulefile>mod_usertrack.xml</modulefile>
<modulefile>mod_vhost_alias.xml</modulefile>
+
<modulefile>mpm_common.xml</modulefile>
+ <modulefile>beos.xml</modulefile>
<modulefile>mpm_netware.xml</modulefile>
<modulefile>mpm_winnt.xml</modulefile>
+ <modulefile>mpmt_os2.xml</modulefile>
<modulefile>perchild.xml</modulefile>
<modulefile>prefork.xml</modulefile>
<modulefile>worker.xml</modulefile>
-
- <modulefile>obs_mod_access.xml</modulefile>
- <modulefile>obs_mod_auth.xml</modulefile>
- <modulefile>obs_mod_auth_anon.xml</modulefile>
- <modulefile>obs_mod_auth_dbm.xml</modulefile>
- <modulefile>obs_mod_auth_digest.xml</modulefile>
+ <modulefile>leader.xml</modulefile>
+ <modulefile>threadpool.xml</modulefile>
</modulefilelist>
</category>
diff --git a/docs/manual/sitemap.xml.de b/docs/manual/sitemap.xml.de
new file mode 100644
index 0000000..6b01d3e
--- /dev/null
+++ b/docs/manual/sitemap.xml.de
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
+<!-- English revision: 1.12.2.5 -->
+
+<sitemap>
+ <relativepath href="."/>
+
+ <title>Seitenindex</title>
+
+<summary>
+<p>Diese Seite verzeichnet die zur Zeit verfügbaren Dokumente der
+<a href="./">Dokumentation zum Apache HTTP Server Version 2.0</a>.</p>
+</summary>
+
+<category id="release">
+<title>Hinweise zur Version</title>
+<page href="upgrading.html">Upgrade von 1.3 auf 2.0</page>
+<page href="new_features_2_0.html">Neue Funktionen in Version 2.0</page>
+</category>
+
+<category id="using">
+<title>Bedienung des Apache HTTP Servers</title>
+<page href="install.html">Kompilieren und Installieren</page>
+<page href="invoking.html">Apache starten</page>
+<page href="stopping.html">Beenden und Neustarten des Servers</page>
+<page href="configuring.html">Konfigurationsdateien</page>
+<page href="sections.html">Konfigurationsabschnitte</page>
+<page href="server-wide.html">Serverweite Konfiguration</page>
+<page href="logs.html">Log-Dateien</page>
+<page href="urlmapping.html">URLs auf das Dateisystem abbilden</page>
+<page href="misc/security_tips.html">Tipps zur Sicherheit</page>
+<page href="dso.html">Dynamic Shared Object (DSO)</page>
+<page href="content-negotiation.html">Content Negotiation</page>
+<page href="custom-error.html">Individuelle Fehlermeldungen</page>
+<page href="bind.html">Bestimmen der vom Apache verwendeten Adressen und Ports</page>
+<page href="mpm.html">Multi-Processing-Module (MPMs)</page>
+<page href="env.html">Umgebungsvariablen</page>
+<page href="handler.html">Handler</page>
+<page href="filter.html">Filter</page>
+<page href="suexec.html">suEXEC Unterstützung</page>
+<page href="misc/perf-tuning.html">Performance-Hinweise</page>
+<page href="misc/rewriteguide.html">Einführung in die URL-Manipulation</page>
+</category>
+
+<category id="vhosts">
+<title>Virtual-Host-Dokumentation des Apache</title>
+<page separate="yes" href="vhosts/">Übersicht</page>
+<page href="vhosts/name-based.html">Namensbasierte Virtual Hosts</page>
+<page href="vhosts/ip-based.html">IP-basierte Virtual Hosts</page>
+<page href="vhosts/mass.html">Dynamisch konfiguriertes Massen-Virtual-Hosting</page>
+<page href="vhosts/examples.html">Virtual-Host-Beispiele</page>
+<page href="vhosts/details.html">Tiefergehende Erörterung des Virtual-Hosts-Matchings</page>
+<page href="vhosts/fd-limits.html">Datei-Deskriptor-Begrenzungen</page>
+<page href="dns-caveats.html">Probleme bezüglich DNS und Apache</page>
+</category>
+
+<category id="faq">
+<title>Häufig gestellte Fragen (FAQ)</title>
+<page separate="yes" href="faq/">Übersicht</page>
+<page href="faq/support.html">Support</page>
+</category>
+
+<category id="ssl">
+<title>SSL/TLS-Verschlüsselung des Apache</title>
+<page separate="yes" href="ssl/">Übersicht</page>
+<page href="ssl/ssl_intro.html">SSL/TLS-Verschlüsselung: Einführung</page>
+<page href="ssl/ssl_compat.html">SSL/TLS-Verschlüsselung: Kompatibilität</page>
+<page href="ssl/ssl_howto.html">SSL/TLS-Verschlüsselung: Praxis</page>
+<page href="ssl/ssl_faq.html">SSL/TLS-Verschlüsselung: FAQ</page>
+</category>
+
+<category id="howto">
+<title>Praxis / Anleitungen</title>
+<page separate="yes" href="howto/">Übersicht</page>
+<page href="howto/auth.html">Authentisierung, Autorisierung und Zugriffskontrolle</page>
+<page href="howto/cgi.html">Dynamische Inhalte mit CGI</page>
+<page href="howto/ssi.html">Einführung in Server Side Includes</page>
+<page href="howto/htaccess.html">.htaccess-Dateien</page>
+<page href="howto/public_html.html">Web-Verzeichnisse für Benutzer</page>
+<page href="misc/tutorials.html">Apache-Tutorials</page>
+</category>
+
+<category id="platform">
+<title>Plattform-spezifische Anmerkungen</title>
+<page separate="yes" href="platform/">Übersicht</page>
+<page href="platform/windows.html">Apache unter Microsoft
+Windows einsetzen</page>
+<page href="platform/win_compiling.html">Kompilieren des Apache für
+Microsoft Windows</page>
+<page href="platform/netware.html">Apache unter Novell NetWare einsetzen</page>
+<page href="platform/perf-hp.html">Einen Hochleistungs-Web-Server auf
+HPUX betreiben</page>
+<page href="platform/ebcdic.html">Die Apache EBCDIC-Portierung</page>
+</category>
+
+<category id="programs">
+<title>Apache HTTP Server und Hilfsprogramme</title>
+<page separate="yes" href="programs/">Übersicht</page>
+<page href="programs/httpd.html">httpd</page>
+<page href="programs/ab.html">ab</page>
+<page href="programs/apachectl.html">apachectl</page>
+<page href="programs/apxs.html">apxs</page>
+<page href="programs/dbmmanage.html">dbmmanage</page>
+<page href="programs/htdigest.html">htdigest</page>
+<page href="programs/htpasswd.html">htpasswd</page>
+<page href="programs/logresolve.html">logresolve</page>
+<page href="programs/rotatelogs.html">rotatelogs</page>
+<page href="programs/suexec.html">suexec</page>
+<page href="programs/other.html">Sonstige Programme</page>
+</category>
+
+<category id="misc">
+<title>Weitere Apache-Dokumentationen</title>
+<page separate="yes" href="misc/">Übersicht</page>
+<page href="misc/custom_errordocs.html">International angepaßte Server-Fehlermeldungen</page>
+<page href="misc/fin_wait_2.html">Verbindungen im FIN_WAIT_2 und Apache</page>
+<page href="misc/known_client_problems.html">Bekannte Client-Probleme</page>
+<page href="misc/descriptors.html">Deskriptoren und Apache</page>
+<page href="cgi_path.html">PATH_INFO-Änderungen in der CGI-Umgebung</page>
+</category>
+
+<category id="modules">
+<title>Apache-Module</title>
+<page href="mod/">Modul-Index</page>
+<page href="mod/directives.html">Direktiven-Index</page>
+<page href="mod/quickreference.html">Kurzreferenz der Direktiven</page>
+<modulefilelist>
+ <modulefile>core.xml</modulefile>
+ <modulefile>mod_actions.xml</modulefile>
+ <modulefile>mod_alias.xml</modulefile>
+ <modulefile>mod_asis.xml</modulefile>
+ <modulefile>mod_access.xml</modulefile>
+ <modulefile>mod_auth.xml</modulefile>
+ <modulefile>mod_auth_anon.xml</modulefile>
+ <modulefile>mod_auth_dbm.xml</modulefile>
+ <modulefile>mod_auth_digest.xml</modulefile>
+ <modulefile>mod_auth_ldap.xml</modulefile>
+ <modulefile>mod_autoindex.xml</modulefile>
+ <modulefile>mod_cache.xml</modulefile>
+ <modulefile>mod_cern_meta.xml</modulefile>
+ <modulefile>mod_cgi.xml</modulefile>
+ <modulefile>mod_cgid.xml</modulefile>
+ <modulefile>mod_charset_lite.xml</modulefile>
+ <modulefile>mod_dav.xml</modulefile>
+ <modulefile>mod_dav_fs.xml</modulefile>
+ <modulefile>mod_deflate.xml</modulefile>
+ <modulefile>mod_dir.xml</modulefile>
+ <modulefile>mod_disk_cache.xml</modulefile>
+ <modulefile>mod_echo.xml</modulefile>
+ <modulefile>mod_env.xml</modulefile>
+ <modulefile>mod_example.xml</modulefile>
+ <modulefile>mod_expires.xml</modulefile>
+ <modulefile>mod_ext_filter.xml</modulefile>
+ <modulefile>mod_file_cache.xml</modulefile>
+ <modulefile>mod_headers.xml</modulefile>
+ <modulefile>mod_imap.xml</modulefile>
+ <modulefile>mod_include.xml</modulefile>
+ <modulefile>mod_info.xml</modulefile>
+ <modulefile>mod_isapi.xml</modulefile>
+ <modulefile>mod_ldap.xml</modulefile>
+ <modulefile>mod_log_config.xml</modulefile>
+ <modulefile>mod_logio.xml</modulefile>
+ <modulefile>mod_mem_cache.xml</modulefile>
+ <modulefile>mod_mime.xml</modulefile>
+ <modulefile>mod_mime_magic.xml</modulefile>
+ <modulefile>mod_negotiation.xml</modulefile>
+ <modulefile>mod_proxy.xml</modulefile>
+ <modulefile>mod_proxy_connect.xml</modulefile>
+ <modulefile>mod_proxy_ftp.xml</modulefile>
+ <modulefile>mod_proxy_http.xml</modulefile>
+ <modulefile>mod_rewrite.xml</modulefile>
+ <modulefile>mod_setenvif.xml</modulefile>
+ <modulefile>mod_so.xml</modulefile>
+ <modulefile>mod_ssl.xml</modulefile>
+ <modulefile>mod_speling.xml</modulefile>
+ <modulefile>mod_status.xml</modulefile>
+ <modulefile>mod_suexec.xml</modulefile>
+ <modulefile>mod_unique_id.xml</modulefile>
+ <modulefile>mod_userdir.xml</modulefile>
+ <modulefile>mod_usertrack.xml</modulefile>
+ <modulefile>mod_vhost_alias.xml</modulefile>
+
+ <modulefile>mpm_common.xml</modulefile>
+ <modulefile>beos.xml</modulefile>
+ <modulefile>mpm_netware.xml</modulefile>
+ <modulefile>mpm_winnt.xml</modulefile>
+ <modulefile>mpmt_os2.xml</modulefile>
+ <modulefile>perchild.xml</modulefile>
+ <modulefile>prefork.xml</modulefile>
+ <modulefile>worker.xml</modulefile>
+ <modulefile>leader.xml</modulefile>
+ <modulefile>threadpool.xml</modulefile>
+</modulefilelist>
+</category>
+
+<category id="developer">
+<title>Dokumentation für Entwickler</title>
+<page separate="yes" href="developer/">Übersicht</page>
+<page href="developer/API.html">Anmerkungen zur Apache-API</page>
+<page href="developer/debugging.html">Debuggen der Speicher-Belegung in der APR </page>
+<page href="developer/documenting.html">Apache 2.0 dokumentieren</page>
+<page href="developer/hooks.html">Hook-Funktionen des Apache 2.0 </page>
+<page href="developer/layeredio.html">Gestaffelte E/A des Apache 2.0</page>
+<page href="developer/modules.html">Module von Apache 1.3 nach Apache 2.0 konvertieren</page>
+<page href="developer/request.html">Verarbeitung der Anfragen im Apache 2.0</page>
+<page href="developer/filters.html">Wie Filter im Apache 2.0 arbeiten</page>
+</category>
+
+<category id="descriptive">
+<title>Beschreibende Informationen</title>
+<page href="mod/module-dict.html">Erklärung der Fachbegriffe zu Apache-Modulen</page>
+<page href="mod/directive-dict.html">Erklärung der Fachbegriffe zu Apache-Direktiven</page>
+<page href="glossary.html">Glossar</page>
+<page>Seitenindex (dieses Dokument)</page>
+</category>
+
+</sitemap>
\ No newline at end of file
diff --git a/docs/manual/sitemap.xml.ja b/docs/manual/sitemap.xml.ja
index fb624ba..a1bb3ee 100644
--- a/docs/manual/sitemap.xml.ja
+++ b/docs/manual/sitemap.xml.ja
@@ -73,6 +73,7 @@
<category id="howto">
<title>$B%,%$%I!"%A%e!<%H%j%"%k!"%O%&%D!<(B</title>
+<page separate="yes" href="howto/">$B35N,(B</page>
<page href="howto/auth.html">$BG'>Z(B</page>
<page href="howto/cgi.html">CGI $B$K$h$kF0E*%3%s%F%s%D(B</page>
<page href="howto/ssi.html">Server Side Includes $BF~Lg(B</page>
@@ -83,6 +84,7 @@
<category id="platform">
<title>$B%W%i%C%H%U%)!<%`8GM-$N>pJs(B</title>
+<page separate="yes" href="platform/">$B35N,(B</page>
<page href="platform/windows.html">Microsoft Windows $B$G$N(B Apache $B$N;HMQ(B</page>
<page href="platform/win_compiling.html">Microsoft Windows $B$G$N(B Apache
$B$N%3%s%Q%$%k(B</page>
@@ -130,15 +132,12 @@
<modulefile>mod_actions.xml.ja</modulefile>
<modulefile>mod_alias.xml.ja</modulefile>
<modulefile>mod_asis.xml.ja</modulefile>
- <modulefile>mod_auth_basic.xml.ja</modulefile>
+ <modulefile>mod_access.xml.ja</modulefile>
+ <modulefile>mod_auth.xml.ja</modulefile>
+ <modulefile>mod_auth_anon.xml</modulefile>
+ <modulefile>mod_auth_dbm.xml</modulefile>
<modulefile>mod_auth_digest.xml</modulefile>
<modulefile>mod_auth_ldap.xml</modulefile>
- <modulefile>mod_authn_anon.xml</modulefile>
- <modulefile>mod_authn_dbm.xml</modulefile>
- <modulefile>mod_authn_file.xml.ja</modulefile>
- <modulefile>mod_authz_dbm.xml</modulefile>
- <modulefile>mod_authz_groupfile.xml</modulefile>
- <modulefile>mod_authz_host.xml.ja</modulefile>
<modulefile>mod_autoindex.xml.ja</modulefile>
<modulefile>mod_cache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
@@ -183,12 +182,6 @@
<modulefile>perchild.xml</modulefile>
<modulefile>prefork.xml.ja</modulefile>
<modulefile>worker.xml.ja</modulefile>
-
- <modulefile>obs_mod_access.xml</modulefile>
- <modulefile>obs_mod_auth.xml</modulefile>
- <modulefile>obs_mod_auth_anon.xml</modulefile>
- <modulefile>obs_mod_auth_dbm.xml</modulefile>
- <modulefile>obs_mod_auth_digest.xml</modulefile>
</modulefilelist>
</category>
diff --git a/docs/manual/ssl/index.html.en b/docs/manual/ssl/index.html.en
index 36e6181..923f97a 100644
--- a/docs/manual/ssl/index.html.en
+++ b/docs/manual/ssl/index.html.en
@@ -4,13 +4,31 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache SSL/TLS Encryption - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="../"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache SSL/TLS Encryption</h1>
+ -->
+<title>Apache SSL/TLS Encryption - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="../"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache SSL/TLS Encryption</h1>
<p>The Apache HTTP Server module <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>
provides an interface to the <a href="http://www.openssl.org/">OpenSSL</a> library, which provides
Strong Encryption using the Secure Sockets Layer and Transport Layer
Security protocols. The module and this documentation are based on
Ralf S. Engelschall's mod_ssl project.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#documentation">Documentation</a></li><li><img alt="" src="../images/down.gif" /> <a href="#mod-ssl">mod_ssl</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="documentation" id="documentation">Documentation</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#documentation">Documentation</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mod-ssl">mod_ssl</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="documentation" id="documentation">Documentation</a></h2>
<ul>
<li><a href="ssl_intro.html">Introduction</a></li>
<li><a href="ssl_compat.html">Compatibility</a></li>
@@ -18,8 +36,14 @@
<li><a href="ssl_faq.html">Frequently Asked Questions</a></li>
<li><a href="../glossary.html">Glossary</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="mod-ssl" id="mod-ssl">mod_ssl</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="mod-ssl" id="mod-ssl">mod_ssl</a></h2>
<p>Extensive documentation on the directives and environment variables
provided by this module is provided in the <a href="../mod/mod_ssl.html">mod_ssl reference documentation</a>.
</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/ssl_compat.html.en b/docs/manual/ssl/ssl_compat.html.en
index 122b297..33b8237 100644
--- a/docs/manual/ssl/ssl_compat.html.en
+++ b/docs/manual/ssl/ssl_compat.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>SSL/TLS Strong Encryption: Compatibility - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">SSL/TLS</a></div><div id="page-content"><div id="preamble"><h1>SSL/TLS Strong Encryption: Compatibility</h1>
+ -->
+<title>SSL/TLS Strong Encryption: Compatibility - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">SSL/TLS</a></div><div id="page-content"><div id="preamble"><h1>SSL/TLS Strong Encryption: Compatibility</h1>
<blockquote>
<p>All PCs are compatible. But some of
them are more compatible than others.</p>
@@ -28,7 +40,14 @@
backward compatibility for most of the cases. Actually there are three
compatibility areas we currently address: configuration directives,
environment variables and custom log functions.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#configuration">Configuration Directives</a></li><li><img alt="" src="../images/down.gif" /> <a href="#variables">Environment Variables</a></li><li><img alt="" src="../images/down.gif" /> <a href="#customlog">Custom Log Functions</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="configuration" id="configuration">Configuration Directives</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#configuration">Configuration Directives</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#variables">Environment Variables</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#customlog">Custom Log Functions</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="configuration" id="configuration">Configuration Directives</a></h2>
<p>For backward compatibility to the configuration directives of other SSL
solutions we do an on-the-fly mapping: directives which have a direct
counterpart in mod_ssl are mapped silently while other directives lead to a
@@ -95,7 +114,9 @@
<tr class="odd"><td><code>SSLProxyCipherList</code> <em>spec</em></td><td>-</td><td>functionality not supported</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="variables" id="variables">Environment Variables</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="variables" id="variables">Environment Variables</a></h2>
<p>When you use ``<code>SSLOptions +CompatEnvVars</code>'' additional environment
variables are generated. They all correspond to existing official mod_ssl
variables. The currently implemented variable derivation is listed in <a href="#table2">Table 2</a>.</p>
@@ -170,7 +191,9 @@
<tr><td><code>SSL_CLIENT_KEY_SIZE</code></td><td><code>-</code></td><td>Not supported by mod_ssl</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="customlog" id="customlog">Custom Log Functions</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="customlog" id="customlog">Custom Log Functions</a></h2>
<p>
When mod_ssl is built into Apache or at least loaded (under DSO situation)
additional functions exist for the <a href="../mod/mod_log_config.html#formats">Custom Log Format</a> of
@@ -196,4 +219,8 @@
<tr><td><code>%...{errstr}c</code></td> <td>Certificate Verification Error (string)</td></tr>
</table>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en
index ea84151..f7dacd8 100644
--- a/docs/manual/ssl/ssl_faq.html.en
+++ b/docs/manual/ssl/ssl_faq.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>SSL/TLS Strong Encryption: FAQ - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">SSL/TLS</a></div><div id="page-content"><div id="preamble"><h1>SSL/TLS Strong Encryption: FAQ</h1>
+ -->
+<title>SSL/TLS Strong Encryption: FAQ - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">SSL/TLS</a></div><div id="page-content"><div id="preamble"><h1>SSL/TLS Strong Encryption: FAQ</h1>
<blockquote>
<p>The wise man doesn't give the right answers,
he poses the right questions.</p>
@@ -20,7 +32,17 @@
<p>Please read this chapter at least once when installing mod_ssl or at least
search for your problem here before submitting a problem report to the
author.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#about">About The Module</a></li><li><img alt="" src="../images/down.gif" /> <a href="#installation">About Installation</a></li><li><img alt="" src="../images/down.gif" /> <a href="#aboutconfig">About Configuration</a></li><li><img alt="" src="../images/down.gif" /> <a href="#aboutcerts">About Certificates</a></li><li><img alt="" src="../images/down.gif" /> <a href="#aboutssl">About SSL Protocol</a></li><li><img alt="" src="../images/down.gif" /> <a href="#support">About Support</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="about" id="about">About The Module</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#about">About The Module</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#installation">About Installation</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#aboutconfig">About Configuration</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#aboutcerts">About Certificates</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#aboutssl">About SSL Protocol</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#support">About Support</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="about" id="about">About The Module</a></h2>
<ul>
<li><a href="#history">What is the history of mod_ssl?</a></li>
<li><a href="#y2k">mod_ssl and Year 2000?</a></li>
@@ -105,25 +127,15 @@
of the Wassenaar Agreement and its <q>List of Dual Use Goods and
Technologies And Munitions List</q>.</p>
-
- <p>Additionally the Wassenaar Agreement itself has no direct consequence for
- exporting cryptography software. What is actually allowed or forbidden to
- be exported from the countries has still to be defined in the local laws
- of each country. And at least according to official press releases from
- the German BMWi (see <a href="http://www.bmwi.de/presse/1998/1208prm2.html">here</a>) and the
- Switzerland Bawi (see <a href="http://jya.com/wass-ch.htm">here</a>) there
- will be no forthcoming export restriction for free cryptography software
- for their countries. Remember that mod_ssl is created in Germany and
- distributed from Switzerland.</p>
-
<p>So, mod_ssl and OpenSSL are not affected by the Wassenaar Agreement.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="installation" id="installation">About Installation</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="installation" id="installation">About Installation</a></h2>
<ul>
<li><a href="#coredump">Core dumps for HTTPS requests?</a></li>
<li><a href="#mutex">Permission problem on SSLMutex</a></li>
<li><a href="#mm">Shared memory and process size?</a></li>
-<li><a href="#mmpath">Shared memory and pathname?</a></li>
<li><a href="#entropy">PRNG and not enough entropy?</a></li>
</ul>
@@ -162,16 +174,6 @@
instance and not once per Apache server process.</p>
-<h3><a name="mmpath" id="mmpath">Apache creates files in a directory declared by the internal
-EAPI_MM_CORE_PATH define. Is there a way to override the path using a
-configuration directive?</a></h3>
-<p>No, there is not configuration directive, because for technical
- bootstrapping reasons, a directive not possible at all. Instead
- use ``<code>CFLAGS='-DEAPI_MM_CORE_PATH="/path/to/wherever/"'
- ./configure ...</code>'' when building Apache or use option
- <code>-d</code> when starting <code>httpd</code>.</p>
-
-
<h3><a name="entropy" id="entropy">When I fire up the server, mod_ssl stops with the error
"Failed to generate temporary 512 bit RSA private key", why?</a></h3>
<p>Cryptographic software needs a source of unpredictable data
@@ -186,7 +188,9 @@
entropy to the PRNG to work correctly. For this one has to use the
<code>SSLRandomSeed</code> directives.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="aboutconfig" id="aboutconfig">About Configuration</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="aboutconfig" id="aboutconfig">About Configuration</a></h2>
<ul>
<li><a href="#parallel">HTTP and HTTPS with a single server?</a></li>
<li><a href="#ports">Where is the HTTPS port?</a></li>
@@ -232,7 +236,7 @@
SSL handshake. For a more general command line client which directly
understands both the HTTP and HTTPS scheme, can perform GET and POST
methods, can use a proxy, supports byte ranges, etc. you should have a
- look at nifty <a href="http://curl.haxx.nu/">cURL</a>
+ look at nifty <a href="http://curl.haxx.se/">cURL</a>
tool. With it you can directly check if your Apache is running fine on
Port 80 and 443 as following:</p>
@@ -284,7 +288,9 @@
<p>This rewrite ruleset lets you use hyperlinks of the form
<code><a href="document.html:SSL"></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="aboutcerts" id="aboutcerts">About Certificates</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="aboutcerts" id="aboutcerts">About Certificates</a></h2>
<ul>
<li><a href="#keyscerts">What are Keys, CSRs and Certs?</a></li>
<li><a href="#startup">Difference on startup?</a></li>
@@ -625,7 +631,7 @@
that file to the <code>SSLCertificateFile</code> directive.
Remember that you need to give the key file in as well (see
<code>SSLCertificateKeyFile</code> directive). For a better
- CA-related overview on SSL certificate fiddling you can look at <a href="http://www.thawte.com/certs/server/keygen/mod_ssl.html">Thawte's mod_ssl instructions</a>.</p>
+ CA-related overview on SSL certificate fiddling you can look at <a href="http://www.thawte.com/html/SUPPORT/server/softwaredocs/modssl.html">Thawte's mod_ssl instructions</a>.</p>
<h3><a name="sgc" id="sgc">Can I use the Server Gated Cryptography (SGC) facility (aka Verisign Global
@@ -648,7 +654,9 @@
makes sure the intermediate CA certificate is send to the browser
and this way fills the gap in the certificate 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="aboutssl" id="aboutssl">About SSL Protocol</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="aboutssl" id="aboutssl">About SSL Protocol</a></h2>
<ul>
<li><a href="#random">Random SSL errors under heavy load?</a></li>
<li><a href="#load">Why has the server a higher load?</a></li>
@@ -657,6 +665,8 @@
<li><a href="#adh">How to use Anonymous-DH ciphers</a></li>
<li><a href="#sharedciphers">Why do I get 'no shared ciphers'?</a></li>
<li><a href="#vhosts">HTTPS and name-based vhosts</a></li>
+<li><a href="#vhosts2">Why is it not possible to use Name-Based Virtual
+Hosting to identify different SSL virtual hosts?</a></li>
<li><a href="#lockicon">The lock icon in Netscape locks very late</a></li>
<li><a href="#msie">Why do I get I/O errors with MSIE clients?</a></li>
<li><a href="#nn">Why do I get I/O errors with NS clients?</a></li>
@@ -746,6 +756,41 @@
handshake phase. Bingo!</p>
+<h3><a name="vhosts2" id="vhosts2">Why is it not possible to use Name-Based
+Virtual Hosting to identify different SSL virtual hosts?</a></h3>
+ <p>Name-Based Virtual Hosting is a very popular method of identifying
+ different virtual hosts. It allows you to use the same IP address and
+ the same port number for many different sites. When people move on to
+ SSL, it seems natural to assume that the same method can be used to have
+ lots of different SSL virtual hosts on the same server.</p>
+
+ <p>It comes as rather a shock to learn that it is impossible.</p>
+
+ <p>The reason is that the SSL protocol is a separate layer which
+ encapsulates the HTTP protocol. So the problem is that the SSL session
+ is a separate transaction that takes place before the HTTP session even
+ starts. Therefore all the server receives is an SSL request on IP
+ address X and port Y (usually 443). Since the SSL request does not
+ contain any Host: field, the server has no way to decide which SSL
+ virtual host to use. Usually, it will just use the first one it finds
+ that matches the port and IP address.</p>
+
+ <p>You can, of course, use Name-Based Virtual Hosting to identify many
+ non-SSL virtual hosts (all on port 80, for example) and then you can
+ have no more than 1 SSL virtual host (on port 443). But if you do this,
+ you must make sure to put the non-SSL port number on the NameVirtualHost
+ directive, e.g.</p>
+
+ <div class="example"><p><code>
+ NameVirtualHost 192.168.1.1:80
+ </code></p></div>
+
+ <p>Other workaround solutions are: </p>
+
+ <p>Use separate IP addresses for different SSL hosts.
+ Use different port numbers for different SSL hosts.</p>
+
+
<h3><a name="lockicon" id="lockicon">When I use Basic Authentication over HTTPS the lock icon in Netscape browsers
still shows the unlocked state when the dialog pops up. Does this mean the
username/password is still transmitted unencrypted?</a></h3>
@@ -829,7 +874,9 @@
implementation is correct, so when you encounter I/O errors with Netscape
Navigator it is most of the time caused by the configured certificates.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="support" id="support">About Support</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="support" id="support">About Support</a></h2>
<ul>
<li><a href="#resources">Resources in case of problems?</a></li>
<li><a href="#contact">Support in case of problems?</a></li>
@@ -965,4 +1012,8 @@
</li>
</ol>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml
index e2f531a..c656ad9 100644
--- a/docs/manual/ssl/ssl_faq.xml
+++ b/docs/manual/ssl/ssl_faq.xml
@@ -117,18 +117,6 @@
of the Wassenaar Agreement and its <q>List of Dual Use Goods and
Technologies And Munitions List</q>.</p>
-
- <p>Additionally the Wassenaar Agreement itself has no direct consequence for
- exporting cryptography software. What is actually allowed or forbidden to
- be exported from the countries has still to be defined in the local laws
- of each country. And at least according to official press releases from
- the German BMWi (see <a
- href="http://www.bmwi.de/presse/1998/1208prm2.html">here</a>) and the
- Switzerland Bawi (see <a href="http://jya.com/wass-ch.htm">here</a>) there
- will be no forthcoming export restriction for free cryptography software
- for their countries. Remember that mod_ssl is created in Germany and
- distributed from Switzerland.</p>
-
<p>So, mod_ssl and OpenSSL are not affected by the Wassenaar Agreement.</p>
</section>
</section>
@@ -139,7 +127,6 @@
<li><a href="#coredump">Core dumps for HTTPS requests?</a></li>
<li><a href="#mutex">Permission problem on SSLMutex</a></li>
<li><a href="#mm">Shared memory and process size?</a></li>
-<li><a href="#mmpath">Shared memory and pathname?</a></li>
<li><a href="#entropy">PRNG and not enough entropy?</a></li>
</ul>
@@ -178,16 +165,6 @@
instance and not once per Apache server process.</p>
</section>
-<section id="mmpath"><title>Apache creates files in a directory declared by the internal
-EAPI_MM_CORE_PATH define. Is there a way to override the path using a
-configuration directive?</title>
-<p>No, there is not configuration directive, because for technical
- bootstrapping reasons, a directive not possible at all. Instead
- use ``<code>CFLAGS='-DEAPI_MM_CORE_PATH="/path/to/wherever/"'
- ./configure ...</code>'' when building Apache or use option
- <code>-d</code> when starting <code>httpd</code>.</p>
-</section>
-
<section id="entropy"><title>When I fire up the server, mod_ssl stops with the error
"Failed to generate temporary 512 bit RSA private key", why?</title>
<p>Cryptographic software needs a source of unpredictable data
@@ -251,7 +228,7 @@
SSL handshake. For a more general command line client which directly
understands both the HTTP and HTTPS scheme, can perform GET and POST
methods, can use a proxy, supports byte ranges, etc. you should have a
- look at nifty <a href="http://curl.haxx.nu/">cURL</a>
+ look at nifty <a href="http://curl.haxx.se/">cURL</a>
tool. With it you can directly check if your Apache is running fine on
Port 80 and 443 as following:</p>
@@ -648,7 +625,7 @@
Remember that you need to give the key file in as well (see
<code>SSLCertificateKeyFile</code> directive). For a better
CA-related overview on SSL certificate fiddling you can look at <a
- href="http://www.thawte.com/certs/server/keygen/mod_ssl.html">Thawte's mod_ssl instructions</a>.</p>
+ href="http://www.thawte.com/html/SUPPORT/server/softwaredocs/modssl.html">Thawte's mod_ssl instructions</a>.</p>
</section>
<section id="sgc"><title>Can I use the Server Gated Cryptography (SGC) facility (aka Verisign Global
@@ -683,6 +660,8 @@
<li><a href="#adh">How to use Anonymous-DH ciphers</a></li>
<li><a href="#sharedciphers">Why do I get 'no shared ciphers'?</a></li>
<li><a href="#vhosts">HTTPS and name-based vhosts</a></li>
+<li><a href="#vhosts2">Why is it not possible to use Name-Based Virtual
+Hosting to identify different SSL virtual hosts?</a></li>
<li><a href="#lockicon">The lock icon in Netscape locks very late</a></li>
<li><a href="#msie">Why do I get I/O errors with MSIE clients?</a></li>
<li><a href="#nn">Why do I get I/O errors with NS clients?</a></li>
@@ -772,6 +751,41 @@
handshake phase. Bingo!</p>
</section>
+<section id="vhosts2"><title>Why is it not possible to use Name-Based
+Virtual Hosting to identify different SSL virtual hosts?</title>
+ <p>Name-Based Virtual Hosting is a very popular method of identifying
+ different virtual hosts. It allows you to use the same IP address and
+ the same port number for many different sites. When people move on to
+ SSL, it seems natural to assume that the same method can be used to have
+ lots of different SSL virtual hosts on the same server.</p>
+
+ <p>It comes as rather a shock to learn that it is impossible.</p>
+
+ <p>The reason is that the SSL protocol is a separate layer which
+ encapsulates the HTTP protocol. So the problem is that the SSL session
+ is a separate transaction that takes place before the HTTP session even
+ starts. Therefore all the server receives is an SSL request on IP
+ address X and port Y (usually 443). Since the SSL request does not
+ contain any Host: field, the server has no way to decide which SSL
+ virtual host to use. Usually, it will just use the first one it finds
+ that matches the port and IP address.</p>
+
+ <p>You can, of course, use Name-Based Virtual Hosting to identify many
+ non-SSL virtual hosts (all on port 80, for example) and then you can
+ have no more than 1 SSL virtual host (on port 443). But if you do this,
+ you must make sure to put the non-SSL port number on the NameVirtualHost
+ directive, e.g.</p>
+
+ <example>
+ NameVirtualHost 192.168.1.1:80
+ </example>
+
+ <p>Other workaround solutions are: </p>
+
+ <p>Use separate IP addresses for different SSL hosts.
+ Use different port numbers for different SSL hosts.</p>
+</section>
+
<section id="lockicon"><title>When I use Basic Authentication over HTTPS the lock icon in Netscape browsers
still shows the unlocked state when the dialog pops up. Does this mean the
username/password is still transmitted unencrypted?</title>
diff --git a/docs/manual/ssl/ssl_howto.html.en b/docs/manual/ssl/ssl_howto.html.en
index 0140451..541e8bf 100644
--- a/docs/manual/ssl/ssl_howto.html.en
+++ b/docs/manual/ssl/ssl_howto.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>SSL/TLS Strong Encryption: How-To - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">SSL/TLS</a></div><div id="page-content"><div id="preamble"><h1>SSL/TLS Strong Encryption: How-To</h1>
+ -->
+<title>SSL/TLS Strong Encryption: How-To - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">SSL/TLS</a></div><div id="page-content"><div id="preamble"><h1>SSL/TLS Strong Encryption: How-To</h1>
<blockquote>
<p>The solution of this problem is trivial
and is left as an exercise for the reader.</p>
@@ -19,7 +31,13 @@
step to find out the final solution, but always try to understand the
stuff before you use it. Nothing is worse than using a security solution
without knowing its restrictions and coherences.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#ciphersuites">Cipher Suites and Enforced Strong Security</a></li><li><img alt="" src="../images/down.gif" /> <a href="#accesscontrol">Client Authentication 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="ciphersuites" id="ciphersuites">Cipher Suites and Enforced Strong Security</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#ciphersuites">Cipher Suites and Enforced Strong Security</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#accesscontrol">Client Authentication 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="ciphersuites" id="ciphersuites">Cipher Suites and Enforced Strong Security</a></h2>
<ul>
<li><a href="#realssl">SSLv2 only server</a></li>
@@ -96,7 +114,9 @@
</Location>
</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="accesscontrol" id="accesscontrol">Client Authentication and Access Control</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="accesscontrol" id="accesscontrol">Client Authentication and Access Control</a></h2>
<ul>
<li><a href="#allclients">simple certificate-based client authentication</a></li>
@@ -147,7 +167,7 @@
<p>The key is to check for various ingredients of the client certficate.
Usually this means to check the whole or part of the Distinguished
- Name (DN) of the Subject. For this two methods exists: The <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> based variant and the <code class="directive"><a href="../mod/mod_ssl.html#sslrequire">SSLRequire</a></code> variant. The first method is
+ Name (DN) of the Subject. For this two methods exists: The <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code> based variant and the <code class="directive"><a href="../mod/mod_ssl.html#sslrequire">SSLRequire</a></code> variant. The first method is
good when the clients are of totally different type, i.e. when their
DNs have no common fields (usually the organisation, etc.). In this
case you've to establish a password database containing <em>all</em>
@@ -249,4 +269,8 @@
Require valid-user
</Directory></pre></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/ssl_howto.xml b/docs/manual/ssl/ssl_howto.xml
index f74dfe4..7263ff4 100644
--- a/docs/manual/ssl/ssl_howto.xml
+++ b/docs/manual/ssl/ssl_howto.xml
@@ -157,7 +157,7 @@
<p>The key is to check for various ingredients of the client certficate.
Usually this means to check the whole or part of the Distinguished
Name (DN) of the Subject. For this two methods exists: The <module
- >mod_auth_basic</module> based variant and the <directive
+ >mod_auth</module> based variant and the <directive
module="mod_ssl">SSLRequire</directive> variant. The first method is
good when the clients are of totally different type, i.e. when their
DNs have no common fields (usually the organisation, etc.). In this
diff --git a/docs/manual/ssl/ssl_intro.html.en b/docs/manual/ssl/ssl_intro.html.en
index 266a05a..6341269 100644
--- a/docs/manual/ssl/ssl_intro.html.en
+++ b/docs/manual/ssl/ssl_intro.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>SSL/TLS Strong Encryption: An Introduction - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">SSL/TLS</a></div><div id="page-content"><div id="preamble"><h1>SSL/TLS Strong Encryption: An Introduction</h1>
+ -->
+<title>SSL/TLS Strong Encryption: An Introduction - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">SSL/TLS</a></div><div id="page-content"><div id="preamble"><h1>SSL/TLS Strong Encryption: An Introduction</h1>
<blockquote>
<p>The nice thing about standards is that there are so many to choose
from. And if you really don't like all the standards you just have to
@@ -31,7 +43,15 @@
Please send any postive feedback to <a href="mailto:hirsch@fjhirsch.com">Frederick Hirsch</a> (the original
article author) and all negative feedback to <a href="mailto:rse@engelschall.com">Ralf S. Engelschall</a> (the
<code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> author).</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cryptographictech">Cryptographic Techniques</a></li><li><img alt="" src="../images/down.gif" /> <a href="#certificates">Certificates</a></li><li><img alt="" src="../images/down.gif" /> <a href="#ssl">Secure Sockets Layer (SSL)</a></li><li><img alt="" src="../images/down.gif" /> <a href="#references">References</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="cryptographictech" id="cryptographictech">Cryptographic Techniques</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cryptographictech">Cryptographic Techniques</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#certificates">Certificates</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ssl">Secure Sockets Layer (SSL)</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#references">References</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="cryptographictech" id="cryptographictech">Cryptographic Techniques</a></h2>
<p>Understanding SSL requires an understanding of cryptographic
algorithms, message digest functions (aka. one-way or hash functions), and
@@ -124,7 +144,9 @@
the bank from a fraudulent claim from Alice that she did not send the message
-- only she could have signed it (non-repudiation).</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="certificates" id="certificates">Certificates</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="certificates" id="certificates">Certificates</a></h2>
<p>Although Alice could have sent a private message to the bank, signed
it, and ensured the integrity of the message, she still needs to be sure
@@ -329,7 +351,9 @@
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="ssl" id="ssl">Secure Sockets Layer (SSL)</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ssl" id="ssl">Secure Sockets Layer (SSL)</a></h2>
<p>The Secure Sockets Layer protocol is a protocol layer which may be
placed between a reliable connection-oriented network layer protocol
@@ -559,7 +583,9 @@
<code>https</code> rather than <code>http</code> and a different
server port (by default 443). This mainly is what <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> provides to you for the Apache webserver...</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="references" id="references">References</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="references" id="references">References</a></h2>
<dl>
<dt><a id="AC96" name="AC96">[AC96]</a></dt>
@@ -597,4 +623,8 @@
<dd>Tim Dierks, Christopher Allen, <q>The TLS Protocol Version 1.0</q>,
1999. See <a href="http://ietf.org/rfc/rfc2246.txt">http://ietf.org/rfc/rfc2246.txt</a>.</dd>
</dl>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.html.de b/docs/manual/stopping.html.de
new file mode 100644
index 0000000..ef2ce7e
--- /dev/null
+++ b/docs/manual/stopping.html.de
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>Beenden und Neustarten - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Beenden und Neustarten</h1>
+ <p>Dieses Dokument umfasst das Beenden und Neustarten des
+ Apache auf Unix-ähnlichen Systemen. Anwender von Windows NT, 2000
+ und XP sollten <a href="platform/windows.html#winsvc">Betreiben
+ des Apache als Dienst</a> lesen, während hingegen Anwender von
+ Windows 9x sowie ME <a href="platform/windows.html#wincons">Betreiben
+ des Apache als Konsolenanwendung</a> lesen sollten, um mehr Informationen
+ zur Handhabung des Apache auf diesen Systemen zu erhalten.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">Einleitung</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#term">Beenden</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#graceful">Unterbrechungsfreier Neustart</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#hup">Neustarten</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#race">Anhang: Signale und Wettkampfsituationen</a></li>
+</ul><h3>Siehe auch</h3><ul class="seealso"><li><a href="programs/httpd.html">httpd</a></li><li><a href="programs/apachectl.html">apachectl</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="introduction" id="introduction">Einleitung</a></h2>
+
+ <p>Um den Apache zu stoppen oder neu zu starten, müssen Sie
+ ein Signal an den laufenden <code>httpd</code>-Prozess senden. Es gibt
+ zwei Möglichkeiten, diese Signale zu senden. Zum einen können
+ Sie den Unix-Befehl <code>kill</code> verwenden, um den Prozessen
+ direkt Signale zu senden. Sie werden feststellen, dass auf Ihrem
+ System mehrere <code>httpd</code>-Programme laufen. Sie sollten jedoch
+ nicht jedem dieser Prozesse ein Signal senden, sondern nur dem
+ Elternprozess, dessen PID im <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code> steht. Das heißt, Sie
+ sollten es niemals nötig haben, einem anderen Prozess, als dem
+ Elternprozess, ein Signal zu senden. Es gibt drei Signale, die Sie an den
+ Elternprozess senden können: <a href="#term"><code>TERM</code></a>,
+ <a href="#hup"><code>HUP</code></a> und
+ <a href="#graceful"><code>USR1</code></a>, die nachfolgend beschrieben
+ werden.</p>
+
+ <p>Um dem Elternprozess ein Signal zu senden, verwenden Sie einen
+ Befehl wie z.B.:</p>
+
+ <div class="example"><p><code>kill -TERM `cat /usr/local/apache2/logs/httpd.pid`</code></p></div>
+
+ <p>Die zweite Methode, dem <code>httpd</code>-Prozess zu signalisieren,
+ ist die Verwendung der <code>-k</code>-Befehlszeilenoptionen
+ <code>stop</code>, <code>restart</code> und <code>graceful</code>, wie
+ unten beschrieben. Dies sind Argumente des <a href="programs/httpd.html">httpd</a>-Programms, es wird jedoch
+ empfohlen, sie unter Verwendung des Steuerskripts <a href="programs/apachectl.html">apachectl</a> zu senden, welches diese
+ an <code>httpd</code> durchreicht.</p>
+
+ <p>Nachdem Sie <code>httpd</code> signalisiert haben, können Sie
+ dessen Fortschritt beobachten, indem Sie eingeben:</p>
+
+ <div class="example"><p><code>tail -f /usr/local/apache2/logs/error_log</code></p></div>
+
+ <p>Passen Sie diese Beispiele entsprechend Ihren <code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code>- und <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code>-Einstellungen an.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="term" id="term">Beenden</a></h2>
+
+ <dl><dt>Signal: TERM</dt>
+ <dd><code>apachectl -k stop</code></dd>
+ </dl>
+
+ <p>Das Senden des <code>TERM</code>- oder <code>stop</code>-Signals an
+ den Elternprozess veranlasst diesen, sofort zu versuchen, alle seine
+ Kindprozesse zu beenden. Es kann einige Sekunden dauern, bis alle
+ Kindprozesse komplett beendet sind. Danach beendet sich der Elternprozess
+ selbst. Alle gerade bearbeiteten Anfragen werden abgebrochen.
+ Es werden keine weiteren Anfragen mehr bedient.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="graceful" id="graceful">Unterbrechungsfreier Neustart</a></h2>
+
+ <dl><dt>Signal: USR1</dt>
+ <dd><code>apachectl -k graceful</code></dd>
+ </dl>
+
+ <p>Das <code>USR1</code>- oder <code>graceful</code>-Signal
+ veranlasst den Elternprozess, die Kinder <em>anzuweisen</em>, sich
+ nach Abschluß ihrer momentanen bearbeiteten Anfrage zu beenden
+ (oder sich sofort zu beenden, wenn sie gerade keine Anfrage bedienen).
+ Der Elternprozess liest seine Konfigurationsdateien erneut ein und
+ öffnet seine Logdateien neu. Wenn ein Kindprozess stirbt,
+ ersetzt der Elternprozess ihn durch ein Kind der neuen
+ Konfigurations-<em>Generation</em>. Dieses beginnt sofort damit,
+ neue Anfragen zu bedienen.</p>
+
+ <div class="note">Auf bestimmten Plattformen, welche kein <code>USR1</code>
+ für einen unterbrechungsfreien Neustart erlauben, kann ein
+ alternatives Signal verwendet werden (wie z.B.
+ <code>WINCH</code>). Der Befehl <code>apachectl graceful</code>
+ sendet das jeweils richtige Signal für Ihre Platform.</div>
+
+ <p>Der Code ist dafür ausgelegt, stets die MPM-Direktiven
+ zur Prozesssteuerung zu beachten, so dass die Anzahl der Prozesse
+ und Threads, die zur Bedienung der Clients bereitstehen, während
+ des Neustarts auf die entsprechenden Werte gesetzt werden.
+ Weiterhin wird <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code>
+ auf folgende Art und Weise interpretiert: Wenn nach einer Sekunde
+ nicht mindestens <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code>
+ neue Kindprozesse erstellt wurden, dann werden, um den Durchsatz zu
+ beschleunigen, entsprechend weitere erstellt. Auf diese Weise versucht
+ der Code sowohl die Anzahl der Kinder entsprechend der Serverlast
+ anzupassen als auch Ihre Wünsche hinsichtlich des Parameters
+ <code class="directive">StartServers</code> zu berücksichtigen.</p>
+
+ <p>Benutzer von <code class="module"><a href="./mod/mod_status.html">mod_status</a></code> werden feststellen,
+ dass die Serverstatistiken <strong>nicht</strong> auf Null
+ zurückgesetzt werden, wenn ein <code>USR1</code> gesendet
+ wurde. Der Code wurde so geschrieben, dass sowohl die Zeit minimiert
+ wird, in der der Server nicht in der Lage ist, neue Anfragen zu
+ bedienen (diese werden vom Betriebssystem in eine Warteschlange
+ gestellt, so dass sie auf keinen Fall verloren gehen) als auch
+ Ihre Parameter zur Feinabstimmung berücksichtigt werden.
+ Um dies zu erreichen, muss die <em>Statustabelle</em> (Scoreboard),
+ die dazu verwendet wird, alle Kinder über mehrere Generationen
+ zu verfolgen, erhalten bleiben.</p>
+
+ <p>Das Statusmodul benutzt außerdem ein <code>G</code>, um
+ diejenigen Kinder zu kennzeichen, die noch immer Anfragen bedienen,
+ welche gestartet wurden, bevor ein unterbrechungsfreier Neustart
+ veranlaßt wurde.</p>
+
+ <p>Derzeit gibt es keine Möglichkeit für ein
+ Log-Rotationsskript, das <code>USR1</code> verwendet, sicher
+ festzustellen, dass alle Kinder, die in ein vor dem Neustart
+ geöffnetes Log schreiben, beendet sind. Wir schlagen vor, dass
+ Sie nach dem Senden des Signals <code>USR1</code> eine angemessene
+ Zeitspanne warten, bevor Sie das alte Log anfassen. Wenn beispielsweise
+ die meisten Ihrer Zugriffe bei Benutzern mit niedriger Bandbreite
+ weniger als 10 Minuten für eine vollständige Antwort
+ benötigen, dann könnten Sie 15 Minuten warten, bevor Sie auf
+ das alte Log zugreifen.</p>
+
+ <div class="note">Wenn Ihre Konfigurationsdatei Fehler enthält, während
+ Sie einen Neustart anweisen, dann wird Ihr Elternprozess nicht neu starten,
+ sondern sich mit einem Fehler beenden. Im Falle eines unterbrechungsfreien
+ Neustarts läßt er die Kinder weiterlaufen, wenn er sich beendet.
+ (Dies sind die Kinder, die sich "sanft beenden", indem sie ihre letzte
+ Anfrage erledigen.) Das verursacht Probleme, wenn Sie versuchen,
+ den Server neu zu starten -- er ist nicht in der Lage, sich an die Ports zu
+ binden, an denen er lauschen soll. Bevor Sie einen Neustart
+ durchführen, können Sie die Syntax der Konfigurationsdateien
+ mit dem Befehlszeilenargument <code>-t</code> überprüfen
+ (siehe auch <a href="programs/httpd.html">httpd</a>). Das garantiert
+ allerdings nicht, dass der Server korrekt starten wird. Um sowohl die
+ Syntax als auch die Semantik der Konfigurationsdateien zu prüfen,
+ können Sie versuchen, <code>httpd</code> als nicht-root-Benutzer
+ zu starten. Wenn dabei keine Fehler auftreten, wird er versuchen, seine
+ Sockets und Logdateien zu öffnen und fehlschlagen, da er nicht root
+ ist (oder weil sich der gegenwärtig laufende <code>httpd</code>
+ bereits diese Ports gebunden hat). Wenn er aus einem anderen Grund
+ fehlschlägt, dann liegt wahrscheinlich ein Konfigurationsfehler vor.
+ Der Fehler sollte behoben werden, bevor der unterbrechungsfreie Neustart
+ angewiesen wird.</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="hup" id="hup">Neustarten</a></h2>
+
+ <dl><dt>Signal: HUP</dt>
+ <dd><code>apachectl -k restart</code></dd>
+ </dl>
+
+ <p>Das Senden des Signals <code>HUP</code> oder <code>restart</code>
+ veranlaßt den Elternprozess, wie bei <code>TERM</code> alle seine
+ Kinder zu beenden. Der Elternprozess beendet sich jedoch nicht. Er liest
+ seine Konfigurationsdateien neu ein und öffnet alle Logdateien
+ erneut. Dann erzeugt er einen neuen Satz Kindprozesse und setzt die
+ Bedienung von Zugriffen fort.</p>
+
+ <p>Benutzer von <code class="module"><a href="./mod/mod_status.html">mod_status</a></code> werden feststellen, dass
+ die Serverstatistiken auf Null gesetzt werden, wenn ein <code>HUP</code>
+ gesendet wurde.</p>
+
+ <div class="note">Wenn Ihre Konfigurationsdatei einen Fehler enthält,
+ während Sie einen Neustart anweisen, dann wird Ihr Elternprozess
+ nicht neu starten, sondern sich mit einem Fehler beenden. Lesen Sie oben,
+ wie Sie das vermeiden können.</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="race" id="race">Anhang: Signale und Wettkampfsituationen</a></h2>
+
+ <p>Vor der Version 1.2b9 des Apache existierten verschiedene
+ <em>Wettkampfsituationen</em> (race conditions), die den Neustart und
+ die Signale beeinflußt haben. (Eine einfache Beschreibung einer
+ Wettkampfsituation lautet: es ist ein zeitabhängiges Problem; wenn
+ etwas zum falschen Zeitpunkt erfolgt, wird es sich nicht wie erwartet
+ verhalten.) Bei Architekturen mit dem "richtigen" Funktionsumfang
+ haben wir so viele eliminiert wie wir nur konnten. Dennoch
+ sollte beachtet werden, dass noch immer Wettkampfsituationen auf
+ bestimmten Architekturen existieren.</p>
+
+ <p>Bei Architekturen, die ein <code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code> auf Platte verwenden,
+ besteht die Gefahr, dass die Statustabelle beschädigt wird.
+ Das kann zu "bind: Address already in use" ("bind: Adresse wird
+ bereits verwendet", nach einem <code>HUP</code>) oder "long lost
+ child came home!" ("Der verlorene Sohn ist heimgekehrt", nach einem
+ <code>USR1</code>) führen. Ersteres ist ein schwerer Fehler,
+ wärend letzteres lediglich bewirkt, dass der Server einen Eintrag
+ in der Statustabelle verliert. So kann es ratsam sein, unterbrechungsfreie
+ Neustarts zusammen mit einem gelegentlichen harten Neustart zu verwenden.
+ Diese Probleme lassen sich nur sehr schwer umgehen, aber
+ glücklicherweise benötigen die meisten Architekturen keine
+ Statustabelle in Form einer Datei. Bitte lesen Sie für Architekturen,
+ die sie benötigen, die Dokumentation zu <code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code>.</p>
+
+ <p>Alle Architekturen haben in jedem Kindprozess eine kleine
+ Wettkampfsituation, welche die zweite und nachfolgende Anfragen
+ einer persistenten HTTP-Verbindung (KeepAlive) umfaßt. Der Prozess
+ kann nach dem Lesen der Anfragezeile aber vor dem Lesen der Anfrage-Header
+ enden. Es existiert eine Korrektur, die für 1.2 zu spät kam.
+ Theoretisch sollte das kein Problem darstellen, da
+ der KeepAlive-Client derartige Ereignisse aufgrund von
+ Netzwerk-Latenzzeiten und Auszeiten des Servers erwarten sollte.
+ In der Praxis scheint keiner von beiden beeinflußt zu werden
+ -- in einem Testfall wurde der Server zwanzig mal
+ pro Sekunde neu gestartet, während Clients das Angebot abgegrast
+ haben, ohne kaputte Bilder oder leere Dokumente zu erhalten.</p>
+</div></div>
+<div id="footer">
+<p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.html.en b/docs/manual/stopping.html.en
index 4668a64..209f93c 100644
--- a/docs/manual/stopping.html.en
+++ b/docs/manual/stopping.html.en
@@ -4,11 +4,35 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Stopping and Restarting - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Stopping and Restarting</h1>
+ -->
+<title>Stopping and Restarting - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Stopping and Restarting</h1>
<p>This document covers stopping and restarting Apache on
- Unix-like systems. Windows users should see <a href="platform/windows.html#signal">Signaling Apache when
- running</a>.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">Introduction</a></li><li><img alt="" src="./images/down.gif" /> <a href="#term">Stop Now</a></li><li><img alt="" src="./images/down.gif" /> <a href="#graceful">Graceful Restart</a></li><li><img alt="" src="./images/down.gif" /> <a href="#hup">Restart Now</a></li><li><img alt="" src="./images/down.gif" /> <a href="#race">Appendix: signals and race conditions</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="programs/httpd.html">httpd</a></li><li><a href="programs/apachectl.html">apachectl</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="introduction" id="introduction">Introduction</a></h2>
+ Unix-like systems. Windows NT, 2000 and XP users should see
+ <a href="platform/windows.html#winsvc">Running Apache as a
+ Service</a> and Windows 9x and ME users should see <a href="platform/windows.html#wincons">Running Apache as a
+ Console Application</a> for information on how to control
+ Apache on those platforms.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">Introduction</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#term">Stop Now</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#graceful">Graceful Restart</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#hup">Restart Now</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#race">Appendix: signals and race conditions</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="programs/httpd.html">httpd</a></li><li><a href="programs/apachectl.html">apachectl</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="introduction" id="introduction">Introduction</a></h2>
<p>In order to stop or restart Apache, you must send a signal to
the running <code>httpd</code> processes. There are two ways to
@@ -28,8 +52,9 @@
<div class="example"><p><code>kill -TERM `cat /usr/local/apache2/logs/httpd.pid`</code></p></div>
<p>The second method of signaling the <code>httpd</code> processes
- is to use the <code>-k</code> command line options: stop, restart,
- and graceful, as described below. These are arguments to the <a href="programs/httpd.html">httpd</a> binary, but we recommend that
+ is to use the <code>-k</code> command line options: <code>stop</code>,
+ <code>restart</code>, and <code>graceful</code>,
+ as described below. These are arguments to the <a href="programs/httpd.html">httpd</a> binary, but we recommend that
you send them using the <a href="programs/apachectl.html">apachectl</a> control script, which
will pass them through to <code>httpd</code>.</p>
@@ -39,7 +64,9 @@
<div class="example"><p><code>tail -f /usr/local/apache2/logs/error_log</code></p></div>
<p>Modify those examples to match your <code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code> and <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code> settings.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="term" id="term">Stop Now</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="term" id="term">Stop Now</a></h2>
<dl><dt>Signal: TERM</dt>
<dd><code>apachectl -k stop</code></dd>
@@ -50,7 +77,9 @@
children. It may take it several seconds to complete killing off
its children. Then the parent itself exits. Any requests in
progress are terminated, and no further requests are served.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="graceful" id="graceful">Graceful Restart</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="graceful" id="graceful">Graceful Restart</a></h2>
<dl><dt>Signal: USR1</dt>
<dd><code>apachectl -k graceful</code></dd>
@@ -64,10 +93,10 @@
it with a child from the new <em>generation</em> of the
configuration, which begins serving new requests immediately.</p>
- <div class="note">On certain platforms that do not allow USR1 to be used for a
- graceful restart, an alternative signal may be used (such as
- WINCH). The command <code>apachectl graceful</code> will send the
- right signal for your platform.</div>
+ <div class="note">On certain platforms that do not allow <code>USR1</code> to
+ be used for a graceful restart, an alternative signal may be used (such
+ as <code>WINCH</code>). The command <code>apachectl graceful</code>
+ will send the right signal for your platform.</div>
<p>This code is designed to always respect the process control
directive of the MPMs, so the number of processes and threads
@@ -78,7 +107,7 @@
been created, then create enough to pick up the slack. Hence the
code tries to maintain both the number of children appropriate for
the current load on the server, and respect your wishes with the
- StartServers parameter.</p>
+ <code class="directive">StartServers</code> parameter.</p>
<p>Users of the <code class="module"><a href="./mod/mod_status.html">mod_status</a></code>
will notice that the server statistics are <strong>not</strong>
@@ -115,13 +144,15 @@
command line argument (see <a href="programs/httpd.html">httpd</a>). This still will not
guarantee that the server will restart correctly. To check the
semantics of the configuration files as well as the syntax, you
- can try starting httpd as a non-root user. If there are no
+ can try starting <code>httpd</code> as a non-root user. If there are no
errors it will attempt to open its sockets and logs and fail
- because it's not root (or because the currently running httpd
+ because it's not root (or because the currently running <code>httpd</code>
already has those ports bound). If it fails for any other
reason then it's probably a config file error and the error
should be fixed before issuing the graceful restart.</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="hup" id="hup">Restart Now</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="hup" id="hup">Restart Now</a></h2>
<dl><dt>Signal: HUP</dt>
<dd><code>apachectl -k restart</code></dd>
@@ -140,7 +171,9 @@
<div class="note">If your configuration file has errors in it when you issue a
restart then your parent will not restart, it will exit with an
error. See above for a method of avoiding this.</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="race" id="race">Appendix: signals and race conditions</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="race" id="race">Appendix: signals and race conditions</a></h2>
<p>Prior to Apache 1.2b9 there were several <em>race
conditions</em> involving the restart and die signals (a simple
@@ -173,4 +206,8 @@
-- in a test case the server was restarted twenty times per
second and clients successfully browsed the site without
getting broken images or empty documents. </p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.html.ja.jis b/docs/manual/stopping.html.ja.jis
index 3f23b46..3941ff9 100644
--- a/docs/manual/stopping.html.ja.jis
+++ b/docs/manual/stopping.html.ja.jis
@@ -4,16 +4,43 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>$BDd;_$H:F5/F0(B - Apache HTTP $B%5!<%P(B</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$BDd;_$H:F5/F0(B</h1>
- <p>$B$3$NJ8=q$G$O(B Unix $B$KN`(B$B;w$7$?%7%9%F%`$G$N(B
- Apache $B$NDd;_$H:F5/F0$K$D$$$F(B$B07$C$F$$$^$9!#(BWindows
+ -->
+<title>$BDd;_$H:F5/F0(B - Apache HTTP $B%5!<%P(B</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>$BDd;_$H:F5/F0(B</h1>
+ <p>$B$3$NJ8=q$G$O(B Unix $B$KN`;w$7$?%7%9%F%`$G$N(B
+ Apache $B$NDd;_$H:F5/F0$K$D$$$F07$C$F$$$^$9!#(BWindows
$B%f!<%6(B (Windows $B$G(B Apache $B$r;H$&>l9g(B) $B$O!"(B<a href="platform/windows.html#signal">$B<B9TCf$N(B Apache
$B$K%7%0%J%k$rAw$k(B</a>$B$b$4Mw2<$5$$!#(B</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">$B%$%s%H%m%@%/%7%g%s(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#term">$B5^$JDd;_(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#graceful">$B4K$d$+$J:F5/F0(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#hup">$B5^$J:F5/F0(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#race">$BIUO?(B: $B%7%0%J%k$H6%9g>uBV(B</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="introduction" id="introduction">$B%$%s%H%m%@%/%7%g%s(B</a></h2>
- <p>$B$?$/$5$s$N<B9T7A<0(B <code>httpd</code> $B$,%7%9%F%`>e$G(B
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">$B%$%s%H%m%@%/%7%g%s(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#term">$B5^$JDd;_(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#graceful">$B4K$d$+$J:F5/F0(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#hup">$B5^$J:F5/F0(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#race">$BIUO?(B: $B%7%0%J%k$H6%9g>uBV(B</a></li>
+</ul><h3>$B;2>H(B</h3><ul class="seealso"><li><a href="programs/httpd.html">httpd</a></li><li><a href="programs/apachectl.html">apachectl</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="introduction" id="introduction">$B%$%s%H%m%@%/%7%g%s(B</a></h2>
+
+ <p>Apache $B$rDd;_$7$?$j:F5/F0$7$?$j$9$k$?$a$K$O!"<B9T$5$l$F$$$k(B
+ <code>httpd</code> $B%W%m%;%9$K%7%0%J%k$rAw$kI,MW$,$"$j$^$9!#(B
+ $B%7%0%J%k$rAw$k$K$OFs$D$NJ}K!$,$"$j$^$9!#(B
+ $B0l$DL\$O%W%m%;%9$KD>@\%7%0%J%k$rAw$k(B unix $B$N(B <code>kill</code>
+ $B%3%^%s%I$r;HMQ$9$kJ}K!$G$9!#(B
+ $B%7%9%F%`$r8+$l$P$?$/$5$s$N(B <code>httpd</code> $B$,(B
$B<B9T$5$l$F$$$k$N$K5$$,IU$/$G$7$g$&$,!"%7%0%J%k$rAw$k$N$O(B
$B?F%W%m%;%9$@$1$G!"$=$l0J30$N8D!9$N%W%m%;%9$K$O(B
- $B%7%0%J%k$r(B$BAw$i$J$$$G2<$5$$!#$=$N?F%W%m%;%9$N(B pid $B$O(B
+ $B%7%0%J%k$rAw$i$J$$$G2<$5$$!#$=$N?F%W%m%;%9$N(B pid $B$O(B
<code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code>
$B$K=q$+$l$F$$$^$9!#$3$l$O$D$^$j!"?F0J30$N%W%m%;%9$K(B
$B%7%0%J%k$rAw$kI,MW$9$i$J$$!"$H$$$&$3$H$G$9!#(B
@@ -24,57 +51,66 @@
<p>$B?F%W%m%;%9$K%7%0%J%k$rAw$k$K$O!"(B
$B<!$N$h$&$J%3%^%s%I$rH/9T$7$F2<$5$$(B:</p>
-<div class="example"><p><code>kill -TERM `cat /usr/local/apache/logs/httpd.pid`</code></p></div>
+<div class="example"><p><code>kill -TERM `cat /usr/local/apache2/logs/httpd.pid`</code></p></div>
- <p>$B$3$l$N<B9T>u67$O<!$N%3%^%s%I$GFI$`$3$H$,$G$-$^$9(B:</p>
+ <p><code>httpd</code> $B%W%m%;%9$K%7%0%J%k$rAw$k(B 2 $BHVL\$NJ}K!$O(B
+ <code>-k</code> $B$H$$$&%3%^%s%I%i%$%s0z?t$r;HMQ$9$k$3$H$G$9!#(B
+ $B2<$G@bL@$5$l$F$$$k$h$&$K!"(B<code>stop</code>, <code>restart</code>,
+ <code>graceful</code> $B$r;XDj$G$-$^$9!#(B
+ $B$3$l$i$O(B <a href="programs/httpd.html">httpd</a> $B$N0z?t$G$9$,!"(B
+ $B@)8fMQ$N%9%/%j%W%H(B <a href="programs/apachectl.html">apachectl</a> $B$r(B
+ $B;H$&$3$H$r$*A&$a$7$^$9!#(B<a href="programs/apachectl.html">apachectl</a> $B$O$=$l$i$N0z?t$r$=$N$^$^(B
+ <code>httpd</code> $B$KEO$7$^$9!#(B</p>
-<div class="example"><p><code>tail -f /usr/local/apache/logs/error_log</code></p></div>
+ <p><code>httpd</code> $B$K%7%0%J%k$rAw$C$?8e!"(B
+ $B<B9T>u67$r<!$N%3%^%s%I$GFI$`$3$H$,$G$-$^$9(B:</p>
+
+<div class="example"><p><code>tail -f /usr/local/apache2/logs/error_log</code></p></div>
<p>$B$3$3$K5s$2$?Nc$O!"3F<+$N(B
<code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code>
$B$H(B
<code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code>
$B$N@_Dj$KE,9g$9$k$h$&$KE,59=$@5$7$F2<$5$$!#(B</p>
-
- <p><a href="programs/apachectl.html">apachectl</a>
- $B$H8F$P$l$k%7%'%k%9%/%j%W%H$G!"(BApache $B$K%7%0%J%k$rAw$k<j=g$r(B
- $B<+F02=$9$k$3$H$,$G$-$^$9!#$3$N%9%/%j%W%H$N>\:Y$K4X$7$F$O!"(B
- <a href="invoking.html">Apache $B$N5/F0(B</a>$B$NJ8=q$r$4Mw2<$5$$!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="term" id="term">$B5^$JDd;_(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="term" id="term">$B5^$JDd;_(B</a></h2>
<dl><dt>$B%7%0%J%k(B: TERM</dt>
-<dd><code>apachectl stop</code></dd>
+<dd><code>apachectl -k stop</code></dd>
</dl>
- <p><code>TERM</code> $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"(B
- $BB(:B$K;R%W%m%;%9A4$F$r(B kill $B$7$h$&$H$7$^$9!#(B
+ <p><code>TERM</code> $B$"$k$$$O(B <code>stop</code>
+ $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"B(:B$K;R%W%m%;%9A4$F$r(B kill $B$7$h$&$H$7$^$9!#(B
$B;R%W%m%;%9$r40A4$K(B kill $B$7=*$o$k$^$G$K?tIC$+$+$k$+$b$7$l$^$;$s!#(B
$B$=$N8e!"?F%W%m%;%9<+?H$,=*N;$7$^$9!#(B
$B=hM}Cf$N%j%/%(%9%H$OA4$FDd;_$5$l!"$b$O$d%j%/%(%9%H$KBP$9$k(B
$B1~Ez$O$5$l$^$;$s!#(B</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="graceful" id="graceful">$B4K$d$+$J:F5/F0(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="graceful" id="graceful">$B4K$d$+$J:F5/F0(B</a></h2>
<dl><dt>$B%7%0%J%k(B: USR1</dt>
-<dd><code>apachectl graceful</code></dd>
+<dd><code>apachectl -k graceful</code></dd>
</dl>
- <p>$B?F%W%m%;%9$O(B <code>USR1</code> $B%7%0%J%k$r<u$1<h$k$H!"(B
- $B;R%W%m%;%9$K8=:_$N%j%/%(%9%H$N=hM}$N8e$K=*N;$9$k(B
+ <p>$B?F%W%m%;%9$O(B <code>USR1</code> $B$"$k$$$O(B <code>graceful</code>
+ $B%7%0%J%k$r<u$1<h$k$H!";R%W%m%;%9$K8=:_$N%j%/%(%9%H$N=hM}$N8e$K=*N;$9$k(B
($B$"$k$$$O2?$b$7$F$$$J$1$l$P$9$0$K=*N;$9$k(B)
$B$h$&$K(B<em>$B=u8@(B</em>$B$7$^$9!#(B
$B?F%W%m%;%9$O@_Dj%U%!%$%k$r:FFI9~$7$F!"%m%0%U%!%$%k$r3+$-D>$7$^$9!#(B
$B;R%W%m%;%9$,=y!9$K$J$/$J$k$K=>$C$F!"(B
$B?7$7$$(B<em>$B@$Be(B</em>$B$N@_Dj$K$h$k;R%W%m%;%9$KCV$-49$($F$$$-$^$9!#(B
$B$=$7$F!"$3$l$i$,?7$?$J%j%/%(%9%H$KB(:B$K1~Ez$7;O$a$^$9!#(B</p>
- <div class="note">$BFCDj$N%W%i%C%H%[!<%`$G$O(B USR1 $B$r4K$d$+$J:F5/F0$N$?$a$K(B
+ <div class="note">$BFCDj$N%W%i%C%H%[!<%`$G$O(B <code>USR1</code> $B$r4K$d$+$J:F5/F0$N$?$a$K(B
$B;H$&$3$H$,$G$-$^$;$s$,!"Be$o$j$N%7%0%J%k(B
- ($BNc$($P(B WINCH) $B$,;HMQ$G$-$k$G$7$g$&!#(B
+ ($BNc$($P(B <code>WINCH</code>) $B$,;HMQ$G$-$k$G$7$g$&!#(B
<code>apachectl graceful</code>
$B$H$$$&%3%^%s%I$O%W%i%C%H%[!<%`$K9g$C$?%7%0%J%k$rAw$j$^$9!#(B</div>
<p>$B$3$N%3!<%I$O>o$K(B
MPM $B$N%W%m%;%9@)8f%G%#%l%/%F%#%V$N@_Dj$r=E;k$7$^$9$N$G!"(B
$B%/%i%$%"%s%H$N%j%/%(%9%H$r07$&%W%m%;%9$H%9%l%C%I$N?t$r:F5/F0$N=hM}Cf$b(B
- $BE,@Z$JCM$K0];}$5$l$^$9!#!#$^$?!"<!$N$h$&$K$7$F(B
+ $BE,@Z$JCM$K0];}$5$l$^$9!#$^$?!"<!$N$h$&$K$7$F(B
<code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code>
$B$r<i$j$^$9(B:
$B>/$J$/$H$b(B 1 $BIC8e$K(B <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code> $B8D$N?7$7$$;R%W%m%;%9$,(B
@@ -95,7 +131,7 @@
<em>$B%9%3%"%\!<%I(B</em>$B$r0];}$7$J$1$l$P$J$j$^$;$s!#(B</p>
<p>status $B%b%8%e!<%k$O!"4K$d$+$J:F5/F00JA0$+$i3+;O$7$F(B
- $B%j%/%(%9%H$K1~Ez$7B3$1$F$$$k;R%W%m%;%9$rFCDj$9$k$?$a(B$B$K!"(B
+ $B%j%/%(%9%H$K1~Ez$7B3$1$F$$$k;R%W%m%;%9$rFCDj$9$k$?$a$K!"(B
<code>G</code> $B$r;H$&$3$H$b$7$^$9!#(B</p>
<p>$B8=:_!"(B<code>USR1</code> $B$r;H$&%m%00\F0%9%/%j%W%H$G$O!"(B
@@ -119,21 +155,23 @@
(<a href="programs/httpd.html">httpd</a> $B$r$4Mw2<$5$$(B)
$B$r;H$C$F8!>Z$9$k$3$H$,$G$-$^$9!#(B
$B@_Dj%U%!%$%k$N0UL#E*$JFbMF$r9=J8$HF1MM$K8!>Z$7$?$$>l9g$O!"(B
- $BHs(B root $B%f!<%6$G(B httpd $B$r5/F0$7$h$&$H$9$l$P$o$+$j$^$9!#(B
+ $BHs(B root $B%f!<%6$G(B <code>httpd</code> $B$r5/F0$7$h$&$H$9$l$P$o$+$j$^$9!#(B
$B$b$7%(%i!<$,$J$1$l$P!"%=%1%C%H$d%m%0$r3+$3$&$H$7$F(B
root $B$G$J$$$?$a(B
- ($B$b$7$/$O(B httpd $B$,4{$KI,MW$J%]!<%H$K%P%$%s%I$7$F$$$k$?$a(B)
+ ($B$b$7$/$O(B <code>httpd</code> $B$,4{$KI,MW$J%]!<%H$K%P%$%s%I$7$F$$$k$?$a(B)
$B$K<:GT$9$k$G$7$g$&!#(B
$B$3$l0J30$NM}M3$G5/F0$K<:GT$7$?$N$G$"$l$P!"(B
$B$=$l$O@_Dj%U%!%$%k$N%(%i!<$G!"(B
$B4K$d$+$J:F5/F0$r9T$&A0$K$=$N8m$j$r=$@5$7$J$1$l$P$J$j$^$;$s!#(B</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="hup" id="hup">$B5^$J:F5/F0(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="hup" id="hup">$B5^$J:F5/F0(B</a></h2>
<dl><dt>$B%7%0%J%k(B: HUP</dt>
-<dd><code>apachectl restart</code></dd>
+<dd><code>apachectl -k restart</code></dd>
</dl>
- <p><code>HUP</code> $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"(B
+ <p><code>HUP</code> $B$"$k$$$O(B <code>restart</code> $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"(B
<code>TERM</code> $B$HF1MM$K;R%W%m%;%9$r(B kill $B$7$^$9$,!"(B
$B?F%W%m%;%9$O=*N;$7$^$;$s!#(B
$B@_Dj%U%!%$%k$r:FFI9~$7$F!"%m%0%U%!%$%kA4$F$r3+$-D>$7$^$9!#(B
@@ -146,7 +184,9 @@
<div class="note">$B:F5/F0;~$K@_Dj%U%!%$%k$K8m$j$,$"$k$H!"(B
$B?F%W%m%;%9$O:F5/F0$;$:$K%(%i!<$H$H$b$K=*N;$7$^$9!#(B
$B$3$l$rHr$1$k$K$O<!$NJ}K!$r$4Mw2<$5$$!#(B</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="race" id="race">$BIUO?(B: $B%7%0%J%k$H6%9g>uBV(B</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="race" id="race">$BIUO?(B: $B%7%0%J%k$H6%9g>uBV(B</a></h2>
<p>Apache 1.2b9 $B0JA0$O!":F5/F0$dDd;_$N%7%0%J%k$r4^$`(B<em>$B6%9g>uBV(B</em>
($B6%9g>uBV$r4JC1$K@bL@$9$k$H(B: $B%?%$%_%s$K%0$h$kLdBj$G!"(B
@@ -188,4 +228,8 @@
-- $B%F%9%H%1!<%9$G%5!<%P$r(B 1 $BIC4V$K(B 20 $B2s:F5/F0$7$F$b(B
$B%/%i%$%"%s%H$O2u$l$?2hA|$d6u$N%I%-%e%a%s%H$r<u$1<h$k$3$H$J$/(B
$B@5>o$K1\Mw$G$-$F$$$^$9!#(B</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.xml b/docs/manual/stopping.xml
index 89a0b6e..88776a7 100644
--- a/docs/manual/stopping.xml
+++ b/docs/manual/stopping.xml
@@ -8,9 +8,12 @@
<summary>
<p>This document covers stopping and restarting Apache on
- Unix-like systems. Windows users should see <a
- href="platform/windows.html#signal">Signaling Apache when
- running</a>.</p>
+ Unix-like systems. Windows NT, 2000 and XP users should see
+ <a href="platform/windows.html#winsvc">Running Apache as a
+ Service</a> and Windows 9x and ME users should see <a
+ href="platform/windows.html#wincons">Running Apache as a
+ Console Application</a> for information on how to control
+ Apache on those platforms.</p>
</summary>
<seealso><a href="programs/httpd.html">httpd</a></seealso>
@@ -37,8 +40,9 @@
<example>kill -TERM `cat /usr/local/apache2/logs/httpd.pid`</example>
<p>The second method of signaling the <code>httpd</code> processes
- is to use the <code>-k</code> command line options: stop, restart,
- and graceful, as described below. These are arguments to the <a
+ is to use the <code>-k</code> command line options: <code>stop</code>,
+ <code>restart</code>, and <code>graceful</code>,
+ as described below. These are arguments to the <a
href="programs/httpd.html">httpd</a> binary, but we recommend that
you send them using the <a
href="programs/apachectl.html">apachectl</a> control script, which
@@ -81,10 +85,10 @@
it with a child from the new <em>generation</em> of the
configuration, which begins serving new requests immediately.</p>
- <note>On certain platforms that do not allow USR1 to be used for a
- graceful restart, an alternative signal may be used (such as
- WINCH). The command <code>apachectl graceful</code> will send the
- right signal for your platform.</note>
+ <note>On certain platforms that do not allow <code>USR1</code> to
+ be used for a graceful restart, an alternative signal may be used (such
+ as <code>WINCH</code>). The command <code>apachectl graceful</code>
+ will send the right signal for your platform.</note>
<p>This code is designed to always respect the process control
directive of the MPMs, so the number of processes and threads
@@ -96,7 +100,7 @@
been created, then create enough to pick up the slack. Hence the
code tries to maintain both the number of children appropriate for
the current load on the server, and respect your wishes with the
- StartServers parameter.</p>
+ <directive>StartServers</directive> parameter.</p>
<p>Users of the <module>mod_status</module>
will notice that the server statistics are <strong>not</strong>
@@ -134,9 +138,9 @@
href="programs/httpd.html">httpd</a>). This still will not
guarantee that the server will restart correctly. To check the
semantics of the configuration files as well as the syntax, you
- can try starting httpd as a non-root user. If there are no
+ can try starting <code>httpd</code> as a non-root user. If there are no
errors it will attempt to open its sockets and logs and fail
- because it's not root (or because the currently running httpd
+ because it's not root (or because the currently running <code>httpd</code>
already has those ports bound). If it fails for any other
reason then it's probably a config file error and the error
should be fixed before issuing the graceful restart.</note>
@@ -200,4 +204,4 @@
getting broken images or empty documents. </p>
</section>
-</manualpage>
\ No newline at end of file
+</manualpage>
diff --git a/docs/manual/stopping.xml.de b/docs/manual/stopping.xml.de
new file mode 100644
index 0000000..ad11ed1
--- /dev/null
+++ b/docs/manual/stopping.xml.de
@@ -0,0 +1,230 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
+<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
+<!-- English revision: 1.2.2.3 -->
+<manualpage>
+<relativepath href="."/>
+
+ <title>Beenden und Neustarten</title>
+
+<summary>
+ <p>Dieses Dokument umfasst das Beenden und Neustarten des
+ Apache auf Unix-ähnlichen Systemen. Anwender von Windows NT, 2000
+ und XP sollten <a href="platform/windows.html#winsvc">Betreiben
+ des Apache als Dienst</a> lesen, während hingegen Anwender von
+ Windows 9x sowie ME <a href="platform/windows.html#wincons">Betreiben
+ des Apache als Konsolenanwendung</a> lesen sollten, um mehr Informationen
+ zur Handhabung des Apache auf diesen Systemen zu erhalten.</p>
+</summary>
+
+<seealso><a href="programs/httpd.html">httpd</a></seealso>
+<seealso><a href="programs/apachectl.html">apachectl</a></seealso>
+
+<section id="introduction"><title>Einleitung</title>
+
+ <p>Um den Apache zu stoppen oder neu zu starten, müssen Sie
+ ein Signal an den laufenden <code>httpd</code>-Prozess senden. Es gibt
+ zwei Möglichkeiten, diese Signale zu senden. Zum einen können
+ Sie den Unix-Befehl <code>kill</code> verwenden, um den Prozessen
+ direkt Signale zu senden. Sie werden feststellen, dass auf Ihrem
+ System mehrere <code>httpd</code>-Programme laufen. Sie sollten jedoch
+ nicht jedem dieser Prozesse ein Signal senden, sondern nur dem
+ Elternprozess, dessen PID im <directive
+ module="mpm_common">PidFile</directive> steht. Das heißt, Sie
+ sollten es niemals nötig haben, einem anderen Prozess, als dem
+ Elternprozess, ein Signal zu senden. Es gibt drei Signale, die Sie an den
+ Elternprozess senden können: <a href="#term"><code>TERM</code></a>,
+ <a href="#hup"><code>HUP</code></a> und
+ <a href="#graceful"><code>USR1</code></a>, die nachfolgend beschrieben
+ werden.</p>
+
+ <p>Um dem Elternprozess ein Signal zu senden, verwenden Sie einen
+ Befehl wie z.B.:</p>
+
+ <example>kill -TERM `cat /usr/local/apache2/logs/httpd.pid`</example>
+
+ <p>Die zweite Methode, dem <code>httpd</code>-Prozess zu signalisieren,
+ ist die Verwendung der <code>-k</code>-Befehlszeilenoptionen
+ <code>stop</code>, <code>restart</code> und <code>graceful</code>, wie
+ unten beschrieben. Dies sind Argumente des <a
+ href="programs/httpd.html">httpd</a>-Programms, es wird jedoch
+ empfohlen, sie unter Verwendung des Steuerskripts <a
+ href="programs/apachectl.html">apachectl</a> zu senden, welches diese
+ an <code>httpd</code> durchreicht.</p>
+
+ <p>Nachdem Sie <code>httpd</code> signalisiert haben, können Sie
+ dessen Fortschritt beobachten, indem Sie eingeben:</p>
+
+ <example>tail -f /usr/local/apache2/logs/error_log</example>
+
+ <p>Passen Sie diese Beispiele entsprechend Ihren <directive
+ module="core">ServerRoot</directive>- und <directive
+ module="mpm_common">PidFile</directive>-Einstellungen an.</p>
+</section>
+
+<section id="term"><title>Beenden</title>
+
+ <dl><dt>Signal: TERM</dt>
+ <dd><code>apachectl -k stop</code></dd>
+ </dl>
+
+ <p>Das Senden des <code>TERM</code>- oder <code>stop</code>-Signals an
+ den Elternprozess veranlasst diesen, sofort zu versuchen, alle seine
+ Kindprozesse zu beenden. Es kann einige Sekunden dauern, bis alle
+ Kindprozesse komplett beendet sind. Danach beendet sich der Elternprozess
+ selbst. Alle gerade bearbeiteten Anfragen werden abgebrochen.
+ Es werden keine weiteren Anfragen mehr bedient.</p>
+</section>
+
+<section id="graceful"><title>Unterbrechungsfreier Neustart</title>
+
+ <dl><dt>Signal: USR1</dt>
+ <dd><code>apachectl -k graceful</code></dd>
+ </dl>
+
+ <p>Das <code>USR1</code>- oder <code>graceful</code>-Signal
+ veranlasst den Elternprozess, die Kinder <em>anzuweisen</em>, sich
+ nach Abschluß ihrer momentanen bearbeiteten Anfrage zu beenden
+ (oder sich sofort zu beenden, wenn sie gerade keine Anfrage bedienen).
+ Der Elternprozess liest seine Konfigurationsdateien erneut ein und
+ öffnet seine Logdateien neu. Wenn ein Kindprozess stirbt,
+ ersetzt der Elternprozess ihn durch ein Kind der neuen
+ Konfigurations-<em>Generation</em>. Dieses beginnt sofort damit,
+ neue Anfragen zu bedienen.</p>
+
+ <note>Auf bestimmten Plattformen, welche kein <code>USR1</code>
+ für einen unterbrechungsfreien Neustart erlauben, kann ein
+ alternatives Signal verwendet werden (wie z.B.
+ <code>WINCH</code>). Der Befehl <code>apachectl graceful</code>
+ sendet das jeweils richtige Signal für Ihre Platform.</note>
+
+ <p>Der Code ist dafür ausgelegt, stets die MPM-Direktiven
+ zur Prozesssteuerung zu beachten, so dass die Anzahl der Prozesse
+ und Threads, die zur Bedienung der Clients bereitstehen, während
+ des Neustarts auf die entsprechenden Werte gesetzt werden.
+ Weiterhin wird <directive module="mpm_common">StartServers</directive>
+ auf folgende Art und Weise interpretiert: Wenn nach einer Sekunde
+ nicht mindestens <directive module="mpm_common">StartServers</directive>
+ neue Kindprozesse erstellt wurden, dann werden, um den Durchsatz zu
+ beschleunigen, entsprechend weitere erstellt. Auf diese Weise versucht
+ der Code sowohl die Anzahl der Kinder entsprechend der Serverlast
+ anzupassen als auch Ihre Wünsche hinsichtlich des Parameters
+ <directive>StartServers</directive> zu berücksichtigen.</p>
+
+ <p>Benutzer von <module>mod_status</module> werden feststellen,
+ dass die Serverstatistiken <strong>nicht</strong> auf Null
+ zurückgesetzt werden, wenn ein <code>USR1</code> gesendet
+ wurde. Der Code wurde so geschrieben, dass sowohl die Zeit minimiert
+ wird, in der der Server nicht in der Lage ist, neue Anfragen zu
+ bedienen (diese werden vom Betriebssystem in eine Warteschlange
+ gestellt, so dass sie auf keinen Fall verloren gehen) als auch
+ Ihre Parameter zur Feinabstimmung berücksichtigt werden.
+ Um dies zu erreichen, muss die <em>Statustabelle</em> (Scoreboard),
+ die dazu verwendet wird, alle Kinder über mehrere Generationen
+ zu verfolgen, erhalten bleiben.</p>
+
+ <p>Das Statusmodul benutzt außerdem ein <code>G</code>, um
+ diejenigen Kinder zu kennzeichen, die noch immer Anfragen bedienen,
+ welche gestartet wurden, bevor ein unterbrechungsfreier Neustart
+ veranlaßt wurde.</p>
+
+ <p>Derzeit gibt es keine Möglichkeit für ein
+ Log-Rotationsskript, das <code>USR1</code> verwendet, sicher
+ festzustellen, dass alle Kinder, die in ein vor dem Neustart
+ geöffnetes Log schreiben, beendet sind. Wir schlagen vor, dass
+ Sie nach dem Senden des Signals <code>USR1</code> eine angemessene
+ Zeitspanne warten, bevor Sie das alte Log anfassen. Wenn beispielsweise
+ die meisten Ihrer Zugriffe bei Benutzern mit niedriger Bandbreite
+ weniger als 10 Minuten für eine vollständige Antwort
+ benötigen, dann könnten Sie 15 Minuten warten, bevor Sie auf
+ das alte Log zugreifen.</p>
+
+ <note>Wenn Ihre Konfigurationsdatei Fehler enthält, während
+ Sie einen Neustart anweisen, dann wird Ihr Elternprozess nicht neu starten,
+ sondern sich mit einem Fehler beenden. Im Falle eines unterbrechungsfreien
+ Neustarts läßt er die Kinder weiterlaufen, wenn er sich beendet.
+ (Dies sind die Kinder, die sich "sanft beenden", indem sie ihre letzte
+ Anfrage erledigen.) Das verursacht Probleme, wenn Sie versuchen,
+ den Server neu zu starten -- er ist nicht in der Lage, sich an die Ports zu
+ binden, an denen er lauschen soll. Bevor Sie einen Neustart
+ durchführen, können Sie die Syntax der Konfigurationsdateien
+ mit dem Befehlszeilenargument <code>-t</code> überprüfen
+ (siehe auch <a href="programs/httpd.html">httpd</a>). Das garantiert
+ allerdings nicht, dass der Server korrekt starten wird. Um sowohl die
+ Syntax als auch die Semantik der Konfigurationsdateien zu prüfen,
+ können Sie versuchen, <code>httpd</code> als nicht-root-Benutzer
+ zu starten. Wenn dabei keine Fehler auftreten, wird er versuchen, seine
+ Sockets und Logdateien zu öffnen und fehlschlagen, da er nicht root
+ ist (oder weil sich der gegenwärtig laufende <code>httpd</code>
+ bereits diese Ports gebunden hat). Wenn er aus einem anderen Grund
+ fehlschlägt, dann liegt wahrscheinlich ein Konfigurationsfehler vor.
+ Der Fehler sollte behoben werden, bevor der unterbrechungsfreie Neustart
+ angewiesen wird.</note>
+</section>
+
+<section id="hup"><title>Neustarten</title>
+
+ <dl><dt>Signal: HUP</dt>
+ <dd><code>apachectl -k restart</code></dd>
+ </dl>
+
+ <p>Das Senden des Signals <code>HUP</code> oder <code>restart</code>
+ veranlaßt den Elternprozess, wie bei <code>TERM</code> alle seine
+ Kinder zu beenden. Der Elternprozess beendet sich jedoch nicht. Er liest
+ seine Konfigurationsdateien neu ein und öffnet alle Logdateien
+ erneut. Dann erzeugt er einen neuen Satz Kindprozesse und setzt die
+ Bedienung von Zugriffen fort.</p>
+
+ <p>Benutzer von <module>mod_status</module> werden feststellen, dass
+ die Serverstatistiken auf Null gesetzt werden, wenn ein <code>HUP</code>
+ gesendet wurde.</p>
+
+ <note>Wenn Ihre Konfigurationsdatei einen Fehler enthält,
+ während Sie einen Neustart anweisen, dann wird Ihr Elternprozess
+ nicht neu starten, sondern sich mit einem Fehler beenden. Lesen Sie oben,
+ wie Sie das vermeiden können.</note>
+</section>
+
+<section id="race"><title>Anhang: Signale und Wettkampfsituationen</title>
+
+ <p>Vor der Version 1.2b9 des Apache existierten verschiedene
+ <em>Wettkampfsituationen</em> (race conditions), die den Neustart und
+ die Signale beeinflußt haben. (Eine einfache Beschreibung einer
+ Wettkampfsituation lautet: es ist ein zeitabhängiges Problem; wenn
+ etwas zum falschen Zeitpunkt erfolgt, wird es sich nicht wie erwartet
+ verhalten.) Bei Architekturen mit dem "richtigen" Funktionsumfang
+ haben wir so viele eliminiert wie wir nur konnten. Dennoch
+ sollte beachtet werden, dass noch immer Wettkampfsituationen auf
+ bestimmten Architekturen existieren.</p>
+
+ <p>Bei Architekturen, die ein <directive
+ module="mpm_common">ScoreBoardFile</directive> auf Platte verwenden,
+ besteht die Gefahr, dass die Statustabelle beschädigt wird.
+ Das kann zu "bind: Address already in use" ("bind: Adresse wird
+ bereits verwendet", nach einem <code>HUP</code>) oder "long lost
+ child came home!" ("Der verlorene Sohn ist heimgekehrt", nach einem
+ <code>USR1</code>) führen. Ersteres ist ein schwerer Fehler,
+ wärend letzteres lediglich bewirkt, dass der Server einen Eintrag
+ in der Statustabelle verliert. So kann es ratsam sein, unterbrechungsfreie
+ Neustarts zusammen mit einem gelegentlichen harten Neustart zu verwenden.
+ Diese Probleme lassen sich nur sehr schwer umgehen, aber
+ glücklicherweise benötigen die meisten Architekturen keine
+ Statustabelle in Form einer Datei. Bitte lesen Sie für Architekturen,
+ die sie benötigen, die Dokumentation zu <directive
+ module="mpm_common">ScoreBoardFile</directive>.</p>
+
+ <p>Alle Architekturen haben in jedem Kindprozess eine kleine
+ Wettkampfsituation, welche die zweite und nachfolgende Anfragen
+ einer persistenten HTTP-Verbindung (KeepAlive) umfaßt. Der Prozess
+ kann nach dem Lesen der Anfragezeile aber vor dem Lesen der Anfrage-Header
+ enden. Es existiert eine Korrektur, die für 1.2 zu spät kam.
+ Theoretisch sollte das kein Problem darstellen, da
+ der KeepAlive-Client derartige Ereignisse aufgrund von
+ Netzwerk-Latenzzeiten und Auszeiten des Servers erwarten sollte.
+ In der Praxis scheint keiner von beiden beeinflußt zu werden
+ -- in einem Testfall wurde der Server zwanzig mal
+ pro Sekunde neu gestartet, während Clients das Angebot abgegrast
+ haben, ohne kaputte Bilder oder leere Dokumente zu erhalten.</p>
+</section>
+
+</manualpage>
diff --git a/docs/manual/stopping.xml.ja b/docs/manual/stopping.xml.ja
index 6cb5c79..643d1f3 100644
--- a/docs/manual/stopping.xml.ja
+++ b/docs/manual/stopping.xml.ja
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-2022-jp"?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English revision: 1.1 -->
+<!-- English revision: 1.2.2.2 -->
<manualpage>
<relativepath href="."/>
@@ -15,8 +15,17 @@
$B$K%7%0%J%k$rAw$k(B</a>$B$b$4Mw2<$5$$!#(B</p>
</summary>
+<seealso><a href="programs/httpd.html">httpd</a></seealso>
+<seealso><a href="programs/apachectl.html">apachectl</a></seealso>
+
<section id="introduction"><title>$B%$%s%H%m%@%/%7%g%s(B</title>
- <p>$B$?$/$5$s$N<B9T7A<0(B <code>httpd</code> $B$,%7%9%F%`>e$G(B
+
+ <p>Apache $B$rDd;_$7$?$j:F5/F0$7$?$j$9$k$?$a$K$O!"<B9T$5$l$F$$$k(B
+ <code>httpd</code> $B%W%m%;%9$K%7%0%J%k$rAw$kI,MW$,$"$j$^$9!#(B
+ $B%7%0%J%k$rAw$k$K$OFs$D$NJ}K!$,$"$j$^$9!#(B
+ $B0l$DL\$O%W%m%;%9$KD>@\%7%0%J%k$rAw$k(B unix $B$N(B <code>kill</code>
+ $B%3%^%s%I$r;HMQ$9$kJ}K!$G$9!#(B
+ $B%7%9%F%`$r8+$l$P$?$/$5$s$N(B <code>httpd</code> $B$,(B
$B<B9T$5$l$F$$$k$N$K5$$,IU$/$G$7$g$&$,!"%7%0%J%k$rAw$k$N$O(B
$B?F%W%m%;%9$@$1$G!"$=$l0J30$N8D!9$N%W%m%;%9$K$O(B
$B%7%0%J%k$rAw$i$J$$$G2<$5$$!#$=$N?F%W%m%;%9$N(B pid $B$O(B
@@ -30,31 +39,37 @@
<p>$B?F%W%m%;%9$K%7%0%J%k$rAw$k$K$O!"(B
$B<!$N$h$&$J%3%^%s%I$rH/9T$7$F2<$5$$(B:</p>
-<example>kill -TERM `cat /usr/local/apache/logs/httpd.pid`</example>
+<example>kill -TERM `cat /usr/local/apache2/logs/httpd.pid`</example>
- <p>$B$3$l$N<B9T>u67$O<!$N%3%^%s%I$GFI$`$3$H$,$G$-$^$9(B:</p>
+ <p><code>httpd</code> $B%W%m%;%9$K%7%0%J%k$rAw$k(B 2 $BHVL\$NJ}K!$O(B
+ <code>-k</code> $B$H$$$&%3%^%s%I%i%$%s0z?t$r;HMQ$9$k$3$H$G$9!#(B
+ $B2<$G@bL@$5$l$F$$$k$h$&$K!"(B<code>stop</code>, <code>restart</code>,
+ <code>graceful</code> $B$r;XDj$G$-$^$9!#(B
+ $B$3$l$i$O(B <a href="programs/httpd.html">httpd</a> $B$N0z?t$G$9$,!"(B
+ $B@)8fMQ$N%9%/%j%W%H(B <a href="programs/apachectl.html">apachectl</a> $B$r(B
+ $B;H$&$3$H$r$*A&$a$7$^$9!#(B<a
+ href="programs/apachectl.html">apachectl</a> $B$O$=$l$i$N0z?t$r$=$N$^$^(B
+ <code>httpd</code> $B$KEO$7$^$9!#(B</p>
-<example>tail -f /usr/local/apache/logs/error_log</example>
+ <p><code>httpd</code> $B$K%7%0%J%k$rAw$C$?8e!"(B
+ $B<B9T>u67$r<!$N%3%^%s%I$GFI$`$3$H$,$G$-$^$9(B:</p>
+
+<example>tail -f /usr/local/apache2/logs/error_log</example>
<p>$B$3$3$K5s$2$?Nc$O!"3F<+$N(B
<directive module="core">ServerRoot</directive>
$B$H(B
<directive module="mpm_common">PidFile</directive>
$B$N@_Dj$KE,9g$9$k$h$&$KE,59=$@5$7$F2<$5$$!#(B</p>
-
- <p><a href="programs/apachectl.html">apachectl</a>
- $B$H8F$P$l$k%7%'%k%9%/%j%W%H$G!"(BApache $B$K%7%0%J%k$rAw$k<j=g$r(B
- $B<+F02=$9$k$3$H$,$G$-$^$9!#$3$N%9%/%j%W%H$N>\:Y$K4X$7$F$O!"(B
- <a href="invoking.html">Apache $B$N5/F0(B</a>$B$NJ8=q$r$4Mw2<$5$$!#(B</p>
</section>
<section id="term"><title>$B5^$JDd;_(B</title>
<dl><dt>$B%7%0%J%k(B: TERM</dt>
-<dd><code>apachectl stop</code></dd>
+<dd><code>apachectl -k stop</code></dd>
</dl>
- <p><code>TERM</code> $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"(B
- $BB(:B$K;R%W%m%;%9A4$F$r(B kill $B$7$h$&$H$7$^$9!#(B
+ <p><code>TERM</code> $B$"$k$$$O(B <code>stop</code>
+ $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"B(:B$K;R%W%m%;%9A4$F$r(B kill $B$7$h$&$H$7$^$9!#(B
$B;R%W%m%;%9$r40A4$K(B kill $B$7=*$o$k$^$G$K?tIC$+$+$k$+$b$7$l$^$;$s!#(B
$B$=$N8e!"?F%W%m%;%9<+?H$,=*N;$7$^$9!#(B
$B=hM}Cf$N%j%/%(%9%H$OA4$FDd;_$5$l!"$b$O$d%j%/%(%9%H$KBP$9$k(B
@@ -64,27 +79,27 @@
<section id="graceful"><title>$B4K$d$+$J:F5/F0(B</title>
<dl><dt>$B%7%0%J%k(B: USR1</dt>
-<dd><code>apachectl graceful</code></dd>
+<dd><code>apachectl -k graceful</code></dd>
</dl>
- <p>$B?F%W%m%;%9$O(B <code>USR1</code> $B%7%0%J%k$r<u$1<h$k$H!"(B
- $B;R%W%m%;%9$K8=:_$N%j%/%(%9%H$N=hM}$N8e$K=*N;$9$k(B
+ <p>$B?F%W%m%;%9$O(B <code>USR1</code> $B$"$k$$$O(B <code>graceful</code>
+ $B%7%0%J%k$r<u$1<h$k$H!";R%W%m%;%9$K8=:_$N%j%/%(%9%H$N=hM}$N8e$K=*N;$9$k(B
($B$"$k$$$O2?$b$7$F$$$J$1$l$P$9$0$K=*N;$9$k(B)
$B$h$&$K(B<em>$B=u8@(B</em>$B$7$^$9!#(B
$B?F%W%m%;%9$O@_Dj%U%!%$%k$r:FFI9~$7$F!"%m%0%U%!%$%k$r3+$-D>$7$^$9!#(B
$B;R%W%m%;%9$,=y!9$K$J$/$J$k$K=>$C$F!"(B
$B?7$7$$(B<em>$B@$Be(B</em>$B$N@_Dj$K$h$k;R%W%m%;%9$KCV$-49$($F$$$-$^$9!#(B
$B$=$7$F!"$3$l$i$,?7$?$J%j%/%(%9%H$KB(:B$K1~Ez$7;O$a$^$9!#(B</p>
- <note>$BFCDj$N%W%i%C%H%[!<%`$G$O(B USR1 $B$r4K$d$+$J:F5/F0$N$?$a$K(B
+ <note>$BFCDj$N%W%i%C%H%[!<%`$G$O(B <code>USR1</code> $B$r4K$d$+$J:F5/F0$N$?$a$K(B
$B;H$&$3$H$,$G$-$^$;$s$,!"Be$o$j$N%7%0%J%k(B
- ($BNc$($P(B WINCH) $B$,;HMQ$G$-$k$G$7$g$&!#(B
+ ($BNc$($P(B <code>WINCH</code>) $B$,;HMQ$G$-$k$G$7$g$&!#(B
<code>apachectl graceful</code>
$B$H$$$&%3%^%s%I$O%W%i%C%H%[!<%`$K9g$C$?%7%0%J%k$rAw$j$^$9!#(B</note>
<p>$B$3$N%3!<%I$O>o$K(B
MPM $B$N%W%m%;%9@)8f%G%#%l%/%F%#%V$N@_Dj$r=E;k$7$^$9$N$G!"(B
$B%/%i%$%"%s%H$N%j%/%(%9%H$r07$&%W%m%;%9$H%9%l%C%I$N?t$r:F5/F0$N=hM}Cf$b(B
- $BE,@Z$JCM$K0];}$5$l$^$9!#!#$^$?!"<!$N$h$&$K$7$F(B
+ $BE,@Z$JCM$K0];}$5$l$^$9!#$^$?!"<!$N$h$&$K$7$F(B
<directive module="mpm_common">StartServers</directive>
$B$r<i$j$^$9(B:
$B>/$J$/$H$b(B 1 $BIC8e$K(B <directive
@@ -131,10 +146,10 @@
(<a href="programs/httpd.html">httpd</a> $B$r$4Mw2<$5$$(B)
$B$r;H$C$F8!>Z$9$k$3$H$,$G$-$^$9!#(B
$B@_Dj%U%!%$%k$N0UL#E*$JFbMF$r9=J8$HF1MM$K8!>Z$7$?$$>l9g$O!"(B
- $BHs(B root $B%f!<%6$G(B httpd $B$r5/F0$7$h$&$H$9$l$P$o$+$j$^$9!#(B
+ $BHs(B root $B%f!<%6$G(B <code>httpd</code> $B$r5/F0$7$h$&$H$9$l$P$o$+$j$^$9!#(B
$B$b$7%(%i!<$,$J$1$l$P!"%=%1%C%H$d%m%0$r3+$3$&$H$7$F(B
root $B$G$J$$$?$a(B
- ($B$b$7$/$O(B httpd $B$,4{$KI,MW$J%]!<%H$K%P%$%s%I$7$F$$$k$?$a(B)
+ ($B$b$7$/$O(B <code>httpd</code> $B$,4{$KI,MW$J%]!<%H$K%P%$%s%I$7$F$$$k$?$a(B)
$B$K<:GT$9$k$G$7$g$&!#(B
$B$3$l0J30$NM}M3$G5/F0$K<:GT$7$?$N$G$"$l$P!"(B
$B$=$l$O@_Dj%U%!%$%k$N%(%i!<$G!"(B
@@ -144,10 +159,10 @@
<section id="hup"><title>$B5^$J:F5/F0(B</title>
<dl><dt>$B%7%0%J%k(B: HUP</dt>
-<dd><code>apachectl restart</code></dd>
+<dd><code>apachectl -k restart</code></dd>
</dl>
- <p><code>HUP</code> $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"(B
+ <p><code>HUP</code> $B$"$k$$$O(B <code>restart</code> $B%7%0%J%k$r?F%W%m%;%9$KAw$k$H!"(B
<code>TERM</code> $B$HF1MM$K;R%W%m%;%9$r(B kill $B$7$^$9$,!"(B
$B?F%W%m%;%9$O=*N;$7$^$;$s!#(B
$B@_Dj%U%!%$%k$r:FFI9~$7$F!"%m%0%U%!%$%kA4$F$r3+$-D>$7$^$9!#(B
diff --git a/docs/manual/style/common.dtd b/docs/manual/style/common.dtd
index e5a5ead..6ad4661 100644
--- a/docs/manual/style/common.dtd
+++ b/docs/manual/style/common.dtd
@@ -1,17 +1,32 @@
<?xml version='1.0' encoding='UTF-8' ?>
-<!ENTITY nbsp " ">
+<!-- Character mnemonic entities -->
+
+<!ENTITY % HTMLlat1 PUBLIC
+ "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
+%HTMLlat1;
+
+<!ENTITY % HTMLsymbol PUBLIC
+ "-//W3C//ENTITIES Symbols for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
+%HTMLsymbol;
+
+<!ENTITY % HTMLspecial PUBLIC
+ "-//W3C//ENTITIES Special for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
+%HTMLspecial;
+
+<!-- Generic tag entities -->
<!ENTITY % inlinetags "em | strong | code | a | br | directive | module | img
-| cite | q | dfn | var">
+| cite | q | dfn | var | transnote">
<!ENTITY % blocktags "p | example | note | table | ul | ol | dl | pre
| blockquote">
<!ENTITY % Block "(%blocktags;)*">
-
<!ENTITY % Inline "(#PCDATA | %inlinetags;)*">
-
<!ENTITY % BlockOrInline "(#PCDATA | %inlinetags; | %blocktags;)*">
<!ELEMENT title %Inline;>
@@ -63,6 +78,9 @@
<!ELEMENT var %Inline;>
+<!-- translators note -->
+<!ELEMENT transnote %Inline;>
+
<!ELEMENT a %Inline;>
<!ATTLIST a href CDATA #IMPLIED
name CDATA #IMPLIED
@@ -124,4 +142,5 @@
height CDATA #IMPLIED
width CDATA #IMPLIED >
-<!ELEMENT blockquote %BlockOrInline;>
\ No newline at end of file
+<!ELEMENT blockquote %Block;>
+<!ATTLIST blockquote cite CDATA #IMPLIED >
\ No newline at end of file
diff --git a/docs/manual/style/css/manual-print.css b/docs/manual/style/css/manual-print.css
index d36851f..e02d384 100644
--- a/docs/manual/style/css/manual-print.css
+++ b/docs/manual/style/css/manual-print.css
@@ -30,6 +30,12 @@
font-style: italic;
}
+span.transnote {
+ background-color: inherit;
+ color: #888;
+ font-size: 90%;
+}
+
/* fixup IE & Opera
* otherwise they forget to inherit
* the computed font-size value
diff --git a/docs/manual/style/css/manual.css b/docs/manual/style/css/manual.css
index 75d9ea0..13c5918 100644
--- a/docs/manual/style/css/manual.css
+++ b/docs/manual/style/css/manual.css
@@ -30,6 +30,12 @@
font-style: italic;
}
+span.transnote {
+ background-color: inherit;
+ color: #888;
+ font-size:90%;
+}
+
/* fixup IE & Opera
* otherwise they forget to inherit
* the computed font-size value
@@ -473,6 +479,10 @@
list-style-type: upper-alpha;
}
+dd.separate {
+ margin-bottom: 2em;
+}
+
li.separate {
margin-bottom: 1em;
}
diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml
index c6c890c..0bc543d 100644
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -11,9 +11,14 @@
<!-- Used for the moduleindex -->
<message name="corefeatures">Kernfunktionen und Multi-Processing-Module</message>
<message name="othermodules">Andere Module</message>
+ <message name="obsoletemodules">Veraltete Module</message>
- <!-- Title for modulesynopsis -->
- <message name="apachemodule">Apache-Module</message>
+ <!-- Used for the modulesynopsis and sitemap -->
+ <message name="obsoleteapachemodule">Veraltetes Apache-Modul</message>
+ <message name="apachemodule">Apache-Modul</message>
+ <message name="apachecore">Apache-Kernfunktionen</message>
+ <message name="apachempmcommon">Allgemeine Direktiven der Apache-MPMs</message>
+ <message name="apachempm">Apache-MPM</message>
<!-- Used in description box for modulesynopsis -->
<message name="description">Beschreibung</message>
@@ -36,14 +41,27 @@
<message name="status">Status</message>
<message name="module">Modul</message>
+ <!-- Used in directive context lists -->
+ <message name="serverconfig">Serverkonfiguration</message>
+ <message name="virtualhost">Virtual Host</message>
+ <message name="directory">Verzeichnis</message>
+ <message name="htaccess">.htaccess</message>
+
<!-- Used for directive lists -->
<message name="directives">Direktiven</message>
- <message name="directive">Direktive</message>
+ <!-- the optional attribute replace-space-with takes a string.
+ if present, the space between <directive name> and 'Directive'
+ in directivesynopsis headings will be replaced by the given string.
+ (see de.xml for an example) -->
+ <message name="directive" replace-space-with="-">Direktive</message>
<message name="nodirectives">Dieses Modul enthält keine Direktiven.</message>
<!-- Used in summaries -->
<message name="summary">Zusammenfassung</message>
+ <!-- Used for translation notes -->
+ <message name="transnote">Anm.d.Ü.:</message>
+
<!-- Used in headers and footers -->
<message name="apachetitle">- Apache HTTP Server</message>
<message name="apachehttpserver">Apache HTTP Server Version 2.0</message>
diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml
index 0efe75d..deae19b 100644
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -49,6 +49,10 @@
<!-- Used for directive lists -->
<message name="directives">Directives</message>
+ <!-- the optional attribute replace-space-with takes a string.
+ if present, the space between <directive name> and 'Directive'
+ in directivesynopsis headings will be replaced by the given string.
+ (see de.xml for an example) -->
<message name="directive">Directive</message>
<message name="nodirectives">This module provides no directives.</message>
diff --git a/docs/manual/style/modulesynopsis.dtd b/docs/manual/style/modulesynopsis.dtd
index 4e4ca48..ce9ae95 100644
--- a/docs/manual/style/modulesynopsis.dtd
+++ b/docs/manual/style/modulesynopsis.dtd
@@ -30,7 +30,7 @@
<!ELEMENT syntax %Inline;>
-<!ELEMENT default (#PCDATA)>
+<!ELEMENT default (#PCDATA | br)*>
<!ELEMENT contextlist (context+)+>
@@ -41,7 +41,7 @@
<!ELEMENT usage %Block;>
<!-- Used in index.xml -->
-<!ELEMENT moduleindex (title | summary | sitemap)+>
+<!ELEMENT moduleindex (title, summary, seealso*, sitemap)>
<!-- Used in directive.xml -->
<!ELEMENT directiveindex (title | summary | sitemap)+>
diff --git a/docs/manual/style/w3c/xhtml-lat1.ent b/docs/manual/style/w3c/xhtml-lat1.ent
new file mode 100644
index 0000000..aaae738
--- /dev/null
+++ b/docs/manual/style/w3c/xhtml-lat1.ent
@@ -0,0 +1,196 @@
+<!-- Portions (C) International Organization for Standardization 1986
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+-->
+<!-- Character entity set. Typical invocation:
+ <!ENTITY % HTMLlat1 PUBLIC
+ "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
+ %HTMLlat1;
+-->
+
+<!ENTITY nbsp " "> <!-- no-break space = non-breaking space,
+ U+00A0 ISOnum -->
+<!ENTITY iexcl "¡"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
+<!ENTITY cent "¢"> <!-- cent sign, U+00A2 ISOnum -->
+<!ENTITY pound "£"> <!-- pound sign, U+00A3 ISOnum -->
+<!ENTITY curren "¤"> <!-- currency sign, U+00A4 ISOnum -->
+<!ENTITY yen "¥"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
+<!ENTITY brvbar "¦"> <!-- broken bar = broken vertical bar,
+ U+00A6 ISOnum -->
+<!ENTITY sect "§"> <!-- section sign, U+00A7 ISOnum -->
+<!ENTITY uml "¨"> <!-- diaeresis = spacing diaeresis,
+ U+00A8 ISOdia -->
+<!ENTITY copy "©"> <!-- copyright sign, U+00A9 ISOnum -->
+<!ENTITY ordf "ª"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
+<!ENTITY laquo "«"> <!-- left-pointing double angle quotation mark
+ = left pointing guillemet, U+00AB ISOnum -->
+<!ENTITY not "¬"> <!-- not sign = discretionary hyphen,
+ U+00AC ISOnum -->
+<!ENTITY shy "­"> <!-- soft hyphen = discretionary hyphen,
+ U+00AD ISOnum -->
+<!ENTITY reg "®"> <!-- registered sign = registered trade mark sign,
+ U+00AE ISOnum -->
+<!ENTITY macr "¯"> <!-- macron = spacing macron = overline
+ = APL overbar, U+00AF ISOdia -->
+<!ENTITY deg "°"> <!-- degree sign, U+00B0 ISOnum -->
+<!ENTITY plusmn "±"> <!-- plus-minus sign = plus-or-minus sign,
+ U+00B1 ISOnum -->
+<!ENTITY sup2 "²"> <!-- superscript two = superscript digit two
+ = squared, U+00B2 ISOnum -->
+<!ENTITY sup3 "³"> <!-- superscript three = superscript digit three
+ = cubed, U+00B3 ISOnum -->
+<!ENTITY acute "´"> <!-- acute accent = spacing acute,
+ U+00B4 ISOdia -->
+<!ENTITY micro "µ"> <!-- micro sign, U+00B5 ISOnum -->
+<!ENTITY para "¶"> <!-- pilcrow sign = paragraph sign,
+ U+00B6 ISOnum -->
+<!ENTITY middot "·"> <!-- middle dot = Georgian comma
+ = Greek middle dot, U+00B7 ISOnum -->
+<!ENTITY cedil "¸"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
+<!ENTITY sup1 "¹"> <!-- superscript one = superscript digit one,
+ U+00B9 ISOnum -->
+<!ENTITY ordm "º"> <!-- masculine ordinal indicator,
+ U+00BA ISOnum -->
+<!ENTITY raquo "»"> <!-- right-pointing double angle quotation mark
+ = right pointing guillemet, U+00BB ISOnum -->
+<!ENTITY frac14 "¼"> <!-- vulgar fraction one quarter
+ = fraction one quarter, U+00BC ISOnum -->
+<!ENTITY frac12 "½"> <!-- vulgar fraction one half
+ = fraction one half, U+00BD ISOnum -->
+<!ENTITY frac34 "¾"> <!-- vulgar fraction three quarters
+ = fraction three quarters, U+00BE ISOnum -->
+<!ENTITY iquest "¿"> <!-- inverted question mark
+ = turned question mark, U+00BF ISOnum -->
+<!ENTITY Agrave "À"> <!-- latin capital letter A with grave
+ = latin capital letter A grave,
+ U+00C0 ISOlat1 -->
+<!ENTITY Aacute "Á"> <!-- latin capital letter A with acute,
+ U+00C1 ISOlat1 -->
+<!ENTITY Acirc "Â"> <!-- latin capital letter A with circumflex,
+ U+00C2 ISOlat1 -->
+<!ENTITY Atilde "Ã"> <!-- latin capital letter A with tilde,
+ U+00C3 ISOlat1 -->
+<!ENTITY Auml "Ä"> <!-- latin capital letter A with diaeresis,
+ U+00C4 ISOlat1 -->
+<!ENTITY Aring "Å"> <!-- latin capital letter A with ring above
+ = latin capital letter A ring,
+ U+00C5 ISOlat1 -->
+<!ENTITY AElig "Æ"> <!-- latin capital letter AE
+ = latin capital ligature AE,
+ U+00C6 ISOlat1 -->
+<!ENTITY Ccedil "Ç"> <!-- latin capital letter C with cedilla,
+ U+00C7 ISOlat1 -->
+<!ENTITY Egrave "È"> <!-- latin capital letter E with grave,
+ U+00C8 ISOlat1 -->
+<!ENTITY Eacute "É"> <!-- latin capital letter E with acute,
+ U+00C9 ISOlat1 -->
+<!ENTITY Ecirc "Ê"> <!-- latin capital letter E with circumflex,
+ U+00CA ISOlat1 -->
+<!ENTITY Euml "Ë"> <!-- latin capital letter E with diaeresis,
+ U+00CB ISOlat1 -->
+<!ENTITY Igrave "Ì"> <!-- latin capital letter I with grave,
+ U+00CC ISOlat1 -->
+<!ENTITY Iacute "Í"> <!-- latin capital letter I with acute,
+ U+00CD ISOlat1 -->
+<!ENTITY Icirc "Î"> <!-- latin capital letter I with circumflex,
+ U+00CE ISOlat1 -->
+<!ENTITY Iuml "Ï"> <!-- latin capital letter I with diaeresis,
+ U+00CF ISOlat1 -->
+<!ENTITY ETH "Ð"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
+<!ENTITY Ntilde "Ñ"> <!-- latin capital letter N with tilde,
+ U+00D1 ISOlat1 -->
+<!ENTITY Ograve "Ò"> <!-- latin capital letter O with grave,
+ U+00D2 ISOlat1 -->
+<!ENTITY Oacute "Ó"> <!-- latin capital letter O with acute,
+ U+00D3 ISOlat1 -->
+<!ENTITY Ocirc "Ô"> <!-- latin capital letter O with circumflex,
+ U+00D4 ISOlat1 -->
+<!ENTITY Otilde "Õ"> <!-- latin capital letter O with tilde,
+ U+00D5 ISOlat1 -->
+<!ENTITY Ouml "Ö"> <!-- latin capital letter O with diaeresis,
+ U+00D6 ISOlat1 -->
+<!ENTITY times "×"> <!-- multiplication sign, U+00D7 ISOnum -->
+<!ENTITY Oslash "Ø"> <!-- latin capital letter O with stroke
+ = latin capital letter O slash,
+ U+00D8 ISOlat1 -->
+<!ENTITY Ugrave "Ù"> <!-- latin capital letter U with grave,
+ U+00D9 ISOlat1 -->
+<!ENTITY Uacute "Ú"> <!-- latin capital letter U with acute,
+ U+00DA ISOlat1 -->
+<!ENTITY Ucirc "Û"> <!-- latin capital letter U with circumflex,
+ U+00DB ISOlat1 -->
+<!ENTITY Uuml "Ü"> <!-- latin capital letter U with diaeresis,
+ U+00DC ISOlat1 -->
+<!ENTITY Yacute "Ý"> <!-- latin capital letter Y with acute,
+ U+00DD ISOlat1 -->
+<!ENTITY THORN "Þ"> <!-- latin capital letter THORN,
+ U+00DE ISOlat1 -->
+<!ENTITY szlig "ß"> <!-- latin small letter sharp s = ess-zed,
+ U+00DF ISOlat1 -->
+<!ENTITY agrave "à"> <!-- latin small letter a with grave
+ = latin small letter a grave,
+ U+00E0 ISOlat1 -->
+<!ENTITY aacute "á"> <!-- latin small letter a with acute,
+ U+00E1 ISOlat1 -->
+<!ENTITY acirc "â"> <!-- latin small letter a with circumflex,
+ U+00E2 ISOlat1 -->
+<!ENTITY atilde "ã"> <!-- latin small letter a with tilde,
+ U+00E3 ISOlat1 -->
+<!ENTITY auml "ä"> <!-- latin small letter a with diaeresis,
+ U+00E4 ISOlat1 -->
+<!ENTITY aring "å"> <!-- latin small letter a with ring above
+ = latin small letter a ring,
+ U+00E5 ISOlat1 -->
+<!ENTITY aelig "æ"> <!-- latin small letter ae
+ = latin small ligature ae, U+00E6 ISOlat1 -->
+<!ENTITY ccedil "ç"> <!-- latin small letter c with cedilla,
+ U+00E7 ISOlat1 -->
+<!ENTITY egrave "è"> <!-- latin small letter e with grave,
+ U+00E8 ISOlat1 -->
+<!ENTITY eacute "é"> <!-- latin small letter e with acute,
+ U+00E9 ISOlat1 -->
+<!ENTITY ecirc "ê"> <!-- latin small letter e with circumflex,
+ U+00EA ISOlat1 -->
+<!ENTITY euml "ë"> <!-- latin small letter e with diaeresis,
+ U+00EB ISOlat1 -->
+<!ENTITY igrave "ì"> <!-- latin small letter i with grave,
+ U+00EC ISOlat1 -->
+<!ENTITY iacute "í"> <!-- latin small letter i with acute,
+ U+00ED ISOlat1 -->
+<!ENTITY icirc "î"> <!-- latin small letter i with circumflex,
+ U+00EE ISOlat1 -->
+<!ENTITY iuml "ï"> <!-- latin small letter i with diaeresis,
+ U+00EF ISOlat1 -->
+<!ENTITY eth "ð"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
+<!ENTITY ntilde "ñ"> <!-- latin small letter n with tilde,
+ U+00F1 ISOlat1 -->
+<!ENTITY ograve "ò"> <!-- latin small letter o with grave,
+ U+00F2 ISOlat1 -->
+<!ENTITY oacute "ó"> <!-- latin small letter o with acute,
+ U+00F3 ISOlat1 -->
+<!ENTITY ocirc "ô"> <!-- latin small letter o with circumflex,
+ U+00F4 ISOlat1 -->
+<!ENTITY otilde "õ"> <!-- latin small letter o with tilde,
+ U+00F5 ISOlat1 -->
+<!ENTITY ouml "ö"> <!-- latin small letter o with diaeresis,
+ U+00F6 ISOlat1 -->
+<!ENTITY divide "÷"> <!-- division sign, U+00F7 ISOnum -->
+<!ENTITY oslash "ø"> <!-- latin small letter o with stroke,
+ = latin small letter o slash,
+ U+00F8 ISOlat1 -->
+<!ENTITY ugrave "ù"> <!-- latin small letter u with grave,
+ U+00F9 ISOlat1 -->
+<!ENTITY uacute "ú"> <!-- latin small letter u with acute,
+ U+00FA ISOlat1 -->
+<!ENTITY ucirc "û"> <!-- latin small letter u with circumflex,
+ U+00FB ISOlat1 -->
+<!ENTITY uuml "ü"> <!-- latin small letter u with diaeresis,
+ U+00FC ISOlat1 -->
+<!ENTITY yacute "ý"> <!-- latin small letter y with acute,
+ U+00FD ISOlat1 -->
+<!ENTITY thorn "þ"> <!-- latin small letter thorn with,
+ U+00FE ISOlat1 -->
+<!ENTITY yuml "ÿ"> <!-- latin small letter y with diaeresis,
+ U+00FF ISOlat1 -->
diff --git a/docs/manual/style/w3c/xhtml-special.ent b/docs/manual/style/w3c/xhtml-special.ent
new file mode 100644
index 0000000..cf709d1
--- /dev/null
+++ b/docs/manual/style/w3c/xhtml-special.ent
@@ -0,0 +1,79 @@
+<!-- Special characters for HTML -->
+
+<!-- Character entity set. Typical invocation:
+ <!ENTITY % HTMLspecial PUBLIC
+ "-//W3C//ENTITIES Special for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
+ %HTMLspecial;
+-->
+
+<!-- Portions (C) International Organization for Standardization 1986:
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+ New names (i.e., not in ISO 8879 list) do not clash with any
+ existing ISO 8879 entity names. ISO 10646 character numbers
+ are given for each character, in hex. values are decimal
+ conversions of the ISO 10646 values and refer to the document
+ character set. Names are Unicode names.
+-->
+
+<!-- C0 Controls and Basic Latin -->
+<!ENTITY quot """> <!-- quotation mark = APL quote,
+ U+0022 ISOnum -->
+<!ENTITY amp "&#38;"> <!-- ampersand, U+0026 ISOnum -->
+<!ENTITY lt "&#60;"> <!-- less-than sign, U+003C ISOnum -->
+<!ENTITY gt ">"> <!-- greater-than sign, U+003E ISOnum -->
+<!ENTITY apos "'"> <!-- apostrophe mark, U+0027 ISOnum -->
+
+<!-- Latin Extended-A -->
+<!ENTITY OElig "Œ"> <!-- latin capital ligature OE,
+ U+0152 ISOlat2 -->
+<!ENTITY oelig "œ"> <!-- latin small ligature oe, U+0153 ISOlat2 -->
+<!-- ligature is a misnomer, this is a separate character in some languages -->
+<!ENTITY Scaron "Š"> <!-- latin capital letter S with caron,
+ U+0160 ISOlat2 -->
+<!ENTITY scaron "š"> <!-- latin small letter s with caron,
+ U+0161 ISOlat2 -->
+<!ENTITY Yuml "Ÿ"> <!-- latin capital letter Y with diaeresis,
+ U+0178 ISOlat2 -->
+
+<!-- Spacing Modifier Letters -->
+<!ENTITY circ "ˆ"> <!-- modifier letter circumflex accent,
+ U+02C6 ISOpub -->
+<!ENTITY tilde "˜"> <!-- small tilde, U+02DC ISOdia -->
+
+<!-- General Punctuation -->
+<!ENTITY ensp " "> <!-- en space, U+2002 ISOpub -->
+<!ENTITY emsp " "> <!-- em space, U+2003 ISOpub -->
+<!ENTITY thinsp " "> <!-- thin space, U+2009 ISOpub -->
+<!ENTITY zwnj "‌"> <!-- zero width non-joiner,
+ U+200C NEW RFC 2070 -->
+<!ENTITY zwj "‍"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
+<!ENTITY lrm "‎"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
+<!ENTITY rlm "‏"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
+<!ENTITY ndash "–"> <!-- en dash, U+2013 ISOpub -->
+<!ENTITY mdash "—"> <!-- em dash, U+2014 ISOpub -->
+<!ENTITY lsquo "‘"> <!-- left single quotation mark,
+ U+2018 ISOnum -->
+<!ENTITY rsquo "’"> <!-- right single quotation mark,
+ U+2019 ISOnum -->
+<!ENTITY sbquo "‚"> <!-- single low-9 quotation mark, U+201A NEW -->
+<!ENTITY ldquo "“"> <!-- left double quotation mark,
+ U+201C ISOnum -->
+<!ENTITY rdquo "”"> <!-- right double quotation mark,
+ U+201D ISOnum -->
+<!ENTITY bdquo "„"> <!-- double low-9 quotation mark, U+201E NEW -->
+<!ENTITY dagger "†"> <!-- dagger, U+2020 ISOpub -->
+<!ENTITY Dagger "‡"> <!-- double dagger, U+2021 ISOpub -->
+<!ENTITY permil "‰"> <!-- per mille sign, U+2030 ISOtech -->
+<!ENTITY lsaquo "‹"> <!-- single left-pointing angle quotation mark,
+ U+2039 ISO proposed -->
+<!-- lsaquo is proposed but not yet ISO standardized -->
+<!ENTITY rsaquo "›"> <!-- single right-pointing angle quotation mark,
+ U+203A ISO proposed -->
+<!-- rsaquo is proposed but not yet ISO standardized -->
+<!ENTITY euro "€"> <!-- euro sign, U+20AC NEW -->
diff --git a/docs/manual/style/w3c/xhtml-symbol.ent b/docs/manual/style/w3c/xhtml-symbol.ent
new file mode 100644
index 0000000..16f876b
--- /dev/null
+++ b/docs/manual/style/w3c/xhtml-symbol.ent
@@ -0,0 +1,242 @@
+<!-- Mathematical, Greek and Symbolic characters for HTML -->
+
+<!-- Character entity set. Typical invocation:
+ <!ENTITY % HTMLsymbol PUBLIC
+ "-//W3C//ENTITIES Symbols for XHTML//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
+ %HTMLsymbol;
+-->
+
+<!-- Portions (C) International Organization for Standardization 1986:
+ Permission to copy in any form is granted for use with
+ conforming SGML systems and applications as defined in
+ ISO 8879, provided this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+ New names (i.e., not in ISO 8879 list) do not clash with any
+ existing ISO 8879 entity names. ISO 10646 character numbers
+ are given for each character, in hex. values are decimal
+ conversions of the ISO 10646 values and refer to the document
+ character set. Names are Unicode names.
+-->
+
+<!-- Latin Extended-B -->
+<!ENTITY fnof "ƒ"> <!-- latin small f with hook = function
+ = florin, U+0192 ISOtech -->
+
+<!-- Greek -->
+<!ENTITY Alpha "Α"> <!-- greek capital letter alpha, U+0391 -->
+<!ENTITY Beta "Β"> <!-- greek capital letter beta, U+0392 -->
+<!ENTITY Gamma "Γ"> <!-- greek capital letter gamma,
+ U+0393 ISOgrk3 -->
+<!ENTITY Delta "Δ"> <!-- greek capital letter delta,
+ U+0394 ISOgrk3 -->
+<!ENTITY Epsilon "Ε"> <!-- greek capital letter epsilon, U+0395 -->
+<!ENTITY Zeta "Ζ"> <!-- greek capital letter zeta, U+0396 -->
+<!ENTITY Eta "Η"> <!-- greek capital letter eta, U+0397 -->
+<!ENTITY Theta "Θ"> <!-- greek capital letter theta,
+ U+0398 ISOgrk3 -->
+<!ENTITY Iota "Ι"> <!-- greek capital letter iota, U+0399 -->
+<!ENTITY Kappa "Κ"> <!-- greek capital letter kappa, U+039A -->
+<!ENTITY Lambda "Λ"> <!-- greek capital letter lambda,
+ U+039B ISOgrk3 -->
+<!ENTITY Mu "Μ"> <!-- greek capital letter mu, U+039C -->
+<!ENTITY Nu "Ν"> <!-- greek capital letter nu, U+039D -->
+<!ENTITY Xi "Ξ"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
+<!ENTITY Omicron "Ο"> <!-- greek capital letter omicron, U+039F -->
+<!ENTITY Pi "Π"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
+<!ENTITY Rho "Ρ"> <!-- greek capital letter rho, U+03A1 -->
+<!-- there is no Sigmaf, and no U+03A2 character either -->
+<!ENTITY Sigma "Σ"> <!-- greek capital letter sigma,
+ U+03A3 ISOgrk3 -->
+<!ENTITY Tau "Τ"> <!-- greek capital letter tau, U+03A4 -->
+<!ENTITY Upsilon "Υ"> <!-- greek capital letter upsilon,
+ U+03A5 ISOgrk3 -->
+<!ENTITY Phi "Φ"> <!-- greek capital letter phi,
+ U+03A6 ISOgrk3 -->
+<!ENTITY Chi "Χ"> <!-- greek capital letter chi, U+03A7 -->
+<!ENTITY Psi "Ψ"> <!-- greek capital letter psi,
+ U+03A8 ISOgrk3 -->
+<!ENTITY Omega "Ω"> <!-- greek capital letter omega,
+ U+03A9 ISOgrk3 -->
+
+<!ENTITY alpha "α"> <!-- greek small letter alpha,
+ U+03B1 ISOgrk3 -->
+<!ENTITY beta "β"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
+<!ENTITY gamma "γ"> <!-- greek small letter gamma,
+ U+03B3 ISOgrk3 -->
+<!ENTITY delta "δ"> <!-- greek small letter delta,
+ U+03B4 ISOgrk3 -->
+<!ENTITY epsilon "ε"> <!-- greek small letter epsilon,
+ U+03B5 ISOgrk3 -->
+<!ENTITY zeta "ζ"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
+<!ENTITY eta "η"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
+<!ENTITY theta "θ"> <!-- greek small letter theta,
+ U+03B8 ISOgrk3 -->
+<!ENTITY iota "ι"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
+<!ENTITY kappa "κ"> <!-- greek small letter kappa,
+ U+03BA ISOgrk3 -->
+<!ENTITY lambda "λ"> <!-- greek small letter lambda,
+ U+03BB ISOgrk3 -->
+<!ENTITY mu "μ"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
+<!ENTITY nu "ν"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
+<!ENTITY xi "ξ"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
+<!ENTITY omicron "ο"> <!-- greek small letter omicron, U+03BF NEW -->
+<!ENTITY pi "π"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
+<!ENTITY rho "ρ"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
+<!ENTITY sigmaf "ς"> <!-- greek small letter final sigma,
+ U+03C2 ISOgrk3 -->
+<!ENTITY sigma "σ"> <!-- greek small letter sigma,
+ U+03C3 ISOgrk3 -->
+<!ENTITY tau "τ"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
+<!ENTITY upsilon "υ"> <!-- greek small letter upsilon,
+ U+03C5 ISOgrk3 -->
+<!ENTITY phi "φ"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
+<!ENTITY chi "χ"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
+<!ENTITY psi "ψ"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
+<!ENTITY omega "ω"> <!-- greek small letter omega,
+ U+03C9 ISOgrk3 -->
+<!ENTITY thetasym "ϑ"> <!-- greek small letter theta symbol,
+ U+03D1 NEW -->
+<!ENTITY upsih "ϒ"> <!-- greek upsilon with hook symbol,
+ U+03D2 NEW -->
+<!ENTITY piv "ϖ"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
+
+<!-- General Punctuation -->
+<!ENTITY bull "•"> <!-- bullet = black small circle,
+ U+2022 ISOpub -->
+<!-- bullet is NOT the same as bullet operator, U+2219 -->
+<!ENTITY hellip "…"> <!-- horizontal ellipsis = three dot leader,
+ U+2026 ISOpub -->
+<!ENTITY prime "′"> <!-- prime = minutes = feet, U+2032 ISOtech -->
+<!ENTITY Prime "″"> <!-- double prime = seconds = inches,
+ U+2033 ISOtech -->
+<!ENTITY oline "‾"> <!-- overline = spacing overscore,
+ U+203E NEW -->
+<!ENTITY frasl "⁄"> <!-- fraction slash, U+2044 NEW -->
+
+<!-- Letterlike Symbols -->
+<!ENTITY weierp "℘"> <!-- script capital P = power set
+ = Weierstrass p, U+2118 ISOamso -->
+<!ENTITY image "ℑ"> <!-- blackletter capital I = imaginary part,
+ U+2111 ISOamso -->
+<!ENTITY real "ℜ"> <!-- blackletter capital R = real part symbol,
+ U+211C ISOamso -->
+<!ENTITY trade "™"> <!-- trade mark sign, U+2122 ISOnum -->
+<!ENTITY alefsym "ℵ"> <!-- alef symbol = first transfinite cardinal,
+ U+2135 NEW -->
+<!-- alef symbol is NOT the same as hebrew letter alef,
+ U+05D0 although the same glyph could be used to depict both characters -->
+
+<!-- Arrows -->
+<!ENTITY larr "←"> <!-- leftwards arrow, U+2190 ISOnum -->
+<!ENTITY uarr "↑"> <!-- upwards arrow, U+2191 ISOnum-->
+<!ENTITY rarr "→"> <!-- rightwards arrow, U+2192 ISOnum -->
+<!ENTITY darr "↓"> <!-- downwards arrow, U+2193 ISOnum -->
+<!ENTITY harr "↔"> <!-- left right arrow, U+2194 ISOamsa -->
+<!ENTITY crarr "↵"> <!-- downwards arrow with corner leftwards
+ = carriage return, U+21B5 NEW -->
+<!ENTITY lArr "⇐"> <!-- leftwards double arrow, U+21D0 ISOtech -->
+<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
+ but also does not have any other character for that function. So ? lArr can
+ be used for 'is implied by' as ISOtech suggests -->
+<!ENTITY uArr "⇑"> <!-- upwards double arrow, U+21D1 ISOamsa -->
+<!ENTITY rArr "⇒"> <!-- rightwards double arrow,
+ U+21D2 ISOtech -->
+<!-- Unicode does not say this is the 'implies' character but does not have
+ another character with this function so ?
+ rArr can be used for 'implies' as ISOtech suggests -->
+<!ENTITY dArr "⇓"> <!-- downwards double arrow, U+21D3 ISOamsa -->
+<!ENTITY hArr "⇔"> <!-- left right double arrow,
+ U+21D4 ISOamsa -->
+
+<!-- Mathematical Operators -->
+<!ENTITY forall "∀"> <!-- for all, U+2200 ISOtech -->
+<!ENTITY part "∂"> <!-- partial differential, U+2202 ISOtech -->
+<!ENTITY exist "∃"> <!-- there exists, U+2203 ISOtech -->
+<!ENTITY empty "∅"> <!-- empty set = null set = diameter,
+ U+2205 ISOamso -->
+<!ENTITY nabla "∇"> <!-- nabla = backward difference,
+ U+2207 ISOtech -->
+<!ENTITY isin "∈"> <!-- element of, U+2208 ISOtech -->
+<!ENTITY notin "∉"> <!-- not an element of, U+2209 ISOtech -->
+<!ENTITY ni "∋"> <!-- contains as member, U+220B ISOtech -->
+<!-- should there be a more memorable name than 'ni'? -->
+<!ENTITY prod "∏"> <!-- n-ary product = product sign,
+ U+220F ISOamsb -->
+<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
+ the same glyph might be used for both -->
+<!ENTITY sum "∑"> <!-- n-ary sumation, U+2211 ISOamsb -->
+<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
+ though the same glyph might be used for both -->
+<!ENTITY minus "−"> <!-- minus sign, U+2212 ISOtech -->
+<!ENTITY lowast "∗"> <!-- asterisk operator, U+2217 ISOtech -->
+<!ENTITY radic "√"> <!-- square root = radical sign,
+ U+221A ISOtech -->
+<!ENTITY prop "∝"> <!-- proportional to, U+221D ISOtech -->
+<!ENTITY infin "∞"> <!-- infinity, U+221E ISOtech -->
+<!ENTITY ang "∠"> <!-- angle, U+2220 ISOamso -->
+<!ENTITY and "∧"> <!-- logical and = wedge, U+2227 ISOtech -->
+<!ENTITY or "∨"> <!-- logical or = vee, U+2228 ISOtech -->
+<!ENTITY cap "∩"> <!-- intersection = cap, U+2229 ISOtech -->
+<!ENTITY cup "∪"> <!-- union = cup, U+222A ISOtech -->
+<!ENTITY int "∫"> <!-- integral, U+222B ISOtech -->
+<!ENTITY there4 "∴"> <!-- therefore, U+2234 ISOtech -->
+<!ENTITY sim "∼"> <!-- tilde operator = varies with = similar to,
+ U+223C ISOtech -->
+<!-- tilde operator is NOT the same character as the tilde, U+007E,
+ although the same glyph might be used to represent both -->
+<!ENTITY cong "≅"> <!-- approximately equal to, U+2245 ISOtech -->
+<!ENTITY asymp "≈"> <!-- almost equal to = asymptotic to,
+ U+2248 ISOamsr -->
+<!ENTITY ne "≠"> <!-- not equal to, U+2260 ISOtech -->
+<!ENTITY equiv "≡"> <!-- identical to, U+2261 ISOtech -->
+<!ENTITY le "≤"> <!-- less-than or equal to, U+2264 ISOtech -->
+<!ENTITY ge "≥"> <!-- greater-than or equal to,
+ U+2265 ISOtech -->
+<!ENTITY sub "⊂"> <!-- subset of, U+2282 ISOtech -->
+<!ENTITY sup "⊃"> <!-- superset of, U+2283 ISOtech -->
+<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol
+ font encoding and is not included. Should it be, for symmetry?
+ It is in ISOamsn -->
+<!ENTITY nsub "⊄"> <!-- not a subset of, U+2284 ISOamsn -->
+<!ENTITY sube "⊆"> <!-- subset of or equal to, U+2286 ISOtech -->
+<!ENTITY supe "⊇"> <!-- superset of or equal to,
+ U+2287 ISOtech -->
+<!ENTITY oplus "⊕"> <!-- circled plus = direct sum,
+ U+2295 ISOamsb -->
+<!ENTITY otimes "⊗"> <!-- circled times = vector product,
+ U+2297 ISOamsb -->
+<!ENTITY perp "⊥"> <!-- up tack = orthogonal to = perpendicular,
+ U+22A5 ISOtech -->
+<!ENTITY sdot "⋅"> <!-- dot operator, U+22C5 ISOamsb -->
+<!-- dot operator is NOT the same character as U+00B7 middle dot -->
+
+<!-- Miscellaneous Technical -->
+<!ENTITY lceil "⌈"> <!-- left ceiling = apl upstile,
+ U+2308 ISOamsc -->
+<!ENTITY rceil "⌉"> <!-- right ceiling, U+2309 ISOamsc -->
+<!ENTITY lfloor "⌊"> <!-- left floor = apl downstile,
+ U+230A ISOamsc -->
+<!ENTITY rfloor "⌋"> <!-- right floor, U+230B ISOamsc -->
+<!ENTITY lang "〈"> <!-- left-pointing angle bracket = bra,
+ U+2329 ISOtech -->
+<!-- lang is NOT the same character as U+003C 'less than'
+ or U+2039 'single left-pointing angle quotation mark' -->
+<!ENTITY rang "〉"> <!-- right-pointing angle bracket = ket,
+ U+232A ISOtech -->
+<!-- rang is NOT the same character as U+003E 'greater than'
+ or U+203A 'single right-pointing angle quotation mark' -->
+
+<!-- Geometric Shapes -->
+<!ENTITY loz "◊"> <!-- lozenge, U+25CA ISOpub -->
+
+<!-- Miscellaneous Symbols -->
+<!ENTITY spades "♠"> <!-- black spade suit, U+2660 ISOpub -->
+<!-- black here seems to mean filled as opposed to hollow -->
+<!ENTITY clubs "♣"> <!-- black club suit = shamrock,
+ U+2663 ISOpub -->
+<!ENTITY hearts "♥"> <!-- black heart suit = valentine,
+ U+2665 ISOpub -->
+<!ENTITY diams "♦"> <!-- black diamond suit, U+2666 ISOpub -->
diff --git a/docs/manual/style/w3c/xhtml1-strict.dtd b/docs/manual/style/w3c/xhtml1-strict.dtd
new file mode 100644
index 0000000..b00ee6c
--- /dev/null
+++ b/docs/manual/style/w3c/xhtml1-strict.dtd
@@ -0,0 +1,978 @@
+<!--
+ Extensible HTML version 1.0 Strict DTD
+
+ This is the same as HTML 4 Strict except for
+ changes due to the differences between XML and SGML.
+
+ Namespace = http://www.w3.org/1999/xhtml
+
+ For further information, see: http://www.w3.org/TR/xhtml1
+
+ Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
+ All Rights Reserved.
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+
+ $Revision: 1.1.2.1 $
+ $Date: 2002/12/15 22:13:49 $
+
+-->
+
+<!--================ Character mnemonic entities =========================-->
+
+<!ENTITY % HTMLlat1 PUBLIC
+ "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+ "xhtml-lat1.ent">
+%HTMLlat1;
+
+<!ENTITY % HTMLsymbol PUBLIC
+ "-//W3C//ENTITIES Symbols for XHTML//EN"
+ "xhtml-symbol.ent">
+%HTMLsymbol;
+
+<!ENTITY % HTMLspecial PUBLIC
+ "-//W3C//ENTITIES Special for XHTML//EN"
+ "xhtml-special.ent">
+%HTMLspecial;
+
+<!--================== Imported Names ====================================-->
+
+<!ENTITY % ContentType "CDATA">
+ <!-- media type, as per [RFC2045] -->
+
+<!ENTITY % ContentTypes "CDATA">
+ <!-- comma-separated list of media types, as per [RFC2045] -->
+
+<!ENTITY % Charset "CDATA">
+ <!-- a character encoding, as per [RFC2045] -->
+
+<!ENTITY % Charsets "CDATA">
+ <!-- a space separated list of character encodings, as per [RFC2045] -->
+
+<!ENTITY % LanguageCode "NMTOKEN">
+ <!-- a language code, as per [RFC3066] -->
+
+<!ENTITY % Character "CDATA">
+ <!-- a single character, as per section 2.2 of [XML] -->
+
+<!ENTITY % Number "CDATA">
+ <!-- one or more digits -->
+
+<!ENTITY % LinkTypes "CDATA">
+ <!-- space-separated list of link types -->
+
+<!ENTITY % MediaDesc "CDATA">
+ <!-- single or comma-separated list of media descriptors -->
+
+<!ENTITY % URI "CDATA">
+ <!-- a Uniform Resource Identifier, see [RFC2396] -->
+
+<!ENTITY % UriList "CDATA">
+ <!-- a space separated list of Uniform Resource Identifiers -->
+
+<!ENTITY % Datetime "CDATA">
+ <!-- date and time information. ISO date format -->
+
+<!ENTITY % Script "CDATA">
+ <!-- script expression -->
+
+<!ENTITY % StyleSheet "CDATA">
+ <!-- style sheet data -->
+
+<!ENTITY % Text "CDATA">
+ <!-- used for titles etc. -->
+
+<!ENTITY % Length "CDATA">
+ <!-- nn for pixels or nn% for percentage length -->
+
+<!ENTITY % MultiLength "CDATA">
+ <!-- pixel, percentage, or relative -->
+
+<!ENTITY % Pixels "CDATA">
+ <!-- integer representing length in pixels -->
+
+<!-- these are used for image maps -->
+
+<!ENTITY % Shape "(rect|circle|poly|default)">
+
+<!ENTITY % Coords "CDATA">
+ <!-- comma separated list of lengths -->
+
+<!--=================== Generic Attributes ===============================-->
+
+<!-- core attributes common to most elements
+ id document-wide unique id
+ class space separated list of classes
+ style associated style info
+ title advisory title/amplification
+-->
+<!ENTITY % coreattrs
+ "id ID #IMPLIED
+ class CDATA #IMPLIED
+ style %StyleSheet; #IMPLIED
+ title %Text; #IMPLIED"
+ >
+
+<!-- internationalization attributes
+ lang language code (backwards compatible)
+ xml:lang language code (as per XML 1.0 spec)
+ dir direction for weak/neutral text
+-->
+<!ENTITY % i18n
+ "lang %LanguageCode; #IMPLIED
+ xml:lang %LanguageCode; #IMPLIED
+ dir (ltr|rtl) #IMPLIED"
+ >
+
+<!-- attributes for common UI events
+ onclick a pointer button was clicked
+ ondblclick a pointer button was double clicked
+ onmousedown a pointer button was pressed down
+ onmouseup a pointer button was released
+ onmousemove a pointer was moved onto the element
+ onmouseout a pointer was moved away from the element
+ onkeypress a key was pressed and released
+ onkeydown a key was pressed down
+ onkeyup a key was released
+-->
+<!ENTITY % events
+ "onclick %Script; #IMPLIED
+ ondblclick %Script; #IMPLIED
+ onmousedown %Script; #IMPLIED
+ onmouseup %Script; #IMPLIED
+ onmouseover %Script; #IMPLIED
+ onmousemove %Script; #IMPLIED
+ onmouseout %Script; #IMPLIED
+ onkeypress %Script; #IMPLIED
+ onkeydown %Script; #IMPLIED
+ onkeyup %Script; #IMPLIED"
+ >
+
+<!-- attributes for elements that can get the focus
+ accesskey accessibility key character
+ tabindex position in tabbing order
+ onfocus the element got the focus
+ onblur the element lost the focus
+-->
+<!ENTITY % focus
+ "accesskey %Character; #IMPLIED
+ tabindex %Number; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED"
+ >
+
+<!ENTITY % attrs "%coreattrs; %i18n; %events;">
+
+<!--=================== Text Elements ====================================-->
+
+<!ENTITY % special.pre
+ "br | span | bdo | map">
+
+
+<!ENTITY % special
+ "%special.pre; | object | img ">
+
+<!ENTITY % fontstyle "tt | i | b | big | small ">
+
+<!ENTITY % phrase "em | strong | dfn | code | q |
+ samp | kbd | var | cite | abbr | acronym | sub | sup ">
+
+<!ENTITY % inline.forms "input | select | textarea | label | button">
+
+<!-- these can occur at block or inline level -->
+<!ENTITY % misc.inline "ins | del | script">
+
+<!-- these can only occur at block level -->
+<!ENTITY % misc "noscript | %misc.inline;">
+
+<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
+
+<!-- %Inline; covers inline or "text-level" elements -->
+<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
+
+<!--================== Block level elements ==============================-->
+
+<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
+<!ENTITY % lists "ul | ol | dl">
+<!ENTITY % blocktext "pre | hr | blockquote | address">
+
+<!ENTITY % block
+ "p | %heading; | div | %lists; | %blocktext; | fieldset | table">
+
+<!ENTITY % Block "(%block; | form | %misc;)*">
+
+<!-- %Flow; mixes block and inline and is used for list items etc. -->
+<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
+
+<!--================== Content models for exclusions =====================-->
+
+<!-- a elements use %Inline; excluding a -->
+
+<!ENTITY % a.content
+ "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
+
+<!-- pre uses %Inline excluding big, small, sup or sup -->
+
+<!ENTITY % pre.content
+ "(#PCDATA | a | %fontstyle; | %phrase; | %special.pre; | %misc.inline;
+ | %inline.forms;)*">
+
+<!-- form uses %Block; excluding form -->
+
+<!ENTITY % form.content "(%block; | %misc;)*">
+
+<!-- button uses %Flow; but excludes a, form and form controls -->
+
+<!ENTITY % button.content
+ "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
+ table | %special; | %fontstyle; | %phrase; | %misc;)*">
+
+<!--================ Document Structure ==================================-->
+
+<!-- the namespace URI designates the document profile -->
+
+<!ELEMENT html (head, body)>
+<!ATTLIST html
+ %i18n;
+ id ID #IMPLIED
+ xmlns %URI; #FIXED 'http://www.w3.org/1999/xhtml'
+ >
+
+<!--================ Document Head =======================================-->
+
+<!ENTITY % head.misc "(script|style|meta|link|object)*">
+
+<!-- content model is %head.misc; combined with a single
+ title and an optional base element in any order -->
+
+<!ELEMENT head (%head.misc;,
+ ((title, %head.misc;, (base, %head.misc;)?) |
+ (base, %head.misc;, (title, %head.misc;))))>
+
+<!ATTLIST head
+ %i18n;
+ id ID #IMPLIED
+ profile %URI; #IMPLIED
+ >
+
+<!-- The title element is not considered part of the flow of text.
+ It should be displayed, for example as the page header or
+ window title. Exactly one title is required per document.
+ -->
+<!ELEMENT title (#PCDATA)>
+<!ATTLIST title
+ %i18n;
+ id ID #IMPLIED
+ >
+
+<!-- document base URI -->
+
+<!ELEMENT base EMPTY>
+<!ATTLIST base
+ href %URI; #REQUIRED
+ id ID #IMPLIED
+ >
+
+<!-- generic metainformation -->
+<!ELEMENT meta EMPTY>
+<!ATTLIST meta
+ %i18n;
+ id ID #IMPLIED
+ http-equiv CDATA #IMPLIED
+ name CDATA #IMPLIED
+ content CDATA #REQUIRED
+ scheme CDATA #IMPLIED
+ >
+
+<!--
+ Relationship values can be used in principle:
+
+ a) for document specific toolbars/menus when used
+ with the link element in document head e.g.
+ start, contents, previous, next, index, end, help
+ b) to link to a separate style sheet (rel="stylesheet")
+ c) to make a link to a script (rel="script")
+ d) by stylesheets to control how collections of
+ html nodes are rendered into printed documents
+ e) to make a link to a printable version of this document
+ e.g. a PostScript or PDF version (rel="alternate" media="print")
+-->
+
+<!ELEMENT link EMPTY>
+<!ATTLIST link
+ %attrs;
+ charset %Charset; #IMPLIED
+ href %URI; #IMPLIED
+ hreflang %LanguageCode; #IMPLIED
+ type %ContentType; #IMPLIED
+ rel %LinkTypes; #IMPLIED
+ rev %LinkTypes; #IMPLIED
+ media %MediaDesc; #IMPLIED
+ >
+
+<!-- style info, which may include CDATA sections -->
+<!ELEMENT style (#PCDATA)>
+<!ATTLIST style
+ %i18n;
+ id ID #IMPLIED
+ type %ContentType; #REQUIRED
+ media %MediaDesc; #IMPLIED
+ title %Text; #IMPLIED
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!-- script statements, which may include CDATA sections -->
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script
+ id ID #IMPLIED
+ charset %Charset; #IMPLIED
+ type %ContentType; #REQUIRED
+ src %URI; #IMPLIED
+ defer (defer) #IMPLIED
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!-- alternate content container for non script-based rendering -->
+
+<!ELEMENT noscript %Block;>
+<!ATTLIST noscript
+ %attrs;
+ >
+
+<!--=================== Document Body ====================================-->
+
+<!ELEMENT body %Block;>
+<!ATTLIST body
+ %attrs;
+ onload %Script; #IMPLIED
+ onunload %Script; #IMPLIED
+ >
+
+<!ELEMENT div %Flow;> <!-- generic language/style container -->
+<!ATTLIST div
+ %attrs;
+ >
+
+<!--=================== Paragraphs =======================================-->
+
+<!ELEMENT p %Inline;>
+<!ATTLIST p
+ %attrs;
+ >
+
+<!--=================== Headings =========================================-->
+
+<!--
+ There are six levels of headings from h1 (the most important)
+ to h6 (the least important).
+-->
+
+<!ELEMENT h1 %Inline;>
+<!ATTLIST h1
+ %attrs;
+ >
+
+<!ELEMENT h2 %Inline;>
+<!ATTLIST h2
+ %attrs;
+ >
+
+<!ELEMENT h3 %Inline;>
+<!ATTLIST h3
+ %attrs;
+ >
+
+<!ELEMENT h4 %Inline;>
+<!ATTLIST h4
+ %attrs;
+ >
+
+<!ELEMENT h5 %Inline;>
+<!ATTLIST h5
+ %attrs;
+ >
+
+<!ELEMENT h6 %Inline;>
+<!ATTLIST h6
+ %attrs;
+ >
+
+<!--=================== Lists ============================================-->
+
+<!-- Unordered list -->
+
+<!ELEMENT ul (li)+>
+<!ATTLIST ul
+ %attrs;
+ >
+
+<!-- Ordered (numbered) list -->
+
+<!ELEMENT ol (li)+>
+<!ATTLIST ol
+ %attrs;
+ >
+
+<!-- list item -->
+
+<!ELEMENT li %Flow;>
+<!ATTLIST li
+ %attrs;
+ >
+
+<!-- definition lists - dt for term, dd for its definition -->
+
+<!ELEMENT dl (dt|dd)+>
+<!ATTLIST dl
+ %attrs;
+ >
+
+<!ELEMENT dt %Inline;>
+<!ATTLIST dt
+ %attrs;
+ >
+
+<!ELEMENT dd %Flow;>
+<!ATTLIST dd
+ %attrs;
+ >
+
+<!--=================== Address ==========================================-->
+
+<!-- information on author -->
+
+<!ELEMENT address %Inline;>
+<!ATTLIST address
+ %attrs;
+ >
+
+<!--=================== Horizontal Rule ==================================-->
+
+<!ELEMENT hr EMPTY>
+<!ATTLIST hr
+ %attrs;
+ >
+
+<!--=================== Preformatted Text ================================-->
+
+<!-- content is %Inline; excluding "img|object|big|small|sub|sup" -->
+
+<!ELEMENT pre %pre.content;>
+<!ATTLIST pre
+ %attrs;
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!--=================== Block-like Quotes ================================-->
+
+<!ELEMENT blockquote %Block;>
+<!ATTLIST blockquote
+ %attrs;
+ cite %URI; #IMPLIED
+ >
+
+<!--=================== Inserted/Deleted Text ============================-->
+
+<!--
+ ins/del are allowed in block and inline content, but its
+ inappropriate to include block content within an ins element
+ occurring in inline content.
+-->
+<!ELEMENT ins %Flow;>
+<!ATTLIST ins
+ %attrs;
+ cite %URI; #IMPLIED
+ datetime %Datetime; #IMPLIED
+ >
+
+<!ELEMENT del %Flow;>
+<!ATTLIST del
+ %attrs;
+ cite %URI; #IMPLIED
+ datetime %Datetime; #IMPLIED
+ >
+
+<!--================== The Anchor Element ================================-->
+
+<!-- content is %Inline; except that anchors shouldn't be nested -->
+
+<!ELEMENT a %a.content;>
+<!ATTLIST a
+ %attrs;
+ %focus;
+ charset %Charset; #IMPLIED
+ type %ContentType; #IMPLIED
+ name NMTOKEN #IMPLIED
+ href %URI; #IMPLIED
+ hreflang %LanguageCode; #IMPLIED
+ rel %LinkTypes; #IMPLIED
+ rev %LinkTypes; #IMPLIED
+ shape %Shape; "rect"
+ coords %Coords; #IMPLIED
+ >
+
+<!--===================== Inline Elements ================================-->
+
+<!ELEMENT span %Inline;> <!-- generic language/style container -->
+<!ATTLIST span
+ %attrs;
+ >
+
+<!ELEMENT bdo %Inline;> <!-- I18N BiDi over-ride -->
+<!ATTLIST bdo
+ %coreattrs;
+ %events;
+ lang %LanguageCode; #IMPLIED
+ xml:lang %LanguageCode; #IMPLIED
+ dir (ltr|rtl) #REQUIRED
+ >
+
+<!ELEMENT br EMPTY> <!-- forced line break -->
+<!ATTLIST br
+ %coreattrs;
+ >
+
+<!ELEMENT em %Inline;> <!-- emphasis -->
+<!ATTLIST em %attrs;>
+
+<!ELEMENT strong %Inline;> <!-- strong emphasis -->
+<!ATTLIST strong %attrs;>
+
+<!ELEMENT dfn %Inline;> <!-- definitional -->
+<!ATTLIST dfn %attrs;>
+
+<!ELEMENT code %Inline;> <!-- program code -->
+<!ATTLIST code %attrs;>
+
+<!ELEMENT samp %Inline;> <!-- sample -->
+<!ATTLIST samp %attrs;>
+
+<!ELEMENT kbd %Inline;> <!-- something user would type -->
+<!ATTLIST kbd %attrs;>
+
+<!ELEMENT var %Inline;> <!-- variable -->
+<!ATTLIST var %attrs;>
+
+<!ELEMENT cite %Inline;> <!-- citation -->
+<!ATTLIST cite %attrs;>
+
+<!ELEMENT abbr %Inline;> <!-- abbreviation -->
+<!ATTLIST abbr %attrs;>
+
+<!ELEMENT acronym %Inline;> <!-- acronym -->
+<!ATTLIST acronym %attrs;>
+
+<!ELEMENT q %Inline;> <!-- inlined quote -->
+<!ATTLIST q
+ %attrs;
+ cite %URI; #IMPLIED
+ >
+
+<!ELEMENT sub %Inline;> <!-- subscript -->
+<!ATTLIST sub %attrs;>
+
+<!ELEMENT sup %Inline;> <!-- superscript -->
+<!ATTLIST sup %attrs;>
+
+<!ELEMENT tt %Inline;> <!-- fixed pitch font -->
+<!ATTLIST tt %attrs;>
+
+<!ELEMENT i %Inline;> <!-- italic font -->
+<!ATTLIST i %attrs;>
+
+<!ELEMENT b %Inline;> <!-- bold font -->
+<!ATTLIST b %attrs;>
+
+<!ELEMENT big %Inline;> <!-- bigger font -->
+<!ATTLIST big %attrs;>
+
+<!ELEMENT small %Inline;> <!-- smaller font -->
+<!ATTLIST small %attrs;>
+
+<!--==================== Object ======================================-->
+<!--
+ object is used to embed objects as part of HTML pages.
+ param elements should precede other content. Parameters
+ can also be expressed as attribute/value pairs on the
+ object element itself when brevity is desired.
+-->
+
+<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
+<!ATTLIST object
+ %attrs;
+ declare (declare) #IMPLIED
+ classid %URI; #IMPLIED
+ codebase %URI; #IMPLIED
+ data %URI; #IMPLIED
+ type %ContentType; #IMPLIED
+ codetype %ContentType; #IMPLIED
+ archive %UriList; #IMPLIED
+ standby %Text; #IMPLIED
+ height %Length; #IMPLIED
+ width %Length; #IMPLIED
+ usemap %URI; #IMPLIED
+ name NMTOKEN #IMPLIED
+ tabindex %Number; #IMPLIED
+ >
+
+<!--
+ param is used to supply a named property value.
+ In XML it would seem natural to follow RDF and support an
+ abbreviated syntax where the param elements are replaced
+ by attribute value pairs on the object start tag.
+-->
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ id ID #IMPLIED
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED
+ valuetype (data|ref|object) "data"
+ type %ContentType; #IMPLIED
+ >
+
+<!--=================== Images ===========================================-->
+
+<!--
+ To avoid accessibility problems for people who aren't
+ able to see the image, you should provide a text
+ description using the alt and longdesc attributes.
+ In addition, avoid the use of server-side image maps.
+ Note that in this DTD there is no name attribute. That
+ is only available in the transitional and frameset DTD.
+-->
+
+<!ELEMENT img EMPTY>
+<!ATTLIST img
+ %attrs;
+ src %URI; #REQUIRED
+ alt %Text; #REQUIRED
+ longdesc %URI; #IMPLIED
+ height %Length; #IMPLIED
+ width %Length; #IMPLIED
+ usemap %URI; #IMPLIED
+ ismap (ismap) #IMPLIED
+ >
+
+<!-- usemap points to a map element which may be in this document
+ or an external document, although the latter is not widely supported -->
+
+<!--================== Client-side image maps ============================-->
+
+<!-- These can be placed in the same document or grouped in a
+ separate document although this isn't yet widely supported -->
+
+<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
+<!ATTLIST map
+ %i18n;
+ %events;
+ id ID #REQUIRED
+ class CDATA #IMPLIED
+ style %StyleSheet; #IMPLIED
+ title %Text; #IMPLIED
+ name NMTOKEN #IMPLIED
+ >
+
+<!ELEMENT area EMPTY>
+<!ATTLIST area
+ %attrs;
+ %focus;
+ shape %Shape; "rect"
+ coords %Coords; #IMPLIED
+ href %URI; #IMPLIED
+ nohref (nohref) #IMPLIED
+ alt %Text; #REQUIRED
+ >
+
+<!--================ Forms ===============================================-->
+<!ELEMENT form %form.content;> <!-- forms shouldn't be nested -->
+
+<!ATTLIST form
+ %attrs;
+ action %URI; #REQUIRED
+ method (get|post) "get"
+ enctype %ContentType; "application/x-www-form-urlencoded"
+ onsubmit %Script; #IMPLIED
+ onreset %Script; #IMPLIED
+ accept %ContentTypes; #IMPLIED
+ accept-charset %Charsets; #IMPLIED
+ >
+
+<!--
+ Each label must not contain more than ONE field
+ Label elements shouldn't be nested.
+-->
+<!ELEMENT label %Inline;>
+<!ATTLIST label
+ %attrs;
+ for IDREF #IMPLIED
+ accesskey %Character; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ >
+
+<!ENTITY % InputType
+ "(text | password | checkbox |
+ radio | submit | reset |
+ file | hidden | image | button)"
+ >
+
+<!-- the name attribute is required for all but submit & reset -->
+
+<!ELEMENT input EMPTY> <!-- form control -->
+<!ATTLIST input
+ %attrs;
+ %focus;
+ type %InputType; "text"
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED
+ checked (checked) #IMPLIED
+ disabled (disabled) #IMPLIED
+ readonly (readonly) #IMPLIED
+ size CDATA #IMPLIED
+ maxlength %Number; #IMPLIED
+ src %URI; #IMPLIED
+ alt CDATA #IMPLIED
+ usemap %URI; #IMPLIED
+ onselect %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ accept %ContentTypes; #IMPLIED
+ >
+
+<!ELEMENT select (optgroup|option)+> <!-- option selector -->
+<!ATTLIST select
+ %attrs;
+ name CDATA #IMPLIED
+ size %Number; #IMPLIED
+ multiple (multiple) #IMPLIED
+ disabled (disabled) #IMPLIED
+ tabindex %Number; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ >
+
+<!ELEMENT optgroup (option)+> <!-- option group -->
+<!ATTLIST optgroup
+ %attrs;
+ disabled (disabled) #IMPLIED
+ label %Text; #REQUIRED
+ >
+
+<!ELEMENT option (#PCDATA)> <!-- selectable choice -->
+<!ATTLIST option
+ %attrs;
+ selected (selected) #IMPLIED
+ disabled (disabled) #IMPLIED
+ label %Text; #IMPLIED
+ value CDATA #IMPLIED
+ >
+
+<!ELEMENT textarea (#PCDATA)> <!-- multi-line text field -->
+<!ATTLIST textarea
+ %attrs;
+ %focus;
+ name CDATA #IMPLIED
+ rows %Number; #REQUIRED
+ cols %Number; #REQUIRED
+ disabled (disabled) #IMPLIED
+ readonly (readonly) #IMPLIED
+ onselect %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ >
+
+<!--
+ The fieldset element is used to group form fields.
+ Only one legend element should occur in the content
+ and if present should only be preceded by whitespace.
+-->
+<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
+<!ATTLIST fieldset
+ %attrs;
+ >
+
+<!ELEMENT legend %Inline;> <!-- fieldset label -->
+<!ATTLIST legend
+ %attrs;
+ accesskey %Character; #IMPLIED
+ >
+
+<!--
+ Content is %Flow; excluding a, form and form controls
+-->
+<!ELEMENT button %button.content;> <!-- push button -->
+<!ATTLIST button
+ %attrs;
+ %focus;
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED
+ type (button|submit|reset) "submit"
+ disabled (disabled) #IMPLIED
+ >
+
+<!--======================= Tables =======================================-->
+
+<!-- Derived from IETF HTML table standard, see [RFC1942] -->
+
+<!--
+ The border attribute sets the thickness of the frame around the
+ table. The default units are screen pixels.
+
+ The frame attribute specifies which parts of the frame around
+ the table should be rendered. The values are not the same as
+ CALS to avoid a name clash with the valign attribute.
+-->
+<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
+
+<!--
+ The rules attribute defines which rules to draw between cells:
+
+ If rules is absent then assume:
+ "none" if border is absent or border="0" otherwise "all"
+-->
+
+<!ENTITY % TRules "(none | groups | rows | cols | all)">
+
+<!-- horizontal alignment attributes for cell contents
+
+ char alignment char, e.g. char=':'
+ charoff offset for alignment char
+-->
+<!ENTITY % cellhalign
+ "align (left|center|right|justify|char) #IMPLIED
+ char %Character; #IMPLIED
+ charoff %Length; #IMPLIED"
+ >
+
+<!-- vertical alignment attributes for cell contents -->
+<!ENTITY % cellvalign
+ "valign (top|middle|bottom|baseline) #IMPLIED"
+ >
+
+<!ELEMENT table
+ (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
+<!ELEMENT caption %Inline;>
+<!ELEMENT thead (tr)+>
+<!ELEMENT tfoot (tr)+>
+<!ELEMENT tbody (tr)+>
+<!ELEMENT colgroup (col)*>
+<!ELEMENT col EMPTY>
+<!ELEMENT tr (th|td)+>
+<!ELEMENT th %Flow;>
+<!ELEMENT td %Flow;>
+
+<!ATTLIST table
+ %attrs;
+ summary %Text; #IMPLIED
+ width %Length; #IMPLIED
+ border %Pixels; #IMPLIED
+ frame %TFrame; #IMPLIED
+ rules %TRules; #IMPLIED
+ cellspacing %Length; #IMPLIED
+ cellpadding %Length; #IMPLIED
+ >
+
+<!ATTLIST caption
+ %attrs;
+ >
+
+<!--
+colgroup groups a set of col elements. It allows you to group
+several semantically related columns together.
+-->
+<!ATTLIST colgroup
+ %attrs;
+ span %Number; "1"
+ width %MultiLength; #IMPLIED
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!--
+ col elements define the alignment properties for cells in
+ one or more columns.
+
+ The width attribute specifies the width of the columns, e.g.
+
+ width=64 width in screen pixels
+ width=0.5* relative width of 0.5
+
+ The span attribute causes the attributes of one
+ col element to apply to more than one column.
+-->
+<!ATTLIST col
+ %attrs;
+ span %Number; "1"
+ width %MultiLength; #IMPLIED
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!--
+ Use thead to duplicate headers when breaking table
+ across page boundaries, or for static headers when
+ tbody sections are rendered in scrolling panel.
+
+ Use tfoot to duplicate footers when breaking table
+ across page boundaries, or for static footers when
+ tbody sections are rendered in scrolling panel.
+
+ Use multiple tbody sections when rules are needed
+ between groups of table rows.
+-->
+<!ATTLIST thead
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tfoot
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tbody
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tr
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+
+<!-- Scope is simpler than headers attribute for common tables -->
+<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
+
+<!-- th is for headers, td for data and for cells acting as both -->
+
+<!ATTLIST th
+ %attrs;
+ abbr %Text; #IMPLIED
+ axis CDATA #IMPLIED
+ headers IDREFS #IMPLIED
+ scope %Scope; #IMPLIED
+ rowspan %Number; "1"
+ colspan %Number; "1"
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST td
+ %attrs;
+ abbr %Text; #IMPLIED
+ axis CDATA #IMPLIED
+ headers IDREFS #IMPLIED
+ scope %Scope; #IMPLIED
+ rowspan %Number; "1"
+ colspan %Number; "1"
+ %cellhalign;
+ %cellvalign;
+ >
+
diff --git a/docs/manual/style/w3c/xhtml1-transitional.dtd b/docs/manual/style/w3c/xhtml1-transitional.dtd
new file mode 100644
index 0000000..008c725
--- /dev/null
+++ b/docs/manual/style/w3c/xhtml1-transitional.dtd
@@ -0,0 +1,1201 @@
+<!--
+ Extensible HTML version 1.0 Transitional DTD
+
+ This is the same as HTML 4 Transitional except for
+ changes due to the differences between XML and SGML.
+
+ Namespace = http://www.w3.org/1999/xhtml
+
+ For further information, see: http://www.w3.org/TR/xhtml1
+
+ Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
+ All Rights Reserved.
+
+ This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+
+ $Revision: 1.1.2.1 $
+ $Date: 2002/12/15 22:13:49 $
+
+-->
+
+<!--================ Character mnemonic entities =========================-->
+
+<!ENTITY % HTMLlat1 PUBLIC
+ "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+ "xhtml-lat1.ent">
+%HTMLlat1;
+
+<!ENTITY % HTMLsymbol PUBLIC
+ "-//W3C//ENTITIES Symbols for XHTML//EN"
+ "xhtml-symbol.ent">
+%HTMLsymbol;
+
+<!ENTITY % HTMLspecial PUBLIC
+ "-//W3C//ENTITIES Special for XHTML//EN"
+ "xhtml-special.ent">
+%HTMLspecial;
+
+<!--================== Imported Names ====================================-->
+
+<!ENTITY % ContentType "CDATA">
+ <!-- media type, as per [RFC2045] -->
+
+<!ENTITY % ContentTypes "CDATA">
+ <!-- comma-separated list of media types, as per [RFC2045] -->
+
+<!ENTITY % Charset "CDATA">
+ <!-- a character encoding, as per [RFC2045] -->
+
+<!ENTITY % Charsets "CDATA">
+ <!-- a space separated list of character encodings, as per [RFC2045] -->
+
+<!ENTITY % LanguageCode "NMTOKEN">
+ <!-- a language code, as per [RFC3066] -->
+
+<!ENTITY % Character "CDATA">
+ <!-- a single character, as per section 2.2 of [XML] -->
+
+<!ENTITY % Number "CDATA">
+ <!-- one or more digits -->
+
+<!ENTITY % LinkTypes "CDATA">
+ <!-- space-separated list of link types -->
+
+<!ENTITY % MediaDesc "CDATA">
+ <!-- single or comma-separated list of media descriptors -->
+
+<!ENTITY % URI "CDATA">
+ <!-- a Uniform Resource Identifier, see [RFC2396] -->
+
+<!ENTITY % UriList "CDATA">
+ <!-- a space separated list of Uniform Resource Identifiers -->
+
+<!ENTITY % Datetime "CDATA">
+ <!-- date and time information. ISO date format -->
+
+<!ENTITY % Script "CDATA">
+ <!-- script expression -->
+
+<!ENTITY % StyleSheet "CDATA">
+ <!-- style sheet data -->
+
+<!ENTITY % Text "CDATA">
+ <!-- used for titles etc. -->
+
+<!ENTITY % FrameTarget "NMTOKEN">
+ <!-- render in this frame -->
+
+<!ENTITY % Length "CDATA">
+ <!-- nn for pixels or nn% for percentage length -->
+
+<!ENTITY % MultiLength "CDATA">
+ <!-- pixel, percentage, or relative -->
+
+<!ENTITY % Pixels "CDATA">
+ <!-- integer representing length in pixels -->
+
+<!-- these are used for image maps -->
+
+<!ENTITY % Shape "(rect|circle|poly|default)">
+
+<!ENTITY % Coords "CDATA">
+ <!-- comma separated list of lengths -->
+
+<!-- used for object, applet, img, input and iframe -->
+<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
+
+<!-- a color using sRGB: #RRGGBB as Hex values -->
+<!ENTITY % Color "CDATA">
+
+<!-- There are also 16 widely known color names with their sRGB values:
+
+ Black = #000000 Green = #008000
+ Silver = #C0C0C0 Lime = #00FF00
+ Gray = #808080 Olive = #808000
+ White = #FFFFFF Yellow = #FFFF00
+ Maroon = #800000 Navy = #000080
+ Red = #FF0000 Blue = #0000FF
+ Purple = #800080 Teal = #008080
+ Fuchsia= #FF00FF Aqua = #00FFFF
+-->
+
+<!--=================== Generic Attributes ===============================-->
+
+<!-- core attributes common to most elements
+ id document-wide unique id
+ class space separated list of classes
+ style associated style info
+ title advisory title/amplification
+-->
+<!ENTITY % coreattrs
+ "id ID #IMPLIED
+ class CDATA #IMPLIED
+ style %StyleSheet; #IMPLIED
+ title %Text; #IMPLIED"
+ >
+
+<!-- internationalization attributes
+ lang language code (backwards compatible)
+ xml:lang language code (as per XML 1.0 spec)
+ dir direction for weak/neutral text
+-->
+<!ENTITY % i18n
+ "lang %LanguageCode; #IMPLIED
+ xml:lang %LanguageCode; #IMPLIED
+ dir (ltr|rtl) #IMPLIED"
+ >
+
+<!-- attributes for common UI events
+ onclick a pointer button was clicked
+ ondblclick a pointer button was double clicked
+ onmousedown a pointer button was pressed down
+ onmouseup a pointer button was released
+ onmousemove a pointer was moved onto the element
+ onmouseout a pointer was moved away from the element
+ onkeypress a key was pressed and released
+ onkeydown a key was pressed down
+ onkeyup a key was released
+-->
+<!ENTITY % events
+ "onclick %Script; #IMPLIED
+ ondblclick %Script; #IMPLIED
+ onmousedown %Script; #IMPLIED
+ onmouseup %Script; #IMPLIED
+ onmouseover %Script; #IMPLIED
+ onmousemove %Script; #IMPLIED
+ onmouseout %Script; #IMPLIED
+ onkeypress %Script; #IMPLIED
+ onkeydown %Script; #IMPLIED
+ onkeyup %Script; #IMPLIED"
+ >
+
+<!-- attributes for elements that can get the focus
+ accesskey accessibility key character
+ tabindex position in tabbing order
+ onfocus the element got the focus
+ onblur the element lost the focus
+-->
+<!ENTITY % focus
+ "accesskey %Character; #IMPLIED
+ tabindex %Number; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED"
+ >
+
+<!ENTITY % attrs "%coreattrs; %i18n; %events;">
+
+<!-- text alignment for p, div, h1-h6. The default is
+ align="left" for ltr headings, "right" for rtl -->
+
+<!ENTITY % TextAlign "align (left|center|right|justify) #IMPLIED">
+
+<!--=================== Text Elements ====================================-->
+
+<!ENTITY % special.extra
+ "object | applet | img | map | iframe">
+
+<!ENTITY % special.basic
+ "br | span | bdo">
+
+<!ENTITY % special
+ "%special.basic; | %special.extra;">
+
+<!ENTITY % fontstyle.extra "big | small | font | basefont">
+
+<!ENTITY % fontstyle.basic "tt | i | b | u
+ | s | strike ">
+
+<!ENTITY % fontstyle "%fontstyle.basic; | %fontstyle.extra;">
+
+<!ENTITY % phrase.extra "sub | sup">
+<!ENTITY % phrase.basic "em | strong | dfn | code | q |
+ samp | kbd | var | cite | abbr | acronym">
+
+<!ENTITY % phrase "%phrase.basic; | %phrase.extra;">
+
+<!ENTITY % inline.forms "input | select | textarea | label | button">
+
+<!-- these can occur at block or inline level -->
+<!ENTITY % misc.inline "ins | del | script">
+
+<!-- these can only occur at block level -->
+<!ENTITY % misc "noscript | %misc.inline;">
+
+<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
+
+<!-- %Inline; covers inline or "text-level" elements -->
+<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
+
+<!--================== Block level elements ==============================-->
+
+<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
+<!ENTITY % lists "ul | ol | dl | menu | dir">
+<!ENTITY % blocktext "pre | hr | blockquote | address | center | noframes">
+
+<!ENTITY % block
+ "p | %heading; | div | %lists; | %blocktext; | isindex |fieldset | table">
+
+<!-- %Flow; mixes block and inline and is used for list items etc. -->
+<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
+
+<!--================== Content models for exclusions =====================-->
+
+<!-- a elements use %Inline; excluding a -->
+
+<!ENTITY % a.content
+ "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
+
+<!-- pre uses %Inline excluding img, object, applet, big, small,
+ font, or basefont -->
+
+<!ENTITY % pre.content
+ "(#PCDATA | a | %special.basic; | %fontstyle.basic; | %phrase.basic; |
+ %inline.forms; | %misc.inline;)*">
+
+<!-- form uses %Flow; excluding form -->
+
+<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
+
+<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
+
+<!ENTITY % button.content
+ "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
+ table | br | span | bdo | object | applet | img | map |
+ %fontstyle; | %phrase; | %misc;)*">
+
+<!--================ Document Structure ==================================-->
+
+<!-- the namespace URI designates the document profile -->
+
+<!ELEMENT html (head, body)>
+<!ATTLIST html
+ %i18n;
+ id ID #IMPLIED
+ xmlns %URI; #FIXED 'http://www.w3.org/1999/xhtml'
+ >
+
+<!--================ Document Head =======================================-->
+
+<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
+
+<!-- content model is %head.misc; combined with a single
+ title and an optional base element in any order -->
+
+<!ELEMENT head (%head.misc;,
+ ((title, %head.misc;, (base, %head.misc;)?) |
+ (base, %head.misc;, (title, %head.misc;))))>
+
+<!ATTLIST head
+ %i18n;
+ id ID #IMPLIED
+ profile %URI; #IMPLIED
+ >
+
+<!-- The title element is not considered part of the flow of text.
+ It should be displayed, for example as the page header or
+ window title. Exactly one title is required per document.
+ -->
+<!ELEMENT title (#PCDATA)>
+<!ATTLIST title
+ %i18n;
+ id ID #IMPLIED
+ >
+
+<!-- document base URI -->
+
+<!ELEMENT base EMPTY>
+<!ATTLIST base
+ id ID #IMPLIED
+ href %URI; #IMPLIED
+ target %FrameTarget; #IMPLIED
+ >
+
+<!-- generic metainformation -->
+<!ELEMENT meta EMPTY>
+<!ATTLIST meta
+ %i18n;
+ id ID #IMPLIED
+ http-equiv CDATA #IMPLIED
+ name CDATA #IMPLIED
+ content CDATA #REQUIRED
+ scheme CDATA #IMPLIED
+ >
+
+<!--
+ Relationship values can be used in principle:
+
+ a) for document specific toolbars/menus when used
+ with the link element in document head e.g.
+ start, contents, previous, next, index, end, help
+ b) to link to a separate style sheet (rel="stylesheet")
+ c) to make a link to a script (rel="script")
+ d) by stylesheets to control how collections of
+ html nodes are rendered into printed documents
+ e) to make a link to a printable version of this document
+ e.g. a PostScript or PDF version (rel="alternate" media="print")
+-->
+
+<!ELEMENT link EMPTY>
+<!ATTLIST link
+ %attrs;
+ charset %Charset; #IMPLIED
+ href %URI; #IMPLIED
+ hreflang %LanguageCode; #IMPLIED
+ type %ContentType; #IMPLIED
+ rel %LinkTypes; #IMPLIED
+ rev %LinkTypes; #IMPLIED
+ media %MediaDesc; #IMPLIED
+ target %FrameTarget; #IMPLIED
+ >
+
+<!-- style info, which may include CDATA sections -->
+<!ELEMENT style (#PCDATA)>
+<!ATTLIST style
+ %i18n;
+ id ID #IMPLIED
+ type %ContentType; #REQUIRED
+ media %MediaDesc; #IMPLIED
+ title %Text; #IMPLIED
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!-- script statements, which may include CDATA sections -->
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script
+ id ID #IMPLIED
+ charset %Charset; #IMPLIED
+ type %ContentType; #REQUIRED
+ language CDATA #IMPLIED
+ src %URI; #IMPLIED
+ defer (defer) #IMPLIED
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!-- alternate content container for non script-based rendering -->
+
+<!ELEMENT noscript %Flow;>
+<!ATTLIST noscript
+ %attrs;
+ >
+
+<!--======================= Frames =======================================-->
+
+<!-- inline subwindow -->
+
+<!ELEMENT iframe %Flow;>
+<!ATTLIST iframe
+ %coreattrs;
+ longdesc %URI; #IMPLIED
+ name NMTOKEN #IMPLIED
+ src %URI; #IMPLIED
+ frameborder (1|0) "1"
+ marginwidth %Pixels; #IMPLIED
+ marginheight %Pixels; #IMPLIED
+ scrolling (yes|no|auto) "auto"
+ align %ImgAlign; #IMPLIED
+ height %Length; #IMPLIED
+ width %Length; #IMPLIED
+ >
+
+<!-- alternate content container for non frame-based rendering -->
+
+<!ELEMENT noframes %Flow;>
+<!ATTLIST noframes
+ %attrs;
+ >
+
+<!--=================== Document Body ====================================-->
+
+<!ELEMENT body %Flow;>
+<!ATTLIST body
+ %attrs;
+ onload %Script; #IMPLIED
+ onunload %Script; #IMPLIED
+ background %URI; #IMPLIED
+ bgcolor %Color; #IMPLIED
+ text %Color; #IMPLIED
+ link %Color; #IMPLIED
+ vlink %Color; #IMPLIED
+ alink %Color; #IMPLIED
+ >
+
+<!ELEMENT div %Flow;> <!-- generic language/style container -->
+<!ATTLIST div
+ %attrs;
+ %TextAlign;
+ >
+
+<!--=================== Paragraphs =======================================-->
+
+<!ELEMENT p %Inline;>
+<!ATTLIST p
+ %attrs;
+ %TextAlign;
+ >
+
+<!--=================== Headings =========================================-->
+
+<!--
+ There are six levels of headings from h1 (the most important)
+ to h6 (the least important).
+-->
+
+<!ELEMENT h1 %Inline;>
+<!ATTLIST h1
+ %attrs;
+ %TextAlign;
+ >
+
+<!ELEMENT h2 %Inline;>
+<!ATTLIST h2
+ %attrs;
+ %TextAlign;
+ >
+
+<!ELEMENT h3 %Inline;>
+<!ATTLIST h3
+ %attrs;
+ %TextAlign;
+ >
+
+<!ELEMENT h4 %Inline;>
+<!ATTLIST h4
+ %attrs;
+ %TextAlign;
+ >
+
+<!ELEMENT h5 %Inline;>
+<!ATTLIST h5
+ %attrs;
+ %TextAlign;
+ >
+
+<!ELEMENT h6 %Inline;>
+<!ATTLIST h6
+ %attrs;
+ %TextAlign;
+ >
+
+<!--=================== Lists ============================================-->
+
+<!-- Unordered list bullet styles -->
+
+<!ENTITY % ULStyle "(disc|square|circle)">
+
+<!-- Unordered list -->
+
+<!ELEMENT ul (li)+>
+<!ATTLIST ul
+ %attrs;
+ type %ULStyle; #IMPLIED
+ compact (compact) #IMPLIED
+ >
+
+<!-- Ordered list numbering style
+
+ 1 arabic numbers 1, 2, 3, ...
+ a lower alpha a, b, c, ...
+ A upper alpha A, B, C, ...
+ i lower roman i, ii, iii, ...
+ I upper roman I, II, III, ...
+
+ The style is applied to the sequence number which by default
+ is reset to 1 for the first list item in an ordered list.
+-->
+<!ENTITY % OLStyle "CDATA">
+
+<!-- Ordered (numbered) list -->
+
+<!ELEMENT ol (li)+>
+<!ATTLIST ol
+ %attrs;
+ type %OLStyle; #IMPLIED
+ compact (compact) #IMPLIED
+ start %Number; #IMPLIED
+ >
+
+<!-- single column list (DEPRECATED) -->
+<!ELEMENT menu (li)+>
+<!ATTLIST menu
+ %attrs;
+ compact (compact) #IMPLIED
+ >
+
+<!-- multiple column list (DEPRECATED) -->
+<!ELEMENT dir (li)+>
+<!ATTLIST dir
+ %attrs;
+ compact (compact) #IMPLIED
+ >
+
+<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
+<!ENTITY % LIStyle "CDATA">
+
+<!-- list item -->
+
+<!ELEMENT li %Flow;>
+<!ATTLIST li
+ %attrs;
+ type %LIStyle; #IMPLIED
+ value %Number; #IMPLIED
+ >
+
+<!-- definition lists - dt for term, dd for its definition -->
+
+<!ELEMENT dl (dt|dd)+>
+<!ATTLIST dl
+ %attrs;
+ compact (compact) #IMPLIED
+ >
+
+<!ELEMENT dt %Inline;>
+<!ATTLIST dt
+ %attrs;
+ >
+
+<!ELEMENT dd %Flow;>
+<!ATTLIST dd
+ %attrs;
+ >
+
+<!--=================== Address ==========================================-->
+
+<!-- information on author -->
+
+<!ELEMENT address (#PCDATA | %inline; | %misc.inline; | p)*>
+<!ATTLIST address
+ %attrs;
+ >
+
+<!--=================== Horizontal Rule ==================================-->
+
+<!ELEMENT hr EMPTY>
+<!ATTLIST hr
+ %attrs;
+ align (left|center|right) #IMPLIED
+ noshade (noshade) #IMPLIED
+ size %Pixels; #IMPLIED
+ width %Length; #IMPLIED
+ >
+
+<!--=================== Preformatted Text ================================-->
+
+<!-- content is %Inline; excluding
+ "img|object|applet|big|small|sub|sup|font|basefont" -->
+
+<!ELEMENT pre %pre.content;>
+<!ATTLIST pre
+ %attrs;
+ width %Number; #IMPLIED
+ xml:space (preserve) #FIXED 'preserve'
+ >
+
+<!--=================== Block-like Quotes ================================-->
+
+<!ELEMENT blockquote %Flow;>
+<!ATTLIST blockquote
+ %attrs;
+ cite %URI; #IMPLIED
+ >
+
+<!--=================== Text alignment ===================================-->
+
+<!-- center content -->
+<!ELEMENT center %Flow;>
+<!ATTLIST center
+ %attrs;
+ >
+
+<!--=================== Inserted/Deleted Text ============================-->
+
+<!--
+ ins/del are allowed in block and inline content, but its
+ inappropriate to include block content within an ins element
+ occurring in inline content.
+-->
+<!ELEMENT ins %Flow;>
+<!ATTLIST ins
+ %attrs;
+ cite %URI; #IMPLIED
+ datetime %Datetime; #IMPLIED
+ >
+
+<!ELEMENT del %Flow;>
+<!ATTLIST del
+ %attrs;
+ cite %URI; #IMPLIED
+ datetime %Datetime; #IMPLIED
+ >
+
+<!--================== The Anchor Element ================================-->
+
+<!-- content is %Inline; except that anchors shouldn't be nested -->
+
+<!ELEMENT a %a.content;>
+<!ATTLIST a
+ %attrs;
+ %focus;
+ charset %Charset; #IMPLIED
+ type %ContentType; #IMPLIED
+ name NMTOKEN #IMPLIED
+ href %URI; #IMPLIED
+ hreflang %LanguageCode; #IMPLIED
+ rel %LinkTypes; #IMPLIED
+ rev %LinkTypes; #IMPLIED
+ shape %Shape; "rect"
+ coords %Coords; #IMPLIED
+ target %FrameTarget; #IMPLIED
+ >
+
+<!--===================== Inline Elements ================================-->
+
+<!ELEMENT span %Inline;> <!-- generic language/style container -->
+<!ATTLIST span
+ %attrs;
+ >
+
+<!ELEMENT bdo %Inline;> <!-- I18N BiDi over-ride -->
+<!ATTLIST bdo
+ %coreattrs;
+ %events;
+ lang %LanguageCode; #IMPLIED
+ xml:lang %LanguageCode; #IMPLIED
+ dir (ltr|rtl) #REQUIRED
+ >
+
+<!ELEMENT br EMPTY> <!-- forced line break -->
+<!ATTLIST br
+ %coreattrs;
+ clear (left|all|right|none) "none"
+ >
+
+<!ELEMENT em %Inline;> <!-- emphasis -->
+<!ATTLIST em %attrs;>
+
+<!ELEMENT strong %Inline;> <!-- strong emphasis -->
+<!ATTLIST strong %attrs;>
+
+<!ELEMENT dfn %Inline;> <!-- definitional -->
+<!ATTLIST dfn %attrs;>
+
+<!ELEMENT code %Inline;> <!-- program code -->
+<!ATTLIST code %attrs;>
+
+<!ELEMENT samp %Inline;> <!-- sample -->
+<!ATTLIST samp %attrs;>
+
+<!ELEMENT kbd %Inline;> <!-- something user would type -->
+<!ATTLIST kbd %attrs;>
+
+<!ELEMENT var %Inline;> <!-- variable -->
+<!ATTLIST var %attrs;>
+
+<!ELEMENT cite %Inline;> <!-- citation -->
+<!ATTLIST cite %attrs;>
+
+<!ELEMENT abbr %Inline;> <!-- abbreviation -->
+<!ATTLIST abbr %attrs;>
+
+<!ELEMENT acronym %Inline;> <!-- acronym -->
+<!ATTLIST acronym %attrs;>
+
+<!ELEMENT q %Inline;> <!-- inlined quote -->
+<!ATTLIST q
+ %attrs;
+ cite %URI; #IMPLIED
+ >
+
+<!ELEMENT sub %Inline;> <!-- subscript -->
+<!ATTLIST sub %attrs;>
+
+<!ELEMENT sup %Inline;> <!-- superscript -->
+<!ATTLIST sup %attrs;>
+
+<!ELEMENT tt %Inline;> <!-- fixed pitch font -->
+<!ATTLIST tt %attrs;>
+
+<!ELEMENT i %Inline;> <!-- italic font -->
+<!ATTLIST i %attrs;>
+
+<!ELEMENT b %Inline;> <!-- bold font -->
+<!ATTLIST b %attrs;>
+
+<!ELEMENT big %Inline;> <!-- bigger font -->
+<!ATTLIST big %attrs;>
+
+<!ELEMENT small %Inline;> <!-- smaller font -->
+<!ATTLIST small %attrs;>
+
+<!ELEMENT u %Inline;> <!-- underline -->
+<!ATTLIST u %attrs;>
+
+<!ELEMENT s %Inline;> <!-- strike-through -->
+<!ATTLIST s %attrs;>
+
+<!ELEMENT strike %Inline;> <!-- strike-through -->
+<!ATTLIST strike %attrs;>
+
+<!ELEMENT basefont EMPTY> <!-- base font size -->
+<!ATTLIST basefont
+ id ID #IMPLIED
+ size CDATA #REQUIRED
+ color %Color; #IMPLIED
+ face CDATA #IMPLIED
+ >
+
+<!ELEMENT font %Inline;> <!-- local change to font -->
+<!ATTLIST font
+ %coreattrs;
+ %i18n;
+ size CDATA #IMPLIED
+ color %Color; #IMPLIED
+ face CDATA #IMPLIED
+ >
+
+<!--==================== Object ======================================-->
+<!--
+ object is used to embed objects as part of HTML pages.
+ param elements should precede other content. Parameters
+ can also be expressed as attribute/value pairs on the
+ object element itself when brevity is desired.
+-->
+
+<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
+<!ATTLIST object
+ %attrs;
+ declare (declare) #IMPLIED
+ classid %URI; #IMPLIED
+ codebase %URI; #IMPLIED
+ data %URI; #IMPLIED
+ type %ContentType; #IMPLIED
+ codetype %ContentType; #IMPLIED
+ archive %UriList; #IMPLIED
+ standby %Text; #IMPLIED
+ height %Length; #IMPLIED
+ width %Length; #IMPLIED
+ usemap %URI; #IMPLIED
+ name NMTOKEN #IMPLIED
+ tabindex %Number; #IMPLIED
+ align %ImgAlign; #IMPLIED
+ border %Pixels; #IMPLIED
+ hspace %Pixels; #IMPLIED
+ vspace %Pixels; #IMPLIED
+ >
+
+<!--
+ param is used to supply a named property value.
+ In XML it would seem natural to follow RDF and support an
+ abbreviated syntax where the param elements are replaced
+ by attribute value pairs on the object start tag.
+-->
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ id ID #IMPLIED
+ name CDATA #REQUIRED
+ value CDATA #IMPLIED
+ valuetype (data|ref|object) "data"
+ type %ContentType; #IMPLIED
+ >
+
+<!--=================== Java applet ==================================-->
+<!--
+ One of code or object attributes must be present.
+ Place param elements before other content.
+-->
+<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
+<!ATTLIST applet
+ %coreattrs;
+ codebase %URI; #IMPLIED
+ archive CDATA #IMPLIED
+ code CDATA #IMPLIED
+ object CDATA #IMPLIED
+ alt %Text; #IMPLIED
+ name NMTOKEN #IMPLIED
+ width %Length; #REQUIRED
+ height %Length; #REQUIRED
+ align %ImgAlign; #IMPLIED
+ hspace %Pixels; #IMPLIED
+ vspace %Pixels; #IMPLIED
+ >
+
+<!--=================== Images ===========================================-->
+
+<!--
+ To avoid accessibility problems for people who aren't
+ able to see the image, you should provide a text
+ description using the alt and longdesc attributes.
+ In addition, avoid the use of server-side image maps.
+-->
+
+<!ELEMENT img EMPTY>
+<!ATTLIST img
+ %attrs;
+ src %URI; #REQUIRED
+ alt %Text; #REQUIRED
+ name NMTOKEN #IMPLIED
+ longdesc %URI; #IMPLIED
+ height %Length; #IMPLIED
+ width %Length; #IMPLIED
+ usemap %URI; #IMPLIED
+ ismap (ismap) #IMPLIED
+ align %ImgAlign; #IMPLIED
+ border %Length; #IMPLIED
+ hspace %Pixels; #IMPLIED
+ vspace %Pixels; #IMPLIED
+ >
+
+<!-- usemap points to a map element which may be in this document
+ or an external document, although the latter is not widely supported -->
+
+<!--================== Client-side image maps ============================-->
+
+<!-- These can be placed in the same document or grouped in a
+ separate document although this isn't yet widely supported -->
+
+<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
+<!ATTLIST map
+ %i18n;
+ %events;
+ id ID #REQUIRED
+ class CDATA #IMPLIED
+ style %StyleSheet; #IMPLIED
+ title %Text; #IMPLIED
+ name CDATA #IMPLIED
+ >
+
+<!ELEMENT area EMPTY>
+<!ATTLIST area
+ %attrs;
+ %focus;
+ shape %Shape; "rect"
+ coords %Coords; #IMPLIED
+ href %URI; #IMPLIED
+ nohref (nohref) #IMPLIED
+ alt %Text; #REQUIRED
+ target %FrameTarget; #IMPLIED
+ >
+
+<!--================ Forms ===============================================-->
+
+<!ELEMENT form %form.content;> <!-- forms shouldn't be nested -->
+
+<!ATTLIST form
+ %attrs;
+ action %URI; #REQUIRED
+ method (get|post) "get"
+ name NMTOKEN #IMPLIED
+ enctype %ContentType; "application/x-www-form-urlencoded"
+ onsubmit %Script; #IMPLIED
+ onreset %Script; #IMPLIED
+ accept %ContentTypes; #IMPLIED
+ accept-charset %Charsets; #IMPLIED
+ target %FrameTarget; #IMPLIED
+ >
+
+<!--
+ Each label must not contain more than ONE field
+ Label elements shouldn't be nested.
+-->
+<!ELEMENT label %Inline;>
+<!ATTLIST label
+ %attrs;
+ for IDREF #IMPLIED
+ accesskey %Character; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ >
+
+<!ENTITY % InputType
+ "(text | password | checkbox |
+ radio | submit | reset |
+ file | hidden | image | button)"
+ >
+
+<!-- the name attribute is required for all but submit & reset -->
+
+<!ELEMENT input EMPTY> <!-- form control -->
+<!ATTLIST input
+ %attrs;
+ %focus;
+ type %InputType; "text"
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED
+ checked (checked) #IMPLIED
+ disabled (disabled) #IMPLIED
+ readonly (readonly) #IMPLIED
+ size CDATA #IMPLIED
+ maxlength %Number; #IMPLIED
+ src %URI; #IMPLIED
+ alt CDATA #IMPLIED
+ usemap %URI; #IMPLIED
+ onselect %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ accept %ContentTypes; #IMPLIED
+ align %ImgAlign; #IMPLIED
+ >
+
+<!ELEMENT select (optgroup|option)+> <!-- option selector -->
+<!ATTLIST select
+ %attrs;
+ name CDATA #IMPLIED
+ size %Number; #IMPLIED
+ multiple (multiple) #IMPLIED
+ disabled (disabled) #IMPLIED
+ tabindex %Number; #IMPLIED
+ onfocus %Script; #IMPLIED
+ onblur %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ >
+
+<!ELEMENT optgroup (option)+> <!-- option group -->
+<!ATTLIST optgroup
+ %attrs;
+ disabled (disabled) #IMPLIED
+ label %Text; #REQUIRED
+ >
+
+<!ELEMENT option (#PCDATA)> <!-- selectable choice -->
+<!ATTLIST option
+ %attrs;
+ selected (selected) #IMPLIED
+ disabled (disabled) #IMPLIED
+ label %Text; #IMPLIED
+ value CDATA #IMPLIED
+ >
+
+<!ELEMENT textarea (#PCDATA)> <!-- multi-line text field -->
+<!ATTLIST textarea
+ %attrs;
+ %focus;
+ name CDATA #IMPLIED
+ rows %Number; #REQUIRED
+ cols %Number; #REQUIRED
+ disabled (disabled) #IMPLIED
+ readonly (readonly) #IMPLIED
+ onselect %Script; #IMPLIED
+ onchange %Script; #IMPLIED
+ >
+
+<!--
+ The fieldset element is used to group form fields.
+ Only one legend element should occur in the content
+ and if present should only be preceded by whitespace.
+-->
+<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
+<!ATTLIST fieldset
+ %attrs;
+ >
+
+<!ENTITY % LAlign "(top|bottom|left|right)">
+
+<!ELEMENT legend %Inline;> <!-- fieldset label -->
+<!ATTLIST legend
+ %attrs;
+ accesskey %Character; #IMPLIED
+ align %LAlign; #IMPLIED
+ >
+
+<!--
+ Content is %Flow; excluding a, form, form controls, iframe
+-->
+<!ELEMENT button %button.content;> <!-- push button -->
+<!ATTLIST button
+ %attrs;
+ %focus;
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED
+ type (button|submit|reset) "submit"
+ disabled (disabled) #IMPLIED
+ >
+
+<!-- single-line text input control (DEPRECATED) -->
+<!ELEMENT isindex EMPTY>
+<!ATTLIST isindex
+ %coreattrs;
+ %i18n;
+ prompt %Text; #IMPLIED
+ >
+
+<!--======================= Tables =======================================-->
+
+<!-- Derived from IETF HTML table standard, see [RFC1942] -->
+
+<!--
+ The border attribute sets the thickness of the frame around the
+ table. The default units are screen pixels.
+
+ The frame attribute specifies which parts of the frame around
+ the table should be rendered. The values are not the same as
+ CALS to avoid a name clash with the valign attribute.
+-->
+<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
+
+<!--
+ The rules attribute defines which rules to draw between cells:
+
+ If rules is absent then assume:
+ "none" if border is absent or border="0" otherwise "all"
+-->
+
+<!ENTITY % TRules "(none | groups | rows | cols | all)">
+
+<!-- horizontal placement of table relative to document -->
+<!ENTITY % TAlign "(left|center|right)">
+
+<!-- horizontal alignment attributes for cell contents
+
+ char alignment char, e.g. char=':'
+ charoff offset for alignment char
+-->
+<!ENTITY % cellhalign
+ "align (left|center|right|justify|char) #IMPLIED
+ char %Character; #IMPLIED
+ charoff %Length; #IMPLIED"
+ >
+
+<!-- vertical alignment attributes for cell contents -->
+<!ENTITY % cellvalign
+ "valign (top|middle|bottom|baseline) #IMPLIED"
+ >
+
+<!ELEMENT table
+ (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
+<!ELEMENT caption %Inline;>
+<!ELEMENT thead (tr)+>
+<!ELEMENT tfoot (tr)+>
+<!ELEMENT tbody (tr)+>
+<!ELEMENT colgroup (col)*>
+<!ELEMENT col EMPTY>
+<!ELEMENT tr (th|td)+>
+<!ELEMENT th %Flow;>
+<!ELEMENT td %Flow;>
+
+<!ATTLIST table
+ %attrs;
+ summary %Text; #IMPLIED
+ width %Length; #IMPLIED
+ border %Pixels; #IMPLIED
+ frame %TFrame; #IMPLIED
+ rules %TRules; #IMPLIED
+ cellspacing %Length; #IMPLIED
+ cellpadding %Length; #IMPLIED
+ align %TAlign; #IMPLIED
+ bgcolor %Color; #IMPLIED
+ >
+
+<!ENTITY % CAlign "(top|bottom|left|right)">
+
+<!ATTLIST caption
+ %attrs;
+ align %CAlign; #IMPLIED
+ >
+
+<!--
+colgroup groups a set of col elements. It allows you to group
+several semantically related columns together.
+-->
+<!ATTLIST colgroup
+ %attrs;
+ span %Number; "1"
+ width %MultiLength; #IMPLIED
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!--
+ col elements define the alignment properties for cells in
+ one or more columns.
+
+ The width attribute specifies the width of the columns, e.g.
+
+ width=64 width in screen pixels
+ width=0.5* relative width of 0.5
+
+ The span attribute causes the attributes of one
+ col element to apply to more than one column.
+-->
+<!ATTLIST col
+ %attrs;
+ span %Number; "1"
+ width %MultiLength; #IMPLIED
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!--
+ Use thead to duplicate headers when breaking table
+ across page boundaries, or for static headers when
+ tbody sections are rendered in scrolling panel.
+
+ Use tfoot to duplicate footers when breaking table
+ across page boundaries, or for static footers when
+ tbody sections are rendered in scrolling panel.
+
+ Use multiple tbody sections when rules are needed
+ between groups of table rows.
+-->
+<!ATTLIST thead
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tfoot
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tbody
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ >
+
+<!ATTLIST tr
+ %attrs;
+ %cellhalign;
+ %cellvalign;
+ bgcolor %Color; #IMPLIED
+ >
+
+<!-- Scope is simpler than headers attribute for common tables -->
+<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
+
+<!-- th is for headers, td for data and for cells acting as both -->
+
+<!ATTLIST th
+ %attrs;
+ abbr %Text; #IMPLIED
+ axis CDATA #IMPLIED
+ headers IDREFS #IMPLIED
+ scope %Scope; #IMPLIED
+ rowspan %Number; "1"
+ colspan %Number; "1"
+ %cellhalign;
+ %cellvalign;
+ nowrap (nowrap) #IMPLIED
+ bgcolor %Color; #IMPLIED
+ width %Length; #IMPLIED
+ height %Length; #IMPLIED
+ >
+
+<!ATTLIST td
+ %attrs;
+ abbr %Text; #IMPLIED
+ axis CDATA #IMPLIED
+ headers IDREFS #IMPLIED
+ scope %Scope; #IMPLIED
+ rowspan %Number; "1"
+ colspan %Number; "1"
+ %cellhalign;
+ %cellvalign;
+ nowrap (nowrap) #IMPLIED
+ bgcolor %Color; #IMPLIED
+ width %Length; #IMPLIED
+ height %Length; #IMPLIED
+ >
+
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 31d281f..0fed175 100644
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -40,7 +40,7 @@
<xsl:include href="synopsis.xsl"/>
<xsl:include href="sitemap.xsl"/>
<xsl:include href="quickreference.xsl"/>
-
+
<!-- make sure, we set relative anchors
only, if we're actually transforming
a modulefile (see <directive>) -->
@@ -66,6 +66,9 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
</xsl:comment>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<title>
<xsl:choose>
<xsl:when test="name">
@@ -80,15 +83,30 @@
<xsl:text> </xsl:text>
<xsl:value-of select="$messages/message[@name='apachetitle']"/>
</title>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<link title="Main stylesheet" type="text/css" media="all" rel="stylesheet"
href="{$path}/style/css/manual.css" />
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<link title="No Sidebar - Default font size" type="text/css" media="all"
- rel="alternate stylesheet"
+ rel="alternate stylesheet"
href="{$path}/style/css/manual-loose-100pc.css"/>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<link type="text/css" media="print"
rel="stylesheet"
href="{$path}/style/css/manual-print.css"/>
-
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<link rel="shortcut icon" href="{$path}/images/favicon.ico" />
</head>
</xsl:template>
@@ -100,15 +118,28 @@
<!-- -->
<xsl:template name="top">
<div id="page-header">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="super-menu" />
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<p class="apache">
<xsl:value-of select="$messages/message[@name='apachehttpserver']"/>
</p>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<img src="{$path}/images/feather.gif" alt="" />
</div> <!-- /page-header -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div class="up">
<a href="./">
<xsl:if test="parentdocument">
@@ -118,35 +149,41 @@
</a>
</div>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div id="path">
- <a href="http://www.apache.org/">
- <xsl:value-of select="$messages/message[@name='apache']"/>
- </a>
- <xsl:text> > </xsl:text>
- <a href="http://httpd.apache.org/">
- <xsl:value-of select="$messages/message[@name='http-server']"/>
- </a>
- <xsl:text> > </xsl:text>
- <a href="http://httpd.apache.org/docs-project/">
- <xsl:value-of select="$messages/message[@name='documentation']"/>
- </a>
- <xsl:text> > </xsl:text>
- <a href="{$path}/">
- <xsl:value-of select="$messages/message[@name='version']"/>
- </a>
- <xsl:if test="../modulesynopsis or ../directiveindex or ../quickreference">
- <xsl:text> > </xsl:text>
- <a href="./">
- <xsl:value-of select="$messages/message[@name='modules']"/>
- </a>
- </xsl:if>
- <xsl:if test="parentdocument/text()">
- <xsl:text> > </xsl:text>
- <a href="{parentdocument/@href}">
- <xsl:value-of select="parentdocument"/>
- </a>
- </xsl:if>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <a href="http://www.apache.org/">
+ <xsl:value-of select="$messages/message[@name='apache']"/>
+ </a>
+ <xsl:text> > </xsl:text>
+ <a href="http://httpd.apache.org/">
+ <xsl:value-of select="$messages/message[@name='http-server']"/>
+ </a>
+ <xsl:text> > </xsl:text>
+ <a href="http://httpd.apache.org/docs-project/">
+ <xsl:value-of select="$messages/message[@name='documentation']"/>
+ </a>
+ <xsl:text> > </xsl:text>
+ <a href="{$path}/">
+ <xsl:value-of select="$messages/message[@name='version']"/>
+ </a>
+ <xsl:if test="../modulesynopsis or ../directiveindex or ../quickreference">
+ <xsl:text> > </xsl:text>
+ <a href="./">
+ <xsl:value-of select="$messages/message[@name='modules']"/>
+ </a>
+ </xsl:if>
+ <xsl:if test="parentdocument/text()">
+ <xsl:text> > </xsl:text>
+ <a href="{parentdocument/@href}">
+ <xsl:value-of select="parentdocument"/>
+ </a>
+ </xsl:if>
</div> <!-- /path -->
</xsl:template>
<!-- /top -->
@@ -157,6 +194,10 @@
<!-- -->
<xsl:template name="bottom">
<div id="footer">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<p class="apache">
<xsl:value-of select="$messages/message[@name='maintainedby']"/>
<xsl:text> </xsl:text>
@@ -164,6 +205,9 @@
>Apache HTTP Server Documentation Project</a>
</p>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="super-menu"/>
</div> <!-- /footer -->
@@ -178,8 +222,14 @@
<xsl:call-template name="toplink"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div class="section">
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<!-- Section heading -->
<h2>
<xsl:if test="@id">
@@ -218,7 +268,7 @@
<xsl:apply-templates select="title" mode="print"/>
</xsl:if>
</h3>
-
+
<!-- Section body -->
<xsl:apply-templates/>
@@ -243,7 +293,7 @@
<xsl:apply-templates select="title" mode="print"/>
</xsl:if>
</h4>
-
+
<!-- Section body -->
<xsl:apply-templates/>
@@ -292,6 +342,10 @@
<xsl:apply-templates select="title" mode="print"/>
</a>
</li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
<xsl:if test="not(@id)">
@@ -310,6 +364,10 @@
</xsl:if>
-->
</li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
</xsl:template>
@@ -321,27 +379,25 @@
<!-- -->
<xsl:template name="super-menu">
<p class="menu">
-
- <a href="{$path}/mod/">
- <xsl:value-of select="$messages/message[@name='modules']"/>
- </a>
- <xsl:text> | </xsl:text>
- <a href="{$path}/mod/directives.html">
- <xsl:value-of select="$messages/message[@name='directives']"/>
- </a>
- <xsl:text> | </xsl:text>
- <a href="{$path}/faq/">
- <xsl:value-of select="$messages/message[@name='faq']"/>
- </a>
- <xsl:text> | </xsl:text>
- <a href="{$path}/glossary.html">
- <xsl:value-of select="$messages/message[@name='glossary']"/>
- </a>
- <xsl:text> | </xsl:text>
- <a href="{$path}/sitemap.html">
- <xsl:value-of select="$messages/message[@name='sitemap']"/>
- </a>
-
+ <a href="{$path}/mod/">
+ <xsl:value-of select="$messages/message[@name='modules']"/>
+ </a>
+ <xsl:text> | </xsl:text>
+ <a href="{$path}/mod/directives.html">
+ <xsl:value-of select="$messages/message[@name='directives']"/>
+ </a>
+ <xsl:text> | </xsl:text>
+ <a href="{$path}/faq/">
+ <xsl:value-of select="$messages/message[@name='faq']"/>
+ </a>
+ <xsl:text> | </xsl:text>
+ <a href="{$path}/glossary.html">
+ <xsl:value-of select="$messages/message[@name='glossary']"/>
+ </a>
+ <xsl:text> | </xsl:text>
+ <a href="{$path}/sitemap.html">
+ <xsl:value-of select="$messages/message[@name='sitemap']"/>
+ </a>
</p>
</xsl:template>
<!-- /super-menu -->
@@ -370,7 +426,7 @@
<xsl:apply-templates select="preceding-sibling::node()[count(preceding-sibling::*[contains($blocks,concat(' ',local-name(),' '))]) >= $bb]"/>
<xsl:apply-templates select="self::node()[not($is-block-node)]"/>
</xsl:variable>
-
+
<!-- apply bare text only, if it's not only \s or empty -->
<xsl:if test="normalize-space($content) != ''">
<p><code>
@@ -380,7 +436,7 @@
<xsl:apply-templates select="self::node()[$is-block-node]"/>
</xsl:if>
-
+
</xsl:for-each>
<!-- /node() -->
@@ -396,7 +452,7 @@
<h3>
<xsl:apply-templates/>
</h3>
- </xsl:template>
+ </xsl:template>
<xsl:template match="example/title">
<!-- don't print twice -->
@@ -411,7 +467,7 @@
<span class="indent">
<xsl:apply-templates/>
</span>
- </xsl:template>
+ </xsl:template>
<!-- /indent -->
@@ -428,7 +484,7 @@
<xsl:apply-templates/>
</div>
- </xsl:template>
+ </xsl:template>
<!-- /note -->
@@ -439,14 +495,14 @@
<h3>
<xsl:apply-templates/>
</h3>
- </xsl:template>
+ </xsl:template>
<!-- /note/title -->
<!-- -->
<!-- <directive> -->
<!-- Inserts link to another directive, which might be -->
- <!-- in another module. References are converted into -->
+ <!-- in another module. References are converted into -->
<!-- lower case. -->
<!-- -->
<xsl:template match="directive" name="directive">
@@ -503,7 +559,7 @@
<xsl:value-of select="."/>
</a>
</code>
- </xsl:template>
+ </xsl:template>
<!-- /module -->
@@ -598,7 +654,7 @@
</xsl:otherwise>
</xsl:choose>
</table>
-
+
</xsl:template>
<!-- /table -->
@@ -624,7 +680,7 @@
<!-- -->
<xsl:template match="summary">
<xsl:apply-templates/>
- </xsl:template>
+ </xsl:template>
<!-- /summary -->
@@ -634,7 +690,7 @@
<!-- -->
<xsl:template match="description">
<xsl:apply-templates/>
- </xsl:template>
+ </xsl:template>
<!-- /description -->
@@ -644,7 +700,7 @@
<!-- -->
<xsl:template match="hint">
<xsl:apply-templates/>
- </xsl:template>
+ </xsl:template>
<!-- /description -->
@@ -654,7 +710,7 @@
<!-- -->
<xsl:template match="usage">
<xsl:apply-templates/>
- </xsl:template>
+ </xsl:template>
<!-- /usage -->
@@ -664,9 +720,18 @@
<!-- -->
<xsl:template match="syntax">
<xsl:apply-templates/>
- </xsl:template>
+ </xsl:template>
<!-- /syntax -->
+ <!-- -->
+ <!-- <default> -->
+ <!-- Passes through content -->
+ <!-- -->
+ <xsl:template match="default">
+ <xsl:apply-templates/>
+ </xsl:template>
+ <!-- /default -->
+
<!-- -->
<!-- toplink -->
@@ -675,11 +740,26 @@
<div class="top">
<a href="#page-header"><img src="{$path}/images/up.gif" alt="top" /></a>
</div>
- </xsl:template>
+ </xsl:template>
<!-- /toplink -->
<!-- -->
+ <!-- <transnote> -->
+ <!-- -->
+ <xsl:template match="transnote">
+ <span class="transnote">
+ <xsl:text>(</xsl:text><em>
+ <xsl:value-of select="$messages/message[@name='transnote']"/>
+ </em><xsl:text> </xsl:text>
+ <xsl:apply-templates/>
+ <xsl:text>)</xsl:text>
+ </span>
+ </xsl:template>
+ <!-- /note/title -->
+
+
+ <!-- -->
<!-- Process everything else by just passing it through -->
<!-- -->
<xsl:template match="*|@*">
@@ -736,7 +816,7 @@
</xsl:call-template>
</xsl:template>
-
+
<xsl:template name="_squeeze-letters">
<xsl:param name="letters"/>
<xsl:param name="lastletter"/>
@@ -746,7 +826,7 @@
<xsl:if test="$lastletter != $current">
<xsl:value-of select="$current"/>
</xsl:if>
-
+
<xsl:if test="string-length($letters) > 1">
<xsl:call-template name="_squeeze-letters">
<xsl:with-param name="letters" select="substring($letters,2)"/>
@@ -755,4 +835,24 @@
</xsl:if>
</xsl:template>
-</xsl:stylesheet>
+
+ <xsl:template name="module-translatename">
+ <xsl:param name="name"/>
+
+ <xsl:variable name="sname" select="translate($name,$lowercase,$uppercase)"/>
+
+ <xsl:choose>
+ <xsl:when test="starts-with($sname,'MOD_') or starts-with($sname,'MPM_')">
+ <xsl:value-of select="substring($name, 5)"/>
+ </xsl:when>
+ <xsl:when test="starts-with($sname,'MPMT_')">
+ <xsl:value-of select="substring($name, 6)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+ <!-- /module-translatename -->
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/manual/style/xsl/directiveindex.xsl b/docs/manual/style/xsl/directiveindex.xsl
index 4f99a60..33b49ad 100644
--- a/docs/manual/style/xsl/directiveindex.xsl
+++ b/docs/manual/style/xsl/directiveindex.xsl
@@ -12,6 +12,9 @@
<html xml:lang="{$messages/@lang}" lang="{$messages/@lang}">
<xsl:call-template name="head"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<body id="directive-index">
<xsl:call-template name="top"/>
@@ -29,8 +32,14 @@
<xsl:value-of select="title"/>
</h1>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:apply-templates select="summary" />
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<!-- letter line -->
<p class="letters">
<xsl:call-template name="letter-bar">
@@ -45,8 +54,15 @@
</div> <!-- /preamble -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div id="directive-list">
<ul>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="dindex-of-letter">
<xsl:with-param name="letters-todo" select="$start-letters"/>
<xsl:with-param name="directives" select="$directives"/>
@@ -54,7 +70,14 @@
</ul>
</div> <!-- /directive-list -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="bottom"/>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</body>
</html>
</xsl:template>
diff --git a/docs/manual/style/xsl/manualpage.xsl b/docs/manual/style/xsl/manualpage.xsl
index 1ce8941..41849ba 100644
--- a/docs/manual/style/xsl/manualpage.xsl
+++ b/docs/manual/style/xsl/manualpage.xsl
@@ -12,6 +12,9 @@
<html xml:lang="{$messages/@lang}" lang="{$messages/@lang}">
<xsl:call-template name="head"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<body id="manual-page">
<xsl:call-template name="top"/>
@@ -24,6 +27,9 @@
<xsl:apply-templates select="summary"/>
</div> <!-- /preamble -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:if test="count(section) > 1 or seealso">
<div id="quickview">
<xsl:if test="count(section) > 1">
@@ -46,12 +52,23 @@
</xsl:if>
</div> <!-- /quickview -->
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
<xsl:apply-templates select="section"/>
</div> <!-- /page-content -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="bottom"/>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</body>
</html>
</xsl:template>
diff --git a/docs/manual/style/xsl/moduleindex.xsl b/docs/manual/style/xsl/moduleindex.xsl
index 26944b0..8d863d1 100644
--- a/docs/manual/style/xsl/moduleindex.xsl
+++ b/docs/manual/style/xsl/moduleindex.xsl
@@ -11,6 +11,9 @@
<html xml:lang="{$messages/@lang}" lang="{$messages/@lang}">
<xsl:call-template name="head"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<body id="module-index">
<xsl:call-template name="top"/>
@@ -20,11 +23,22 @@
<xsl:value-of select="title"/>
</h1>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:apply-templates select="summary" />
</div>
-
+ <!-- /preamble -->
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div id="quickview">
<ul id="toc">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<li>
<img src="{$path}/images/down.gif" alt="" />
<xsl:text> </xsl:text>
@@ -32,7 +46,7 @@
<xsl:value-of select="$messages/message[@name='corefeatures']"/>
</a>
</li>
-
+
<li>
<img src="{$path}/images/down.gif" alt="" />
<xsl:text> </xsl:text>
@@ -40,19 +54,42 @@
<xsl:value-of select="$messages/message[@name='othermodules']"/>
</a>
</li>
-
- <li>
- <img src="{$path}/images/down.gif" alt="" />
- <xsl:text> </xsl:text>
- <a href="#obsolete">
- <xsl:value-of select="$messages/message[@name='obsoletemodules']"/>
- </a>
- </li>
</ul>
+
+ <xsl:if test="seealso">
+ <h3>
+ <xsl:value-of select="$messages/message[@name='seealso']"/>
+ </h3>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <ul class="seealso">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <xsl:for-each select="seealso">
+ <li>
+ <xsl:apply-templates/>
+ </li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ </xsl:for-each>
+ </ul>
+ </xsl:if>
</div> <!-- /quickview -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="toplink"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div class="section">
<h2>
<a name="core" id="core">
@@ -60,31 +97,78 @@
</a>
</h2>
- <dl>
- <xsl:for-each select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis">
- <xsl:sort select="name"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
- <xsl:if test="status='MPM' or status='Core'">
- <dt>
- <a href="{name}.html">
- <xsl:value-of select="name"/>
- </a>
- </dt>
- <dd>
- <xsl:apply-templates select="description"/>
- </dd>
+ <!-- -->
+ <!-- put core and mpm_common on top -->
+ <!-- -->
+ <dl>
<xsl:text>
</xsl:text> <!-- insert line break -->
- </xsl:if>
+ <dt>
+ <a href="{document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'core.xml')])/modulesynopsis/name}.html">
+ <xsl:value-of select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'core.xml')])/modulesynopsis/name"/>
+ </a>
+ </dt>
+ <dd>
+ <xsl:apply-templates select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'core.xml')])/modulesynopsis/description"/>
+ </dd>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <dt>
+ <a href="{document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'mpm_common.xml')])/modulesynopsis/name}.html">
+ <xsl:value-of select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'mpm_common.xml')])/modulesynopsis/name"/>
+ </a>
+ </dt>
+ <dd class="separate">
+ <xsl:apply-templates select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'mpm_common.xml')])/modulesynopsis/description"/>
+ </dd>
+ <!-- /core, mpm_common -->
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <xsl:variable name="mpmmodules" select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis[status='MPM' and name != 'mpm_common']"/>
+ <xsl:variable name="translist">
+ <xsl:call-template name="module-translist">
+ <xsl:with-param name="modules" select="$mpmmodules"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:for-each select="$mpmmodules">
+ <xsl:sort select="substring-before(substring-after($translist, concat('- ', translate(normalize-space(name),$lowercase,$uppercase), ' ')), ' -')"/>
+
+ <dt>
+ <a href="{name}.html">
+ <xsl:value-of select="name"/>
+ </a>
+ </dt>
+ <dd>
+ <xsl:apply-templates select="description"/>
+ </dd>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:for-each>
+ <!-- /mpm -->
</dl>
</div>
<!-- /core section -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="toplink"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div class="section">
<h2>
<a name="other" id="other">
@@ -92,77 +176,172 @@
</a>
</h2>
- <dl>
- <xsl:for-each select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis">
- <xsl:sort select="name"/>
-
- <xsl:if test="status!='MPM' and status!='Core' and status!='Obsolete'">
- <dt>
- <a href="{name}.html">
- <xsl:value-of select="name"/>
- </a>
- </dt>
- <dd>
- <xsl:apply-templates select="description"/>
- </dd>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <xsl:variable name="modules" select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis[status!='MPM' and status!='Core' and status!='Obsolete']"/>
+
+ <!-- collect the start letters -->
+ <xsl:variable name="start-letters">
+ <xsl:call-template name="module-startletters">
+ <xsl:with-param name="modules" select="$modules"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <!-- letter line -->
+ <p class="letters">
+ <xsl:call-template name="letter-bar">
+ <xsl:with-param name="letters" select="$start-letters"/>
+ <xsl:with-param name="first" select="true()"/>
+ </xsl:call-template>
+ </p>
+ <!-- /letter line -->
<xsl:text>
</xsl:text> <!-- insert line break -->
- </xsl:if>
- </xsl:for-each>
+ <dl>
+ <xsl:call-template name="mindex-of-letter">
+ <xsl:with-param name="letters-todo" select="$start-letters"/>
+ <xsl:with-param name="modules" select="$modules"/>
+ </xsl:call-template>
</dl>
</div>
<!-- /modules section -->
-
- <xsl:call-template name="toplink"/>
-
- <div class="section">
- <h2>
- <a name="obsolete" id="obsolete">
- <xsl:value-of select="$messages/message[@name='obsoletemodules']"/>
- </a>
- </h2>
-
- <dl>
- <xsl:for-each select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis">
- <xsl:sort select="name"/>
-
- <xsl:if test="status='Obsolete'">
- <dt>
- <a href="obs_{name}.html">
- <xsl:value-of select="name"/>
- </a>
- </dt>
- <dd>
- <xsl:if test="hint">
- <em>
- <xsl:text>(</xsl:text>
- <xsl:apply-templates select="hint"/>
- <xsl:text>)</xsl:text>
- </em>
- <br />
- </xsl:if>
-
- <xsl:apply-templates select="description"/>
- </dd>
+
+ </div>
+ <!-- /page-content -->
<xsl:text>
</xsl:text> <!-- insert line break -->
- </xsl:if>
- </xsl:for-each>
- </dl>
- </div>
- <!-- /obsolete section -->
-
- </div> <!-- /page-content -->
-
<xsl:call-template name="bottom"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</body>
</html>
</xsl:template>
<!-- /moduleindex -->
-</xsl:stylesheet>
+
+ <!-- -->
+ <!-- the working horse. builds list items of all -->
+ <!-- modules starting with one letter -->
+ <!-- when done, it calls itself to catch the next letter -->
+ <!-- -->
+ <xsl:template name="mindex-of-letter">
+ <xsl:param name="letters-todo"/>
+ <xsl:param name="modules"/>
+
+ <xsl:variable name="letter" select="substring($letters-todo,1,1)"/>
+ <xsl:variable name="translist">
+ <xsl:call-template name="module-translist">
+ <xsl:with-param name="modules" select="$modules"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:for-each select="$modules[$letter=substring(substring-before(substring-after($translist, concat('- ', translate(normalize-space(name),$lowercase,$uppercase), ' ')), ' -'), 1, 1)]">
+ <xsl:sort select="substring-before(substring-after($translist, concat('- ', translate(normalize-space(name),$lowercase,$uppercase), ' ')), ' -')"/>
+
+ <dt>
+ <a href="{name}.html">
+ <xsl:if test="position()=1">
+ <xsl:attribute name="id"><xsl:value-of select="$letter"/></xsl:attribute>
+ <xsl:attribute name="name"><xsl:value-of select="$letter"/></xsl:attribute>
+ </xsl:if>
+
+ <xsl:value-of select="name"/>
+ </a>
+ </dt>
+ <dd>
+ <xsl:apply-templates select="description"/>
+ </dd>
+
+<xsl:text>
+</xsl:text> <!-- insert a line break -->
+
+ </xsl:for-each> <!-- /directives -->
+
+ <!-- call next letter, if there is -->
+ <xsl:if test="string-length($letters-todo) > 1">
+ <xsl:call-template name="mindex-of-letter">
+ <xsl:with-param name="letters-todo" select="substring($letters-todo,2)"/>
+ <xsl:with-param name="modules" select="$modules"/>
+ </xsl:call-template>
+ </xsl:if>
+
+ </xsl:template>
+ <!-- /mindex-of-letter -->
+
+
+ <!-- -->
+ <!-- collect start letters of modules -->
+ <!-- -->
+ <xsl:template name="module-startletters">
+ <xsl:param name="modules"/>
+
+ <xsl:variable name="translist">
+ <xsl:call-template name="module-translist">
+ <xsl:with-param name="modules" select="$modules"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:call-template name="_squeeze-letters">
+ <xsl:with-param name="lastletter" select="''"/>
+
+ <xsl:with-param name="letters">
+ <xsl:for-each select="$modules">
+ <xsl:sort select="substring-before(substring-after($translist, concat('- ', translate(normalize-space(name),$lowercase,$uppercase), ' ')), ' -')"/>
+ <xsl:value-of select="substring(substring-before(substring-after($translist, concat('- ', translate(normalize-space(name),$lowercase,$uppercase), ' ')), ' -'), 1, 1)"/>
+ </xsl:for-each>
+ </xsl:with-param>
+ </xsl:call-template>
+
+ </xsl:template>
+ <!-- /module-startletters -->
+
+
+ <!-- -->
+ <!-- define module name translations for sorting -->
+ <!-- -->
+ <!-- it's a kind of a hack... -->
+ <!-- we build a string that contains the following data: -->
+ <!-- "- modulename sortname - modulename sortname - ..." -->
+ <!-- (with all data in uppercase) -->
+ <!-- -->
+ <!-- So, the translation from modulename to sortname -->
+ <!-- can be done with the expression below: -->
+ <!--
+ substring-before(
+ substring-after($translist,
+ concat('- ',
+ translate(modulename,
+ $lowercase,
+ $uppercase),
+ ' ')
+ ),
+ ' -')
+ -->
+ <!-- -->
+ <xsl:template name="module-translist">
+ <xsl:param name="modules"/>
+
+ <xsl:text>-</xsl:text>
+ <xsl:for-each select="$modules">
+ <xsl:variable name="sname" select="translate(normalize-space(name),$lowercase,$uppercase)"/>
+
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$sname"/>
+ <xsl:text> </xsl:text>
+ <xsl:call-template name="module-translatename">
+ <xsl:with-param name="name" select="$sname"/>
+ </xsl:call-template>
+ <xsl:text> -</xsl:text>
+ </xsl:for-each>
+
+ </xsl:template>
+ <!-- /module-translist -->
+
+ </xsl:stylesheet>
diff --git a/docs/manual/style/xsl/quickreference.xsl b/docs/manual/style/xsl/quickreference.xsl
index 82bc011..4e79a43 100644
--- a/docs/manual/style/xsl/quickreference.xsl
+++ b/docs/manual/style/xsl/quickreference.xsl
@@ -12,14 +12,27 @@
<html xml:lang="{$messages/@lang}" lang="{$messages/@lang}">
<xsl:call-template name="head"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<body id="directive-index">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="top"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div id="preamble">
<h1>
<xsl:value-of select="title"/>
</h1>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:apply-templates select="summary" />
</div> <!-- /preamble -->
@@ -36,8 +49,12 @@
<xsl:with-param name="directives" select="$directives"/>
</xsl:call-template>
</xsl:variable>
-
+
<table id="legend">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<td class="letters"><span>
<xsl:call-template name="letter-bar">
@@ -53,16 +70,27 @@
<xsl:apply-templates select="legend/table[position()=1]"/>
</td>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<td>
<xsl:apply-templates select="legend/table[position()=2]"/>
</td>
</tr>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</table>
<xsl:text>
</xsl:text> <!-- insert a line break -->
<table class="qref">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="reference-of-letter">
<xsl:with-param name="letters-todo" select="$start-letters"/>
<xsl:with-param name="offset" select="number(0)"/>
@@ -72,10 +100,17 @@
</div> <!-- /directive-ref -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="bottom"/>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</body>
</html>
- </xsl:template>
+ </xsl:template>
<!-- -->
@@ -110,8 +145,20 @@
</td>
<td>
- <xsl:value-of select="substring(substring-after(concat(default,' '),name),1,20)"/>
- <xsl:if test="string-length(substring-after(concat(default,' '),name)) > 20">
+ <xsl:variable name="default">
+ <xsl:choose>
+ <xsl:when test="count(default[count(br) > 0]) > 0">
+ <xsl:value-of select="default/child::node()[count(preceding-sibling::*) = 0]"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="default"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:value-of select="substring(substring-after(concat($default,' '),name),1,20)"/>
+ <xsl:if test="string-length(substring-after(concat($default,' '),name)) > 20
+ or count(default[count(br) > 0]) > 0">
<xsl:text> +</xsl:text>
</xsl:if>
</td>
@@ -167,4 +214,4 @@
</xsl:template>
<!-- /reference-of-letter -->
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/manual/style/xsl/sitemap.xsl b/docs/manual/style/xsl/sitemap.xsl
index 12a7cfe..1436b82 100644
--- a/docs/manual/style/xsl/sitemap.xsl
+++ b/docs/manual/style/xsl/sitemap.xsl
@@ -16,24 +16,44 @@
<html xml:lang="{$messages/@lang}" lang="{$messages/@lang}">
<xsl:call-template name="head"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<body id="manual-page">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="top"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div id="page-content">
<div id="preamble">
<h1>
<xsl:value-of select="title"/>
</h1>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:apply-templates select="summary"/>
</div> <!-- /preamble -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:if test="count(category) > 1 or seealso">
<div id="quickview">
<xsl:if test="count(category) > 1">
<!-- category index -->
<ul id="toc">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:for-each select="category">
<xsl:if test="@id">
<li>
@@ -43,6 +63,10 @@
<xsl:apply-templates select="title" mode="print"/>
</a>
</li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
<xsl:if test="not(@id)">
@@ -51,31 +75,65 @@
<xsl:text> </xsl:text>
<xsl:apply-templates select="title" mode="print"/>
</li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
</xsl:for-each>
</ul>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
<xsl:if test="seealso">
<h3>
<xsl:value-of select="$messages/message[@name='seealso']"/>
</h3>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<ul class="seealso">
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:for-each select="seealso">
<li>
<xsl:apply-templates/>
</li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:for-each>
</ul>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
</div> <!-- /quickview -->
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
<xsl:apply-templates select="category"/>
</div> <!-- /page-content -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="bottom"/>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</body>
</html>
</xsl:template>
@@ -114,6 +172,9 @@
<xsl:call-template name="toplink"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div class="section">
<!-- Section heading -->
@@ -129,6 +190,9 @@
</xsl:if>
</h2>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<!-- category body -->
<ul>
<xsl:apply-templates select="page"/>
@@ -136,6 +200,9 @@
<xsl:apply-templates select="modulefilelist"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</div> <!-- /.section -->
</xsl:template>
<!-- /category -->
@@ -146,37 +213,57 @@
<!-- insert module list into sitemap -->
<!-- -->
<xsl:template match="category/modulefilelist">
- <ul>
+
+ <!-- create our own translation list first -->
+ <xsl:variable name="translist">
+ <xsl:text>-</xsl:text>
+
<xsl:for-each select="modulefile">
- <xsl:sort select="document(concat($basedir,'mod/',.))/modulesynopsis/name"/>
+ <xsl:variable name="current" select="document(concat($basedir,'mod/',.))/modulesynopsis" />
+
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$current/name"/>
+ <xsl:text> </xsl:text>
+ <xsl:call-template name="module-translatename">
+ <xsl:with-param name="name" select="$current/name"/>
+ </xsl:call-template>
+ <xsl:text> -</xsl:text>
+ </xsl:for-each>
+ </xsl:variable>
+
+ <ul>
+ <!-- put core and mpm_common on top -->
+ <li>
+ <a href="mod/core.html">
+ <xsl:value-of select="$messages/message[@name='apachecore']"/>
+ </a>
+ </li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <li>
+ <a href="mod/mpm_common.html">
+ <xsl:value-of select="$messages/message[@name='apachempmcommon']"/>
+ </a>
+ </li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+ <xsl:for-each select="modulefile">
+ <xsl:sort select="substring-before(substring-after($translist, concat('- ', document(concat($basedir,'mod/',.))/modulesynopsis/name, ' ')), ' -')"/>
+
<xsl:variable name="current" select="document(concat($basedir,'mod/',.))/modulesynopsis" />
- <xsl:if test="$current/status='MPM' or $current/status='Core'">
- <xsl:variable name="name"><xsl:choose>
- <xsl:when test="starts-with($current/name,'mpm_')">
- <xsl:value-of select="substring($current/name,5)"/>
- </xsl:when>
-
- <xsl:otherwise>
- <xsl:value-of select="$current/name"/>
- </xsl:otherwise>
- </xsl:choose></xsl:variable>
+ <xsl:if test="$current/status='MPM' and $current/name!='mpm_common'">
+ <xsl:variable name="name" select="substring-before(substring-after($translist, concat('- ', $current/name, ' ')), ' -')"/>
<li>
- <a href="mod/{$current/name}.html"><xsl:choose>
- <xsl:when test="$name='core'">
- <xsl:value-of select="$messages/message[@name='apachecore']"/>
- </xsl:when>
-
- <xsl:when test="$name='common'">
- <xsl:value-of select="$messages/message[@name='apachempmcommon']"/>
- </xsl:when>
-
- <xsl:otherwise>
- <xsl:value-of select="$messages/message[@name='apachempm']"/>
- <xsl:text> </xsl:text>
- <xsl:value-of select="$name"/>
- </xsl:otherwise></xsl:choose>
+ <a href="mod/{$current/name}.html">
+ <xsl:value-of select="$messages/message[@name='apachempm']"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$name"/>
</a>
</li>
@@ -185,10 +272,13 @@
</xsl:if>
</xsl:for-each>
- <!-- /core,mpm -->
+ </ul>
+ <!-- /core, mpm -->
+ <ul>
<xsl:for-each select="modulefile">
- <xsl:sort select="document(concat($basedir,'mod/',.))/modulesynopsis/name"/>
+ <xsl:sort select="substring-before(substring-after($translist, concat('- ', document(concat($basedir,'mod/',.))/modulesynopsis/name, ' ')), ' -')"/>
+
<xsl:variable name="current" select="document(concat($basedir,'mod/',.))/modulesynopsis" />
<xsl:if test="$current/status!='MPM' and $current/status!='Core' and $current/status!='Obsolete'">
@@ -205,31 +295,8 @@
</xsl:if>
</xsl:for-each>
- <!-- /other modules -->
</ul>
-
- <!-- obsolete modules -->
- <ul>
- <xsl:for-each select="modulefile">
- <xsl:sort select="document(concat($basedir,'mod/',.))/modulesynopsis/name"/>
- <xsl:variable name="current" select="document(concat($basedir,'mod/',.))/modulesynopsis" />
-
- <xsl:if test="$current/status='Obsolete'">
- <li>
- <a href="mod/obs_{$current/name}.html">
- <xsl:value-of select="$messages/message[@name='obsoleteapachemodule']"/>
- <xsl:text> </xsl:text>
- <xsl:value-of select="$current/name"/>
- </a>
- </li>
-
-<xsl:text>
-</xsl:text> <!-- insert line break -->
-
- </xsl:if>
- </xsl:for-each>
- <!-- /other modules -->
- </ul>
+ <!-- /other modules -->
</xsl:template>
<!-- /category/modulefilelist -->
diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl
index d344a80..990433a 100644
--- a/docs/manual/style/xsl/synopsis.xsl
+++ b/docs/manual/style/xsl/synopsis.xsl
@@ -12,28 +12,66 @@
<html xml:lang="{$messages/@lang}" lang="{$messages/@lang}">
<xsl:call-template name="head"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<body>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="top"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div id="page-content">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div id="preamble">
<h1>
- <xsl:if test="status='Obsolete'">
- <xsl:value-of select="$messages/message[@name='obsoleteapachemodule']"/>
- </xsl:if>
- <xsl:if test="status!='Obsolete'">
- <xsl:value-of select="$messages/message[@name='apachemodule']"/>
- </xsl:if>
- <xsl:text> </xsl:text>
- <xsl:value-of select="name"/>
+ <xsl:choose>
+ <xsl:when test="status='Core'">
+ <xsl:value-of select="$messages/message[@name='apachecore']"/>
+ </xsl:when>
+
+ <xsl:when test="name='mpm_common'">
+ <xsl:value-of select="$messages/message[@name='apachempmcommon']"/>
+ </xsl:when>
+
+ <xsl:when test="status='MPM'">
+ <xsl:value-of select="$messages/message[@name='apachempm']"/>
+ <xsl:text> </xsl:text>
+ <xsl:call-template name="module-translatename">
+ <xsl:with-param name="name" select="name" />
+ </xsl:call-template>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:if test="status='Obsolete'">
+ <xsl:value-of select="$messages/message[@name='obsoleteapachemodule']"/>
+ </xsl:if>
+ <xsl:if test="status!='Obsolete'">
+ <xsl:value-of select="$messages/message[@name='apachemodule']"/>
+ </xsl:if>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="name"/>
+ </xsl:otherwise>
+ </xsl:choose>
</h1>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<!-- Description and module-headers -->
<table class="module">
<tr>
<th>
<a href="module-dict.html#Description">
- <xsl:value-of select="$messages/message[@name='description']"/>:
+ <xsl:value-of select="$messages/message[@name='description']"/>
+ <xsl:text>:</xsl:text>
</a>
</th>
<td>
@@ -41,10 +79,14 @@
</td>
</tr>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="module-dict.html#Status">
- <xsl:value-of select="$messages/message[@name='status']"/>:
+ <xsl:value-of select="$messages/message[@name='status']"/>
+ <xsl:text>:</xsl:text>
</a>
</th>
<td>
@@ -62,11 +104,16 @@
</tr>
<xsl:if test="identifier">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="module-dict.html#ModuleIdentifier">
- <xsl:value-of select="$messages/message[@name='moduleidentifier']"/>:
- </a>
+ <xsl:value-of select="$messages/message[@name='moduleidentifier']"/>
+ <xsl:text>:</xsl:text>
+ </a>
</th>
<td>
<xsl:value-of select="identifier"/>
@@ -75,11 +122,16 @@
</xsl:if>
<xsl:if test="sourcefile">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="module-dict.html#SourceFile">
- <xsl:value-of select="$messages/message[@name='sourcefile']"/>:
- </a>
+ <xsl:value-of select="$messages/message[@name='sourcefile']"/>
+ <xsl:text>:</xsl:text>
+ </a>
</th>
<td>
<xsl:value-of select="sourcefile"/>
@@ -88,10 +140,15 @@
</xsl:if>
<xsl:if test="compatibility">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="module-dict.html#Compatibility">
- <xsl:value-of select="$messages/message[@name='compatibility']"/>:
+ <xsl:value-of select="$messages/message[@name='compatibility']"/>
+ <xsl:text>:</xsl:text>
</a>
</th>
<td>
@@ -101,16 +158,25 @@
</xsl:if>
</table>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<!-- Summary of module features/usage (1 to 3 paragraphs, optional) -->
<xsl:if test="summary">
<h3>
<xsl:value-of select="$messages/message[@name='summary']"/>
</h3>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:apply-templates select="summary"/>
</xsl:if>
</div> <!-- /preamble -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div id="quickview">
<!-- Index of directives, automatically generated from
@@ -119,8 +185,15 @@
<xsl:value-of select="$messages/message[@name='directives']"/>
</h3>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:if test="directivesynopsis">
<ul id="toc">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:for-each select="directivesynopsis">
<xsl:sort select="name"/>
<xsl:variable name="lowername" select="translate(name, $uppercase, $lowercase)"/>
@@ -160,19 +233,35 @@
</xsl:if>
</xsl:for-each>
</ul> <!-- /toc -->
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
<xsl:if test="not(directivesynopsis)">
<p>
<xsl:value-of select="$messages/message[@name='nodirectives']"/>
</p>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
<xsl:if test="section">
<h3>
<xsl:value-of select="$messages/message[@name='topics']"/>
</h3>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<ul id="topics">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:apply-templates select="section" mode="index"/>
</ul>
</xsl:if>
@@ -181,21 +270,38 @@
<h3>
<xsl:value-of select="$messages/message[@name='seealso']"/>
</h3>
-
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<ul class="seealso">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:for-each select="seealso">
<li>
<xsl:apply-templates/>
</li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:for-each>
</ul>
</xsl:if>
</div> <!-- /quickview -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<!-- Sections of documentation about the module as a whole -->
<xsl:apply-templates select="section"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<!-- Directive documentation -->
<xsl:apply-templates select="directivesynopsis">
<xsl:sort select="name"/>
@@ -203,7 +309,14 @@
</div> <!-- /page-content -->
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:call-template name="bottom"/>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</body>
</html>
</xsl:template>
@@ -219,6 +332,14 @@
<!-- -->
+ <!-- directivesynopsis/compatibility -->
+ <!-- -->
+ <xsl:template match="directivesynopsis/compatibility">
+ <xsl:apply-templates />
+ </xsl:template>
+
+
+ <!-- -->
<!-- Directivesynopsis -->
<!-- -->
<xsl:template match="directivesynopsis">
@@ -226,6 +347,9 @@
<xsl:call-template name="toplink"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<div class="directive-section">
<xsl:variable name="lowername" select="translate(name, $uppercase, $lowercase)"/>
@@ -237,18 +361,33 @@
<xsl:value-of select="name"/>
<xsl:if test="@type='section'">></xsl:if>
</a>
- <xsl:text> </xsl:text>
+ <xsl:choose>
+ <xsl:when test="$messages/message[@name='directive']/@replace-space-with">
+ <xsl:value-of select="$messages/message[@name='directive']/@replace-space-with"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text> </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
<a id="{$lowername}" name="{$lowername}">
<xsl:value-of select="$messages/message[@name='directive']"/>
</a>
</h2>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<!-- Directive header -->
<table class="directive">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="directive-dict.html#Description">
- <xsl:value-of select="$messages/message[@name='description']"/>:
+ <xsl:value-of select="$messages/message[@name='description']"/>
+ <xsl:text>:</xsl:text>
</a>
</th>
<td>
@@ -256,11 +395,15 @@
</td>
</tr>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="directive-dict.html#Syntax">
- <xsl:value-of select="$messages/message[@name='syntax']"/>:
- </a>
+ <xsl:value-of select="$messages/message[@name='syntax']"/>
+ <xsl:text>:</xsl:text>
+ </a>
</th>
<td>
<code>
@@ -270,25 +413,34 @@
</tr>
<xsl:if test="default">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="directive-dict.html#Default">
- <xsl:value-of select="$messages/message[@name='default']"/>:
- </a>
+ <xsl:value-of select="$messages/message[@name='default']"/>
+ <xsl:text>:</xsl:text>
+ </a>
</th>
<td>
<code>
- <xsl:value-of select="default"/>
+ <xsl:apply-templates select="default"/>
</code>
</td>
</tr>
</xsl:if>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="directive-dict.html#Context">
- <xsl:value-of select="$messages/message[@name='context']"/>:
- </a>
+ <xsl:value-of select="$messages/message[@name='context']"/>
+ <xsl:text>:</xsl:text>
+ </a>
</th>
<td>
<xsl:apply-templates select="contextlist"/>
@@ -296,11 +448,16 @@
</tr>
<xsl:if test="override">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="directive-dict.html#Override">
- <xsl:value-of select="$messages/message[@name='override']"/>:
- </a>
+ <xsl:value-of select="$messages/message[@name='override']"/>
+ <xsl:text>:</xsl:text>
+ </a>
</th>
<td>
<xsl:value-of select="override"/>
@@ -308,22 +465,30 @@
</tr>
</xsl:if>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="directive-dict.html#Status">
- <xsl:value-of select="$messages/message[@name='status']"/>:
- </a>
+ <xsl:value-of select="$messages/message[@name='status']"/>
+ <xsl:text>:</xsl:text>
+ </a>
</th>
<td>
<xsl:value-of select="../status"/>
</td>
</tr>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="directive-dict.html#Module">
- <xsl:value-of select="$messages/message[@name='module']"/>:
- </a>
+ <xsl:value-of select="$messages/message[@name='module']"/>
+ <xsl:text>:</xsl:text>
+ </a>
</th>
<td>
<xsl:if test="modulelist">
@@ -337,36 +502,67 @@
</tr>
<xsl:if test="compatibility">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<tr>
<th>
<a href="directive-dict.html#Compatibility">
- <xsl:value-of select="$messages/message[@name='compatibility']"/>:
- </a>
+ <xsl:value-of select="$messages/message[@name='compatibility']"/>
+ <xsl:text>:</xsl:text>
+ </a>
</th>
<td>
- <xsl:value-of select="compatibility"/>
+ <xsl:apply-templates select="compatibility"/>
</td>
</tr>
</xsl:if>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</table>
<xsl:apply-templates select="usage"/>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:if test="seealso">
<h3>
<xsl:value-of select="$messages/message[@name='seealso']"/>
</h3>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<ul>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
<xsl:for-each select="seealso">
<li>
<xsl:apply-templates/>
</li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:for-each>
</ul>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
</div> <!-- /directive-section -->
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
</xsl:if>
</xsl:template>
<!-- /directivesynopsis -->
@@ -378,7 +574,7 @@
<!-- -->
<xsl:template match="contextlist">
<xsl:apply-templates select="context"/>
- </xsl:template>
+ </xsl:template>
<!-- /contextlist -->
@@ -411,7 +607,7 @@
<xsl:if test="position() != last()">
<xsl:text>, </xsl:text>
</xsl:if>
- </xsl:template>
+ </xsl:template>
<!-- /context -->
@@ -426,7 +622,7 @@
<xsl:text>, </xsl:text>
</xsl:if>
</xsl:for-each>
- </xsl:template>
+ </xsl:template>
<!-- /modulelist -->
</xsl:stylesheet>
diff --git a/docs/manual/suexec.html.en b/docs/manual/suexec.html.en
index b23cadc..6b9ed18 100644
--- a/docs/manual/suexec.html.en
+++ b/docs/manual/suexec.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>suEXEC Support - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>suEXEC Support</h1>
+ -->
+<title>suEXEC Support - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>suEXEC Support</h1>
<p>The <strong>suEXEC</strong> feature provides
Apache users the ability
to run <strong>CGI</strong> and <strong>SSI</strong> programs
@@ -20,10 +32,21 @@
you aren't familiar with managing setuid root programs and the
security issues they present, we highly recommend that you not
consider using suEXEC.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#before">Before we begin</a></li><li><img alt="" src="./images/down.gif" /> <a href="#model">suEXEC Security Model</a></li><li><img alt="" src="./images/down.gif" /> <a href="#install">Configuring & Installing
- suEXEC</a></li><li><img alt="" src="./images/down.gif" /> <a href="#enable">Enabling & Disabling
- suEXEC</a></li><li><img alt="" src="./images/down.gif" /> <a href="#usage">Using suEXEC</a></li><li><img alt="" src="./images/down.gif" /> <a href="#debug">Debugging suEXEC</a></li><li><img alt="" src="./images/down.gif" /> <a href="#jabberwock">Beware the Jabberwock:
- Warnings & Examples</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="before" id="before">Before we begin</a></h2>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#before">Before we begin</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#model">suEXEC Security Model</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#install">Configuring & Installing
+ suEXEC</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#enable">Enabling & Disabling
+ suEXEC</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#usage">Using suEXEC</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#debug">Debugging suEXEC</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#jabberwock">Beware the Jabberwock:
+ Warnings & Examples</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="before" id="before">Before we begin</a></h2>
<p>Before jumping head-first into this document,
you should be aware of the assumptions made on the part of the
@@ -69,7 +92,9 @@
enough to use it.</p>
<p>Still with us? Yes? Good. Let's move on!</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="model" id="model">suEXEC Security Model</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="model" id="model">suEXEC Security Model</a></h2>
<p>Before we begin configuring and installing
suEXEC, we will first discuss the security model you are about
@@ -313,7 +338,9 @@
configuration, as well as what security risks can be avoided
with a proper suEXEC setup, see the <a href="#jabberwock">"Beware the Jabberwock"</a> section of this
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="install" id="install">Configuring & Installing
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="install" id="install">Configuring & Installing
suEXEC</a></h2>
<p>Here's where we begin the fun.</p>
@@ -434,7 +461,9 @@
owner <code><em>root</em></code> and must have the setuserid
execution bit set for file modes.</p>
-</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 & Disabling
+</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 & Disabling
suEXEC</a></h2>
<p>Upon startup of Apache, it looks for the file
@@ -455,7 +484,9 @@
will not be enough. </p>
<p>If you want to disable suEXEC you should kill and restart
Apache after you have removed the "suexec" file. </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">Using suEXEC</a></h2>
+</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">Using suEXEC</a></h2>
<p><strong>Virtual Hosts:</strong><br /> One way to use the suEXEC
wrapper is through the <code class="directive"><a href="./mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code> directive in
@@ -475,7 +506,9 @@
execution to be enabled for the user and that the script must
meet the scrutiny of the <a href="#model">security checks</a>
above.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="debug" id="debug">Debugging suEXEC</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="debug" id="debug">Debugging suEXEC</a></h2>
<p>The suEXEC wrapper will write log information
to the file defined with the --with-suexec-logfile option as
@@ -483,7 +516,9 @@
the wrapper properly, have a look at this log and the error_log
for the server to see where you may have gone astray.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="jabberwock" id="jabberwock">Beware the Jabberwock:
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="jabberwock" id="jabberwock">Beware the Jabberwock:
Warnings & Examples</a></h2>
<p><strong>NOTE!</strong> This section may not be
@@ -536,4 +571,8 @@
</li>
</ul>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.html.de b/docs/manual/upgrading.html.de
index 17fbafa..1730116 100644
--- a/docs/manual/upgrading.html.de
+++ b/docs/manual/upgrading.html.de
@@ -4,14 +4,35 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Upgrade von 1.3 auf 2.0 - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Upgrade von 1.3 auf 2.0</h1>
+ -->
+<title>Upgrade von 1.3 auf 2.0 - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP-Server</a> > <a href="http://httpd.apache.org/docs-project/">Dokumentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Upgrade von 1.3 auf 2.0</h1>
<p>Dieses Dokument dient der Unterstützung beim Upgrade. Es
enthält die entscheidenden Informationen für bisherige
Apache-Nutzer. Diese sind als kurze Anmerkungen
gedacht. Weitere Informationen finden Sie entweder unter
<a href="new_features_2_0.html">Neue Funktionen</a> oder in
den <code>src/CHANGES</code>-Dateien.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">Änderungen der Konfiguration bei der Kompilierung</a></li><li><img alt="" src="./images/down.gif" /> <a href="#run-time">Änderungen der Laufzeit-Konfiguration</a></li><li><img alt="" src="./images/down.gif" /> <a href="#misc">Sonstige Änderungen</a></li><li><img alt="" src="./images/down.gif" /> <a href="#third-party">Module von Drittanbietern</a></li></ul><h3>Siehe auch</h3><ul class="seealso"><li><a href="new_features_2_0.html">Neue Funktionen in Version 2.0</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="compile-time" id="compile-time">Änderungen der Konfiguration bei der Kompilierung</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">Änderungen der Konfiguration bei der Kompilierung</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#run-time">Änderungen der Laufzeit-Konfiguration</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#misc">Sonstige Änderungen</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#third-party">Module von Drittanbietern</a></li>
+</ul><h3>Siehe auch</h3><ul class="seealso"><li><a href="new_features_2_0.html">Übersicht der neuen Funktionen
+in Apache 2.0</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="compile-time" id="compile-time">Änderungen der Konfiguration bei der Kompilierung</a></h2>
<ul>
@@ -26,7 +47,9 @@
Request-Verarbeitung im Apache 2.0 in die <a href="mpm.html">
Multi-Processing-Module</a> (MPMs) verschoben.</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="run-time" id="run-time">Änderungen der Laufzeit-Konfiguration</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="run-time" id="run-time">Änderungen der Laufzeit-Konfiguration</a></h2>
<ul>
@@ -133,16 +156,20 @@
<li>Die Direktive <code>FancyIndexing</code> wurde entfernt.
Die gleiche Funktionalität ist nun mit der Option
<code>FancyIndexing</code> der Direktive <code class="directive"><a href="./mod/mod_autoindex.html#indexoptions">IndexOptions</a></code> verfügbar.</li>
+
+ <li>Die von <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> bereitgestellte
+ Content-Negotiation-Technik MultiViews führt nun eine strengere
+ Dateierkennung durch. Es wird ausschließlich unter den
+ <em>aushandelbaren</em> Dateien gewählt. Das bisherige Verhalten
+ kann jedoch mit der Direktive <code class="directive"><a href="./mod/mod_mime.html#multiviewsmatch">MultiviewsMatch</a></code> wiederhergestellt
+ werden.</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="misc" id="misc">Sonstige Änderungen</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="misc" id="misc">Sonstige Änderungen</a></h2>
<ul>
- <li>Die <code>httpd</code>-Kommandozeilenoption
- <code>-S</code>, die dazu verwendet wurde, die
- Virtual-Host-Konfiguration auszugeben, wurde durch
- <code>-t -D DUMP_VHOSTS</code> ersetzt.</li>
-
<li>Das Modul <code class="module"><a href="./mod/mod_auth_digest.html">mod_auth_digest</a></code>, das im Apache 1.3
experimentellen Status hatte, ist nun ein Standardmodul.</li>
@@ -155,11 +182,17 @@
Distribution angeordnet. Installationen des kompilierten Servers
sollten in ein separates Verzeichnis erfolgen.</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="third-party" id="third-party">Module von Drittanbietern</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="third-party" id="third-party">Module von Drittanbietern</a></h2>
<p>An der API des Apache 2.0 wurden umfassende Änderungen
vorgenommen. Bestehende Module, die für die Apache 1.3 API
entwickelt wurden, werden <strong>nicht</strong> ohne Modifikationen mit
der Version 2.0 des Apache zusammenarbeiten. Details sind in der <a href="developer/">Dokumentation für Entwickler</a> beschrieben.</p>
- </div></div><div id="footer"><p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Gepflegt durch das <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index da6938d..892ccfb 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -4,13 +4,34 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Upgrading to 2.0 from 1.3 - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Upgrading to 2.0 from 1.3</h1>
+ -->
+<title>Upgrading to 2.0 from 1.3 - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Upgrading to 2.0 from 1.3</h1>
<p>In order to assist folks upgrading, we maintain a document
describing information critical to existing Apache users. These
are intended to be brief notes, and you should be able to find
more information in either the <a href="new_features_2_0.html">New Features</a> document, or in
the <code>src/CHANGES</code> file.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">Compile-Time Configuration Changes</a></li><li><img alt="" src="./images/down.gif" /> <a href="#run-time">Run-Time Configuration Changes</a></li><li><img alt="" src="./images/down.gif" /> <a href="#misc">Misc Changes</a></li><li><img alt="" src="./images/down.gif" /> <a href="#third-party">Third Party Modules</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="new_features_2_0.html">New Features in 2.0</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="compile-time" id="compile-time">Compile-Time Configuration Changes</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">Compile-Time Configuration Changes</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#run-time">Run-Time Configuration Changes</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#misc">Misc Changes</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#third-party">Third Party Modules</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="new_features_2_0.html">Overview of new features in
+Apache 2.0</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="compile-time" id="compile-time">Compile-Time Configuration Changes</a></h2>
<ul>
@@ -24,7 +45,9 @@
request processing into <a href="mpm.html">Multi-Processing
Modules</a> (MPMs).</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="run-time" id="run-time">Run-Time Configuration Changes</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="run-time" id="run-time">Run-Time Configuration Changes</a></h2>
<ul>
@@ -127,16 +150,19 @@
The same functionality is available through the
<code>FancyIndexing</code> option to the <code class="directive"><a href="./mod/mod_autoindex.html#indexoptions">IndexOptions</a></code>
directive.</li>
+
+ <li>The MultiViews content-negotiation technique provided by
+ <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> has become more strict in its
+ default file matching. It will select only from <em>negotiable</em>
+ files. The old behavior can be restored using the <code class="directive"><a href="./mod/mod_mime.html#multiviewsmatch">MultiviewsMatch</a></code> directive.</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="misc" id="misc">Misc Changes</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="misc" id="misc">Misc Changes</a></h2>
<ul>
- <li>The <code>httpd</code> command line option
- <code>-S</code> which was used for printing the virtual host
- configuration has been replaced by <code>-t -D
- DUMP_VHOSTS</code>.</li>
-
<li>The module <code class="module"><a href="./mod/mod_auth_digest.html">mod_auth_digest</a></code>, which was
experimental in Apache 1.3, is now a standard module.</li>
@@ -150,7 +176,9 @@
compiled server should be directed to a separate
directory.</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="third-party" id="third-party">Third Party Modules</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="third-party" id="third-party">Third Party Modules</a></h2>
<p>Extensive changes were made to the server API in Apache 2.0.
@@ -158,4 +186,8 @@
<strong>not</strong> work in Apache 2.0 without modification.
Details are provided in the <a href="developer/">developer
documentation</a>.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.html.ja.jis b/docs/manual/upgrading.html.ja.jis
index e589b46..af86a15 100644
--- a/docs/manual/upgrading.html.ja.jis
+++ b/docs/manual/upgrading.html.ja.jis
@@ -4,18 +4,38 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B - Apache HTTP $B%5!<%P(B</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p><p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B</h1>
- <p>$B%"%C%W(B$B%0%l!<%I$r4JC1$K$9$k$?$a$K!"4{B8$N(B Apache $B%f!<%6$K(B
+ -->
+<title>1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B - Apache HTTP $B%5!<%P(B</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p>
+<p class="apache">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP $B%5!<%P(B</a> > <a href="http://httpd.apache.org/docs-project/">$B%I%-%e%a%s%F!<%7%g%s(B</a> > <a href="./">$B%P!<%8%g%s(B 2.0</a></div><div id="page-content"><div id="preamble"><h1>1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B</h1>
+ <p>$B%"%C%W%0%l!<%I$r4JC1$K$9$k$?$a$K!"4{B8$N(B Apache $B%f!<%6$K(B
$BHs>o$K=EMW$J>pJs$r$3$NJ8=q$K$^$H$a$F$$$^$9!#$3$l$OC;$$(B
- $BCm0U(B$B=q$-$H$7$F=q$+$l$F$$$^$9!#$h$j>\$7$$>pJs$O(B
+ $BCm0U=q$-$H$7$F=q$+$l$F$$$^$9!#$h$j>\$7$$>pJs$O(B
<a href="new_features_2_0.html">$B?75!G=(B</a>$B$NJ8=q$d(B
<code>src/CHANGES</code> $B%U%!%$%k$G8+$D$1$i$l$k$H;W$$$^$9!#(B</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">$B%3%s%Q%$%k;~$N@_Dj$NJQ99(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#run-time">$B<B9T;~$N@_Dj$NJQ99(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#misc">$B$=$NB>$NJQ99(B</a></li><li><img alt="" src="./images/down.gif" /> <a href="#third-party">$B%5!<%I%Q!<%F%#%b%8%e!<%k(B</a></li></ul><h3>$B;2(B$B>H(B</h3><ul class="seealso"><li><a href="new_features_2_0.html">Apache 2.0 $B$N?75!G=(B</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="compile-time" id="compile-time">$B%3%s%Q%$%k;~$N@_Dj$NJQ99(B</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">$B%3%s%Q%$%k;~$N@_Dj$NJQ99(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#run-time">$B<B9T;~$N@_Dj$NJQ99(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#misc">$B$=$NB>$NJQ99(B</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#third-party">$B%5!<%I%Q!<%F%#%b%8%e!<%k(B</a></li>
+</ul><h3>$B;2>H(B</h3><ul class="seealso"><li><a href="new_features_2_0.html">Apache 2.0 $B$N?75!G=$N35MW(B</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="compile-time" id="compile-time">$B%3%s%Q%$%k;~$N@_Dj$NJQ99(B</a></h2>
<ul>
<li>Apache $B$O(B <a href="install.html">$B%S%k%I=hM}$N@_Dj(B</a>
- $B$K(B <code>autoconf</code> $B$H(B <code>libtool</code> $B$r(B$B;H$&$h$&$K$J$j$^$7$?!#(B
+ $B$K(B <code>autoconf</code> $B$H(B <code>libtool</code> $B$r;H$&$h$&$K$J$j$^$7$?!#(B
$B$3$N%7%9%F%`$O(B Apache 1.3 $B$N(B APACI $B%7%9%F%`$H;w$F$$$^$9$,!"(B
$B$^$C$?$/F1$8$H$$$&$o$1$G$O$"$j$^$;$s!#(B</li>
@@ -24,11 +44,13 @@
$B%j%/%(%9%H=hM}$N<g$JItJ,$r(B <a href="mpm.html">$B%^%k%A%W%m%;%C%7%s%0(B
$B%b%8%e!<%k(B</a> (MPM) $B$K0\F0$7$^$7$?!#(B</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="run-time" id="run-time">$B<B9T;~$N@_Dj$NJQ99(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="run-time" id="run-time">$B<B9T;~$N@_Dj$NJQ99(B</a></h2>
<ul>
- <li>Apache 1.3 $B$N;~$K%3%"%5!<(B$B%P$K$"$C$?B?$/$N%G%#%l%/%F%#%V$O(B
+ <li>Apache 1.3 $B$N;~$K%3%"%5!<%P$K$"$C$?B?$/$N%G%#%l%/%F%#%V$O(B
MPM $B$K0\F0$7$^$7$?!#%5!<%P$K(B Apache 1.3 $B$H$G$-$k$@$1F1$8?6$kIq$$$r(B
$B$5$;$?$$>l9g$O!"(B<code class="module"><a href="./mod/prefork.html">prefork</a></code> MPM $B$r(B
$BA*$s$G$/$@$5$$!#B>$N(B MPM $B$O%W%m%;%9$N:n@.$d%j%/%(%9%H$N=hM}$N(B
@@ -44,7 +66,7 @@
$B%Q%9>pJs(B) $B$N07$$$,JQ$o$C$?$b$N$,$"$j$^$9!#0JA0$O%O%s%I%i$H$7$F(B
$B<BAu$5$l$F$$$?$b$N$,%U%#%k%?$H$7$F<BAu$5$l$k$h$&$K$J$C$?$b$N$O(B
<code>PATH_INFO</code> $B$N$"$k%j%/%(%9%H$r<u$1IU$1$^$;$s!#(B<a href="mod/mod_include.html">INCLUDES</a> $B$J$I$N%U%#%k%?$O(B
- $B%3%"%O%s%I%i$N>e$K<BAu$5$l$F$$$^(B$B$9$N$G!"(B<code>PATH_INFO</code>
+ $B%3%"%O%s%I%i$N>e$K<BAu$5$l$F$$$^$9$N$G!"(B<code>PATH_INFO</code>
$BIU$-$N%j%/%(%9%H$r5qH]$7$^$9!#(B
<code class="directive"><a href="./mod/core.html#acceptpathinfo">AcceptPathInfo</a></code>
$B%G%#%l%/%F%#%V$r;H$C$F%3%"%O%s%I%i$,(B <code>PATH_INFO</code>
@@ -88,7 +110,7 @@
<code>httpd.conf</code> $B$K(B <code>Include conf/access.conf</code> $B$H(B
<code>Include conf/srm.conf</code> $B$rDI2C$9$kI,MW$,$"$k$G$7$g$&!#(B
$B0JA0$N%G%#%l%/%F%#%V$K$h$k=gHV$N$h$&$K(B Apache $B$,@_Dj%U%!%$%k$r(B
- $BFI$_9~$`$h$&(B$B$K$9$k$?$a$K$O!"(B<code>httpd.conf</code> $B$N:G8e$K(B
+ $BFI$_9~$`$h$&$K$9$k$?$a$K$O!"(B<code>httpd.conf</code> $B$N:G8e$K(B
<code>srm.conf</code>$B!"(B<code>access.conf</code> $B$N=g$K$=$l$>$l(B
<code class="directive"><a href="./mod/core.html#include">Include</a></code>
$B%G%#%l%/%F%#%V$r=q$$$F$/$@$5$$!#(B</li>
@@ -128,8 +150,18 @@
$BF1$85!G=$O(B <code class="directive"><a href="./mod/mod_autoindex.html#indexoptions">IndexOptions</a></code>
$B%G%#%l%/%F%#%V$N(B <code>FancyIndexing</code> $B%*%W%7%g%s$G(B
$B<B8=$G$-$^$9!#(B</li>
+
+ <li><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> $B$K$h$k(B MultiViews
+ $B%3%s%F%s%H%M%4%7%(!<%7%g%s5;=Q$O!"(B
+ $B%G%U%)%k%H$N%U%!%$%k%^%C%A%s%0$,$h$j87L)$J$b$N$KJQ99$5$l$^$7$?!#(B
+ <em>$B%M%4%7%(!<%H2DG=$J(B</em>$B%U%!%$%k$N>l9g$K$N$_A*Br$5$l$^$9!#(B
+ $B0JA0$N5sF0$O!"(B<code class="directive"><a href="./mod/mod_mime.html#multiviewsmatch">MultiviewsMatch</a></code>
+ $B%G%#%l%/%F%#%V$r;HMQ$9$k$3$H$GI|3h$G$-$^$9!#(B</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="misc" id="misc">$B$=$NB>$NJQ99(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="misc" id="misc">$B$=$NB>$NJQ99(B</a></h2>
<ul>
@@ -150,10 +182,16 @@
$B%3%s%Q%$%k$5$l$?%5!<%P$N%$%s%9%H!<%k$OJL%G%#%l%/%H%j$X(B
$B9T$J$&$h$&$K$J$j$^$7$?!#(B</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="third-party" id="third-party">$B%5!<%I%Q!<%F%#%b%8%e!<%k(B</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="third-party" id="third-party">$B%5!<%I%Q!<%F%#%b%8%e!<%k(B</a></h2>
<p>Apache 2.0 $B$N%5!<%P(B API $B$K$OB?$/$NJQ99$,2C$($i$l$^$7$?!#(B
Apache 1.3 $BMQ$N4{B8$N%b%8%e!<%k$O(B Apache 2.0 $B$G$O=$@5$J$7$G$O(B
$BF0$-(B<strong>$B$^$;$s(B</strong>$B!#>\:Y$O(B <a href="developer/">$B3+H/<T8~$1J8=q(B</a> $B$K$"$j$^$9!#(B</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">$B%b%8%e!<%k(B</a> | <a href="./mod/directives.html">$B%G%#%l%/%F%#%V(B</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">$BMQ8l(B</a> | <a href="./sitemap.html">$B%5%$%H%^%C%W(B</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.html.ru.koi8-r b/docs/manual/upgrading.html.ru.koi8-r
index 51f0dc2..28fa6b4 100644
--- a/docs/manual/upgrading.html.ru.koi8-r
+++ b/docs/manual/upgrading.html.ru.koi8-r
@@ -4,12 +4,32 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>ðÅÒÅÈÏÄ ÏÔ ×ÅÒÓÉÉ 1.3 Ë ×ÅÒÓÉÉ 2.0 - HTTP ÓÅÒ×ÅÒ Apache</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p><p class="apache">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP ÓÅÒ×ÅÒ</a> > <a href="http://httpd.apache.org/docs-project/">äÏËÕÍÅÎÔÁÃÉÑ</a> > <a href="./">÷ÅÒÓÉÑ 2.0</a></div><div id="page-content"><div id="preamble"><h1>ðÅÒÅÈÏÄ ÏÔ ×ÅÒÓÉÉ 1.3 Ë ×ÅÒÓÉÉ 2.0</h1>
+ -->
+<title>ðÅÒÅÈÏÄ ÏÔ ×ÅÒÓÉÉ 1.3 Ë ×ÅÒÓÉÉ 2.0 - HTTP ÓÅÒ×ÅÒ Apache</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p>
+<p class="apache">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP ÓÅÒ×ÅÒ</a> > <a href="http://httpd.apache.org/docs-project/">äÏËÕÍÅÎÔÁÃÉÑ</a> > <a href="./">÷ÅÒÓÉÑ 2.0</a></div><div id="page-content"><div id="preamble"><h1>ðÅÒÅÈÏÄ ÏÔ ×ÅÒÓÉÉ 1.3 Ë ×ÅÒÓÉÉ 2.0</h1>
<p>üÔÏÔ ÄÏËÕÍÅÎÔ ÎÅÏÂÈÏÄÉÍ ÄÌÑ ÔÏÇÏ, ÞÔÏÂÙ ÐÏÍÏÞØ ÐÏÌØÚÏ×ÁÔÅÌÑÍ
ÐÅÒÅÊÔÉ Ë ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÓÅÒ×ÅÒÁ ×ÅÒÓÉÉ 2.0. úÄÅÓØ ×Ù ÎÁÊÄÅÔÅ ÌÉÛØ
ËÒÁÔËÉÅ ÚÁÍÅÞÁÎÉÑ; ÂÏÌÅÅ ÐÏÄÒÏÂÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÎÏ×Ï××ÅÄÅÎÉÑÈ ÍÏÖÎÏ
ÎÁÊÔÉ ÌÉÂÏ × ÄÏËÕÍÅÎÔÅ <a href="new_features_2_0.html">îÏ×ÙÅ ×ÏÚÍÏÖÎÏÓÔÉ</a>, ÌÉÂÏ × ÆÁÊÌÅ <code>src/CHANGES</code>.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ</a></li><li><img alt="" src="./images/down.gif" /> <a href="#run-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÒÁÂÏÔÙ ÓÅÒ×ÅÒÁ</a></li><li><img alt="" src="./images/down.gif" /> <a href="#misc">äÒÕÇÉÅ ÉÚÍÅÎÅÎÉÑ</a></li><li><img alt="" src="./images/down.gif" /> <a href="#third-party">íÏÄÕÌÉ ÔÒÅÔØÉÈ ÆÉÒÍ</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="compile-time" id="compile-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#run-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÒÁÂÏÔÙ ÓÅÒ×ÅÒÁ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#misc">äÒÕÇÉÅ ÉÚÍÅÎÅÎÉÑ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#third-party">íÏÄÕÌÉ ÔÒÅÔØÉÈ ÆÉÒÍ</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="compile-time" id="compile-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ</a></h2>
<ul>
@@ -23,7 +43,9 @@
ÓËÏÎÃÅÎÔÒÉÒÏ×ÁÎÁ ÏÓÎÏ×ÎÁÑ ÞÁÓÔØ ËÏÄÁ, ÏÔ×ÅÞÁÀÝÅÇÏ ÚÁ ÏÂÒÁÂÏÔËÕ
ÚÁÐÒÏÓÏ×.</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="run-time" id="run-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÒÁÂÏÔÙ ÓÅÒ×ÅÒÁ</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="run-time" id="run-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÒÁÂÏÔÙ ÓÅÒ×ÅÒÁ</a></h2>
<ul>
@@ -123,7 +145,9 @@
<li>äÉÒÅËÔÉ×Á <code>FancyIndexing</code> ÂÙÌÁ ÕÂÒÁÎÁ. åÅ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØ
ÔÅÐÅÒØ ÏÂÅÓÐÅÞÉ×ÁÅÔÓÑ ÏÐÃÉÅÊ <code>FancyIndexing</code> × ÄÉÒÅËÔÉ×Å <code class="directive"><a href="./mod/mod_autoindex.html#indexoptions">IndexOptions</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="misc" id="misc">äÒÕÇÉÅ ÉÚÍÅÎÅÎÉÑ</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="misc" id="misc">äÒÕÇÉÅ ÉÚÍÅÎÅÎÉÑ</a></h2>
<ul>
@@ -142,7 +166,9 @@
ÉÓÈÏÄÎÙÅ ËÏÄÙ ÌÏÇÉÞÅÓËÉ ÏÒÇÁÎÉÚÏ×ÁÎÙ × ÏÓÎÏ×ÎÏÍ ËÁÔÁÌÏÇÅ ÄÉÓÔÒÉÂÕÔÉ×Á, Á
ÕÓÔÁÎÏ×ËÁ ÓËÏÍÐÉÌÉÒÏ×ÁÎÎÏÇÏ ÓÅÒ×ÅÒÁ ÐÒÏÉÚ×ÏÄÉÔÓÑ × ÏÔÄÅÌØÎÙÊ ËÁÔÁÌÏÇ.</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="third-party" id="third-party">íÏÄÕÌÉ ÔÒÅÔØÉÈ ÆÉÒÍ</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="third-party" id="third-party">íÏÄÕÌÉ ÔÒÅÔØÉÈ ÆÉÒÍ</a></h2>
<p>úÎÁÞÉÔÅÌØÎÙÅ ÉÚÍÅÎÅÎÉÑ ÂÙÌÉ ×ÎÅÓÅÎÙ × API ÄÌÑ Apache 2.0.
@@ -150,4 +176,8 @@
<strong>ÎÅ</strong> ÂÕÄÕÔ ÒÁÂÏÔÁÔØ ÐÏÄ Apache 2.0, ÅÓÌÉ ÎÅ ×ÎÅÓÔÉ
× ÎÉÈ ÎÅÏÂÈÏÄÉÍÙÅ ÉÚÍÅÎÅÎÉÑ. âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÐÏ ÜÔÏÍÕ ÐÏ×ÏÄÕ
ÄÏÓÔÕÐÎÁ × <a href="developer/">ÄÏËÕÍÅÎÔÁÃÉÉ ÄÌÑ ÒÁÚÒÁÂÏÔÞÉËÏ×</a>.</p>
- </div></div><div id="footer"><p class="apache">ðÏÄÄÅÒÖËÁ ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">ðÏÄÄÅÒÖËÁ ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index 9ffaf64..f83e261 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -14,7 +14,8 @@
href="new_features_2_0.html">New Features</a> document, or in
the <code>src/CHANGES</code> file.</p>
</summary>
-<seealso><a href="new_features_2_0.html">New Features in 2.0</a></seealso>
+<seealso><a href="new_features_2_0.html">Overview of new features in
+Apache 2.0</a></seealso>
<section id="compile-time">
<title>Compile-Time Configuration Changes</title>
@@ -157,11 +158,6 @@
<title>Misc Changes</title>
<ul>
- <li>The <code>httpd</code> command line option
- <code>-S</code> which was used for printing the virtual host
- configuration has been replaced by <code>-t -D
- DUMP_VHOSTS</code>.</li>
-
<li>The module <module>mod_auth_digest</module>, which was
experimental in Apache 1.3, is now a standard module.</li>
diff --git a/docs/manual/upgrading.xml.de b/docs/manual/upgrading.xml.de
index cd6d410..40970b5 100644
--- a/docs/manual/upgrading.xml.de
+++ b/docs/manual/upgrading.xml.de
@@ -1,6 +1,8 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
+<!-- English revision: 1.6.2.1 -->
+
<manualpage>
<relativepath href="."/>
@@ -14,7 +16,8 @@
<a href="new_features_2_0.html">Neue Funktionen</a> oder in
den <code>src/CHANGES</code>-Dateien.</p>
</summary>
-<seealso><a href="new_features_2_0.html">Neue Funktionen in Version 2.0</a></seealso>
+<seealso><a href="new_features_2_0.html">Übersicht der neuen Funktionen
+in Apache 2.0</a></seealso>
<section id="compile-time">
<title>Änderungen der Konfiguration bei der Kompilierung</title>
@@ -151,6 +154,14 @@
Die gleiche Funktionalität ist nun mit der Option
<code>FancyIndexing</code> der Direktive <directive
module="mod_autoindex">IndexOptions</directive> verfügbar.</li>
+
+ <li>Die von <module>mod_negotiation</module> bereitgestellte
+ Content-Negotiation-Technik MultiViews führt nun eine strengere
+ Dateierkennung durch. Es wird ausschließlich unter den
+ <em>aushandelbaren</em> Dateien gewählt. Das bisherige Verhalten
+ kann jedoch mit der Direktive <directive
+ module="mod_mime">MultiviewsMatch</directive> wiederhergestellt
+ werden.</li>
</ul>
</section>
@@ -158,11 +169,6 @@
<title>Sonstige Änderungen</title>
<ul>
- <li>Die <code>httpd</code>-Kommandozeilenoption
- <code>-S</code>, die dazu verwendet wurde, die
- Virtual-Host-Konfiguration auszugeben, wurde durch
- <code>-t -D DUMP_VHOSTS</code> ersetzt.</li>
-
<li>Das Modul <module>mod_auth_digest</module>, das im Apache 1.3
experimentellen Status hatte, ist nun ein Standardmodul.</li>
diff --git a/docs/manual/upgrading.xml.ja b/docs/manual/upgrading.xml.ja
index 5f24223..bb48321 100644
--- a/docs/manual/upgrading.xml.ja
+++ b/docs/manual/upgrading.xml.ja
@@ -3,7 +3,7 @@
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
<manualpage>
<relativepath href="."/>
-<!-- English revision: 1.5 -->
+<!-- English revision: 1.6.2.1 -->
<title>1.3 $B$+$i(B 2.0 $B$X$N%"%C%W%0%l!<%I(B</title>
@@ -14,7 +14,7 @@
<a href="new_features_2_0.html">$B?75!G=(B</a>$B$NJ8=q$d(B
<code>src/CHANGES</code> $B%U%!%$%k$G8+$D$1$i$l$k$H;W$$$^$9!#(B</p>
</summary>
-<seealso><a href="new_features_2_0.html">Apache 2.0 $B$N?75!G=(B</a></seealso>
+<seealso><a href="new_features_2_0.html">Apache 2.0 $B$N?75!G=$N35MW(B</a></seealso>
<section id="compile-time">
<title>$B%3%s%Q%$%k;~$N@_Dj$NJQ99(B</title>
@@ -137,6 +137,14 @@
$BF1$85!G=$O(B <directive module="mod_autoindex">IndexOptions</directive>
$B%G%#%l%/%F%#%V$N(B <code>FancyIndexing</code> $B%*%W%7%g%s$G(B
$B<B8=$G$-$^$9!#(B</li>
+
+ <li><module>mod_negotiation</module> $B$K$h$k(B MultiViews
+ $B%3%s%F%s%H%M%4%7%(!<%7%g%s5;=Q$O!"(B
+ $B%G%U%)%k%H$N%U%!%$%k%^%C%A%s%0$,$h$j87L)$J$b$N$KJQ99$5$l$^$7$?!#(B
+ <em>$B%M%4%7%(!<%H2DG=$J(B</em>$B%U%!%$%k$N>l9g$K$N$_A*Br$5$l$^$9!#(B
+ $B0JA0$N5sF0$O!"(B<directive module="mod_mime">MultiviewsMatch</directive>
+ $B%G%#%l%/%F%#%V$r;HMQ$9$k$3$H$GI|3h$G$-$^$9!#(B</li>
+
</ul>
</section>
diff --git a/docs/manual/urlmapping.html.en b/docs/manual/urlmapping.html.en
index 7ab9d33..1bd1750 100755
--- a/docs/manual/urlmapping.html.en
+++ b/docs/manual/urlmapping.html.en
@@ -4,14 +4,40 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Mapping URLs to Filesystem Locations - Apache HTTP Server</title><link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="./images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="./images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Mapping URLs to Filesystem Locations</h1>
+ -->
+<title>Mapping URLs to Filesystem Locations - Apache HTTP Server</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="./">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Mapping URLs to Filesystem Locations</h1>
<p>This document explains how Apache uses the URL of a request
to determine the filesystem location from which to serve a
file.</p>
- </div><div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#related">Related Modules and Directives</a></li><li><img alt="" src="./images/down.gif" /> <a href="#documentroot">DocumentRoot</a></li><li><img alt="" src="./images/down.gif" /> <a href="#outside">Files Outside the DocumentRoot</a></li><li><img alt="" src="./images/down.gif" /> <a href="#user">User Directories</a></li><li><img alt="" src="./images/down.gif" /> <a href="#redirect">URL Redirection</a></li><li><img alt="" src="./images/down.gif" /> <a href="#proxy">Reverse Proxy</a></li><li><img alt="" src="./images/down.gif" /> <a href="#rewrite">Rewriting Engine</a></li><li><img alt="" src="./images/down.gif" /> <a href="#notfound">File Not Found</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>
+ </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#related">Related Modules and Directives</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#documentroot">DocumentRoot</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#outside">Files Outside the DocumentRoot</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#user">User Directories</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#redirect">URL Redirection</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#proxy">Reverse Proxy</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#rewrite">Rewriting Engine</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#notfound">File Not Found</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_alias.html">mod_alias</a></code></li><li><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li><li><code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code></li><li><code class="module"><a href="./mod/mod_speling.html">mod_speling</a></code></li><li><code class="module"><a href="./mod/mod_vhost_alias.html">mod_vhost_alias</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_alias.html#alias">Alias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#aliasmatch">AliasMatch</a></code></li><li><code class="directive"><a href="./mod/mod_speling.html#checkspelling">CheckSpelling</a></code></li><li><code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code></li><li><code class="directive"><a href="./mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxypassreverse">ProxyPassReverse</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#redirect">Redirect</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#redirectmatch">RedirectMatch</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritematch">RewriteMatch</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#scriptaliasmatch">ScriptAliasMatch</a></code></li><li><code class="directive"><a href="./mod/mod_userdir.html#userdir">UserDir</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="documentroot" id="documentroot">DocumentRoot</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="documentroot" id="documentroot">DocumentRoot</a></h2>
<p>In deciding what file to serve for a given request, Apache's
default behavior is to take the URL-Path for the request (the part
@@ -30,7 +56,9 @@
be used to dynamically determine the appropriate place from which
to serve content based on the requested IP address or
hostname.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="outside" id="outside">Files Outside the DocumentRoot</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="outside" id="outside">Files Outside the DocumentRoot</a></h2>
<p>There are frequently circumstances where it is necessary to
allow web access to parts of the filesystem that are not strictly
@@ -65,7 +93,9 @@
<code>http://example.com/~user/cgi-bin/script.cgi</code> to the
path <code>/home/user/cgi-bin/script.cgi</code> and will treat
the resulting file as a CGI script.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="user" id="user">User Directories</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="user" id="user">User Directories</a></h2>
<p>Traditionally on Unix systems, the home directory of a
particular <em>user</em> can be referred to as
@@ -105,7 +135,9 @@
<div class="example"><p><code>AliasMatch ^/upages/([a-zA-Z0-9]*)/?(.*)
/home/$1/public_html/$2</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="redirect" id="redirect">URL Redirection</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="redirect" id="redirect">URL Redirection</a></h2>
<p>The configuration directives discussed in the above sections
tell Apache to get content from a specific place in the filesystem
@@ -141,7 +173,9 @@
<div class="example"><p><code>RedirectMatch temp .*
http://www.example.com/startpage.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="proxy" id="proxy">Reverse Proxy</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="proxy" id="proxy">Reverse Proxy</a></h2>
<p>Apache also allows you to bring remote documents into the URL space
of the local server. This technique is called <em>reverse
@@ -171,7 +205,9 @@
links on <code>internal.example.com</code> will result in the client
breaking out of the proxy server and requesting directly from
<code>internal.example.com</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="rewrite" id="rewrite">Rewriting Engine</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="rewrite" id="rewrite">Rewriting Engine</a></h2>
<p>When even more powerful substitution is required, the rewriting
engine provided by <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>
@@ -184,7 +220,9 @@
internal redirects (aliases), external redirects, and proxying.
Many practical examples employing mod_rewrite are discussed in the
<a href="misc/rewriteguide.html">URL Rewriting Guide</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="notfound" id="notfound">File Not Found</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="notfound" id="notfound">File Not Found</a></h2>
<p>Inevitably, URLs will be requested for which no matching
file can be found in the filesystem. This can happen for
@@ -222,4 +260,8 @@
and can be customized in a flexible manner as discussed in the
<a href="custom-error.html">Custom error responses</a> and <a href="misc/custom_errordocs.html">International Server Error
Responses</a> documents.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/details.html.en b/docs/manual/vhosts/details.html.en
index 886dbe3..4f03372 100644
--- a/docs/manual/vhosts/details.html.en
+++ b/docs/manual/vhosts/details.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>An In-Depth Discussion of Virtual Host Matching - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>An In-Depth Discussion of Virtual Host Matching</h1>
+ -->
+<title>An In-Depth Discussion of Virtual Host Matching - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>An In-Depth Discussion of Virtual Host Matching</h1>
<p>The virtual host code was completely rewritten in
<strong>Apache 1.3</strong>. This document attempts to explain
@@ -18,7 +30,14 @@
understanding how, here are <a href="examples.html">some
examples</a>.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#configparsing">Config File Parsing</a></li><li><img alt="" src="../images/down.gif" /> <a href="#hostmatching">Virtual Host Matching</a></li><li><img alt="" src="../images/down.gif" /> <a href="#tips">Tips</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="configparsing" id="configparsing">Config File Parsing</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#configparsing">Config File Parsing</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#hostmatching">Virtual Host Matching</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#tips">Tips</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="configparsing" id="configparsing">Config File Parsing</a></h2>
<p>There is a <em>main_server</em> which consists of all the
definitions appearing outside of
@@ -205,7 +224,9 @@
wildcard is given the same <code>ServerName</code> as the
main_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="hostmatching" id="hostmatching">Virtual Host Matching</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="hostmatching" id="hostmatching">Virtual Host Matching</a></h2>
<p>The server determines which vhost to use for a request as
follows:</p>
@@ -377,7 +398,9 @@
</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="tips" id="tips">Tips</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="tips" id="tips">Tips</a></h2>
<p>In addition to the tips on the <a href="../dns-caveats.html#tips">DNS Issues</a> page, here are
some further tips:</p>
@@ -401,4 +424,8 @@
/abc" should appear after "ServerPath /abc/def").</li>
</ul>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/examples.html.en b/docs/manual/vhosts/examples.html.en
index 4665351..6a2a720 100644
--- a/docs/manual/vhosts/examples.html.en
+++ b/docs/manual/vhosts/examples.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>VirtualHost Examples - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>VirtualHost Examples</h1>
+ -->
+<title>VirtualHost Examples - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>VirtualHost Examples</h1>
<p>This document attempts to answer the commonly-asked questions about
setting up virtual hosts. These scenarios are those involving multiple
@@ -12,17 +24,31 @@
coming soon about running sites on several servers behind a single
proxy server.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#purename">Running several name-based web
- sites on a single IP address.</a></li><li><img alt="" src="../images/down.gif" /> <a href="#twoips">Name-based hosts on more than one
- IP address.</a></li><li><img alt="" src="../images/down.gif" /> <a href="#intraextra">Serving the same content on
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#purename">Running several name-based web
+ sites on a single IP address.</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#twoips">Name-based hosts on more than one
+ IP address.</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#intraextra">Serving the same content on
different IP addresses (such as an internal and external
- address).</a></li><li><img alt="" src="../images/down.gif" /> <a href="#port">Running different sites on different
- ports.</a></li><li><img alt="" src="../images/down.gif" /> <a href="#ip">IP-based virtual hosting</a></li><li><img alt="" src="../images/down.gif" /> <a href="#ipport">Mixed port-based and ip-based virtual
- hosts</a></li><li><img alt="" src="../images/down.gif" /> <a href="#mixed">Mixed name-based and IP-based
- vhosts</a></li><li><img alt="" src="../images/down.gif" /> <a href="#default">Using <code>_default_</code>
- vhosts</a></li><li><img alt="" src="../images/down.gif" /> <a href="#migrate">Migrating a name-based vhost to an
- IP-based vhost</a></li><li><img alt="" src="../images/down.gif" /> <a href="#serverpath">Using the <code>ServerPath</code>
- directive</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="purename" id="purename">Running several name-based web
+ address).</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#port">Running different sites on different
+ ports.</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ip">IP-based virtual hosting</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ipport">Mixed port-based and ip-based virtual
+ hosts</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mixed">Mixed name-based and IP-based
+ vhosts</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#default">Using <code>_default_</code>
+ vhosts</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#migrate">Migrating a name-based vhost to an
+ IP-based vhost</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serverpath">Using the <code>ServerPath</code>
+ directive</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="purename" id="purename">Running several name-based web
sites on a single IP address.</a></h2>
<p>Your server has a single IP address, and multiple aliases (CNAMES)
@@ -107,7 +133,9 @@
configuration will not work for, in fact, is when you are serving
different content based on differing IP addresses or ports.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="twoips" id="twoips">Name-based hosts on more than one
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="twoips" id="twoips">Name-based hosts on more than one
IP address.</a></h2>
<div class="note">
@@ -158,7 +186,9 @@
unknown hostname, or no <code>Host:</code> header, will be served from
<code>www.example1.com</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="intraextra" id="intraextra">Serving the same content on
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="intraextra" id="intraextra">Serving the same content on
different IP addresses (such as an internal and external
address).</a></h2>
@@ -203,7 +233,9 @@
respond the same on all addresses.</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="port" id="port">Running different sites on different
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="port" id="port">Running different sites on different
ports.</a></h2>
<p>You have multiple domains going to the same IP and also want to
@@ -250,7 +282,9 @@
</VirtualHost>
</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="ip" id="ip">IP-based virtual hosting</a></h2>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ip" id="ip">IP-based virtual hosting</a></h2>
<p>The server has two IP addresses (<code>172.20.30.40</code> and
<code>172.20.30.50</code>) which resolve to the names
@@ -282,7 +316,9 @@
<code>localhost</code>, for example) will go to the main server, if
there is one.</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="ipport" id="ipport">Mixed port-based and ip-based virtual
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ipport" id="ipport">Mixed port-based and ip-based virtual
hosts</a></h2>
<p>The server machine has two IP addresses (<code>172.20.30.40</code> and
@@ -328,7 +364,9 @@
</VirtualHost>
</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="mixed" id="mixed">Mixed name-based and IP-based
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="mixed" id="mixed">Mixed name-based and IP-based
vhosts</a></h2>
<p>On some of my addresses, I want to do name-based virtual hosts, and
@@ -378,7 +416,9 @@
</VirtualHost>
</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="default" id="default">Using <code>_default_</code>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="default" id="default">Using <code>_default_</code>
vhosts</a></h2>
<h3><a name="defaultallports" id="defaultallports"><code>_default_</code> vhosts
@@ -462,7 +502,9 @@
served from the main 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="migrate" id="migrate">Migrating a name-based vhost to an
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="migrate" id="migrate">Migrating a name-based vhost to an
IP-based vhost</a></h2>
<p>The name-based vhost with the hostname
@@ -505,7 +547,9 @@
IP-based vhost) and through the old address (as a name-based
vhost).</p>
- </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="serverpath" id="serverpath">Using the <code>ServerPath</code>
+ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="serverpath" id="serverpath">Using the <code>ServerPath</code>
directive</a></h2>
<p>We have a server with two name-based vhosts. In order to match the
@@ -571,4 +615,8 @@
<code>Host:</code> header can use both URL variants, <em>i.e.</em>,
with or without URL prefix.</p>
- </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+ </div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/fd-limits.html.en b/docs/manual/vhosts/fd-limits.html.en
index 77f793c..61276ab 100644
--- a/docs/manual/vhosts/fd-limits.html.en
+++ b/docs/manual/vhosts/fd-limits.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>File Descriptor Limits - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>File Descriptor Limits</h1>
+ -->
+<title>File Descriptor Limits - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>File Descriptor Limits</h1>
<p>When using a large number of Virtual Hosts, Apache may run
out of available file descriptors (sometimes called <cite>file
@@ -60,7 +72,10 @@
problems and how they can be solved on your operating
system.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="splitlogs" id="splitlogs">Splitting up your log files</a></h2>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="splitlogs" id="splitlogs">Splitting up your log files</a></h2>
<p>If you want to log multiple virtual hosts to the same log file, you
may want to split up the log files afterwards in order to run
@@ -99,4 +114,8 @@
generate one file for each virtual host that appears in your log file.
Each file will be called <code>hostname.log</code>.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/index.html.en b/docs/manual/vhosts/index.html.en
index c11b7c2..4175fae 100644
--- a/docs/manual/vhosts/index.html.en
+++ b/docs/manual/vhosts/index.html.en
@@ -4,7 +4,19 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache Virtual Host documentation - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="../"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache Virtual Host documentation</h1>
+ -->
+<title>Apache Virtual Host documentation - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="../"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a></div><div id="page-content"><div id="preamble"><h1>Apache Virtual Host documentation</h1>
<p>The term <cite>Virtual Host</cite> refers to the practice of
running more than one web site (such as
@@ -25,9 +37,14 @@
details of virtual host support in Apache version 1.3 and
later.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#support">Virtual Host Support</a></li><li><img alt="" src="../images/down.gif" /> <a href="#directives">Configuration directives</a></li></ul><h3>See also</h3><ul class="seealso"><li>
- <code class="module"><a href="../mod/mod_vhost_alias.html">mod_vhost_alias</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="support" id="support">Virtual Host Support</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#support">Virtual Host Support</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#directives">Configuration directives</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_vhost_alias.html">mod_vhost_alias</a></code></li><li><a href="name-based.html">Name-based virtual
+hosts</a></li><li><a href="ip-based.html">IP-based virtual hosts</a></li><li><a href="examples.html">Virtual host examples</a></li><li><a href="fd-limits.html">File descriptor limits</a></li><li><a href="mass.html">Mass virtual hosting</a></li><li><a href="details.html">Detalis of host matching</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="support" id="support">Virtual Host Support</a></h2>
<ul>
<li><a href="name-based.html">Name-based Virtual Hosts</a> (More
@@ -44,7 +61,9 @@
Matching</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="directives" id="directives">Configuration directives</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="directives" id="directives">Configuration directives</a></h2>
<ul>
<li><code class="directive"><a href="../mod/core.html#virtualhost"><VirtualHost></a></code></li>
@@ -55,11 +74,11 @@
</ul>
<p>If you are trying to debug your virtual host configuration, you
- may find the Apache <code>-t -D DUMP_VHOSTS</code> command line switch
+ may find the Apache <code>-S</code> command line switch
useful. That is, type the following command:</p>
<div class="example"><p><code>
- /usr/local/apache/bin/httpd -t -D DUMP_VHOSTS
+ /usr/local/apache2/bin/httpd -S
</code></p></div>
<p>This command will dump out a description of how Apache parsed
@@ -67,4 +86,8 @@
server names may help uncover configuration mistakes. (See <a href="../programs/httpd.html">the docs for the httpd program</a> for
other command line options)</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/index.xml b/docs/manual/vhosts/index.xml
index c14ec08..f06a5e5 100644
--- a/docs/manual/vhosts/index.xml
+++ b/docs/manual/vhosts/index.xml
@@ -33,9 +33,14 @@
</summary>
-<seealso>
- <module>mod_vhost_alias</module>
-</seealso>
+<seealso><module>mod_vhost_alias</module></seealso>
+<seealso><a href="name-based.html">Name-based virtual
+hosts</a></seealso>
+<seealso><a href="ip-based.html">IP-based virtual hosts</a></seealso>
+<seealso><a href="examples.html">Virtual host examples</a></seealso>
+<seealso><a href="fd-limits.html">File descriptor limits</a></seealso>
+<seealso><a href="mass.html">Mass virtual hosting</a></seealso>
+<seealso><a href="details.html">Detalis of host matching</a></seealso>
<section id="support"><title>Virtual Host Support</title>
@@ -68,11 +73,11 @@
</ul>
<p>If you are trying to debug your virtual host configuration, you
- may find the Apache <code>-t -D DUMP_VHOSTS</code> command line switch
+ may find the Apache <code>-S</code> command line switch
useful. That is, type the following command:</p>
<example>
- /usr/local/apache/bin/httpd -t -D DUMP_VHOSTS
+ /usr/local/apache2/bin/httpd -S
</example>
<p>This command will dump out a description of how Apache parsed
diff --git a/docs/manual/vhosts/ip-based.html.en b/docs/manual/vhosts/ip-based.html.en
index 711db55..5b0c72e 100644
--- a/docs/manual/vhosts/ip-based.html.en
+++ b/docs/manual/vhosts/ip-based.html.en
@@ -4,10 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Apache IP-based Virtual Host Support - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>Apache IP-based Virtual Host Support</h1></div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">System requirements</a></li><li><img alt="" src="../images/down.gif" /> <a href="#howto">How to set up Apache</a></li><li><img alt="" src="../images/down.gif" /> <a href="#multiple">Setting up multiple daemons</a></li><li><img alt="" src="../images/down.gif" /> <a href="#single">Setting up a single daemon
- with virtual hosts</a></li></ul><h3>See also</h3><ul class="seealso"><li>
+ -->
+<title>Apache IP-based Virtual Host Support - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>Apache IP-based Virtual Host Support</h1></div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">System requirements</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#howto">How to set up Apache</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#multiple">Setting up multiple daemons</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#single">Setting up a single daemon
+ with virtual hosts</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li>
<a href="name-based.html">Name-based Virtual Hosts Support</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="requirements" id="requirements">System requirements</a></h2>
+</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="requirements" id="requirements">System requirements</a></h2>
<p>As the term <cite>IP-based</cite> indicates, the server
<strong>must have a different IP address for each IP-based
@@ -18,7 +38,9 @@
frequently called "ip aliases", and the "ifconfig" command is
most commonly used to set them up).</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="howto" id="howto">How to set up Apache</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="howto" id="howto">How to set up Apache</a></h2>
<p>There are two ways of configuring apache to support multiple
hosts. Either by running a separate httpd daemon for each
@@ -54,7 +76,9 @@
significant.</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="multiple" id="multiple">Setting up multiple daemons</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="multiple" id="multiple">Setting up multiple daemons</a></h2>
<p>Create a separate httpd installation for each virtual host. For
each installation, use the <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> directive in the
@@ -68,7 +92,9 @@
<p>It is recommended that you use an IP address instead of a
hostname (see <a href="../dns-caveats.html">DNS caveats</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="single" id="single">Setting up a single daemon
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="single" id="single">Setting up a single daemon
with virtual hosts</a></h2>
<p>For this case, a single httpd will service requests for the
@@ -116,4 +142,8 @@
directory where they are written. See the <a href="../misc/security_tips.html">security tips</a> document
for details.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en
index 5c7ddbf..423f9cf 100644
--- a/docs/manual/vhosts/mass.html.en
+++ b/docs/manual/vhosts/mass.html.en
@@ -4,17 +4,43 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Dynamically configured mass virtual hosting - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>Dynamically configured mass virtual hosting</h1>
+ -->
+<title>Dynamically configured mass virtual hosting - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>Dynamically configured mass virtual hosting</h1>
<p>This document describes how to efficiently serve an
arbitrary number of virtual hosts with Apache 1.3.
</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#motivation">Motivation</a></li><li><img alt="" src="../images/down.gif" /> <a href="#overview">Overview</a></li><li><img alt="" src="../images/down.gif" /> <a href="#simple">Simple dynamic virtual hosts</a></li><li><img alt="" src="../images/down.gif" /> <a href="#homepages">A virtually hosted homepages system</a></li><li><img alt="" src="../images/down.gif" /> <a href="#combinations">Using more than
- one virtual hosting system on the same server</a></li><li><img alt="" src="../images/down.gif" /> <a href="#ipbased">More efficient IP-based virtual hosting</a></li><li><img alt="" src="../images/down.gif" /> <a href="#oldversion">Using older versions of Apache</a></li><li><img alt="" src="../images/down.gif" /> <a href="#simple.rewrite">Simple dynamic
- virtual hosts using <code>mod_rewrite</code></a></li><li><img alt="" src="../images/down.gif" /> <a href="#homepages.rewrite">A
- homepages system using <code>mod_rewrite</code></a></li><li><img alt="" src="../images/down.gif" /> <a href="#xtra-conf">Using a separate virtual
- host configuration file</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="motivation" id="motivation">Motivation</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#motivation">Motivation</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#overview">Overview</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#simple">Simple dynamic virtual hosts</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#homepages">A virtually hosted homepages system</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#combinations">Using more than
+ one virtual hosting system on the same server</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ipbased">More efficient IP-based virtual hosting</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#oldversion">Using older versions of Apache</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#simple.rewrite">Simple dynamic
+ virtual hosts using <code>mod_rewrite</code></a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#homepages.rewrite">A
+ homepages system using <code>mod_rewrite</code></a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#xtra-conf">Using a separate virtual
+ host configuration file</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="motivation" id="motivation">Motivation</a></h2>
<p>The techniques described here are of interest if your
<code>httpd.conf</code> contains many
@@ -68,7 +94,9 @@
arrange for the process at the other end to distribute the logs
to the customers (it can also accumulate statistics, etc.).</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="overview" id="overview">Overview</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="overview" id="overview">Overview</a></h2>
<p>A virtual host is defined by two pieces of information: its
IP address, and the contents of the <code>Host:</code> header
@@ -112,7 +140,9 @@
if any CGIs or SSI documents make use of it they will get a
misleading value.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="simple" id="simple">Simple dynamic virtual hosts</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="simple" id="simple">Simple dynamic virtual hosts</a></h2>
<p>This extract from <code>httpd.conf</code> implements the
virtual host arrangement outlined in the <a href="#motivation">Motivation</a> section above, but in a
@@ -137,7 +167,9 @@
name that is inserted into the filename is then derived from
the IP address of the virtual host.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="homepages" id="homepages">A virtually hosted homepages system</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="homepages" id="homepages">A virtually hosted homepages system</a></h2>
<p>This is an adjustment of the above system tailored for an
ISP's homepages server. Using a slightly more complicated
@@ -161,7 +193,9 @@
<code>VirtualDocumentRoot</code> settings in the
<code class="module"><a href="../mod/mod_vhost_alias.html">mod_vhost_alias</a></code> documentation.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="combinations" id="combinations">Using more than
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="combinations" id="combinations">Using more than
one virtual hosting system on the same server</a></h2>
<p>With more complicated setups you can use Apache's normal
@@ -214,7 +248,9 @@
</VirtualHost>
</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="ipbased" id="ipbased">More efficient IP-based virtual hosting</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ipbased" id="ipbased">More efficient IP-based virtual hosting</a></h2>
<p>After <a href="#simple">the first example</a> I noted that
it is easy to turn it into an IP-based virtual hosting setup.
@@ -238,7 +274,9 @@
VirtualScriptAliasIP /www/hosts/%0/cgi-bin<br />
</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="oldversion" id="oldversion">Using older versions of Apache</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="oldversion" id="oldversion">Using older versions of Apache</a></h2>
<p>The examples above rely on <code>mod_vhost_alias</code>
which appeared after version 1.3.6. If you are using a version
@@ -260,7 +298,9 @@
<code>:port</code> on the end which is not the case for
<code>%V</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="simple.rewrite" id="simple.rewrite">Simple dynamic
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="simple.rewrite" id="simple.rewrite">Simple dynamic
virtual hosts using <code>mod_rewrite</code></a></h2>
<p>This extract from <code>httpd.conf</code> does the same
@@ -316,7 +356,9 @@
# that's it!
</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="homepages.rewrite" id="homepages.rewrite">A
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="homepages.rewrite" id="homepages.rewrite">A
homepages system using <code>mod_rewrite</code></a></h2>
<p>This does the same thing as <a href="#homepages">the second
@@ -344,7 +386,9 @@
ScriptAlias /cgi-bin/ /www/std-cgi/
</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="xtra-conf" id="xtra-conf">Using a separate virtual
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="xtra-conf" id="xtra-conf">Using a separate virtual
host configuration file</a></h2>
<p>This arrangement uses more advanced <code>mod_rewrite</code>
@@ -386,4 +430,8 @@
RewriteRule ^/(.*)$ %1/cgi-bin/$1
</code></p></div>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/name-based.html.en b/docs/manual/vhosts/name-based.html.en
index f1f6fa4..989046f 100644
--- a/docs/manual/vhosts/name-based.html.en
+++ b/docs/manual/vhosts/name-based.html.en
@@ -4,11 +4,30 @@
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- --><title>Name-based Virtual Host Support - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body id="manual-page"><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>Name-based Virtual Host Support</h1>
+ -->
+<title>Name-based Virtual Host Support - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.0</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Virtual Hosts</a></div><div id="page-content"><div id="preamble"><h1>Name-based Virtual Host Support</h1>
<p>This document describes when and how to use name-based virtual hosts.</p>
-</div><div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#namevip">Name-based vs. IP-based Virtual Hosts</a></li><li><img alt="" src="../images/down.gif" /> <a href="#using">Using Name-based Virtual Hosts</a></li><li><img alt="" src="../images/down.gif" /> <a href="#compat">Compatibility with Older Browsers</a></li></ul><h3>See also</h3><ul class="seealso"><li><a href="ip-based.html">IP-based Virtual Host Support</a></li><li><a href="details.html">An In-Depth Discussion of Virtual Host Matching</a></li><li><a href="mass.html">Dynamically configured mass virtual hosting</a></li><li><a href="examples.html">Virtual Host examples for common setups</a></li><li><a href="examples.html#serverpath">ServerPath configuration example</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="namevip" id="namevip">Name-based vs. IP-based Virtual Hosts</a></h2>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#namevip">Name-based vs. IP-based Virtual Hosts</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#using">Using Name-based Virtual Hosts</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#compat">Compatibility with Older Browsers</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="ip-based.html">IP-based Virtual Host Support</a></li><li><a href="details.html">An In-Depth Discussion of Virtual Host Matching</a></li><li><a href="mass.html">Dynamically configured mass virtual hosting</a></li><li><a href="examples.html">Virtual Host examples for common setups</a></li><li><a href="examples.html#serverpath">ServerPath configuration example</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="namevip" id="namevip">Name-based vs. IP-based Virtual Hosts</a></h2>
<p>IP-based virtual hosts use the IP address of the connection to
determine the correct virtual host to serve. Therefore you need to
@@ -43,7 +62,9 @@
they are on separate IP addresses.</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 Name-based Virtual Hosts</a></h2>
+</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 Name-based Virtual Hosts</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/core.html">core</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code></li><li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li><li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li><li><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code></li><li><code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code></li></ul></td></tr></table>
@@ -158,7 +179,9 @@
<code><VirtualHost></code> container and list it first in the
configuration file.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="section"><h2><a name="compat" id="compat">Compatibility with Older Browsers</a></h2>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="compat" id="compat">Compatibility with Older Browsers</a></h2>
<p>As mentioned earlier, there are some clients
who do not send the required data for the name-based virtual
@@ -212,4 +235,8 @@
guidelines will, for the most part, ensure that your pages will
work with all browsers, new and old.</p>
-</div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file
+</div></div>
+<div id="footer">
+<p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/include/.cvsignore b/include/.cvsignore
index 8777ada..1ab151e 100644
--- a/include/.cvsignore
+++ b/include/.cvsignore
@@ -1,3 +1,11 @@
ap_config_auto.h
ap_config_auto.h.in
ap_config_layout.h
+mod_cgi.h
+mod_core.h
+mod_dav.h
+mod_include.h
+mod_proxy.h
+mpm.h
+mpm_default.h
+os.h
diff --git a/include/ap_provider.h b/include/ap_provider.h
index 22fe2eb..b89ade2 100644
--- a/include/ap_provider.h
+++ b/include/ap_provider.h
@@ -67,12 +67,14 @@
* @param pool The pool to create any storage from
* @param provider_group The group to store the provider in
* @param provider_name The name for this provider
+ * @param provider_version The version for this provider
* @param provider Opaque structure for this provider
* @return APR_SUCCESS if all went well
*/
AP_DECLARE(apr_status_t) ap_register_provider(apr_pool_t *pool,
const char *provider_group,
const char *provider_name,
+ const char *provider_version,
const void *provider);
/**
@@ -80,9 +82,11 @@
* provider pool.
* @param provider_group The group to look for this provider in
* @param provider_name The name for the provider
+ * @param provider_version The version for the provider
* @return provider pointer to provider if found, NULL otherwise
*/
AP_DECLARE(void *) ap_lookup_provider(const char *provider_group,
- const char *provider_name);
+ const char *provider_name,
+ const char *provider_version);
#endif
diff --git a/include/ap_release.h b/include/ap_release.h
index 25c5c63..3a94dc1 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -75,7 +75,7 @@
#define AP_SERVER_BASEPRODUCT "Apache"
#define AP_SERVER_MAJORVERSION "2"
#define AP_SERVER_MINORVERSION "0"
-#define AP_SERVER_PATCHLEVEL "44-dev"
+#define AP_SERVER_PATCHLEVEL "44"
#define AP_SERVER_MINORREVISION AP_SERVER_MAJORVERSION "." AP_SERVER_MINORVERSION
#define AP_SERVER_BASEREVISION AP_SERVER_MINORREVISION "." AP_SERVER_PATCHLEVEL
#define AP_SERVER_BASEVERSION AP_SERVER_BASEPRODUCT "/" AP_SERVER_BASEREVISION
diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile
index 4c7cfa8..d7f847c 100644
--- a/modules/NWGNUmakefile
+++ b/modules/NWGNUmakefile
@@ -14,6 +14,7 @@
mappers \
metadata \
proxy \
+ filters \
$(EOLIST)
#If the mod_edir directory exists then build the mod_edir module
@@ -22,12 +23,6 @@
$(EOLIST)
endif
-# If the zlib libraries source exists then build the mod_deflate module
-ifeq "$(wildcard $(AP_WORK)\srclib\zlib)" "$(AP_WORK)\srclib\zlib"
-SUBDIRS += filters \
- $(EOLIST)
-endif
-
#
# Get the 'head' of the build environment. This includes default targets and
# paths to tools
diff --git a/modules/aaa/NWGNUauthnano b/modules/aaa/NWGNUauthanon
similarity index 95%
rename from modules/aaa/NWGNUauthnano
rename to modules/aaa/NWGNUauthanon
index 2e61075..1847e7d 100644
--- a/modules/aaa/NWGNUauthnano
+++ b/modules/aaa/NWGNUauthanon
@@ -94,13 +94,13 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = authnano
+NLM_NAME = authanon
#
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION = Apache $(VERSION_STR) Anonymous Authentication Module
+NLM_DESCRIPTION = Authentication Anonymous Module
#
# This is used by the '-threadname' directive. If left blank,
@@ -151,7 +151,7 @@
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/authnano.nlm \
+ $(OBJDIR)/authanon.nlm \
$(EOLIST)
#
@@ -165,7 +165,7 @@
# Paths must all use the '/' character
#
FILES_nlm_objs = \
- $(OBJDIR)/mod_authn_anon.o \
+ $(OBJDIR)/mod_auth_anon.o \
$(EOLIST)
#
@@ -213,7 +213,7 @@
# Any symbols exported to here
#
FILES_nlm_exports = \
- authn_anon_module \
+ auth_anon_module \
$(EOLIST)
#
diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc
deleted file mode 100644
index dbc4d0f..0000000
--- a/modules/aaa/NWGNUauthbasc
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary. This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS += \
- $(AP_WORK)/include \
- $(NWOS) \
- $(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
- $(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS += \
- -prefix pre_nw.h \
- $(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES += \
- $(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS += \
- $(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm. If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME = authbasc
-
-#
-# This is used by the link '-desc ' directive.
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION = Apache $(VERSION_STR) Basic Authentication Module
-
-#
-# This is used by the '-threadname' directive. If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME = AuthBasic Module
-
-#
-# If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION =
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE = 8192
-
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM = _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM = _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM =
-
-#
-# If these are specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
-
-#
-# If this is specified it will be linked in with the XDCData option in the def
-# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
-# by setting APACHE_UNIPROC in the environment
-#
-XDCDATA =
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
- $(OBJDIR)/authbasc.nlm \
- $(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
- $(OBJDIR)/mod_auth_basic.o \
- $(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
- libcpre.o \
- $(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
- aprlib \
- libc \
- $(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
-
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
- @$(NWOS)/httpd.imp \
- @libc.imp \
- $(EOLIST)
-
-#
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
- auth_basic_module \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
- $(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(AP_WORK)\build\NWGNUtail.inc
-
diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthdbm
similarity index 95%
rename from modules/aaa/NWGNUauthndbm
rename to modules/aaa/NWGNUauthdbm
index c9087bd..a64e7ec 100644
--- a/modules/aaa/NWGNUauthndbm
+++ b/modules/aaa/NWGNUauthdbm
@@ -93,19 +93,19 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = authndbm
+NLM_NAME = authdbm
#
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION = Apache $(VERSION_STR) Database Authentication Module
+NLM_DESCRIPTION = Database Authentication Module
#
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
-NLM_THREAD_NAME = AuthnDBM Module
+NLM_THREAD_NAME = AuthDBM Module
#
# If this is specified, it will override VERSION value in
@@ -150,7 +150,7 @@
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/authndbm.nlm \
+ $(OBJDIR)/authdbm.nlm \
$(EOLIST)
#
@@ -164,7 +164,7 @@
# Paths must all use the '/' character
#
FILES_nlm_objs = \
- $(OBJDIR)/mod_authn_dbm.o \
+ $(OBJDIR)/mod_auth_dbm.o \
$(EOLIST)
#
@@ -212,7 +212,7 @@
# Any symbols exported to here
#
FILES_nlm_exports = \
- authn_dbm_module \
+ auth_dbm_module \
$(EOLIST)
#
diff --git a/modules/aaa/NWGNUauthndef b/modules/aaa/NWGNUauthndef
deleted file mode 100644
index 39710e6..0000000
--- a/modules/aaa/NWGNUauthndef
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary. This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS += \
- $(AP_WORK)/include \
- $(NWOS) \
- $(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
- $(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS += \
- -prefix pre_nw.h \
- $(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES += \
- $(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS += \
- $(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm. If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME = authndef
-
-#
-# This is used by the link '-desc ' directive.
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION = Apache $(VERSION_STR) Default Authentication Module
-
-#
-# This is used by the '-threadname' directive. If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME = Authndef Module
-
-#
-# If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION =
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE = 8192
-
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM = _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM = _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM =
-
-#
-# If these are specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
-
-#
-# If this is specified it will be linked in with the XDCData option in the def
-# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
-# by setting APACHE_UNIPROC in the environment
-#
-XDCDATA =
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
- $(OBJDIR)/authndef.nlm \
- $(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
- $(OBJDIR)/mod_authn_default.o \
- $(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
- libcpre.o \
- $(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
- aprlib \
- libc \
- $(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
-
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
- @$(NWOS)/httpd.imp \
- @libc.imp \
- $(EOLIST)
-
-#
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
- authn_default_module \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
- $(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(AP_WORK)\build\NWGNUtail.inc
-
diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil
deleted file mode 100644
index 9e396a6..0000000
--- a/modules/aaa/NWGNUauthnfil
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary. This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS += \
- $(AP_WORK)/include \
- $(NWOS) \
- $(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
- $(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS += \
- -prefix pre_nw.h \
- $(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES += \
- $(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS += \
- $(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm. If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME = authnfil
-
-#
-# This is used by the link '-desc ' directive.
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION = Apache $(VERSION_STR) File Authentication Module
-
-#
-# This is used by the '-threadname' directive. If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME = AuthnFile Module
-
-#
-# If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION =
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE = 8192
-
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM = _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM = _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM =
-
-#
-# If these are specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
-
-#
-# If this is specified it will be linked in with the XDCData option in the def
-# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
-# by setting APACHE_UNIPROC in the environment
-#
-XDCDATA =
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
- $(OBJDIR)/authnfil.nlm \
- $(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
- $(OBJDIR)/mod_authn_file.o \
- $(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
- libcpre.o \
- $(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
- aprlib \
- libc \
- $(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
-
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
- @$(NWOS)/httpd.imp \
- @libc.imp \
- $(EOLIST)
-
-#
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
- authn_file_module \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
- $(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(AP_WORK)\build\NWGNUtail.inc
-
diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm
deleted file mode 100644
index 65060a3..0000000
--- a/modules/aaa/NWGNUauthzdbm
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary. This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS += \
- $(AP_WORK)/include \
- $(NWOS) \
- $(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
- $(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS += \
- -prefix pre_nw.h \
- $(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES += \
- $(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS += \
- $(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm. If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME = authzdbm
-
-#
-# This is used by the link '-desc ' directive.
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION = Apache $(VERSION_STR) Database Authorization Module
-
-#
-# This is used by the '-threadname' directive. If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME = AuthzDBM Module
-
-#
-# If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION =
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE = 8192
-
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM = _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM = _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM =
-
-#
-# If these are specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
-
-#
-# If this is specified it will be linked in with the XDCData option in the def
-# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
-# by setting APACHE_UNIPROC in the environment
-#
-XDCDATA =
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
- $(OBJDIR)/authzdbm.nlm \
- $(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
- $(OBJDIR)/mod_authz_dbm.o \
- $(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
- libcpre.o \
- $(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
- aprlib \
- libc \
- $(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
-
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
- @$(NWOS)/httpd.imp \
- @libc.imp \
- $(EOLIST)
-
-#
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
- authz_dbm_module \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
- $(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(AP_WORK)\build\NWGNUtail.inc
-
diff --git a/modules/aaa/NWGNUauthzdef b/modules/aaa/NWGNUauthzdef
deleted file mode 100644
index e194678..0000000
--- a/modules/aaa/NWGNUauthzdef
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary. This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS += \
- $(AP_WORK)/include \
- $(NWOS) \
- $(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
- $(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS += \
- -prefix pre_nw.h \
- $(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES += \
- $(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS += \
- $(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm. If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME = authzdef
-
-#
-# This is used by the link '-desc ' directive.
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION = Apache $(VERSION_STR) Default Authorization Module
-
-#
-# This is used by the '-threadname' directive. If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME = Authzdef Module
-
-#
-# If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION =
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE = 8192
-
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM = _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM = _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM =
-
-#
-# If these are specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
-
-#
-# If this is specified it will be linked in with the XDCData option in the def
-# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
-# by setting APACHE_UNIPROC in the environment
-#
-XDCDATA =
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
- $(OBJDIR)/authzdef.nlm \
- $(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
- $(OBJDIR)/mod_authz_default.o \
- $(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
- libcpre.o \
- $(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
- aprlib \
- libc \
- $(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
-
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
- @$(NWOS)/httpd.imp \
- @libc.imp \
- $(EOLIST)
-
-#
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
- authz_default_module \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
- $(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(AP_WORK)\build\NWGNUtail.inc
-
diff --git a/modules/aaa/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp
deleted file mode 100644
index 60eb244..0000000
--- a/modules/aaa/NWGNUauthzgrp
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary. This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS += \
- $(AP_WORK)/include \
- $(NWOS) \
- $(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
- $(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS += \
- -prefix pre_nw.h \
- $(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES += \
- $(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS += \
- $(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm. If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME = authzgrp
-
-#
-# This is used by the link '-desc ' directive.
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION = Apache $(VERSION_STR) Group File Authorization Module
-
-#
-# This is used by the '-threadname' directive. If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME = AuthzGrp Module
-
-#
-# If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION =
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE = 8192
-
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM = _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM = _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM =
-
-#
-# If these are specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
-
-#
-# If this is specified it will be linked in with the XDCData option in the def
-# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
-# by setting APACHE_UNIPROC in the environment
-#
-XDCDATA =
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
- $(OBJDIR)/authzgrp.nlm \
- $(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
- $(OBJDIR)/mod_authz_groupfile.o \
- $(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
- libcpre.o \
- $(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
- aprlib \
- libc \
- $(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
-
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
- @$(NWOS)/httpd.imp \
- @libc.imp \
- $(EOLIST)
-
-#
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
- authz_groupfile_module \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
- $(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(AP_WORK)\build\NWGNUtail.inc
-
diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr
deleted file mode 100644
index 3a3a11d..0000000
--- a/modules/aaa/NWGNUauthzusr
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary. This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS += \
- $(AP_WORK)/include \
- $(NWOS) \
- $(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
- $(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS += \
- -prefix pre_nw.h \
- $(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES += \
- $(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS += \
- $(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm. If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME = authzusr
-
-#
-# This is used by the link '-desc ' directive.
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION = Apache $(VERSION_STR) User Authorization Module
-
-#
-# This is used by the '-threadname' directive. If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME = AuthzUser Module
-
-#
-# If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION =
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE = 8192
-
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM = _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM = _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM =
-
-#
-# If these are specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
-
-#
-# If this is specified it will be linked in with the XDCData option in the def
-# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
-# by setting APACHE_UNIPROC in the environment
-#
-XDCDATA =
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
- $(OBJDIR)/authzusr.nlm \
- $(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
- $(OBJDIR)/mod_authz_user.o \
- $(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
- libcpre.o \
- $(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
- aprlib \
- libc \
- $(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
-
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
- @$(NWOS)/httpd.imp \
- @libc.imp \
- $(EOLIST)
-
-#
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
- authz_user_module \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
- $(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(AP_WORK)\build\NWGNUtail.inc
-
diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUdigest
similarity index 95%
rename from modules/aaa/NWGNUauthdigt
rename to modules/aaa/NWGNUdigest
index 9dfa45b..814db98 100644
--- a/modules/aaa/NWGNUauthdigt
+++ b/modules/aaa/NWGNUdigest
@@ -16,7 +16,6 @@
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
$(AP_WORK)/srclib/apr/include \
@@ -28,7 +27,6 @@
# These flags will come after CFLAGS
#
XCFLAGS += \
- -prefix pre_nw.h \
$(EOLIST)
#
@@ -94,13 +92,13 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = authdigt
+NLM_NAME = digest
#
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION = Apache $(VERSION_STR) Digest Authentication Module
+NLM_DESCRIPTION = Digest Authentication Module
#
# This is used by the '-threadname' directive. If left blank,
@@ -151,7 +149,7 @@
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/authdigt.nlm \
+ $(OBJDIR)/digest.nlm \
$(EOLIST)
#
diff --git a/modules/aaa/NWGNUmakefile b/modules/aaa/NWGNUmakefile
index 7a45c0c..fc72c73 100644
--- a/modules/aaa/NWGNUmakefile
+++ b/modules/aaa/NWGNUmakefile
@@ -152,16 +152,9 @@
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/authbasc.nlm \
- $(OBJDIR)/authdigt.nlm \
- $(OBJDIR)/authnano.nlm \
- $(OBJDIR)/authndbm.nlm \
- $(OBJDIR)/authndef.nlm \
- $(OBJDIR)/authnfil.nlm \
- $(OBJDIR)/authzdbm.nlm \
- $(OBJDIR)/authzdef.nlm \
- $(OBJDIR)/authzgrp.nlm \
- $(OBJDIR)/authzusr.nlm \
+ $(OBJDIR)/authanon.nlm \
+ $(OBJDIR)/authdbm.nlm \
+ $(OBJDIR)/digest.nlm \
$(EOLIST)
#
diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index 8579d33..525e79d 100644
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -1,46 +1,22 @@
dnl modules enabled in this directory by default
-dnl Authentication (authn), Access, and Authorization (authz)
-
dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
APACHE_MODPATH_INIT(aaa)
-dnl Authentication modules; modules checking a username and password against a
-dnl file, database, or other similar magic.
-dnl
-APACHE_MODULE(authn_file, file-based authentication control, , , yes)
-APACHE_MODULE(authn_dbm, DBM-based authentication control, , , most)
-APACHE_MODULE(authn_anon, anonymous user authentication control, , , most)
+APACHE_MODULE(access, host-based access control, , , yes)
+APACHE_MODULE(auth, user-based access control, , , yes)
+APACHE_MODULE(auth_anon, anonymous user access, , , most)
+APACHE_MODULE(auth_dbm, DBM-based access databases, , , most)
-dnl - and just in case all of the above punt; a default handler to
-dnl keep the bad guys out.
-APACHE_MODULE(authn_default, authentication backstopper, , , yes)
-
-dnl Authorization modules: modules which verify a certain property such as
-dnl membership of a group, value of the IP address against a list of pre
-dnl configured directives (e.g. require, allow) or against an external file
-dnl or database.
-dnl
-APACHE_MODULE(authz_host, host-based authorization control, , , yes)
-APACHE_MODULE(authz_groupfile, 'require group' authorization control, , , yes)
-APACHE_MODULE(authz_user, 'require user' authorization control, , , yes)
-APACHE_MODULE(authz_dbm, DBM-based authorization control, , , most)
-
-dnl - and just in case all of the above punt; a default handler to
-dnl keep the bad guys out.
-APACHE_MODULE(authz_default, authorization control backstopper, , , yes)
-
-dnl these are the front-end authentication modules
-
-APACHE_MODULE(auth_basic, basic authentication, , , yes)
APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
ap_old_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
- AC_TRY_COMPILE([#include <apr.h>], [
-#if !APR_HAS_RANDOM
-#error You need APR random support to use mod_auth_digest.
-#endif], , enable_auth_digest=no)
+ AC_TRY_COMPILE([#include <apr.h>],
+ [#if !APR_HAS_RANDOM
+ #error You need APR random support to use auth_digest.
+ #endif],,
+ enable_auth_digest=no)
CPPFLAGS=$ap_old_cppflags
])
diff --git a/modules/aaa/mod_authz_host.c b/modules/aaa/mod_access.c
similarity index 70%
rename from modules/aaa/mod_authz_host.c
rename to modules/aaa/mod_access.c
index 5e15d9c..af377aa 100644
--- a/modules/aaa/mod_authz_host.c
+++ b/modules/aaa/mod_access.c
@@ -65,7 +65,7 @@
#include "apr_strings.h"
#include "apr_network_io.h"
-#include "apr_md5.h"
+#include "apr_lib.h"
#define APR_WANT_STRFUNC
#define APR_WANT_BYTEFUNC
@@ -108,15 +108,15 @@
int order[METHODS];
apr_array_header_t *allows;
apr_array_header_t *denys;
-} authz_host_dir_conf;
+} access_dir_conf;
-module AP_MODULE_DECLARE_DATA authz_host_module;
+module AP_MODULE_DECLARE_DATA access_module;
-static void *create_authz_host_dir_config(apr_pool_t *p, char *dummy)
+static void *create_access_dir_config(apr_pool_t *p, char *dummy)
{
int i;
- authz_host_dir_conf *conf =
- (authz_host_dir_conf *)apr_pcalloc(p, sizeof(authz_host_dir_conf));
+ access_dir_conf *conf =
+ (access_dir_conf *)apr_pcalloc(p, sizeof(access_dir_conf));
for (i = 0; i < METHODS; ++i) {
conf->order[i] = DENY_THEN_ALLOW;
@@ -129,21 +129,21 @@
static const char *order(cmd_parms *cmd, void *dv, const char *arg)
{
- authz_host_dir_conf *d = (authz_host_dir_conf *) dv;
+ access_dir_conf *d = (access_dir_conf *) dv;
int i, o;
if (!strcasecmp(arg, "allow,deny"))
- o = ALLOW_THEN_DENY;
+ o = ALLOW_THEN_DENY;
else if (!strcasecmp(arg, "deny,allow"))
- o = DENY_THEN_ALLOW;
+ o = DENY_THEN_ALLOW;
else if (!strcasecmp(arg, "mutual-failure"))
- o = MUTUAL_FAILURE;
+ o = MUTUAL_FAILURE;
else
- return "unknown order";
+ return "unknown order";
for (i = 0; i < METHODS; ++i)
- if (cmd->limited & (AP_METHOD_BIT << i))
- d->order[i] = o;
+ if (cmd->limited & (AP_METHOD_BIT << i))
+ d->order[i] = o;
return NULL;
}
@@ -151,7 +151,7 @@
static const char *allow_cmd(cmd_parms *cmd, void *dv, const char *from,
const char *where_c)
{
- authz_host_dir_conf *d = (authz_host_dir_conf *) dv;
+ access_dir_conf *d = (access_dir_conf *) dv;
allowdeny *a;
char *where = apr_pstrdup(cmd->pool, where_c);
char *s;
@@ -159,19 +159,19 @@
apr_status_t rv;
if (strcasecmp(from, "from"))
- return "allow and deny must be followed by 'from'";
+ return "allow and deny must be followed by 'from'";
a = (allowdeny *) apr_array_push(cmd->info ? d->allows : d->denys);
a->x.from = where;
a->limited = cmd->limited;
if (!strncasecmp(where, "env=", 4)) {
- a->type = T_ENV;
- a->x.from += 4;
+ a->type = T_ENV;
+ a->x.from += 4;
}
else if (!strcasecmp(where, "all")) {
- a->type = T_ALL;
+ a->type = T_ALL;
}
else if ((s = strchr(where, '/'))) {
*s++ = '\0';
@@ -194,7 +194,7 @@
a->type = T_IP;
}
else { /* no slash, didn't look like an IP address => must be a host */
- a->type = T_HOST;
+ a->type = T_HOST;
}
return NULL;
@@ -202,7 +202,7 @@
static char its_an_allow;
-static const command_rec authz_host_cmds[] =
+static const command_rec access_cmds[] =
{
AP_INIT_TAKE1("order", order, NULL, OR_LIMIT,
"'allow,deny', 'deny,allow', or 'mutual-failure'"),
@@ -219,25 +219,21 @@
int wl = strlen(what);
if ((wl - dl) >= 0) {
- if (strcasecmp(domain, &what[wl - dl]) != 0) {
- return 0;
- }
+ if (strcasecmp(domain, &what[wl - dl]) != 0)
+ return 0;
- /* Make sure we matched an *entire* subdomain --- if the user
- * said 'allow from good.com', we don't want people from nogood.com
- * to be able to get in.
- */
+ /* Make sure we matched an *entire* subdomain --- if the user
+ * said 'allow from good.com', we don't want people from nogood.com
+ * to be able to get in.
+ */
- if (wl == dl) {
- return 1; /* matched whole thing */
- }
- else {
- return (domain[0] == '.' || what[wl - dl - 1] == '.');
- }
+ if (wl == dl)
+ return 1; /* matched whole thing */
+ else
+ return (domain[0] == '.' || what[wl - dl - 1] == '.');
}
- else {
- return 0;
- }
+ else
+ return 0;
}
static int find_allowdeny(request_rec *r, apr_array_header_t *a, int method)
@@ -250,52 +246,46 @@
const char *remotehost = NULL;
for (i = 0; i < a->nelts; ++i) {
- if (!(mmask & ap[i].limited)) {
- continue;
- }
+ if (!(mmask & ap[i].limited))
+ continue;
- switch (ap[i].type) {
- case T_ENV:
- if (apr_table_get(r->subprocess_env, ap[i].x.from)) {
- return 1;
- }
- break;
+ switch (ap[i].type) {
+ case T_ENV:
+ if (apr_table_get(r->subprocess_env, ap[i].x.from)) {
+ return 1;
+ }
+ break;
- case T_ALL:
- return 1;
+ case T_ALL:
+ return 1;
- case T_IP:
+ case T_IP:
if (apr_ipsubnet_test(ap[i].x.ip, r->connection->remote_addr)) {
return 1;
}
break;
- case T_HOST:
- if (!gothost) {
+ case T_HOST:
+ if (!gothost) {
int remotehost_is_ip;
- remotehost = ap_get_remote_host(r->connection,
- r->per_dir_config,
- REMOTE_DOUBLE_REV,
- &remotehost_is_ip);
+ remotehost = ap_get_remote_host(r->connection, r->per_dir_config,
+ REMOTE_DOUBLE_REV, &remotehost_is_ip);
- if ((remotehost == NULL) || remotehost_is_ip) {
- gothost = 1;
- }
- else {
- gothost = 2;
- }
- }
+ if ((remotehost == NULL) || remotehost_is_ip)
+ gothost = 1;
+ else
+ gothost = 2;
+ }
- if ((gothost == 2) && in_domain(ap[i].x.from, remotehost)) {
- return 1;
- }
- break;
+ if ((gothost == 2) && in_domain(ap[i].x.from, remotehost))
+ return 1;
+ break;
- case T_FAIL:
- /* do nothing? */
- break;
- }
+ case T_FAIL:
+ /* do nothing? */
+ break;
+ }
}
return 0;
@@ -305,34 +295,28 @@
{
int method = r->method_number;
int ret = OK;
- authz_host_dir_conf *a = (authz_host_dir_conf *)
- ap_get_module_config(r->per_dir_config, &authz_host_module);
+ access_dir_conf *a = (access_dir_conf *)
+ ap_get_module_config(r->per_dir_config, &access_module);
if (a->order[method] == ALLOW_THEN_DENY) {
ret = HTTP_FORBIDDEN;
- if (find_allowdeny(r, a->allows, method)) {
+ if (find_allowdeny(r, a->allows, method))
ret = OK;
- }
- if (find_allowdeny(r, a->denys, method)) {
+ if (find_allowdeny(r, a->denys, method))
ret = HTTP_FORBIDDEN;
- }
}
else if (a->order[method] == DENY_THEN_ALLOW) {
- if (find_allowdeny(r, a->denys, method)) {
+ if (find_allowdeny(r, a->denys, method))
ret = HTTP_FORBIDDEN;
- }
- if (find_allowdeny(r, a->allows, method)) {
+ if (find_allowdeny(r, a->allows, method))
ret = OK;
- }
}
else {
if (find_allowdeny(r, a->allows, method)
- && !find_allowdeny(r, a->denys, method)) {
+ && !find_allowdeny(r, a->denys, method))
ret = OK;
- }
- else {
+ else
ret = HTTP_FORBIDDEN;
- }
}
if (ret == HTTP_FORBIDDEN
@@ -347,17 +331,16 @@
static void register_hooks(apr_pool_t *p)
{
- /* This can be access checker since we don't require r->user to be set. */
ap_hook_access_checker(check_dir_access,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA authz_host_module =
+module AP_MODULE_DECLARE_DATA access_module =
{
STANDARD20_MODULE_STUFF,
- create_authz_host_dir_config, /* dir config creater */
- NULL, /* dir merger --- default is to override */
- NULL, /* server config */
- NULL, /* merge server config */
- authz_host_cmds,
- register_hooks /* register hooks */
+ create_access_dir_config, /* dir config creater */
+ NULL, /* dir merger --- default is to override */
+ NULL, /* server config */
+ NULL, /* merge server config */
+ access_cmds,
+ register_hooks /* register hooks */
};
diff --git a/modules/aaa/mod_access.dsp b/modules/aaa/mod_access.dsp
new file mode 100644
index 0000000..ee1118b
--- /dev/null
+++ b/modules/aaa/mod_access.dsp
@@ -0,0 +1,128 @@
+# Microsoft Developer Studio Project File - Name="mod_access" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=mod_access - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "mod_access.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "mod_access.mak" CFG="mod_access - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "mod_access - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_access - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "mod_access - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_access" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_access.so" /base:@..\..\os\win32\BaseAddr.ref,mod_access
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_access.so" /base:@..\..\os\win32\BaseAddr.ref,mod_access
+
+!ELSEIF "$(CFG)" == "mod_access - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_access" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_access.so" /base:@..\..\os\win32\BaseAddr.ref,mod_access
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_access.so" /base:@..\..\os\win32\BaseAddr.ref,mod_access
+
+!ENDIF
+
+# Begin Target
+
+# Name "mod_access - Win32 Release"
+# Name "mod_access - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\mod_access.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_access.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF "$(CFG)" == "mod_access - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_access.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_access "access_module for Apache" ../../include/ap_release.h > .\mod_access.rc
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "mod_access - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_access.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_access "access_module for Apache" ../../include/ap_release.h > .\mod_access.rc
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/modules/aaa/mod_access.exp b/modules/aaa/mod_access.exp
new file mode 100644
index 0000000..f8aff33
--- /dev/null
+++ b/modules/aaa/mod_access.exp
@@ -0,0 +1 @@
+access_module
diff --git a/modules/aaa/mod_auth.c b/modules/aaa/mod_auth.c
new file mode 100644
index 0000000..ed349bd
--- /dev/null
+++ b/modules/aaa/mod_auth.c
@@ -0,0 +1,356 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
+ */
+
+/*
+ * http_auth: authentication
+ *
+ * Rob McCool
+ *
+ * Adapted to Apache by rst.
+ *
+ * dirkx - Added Authoritative control to allow passing on to lower
+ * modules if and only if the userid is not known to this
+ * module. A known user with a faulty or absent password still
+ * causes an AuthRequired. The default is 'Authoritative', i.e.
+ * no control is passed along.
+ */
+
+#include "apr_strings.h"
+#include "apr_md5.h" /* for apr_password_validate */
+
+#include "ap_config.h"
+#include "httpd.h"
+#include "http_config.h"
+#include "http_core.h"
+#include "http_log.h"
+#include "http_protocol.h"
+#include "http_request.h"
+
+
+typedef struct {
+ char *auth_pwfile;
+ char *auth_grpfile;
+ int auth_authoritative;
+} auth_config_rec;
+
+static void *create_auth_dir_config(apr_pool_t *p, char *d)
+{
+ auth_config_rec *conf = apr_palloc(p, sizeof(*conf));
+
+ conf->auth_pwfile = NULL; /* just to illustrate the default really */
+ conf->auth_grpfile = NULL; /* unless you have a broken HP cc */
+ conf->auth_authoritative = 1; /* keep the fortress secure by default */
+ return conf;
+}
+
+static const char *set_auth_slot(cmd_parms *cmd, void *offset, const char *f,
+ const char *t)
+{
+ if (t && strcmp(t, "standard")) {
+ return apr_pstrcat(cmd->pool, "Invalid auth file type: ", t, NULL);
+ }
+
+ return ap_set_file_slot(cmd, offset, f);
+}
+
+static const command_rec auth_cmds[] =
+{
+ AP_INIT_TAKE12("AuthUserFile", set_auth_slot,
+ (void *)APR_OFFSETOF(auth_config_rec, auth_pwfile),
+ OR_AUTHCFG, "text file containing user IDs and passwords"),
+ AP_INIT_TAKE12("AuthGroupFile", set_auth_slot,
+ (void *)APR_OFFSETOF(auth_config_rec, auth_grpfile),
+ OR_AUTHCFG,
+ "text file containing group names and member user IDs"),
+ AP_INIT_FLAG("AuthAuthoritative", ap_set_flag_slot,
+ (void *)APR_OFFSETOF(auth_config_rec, auth_authoritative),
+ OR_AUTHCFG,
+ "Set to 'no' to allow access control to be passed along to "
+ "lower modules if the UserID is not known to this module"),
+ {NULL}
+};
+
+module AP_MODULE_DECLARE_DATA auth_module;
+
+static char *get_pw(request_rec *r, char *user, char *auth_pwfile)
+{
+ ap_configfile_t *f;
+ char l[MAX_STRING_LEN];
+ const char *rpw, *w;
+ apr_status_t status;
+
+ if ((status = ap_pcfg_openfile(&f, r->pool, auth_pwfile)) != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
+ "Could not open password file: %s", auth_pwfile);
+ return NULL;
+ }
+ while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
+ if ((l[0] == '#') || (!l[0])) {
+ continue;
+ }
+ rpw = l;
+ w = ap_getword(r->pool, &rpw, ':');
+
+ if (!strcmp(user, w)) {
+ ap_cfg_closefile(f);
+ return ap_getword(r->pool, &rpw, ':');
+ }
+ }
+ ap_cfg_closefile(f);
+ return NULL;
+}
+
+static apr_table_t *groups_for_user(apr_pool_t *p, char *user, char *grpfile)
+{
+ ap_configfile_t *f;
+ apr_table_t *grps = apr_table_make(p, 15);
+ apr_pool_t *sp;
+ char l[MAX_STRING_LEN];
+ const char *group_name, *ll, *w;
+ apr_status_t status;
+
+ if ((status = ap_pcfg_openfile(&f, p, grpfile)) != APR_SUCCESS) {
+/*add? aplog_error(APLOG_MARK, APLOG_ERR, NULL,
+ "Could not open group file: %s", grpfile);*/
+ return NULL;
+ }
+
+ apr_pool_create(&sp, p);
+
+ while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
+ if ((l[0] == '#') || (!l[0])) {
+ continue;
+ }
+ ll = l;
+ apr_pool_clear(sp);
+
+ group_name = ap_getword(sp, &ll, ':');
+
+ while (ll[0]) {
+ w = ap_getword_conf(sp, &ll);
+ if (!strcmp(w, user)) {
+ apr_table_setn(grps, apr_pstrdup(p, group_name), "in");
+ break;
+ }
+ }
+ }
+ ap_cfg_closefile(f);
+ apr_pool_destroy(sp);
+ return grps;
+}
+
+/* These functions return 0 if client is OK, and proper error status
+ * if not... either HTTP_UNAUTHORIZED, if we made a check, and it failed, or
+ * HTTP_INTERNAL_SERVER_ERROR, if things are so totally confused that we
+ * couldn't figure out how to tell if the client is authorized or not.
+ *
+ * If they return DECLINED, and all other modules also decline, that's
+ * treated by the server core as a configuration error, logged and
+ * reported as such.
+ */
+
+/* Determine user ID, and check if it really is that user, for HTTP
+ * basic authentication...
+ */
+
+static int authenticate_basic_user(request_rec *r)
+{
+ auth_config_rec *conf = ap_get_module_config(r->per_dir_config,
+ &auth_module);
+ const char *sent_pw;
+ char *real_pw;
+ apr_status_t invalid_pw;
+ int res;
+
+ if ((res = ap_get_basic_auth_pw(r, &sent_pw))) {
+ return res;
+ }
+
+ if (!conf->auth_pwfile) {
+ return DECLINED;
+ }
+
+ if (!(real_pw = get_pw(r, r->user, conf->auth_pwfile))) {
+ if (!(conf->auth_authoritative)) {
+ return DECLINED;
+ }
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "user %s not found: %s", r->user, r->uri);
+ ap_note_basic_auth_failure(r);
+ return HTTP_UNAUTHORIZED;
+ }
+ invalid_pw = apr_password_validate(sent_pw, real_pw);
+ if (invalid_pw != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "user %s: authentication failure for \"%s\": "
+ "Password Mismatch",
+ r->user, r->uri);
+ ap_note_basic_auth_failure(r);
+ return HTTP_UNAUTHORIZED;
+ }
+ return OK;
+}
+
+/* Checking ID */
+
+static int check_user_access(request_rec *r)
+{
+ auth_config_rec *conf = ap_get_module_config(r->per_dir_config,
+ &auth_module);
+ char *user = r->user;
+ int m = r->method_number;
+ int method_restricted = 0;
+ register int x;
+ const char *t, *w;
+ apr_table_t *grpstatus;
+ const apr_array_header_t *reqs_arr = ap_requires(r);
+ require_line *reqs;
+
+ /* BUG FIX: tadc, 11-Nov-1995. If there is no "requires" directive,
+ * then any user will do.
+ */
+ if (!reqs_arr) {
+ return OK;
+ }
+ reqs = (require_line *)reqs_arr->elts;
+
+ if (conf->auth_grpfile) {
+ grpstatus = groups_for_user(r->pool, user, conf->auth_grpfile);
+ }
+ else {
+ grpstatus = NULL;
+ }
+
+ for (x = 0; x < reqs_arr->nelts; x++) {
+
+ if (!(reqs[x].method_mask & (AP_METHOD_BIT << m))) {
+ continue;
+ }
+
+ method_restricted = 1;
+
+ t = reqs[x].requirement;
+ w = ap_getword_white(r->pool, &t);
+ if (!strcmp(w, "valid-user")) {
+ return OK;
+ }
+ if (!strcmp(w, "user")) {
+ while (t[0]) {
+ w = ap_getword_conf(r->pool, &t);
+ if (!strcmp(user, w)) {
+ return OK;
+ }
+ }
+ }
+ else if (!strcmp(w, "group")) {
+ if (!grpstatus) {
+ return DECLINED; /* DBM group? Something else? */
+ }
+
+ while (t[0]) {
+ w = ap_getword_conf(r->pool, &t);
+ if (apr_table_get(grpstatus, w)) {
+ return OK;
+ }
+ }
+ }
+ else if (conf->auth_authoritative) {
+ /* if we aren't authoritative, any require directive could be
+ * valid even if we don't grok it. However, if we are
+ * authoritative, we can warn the user they did something wrong.
+ * That something could be a missing "AuthAuthoritative off", but
+ * more likely is a typo in the require directive.
+ */
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "access to %s failed, reason: unknown require "
+ "directive:\"%s\"", r->uri, reqs[x].requirement);
+ }
+ }
+
+ if (!method_restricted) {
+ return OK;
+ }
+
+ if (!(conf->auth_authoritative)) {
+ return DECLINED;
+ }
+
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "access to %s failed, reason: user %s not allowed access",
+ r->uri, user);
+
+ ap_note_basic_auth_failure(r);
+ return HTTP_UNAUTHORIZED;
+}
+
+static void register_hooks(apr_pool_t *p)
+{
+ ap_hook_check_user_id(authenticate_basic_user,NULL,NULL,APR_HOOK_MIDDLE);
+ ap_hook_auth_checker(check_user_access,NULL,NULL,APR_HOOK_MIDDLE);
+}
+
+module AP_MODULE_DECLARE_DATA auth_module =
+{
+ STANDARD20_MODULE_STUFF,
+ create_auth_dir_config, /* dir config creater */
+ NULL, /* dir merger --- default is to override */
+ NULL, /* server config */
+ NULL, /* merge server config */
+ auth_cmds, /* command apr_table_t */
+ register_hooks /* register hooks */
+};
diff --git a/modules/aaa/mod_auth.dsp b/modules/aaa/mod_auth.dsp
new file mode 100644
index 0000000..b2d6863
--- /dev/null
+++ b/modules/aaa/mod_auth.dsp
@@ -0,0 +1,128 @@
+# Microsoft Developer Studio Project File - Name="mod_auth" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=mod_auth - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "mod_auth.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "mod_auth.mak" CFG="mod_auth - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "mod_auth - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_auth - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "mod_auth - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_auth" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth
+
+!ELSEIF "$(CFG)" == "mod_auth - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_auth" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth
+
+!ENDIF
+
+# Begin Target
+
+# Name "mod_auth - Win32 Release"
+# Name "mod_auth - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\mod_auth.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_auth.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF "$(CFG)" == "mod_auth - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_auth.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_auth "auth_module for Apache" ../../include/ap_release.h > .\mod_auth.rc
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "mod_auth - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_auth.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_auth "auth_module for Apache" ../../include/ap_release.h > .\mod_auth.rc
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/modules/aaa/mod_auth.exp b/modules/aaa/mod_auth.exp
new file mode 100644
index 0000000..76adad0
--- /dev/null
+++ b/modules/aaa/mod_auth.exp
@@ -0,0 +1 @@
+auth_module
diff --git a/modules/aaa/mod_auth.h b/modules/aaa/mod_auth.h
deleted file mode 100644
index bf33460..0000000
--- a/modules/aaa/mod_auth.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-#ifndef APACHE_MOD_AUTH_H
-#define APACHE_MOD_AUTH_H
-
-#include "apr_pools.h"
-#include "apr_hash.h"
-
-#include "httpd.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define AUTHN_PROVIDER_GROUP "authn"
-#define AUTHN_DEFAULT_PROVIDER "file"
-
-typedef enum {
- AUTH_DENIED,
- AUTH_GRANTED,
- AUTH_USER_FOUND,
- AUTH_USER_NOT_FOUND,
- AUTH_GENERAL_ERROR
-} authn_status;
-
-typedef struct {
- /* Given a username and password, expected to return AUTH_GRANTED
- * if we can validate this user/password combination.
- */
- authn_status (*check_password)(request_rec *r, const char *user,
- const char *password);
-
- /* Given a user and realm, expected to return AUTH_USER_FOUND if we
- * can find a md5 hash of 'user:realm:password'
- */
- authn_status (*get_realm_hash)(request_rec *r, const char *user,
- const char *realm, char **rethash);
-} authn_provider;
-
-/* A linked-list of authn providers. */
-typedef struct authn_provider_list authn_provider_list;
-
-struct authn_provider_list {
- const char *provider_name;
- const authn_provider *provider;
- authn_provider_list *next;
-};
-
-typedef struct {
- /* For a given user, return a hash of all groups the user belongs to. */
- apr_hash_t * (*get_user_groups)(request_rec *r, const char *user);
-} authz_provider;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/modules/aaa/mod_authn_anon.c b/modules/aaa/mod_auth_anon.c
similarity index 68%
rename from modules/aaa/mod_authn_anon.c
rename to modules/aaa/mod_auth_anon.c
index 28c1c81..0726e9f 100644
--- a/modules/aaa/mod_authn_anon.c
+++ b/modules/aaa/mod_auth_anon.c
@@ -106,87 +106,85 @@
#include "http_request.h"
#include "http_protocol.h"
-typedef struct anon_auth_pw {
+typedef struct anon_auth {
char *password;
- struct anon_auth_pw *next;
-} anon_auth_pw;
+ struct anon_auth *next;
+} anon_auth;
typedef struct {
- anon_auth_pw *passwords;
- int nouserid;
- int logemail;
- int verifyemail;
- int mustemail;
- int authoritative;
-} authn_anon_config_rec;
+ anon_auth *anon_auth_passwords;
+ int anon_auth_nouserid;
+ int anon_auth_logemail;
+ int anon_auth_verifyemail;
+ int anon_auth_mustemail;
+ int anon_auth_authoritative;
+} anon_auth_config_rec;
-static void *create_authn_anon_dir_config(apr_pool_t *p, char *d)
+static void *create_anon_auth_dir_config(apr_pool_t *p, char *d)
{
- authn_anon_config_rec *conf = apr_palloc(p, sizeof(*conf));
+ anon_auth_config_rec *conf = apr_palloc(p, sizeof(*conf));
/* just to illustrate the defaults really. */
- conf->passwords = NULL;
+ conf->anon_auth_passwords = NULL;
- conf->nouserid = 0;
- conf->logemail = 1;
- conf->verifyemail = 0;
- conf->mustemail = 1;
- conf->authoritative = 0;
+ conf->anon_auth_nouserid = 0;
+ conf->anon_auth_logemail = 1;
+ conf->anon_auth_verifyemail = 0;
+ conf->anon_auth_mustemail = 1;
+ conf->anon_auth_authoritative = 0;
return conf;
}
static const char *anon_set_string_slots(cmd_parms *cmd,
void *my_config, const char *arg)
{
- authn_anon_config_rec *conf = my_config;
- anon_auth_pw *first;
+ anon_auth_config_rec *conf = my_config;
+ anon_auth *first;
- if (!(*arg)) {
- return "Anonymous string cannot be empty, use Anonymous_NoUserId";
- }
+ if (!(*arg))
+ return "Anonymous string cannot be empty, use Anonymous_NoUserId instead";
/* squeeze in a record */
- first = conf->passwords;
+ first = conf->anon_auth_passwords;
- if (!(conf->passwords = apr_palloc(cmd->pool, sizeof(anon_auth_pw))) ||
- !(conf->passwords->password = apr_pstrdup(cmd->pool, arg))) {
- return "Failed to claim memory for an anonymous password...";
- }
+ if (!(conf->anon_auth_passwords = apr_palloc(cmd->pool, sizeof(anon_auth))) ||
+ !(conf->anon_auth_passwords->password = apr_pstrdup(cmd->pool, arg)))
+ return "Failed to claim memory for an anonymous password...";
/* and repair the next */
- conf->passwords->next = first;
+ conf->anon_auth_passwords->next = first;
return NULL;
}
-static const command_rec authn_anon_cmds[] =
+static const command_rec anon_auth_cmds[] =
{
AP_INIT_ITERATE("Anonymous", anon_set_string_slots, NULL, OR_AUTHCFG,
"a space-separated list of user IDs"),
AP_INIT_FLAG("Anonymous_MustGiveEmail", ap_set_flag_slot,
- (void *)APR_OFFSETOF(authn_anon_config_rec, mustemail),
+ (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_mustemail),
OR_AUTHCFG, "Limited to 'on' or 'off'"),
AP_INIT_FLAG("Anonymous_NoUserId", ap_set_flag_slot,
- (void *)APR_OFFSETOF(authn_anon_config_rec, nouserid),
+ (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_nouserid),
OR_AUTHCFG, "Limited to 'on' or 'off'"),
AP_INIT_FLAG("Anonymous_VerifyEmail", ap_set_flag_slot,
- (void *)APR_OFFSETOF(authn_anon_config_rec, verifyemail),
+ (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_verifyemail),
OR_AUTHCFG, "Limited to 'on' or 'off'"),
AP_INIT_FLAG("Anonymous_LogEmail", ap_set_flag_slot,
- (void *)APR_OFFSETOF(authn_anon_config_rec, logemail),
+ (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_logemail),
OR_AUTHCFG, "Limited to 'on' or 'off'"),
AP_INIT_FLAG("Anonymous_Authoritative", ap_set_flag_slot,
- (void *)APR_OFFSETOF(authn_anon_config_rec, authoritative),
+ (void *)APR_OFFSETOF(anon_auth_config_rec, anon_auth_authoritative),
OR_AUTHCFG, "Limited to 'on' or 'off'"),
{NULL}
};
-module AP_MODULE_DECLARE_DATA authn_anon_module;
+module AP_MODULE_DECLARE_DATA auth_anon_module;
static int anon_authenticate_basic_user(request_rec *r)
{
- authn_anon_config_rec *conf = ap_get_module_config(r->per_dir_config,
- &authn_anon_module);
+ anon_auth_config_rec *conf = ap_get_module_config(r->per_dir_config,
+ &auth_anon_module);
const char *sent_pw;
int res = DECLINED;
@@ -195,18 +193,18 @@
}
/* Ignore if we are not configured */
- if (!conf->passwords) {
+ if (!conf->anon_auth_passwords) {
return DECLINED;
}
/* Do we allow an empty userID and/or is it the magic one
*/
- if ((!(r->user[0])) && (conf->nouserid)) {
+ if ((!(r->user[0])) && (conf->anon_auth_nouserid)) {
res = OK;
}
else {
- anon_auth_pw *p = conf->passwords;
+ anon_auth *p = conf->anon_auth_passwords;
res = DECLINED;
while ((res == DECLINED) && (p != NULL)) {
if (!(strcasecmp(r->user, p->password))) {
@@ -215,13 +213,16 @@
p = p->next;
}
}
- /* Is username is OK and password been filled out (if required) */
- if ((res == OK) && ((!conf->mustemail) || strlen(sent_pw)) &&
+ if (
+ /* username is OK */
+ (res == OK)
+ /* password been filled out ? */
+ && ((!conf->anon_auth_mustemail) || strlen(sent_pw))
/* does the password look like an email address ? */
- ((!conf->verifyemail) ||
- ((strpbrk("@", sent_pw) != NULL) &&
- (strpbrk(".", sent_pw) != NULL)))) {
- if (conf->logemail && ap_is_initial_req(r)) {
+ && ((!conf->anon_auth_verifyemail)
+ || ((strpbrk("@", sent_pw) != NULL)
+ && (strpbrk(".", sent_pw) != NULL)))) {
+ if (conf->anon_auth_logemail && ap_is_initial_req(r)) {
ap_log_rerror(APLOG_MARK, APLOG_INFO, APR_SUCCESS, r,
"Anonymous: Passwd <%s> Accepted",
sent_pw ? sent_pw : "\'none\'");
@@ -229,7 +230,7 @@
return OK;
}
else {
- if (conf->authoritative) {
+ if (conf->anon_auth_authoritative) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r,
"Anonymous: Authoritative, Passwd <%s> not accepted",
sent_pw ? sent_pw : "\'none\'");
@@ -241,18 +242,39 @@
return DECLINED;
}
+static int check_anon_access(request_rec *r)
+{
+#ifdef NOTYET
+ conn_rec *c = r->connection;
+ anon_auth_config_rec *conf = ap_get_module_config(r->per_dir_config,
+ &auth_anon_module);
+
+ if (!conf->anon_auth) {
+ return DECLINED;
+ }
+
+ if (strcasecmp(r->connection->user, conf->anon_auth)) {
+ return DECLINED;
+ }
+
+ return OK;
+#endif
+ return DECLINED;
+}
+
static void register_hooks(apr_pool_t *p)
{
ap_hook_check_user_id(anon_authenticate_basic_user,NULL,NULL,APR_HOOK_MIDDLE);
+ ap_hook_auth_checker(check_anon_access,NULL,NULL,APR_HOOK_MIDDLE);
}
-module AP_MODULE_DECLARE_DATA authn_anon_module =
+module AP_MODULE_DECLARE_DATA auth_anon_module =
{
STANDARD20_MODULE_STUFF,
- create_authn_anon_dir_config, /* dir config creater */
- NULL, /* dir merger ensure strictness */
- NULL, /* server config */
- NULL, /* merge server config */
- authn_anon_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
+ create_anon_auth_dir_config, /* dir config creater */
+ NULL, /* dir merger ensure strictness */
+ NULL, /* server config */
+ NULL, /* merge server config */
+ anon_auth_cmds, /* command apr_table_t */
+ register_hooks /* register hooks */
};
diff --git a/modules/aaa/mod_authn_dbm.dsp b/modules/aaa/mod_auth_anon.dsp
similarity index 60%
rename from modules/aaa/mod_authn_dbm.dsp
rename to modules/aaa/mod_auth_anon.dsp
index dc6558f..9f2cd2d 100644
--- a/modules/aaa/mod_authn_dbm.dsp
+++ b/modules/aaa/mod_auth_anon.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="mod_authn_dbm" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="mod_auth_anon" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=mod_authn_dbm - Win32 Debug
+CFG=mod_auth_anon - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "mod_authn_dbm.mak".
+!MESSAGE NMAKE /f "mod_auth_anon.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "mod_authn_dbm.mak" CFG="mod_authn_dbm - Win32 Debug"
+!MESSAGE NMAKE /f "mod_auth_anon.mak" CFG="mod_auth_anon - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "mod_authn_dbm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_authn_dbm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_auth_anon - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_auth_anon - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -29,7 +29,7 @@
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "mod_authn_dbm - Win32 Release"
+!IF "$(CFG)" == "mod_auth_anon - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -43,19 +43,19 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_authn_dbm" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_auth_anon" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authn_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_dbm
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authn_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_dbm
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon
-!ELSEIF "$(CFG)" == "mod_authn_dbm - Win32 Debug"
+!ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -69,55 +69,55 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_authn_dbm" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_auth_anon" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authn_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_dbm
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authn_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_dbm
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon
!ENDIF
# Begin Target
-# Name "mod_authn_dbm - Win32 Release"
-# Name "mod_authn_dbm - Win32 Debug"
+# Name "mod_auth_anon - Win32 Release"
+# Name "mod_auth_anon - Win32 Debug"
# Begin Source File
-SOURCE=.\mod_authn_dbm.c
+SOURCE=.\mod_auth_anon.c
# End Source File
# Begin Source File
-SOURCE=.\mod_authn_dbm.rc
+SOURCE=.\mod_auth_anon.rc
# End Source File
# Begin Source File
SOURCE=..\..\build\win32\win32ver.awk
-!IF "$(CFG)" == "mod_authn_dbm - Win32 Release"
+!IF "$(CFG)" == "mod_auth_anon - Win32 Release"
# PROP Ignore_Default_Tool 1
# Begin Custom Build - Creating Version Resource
InputPath=..\..\build\win32\win32ver.awk
-".\mod_authn_dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authn_dbm "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authn_dbm.rc
+".\mod_auth_anon.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_auth_anon "auth_anon_module for Apache" ../../include/ap_release.h > .\mod_auth_anon.rc
# End Custom Build
-!ELSEIF "$(CFG)" == "mod_authn_dbm - Win32 Debug"
+!ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug"
# PROP Ignore_Default_Tool 1
# Begin Custom Build - Creating Version Resource
InputPath=..\..\build\win32\win32ver.awk
-".\mod_authn_dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authn_dbm "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authn_dbm.rc
+".\mod_auth_anon.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_auth_anon "auth_anon_module for Apache" ../../include/ap_release.h > .\mod_auth_anon.rc
# End Custom Build
diff --git a/modules/aaa/mod_auth_anon.exp b/modules/aaa/mod_auth_anon.exp
new file mode 100644
index 0000000..6328253
--- /dev/null
+++ b/modules/aaa/mod_auth_anon.exp
@@ -0,0 +1 @@
+auth_anon_module
diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c
deleted file mode 100644
index a5f99be..0000000
--- a/modules/aaa/mod_auth_basic.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
-#include "apr_strings.h"
-#include "apr_md5.h" /* for apr_password_validate */
-#include "apr_lib.h" /* for apr_isspace */
-#include "apr_base64.h" /* for apr_base64_decode et al */
-#define APR_WANT_STRFUNC /* for strcasecmp */
-#include "apr_want.h"
-
-#include "ap_config.h"
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h"
-#include "ap_provider.h"
-
-#include "mod_auth.h"
-
-typedef struct {
- authn_provider_list *providers;
- char *dir;
- int authoritative;
-} auth_basic_config_rec;
-
-static void *create_auth_basic_dir_config(apr_pool_t *p, char *d)
-{
- auth_basic_config_rec *conf = apr_pcalloc(p, sizeof(*conf));
-
- conf->dir = d;
- /* Any failures are fatal. */
- conf->authoritative = 1;
-
- return conf;
-}
-
-static const char *add_authn_provider(cmd_parms *cmd, void *config,
- const char *arg)
-{
- auth_basic_config_rec *conf = (auth_basic_config_rec*)config;
- authn_provider_list *newp;
- const char *provider_name;
-
- if (strcasecmp(arg, "on") == 0) {
- provider_name = AUTHN_DEFAULT_PROVIDER;
- }
- else if (strcasecmp(arg, "off") == 0) {
- /* Clear all configured providers and return. */
- conf->providers = NULL;
- return NULL;
- }
- else {
- provider_name = apr_pstrdup(cmd->pool, arg);
- }
-
- newp = apr_pcalloc(cmd->pool, sizeof(authn_provider_list));
- newp->provider_name = provider_name;
-
- /* lookup and cache the actual provider now */
- newp->provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
- newp->provider_name);
-
- if (newp->provider == NULL) {
- /* by the time they use it, the provider should be loaded and
- registered with us. */
- return apr_psprintf(cmd->pool,
- "Unknown Authn provider: %s",
- newp->provider_name);
- }
-
- /* Add it to the list now. */
- if (!conf->providers) {
- conf->providers = newp;
- }
- else {
- authn_provider_list *last = conf->providers;
-
- while (last->next) {
- last = last->next;
- }
- last->next = newp;
- }
-
- return NULL;
-}
-
-static const command_rec auth_basic_cmds[] =
-{
- AP_INIT_ITERATE("AuthBasicProvider", add_authn_provider, NULL, ACCESS_CONF,
- "specify the auth providers for a directory or location"),
- AP_INIT_FLAG("AuthBasicAuthoritative", ap_set_flag_slot,
- (void *)APR_OFFSETOF(auth_basic_config_rec, authoritative),
- OR_AUTHCFG,
- "Set to 'no' to allow access control to be passed along to "
- "lower modules if the UserID is not known to this module"),
- {NULL}
-};
-
-module AP_MODULE_DECLARE_DATA auth_basic_module;
-
-/* These functions return 0 if client is OK, and proper error status
- * if not... either HTTP_UNAUTHORIZED, if we made a check, and it failed, or
- * HTTP_INTERNAL_SERVER_ERROR, if things are so totally confused that we
- * couldn't figure out how to tell if the client is authorized or not.
- *
- * If they return DECLINED, and all other modules also decline, that's
- * treated by the server core as a configuration error, logged and
- * reported as such.
- */
-
-static void note_basic_auth_failure(request_rec *r)
-{
- apr_table_setn(r->err_headers_out,
- (PROXYREQ_PROXY == r->proxyreq) ? "Proxy-Authenticate"
- : "WWW-Authenticate",
- apr_pstrcat(r->pool, "Basic realm=\"", ap_auth_name(r),
- "\"", NULL));
-}
-
-static int get_basic_auth(request_rec *r, const char **user,
- const char **pw)
-{
- const char *auth_line;
- char *decoded_line;
- int length;
-
- /* Get the appropriate header */
- auth_line = apr_table_get(r->headers_in, (PROXYREQ_PROXY == r->proxyreq)
- ? "Proxy-Authorization"
- : "Authorization");
-
- if (!auth_line) {
- note_basic_auth_failure(r);
- return HTTP_UNAUTHORIZED;
- }
-
- if (strcasecmp(ap_getword(r->pool, &auth_line, ' '), "Basic")) {
- /* Client tried to authenticate using wrong auth scheme */
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "client used wrong authentication scheme: %s", r->uri);
- note_basic_auth_failure(r);
- return HTTP_UNAUTHORIZED;
- }
-
- /* Skip leading spaces. */
- while (apr_isspace(*auth_line)) {
- auth_line++;
- }
-
- decoded_line = apr_palloc(r->pool, apr_base64_decode_len(auth_line) + 1);
- length = apr_base64_decode(decoded_line, auth_line);
- /* Null-terminate the string. */
- decoded_line[length] = '\0';
-
- *user = ap_getword_nulls(r->pool, (const char**)&decoded_line, ':');
- *pw = decoded_line;
-
- return OK;
-}
-
-/* Determine user ID, and check if it really is that user, for HTTP
- * basic authentication...
- */
-static int authenticate_basic_user(request_rec *r)
-{
- auth_basic_config_rec *conf = ap_get_module_config(r->per_dir_config,
- &auth_basic_module);
- const char *sent_user, *sent_pw, *current_auth;
- int res;
- authn_status auth_result;
- authn_provider_list *current_provider;
-
- /* Are we configured to be Basic auth? */
- current_auth = ap_auth_type(r);
- if (!current_auth || strcasecmp(current_auth, "Basic")) {
- return DECLINED;
- }
-
- /* We need an authentication realm. */
- if (!ap_auth_name(r)) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR,
- 0, r, "need AuthName: %s", r->uri);
- return HTTP_INTERNAL_SERVER_ERROR;
- }
-
- r->ap_auth_type = "Basic";
-
- res = get_basic_auth(r, &sent_user, &sent_pw);
- if (res) {
- return res;
- }
-
- current_provider = conf->providers;
- do {
- const authn_provider *provider;
-
- /* For now, if a provider isn't set, we'll be nice and use the file
- * provider.
- */
- if (!current_provider) {
- provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
- AUTHN_DEFAULT_PROVIDER);
- }
- else {
- provider = current_provider->provider;
- }
-
- auth_result = provider->check_password(r, sent_user, sent_pw);
-
- /* Access is granted. Stop checking. */
- if (auth_result == AUTH_GRANTED) {
- break;
- }
-
- /* If we're not really configured for providers, stop now. */
- if (!conf->providers) {
- break;
- }
-
- current_provider = current_provider->next;
- } while (current_provider);
-
- if (auth_result != AUTH_GRANTED) {
- int return_code;
-
- /* If we're not authoritative, then any error is ignored. */
- if (!(conf->authoritative)) {
- return DECLINED;
- }
-
- switch (auth_result) {
- case AUTH_DENIED:
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "user %s: authentication failure for \"%s\": "
- "Password Mismatch",
- sent_user, r->uri);
- return_code = HTTP_UNAUTHORIZED;
- break;
- case AUTH_USER_NOT_FOUND:
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "user %s not found: %s", sent_user, r->uri);
- return_code = HTTP_UNAUTHORIZED;
- break;
- case AUTH_GENERAL_ERROR:
- default:
- /* We'll assume that the module has already said what its error
- * was in the logs.
- */
- return_code = HTTP_INTERNAL_SERVER_ERROR;
- break;
- }
-
- /* If we're returning 403, tell them to try again. */
- if (return_code == HTTP_UNAUTHORIZED) {
- note_basic_auth_failure(r);
- }
- return return_code;
- }
-
- /* Now that we are done, set the request_rec values so others will know
- * who we are.
- */
- r->user = (char*)sent_user;
- r->ap_auth_type = "Basic";
-
- return OK;
-}
-
-static void register_hooks(apr_pool_t *p)
-{
- ap_hook_check_user_id(authenticate_basic_user,NULL,NULL,APR_HOOK_MIDDLE);
-}
-
-module AP_MODULE_DECLARE_DATA auth_basic_module =
-{
- STANDARD20_MODULE_STUFF,
- create_auth_basic_dir_config, /* dir config creater */
- NULL, /* dir merger --- default is to override */
- NULL, /* server config */
- NULL, /* merge server config */
- auth_basic_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
-};
diff --git a/modules/aaa/mod_auth_basic.dsp b/modules/aaa/mod_auth_basic.dsp
deleted file mode 100644
index dfad857..0000000
--- a/modules/aaa/mod_auth_basic.dsp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_auth_basic" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_auth_basic - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mod_auth_basic.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mod_auth_basic.mak" CFG="mod_auth_basic - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mod_auth_basic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_auth_basic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mod_auth_basic - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AAA_DECLARE_EXPORT" /Fd"Release\mod_auth_basic" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_basic.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_basic
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_basic.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_basic
-
-!ELSEIF "$(CFG)" == "mod_auth_basic - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AAA_DECLARE_EXPORT" /Fd"Debug\mod_auth_basic" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_basic.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_basic
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_basic.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_basic
-
-!ENDIF
-
-# Begin Target
-
-# Name "mod_auth_basic - Win32 Release"
-# Name "mod_auth_basic - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_auth_basic.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_auth_basic.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF "$(CFG)" == "mod_auth_basic - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_auth_basic.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_auth_basic "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_auth_basic.rc
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "mod_auth_basic - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_auth_basic.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_auth_basic "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_auth_basic.rc
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
diff --git a/modules/aaa/mod_auth_dbm.c b/modules/aaa/mod_auth_dbm.c
new file mode 100644
index 0000000..c14e5fa
--- /dev/null
+++ b/modules/aaa/mod_auth_dbm.c
@@ -0,0 +1,335 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
+ */
+
+/*
+ * http_auth: authentication
+ *
+ * Rob McCool & Brian Behlendorf.
+ *
+ * Adapted to Apache by rst.
+ *
+ * dirkx - Added Authoritative control to allow passing on to lower
+ * modules if and only if the userid is not known to this
+ * module. A known user with a faulty or absent password still
+ * causes an AuthRequired. The default is 'Authoritative', i.e.
+ * no control is passed along.
+ */
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+#include "apr_strings.h"
+#include "apr_dbm.h"
+#include "apr_md5.h" /* for apr_password_validate */
+
+#include "httpd.h"
+#include "http_config.h"
+#include "http_core.h"
+#include "http_log.h"
+#include "http_protocol.h"
+#include "http_request.h" /* for ap_hook_(check_user_id | auth_checker)*/
+
+
+typedef struct {
+ char *auth_dbmpwfile;
+ char *auth_dbmgrpfile;
+ char *auth_dbmtype;
+ int auth_dbmauthoritative;
+} dbm_auth_config_rec;
+
+static void *create_dbm_auth_dir_config(apr_pool_t *p, char *d)
+{
+ dbm_auth_config_rec *conf = apr_palloc(p, sizeof(*conf));
+
+ conf->auth_dbmpwfile = NULL;
+ conf->auth_dbmgrpfile = NULL;
+ conf->auth_dbmtype = "default";
+ conf->auth_dbmauthoritative = 1; /* fortress is secure by default */
+
+ return conf;
+}
+
+static const char *set_dbm_slot(cmd_parms *cmd, void *offset,
+ const char *f, const char *t)
+{
+ if (!t || strcmp(t, "dbm"))
+ return DECLINE_CMD;
+
+ return ap_set_file_slot(cmd, offset, f);
+}
+
+static const char *set_dbm_type(cmd_parms *cmd,
+ void *dir_config,
+ const char *arg)
+{
+ dbm_auth_config_rec *conf = dir_config;
+
+ conf->auth_dbmtype = apr_pstrdup(cmd->pool, arg);
+ return NULL;
+}
+
+static const command_rec dbm_auth_cmds[] =
+{
+ AP_INIT_TAKE1("AuthDBMUserFile", ap_set_file_slot,
+ (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmpwfile),
+ OR_AUTHCFG, "dbm database file containing user IDs and passwords"),
+ AP_INIT_TAKE1("AuthDBMGroupFile", ap_set_file_slot,
+ (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmgrpfile),
+ OR_AUTHCFG, "dbm database file containing group names and member user IDs"),
+ AP_INIT_TAKE12("AuthUserFile", set_dbm_slot,
+ (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmpwfile),
+ OR_AUTHCFG, NULL),
+ AP_INIT_TAKE12("AuthGroupFile", set_dbm_slot,
+ (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmgrpfile),
+ OR_AUTHCFG, NULL),
+ AP_INIT_TAKE1("AuthDBMType", set_dbm_type,
+ NULL,
+ OR_AUTHCFG, "what type of DBM file the user file is"),
+ AP_INIT_FLAG("AuthDBMAuthoritative", ap_set_flag_slot,
+ (void *)APR_OFFSETOF(dbm_auth_config_rec, auth_dbmauthoritative),
+ OR_AUTHCFG, "Set to 'no' to allow access control to be passed along to lower modules, if the UserID is not known in this module"),
+ {NULL}
+};
+
+module AP_MODULE_DECLARE_DATA auth_dbm_module;
+
+static char *get_dbm_pw(request_rec *r,
+ char *user,
+ char *auth_dbmpwfile,
+ char *dbtype)
+{
+ apr_dbm_t *f;
+ apr_datum_t d, q;
+ char *pw = NULL;
+ apr_status_t retval;
+ q.dptr = user;
+#ifndef NETSCAPE_DBM_COMPAT
+ q.dsize = strlen(q.dptr);
+#else
+ q.dsize = strlen(q.dptr) + 1;
+#endif
+
+ retval = apr_dbm_open_ex(&f, dbtype, auth_dbmpwfile, APR_DBM_READONLY,
+ APR_OS_DEFAULT, r->pool);
+ if (retval != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, retval, r,
+ "could not open dbm (type %s) auth file: %s", dbtype,
+ auth_dbmpwfile);
+ return NULL;
+ }
+ if (apr_dbm_fetch(f, q, &d) == APR_SUCCESS && d.dptr) {
+ pw = apr_palloc(r->pool, d.dsize + 1);
+ strncpy(pw, d.dptr, d.dsize);
+ pw[d.dsize] = '\0'; /* Terminate the string */
+ }
+
+ apr_dbm_close(f);
+ return pw;
+}
+
+/* We do something strange with the group file. If the group file
+ * contains any : we assume the format is
+ * key=username value=":"groupname [":"anything here is ignored]
+ * otherwise we now (0.8.14+) assume that the format is
+ * key=username value=groupname
+ * The first allows the password and group files to be the same
+ * physical DBM file; key=username value=password":"groupname[":"anything]
+ *
+ * mark@telescope.org, 22Sep95
+ */
+
+static char *get_dbm_grp(request_rec *r, char *user, char *auth_dbmgrpfile,
+ char *dbtype)
+{
+ char *grp_data = get_dbm_pw(r, user, auth_dbmgrpfile,dbtype);
+ char *grp_colon;
+ char *grp_colon2;
+
+ if (grp_data == NULL)
+ return NULL;
+
+ if ((grp_colon = strchr(grp_data, ':')) != NULL) {
+ grp_colon2 = strchr(++grp_colon, ':');
+ if (grp_colon2)
+ *grp_colon2 = '\0';
+ return grp_colon;
+ }
+ return grp_data;
+}
+
+static int dbm_authenticate_basic_user(request_rec *r)
+{
+ dbm_auth_config_rec *conf = ap_get_module_config(r->per_dir_config,
+ &auth_dbm_module);
+ const char *sent_pw;
+ char *real_pw, *colon_pw;
+ apr_status_t invalid_pw;
+ int res;
+
+ if ((res = ap_get_basic_auth_pw(r, &sent_pw)))
+ return res;
+
+ if (!conf->auth_dbmpwfile)
+ return DECLINED;
+
+ if (!(real_pw = get_dbm_pw(r, r->user, conf->auth_dbmpwfile,
+ conf->auth_dbmtype))) {
+ if (!(conf->auth_dbmauthoritative))
+ return DECLINED;
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "DBM user %s not found: %s", r->user, r->filename);
+ ap_note_basic_auth_failure(r);
+ return HTTP_UNAUTHORIZED;
+ }
+ /* Password is up to first : if exists */
+ colon_pw = strchr(real_pw, ':');
+ if (colon_pw) {
+ *colon_pw = '\0';
+ }
+ invalid_pw = apr_password_validate(sent_pw, real_pw);
+ if (invalid_pw != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "DBM user %s: authentication failure for \"%s\": "
+ "Password Mismatch",
+ r->user, r->uri);
+ ap_note_basic_auth_failure(r);
+ return HTTP_UNAUTHORIZED;
+ }
+ return OK;
+}
+
+/* Checking ID */
+
+static int dbm_check_auth(request_rec *r)
+{
+ dbm_auth_config_rec *conf = ap_get_module_config(r->per_dir_config,
+ &auth_dbm_module);
+ char *user = r->user;
+ int m = r->method_number;
+
+ const apr_array_header_t *reqs_arr = ap_requires(r);
+ require_line *reqs = reqs_arr ? (require_line *) reqs_arr->elts : NULL;
+
+ register int x;
+ const char *t;
+ char *w;
+
+ if (!conf->auth_dbmgrpfile)
+ return DECLINED;
+ if (!reqs_arr)
+ return DECLINED;
+
+ for (x = 0; x < reqs_arr->nelts; x++) {
+
+ if (!(reqs[x].method_mask & (AP_METHOD_BIT << m)))
+ continue;
+
+ t = reqs[x].requirement;
+ w = ap_getword_white(r->pool, &t);
+
+ if (!strcmp(w, "group") && conf->auth_dbmgrpfile) {
+ const char *orig_groups, *groups;
+ char *v;
+
+ if (!(groups = get_dbm_grp(r, user, conf->auth_dbmgrpfile,
+ conf->auth_dbmtype))) {
+ if (!(conf->auth_dbmauthoritative))
+ return DECLINED;
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "user %s not in DBM group file %s: %s",
+ user, conf->auth_dbmgrpfile, r->filename);
+ ap_note_basic_auth_failure(r);
+ return HTTP_UNAUTHORIZED;
+ }
+ orig_groups = groups;
+ while (t[0]) {
+ w = ap_getword_white(r->pool, &t);
+ groups = orig_groups;
+ while (groups[0]) {
+ v = ap_getword(r->pool, &groups, ',');
+ if (!strcmp(v, w))
+ return OK;
+ }
+ }
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "user %s not in right group: %s",
+ user, r->filename);
+ ap_note_basic_auth_failure(r);
+ return HTTP_UNAUTHORIZED;
+ }
+ }
+
+ return DECLINED;
+}
+
+static void register_hooks(apr_pool_t *p)
+{
+ ap_hook_check_user_id(dbm_authenticate_basic_user, NULL, NULL,
+ APR_HOOK_MIDDLE);
+ ap_hook_auth_checker(dbm_check_auth, NULL, NULL, APR_HOOK_MIDDLE);
+}
+
+module AP_MODULE_DECLARE_DATA auth_dbm_module =
+{
+ STANDARD20_MODULE_STUFF,
+ create_dbm_auth_dir_config, /* dir config creater */
+ NULL, /* dir merger --- default is to override */
+ NULL, /* server config */
+ NULL, /* merge server config */
+ dbm_auth_cmds, /* command apr_table_t */
+ register_hooks /* register hooks */
+};
diff --git a/modules/aaa/mod_auth_dbm.dsp b/modules/aaa/mod_auth_dbm.dsp
new file mode 100644
index 0000000..59a2575
--- /dev/null
+++ b/modules/aaa/mod_auth_dbm.dsp
@@ -0,0 +1,128 @@
+# Microsoft Developer Studio Project File - Name="mod_auth_dbm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=mod_auth_dbm - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "mod_auth_dbm.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "mod_auth_dbm.mak" CFG="mod_auth_dbm - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "mod_auth_dbm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_auth_dbm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "mod_auth_dbm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_AUTH_DBM_USE_APR" /Fd"Release\mod_auth_dbm" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm
+
+!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_AUTH_DBM_USE_APR" /Fd"Debug\mod_auth_dbm" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm
+
+!ENDIF
+
+# Begin Target
+
+# Name "mod_auth_dbm - Win32 Release"
+# Name "mod_auth_dbm - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\mod_auth_dbm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_auth_dbm.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF "$(CFG)" == "mod_auth_dbm - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_auth_dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_auth_dbm "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_dbm.rc
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_auth_dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_auth_dbm "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_dbm.rc
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/modules/aaa/mod_auth_dbm.exp b/modules/aaa/mod_auth_dbm.exp
new file mode 100644
index 0000000..7038e80
--- /dev/null
+++ b/modules/aaa/mod_auth_dbm.exp
@@ -0,0 +1 @@
+auth_dbm_module
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 4abc035..2ea178f 100644
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -118,9 +118,6 @@
#include "util_md5.h"
#include "apr_shm.h"
#include "apr_rmm.h"
-#include "ap_provider.h"
-
-#include "mod_auth.h"
/* Disable shmem until pools/init gets sorted out
* remove following two lines when fixed
@@ -132,7 +129,8 @@
typedef struct digest_config_struct {
const char *dir_name;
- authn_provider_list *providers;
+ const char *pwfile;
+ const char *grpfile;
const char *realm;
char **qop_list;
apr_sha1_ctx_t nonce_ctx;
@@ -482,53 +480,17 @@
return DECLINE_CMD;
}
-static const char *add_authn_provider(cmd_parms *cmd, void *config,
- const char *arg)
+static const char *set_digest_file(cmd_parms *cmd, void *config,
+ const char *file)
{
- digest_config_rec *conf = (digest_config_rec*)config;
- authn_provider_list *newp;
- const char *provider_name;
-
- if (strcasecmp(arg, "on") == 0) {
- provider_name = AUTHN_DEFAULT_PROVIDER;
- }
- else if (strcasecmp(arg, "off") == 0) {
- /* Clear all configured providers and return. */
- conf->providers = NULL;
- return NULL;
- }
- else {
- provider_name = apr_pstrdup(cmd->pool, arg);
- }
+ ((digest_config_rec *) config)->pwfile = file;
+ return NULL;
+}
- newp = apr_pcalloc(cmd->pool, sizeof(authn_provider_list));
- newp->provider_name = provider_name;
-
- /* lookup and cache the actual provider now */
- newp->provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
- newp->provider_name);
-
- if (newp->provider == NULL) {
- /* by the time they use it, the provider should be loaded and
- registered with us. */
- return apr_psprintf(cmd->pool,
- "Unknown Authn provider: %s",
- newp->provider_name);
- }
-
- /* Add it to the list now. */
- if (!conf->providers) {
- conf->providers = newp;
- }
- else {
- authn_provider_list *last = conf->providers;
-
- while (last->next) {
- last = last->next;
- }
- last->next = newp;
- }
-
+static const char *set_group_file(cmd_parms *cmd, void *config,
+ const char *file)
+{
+ ((digest_config_rec *) config)->grpfile = file;
return NULL;
}
@@ -681,8 +643,10 @@
{
AP_INIT_TAKE1("AuthName", set_realm, NULL, OR_AUTHCFG,
"The authentication realm (e.g. \"Members Only\")"),
- AP_INIT_ITERATE("AuthDigestProvider", add_authn_provider, NULL, ACCESS_CONF,
- "specify the auth providers for a directory or location"),
+ AP_INIT_TAKE1("AuthDigestFile", set_digest_file, NULL, OR_AUTHCFG,
+ "The name of the file containing the usernames and password hashes"),
+ AP_INIT_TAKE1("AuthDigestGroupFile", set_group_file, NULL, OR_AUTHCFG,
+ "The name of the file containing the group names and members"),
AP_INIT_ITERATE("AuthDigestQop", set_qop, NULL, OR_AUTHCFG,
"A list of quality-of-protection options"),
AP_INIT_TAKE1("AuthDigestNonceLifetime", set_nonce_lifetime, NULL, OR_AUTHCFG,
@@ -1461,50 +1425,34 @@
*/
static const char *get_hash(request_rec *r, const char *user,
- digest_config_rec *conf)
+ const char *realm, const char *auth_pwfile)
{
- authn_status auth_result;
- char *password;
- authn_provider_list *current_provider;
+ ap_configfile_t *f;
+ char l[MAX_STRING_LEN];
+ const char *rpw;
+ char *w, *x;
+ apr_status_t sts;
- current_provider = conf->providers;
- do {
- const authn_provider *provider;
-
- /* For now, if a provider isn't set, we'll be nice and use the file
- * provider.
- */
- if (!current_provider) {
- provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
- AUTHN_DEFAULT_PROVIDER);
- }
- else {
- provider = current_provider->provider;
- }
-
- /* We expect the password to be md5 hash of user:realm:password */
- auth_result = provider->get_realm_hash(r, user, conf->realm,
- &password);
-
- /* User is found. Stop checking. */
- if (auth_result == AUTH_USER_FOUND) {
- break;
- }
-
- /* If we're not really configured for providers, stop now. */
- if (!conf->providers) {
- break;
- }
-
- current_provider = current_provider->next;
- } while (current_provider);
-
- if (auth_result != AUTH_USER_FOUND) {
+ if ((sts = ap_pcfg_openfile(&f, r->pool, auth_pwfile)) != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, sts, r,
+ "Digest: Could not open password file: %s", auth_pwfile);
return NULL;
}
- else {
- return password;
+ while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
+ if ((l[0] == '#') || (!l[0])) {
+ continue;
+ }
+ rpw = l;
+ w = ap_getword(r->pool, &rpw, ':');
+ x = ap_getword(r->pool, &rpw, ':');
+
+ if (x && w && !strcmp(user, w) && !strcmp(realm, x)) {
+ ap_cfg_closefile(f);
+ return apr_pstrdup(r->pool, rpw);
+ }
}
+ ap_cfg_closefile(f);
+ return NULL;
}
static int check_nc(const request_rec *r, const digest_header_rec *resp,
@@ -1863,7 +1811,11 @@
return HTTP_UNAUTHORIZED;
}
- if (!(conf->ha1 = get_hash(r, r->user, conf))) {
+ if (!conf->pwfile) {
+ return DECLINED;
+ }
+
+ if (!(conf->ha1 = get_hash(r, r->user, conf->realm, conf->pwfile))) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"Digest: user `%s' in realm `%s' not found: %s",
r->user, conf->realm, r->uri);
@@ -1930,6 +1882,146 @@
return OK;
}
+
+/*
+ * Checking ID
+ */
+
+static apr_table_t *groups_for_user(request_rec *r, const char *user,
+ const char *grpfile)
+{
+ ap_configfile_t *f;
+ apr_table_t *grps = apr_table_make(r->pool, 15);
+ apr_pool_t *sp;
+ char l[MAX_STRING_LEN];
+ const char *group_name, *ll, *w;
+ apr_status_t sts;
+
+ if ((sts = ap_pcfg_openfile(&f, r->pool, grpfile)) != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, sts, r,
+ "Digest: Could not open group file: %s", grpfile);
+ return NULL;
+ }
+
+ if (apr_pool_create(&sp, r->pool) != APR_SUCCESS) {
+ return NULL;
+ }
+
+ while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
+ if ((l[0] == '#') || (!l[0])) {
+ continue;
+ }
+ ll = l;
+ apr_pool_clear(sp);
+
+ group_name = ap_getword(sp, &ll, ':');
+
+ while (ll[0]) {
+ w = ap_getword_conf(sp, &ll);
+ if (!strcmp(w, user)) {
+ apr_table_setn(grps, apr_pstrdup(r->pool, group_name), "in");
+ break;
+ }
+ }
+ }
+
+ ap_cfg_closefile(f);
+ apr_pool_destroy(sp);
+ return grps;
+}
+
+
+static int digest_check_auth(request_rec *r)
+{
+ const digest_config_rec *conf =
+ (digest_config_rec *) ap_get_module_config(r->per_dir_config,
+ &auth_digest_module);
+ const char *user = r->user;
+ int m = r->method_number;
+ int method_restricted = 0;
+ register int x;
+ const char *t, *w;
+ apr_table_t *grpstatus;
+ const apr_array_header_t *reqs_arr;
+ require_line *reqs;
+
+ if (!(t = ap_auth_type(r)) || strcasecmp(t, "Digest")) {
+ return DECLINED;
+ }
+
+ reqs_arr = ap_requires(r);
+ /* If there is no "requires" directive, then any user will do.
+ */
+ if (!reqs_arr) {
+ return OK;
+ }
+ reqs = (require_line *) reqs_arr->elts;
+
+ if (conf->grpfile) {
+ grpstatus = groups_for_user(r, user, conf->grpfile);
+ }
+ else {
+ grpstatus = NULL;
+ }
+
+ for (x = 0; x < reqs_arr->nelts; x++) {
+
+ if (!(reqs[x].method_mask & (AP_METHOD_BIT << m))) {
+ continue;
+ }
+
+ method_restricted = 1;
+
+ t = reqs[x].requirement;
+ w = ap_getword_white(r->pool, &t);
+ if (!strcasecmp(w, "valid-user")) {
+ return OK;
+ }
+ else if (!strcasecmp(w, "user")) {
+ while (t[0]) {
+ w = ap_getword_conf(r->pool, &t);
+ if (!strcmp(user, w)) {
+ return OK;
+ }
+ }
+ }
+ else if (!strcasecmp(w, "group")) {
+ if (!grpstatus) {
+ return DECLINED;
+ }
+
+ while (t[0]) {
+ w = ap_getword_conf(r->pool, &t);
+ if (apr_table_get(grpstatus, w)) {
+ return OK;
+ }
+ }
+ }
+ else {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "Digest: access to %s failed, reason: unknown "
+ "require directive \"%s\"",
+ r->uri, reqs[x].requirement);
+ return DECLINED;
+ }
+ }
+
+ if (!method_restricted) {
+ return OK;
+ }
+
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "Digest: access to %s failed, reason: user %s not "
+ "allowed access", r->uri, user);
+
+ note_digest_auth_failure(r, conf,
+ (digest_header_rec *) ap_get_module_config(r->request_config,
+ &auth_digest_module),
+ 0);
+ return HTTP_UNAUTHORIZED;
+}
+
+
/*
* Authorization-Info header code
*/
@@ -2115,7 +2207,7 @@
ap_hook_child_init(initialize_child, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_read_request(parse_hdr_and_update_nc, parsePre, NULL, APR_HOOK_MIDDLE);
ap_hook_check_user_id(authenticate_digest_user, NULL, NULL, APR_HOOK_MIDDLE);
-
+ ap_hook_auth_checker(digest_check_auth, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_fixups(add_auth_info, NULL, NULL, APR_HOOK_MIDDLE);
}
diff --git a/modules/aaa/mod_authn_anon.dsp b/modules/aaa/mod_authn_anon.dsp
deleted file mode 100644
index de9c8c6..0000000
--- a/modules/aaa/mod_authn_anon.dsp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_authn_anon" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_authn_anon - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authn_anon.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authn_anon.mak" CFG="mod_authn_anon - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mod_authn_anon - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_authn_anon - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mod_authn_anon - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_authn_anon" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authn_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_anon
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authn_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_anon
-
-!ELSEIF "$(CFG)" == "mod_authn_anon - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_authn_anon" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authn_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_anon
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authn_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_anon
-
-!ENDIF
-
-# Begin Target
-
-# Name "mod_authn_anon - Win32 Release"
-# Name "mod_authn_anon - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_authn_anon.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_authn_anon.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF "$(CFG)" == "mod_authn_anon - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authn_anon.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authn_anon "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authn_anon.rc
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "mod_authn_anon - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authn_anon.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authn_anon "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authn_anon.rc
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
diff --git a/modules/aaa/mod_authn_dbm.c b/modules/aaa/mod_authn_dbm.c
deleted file mode 100644
index 6c001bc..0000000
--- a/modules/aaa/mod_authn_dbm.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
-/*
- * http_auth: authentication
- *
- * Rob McCool & Brian Behlendorf.
- *
- * Adapted to Apache by rst.
- *
- */
-
-#define APR_WANT_STRFUNC
-#include "apr_want.h"
-#include "apr_strings.h"
-#include "apr_dbm.h"
-#include "apr_md5.h" /* for apr_password_validate */
-
-#include "ap_provider.h"
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h" /* for ap_hook_(check_user_id | auth_checker)*/
-
-#include "mod_auth.h"
-
-typedef struct {
- char *pwfile;
- char *dbmtype;
-} authn_dbm_config_rec;
-
-static void *create_authn_dbm_dir_config(apr_pool_t *p, char *d)
-{
- authn_dbm_config_rec *conf = apr_palloc(p, sizeof(*conf));
-
- conf->pwfile = NULL;
- conf->dbmtype = "default";
-
- return conf;
-}
-
-static const char *set_dbm_type(cmd_parms *cmd,
- void *dir_config,
- const char *arg)
-{
- authn_dbm_config_rec *conf = dir_config;
-
- conf->dbmtype = apr_pstrdup(cmd->pool, arg);
- return NULL;
-}
-
-static const command_rec authn_dbm_cmds[] =
-{
- AP_INIT_TAKE1("AuthDBMUserFile", ap_set_file_slot,
- (void *)APR_OFFSETOF(authn_dbm_config_rec, pwfile),
- OR_AUTHCFG, "dbm database file containing user IDs and passwords"),
- AP_INIT_TAKE1("AuthDBMType", set_dbm_type,
- NULL,
- OR_AUTHCFG, "what type of DBM file the user file is"),
- {NULL}
-};
-
-module AP_MODULE_DECLARE_DATA authn_dbm_module;
-
-static apr_status_t fetch_dbm(const char *dbmtype, const char *dbmfile,
- const char *user, apr_datum_t *val,
- apr_pool_t *pool)
-{
- apr_dbm_t *f;
- apr_datum_t key;
- apr_status_t rv;
-
- rv = apr_dbm_open_ex(&f, dbmtype, dbmfile, APR_DBM_READONLY,
- APR_OS_DEFAULT, pool);
-
- if (rv != APR_SUCCESS) {
- return rv;
- }
-
- key.dptr = (char*)user;
-#ifndef NETSCAPE_DBM_COMPAT
- key.dsize = strlen(key.dptr);
-#else
- key.dsize = strlen(key.dptr) + 1;
-#endif
-
- rv = apr_dbm_fetch(f, key, val);
-
- apr_dbm_close(f);
-
- return rv;
-}
-
-static authn_status check_dbm_pw(request_rec *r, const char *user,
- const char *password)
-{
- authn_dbm_config_rec *conf = ap_get_module_config(r->per_dir_config,
- &authn_dbm_module);
- apr_datum_t dbm_pw;
- apr_status_t rv;
- char *dbm_password = NULL;
-
- rv = fetch_dbm(conf->dbmtype, conf->pwfile, user, &dbm_pw, r->pool);
-
- if (rv != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
- "could not open dbm (type %s) auth file: %s",
- conf->dbmtype, conf->pwfile);
- return AUTH_GENERAL_ERROR;
- }
-
- if (dbm_pw.dptr) {
- dbm_password = apr_pstrmemdup(r->pool, dbm_pw.dptr, dbm_pw.dsize);
- }
-
- if (!dbm_password) {
- return AUTH_USER_NOT_FOUND;
- }
-
- rv = apr_password_validate(password, dbm_password);
-
- if (rv != APR_SUCCESS) {
- return AUTH_DENIED;
- }
-
- return AUTH_GRANTED;
-}
-
-static const authn_provider authn_dbm_provider =
-{
- &check_dbm_pw,
- NULL, /* No realm support yet. */
-};
-
-static void register_hooks(apr_pool_t *p)
-{
- ap_register_provider(p, AUTHN_PROVIDER_GROUP, "dbm", &authn_dbm_provider);
-}
-
-module AP_MODULE_DECLARE_DATA authn_dbm_module =
-{
- STANDARD20_MODULE_STUFF,
- create_authn_dbm_dir_config, /* dir config creater */
- NULL, /* dir merger --- default is to override */
- NULL, /* server config */
- NULL, /* merge server config */
- authn_dbm_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
-};
diff --git a/modules/aaa/mod_authn_default.c b/modules/aaa/mod_authn_default.c
deleted file mode 100644
index fa6a189..0000000
--- a/modules/aaa/mod_authn_default.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
-/*
- * http_auth: authentication
- *
- * Rob McCool
- *
- * Adapted to Apache by rst.
- *
- * dirkx - Added Authoritative control to allow passing on to lower
- * modules if and only if the userid is not known to this
- * module. A known user with a faulty or absent password still
- * causes an AuthRequired. The default is 'Authoritative', i.e.
- * no control is passed along.
- */
-
-#include "apr_strings.h"
-#include "apr_md5.h" /* for apr_password_validate */
-
-#include "ap_config.h"
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h"
-
-typedef struct {
- int authoritative;
-} authn_default_config_rec;
-
-static void *create_authn_default_dir_config(apr_pool_t *p, char *d)
-{
- authn_default_config_rec *conf = apr_palloc(p, sizeof(*conf));
-
- conf->authoritative = 1; /* keep the fortress secure by default */
- return conf;
-}
-
-static const command_rec authn_default_cmds[] =
-{
- AP_INIT_FLAG("AuthDefaultAuthoritative", ap_set_flag_slot,
- (void *)APR_OFFSETOF(authn_default_config_rec,
- authoritative),
- OR_AUTHCFG,
- "Set to 'no' to allow access control to be passed along to "
- "lower modules if the UserID is not known to this module. "
- "(default is yes)."),
- {NULL}
-};
-
-module AP_MODULE_DECLARE_DATA authn_default_module;
-
-static int authenticate_basic_user(request_rec *r)
-{
- authn_default_config_rec *conf = ap_get_module_config(r->per_dir_config,
- &authn_default_module);
- const char *sent_pw;
- int res;
-
- if ((res = ap_get_basic_auth_pw(r, &sent_pw))) {
- return res;
- }
-
- if (conf->authoritative == 0) {
- return DECLINED;
- }
-
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "access to %s failed, reason: verification of user id '%s' "
- "not configured",
- r->uri, r->user ? r->user : "<null>");
-
- ap_note_basic_auth_failure(r);
- return HTTP_UNAUTHORIZED;
-}
-
-static void register_hooks(apr_pool_t *p)
-{
- ap_hook_check_user_id(authenticate_basic_user,NULL,NULL,APR_HOOK_LAST);
-}
-
-module AP_MODULE_DECLARE_DATA authn_default_module =
-{
- STANDARD20_MODULE_STUFF,
- create_authn_default_dir_config,/* dir config creater */
- NULL, /* dir merger --- default is to override */
- NULL, /* server config */
- NULL, /* merge server config */
- authn_default_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
-};
diff --git a/modules/aaa/mod_authn_default.dsp b/modules/aaa/mod_authn_default.dsp
deleted file mode 100644
index 7e56e8f..0000000
--- a/modules/aaa/mod_authn_default.dsp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_authn_default" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_authn_default - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authn_default.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authn_default.mak" CFG="mod_authn_default - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mod_authn_default - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_authn_default - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mod_authn_default - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_authn_default" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authn_default.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_default
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authn_default.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_default
-
-!ELSEIF "$(CFG)" == "mod_authn_default - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_authn_default" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authn_default.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_default
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authn_default.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_default
-
-!ENDIF
-
-# Begin Target
-
-# Name "mod_authn_default - Win32 Release"
-# Name "mod_authn_default - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_authn_default.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_authn_default.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF "$(CFG)" == "mod_authn_default - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authn_default.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authn_default "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authn_default.rc
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "mod_authn_default - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authn_default.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authn_default "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authn_default.rc
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
diff --git a/modules/aaa/mod_authn_file.c b/modules/aaa/mod_authn_file.c
deleted file mode 100644
index 2188c54..0000000
--- a/modules/aaa/mod_authn_file.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
-/*
- * http_auth: authentication
- *
- * Rob McCool
- *
- * Adapted to Apache by rst.
- *
- * dirkx - Added Authoritative control to allow passing on to lower
- * modules if and only if the userid is not known to this
- * module. A known user with a faulty or absent password still
- * causes an AuthRequired. The default is 'Authoritative', i.e.
- * no control is passed along.
- */
-
-#include "apr_strings.h"
-#include "apr_md5.h" /* for apr_password_validate */
-
-#include "ap_config.h"
-#include "ap_provider.h"
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h"
-
-#include "mod_auth.h"
-
-typedef struct {
- char *pwfile;
-} authn_file_config_rec;
-
-static void *create_authn_file_dir_config(apr_pool_t *p, char *d)
-{
- authn_file_config_rec *conf = apr_palloc(p, sizeof(*conf));
-
- conf->pwfile = NULL; /* just to illustrate the default really */
- return conf;
-}
-
-static const char *set_authn_file_slot(cmd_parms *cmd, void *offset,
- const char *f, const char *t)
-{
- if (t && strcmp(t, "standard")) {
- return apr_pstrcat(cmd->pool, "Invalid auth file type: ", t, NULL);
- }
-
- return ap_set_file_slot(cmd, offset, f);
-}
-
-static const command_rec authn_file_cmds[] =
-{
- AP_INIT_TAKE12("AuthUserFile", set_authn_file_slot,
- (void *)APR_OFFSETOF(authn_file_config_rec, pwfile),
- OR_AUTHCFG, "text file containing user IDs and passwords"),
- {NULL}
-};
-
-module AP_MODULE_DECLARE_DATA authn_file_module;
-
-static authn_status check_password(request_rec *r, const char *user,
- const char *password)
-{
- authn_file_config_rec *conf = ap_get_module_config(r->per_dir_config,
- &authn_file_module);
- ap_configfile_t *f;
- char l[MAX_STRING_LEN];
- apr_status_t status;
- char *file_password = NULL;
-
- status = ap_pcfg_openfile(&f, r->pool, conf->pwfile);
-
- if (status != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
- "Could not open password file: %s", conf->pwfile);
- return AUTH_GENERAL_ERROR;
- }
-
- while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
- const char *rpw, *w;
-
- /* Skip # or blank lines. */
- if ((l[0] == '#') || (!l[0])) {
- continue;
- }
-
- rpw = l;
- w = ap_getword(r->pool, &rpw, ':');
-
- if (!strcmp(user, w)) {
- file_password = ap_getword(r->pool, &rpw, ':');
- break;
- }
- }
- ap_cfg_closefile(f);
-
- if (!file_password) {
- return AUTH_USER_NOT_FOUND;
- }
-
- status = apr_password_validate(password, file_password);
- if (status != APR_SUCCESS) {
- return AUTH_DENIED;
- }
-
- return AUTH_GRANTED;
-}
-
-static authn_status get_realm_hash(request_rec *r, const char *user,
- const char *realm, char **rethash)
-{
- authn_file_config_rec *conf = ap_get_module_config(r->per_dir_config,
- &authn_file_module);
- ap_configfile_t *f;
- char l[MAX_STRING_LEN];
- apr_status_t status;
- char *file_hash = NULL;
-
- status = ap_pcfg_openfile(&f, r->pool, conf->pwfile);
-
- if (status != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
- "Could not open password file: %s", conf->pwfile);
- return AUTH_GENERAL_ERROR;
- }
-
- while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
- const char *rpw, *w, *x;
-
- /* Skip # or blank lines. */
- if ((l[0] == '#') || (!l[0])) {
- continue;
- }
-
- rpw = l;
- w = ap_getword(r->pool, &rpw, ':');
- x = ap_getword(r->pool, &rpw, ':');
-
- if (x && w && !strcmp(user, w) && !strcmp(realm, x)) {
- /* Remember that this is a md5 hash of user:realm:password. */
- file_hash = ap_getword(r->pool, &rpw, ':');
- break;
- }
- }
- ap_cfg_closefile(f);
-
- if (!file_hash) {
- return AUTH_USER_NOT_FOUND;
- }
-
- *rethash = file_hash;
-
- return AUTH_USER_FOUND;
-}
-
-static const authn_provider authn_file_provider =
-{
- &check_password,
- &get_realm_hash,
-};
-
-static void register_hooks(apr_pool_t *p)
-{
- ap_register_provider(p, AUTHN_PROVIDER_GROUP, "file", &authn_file_provider);
-}
-
-module AP_MODULE_DECLARE_DATA authn_file_module =
-{
- STANDARD20_MODULE_STUFF,
- create_authn_file_dir_config, /* dir config creater */
- NULL, /* dir merger --- default is to override */
- NULL, /* server config */
- NULL, /* merge server config */
- authn_file_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
-};
diff --git a/modules/aaa/mod_authn_file.dsp b/modules/aaa/mod_authn_file.dsp
deleted file mode 100644
index 77cd417..0000000
--- a/modules/aaa/mod_authn_file.dsp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_authn_file" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_authn_file - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authn_file.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authn_file.mak" CFG="mod_authn_file - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mod_authn_file - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_authn_file - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mod_authn_file - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_authn_file" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authn_file.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_file
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authn_file.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_file
-
-!ELSEIF "$(CFG)" == "mod_authn_file - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_authn_file" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authn_file.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_file
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authn_file.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authn_file
-
-!ENDIF
-
-# Begin Target
-
-# Name "mod_authn_file - Win32 Release"
-# Name "mod_authn_file - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_authn_file.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_authn_file.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF "$(CFG)" == "mod_authn_file - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authn_file.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authn_file "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authn_file.rc
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "mod_authn_file - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authn_file.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authn_file "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authn_file.rc
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
diff --git a/modules/aaa/mod_authz_dbm.c b/modules/aaa/mod_authz_dbm.c
deleted file mode 100644
index fa95303..0000000
--- a/modules/aaa/mod_authz_dbm.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
-/*
- * http_auth: authentication
- *
- * Rob McCool & Brian Behlendorf.
- *
- * Adapted to Apache by rst.
- *
- * dirkx - Added Authoritative control to allow passing on to lower
- * modules if and only if the userid is not known to this
- * module. A known user with a faulty or absent password still
- * causes an AuthRequired. The default is 'Authoritative', i.e.
- * no control is passed along.
- */
-
-#define APR_WANT_STRFUNC
-#include "apr_want.h"
-#include "apr_strings.h"
-#include "apr_dbm.h"
-#include "apr_md5.h"
-
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h" /* for ap_hook_(check_user_id | auth_checker)*/
-
-typedef struct {
- char *grpfile;
- char *dbmtype;
- int authoritative;
-} authz_dbm_config_rec;
-
-/* This should go into APR; perhaps with some nice
- * caching/locking/flocking of the open dbm file.
- *
- * Duplicated in mod_auth_dbm.c
- */
-static apr_status_t get_dbm_entry_as_str(request_rec *r, char *user,
- char *auth_dbmfile, char *dbtype,
- char ** str)
-{
- apr_dbm_t *f;
- apr_datum_t d, q;
- char *pw = NULL;
- apr_status_t retval;
- q.dptr = user;
-
-#ifndef NETSCAPE_DBM_COMPAT
- q.dsize = strlen(q.dptr);
-#else
- q.dsize = strlen(q.dptr) + 1;
-#endif
-
- retval = apr_dbm_open_ex(&f, dbtype, auth_dbmfile, APR_DBM_READONLY,
- APR_OS_DEFAULT, r->pool);
-
- if (retval != APR_SUCCESS) {
- return retval;
- }
-
- *str = NULL;
-
- if (apr_dbm_fetch(f, q, &d) == APR_SUCCESS && d.dptr) {
- *str = apr_palloc(r->pool, d.dsize + 1);
- strncpy(pw, d.dptr, d.dsize);
- *str[d.dsize] = '\0'; /* Terminate the string */
- }
-
- apr_dbm_close(f);
-
- return retval;
-}
-
-static void *create_authz_dbm_dir_config(apr_pool_t *p, char *d)
-{
- authz_dbm_config_rec *conf = apr_palloc(p, sizeof(*conf));
-
- conf->grpfile = NULL;
- conf->dbmtype = "default";
- conf->authoritative = 1; /* fortress is secure by default */
-
- return conf;
-}
-
-static const command_rec authz_dbm_cmds[] =
-{
- AP_INIT_TAKE1("AuthDBMGroupFile", ap_set_file_slot,
- (void *)APR_OFFSETOF(authz_dbm_config_rec, grpfile),
- OR_AUTHCFG, "database file containing group names and member user IDs"),
- AP_INIT_TAKE1("AuthzDBMType", ap_set_string_slot,
- (void *)APR_OFFSETOF(authz_dbm_config_rec, dbmtype),
- OR_AUTHCFG, "what type of DBM file the group file is"),
- AP_INIT_FLAG("AuthzDBMAuthoritative", ap_set_flag_slot,
- (void *)APR_OFFSETOF(authz_dbm_config_rec, authoritative),
- OR_AUTHCFG, "Set to 'no' to allow access control to be passed along to "
- "lower modules, if the group required is not found or empty, or the user "
- " is not in the required groups. (default is yes.)"),
- {NULL}
-};
-
-module AP_MODULE_DECLARE_DATA authz_dbm_module;
-
-/* We do something strange with the group file. If the group file
- * contains any : we assume the format is
- * key=username value=":"groupname [":"anything here is ignored]
- * otherwise we now (0.8.14+) assume that the format is
- * key=username value=groupname
- * The first allows the password and group files to be the same
- * physical DBM file; key=username value=password":"groupname[":"anything]
- *
- * mark@telescope.org, 22Sep95
- */
-
-static apr_status_t get_dbm_grp(request_rec *r, char *user, char *dbmgrpfile,
- char *dbtype, const char ** out)
-{
- char *grp_data;
- char *grp_colon;
- char *grp_colon2;
-
- apr_status_t status = get_dbm_entry_as_str(r, user, dbmgrpfile,
- dbtype, &grp_data);
-
- if (status != APR_SUCCESS) {
- return status;
- }
-
- *out = NULL;
-
- if (grp_data == NULL) {
- return APR_SUCCESS;
- }
-
- if ((grp_colon = strchr(grp_data, ':')) != NULL) {
- grp_colon2 = strchr(++grp_colon, ':');
- if (grp_colon2) {
- *grp_colon2 = '\0';
- }
- *out = grp_colon;
- return APR_SUCCESS;
- }
-
- return APR_SUCCESS;
-}
-
-/* Checking ID */
-static int dbm_check_auth(request_rec *r)
-{
- authz_dbm_config_rec *conf = ap_get_module_config(r->per_dir_config,
- &authz_dbm_module);
- char *user = r->user;
- int m = r->method_number;
- int required = 0;
- const apr_array_header_t *reqs_arr = ap_requires(r);
- require_line *reqs = reqs_arr ? (require_line *) reqs_arr->elts : NULL;
- register int x;
- const char *t;
- char *w;
- apr_status_t status;
-
- if (!conf->grpfile) {
- return DECLINED;
- }
-
- if (!reqs_arr) {
- return DECLINED;
- }
-
- for (x = 0; x < reqs_arr->nelts; x++) {
-
- required |= 1;
-
- if (!(reqs[x].method_mask & (AP_METHOD_BIT << m))) {
- continue;
- }
-
- t = reqs[x].requirement;
- w = ap_getword_white(r->pool, &t);
-
- if (!strcmp(w, "group")) {
- const char *orig_groups, *groups;
- char *v;
-
- required |= 2;
-
- status = get_dbm_grp(r, user, conf->grpfile, conf->dbmtype,
- &groups);
-
- if (status != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
- "could not open dbm (type %s) group access file: %s",
- conf->dbmtype, conf->grpfile);
- return HTTP_INTERNAL_SERVER_ERROR;
- }
-
- if (groups == NULL) {
- if (!conf->authoritative) {
- return DECLINED;
- }
-
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "user %s not in DBM group file %s: %s",
- user, conf->grpfile, r->filename);
-
- ap_note_basic_auth_failure(r);
- return HTTP_UNAUTHORIZED;
- }
-
- orig_groups = groups;
- while (t[0]) {
- w = ap_getword_white(r->pool, &t);
- groups = orig_groups;
- while (groups[0]) {
- v = ap_getword(r->pool, &groups, ',');
- if (!strcmp(v, w)) {
- return OK;
- }
- }
- }
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "user %s not in right group: %s",
- user, r->filename);
- ap_note_basic_auth_failure(r);
- return HTTP_UNAUTHORIZED;
- }
- }
-
- return DECLINED;
-}
-
-static void register_hooks(apr_pool_t *p)
-{
- ap_hook_auth_checker(dbm_check_auth, NULL, NULL, APR_HOOK_MIDDLE);
-}
-
-module AP_MODULE_DECLARE_DATA authz_dbm_module =
-{
- STANDARD20_MODULE_STUFF,
- create_authz_dbm_dir_config, /* dir config creater */
- NULL, /* dir merger --- default is to override */
- NULL, /* server config */
- NULL, /* merge server config */
- authz_dbm_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
-};
diff --git a/modules/aaa/mod_authz_dbm.dsp b/modules/aaa/mod_authz_dbm.dsp
deleted file mode 100644
index 833e7ae..0000000
--- a/modules/aaa/mod_authz_dbm.dsp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_authz_dbm" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_authz_dbm - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authz_dbm.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authz_dbm.mak" CFG="mod_authz_dbm - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mod_authz_dbm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_authz_dbm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mod_authz_dbm - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_authz_dbm" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authz_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_dbm
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authz_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_dbm
-
-!ELSEIF "$(CFG)" == "mod_authz_dbm - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_authz_dbm" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authz_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_dbm
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authz_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_dbm
-
-!ENDIF
-
-# Begin Target
-
-# Name "mod_authz_dbm - Win32 Release"
-# Name "mod_authz_dbm - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_authz_dbm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_authz_dbm.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF "$(CFG)" == "mod_authz_dbm - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authz_dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authz_dbm "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authz_dbm.rc
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "mod_authz_dbm - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authz_dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authz_dbm "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authz_dbm.rc
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
diff --git a/modules/aaa/mod_authz_default.c b/modules/aaa/mod_authz_default.c
deleted file mode 100644
index 4fb5e66..0000000
--- a/modules/aaa/mod_authz_default.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
-/*
- * http_auth: authentication
- *
- * Rob McCool
- *
- * Adapted to Apache by rst.
- *
- * dirkx - Added Authoritative control to allow passing on to lower
- * modules if and only if the userid is not known to this
- * module. A known user with a faulty or absent password still
- * causes an AuthRequired. The default is 'Authoritative', i.e.
- * no control is passed along.
- */
-
-#include "apr_strings.h"
-#include "apr_md5.h" /* for apr_password_validate */
-
-#include "ap_config.h"
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h"
-
-typedef struct {
- int authoritative;
-} authz_default_config_rec;
-
-static void *create_authz_default_dir_config(apr_pool_t *p, char *d)
-{
- authz_default_config_rec *conf = apr_palloc(p, sizeof(*conf));
-
- conf->authoritative = 1; /* keep the fortress secure by default */
- return conf;
-}
-
-static const command_rec authz_default_cmds[] =
-{
- AP_INIT_FLAG("AccessAuthoritative", ap_set_flag_slot,
- (void *)APR_OFFSETOF(authz_default_config_rec, authoritative),
- OR_AUTHCFG,
- "Set to 'no' to allow access control to be passed along to "
- "lower modules. (default is yes.)"),
- {NULL}
-};
-
-module AP_MODULE_DECLARE_DATA authz_default_module;
-
-static int check_user_access(request_rec *r)
-{
- authz_default_config_rec *conf = ap_get_module_config(r->per_dir_config,
- &authz_default_module);
- int m = r->method_number;
- int method_restricted = 0;
- register int x;
- const apr_array_header_t *reqs_arr = ap_requires(r);
- require_line *reqs;
-
- /* BUG FIX: tadc, 11-Nov-1995. If there is no "requires" directive,
- * then any user will do.
- */
- if (!reqs_arr) {
- return OK;
- }
- reqs = (require_line *)reqs_arr->elts;
-
- for (x = 0; x < reqs_arr->nelts; x++) {
- if (!(reqs[x].method_mask & (AP_METHOD_BIT << m))) {
- continue;
- }
- method_restricted = 1;
- break;
- }
-
- if (method_restricted == 0) {
- return OK;
- }
-
- if (!(conf->authoritative)) {
- return DECLINED;
- }
-
- /* if we aren't authoritative, any require directive could be
- * considered valid even if noone groked it. However, if we are
- * authoritative, we can warn the user they did something wrong.
- *
- * That something could be a missing "AuthAuthoritative off", but
- * more likely is a typo in the require directive.
- */
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "access to %s failed, reason: require directives "
- "present and no Authoritative handler.", r->uri);
-
- ap_note_basic_auth_failure(r);
- return HTTP_UNAUTHORIZED;
-}
-
-static void register_hooks(apr_pool_t *p)
-{
- ap_hook_auth_checker(check_user_access,NULL,NULL,APR_HOOK_LAST);
-}
-
-module AP_MODULE_DECLARE_DATA authz_default_module =
-{
- STANDARD20_MODULE_STUFF,
- create_authz_default_dir_config, /* dir config creater */
- NULL, /* dir merger --- default is to override */
- NULL, /* server config */
- NULL, /* merge server config */
- authz_default_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
-};
diff --git a/modules/aaa/mod_authz_default.dsp b/modules/aaa/mod_authz_default.dsp
deleted file mode 100644
index f565857..0000000
--- a/modules/aaa/mod_authz_default.dsp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_authz_default" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_authz_default - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authz_default.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authz_default.mak" CFG="mod_authz_default - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mod_authz_default - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_authz_default - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mod_authz_default - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_authz_default" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authz_default.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_default
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authz_default.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_default
-
-!ELSEIF "$(CFG)" == "mod_authz_default - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_authz_default" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authz_default.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_default
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authz_default.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_default
-
-!ENDIF
-
-# Begin Target
-
-# Name "mod_authz_default - Win32 Release"
-# Name "mod_authz_default - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_authz_default.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_authz_default.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF "$(CFG)" == "mod_authz_default - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authz_default.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authz_default "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authz_default.rc
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "mod_authz_default - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authz_default.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authz_default "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authz_default.rc
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
diff --git a/modules/aaa/mod_authz_groupfile.c b/modules/aaa/mod_authz_groupfile.c
deleted file mode 100644
index 3be7eab..0000000
--- a/modules/aaa/mod_authz_groupfile.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
-/* This module is triggered by an
- *
- * AuthGroupFile standard /path/to/file
- *
- * and the presense of a
- *
- * require group <list-of-groups>
- *
- * In an applicable limit/directory block for that method.
- *
- * If there are no AuthGroupFile directives valid for
- * the request; we DECLINED.
- *
- * If the AuthGroupFile is defined; but somehow not
- * accessible: we SERVER_ERROR (was DECLINED).
- *
- * If there are no 'require ' directives defined for
- * this request then we DECLINED (was OK).
- *
- * If there are no 'require ' directives valid for
- * this request method then we DECLINED. (was OK)
- *
- * If there are any 'require group' blocks and we
- * are not in any group - we HTTP_UNAUTHORIZE
- * unless we are non-authoritative; in which
- * case we DECLINED.
- *
- */
-
-#include "apr_strings.h"
-#include "apr_md5.h" /* for apr_password_validate */
-
-#include "ap_config.h"
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h"
-
-typedef struct {
- char *groupfile;
- int authoritative;
-} authz_groupfile_config_rec;
-
-static void *create_authz_groupfile_dir_config(apr_pool_t *p, char *d)
-{
- authz_groupfile_config_rec *conf = apr_palloc(p, sizeof(*conf));
-
- conf->groupfile = NULL;
- conf->authoritative = 1; /* keep the fortress secure by default */
- return conf;
-}
-
-static const char *set_authz_groupfile_slot(cmd_parms *cmd, void *offset, const char *f,
- const char *t)
-{
- if (t && strcmp(t, "standard")) {
- return apr_pstrcat(cmd->pool, "Invalid auth file type: ", t, NULL);
- }
-
- return ap_set_file_slot(cmd, offset, f);
-}
-
-static const command_rec authz_groupfile_cmds[] =
-{
- AP_INIT_TAKE12("AuthGroupFile", set_authz_groupfile_slot,
- (void *)APR_OFFSETOF(authz_groupfile_config_rec, groupfile),
- OR_AUTHCFG,
- "text file containing group names and member user IDs"),
- AP_INIT_FLAG("AuthzGroupFileAuthoritative", ap_set_flag_slot,
- (void *)APR_OFFSETOF(authz_groupfile_config_rec,
- authoritative),
- OR_AUTHCFG,
- "Set to 'no' to allow access control to be passed along to "
- "lower modules if the 'require group' fails. (default is "
- "no)."),
- {NULL}
-};
-
-module AP_MODULE_DECLARE_DATA authz_groupfile_module;
-
-static apr_status_t groups_for_user(apr_pool_t *p, char *user, char *grpfile,
- apr_table_t ** out)
-{
- ap_configfile_t *f;
- apr_table_t *grps = apr_table_make(p, 15);
- apr_pool_t *sp;
- char l[MAX_STRING_LEN];
- const char *group_name, *ll, *w;
- apr_status_t status;
-
- if ((status = ap_pcfg_openfile(&f, p, grpfile)) != APR_SUCCESS) {
- return status ;
- }
-
- apr_pool_create(&sp, p);
-
- while (!(ap_cfg_getline(l, MAX_STRING_LEN, f))) {
- if ((l[0] == '#') || (!l[0])) {
- continue;
- }
- ll = l;
- apr_pool_clear(sp);
-
- group_name = ap_getword(sp, &ll, ':');
-
- while (ll[0]) {
- w = ap_getword_conf(sp, &ll);
- if (!strcmp(w, user)) {
- apr_table_setn(grps, apr_pstrdup(p, group_name), "in");
- break;
- }
- }
- }
- ap_cfg_closefile(f);
- apr_pool_destroy(sp);
-
- *out = grps;
- return APR_SUCCESS;
-}
-
-/* Checking ID */
-
-static int check_user_access(request_rec *r)
-{
- authz_groupfile_config_rec *conf = ap_get_module_config(r->per_dir_config,
- &authz_groupfile_module);
- char *user = r->user;
- int m = r->method_number;
- int method_restricted = 0;
- register int x,has_entries;
- const char *t, *w;
- apr_table_t *grpstatus;
- const apr_array_header_t *reqs_arr = ap_requires(r);
- require_line *reqs;
- apr_status_t status;
-
- if (!reqs_arr) {
- return DECLINED; /* XXX change from legacy */
- }
-
- reqs = (require_line *)reqs_arr->elts;
-
- /* If there is no group file - then we are not
- * configured. So decline.
- */
- if (!(conf->groupfile))
- return DECLINED;
-
- if ((status = groups_for_user(r->pool, user, conf->groupfile,
- &grpstatus)) != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
- "Could not open group file: %s", conf->groupfile);
- return HTTP_INTERNAL_SERVER_ERROR;
- };
-
- has_entries = apr_table_elts(grpstatus)->nelts;
-
- for (x = 0; x < reqs_arr->nelts; x++) {
-
- if (!(reqs[x].method_mask & (AP_METHOD_BIT << m))) {
- continue;
- }
- method_restricted |= 1;
-
- t = reqs[x].requirement;
- w = ap_getword_white(r->pool, &t);
-
- if (!strcmp(w, "group")) {
- method_restricted |= 2;
- if (has_entries) {
- while (t[0]) {
- w = ap_getword_conf(r->pool, &t);
- if (apr_table_get(grpstatus, w)) {
- return OK;
- }
- }
- }
- }
- }
-
- /* No applicable requires for this method seen at all */
- if (method_restricted == 0) {
- return DECLINED; /* XXX change from legacy */
- }
-
- /* No applicable "requires group" for this method seen */
- if ((method_restricted & 2) == 0) {
- return DECLINED;
- }
-
- if (!(conf->authoritative)) {
- return DECLINED;
- }
-
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "access to %s failed, reason: user %s not part of the "
- "'require'ed group(s).", r->uri, user);
-
- ap_note_basic_auth_failure(r);
- return HTTP_UNAUTHORIZED;
-}
-
-static void register_hooks(apr_pool_t *p)
-{
- ap_hook_auth_checker(check_user_access,NULL,NULL,APR_HOOK_MIDDLE);
-}
-
-module AP_MODULE_DECLARE_DATA authz_groupfile_module =
-{
- STANDARD20_MODULE_STUFF,
- create_authz_groupfile_dir_config,/* dir config creater */
- NULL, /* dir merger -- default is to override */
- NULL, /* server config */
- NULL, /* merge server config */
- authz_groupfile_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
-};
diff --git a/modules/aaa/mod_authz_groupfile.dsp b/modules/aaa/mod_authz_groupfile.dsp
deleted file mode 100644
index 6a2298b..0000000
--- a/modules/aaa/mod_authz_groupfile.dsp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_authz_groupfile" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_authz_groupfile - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authz_groupfile.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authz_groupfile.mak" CFG="mod_authz_groupfile - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mod_authz_groupfile - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_authz_groupfile - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mod_authz_groupfile - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_authz_groupfile" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authz_groupfile.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_groupfile
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authz_groupfile.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_groupfile
-
-!ELSEIF "$(CFG)" == "mod_authz_groupfile - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_authz_groupfile" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authz_groupfile.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_groupfile
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authz_groupfile.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_groupfile
-
-!ENDIF
-
-# Begin Target
-
-# Name "mod_authz_groupfile - Win32 Release"
-# Name "mod_authz_groupfile - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_authz_groupfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_authz_groupfile.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF "$(CFG)" == "mod_authz_groupfile - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authz_groupfile.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authz_groupfile "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authz_groupfile.rc
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "mod_authz_groupfile - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authz_groupfile.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authz_groupfile "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authz_groupfile.rc
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
diff --git a/modules/aaa/mod_authz_host.dsp b/modules/aaa/mod_authz_host.dsp
deleted file mode 100644
index 12ab8f7..0000000
--- a/modules/aaa/mod_authz_host.dsp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_authz_host" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_authz_host - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authz_host.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authz_host.mak" CFG="mod_authz_host - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mod_authz_host - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_authz_host - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mod_authz_host - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_authz_host" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authz_host.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_host
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authz_host.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_host
-
-!ELSEIF "$(CFG)" == "mod_authz_host - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_authz_host" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authz_host.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_host
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authz_host.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_host
-
-!ENDIF
-
-# Begin Target
-
-# Name "mod_authz_host - Win32 Release"
-# Name "mod_authz_host - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_authz_host.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_authz_host.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF "$(CFG)" == "mod_authz_host - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authz_host.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authz_host "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authz_host.rc
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "mod_authz_host - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authz_host.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authz_host "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authz_host.rc
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
diff --git a/modules/aaa/mod_authz_user.c b/modules/aaa/mod_authz_user.c
deleted file mode 100644
index a2befbd..0000000
--- a/modules/aaa/mod_authz_user.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
-/* http_auth:
- * authentication
- *
- * Rob McCool
- *
- * Adapted to Apache by rst.
- *
- * dirkx - Added Authoritative control to allow passing on to lower
- * modules if and only if the userid is not known to this
- * module. A known user with a faulty or absent password still
- * causes an AuthRequired. The default is 'Authoritative', i.e.
- * no control is passed along.
- */
-
-#include "apr_strings.h"
-
-#include "ap_config.h"
-#include "httpd.h"
-#include "http_config.h"
-#include "http_core.h"
-#include "http_log.h"
-#include "http_protocol.h"
-#include "http_request.h"
-
-typedef struct {
- int authoritative;
-} authz_user_config_rec;
-
-static void *create_authz_user_dir_config(apr_pool_t *p, char *d)
-{
- authz_user_config_rec *conf = apr_palloc(p, sizeof(*conf));
-
- conf->authoritative = 1; /* keep the fortress secure by default */
- return conf;
-}
-
-static const command_rec authz_user_cmds[] =
-{
- AP_INIT_FLAG("AuthzUserAuthoritative", ap_set_flag_slot,
- (void *)APR_OFFSETOF(authz_user_config_rec, authoritative),
- OR_AUTHCFG,
- "Set to 'no' to allow access control to be passed along to "
- "lower modules if the 'require user' or 'require valid-user' "
- "statement is not met. (default: yes)."),
- {NULL}
-};
-
-module AP_MODULE_DECLARE_DATA authz_user_module;
-
-static int check_user_access(request_rec *r)
-{
- authz_user_config_rec *conf = ap_get_module_config(r->per_dir_config,
- &authz_user_module);
- char *user = r->user;
- int m = r->method_number;
- int method_restricted = 0;
- register int x;
- const char *t, *w;
- const apr_array_header_t *reqs_arr = ap_requires(r);
- require_line *reqs;
-
- /* BUG FIX: tadc, 11-Nov-1995. If there is no "requires" directive,
- * then any user will do.
- */
- if (!reqs_arr) {
- return DECLINED;
- }
- reqs = (require_line *)reqs_arr->elts;
-
- for (x = 0; x < reqs_arr->nelts; x++) {
-
- if (!(reqs[x].method_mask & (AP_METHOD_BIT << m))) {
- continue;
- }
-
- /* Note that there are applicable requirements
- */
- method_restricted |= 1;
-
- t = reqs[x].requirement;
- w = ap_getword_white(r->pool, &t);
- if (!strcmp(w, "valid-user")) {
- return OK;
- }
- if (!strcmp(w, "user")) {
- /* And note that there are applicable requirements
- * which we consider ourselves the owner of.
- */
- method_restricted |= 2;
- while (t[0]) {
- w = ap_getword_conf(r->pool, &t);
- if (!strcmp(user, w)) {
- return OK;
- }
- }
- }
- }
-
- if (method_restricted == 0) {
- /* no applicable requirements at all */
- return DECLINED;
- }
- /* There are require methods which we do not
- * understand.
- */
- if ((method_restricted & 2) == 0) {
- /* no requirements of which we consider ourselves
- * the owner.
- */
- return DECLINED;
- }
-
- if (!conf->authoritative) {
- return DECLINED;
- }
-
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "access to %s failed, reason: user '%s' does not meet "
- "'require'ments for user/valid-user to be allowed access",
- r->uri, user);
-
- ap_note_basic_auth_failure(r);
- return HTTP_UNAUTHORIZED;
-}
-
-static void register_hooks(apr_pool_t *p)
-{
- ap_hook_auth_checker(check_user_access, NULL, NULL, APR_HOOK_MIDDLE);
-}
-
-module AP_MODULE_DECLARE_DATA authz_user_module =
-{
- STANDARD20_MODULE_STUFF,
- create_authz_user_dir_config, /* dir config creater */
- NULL, /* dir merger --- default is to override */
- NULL, /* server config */
- NULL, /* merge server config */
- authz_user_cmds, /* command apr_table_t */
- register_hooks /* register hooks */
-};
diff --git a/modules/aaa/mod_authz_user.dsp b/modules/aaa/mod_authz_user.dsp
deleted file mode 100644
index ef710f5..0000000
--- a/modules/aaa/mod_authz_user.dsp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Microsoft Developer Studio Project File - Name="mod_authz_user" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_authz_user - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authz_user.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "mod_authz_user.mak" CFG="mod_authz_user - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "mod_authz_user - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_authz_user - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mod_authz_user - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_authz_user" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authz_user.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_user
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_authz_user.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_user
-
-!ELSEIF "$(CFG)" == "mod_authz_user - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_authz_user" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authz_user.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_user
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_authz_user.so" /base:@..\..\os\win32\BaseAddr.ref,mod_authz_user
-
-!ENDIF
-
-# Begin Target
-
-# Name "mod_authz_user - Win32 Release"
-# Name "mod_authz_user - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_authz_user.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_authz_user.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF "$(CFG)" == "mod_authz_user - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authz_user.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authz_user "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authz_user.rc
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "mod_authz_user - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_authz_user.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_authz_user "auth_basic_module for Apache" ../../include/ap_release.h > .\mod_authz_user.rc
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
diff --git a/modules/arch/netware/mod_auth_anon.def b/modules/arch/netware/mod_auth_anon.def
new file mode 100644
index 0000000..ab6b138
--- /dev/null
+++ b/modules/arch/netware/mod_auth_anon.def
@@ -0,0 +1 @@
+EXPORT auth_anon_module
diff --git a/modules/arch/netware/mod_auth_dbm.def b/modules/arch/netware/mod_auth_dbm.def
new file mode 100644
index 0000000..830f194
--- /dev/null
+++ b/modules/arch/netware/mod_auth_dbm.def
@@ -0,0 +1 @@
+EXPORT auth_dbm_module
diff --git a/modules/arch/netware/mod_authn_anon.def b/modules/arch/netware/mod_authn_anon.def
deleted file mode 100644
index 78bb61b..0000000
--- a/modules/arch/netware/mod_authn_anon.def
+++ /dev/null
@@ -1 +0,0 @@
-EXPORT authn_anon_module
diff --git a/modules/arch/netware/mod_authn_dbm.def b/modules/arch/netware/mod_authn_dbm.def
deleted file mode 100644
index 7a242b0..0000000
--- a/modules/arch/netware/mod_authn_dbm.def
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPORT authn_dbm_module
-
diff --git a/modules/arch/netware/mod_authn_default.def b/modules/arch/netware/mod_authn_default.def
deleted file mode 100644
index fb94aa3..0000000
--- a/modules/arch/netware/mod_authn_default.def
+++ /dev/null
@@ -1 +0,0 @@
-EXPORT authn_default_module
diff --git a/modules/arch/netware/mod_authn_file.def b/modules/arch/netware/mod_authn_file.def
deleted file mode 100644
index fd0765a..0000000
--- a/modules/arch/netware/mod_authn_file.def
+++ /dev/null
@@ -1,3 +0,0 @@
-EXPORT authn_file_module
-
-
diff --git a/modules/arch/netware/mod_authz_dbm.def b/modules/arch/netware/mod_authz_dbm.def
deleted file mode 100644
index d52639c..0000000
--- a/modules/arch/netware/mod_authz_dbm.def
+++ /dev/null
@@ -1 +0,0 @@
-EXPORT authz_dbm_module
diff --git a/modules/arch/netware/mod_authz_default.def b/modules/arch/netware/mod_authz_default.def
deleted file mode 100644
index 164564f..0000000
--- a/modules/arch/netware/mod_authz_default.def
+++ /dev/null
@@ -1 +0,0 @@
-EXPORT authz_default_module
diff --git a/modules/arch/netware/mod_authz_groupfile.def b/modules/arch/netware/mod_authz_groupfile.def
deleted file mode 100644
index 25d9555..0000000
--- a/modules/arch/netware/mod_authz_groupfile.def
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPORT authz_groupfile_module
-
diff --git a/modules/arch/netware/mod_authz_user.def b/modules/arch/netware/mod_authz_user.def
deleted file mode 100644
index 043418b..0000000
--- a/modules/arch/netware/mod_authz_user.def
+++ /dev/null
@@ -1 +0,0 @@
-EXPORT authz_user_module
diff --git a/modules/dav/main/providers.c b/modules/dav/main/providers.c
index c808dcd..c2b721c 100644
--- a/modules/dav/main/providers.c
+++ b/modules/dav/main/providers.c
@@ -62,10 +62,10 @@
DAV_DECLARE(void) dav_register_provider(apr_pool_t *p, const char *name,
const dav_provider *provider)
{
- ap_register_provider(p, DAV_PROVIDER_GROUP, name, provider);
+ ap_register_provider(p, DAV_PROVIDER_GROUP, name, "0", provider);
}
const dav_provider * dav_lookup_provider(const char *name)
{
- return ap_lookup_provider(DAV_PROVIDER_GROUP, name);
+ return ap_lookup_provider(DAV_PROVIDER_GROUP, name, "0");
}
diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c
index 5ca232c..1772982 100644
--- a/modules/dav/main/util.c
+++ b/modules/dav/main/util.c
@@ -2019,14 +2019,14 @@
/* If parent resource was checked out, and auto-checkin is enabled,
* then check it in.
*/
- if (av_info->parent_resource != NULL && av_info->parent_resource->working
- && (unlock || av_info->parent_checkedout)) {
+ if (!unlock
+ && av_info->parent_checkedout
+ && av_info->parent_resource != NULL
+ && av_info->parent_resource->working) {
auto_version = (*vsn_hooks->auto_versionable)(av_info->parent_resource);
- if (auto_version == DAV_AUTO_VERSION_ALWAYS ||
- (unlock && (auto_version == DAV_AUTO_VERSION_LOCKED))) {
-
+ if (auto_version == DAV_AUTO_VERSION_ALWAYS) {
if ((err = (*vsn_hooks->checkin)(av_info->parent_resource,
0 /*keep_checked_out*/, NULL))
!= NULL) {
diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile
index 6045155..24a1e3a 100644
--- a/modules/experimental/NWGNUmakefile
+++ b/modules/experimental/NWGNUmakefile
@@ -156,7 +156,6 @@
$(OBJDIR)/mod_cach.nlm \
$(OBJDIR)/mem_cach.nlm \
$(OBJDIR)/dsk_cach.nlm \
- $(OBJDIR)/extfiltr.nlm \
$(EOLIST)
# If LDAPSDK has been defined then build the auth_ldap module
diff --git a/modules/experimental/cache_cache.c b/modules/experimental/cache_cache.c
index 5705572..4c69841 100644
--- a/modules/experimental/cache_cache.c
+++ b/modules/experimental/cache_cache.c
@@ -101,6 +101,7 @@
((c->current_size + c->size_entry(entry)) > c->max_size)) {
ejected = cache_pq_pop(c->pq);
+ /* FIX: If ejected is NULL, we'll segfault here */
priority = c->get_pri(ejected);
if (c->queue_clock < priority)
diff --git a/modules/experimental/config.m4 b/modules/experimental/config.m4
index f8d3b67..d02181a 100644
--- a/modules/experimental/config.m4
+++ b/modules/experimental/config.m4
@@ -28,9 +28,11 @@
APACHE_MODULE(example, example and demo module, , , no)
APACHE_MODULE(case_filter, example uppercase conversion filter, , , no)
APACHE_MODULE(case_filter_in, example uppercase conversion input filter, , , no)
-APACHE_MODULE(auth_ldap, LDAP based authentication, , , no)
ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo"
APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no)
+auth_ldap_objects="mod_auth_ldap.lo"
+APACHE_MODULE(auth_ldap, LDAP based authentication, $auth_ldap_objects, , no)
+
APACHE_MODPATH_FINISH
diff --git a/modules/experimental/mod_auth_ldap.c b/modules/experimental/mod_auth_ldap.c
index 8f26f70..2fdcf6a 100644
--- a/modules/experimental/mod_auth_ldap.c
+++ b/modules/experimental/mod_auth_ldap.c
@@ -642,7 +642,7 @@
const char *url)
{
int result;
- LDAPURLDesc *urld;
+ apr_ldap_url_desc_t *urld;
mod_auth_ldap_config_t *sec = config;
@@ -650,7 +650,7 @@
cmd->server, "[%d] auth_ldap url parse: `%s'",
getpid(), url);
- result = ldap_url_parse(url, &(urld));
+ result = apr_ldap_url_parse(url, &(urld));
if (result != LDAP_SUCCESS) {
switch (result) {
case LDAP_URL_ERR_NOTLDAP:
@@ -755,7 +755,7 @@
}
sec->have_ldap_url = 1;
- ldap_free_urldesc(urld);
+ apr_ldap_free_urldesc(urld);
return NULL;
}
diff --git a/modules/experimental/mod_auth_ldap.dsp b/modules/experimental/mod_auth_ldap.dsp
index 5021f83..4fb5872 100644
--- a/modules/experimental/mod_auth_ldap.dsp
+++ b/modules/experimental/mod_auth_ldap.dsp
@@ -1,129 +1,128 @@
-# Microsoft Developer Studio Project File - Name="mod_auth_ldap" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=mod_auth_ldap - Win32 Release
-!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
-!MESSAGE
-!MESSAGE NMAKE /f "mod_auth_ldap.mak".
-!MESSAGE
-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE
-!MESSAGE NMAKE /f "mod_auth_ldap.mak" CFG="mod_auth_ldap - Win32 Release"
-!MESSAGE
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
-!MESSAGE
-!MESSAGE "mod_auth_ldap - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_auth_ldap - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "mod_auth_ldap - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/ldap/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_AUTH_DBM_USE_APR" /Fd"Release\mod_auth_ldap" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_ldap
-# ADD LINK32 kernel32.lib libhttpd.lib libapr.lib nsldap32v50.lib libaprutil.lib util_ldap.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_ldap.so" /libpath:"release" /libpath:"..\..\release" /libpath:"..\..\srclib\apr\release" /libpath:"..\..\srclib\ldap\lib" /libpath:"..\..\srclib\apr-util\release" /libpath:"..\..\srclib\apr-util\Release" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_ldap
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "mod_auth_ldap - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/ldap/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_AUTH_DBM_USE_APR" /Fd"Debug\mod_auth_ldap" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_ldap
-# ADD LINK32 kernel32.lib libhttpd.lib libapr.lib nsldap32v50.lib libaprutil.lib util_ldap.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_ldap.so" /libpath:"Debug" /libpath:"..\..\debug" /libpath:"..\..\srclib\apr\debug" /libpath:"..\..\srclib\ldap\lib" /libpath:"..\..\srclib\apr-util\debug" /libpath:"..\..\srclib\apr-util\Debug" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_ldap
-
-!ENDIF
-
-# Begin Target
-
-# Name "mod_auth_ldap - Win32 Release"
-# Name "mod_auth_ldap - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\mod_auth_ldap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_auth_ldap.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF "$(CFG)" == "mod_auth_ldap - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_auth_ldap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_auth_ldap "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_ldap.rc
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "mod_auth_ldap - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\mod_auth_ldap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk mod_auth_ldap "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_ldap.rc
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="mod_auth_ldap" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=mod_auth_ldap - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "mod_auth_ldap.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "mod_auth_ldap.mak" CFG="mod_auth_ldap - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "mod_auth_ldap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_auth_ldap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "mod_auth_ldap - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_auth_ldap" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_ldap
+# ADD LINK32 kernel32.lib wldap32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_ldap
+
+!ELSEIF "$(CFG)" == "mod_auth_ldap - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_auth_ldap" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_ldap
+# ADD LINK32 kernel32.lib wldap32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_ldap
+
+!ENDIF
+
+# Begin Target
+
+# Name "mod_auth_ldap - Win32 Release"
+# Name "mod_auth_ldap - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\mod_auth_ldap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_auth_ldap.rc
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF "$(CFG)" == "mod_auth_ldap - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_auth_ldap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_auth_ldap "auth_ldap_module for Apache" ../../include/ap_release.h > .\mod_auth_ldap.rc
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "mod_auth_ldap - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\mod_auth_ldap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk mod_auth_ldap "auth_ldap_module for Apache" ../../include/ap_release.h > .\mod_auth_ldap.rc
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c
index 8906b26..6dd38a8 100644
--- a/modules/experimental/mod_cache.c
+++ b/modules/experimental/mod_cache.c
@@ -363,7 +363,7 @@
ap_remove_output_filter(f);
ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r->server,
- "cache: serving cached version of %s", r->uri);
+ "cache: serving %s", r->uri);
return ap_pass_brigade(f->next, bb);
}
@@ -418,23 +418,16 @@
{
int rv;
request_rec *r = f->r;
+ cache_request_rec *cache;
+ cache_server_conf *conf;
char *url = r->unparsed_uri;
- const char *cc_out = apr_table_get(r->headers_out, "Cache-Control");
+ const char *cc_out, *cl;
const char *exps, *lastmods, *dates, *etag;
apr_time_t exp, date, lastmod, now;
apr_off_t size;
cache_info *info;
- void *sconf = r->server->module_config;
- cache_server_conf *conf =
- (cache_server_conf *) ap_get_module_config(sconf, &cache_module);
- void *scache = r->request_config;
- cache_request_rec *cache =
- (cache_request_rec *) ap_get_module_config(scache, &cache_module);
- apr_bucket *split_point = NULL;
-
-
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, f->r->server,
- "cache: running CACHE_IN filter");
+ char *reason;
+ apr_pool_t *p;
/* check first whether running this filter has any point or not */
if(r->no_cache) {
@@ -442,298 +435,204 @@
return ap_pass_brigade(f->next, in);
}
- /* make space for the per request config
- * We hit this code path when CACHE_IN has been installed by someone
- * other than the cache handler
- */
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "cache: running CACHE_IN filter");
+
+ /* Setup cache_request_rec */
+ cache = (cache_request_rec *) ap_get_module_config(r->request_config, &cache_module);
if (!cache) {
cache = apr_pcalloc(r->pool, sizeof(cache_request_rec));
ap_set_module_config(r->request_config, &cache_module, cache);
}
- /* If we've previously processed and set aside part of this
- * response, skip the cacheability checks
+ reason = NULL;
+ p = r->pool;
+ /*
+ * Pass Data to Cache
+ * ------------------
+ * This section passes the brigades into the cache modules, but only
+ * if the setup section (see below) is complete.
*/
- if (cache->saved_brigade != NULL) {
- exp = cache->exp;
- lastmod = cache->lastmod;
- info = cache->info;
+
+ /* have we already run the cachability check and set up the
+ * cached file handle?
+ */
+ if (cache->in_checked) {
+ /* pass the brigades into the cache, then pass them
+ * up the filter stack
+ */
+ rv = cache_write_entity_body(cache->handle, r, in);
+ if (rv != APR_SUCCESS) {
+ ap_remove_output_filter(f);
+ }
+ return ap_pass_brigade(f->next, in);
+ }
+
+ /*
+ * Setup Data in Cache
+ * -------------------
+ * This section opens the cache entity and sets various caching
+ * parameters, and decides whether this URL should be cached at
+ * all. This section is* run before the above section.
+ */
+ info = apr_pcalloc(r->pool, sizeof(cache_info));
+
+ /* read expiry date; if a bad date, then leave it so the client can
+ * read it
+ */
+ exps = apr_table_get(r->headers_out, "Expires");
+ if (exps != NULL) {
+ if (APR_DATE_BAD == (exp = apr_date_parse_http(exps))) {
+ exps = NULL;
+ }
}
else {
+ exp = APR_DATE_BAD;
+ }
- /*
- * Pass Data to Cache
- * ------------------
- * This section passes the brigades into the cache modules, but only
- * if the setup section (see below) is complete.
- */
-
- /* have we already run the cachability check and set up the
- * cached file handle?
- */
- if (cache->in_checked) {
- /* pass the brigades into the cache, then pass them
- * up the filter stack
- */
- rv = cache_write_entity_body(cache->handle, r, in);
- if (rv != APR_SUCCESS) {
- ap_remove_output_filter(f);
- }
- return ap_pass_brigade(f->next, in);
+ /* read the last-modified date; if the date is bad, then delete it */
+ lastmods = apr_table_get(r->headers_out, "Last-Modified");
+ if (lastmods != NULL) {
+ if (APR_DATE_BAD == (lastmod = apr_date_parse_http(lastmods))) {
+ lastmods = NULL;
}
+ }
+ else {
+ lastmod = APR_DATE_BAD;
+ }
- /*
- * Setup Data in Cache
- * -------------------
- * This section opens the cache entity and sets various caching
- * parameters, and decides whether this URL should be cached at
- * all. This section is* run before the above section.
- */
- info = apr_pcalloc(r->pool, sizeof(cache_info));
+ conf = (cache_server_conf *) ap_get_module_config(r->server->module_config, &cache_module);
+ /* read the etag and cache-control from the entity */
+ etag = apr_table_get(r->headers_out, "Etag");
+ cc_out = apr_table_get(r->headers_out, "Cache-Control");
- /* read expiry date; if a bad date, then leave it so the client can
- * read it
- */
- exps = apr_table_get(r->headers_out, "Expires");
- if (exps != NULL) {
- if (APR_DATE_BAD == (exp = apr_date_parse_http(exps))) {
- exps = NULL;
- }
- }
- else {
- exp = APR_DATE_BAD;
- }
-
- /* read the last-modified date; if the date is bad, then delete it */
- lastmods = apr_table_get(r->headers_out, "Last-Modified");
- if (lastmods != NULL) {
- if (APR_DATE_BAD == (lastmod = apr_date_parse_http(lastmods))) {
- lastmods = NULL;
- }
- }
- else {
- lastmod = APR_DATE_BAD;
- }
-
- /* read the etag from the entity */
- etag = apr_table_get(r->headers_out, "Etag");
-
- /*
- * what responses should we not cache?
- *
- * At this point we decide based on the response headers whether it
- * is appropriate _NOT_ to cache the data from the server. There are
- * a whole lot of conditions that prevent us from caching this data.
- * They are tested here one by one to be clear and unambiguous.
- */
-
+ /*
+ * what responses should we not cache?
+ *
+ * At this point we decide based on the response headers whether it
+ * is appropriate _NOT_ to cache the data from the server. There are
+ * a whole lot of conditions that prevent us from caching this data.
+ * They are tested here one by one to be clear and unambiguous.
+ */
+ if (r->status != HTTP_OK && r->status != HTTP_NON_AUTHORITATIVE
+ && r->status != HTTP_MULTIPLE_CHOICES
+ && r->status != HTTP_MOVED_PERMANENTLY
+ && r->status != HTTP_NOT_MODIFIED) {
/* RFC2616 13.4 we are allowed to cache 200, 203, 206, 300, 301 or 410
* We don't cache 206, because we don't (yet) cache partial responses.
* We include 304 Not Modified here too as this is the origin server
* telling us to serve the cached copy.
*/
- if ((r->status != HTTP_OK && r->status != HTTP_NON_AUTHORITATIVE
- && r->status != HTTP_MULTIPLE_CHOICES
- && r->status != HTTP_MOVED_PERMANENTLY
- && r->status != HTTP_NOT_MODIFIED)
- /* if a broken Expires header is present, don't cache it */
- || (exps != NULL && exp == APR_DATE_BAD)
- /* if query string present but no expiration time, don't cache it
- * (RFC 2616/13.9)
- */
- || (r->args && exps == NULL)
- /* if the server said 304 Not Modified but we have no cache
- * file - pass this untouched to the user agent, it's not for us.
- */
- || (r->status == HTTP_NOT_MODIFIED && (NULL == cache->handle))
- /* 200 OK response from HTTP/1.0 and up without a Last-Modified
- * header/Etag
- */
- /* XXX mod-include clears last_modified/expires/etags - this
- * is why we have an optional function for a key-gen ;-)
- */
- || (r->status == HTTP_OK && lastmods == NULL && etag == NULL
- && (conf->no_last_mod_ignore ==0))
- /* HEAD requests */
- || r->header_only
- /* RFC2616 14.9.2 Cache-Control: no-store response
- * indicating do not cache, or stop now if you are
- * trying to cache it */
- || ap_cache_liststr(NULL, cc_out, "no-store", NULL)
- /* RFC2616 14.9.1 Cache-Control: private
- * this object is marked for this user's eyes only. Behave
- * as a tunnel.
- */
- || ap_cache_liststr(NULL, cc_out, "private", NULL)
- /* RFC2616 14.8 Authorisation:
- * if authorisation is included in the request, we don't cache,
- * but we can cache if the following exceptions are true:
- * 1) If Cache-Control: s-maxage is included
- * 2) If Cache-Control: must-revalidate is included
- * 3) If Cache-Control: public is included
- */
- || (apr_table_get(r->headers_in, "Authorization") != NULL
- && !(ap_cache_liststr(NULL, cc_out, "s-maxage", NULL)
- || ap_cache_liststr(NULL, cc_out, "must-revalidate", NULL)
- || ap_cache_liststr(NULL, cc_out, "public", NULL)))
- /* or we've been asked not to cache it above */
- || r->no_cache) {
+ reason = apr_psprintf(p, "Response status %d", r->status);
+ }
+ else if (exps != NULL && exp == APR_DATE_BAD) {
+ /* if a broken Expires header is present, don't cache it */
+ reason = apr_pstrcat(p, "Broken expires header: ", exps, NULL);
+ }
+ else if (r->args && exps == NULL) {
+ /* if query string present but no expiration time, don't cache it
+ * (RFC 2616/13.9)
+ */
+ reason = "Query string present but no expires header";
+ }
+ else if (r->status == HTTP_NOT_MODIFIED && (NULL == cache->handle)) {
+ /* if the server said 304 Not Modified but we have no cache
+ * file - pass this untouched to the user agent, it's not for us.
+ */
+ reason = "HTTP Status 304 Not Modified";
+ }
+ else if (r->status == HTTP_OK && lastmods == NULL && etag == NULL
+ && (conf->no_last_mod_ignore ==0)) {
+ /* 200 OK response from HTTP/1.0 and up without a Last-Modified
+ * header/Etag
+ */
+ /* XXX mod-include clears last_modified/expires/etags - this
+ * is why we have an optional function for a key-gen ;-)
+ */
+ reason = "No Last-Modified or Etag header";
+ }
+ else if (r->header_only) {
+ /* HEAD requests */
+ reason = "HTTP HEAD request";
+ }
+ else if (ap_cache_liststr(NULL, cc_out, "no-store", NULL)) {
+ /* RFC2616 14.9.2 Cache-Control: no-store response
+ * indicating do not cache, or stop now if you are
+ * trying to cache it */
+ reason = "Cache-Control: no-store present";
+ }
+ else if (ap_cache_liststr(NULL, cc_out, "private", NULL)) {
+ /* RFC2616 14.9.1 Cache-Control: private
+ * this object is marked for this user's eyes only. Behave
+ * as a tunnel.
+ */
+ reason = "Cache-Control: private present";
+ }
+ else if (apr_table_get(r->headers_in, "Authorization") != NULL
+ && !(ap_cache_liststr(NULL, cc_out, "s-maxage", NULL)
+ || ap_cache_liststr(NULL, cc_out, "must-revalidate", NULL)
+ || ap_cache_liststr(NULL, cc_out, "public", NULL))) {
+ /* RFC2616 14.8 Authorisation:
+ * if authorisation is included in the request, we don't cache,
+ * but we can cache if the following exceptions are true:
+ * 1) If Cache-Control: s-maxage is included
+ * 2) If Cache-Control: must-revalidate is included
+ * 3) If Cache-Control: public is included
+ */
+ reason = "Authorization required";
+ }
+ else if (r->no_cache) {
+ /* or we've been asked not to cache it above */
+ reason = "no_cache present";
+ }
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "cache: response is not cachable");
+ if (reason) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "cache: %s not cached. Reason: %s", url, reason);
+ /* remove this object from the cache
+ * BillS Asks.. Why do we need to make this call to remove_url?
+ * leave it in for now..
+ */
+ cache_remove_url(r, cache->types, url);
- /* remove this object from the cache
- * BillS Asks.. Why do we need to make this call to remove_url?
- * leave it in for now..
- */
- cache_remove_url(r, cache->types, url);
+ /* remove this filter from the chain */
+ ap_remove_output_filter(f);
- /* remove this filter from the chain */
- ap_remove_output_filter(f);
+ /* ship the data up the stack */
+ return ap_pass_brigade(f->next, in);
+ }
+ cache->in_checked = 1;
- /* ship the data up the stack */
- return ap_pass_brigade(f->next, in);
- }
- cache->in_checked = 1;
- } /* if cache->saved_brigade==NULL */
-
- /* Set the content length if known. We almost certainly do NOT want to
- * cache streams with unknown content lengths in the in-memory cache.
- * Streams with unknown content length should be first cached in the
- * file system. If they are withing acceptable limits, then they can be
- * moved to the in-memory cache.
+ /* Set the content length if known.
*/
- {
- const char* cl;
- cl = apr_table_get(r->headers_out, "Content-Length");
- if (cl) {
- size = apr_atoi64(cl);
+ cl = apr_table_get(r->headers_out, "Content-Length");
+ if (cl) {
+ size = apr_atoi64(cl);
+ }
+ else {
+ /* if we don't get the content-length, see if we have all the
+ * buckets and use their length to calculate the size
+ */
+ apr_bucket *e;
+ int all_buckets_here=0;
+ int unresolved_length = 0;
+ size=0;
+ APR_BRIGADE_FOREACH(e, in) {
+ if (APR_BUCKET_IS_EOS(e)) {
+ all_buckets_here=1;
+ break;
+ }
+ if (APR_BUCKET_IS_FLUSH(e)) {
+ unresolved_length = 1;
+ continue;
+ }
+ if (e->length == (apr_size_t)-1) {
+ break;
+ }
+ size += e->length;
}
- else {
-
- /* if we don't get the content-length, see if we have all the
- * buckets and use their length to calculate the size
- */
- apr_bucket *e;
- int all_buckets_here=0;
- int unresolved_length = 0;
- size=0;
- APR_BRIGADE_FOREACH(e, in) {
- if (APR_BUCKET_IS_EOS(e)) {
- all_buckets_here=1;
- break;
- }
- if (APR_BUCKET_IS_FLUSH(e)) {
- unresolved_length = 1;
- continue;
- }
- if (e->length == (apr_size_t)-1) {
- break;
- }
- size += e->length;
- }
-
- if (!all_buckets_here) {
- /* Attempt to set aside a copy of a partial response
- * in hopes of caching it once the rest of the response
- * is available. There are special cases in which we
- * don't try to set aside the content, though:
- * 1. The brigade contains at least one bucket of
- * unknown length, such as a pipe or socket bucket.
- * 2. The size of the response exceeds the limit set
- * by the CacheMaxStreamingBuffer directive.
- */
- if (unresolved_length ||
- (cache->saved_size + size >
- conf->max_streaming_buffer_size)) {
-
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "cache: not caching streamed response for "
- "%s because length %s", url,
- (unresolved_length ?
- "cannot be determined" :
- "> CacheMaxStreamingBuffer"));
-
- if (cache->saved_brigade != NULL) {
- apr_brigade_destroy(cache->saved_brigade);
- cache->saved_brigade = NULL;
- cache->saved_size = 0;
- }
- ap_remove_output_filter(f);
- return ap_pass_brigade(f->next, in);
- }
-
- /* Add a copy of the new brigade's buckets to the
- * saved brigade. The reason for the copy is so
- * that we can output the new buckets immediately,
- * rather than having to buffer up the entire
- * response before sending anything.
- */
- if (cache->saved_brigade == NULL) {
- cache->saved_brigade =
- apr_brigade_create(r->pool,
- r->connection->bucket_alloc);
- cache->exp = exp;
- cache->lastmod = lastmod;
- cache->info = info;
- }
- APR_BRIGADE_FOREACH(e, in) {
- apr_bucket *copy;
- rv = apr_bucket_copy(e, ©);
- if (rv == APR_ENOTIMPL) {
- const char *str;
- apr_size_t len;
-
- /* This takes care of uncopyable buckets. */
- rv = apr_bucket_read(e, &str, &len, APR_BLOCK_READ);
- if ((rv == APR_SUCCESS) &&
- (cache->saved_size + len <=
- conf->max_streaming_buffer_size)) {
- rv = apr_bucket_copy(e, ©);
- }
-
- if ((rv != APR_SUCCESS) ||
- (cache->saved_size + len >
- conf->max_streaming_buffer_size)){
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "cache: not caching streamed response for "
- "%s because length %s", url,
- "> CacheMaxStreamingBuffer");
-
- if (cache->saved_brigade != NULL) {
- apr_brigade_destroy(cache->saved_brigade);
- cache->saved_brigade = NULL;
- cache->saved_size = 0;
- }
- ap_remove_output_filter(f);
- return ap_pass_brigade(f->next, in);
- }
- }
- APR_BRIGADE_INSERT_TAIL(cache->saved_brigade, copy);
- }
- cache->saved_size += size;
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "cache: Response length still unknown, setting "
- "aside content for url: %s", url);
-
- return ap_pass_brigade(f->next, in);
- }
- else {
- /* Now that we've seen an EOS, it's appropriate
- * to try caching the response. If any content
- * has been copied into cache->saved_brigade in
- * previous passes through this filter, the
- * content placed in the cache must be the
- * concatenation of the saved brigade and the
- * current brigade.
- */
- if (cache->saved_brigade != NULL) {
- split_point = APR_BRIGADE_FIRST(in);
- APR_BRIGADE_CONCAT(cache->saved_brigade, in);
- in = cache->saved_brigade;
- size += cache->saved_size;
- }
- }
+ if (!all_buckets_here) {
+ size = -1;
}
}
@@ -775,11 +674,6 @@
if (rv != OK) {
/* Caching layer declined the opportunity to cache the response */
ap_remove_output_filter(f);
- if (split_point) {
- apr_bucket_brigade *already_sent = in;
- in = apr_brigade_split(in, split_point);
- apr_brigade_destroy(already_sent);
- }
return ap_pass_brigade(f->next, in);
}
@@ -850,7 +744,11 @@
* expire date = now + defaultexpire
*/
if (exp == APR_DATE_BAD) {
- if (lastmod != APR_DATE_BAD) {
+ /* if lastmod == date then you get 0*conf->factor which results in
+ * an expiration time of now. This causes some problems with
+ * freshness calculations, so we choose the else path...
+ */
+ if ((lastmod != APR_DATE_BAD) && (lastmod < date)) {
apr_time_t x = (apr_time_t) ((date - lastmod) * conf->factor);
if (x > conf->maxex) {
x = conf->maxex;
@@ -876,11 +774,7 @@
if (rv != APR_SUCCESS) {
ap_remove_output_filter(f);
}
- if (split_point) {
- apr_bucket_brigade *already_sent = in;
- in = apr_brigade_split(in, split_point);
- apr_brigade_destroy(already_sent);
- }
+
return ap_pass_brigade(f->next, in);
}
@@ -911,7 +805,6 @@
ps->no_last_mod_ignore = 0;
ps->ignorecachecontrol = 0;
ps->ignorecachecontrol_set = 0 ;
- ps->max_streaming_buffer_size = 0;
return ps;
}
@@ -948,11 +841,6 @@
(overrides->ignorecachecontrol_set == 0)
? base->ignorecachecontrol
: overrides->ignorecachecontrol;
- ps->max_streaming_buffer_size =
- (overrides->max_streaming_buffer_size == 0)
- ? base->max_streaming_buffer_size
- : overrides->max_streaming_buffer_size;
-
return ps;
}
static const char *set_cache_ignore_no_last_mod(cmd_parms *parms, void *dummy,
@@ -1072,24 +960,6 @@
return NULL;
}
-static const char *set_max_streaming_buffer(cmd_parms *parms, void *dummy,
- const char *arg)
-{
- cache_server_conf *conf;
- apr_off_t val;
- char *err;
-
- conf =
- (cache_server_conf *)ap_get_module_config(parms->server->module_config,
- &cache_module);
- val = (apr_off_t)strtol(arg, &err, 10);
- if (*err != 0) {
- return "CacheMaxStreamingBuffer value must be a number";
- }
- conf->max_streaming_buffer_size = val;
- return NULL;
-}
-
static int cache_post_config(apr_pool_t *p, apr_pool_t *plog,
apr_pool_t *ptemp, server_rec *s)
{
@@ -1136,10 +1006,6 @@
AP_INIT_TAKE1("CacheForceCompletion", set_cache_complete, NULL, RSRC_CONF,
"Percentage of download to arrive for the cache to force "
"complete transfer"),
- AP_INIT_TAKE1("CacheMaxStreamingBuffer", set_max_streaming_buffer, NULL,
- RSRC_CONF,
- "Maximum number of bytes of content to buffer for "
- "a streamed response"),
{NULL}
};
diff --git a/modules/experimental/mod_cache.h b/modules/experimental/mod_cache.h
index ca9a8c7..e6f208a 100644
--- a/modules/experimental/mod_cache.h
+++ b/modules/experimental/mod_cache.h
@@ -179,9 +179,6 @@
/** ignore client's requests for uncached responses */
int ignorecachecontrol;
int ignorecachecontrol_set;
- /* maximum amount of data to buffer on a streamed response where
- * we haven't yet seen EOS */
- apr_off_t max_streaming_buffer_size;
} cache_server_conf;
/* cache info information */
diff --git a/modules/experimental/mod_cache.imp b/modules/experimental/mod_cache.imp
index ef3af98..6125525 100644
--- a/modules/experimental/mod_cache.imp
+++ b/modules/experimental/mod_cache.imp
@@ -6,6 +6,7 @@
ap_cache_tokstr,
ap_cache_hex2usec,
ap_cache_usec2hex,
+ ap_cache_cacheable_hdrs_out,
generate_name,
cache_hook_create_entity,
cache_hook_open_entity,
diff --git a/modules/experimental/mod_mem_cache.c b/modules/experimental/mod_mem_cache.c
index c6fa661..ecce72a 100644
--- a/modules/experimental/mod_mem_cache.c
+++ b/modules/experimental/mod_mem_cache.c
@@ -121,6 +121,9 @@
apr_size_t max_object_cnt;
cache_pqueue_set_priority cache_remove_algorithm;
+ /* maximum amount of data to buffer on a streamed response where
+ * we haven't yet seen EOS */
+ apr_off_t max_streaming_buffer_size;
} mem_cache_conf;
static mem_cache_conf *sconf;
@@ -128,6 +131,7 @@
#define DEFAULT_MIN_CACHE_OBJECT_SIZE 0
#define DEFAULT_MAX_CACHE_OBJECT_SIZE 10000
#define DEFAULT_MAX_OBJECT_CNT 1009
+#define DEFAULT_MAX_STREAMING_BUFFER_SIZE 100000
#define CACHEFILE_LEN 20
/* Forward declarations */
@@ -425,6 +429,7 @@
sconf->cache_size = 0;
sconf->cache_cache = NULL;
sconf->cache_remove_algorithm = memcache_gdsf_algorithm;
+ sconf->max_streaming_buffer_size = DEFAULT_MAX_STREAMING_BUFFER_SIZE;
return sconf;
}
@@ -449,20 +454,28 @@
return DECLINED;
}
- /* In principle, we should be able to dispense with the cache_size checks
- * when caching open file descriptors. However, code in cache_insert() and
- * other places does not make the distinction whether a file's content or
- * descriptor is being cached. For now, just do all the same size checks
- * regardless of what we are caching.
+ if (len == -1) {
+ /* Caching a streaming response. Assume the response is
+ * less than or equal to max_streaming_buffer_size. We will
+ * correct all the cache size counters in write_body once
+ * we know exactly know how much we are caching.
+ */
+ len = sconf->max_streaming_buffer_size;
+ }
+
+ /* Note: cache_insert() will automatically garbage collect
+ * objects from the cache if the max_cache_size threshold is
+ * exceeded. This means mod_mem_cache does not need to implement
+ * max_cache_size checks.
*/
if (len < sconf->min_cache_object_size ||
len > sconf->max_cache_object_size) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "cache_mem: URL %s failed the size check, "
- "or is incomplete",
+ "mem_cache: URL %s failed the size check and will not be cached.",
key);
return DECLINED;
}
+
if (type_e == CACHE_TYPE_FILE) {
/* CACHE_TYPE_FILE is only valid for local content handled by the
* default handler. Need a better way to check if the file is
@@ -488,7 +501,6 @@
/* Safe cast: We tested < sconf->max_cache_object_size above */
obj->info.len = (apr_size_t)len;
-
/* Allocate and init mem_cache_object_t */
mobj = calloc(1, sizeof(*mobj));
if (!mobj) {
@@ -941,21 +953,14 @@
apr_os_file_get(&(mobj->fd), tmpfile);
/* Open for business */
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
+ "mem_cache: Cached file: %s with key: %s", name, obj->key);
obj->complete = 1;
return APR_SUCCESS;
}
/* Content not suitable for fd caching. Cache in-memory instead. */
mobj->type = CACHE_TYPE_HEAP;
- /* Check to make sure the object will not exceed configured thresholds */
- if (mobj->m_len < sconf->min_cache_object_size ||
- mobj->m_len > sconf->max_cache_object_size) {
- return APR_ENOMEM; /* ?? DECLINED; */
- }
- if ((sconf->cache_size + mobj->m_len) > sconf->max_cache_size) {
- return APR_ENOMEM; /* ?? DECLINED; */
- }
- sconf->cache_size += mobj->m_len;
}
/*
@@ -977,7 +982,37 @@
apr_size_t len;
if (APR_BUCKET_IS_EOS(e)) {
+ if (mobj->m_len > obj->count) {
+ /* Caching a streamed response. Reallocate a buffer of the
+ * correct size and copy the streamed response into that
+ * buffer */
+ char *buf = malloc(obj->count);
+ if (!buf) {
+ return APR_ENOMEM;
+ }
+ memcpy(buf, mobj->m, obj->count);
+ free(mobj->m);
+ mobj->m = buf;
+
+ /* Now comes the crufty part... there is no way to tell the
+ * cache that the size of the object has changed. We need
+ * to remove the object, update the size and re-add the
+ * object, all under protection of the lock.
+ */
+ if (sconf->lock) {
+ apr_thread_mutex_lock(sconf->lock);
+ }
+ cache_remove(sconf->cache_cache, obj);
+ mobj->m_len = obj->count;
+ cache_insert(sconf->cache_cache, obj);
+ sconf->cache_size -= (mobj->m_len - obj->count);
+ if (sconf->lock) {
+ apr_thread_mutex_unlock(sconf->lock);
+ }
+ }
/* Open for business */
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
+ "mem_cache: Cached url: %s", obj->key);
obj->complete = 1;
break;
}
@@ -1022,6 +1057,23 @@
"MCacheSize must be greater than MCacheMaxObjectSize");
return DONE;
}
+ if (sconf->max_streaming_buffer_size > sconf->max_cache_object_size) {
+ /* Issue a notice only if something other than the default config
+ * is being used */
+ if (sconf->max_streaming_buffer_size != DEFAULT_MAX_STREAMING_BUFFER_SIZE &&
+ sconf->max_cache_object_size != DEFAULT_MAX_CACHE_OBJECT_SIZE) {
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
+ "MCacheMaxStreamingBuffer must be less than or equal to MCacheMaxObjectSize. "
+ "Resetting MCacheMaxStreamingBuffer to MCacheMaxObjectSize.");
+ }
+ sconf->max_streaming_buffer_size = sconf->max_cache_object_size;
+ }
+ if (sconf->max_streaming_buffer_size < sconf->min_cache_object_size) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
+ "MCacheMaxStreamingBuffer must be greater than or equal to MCacheMinObjectSize. "
+ "Resetting MCacheMaxStreamingBuffer to MCacheMinObjectSize.");
+ sconf->max_streaming_buffer_size = sconf->min_cache_object_size;
+ }
ap_mpm_query(AP_MPMQ_IS_THREADED, &threaded_mpm);
if (threaded_mpm) {
apr_thread_mutex_create(&sconf->lock, APR_THREAD_MUTEX_DEFAULT, p);
@@ -1108,6 +1160,19 @@
return NULL;
}
+static const char *set_max_streaming_buffer(cmd_parms *parms, void *dummy,
+ const char *arg)
+{
+ apr_off_t val;
+ char *err;
+ val = (apr_off_t)strtol(arg, &err, 10);
+ if (*err != 0) {
+ return "MCacheMaxStreamingBuffer value must be a number";
+ }
+ sconf->max_streaming_buffer_size = val;
+ return NULL;
+}
+
static const command_rec cache_cmds[] =
{
AP_INIT_TAKE1("MCacheSize", set_max_cache_size, NULL, RSRC_CONF,
@@ -1120,6 +1185,8 @@
"The maximum size (in bytes) of an object to be placed in the cache"),
AP_INIT_TAKE1("MCacheRemovalAlgorithm", set_cache_removal_algorithm, NULL, RSRC_CONF,
"The algorithm used to remove entries from the cache (default: GDSF)"),
+ AP_INIT_TAKE1("MCacheMaxStreamingBuffer", set_max_streaming_buffer, NULL, RSRC_CONF,
+ "Maximum number of bytes of content to buffer for a streamed response"),
{NULL}
};
diff --git a/modules/experimental/util_ldap.c b/modules/experimental/util_ldap.c
index 23768ca..1024312 100644
--- a/modules/experimental/util_ldap.c
+++ b/modules/experimental/util_ldap.c
@@ -205,7 +205,7 @@
* with the pool cleanup function - causing the LDAP connections to be
* shut down cleanly on graceful restart.
*/
-apr_status_t util_ldap_connection_destroy(void *param)
+LDAP_DECLARE_NONSTD(apr_status_t) util_ldap_connection_destroy(void *param)
{
util_ldap_connection_t *ldc = param;
@@ -1011,7 +1011,7 @@
return NULL;
}
-#ifdef APU_HAS_LDAPSSL_CLIENT_INIT
+#ifdef APU_HAS_LDAP_NETSCAPE_SSL
static const char *util_ldap_set_certdbpath(cmd_parms *cmd, void *dummy, const char *path)
{
util_ldap_state_t *st =
@@ -1092,7 +1092,7 @@
"Sets the maximum time (in seconds) that an item is cached in the LDAP "
"operation cache. Zero means no limit. Defaults to 600 seconds (10 minutes)."),
-#ifdef APU_HAS_LDAPSSL_CLIENT_INIT
+#ifdef APU_HAS_LDAP_NETSCAPE_SSL
AP_INIT_TAKE1("LDAPCertDBPath", util_ldap_set_certdbpath, NULL, RSRC_CONF,
"Specifies the file containing Certificate Authority certificates "
"for validating secure LDAP server certificates. This file must be the "
diff --git a/modules/experimental/util_ldap.dsp b/modules/experimental/util_ldap.dsp
index 7535d14..77c5a56 100644
--- a/modules/experimental/util_ldap.dsp
+++ b/modules/experimental/util_ldap.dsp
@@ -1,148 +1,140 @@
-# Microsoft Developer Studio Project File - Name="util_ldap" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=util_ldap - Win32 Release
-!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
-!MESSAGE
-!MESSAGE NMAKE /f "util_ldap.mak".
-!MESSAGE
-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE
-!MESSAGE NMAKE /f "util_ldap.mak" CFG="util_ldap - Win32 Release"
-!MESSAGE
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
-!MESSAGE
-!MESSAGE "util_ldap - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "util_ldap - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "util_ldap - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/ldap/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_AUTH_DBM_USE_APR" /Fd"Release\util_ldap" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/util_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,util_ldap
-# ADD LINK32 kernel32.lib libhttpd.lib libapr.lib nsldap32v50.lib libaprutil.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/util_ldap.so" /libpath:"..\..\release" /libpath:"..\..\srclib\apr\release" /libpath:"..\..\srclib\ldap\lib" /libpath:"..\..\srclib\apr-util\release" /libpath:"..\..\srclib\apr-util\Release" /base:@..\..\os\win32\BaseAddr.ref,util_ldap
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "util_ldap - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/ldap/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_AUTH_DBM_USE_APR" /Fd"Debug\util_ldap" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/util_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,util_ldap
-# ADD LINK32 kernel32.lib libhttpd.lib libapr.lib nsldap32v50.lib libaprutil.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/util_ldap.so" /libpath:"..\..\debug" /libpath:"..\..\srclib\apr\debug" /libpath:"..\..\srclib\ldap\lib" /libpath:"..\..\srclib\apr-util\debug" /libpath:"..\..\srclib\apr-util\Debug" /base:@..\..\os\win32\BaseAddr.ref,util_ldap
-
-!ENDIF
-
-# Begin Target
-
-# Name "util_ldap - Win32 Release"
-# Name "util_ldap - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\util_ldap.c
-
-!IF "$(CFG)" == "util_ldap - Win32 Release"
-
-# ADD CPP /D "LDAP_DECLARE_EXPORT"
-
-!ELSEIF "$(CFG)" == "util_ldap - Win32 Debug"
-
-# ADD CPP /D "LDAP_DECLARE_EXPORT"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\util_ldap.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\util_ldap_cache.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\util_ldap_cache_mgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\build\win32\win32ver.awk
-
-!IF "$(CFG)" == "util_ldap - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\util_ldap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk util_ldap "auth_dbm_module for Apache" ../../include/ap_release.h > .\util_ldap.rc
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "util_ldap - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=..\..\build\win32\win32ver.awk
-
-".\util_ldap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- awk -f ../../build/win32/win32ver.awk util_ldap "auth_dbm_module for Apache" ../../include/ap_release.h > .\util_ldap.rc
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="util_ldap" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=util_ldap - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "util_ldap.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "util_ldap.mak" CFG="util_ldap - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "util_ldap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "util_ldap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "util_ldap - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "LDAP_DECLARE_EXPORT" /Fd"Release\util_ldap" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/util_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,util_ldap
+# ADD LINK32 kernel32.lib wldap32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/util_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,util_ldap
+
+!ELSEIF "$(CFG)" == "util_ldap - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "LDAP_DECLARE_EXPORT" /Fd"Debug\util_ldap" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/util_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,util_ldap
+# ADD LINK32 kernel32.lib wldap32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/util_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,util_ldap
+
+!ENDIF
+
+# Begin Target
+
+# Name "util_ldap - Win32 Release"
+# Name "util_ldap - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\util_ldap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\util_ldap.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\util_ldap_cache.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\util_ldap_cache.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\util_ldap_cache_mgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\win32ver.awk
+
+!IF "$(CFG)" == "util_ldap - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\util_ldap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk util_ldap "LDAP Utility Module for Apache" ../../include/ap_release.h > .\util_ldap.rc
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "util_ldap - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+InputPath=..\..\build\win32\win32ver.awk
+
+".\util_ldap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ awk -f ../../build/win32/win32ver.awk util_ldap "LDAP Utility Module for Apache" ../../include/ap_release.h > .\util_ldap.rc
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
diff --git a/modules/experimental/util_ldap_cache.h b/modules/experimental/util_ldap_cache.h
index 6adeb99..2a66069 100644
--- a/modules/experimental/util_ldap_cache.h
+++ b/modules/experimental/util_ldap_cache.h
@@ -73,7 +73,7 @@
typedef struct util_cache_node_t {
void *payload; /* Pointer to the payload */
- time_t add_time; /* Time node was added to cache */
+ apr_time_t add_time; /* Time node was added to cache */
struct util_cache_node_t *next;
} util_cache_node_t;
@@ -82,16 +82,16 @@
unsigned long maxentries; /* Maximum number of cache entries */
unsigned long numentries; /* Current number of cache entries */
unsigned long fullmark; /* Used to keep track of when cache becomes 3/4 full */
- time_t marktime; /* Time that the cache became 3/4 full */
+ apr_time_t marktime; /* Time that the cache became 3/4 full */
unsigned long (*hash)(void *); /* Func to hash the payload */
int (*compare)(void *, void *); /* Func to compare two payloads */
void * (*copy)(void *); /* Func to alloc mem and copy payload to new mem */
- void (*free)(void *); /* Func to free mem used by the payload */
+ void (*free)(void *); /* Func to free mem used by the payload */
util_cache_node_t **nodes;
unsigned long numpurges; /* No. of times the cache has been purged */
- double avg_purgetime; /* Average time to purge the cache */
- time_t last_purge; /* Time of the last purge */
+ double avg_purgetime; /* Average time to purge the cache */
+ apr_time_t last_purge; /* Time of the last purge */
unsigned long npurged; /* Number of elements purged in last purge. This is not
obvious: it won't be 3/4 the size of the cache if
there were a lot of expired entries. */
diff --git a/modules/experimental/util_ldap_cache_mgr.c b/modules/experimental/util_ldap_cache_mgr.c
index f2a65d9..5d07650 100644
--- a/modules/experimental/util_ldap_cache_mgr.c
+++ b/modules/experimental/util_ldap_cache_mgr.c
@@ -73,7 +73,7 @@
/* here till malloc is gone */
#include <stdlib.h>
-static const int primes[] =
+static const unsigned long primes[] =
{
11,
19,
@@ -201,7 +201,7 @@
*/
void util_ald_cache_purge(util_ald_cache_t *cache)
{
- int i;
+ unsigned long i;
util_cache_node_t *p, *q;
apr_time_t t;
@@ -287,7 +287,7 @@
void (*freefunc)(void *))
{
util_ald_cache_t *cache;
- int i;
+ unsigned long i;
if (maxentries <= 0)
return NULL;
@@ -334,7 +334,7 @@
void util_ald_destroy_cache(util_ald_cache_t *cache)
{
- int i;
+ unsigned long i;
util_cache_node_t *p, *q;
if (cache == NULL)
@@ -438,7 +438,7 @@
char *util_ald_cache_display_stats(apr_pool_t *p, util_ald_cache_t *cache, char *name)
{
- int i;
+ unsigned long i;
int totchainlen = 0;
int nchains = 0;
double chainlen;
@@ -501,7 +501,7 @@
char *util_ald_cache_display(apr_pool_t *pool)
{
- int i;
+ unsigned long i;
char *buf, *t1, *t2, *t3;
if (!util_ldap_cache) {
diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate
index 94b8010..b39035d 100644
--- a/modules/filters/NWGNUdeflate
+++ b/modules/filters/NWGNUdeflate
@@ -33,7 +33,6 @@
$(AP_WORK)/srclib/apr/include \
$(AP_WORK)/srclib/apr-util/include \
$(AP_WORK)/srclib/apr \
- $(AP_WORK)/srclib/zlib \
$(EOLIST)
#
@@ -265,10 +264,11 @@
# Any specialized rules here
#
-$(OBJDIR)/%.o: ../../srclib/zlib/%.c $(OBJDIR)\cc.opt
+ifneq "$(ZLIBSDK)" ""
+$(OBJDIR)/%.o: $(ZLIBSDK)/%.c $(OBJDIR)\cc.opt
@echo Compiling $<
- $(CC) ..\..\srclib\zlib\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-
+ $(CC) $(ZLIBSDK)\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+endif
#
# Include the 'tail' makefile that has targets that depend on variables defined
diff --git a/modules/aaa/NWGNUauthndbm b/modules/filters/NWGNUmakefile
similarity index 79%
copy from modules/aaa/NWGNUauthndbm
copy to modules/filters/NWGNUmakefile
index c9087bd..c850942 100644
--- a/modules/aaa/NWGNUauthndbm
+++ b/modules/filters/NWGNUmakefile
@@ -1,27 +1,29 @@
#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+ $(EOLIST)
+
+#
+# Get the 'head' of the build environment. This includes default targets and
+# paths to tools
+#
+
+include $(AP_WORK)\build\NWGNUhead.inc
+
+#
+# build this level's files
+
+#
# Make sure all needed macro's are defined
#
#
-# Get the 'head' of the build environment if necessary. This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
-endif
-
-#
# These directories will be at the beginning of the include list, followed by
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/include \
- $(NWOS) \
- $(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
$(EOLIST)
#
@@ -93,22 +95,22 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = authndbm
+NLM_NAME =
#
-# This is used by the link '-desc ' directive.
+# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION = Apache $(VERSION_STR) Database Authentication Module
+NLM_DESCRIPTION =
#
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
-NLM_THREAD_NAME = AuthnDBM Module
+NLM_THREAD_NAME =
#
-# If this is specified, it will override VERSION value in
+# If this is specified, it will override VERSION value in
# $(AP_WORK)\build\NWGNUenvironment.inc
#
NLM_VERSION =
@@ -116,18 +118,18 @@
#
# If this is specified, it will override the default of 64K
#
-NLM_STACK_SIZE = 8192
+NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -137,21 +139,32 @@
#
# If these are specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS =
#
-# If this is specified it will be linked in with the XDCData option in the def
+# If this is specified it will be linked in with the XDCData option in the def
# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
# by setting APACHE_UNIPROC in the environment
#
-XDCDATA =
+XDCDATA =
#
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/authndbm.nlm \
+ $(OBJDIR)/extfiltr.nlm \
$(EOLIST)
+
+# If the zlib libraries source exists then build the mod_deflate module
+ifneq "$(ZLIBSDK)" ""
+ifeq "$(wildcard $(ZLIBSDK))" "$(ZLIBSDK)"
+TARGET_nlm += $(OBJDIR)/deflate.nlm \
+ $(EOLIST)
+endif
+else
+TARGET_nlm += $(OBJDIR)/extfiltr.nlm \
+ $(EOLIST)
+endif
#
# If there is an LIB target, put it here
@@ -164,7 +177,6 @@
# Paths must all use the '/' character
#
FILES_nlm_objs = \
- $(OBJDIR)/mod_authn_dbm.o \
$(EOLIST)
#
@@ -172,7 +184,6 @@
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
$(EOLIST)
#
@@ -180,15 +191,13 @@
# These will be added as a module command in the link.opt file.
#
FILES_nlm_modules = \
- aprlib \
- libc \
$(EOLIST)
#
# If the nlm has a msg file, put it's path here
#
FILE_nlm_msg =
-
+
#
# If the nlm has a hlp file put it's path here
#
@@ -203,19 +212,15 @@
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
- @$(NWOS)/httpd.imp \
- @libc.imp \
$(EOLIST)
-
-#
+
+#
# Any symbols exported to here
#
FILES_nlm_exports = \
- authn_dbm_module \
$(EOLIST)
-
-#
+
+#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
@@ -231,10 +236,11 @@
nlms :: libs $(TARGET_nlm)
#
-# Updated this target to create necessary directories and copy files to the
+# Updated this target to create necessary directories and copy files to the
# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
#
install :: nlms FORCE
+ copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.*
#
# Any specialized rules here
diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 80b4ea3..726dfe2 100644
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -42,7 +42,7 @@
if test "$ap_zlib_base" != "/usr"; then
APR_ADDTO(INCLUDES, [-I${ap_zlib_base}/include])
dnl put in CPPFLAGS temporarily so that AC_TRY_LINK below will work
- CPPFLAGS="$CPPFLAGS -I${ap_zlib_base}/include"
+ CPPFLAGS="$CPPFLAGS $INCLUDES"
APR_ADDTO(LDFLAGS, [-L${ap_zlib_base}/lib])
if test "x$ap_platform_runtime_link_flag" != "x"; then
APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag${ap_zlib_base}/lib])
diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 3e3eef4..37b686d 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -94,22 +94,23 @@
* Handling configuration directives...
*/
-#define NO_OPTIONS 0x0001 /* Indexing options */
-#define ICONS_ARE_LINKS 0x0002
-#define SCAN_HTML_TITLES 0x0004
-#define SUPPRESS_ICON 0x0008
-#define SUPPRESS_LAST_MOD 0x0010
-#define SUPPRESS_SIZE 0x0020
-#define SUPPRESS_DESC 0x0040
-#define SUPPRESS_PREAMBLE 0x0080
-#define SUPPRESS_COLSORT 0x0100
-#define SUPPRESS_RULES 0x0200
-#define FOLDERS_FIRST 0x0400
-#define VERSION_SORT 0x0800
-#define TRACK_MODIFIED 0x1000
-#define FANCY_INDEXING 0x2000
-#define TABLE_INDEXING 0x4000
-#define IGNORE_CLIENT 0x8000
+#define NO_OPTIONS (1 << 0) /* Indexing options */
+#define ICONS_ARE_LINKS (1 << 1)
+#define SCAN_HTML_TITLES (1 << 2)
+#define SUPPRESS_ICON (1 << 3)
+#define SUPPRESS_LAST_MOD (1 << 4)
+#define SUPPRESS_SIZE (1 << 5)
+#define SUPPRESS_DESC (1 << 6)
+#define SUPPRESS_PREAMBLE (1 << 7)
+#define SUPPRESS_COLSORT (1 << 8)
+#define SUPPRESS_RULES (1 << 9)
+#define FOLDERS_FIRST (1 << 10)
+#define VERSION_SORT (1 << 11)
+#define TRACK_MODIFIED (1 << 12)
+#define FANCY_INDEXING (1 << 13)
+#define TABLE_INDEXING (1 << 14)
+#define IGNORE_CLIENT (1 << 15)
+#define IGNORE_CASE (1 << 16)
#define K_NOADJUST 0
#define K_ADJUST 1
@@ -374,6 +375,9 @@
else if (!strcasecmp(w, "IconsAreLinks")) {
option = ICONS_ARE_LINKS;
}
+ else if (!strcasecmp(w, "IgnoreCase")) {
+ option = IGNORE_CASE;
+ }
else if (!strcasecmp(w, "IgnoreClient")) {
option = IGNORE_CLIENT;
}
@@ -724,7 +728,7 @@
apr_off_t size;
apr_time_t lm;
struct ent *next;
- int ascending, version_sort;
+ int ascending, ignore_case, version_sort;
char key;
int isdir;
};
@@ -1321,6 +1325,14 @@
return (NULL);
}
+ if (rr->finfo.filetype == APR_DIR) {
+ /* ap_sub_req_lookup_dirent() adds '/' to end of any directory,
+ * but that messes up our attempt to find relevant
+ * AddDescription directives.
+ */
+ rr->filename[strlen(rr->filename) - 1] = '\0';
+ }
+
p = (struct ent *) apr_pcalloc(r->pool, sizeof(struct ent));
if (dirent->filetype == APR_DIR) {
p->name = apr_pstrcat(r->pool, dirent->name, "/", NULL);
@@ -1337,6 +1349,7 @@
p->key = apr_toupper(keyid);
p->ascending = (apr_toupper(direction) == D_ASCENDING);
p->version_sort = !!(autoindex_opts & VERSION_SORT);
+ p->ignore_case = !!(autoindex_opts & IGNORE_CASE);
if (autoindex_opts & (FANCY_INDEXING | TABLE_INDEXING)) {
p->lm = rr->finfo.mtime;
@@ -1889,12 +1902,36 @@
}
break;
}
+
+ /* names may identical when treated case-insensitively,
+ * so always fall back on strcmp() flavors to put entries
+ * in deterministic order. This means that 'ABC' and 'abc'
+ * will always appear in the same order, rather than
+ * variably between 'ABC abc' and 'abc ABC' order.
+ */
+
if (c1->version_sort) {
- return apr_strnatcmp(c1->name, c2->name);
+ if (c1->ignore_case) {
+ result = apr_strnatcasecmp (c1->name, c2->name);
+ }
+ if (!result) {
+ result = apr_strnatcmp(c1->name, c2->name);
+ }
}
- else {
- return strcmp(c1->name, c2->name);
+
+ /* The names may be identical in respects other other than
+ * filename case when strnatcmp is used above, so fall back
+ * to strcmp on conflicts so that fn1.01.zzz and fn1.1.zzz
+ * are also sorted in a deterministic order.
+ */
+
+ if (!result && c1->ignore_case) {
+ result = strcasecmp (c1->name, c2->name);
}
+ if (!result) {
+ result = strcmp (c1->name, c2->name);
+ }
+ return result;
}
diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index c46692b..6cc1397 100644
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -514,7 +514,6 @@
if (e_info->process_cgi) {
*cmd = r->filename;
- args = r->args;
/* Do not process r->args if they contain an '=' assignment
*/
if (r->args && r->args[0] && !ap_strchr_c(r->args, '=')) {
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 438817f..1e84e56 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -204,13 +204,13 @@
apr_size_t mod_userdir_user_len;
} cgid_req_t;
-/* If a request includes query info in the URL (stuff after "?"), and
- * the query info does not contain "=" (indicative of a FORM submission),
- * then this routine is called to create the argument list to be passed
+/* This routine is called to create the argument list to be passed
* to the CGI script. When suexec is enabled, the suexec path, user, and
* group are the first three arguments to be passed; if not, all three
* must be NULL. The query info is split into separate arguments, where
* "+" is the separator between keyword arguments.
+ *
+ * Do not process the args if they containing an '=' assignment.
*/
static char **create_argv(apr_pool_t *p, char *path, char *user, char *group,
char *av0, const char *args)
@@ -220,11 +220,16 @@
char *w;
int idx = 0;
- /* count the number of keywords */
-
- for (x = 0, numwords = 1; args[x]; x++) {
- if (args[x] == '+') {
- ++numwords;
+ if (ap_strchr_c(args, '=')) {
+ numwords = 0;
+ }
+ else {
+ /* count the number of keywords */
+
+ for (x = 0, numwords = 1; args[x]; x++) {
+ if (args[x] == '+') {
+ ++numwords;
+ }
}
}
diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index e91cdf9..eecd8d1 100644
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -790,6 +790,10 @@
return OK;
}
+ if (!r->filename) {
+ return DECLINED;
+ }
+
conf = (mime_dir_config *)ap_get_module_config(r->per_dir_config,
&mime_module);
exception_list = apr_array_make(r->pool, 2, sizeof(char *));
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 33c8a24..eadf6fb 100644
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -699,6 +699,15 @@
++s;
it->condition_sense = 0;
it->conditions = NULL;
+
+ if (*s == '%') {
+ it->arg = "%";
+ it->func = constant_item;
+ *sa = ++s;
+
+ return NULL;
+ }
+
it->want_orig = -1;
it->arg = ""; /* For safety's sake... */
diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index 60b9138..5b8a658 100644
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -23,7 +23,7 @@
fi
ap_old_cppflags=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
+CPPFLAGS="$CPPFLAGS $INCLUDES"
AC_TRY_COMPILE([#include <apr.h>], [
#if !APR_HAS_DSO
#error You need APR DSO support to use mod_so.
diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index 28e7aa5..41ef479 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -2844,7 +2844,34 @@
* ap_set_etag(r);
*/
apr_table_setn(r->headers_out, "Accept-Ranges", "bytes");
- ap_set_content_length(r, best->bytes);
+ ap_set_content_length(r, best->bytes);
+
+ /* set MIME type and charset as negotiated */
+ if (best->mime_type && *best->mime_type) {
+ if (best->content_charset && *best->content_charset) {
+ ap_set_content_type(r, apr_pstrcat(r->pool,
+ best->mime_type,
+ "; charset=",
+ best->content_charset,
+ NULL));
+ }
+ else {
+ ap_set_content_type(r, apr_pstrdup(r->pool, best->mime_type));
+ }
+ }
+
+ /* set Content-language(s) as negotiated */
+ if (best->content_languages && best->content_languages->nelts) {
+ r->content_languages = apr_array_copy(r->pool,
+ best->content_languages);
+ }
+
+ /* set Content-Encoding as negotiated */
+ if (best->content_encoding && *best->content_encoding) {
+ r->content_encoding = apr_pstrdup(r->pool,
+ best->content_encoding);
+ }
+
if ((res = ap_meets_conditions(r)) != OK) {
return res;
}
diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
index 0ec8171..1149030 100644
--- a/modules/metadata/mod_setenvif.c
+++ b/modules/metadata/mod_setenvif.c
@@ -342,7 +342,7 @@
new->icase = icase;
if ((simple_pattern = non_regex_pattern(cmd->pool, regex))) {
new->pattern = apr_strmatch_precompile(cmd->pool,
- simple_pattern, 1);
+ simple_pattern, !icase);
if (new->pattern == NULL) {
return apr_pstrcat(cmd->pool, cmd->cmd->name,
" pattern could not be compiled.", NULL);
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index b310c9a..7907427 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -212,6 +212,9 @@
apr_pool_t *plog,
apr_pool_t *ptemp)
{
+ /* Preregister the malloc callbacks so cmds can make library calls */
+ CRYPTO_malloc_init();
+
/* Register us to handle mod_log_config %c/%x variables */
ssl_var_log_config_register(pconf);
#if 0 /* XXX */
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 7a2e742..64a6321 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -114,7 +114,6 @@
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
"Init: Initializing %s library", SSL_LIBRARY_NAME);
- CRYPTO_malloc_init();
SSL_load_error_strings();
SSL_library_init();
}
@@ -1143,7 +1142,7 @@
if (ca_path) {
apr_dir_t *dir;
apr_finfo_t direntry;
- apr_int32_t finfo_flags = APR_FINFO_MIN|APR_FINFO_NAME;
+ apr_int32_t finfo_flags = APR_FINFO_TYPE|APR_FINFO_NAME;
apr_status_t rv;
if ((rv = apr_dir_open(&dir, ca_path, ptemp)) != APR_SUCCESS) {
diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index 8fa4986..041a59b 100644
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -401,7 +401,7 @@
char *c, apr_size_t *len)
{
apr_size_t actual = 0;
- apr_status_t status;
+ apr_status_t status = APR_SUCCESS;
while (!APR_BRIGADE_EMPTY(bb)) {
apr_bucket *b = APR_BRIGADE_FIRST(bb);
@@ -450,9 +450,7 @@
c += consume;
actual += consume;
- }
- if (b->start >= 0) {
if (consume >= b->length) {
/* This physical bucket was consumed */
apr_bucket_delete(b);
@@ -463,6 +461,9 @@
b->length -= consume;
}
}
+ else if (b->length == 0) {
+ apr_bucket_delete(b);
+ }
/* This could probably be actual == *len, but be safe from stray
* photons. */
@@ -955,13 +956,6 @@
type = "abortive";
}
else switch (sslconn->shutdown_type) {
- case SSL_SHUTDOWN_TYPE_UNSET:
- case SSL_SHUTDOWN_TYPE_STANDARD:
- /* send close notify, but don't wait for clients close notify
- (standard compliant and safe, so it's the DEFAULT!) */
- shutdown_type = SSL_RECEIVED_SHUTDOWN;
- type = "standard";
- break;
case SSL_SHUTDOWN_TYPE_UNCLEAN:
/* perform no close notify handshake at all
(violates the SSL/TLS standard!) */
@@ -974,6 +968,16 @@
shutdown_type = 0;
type = "accurate";
break;
+ default:
+ /*
+ * case SSL_SHUTDOWN_TYPE_UNSET:
+ * case SSL_SHUTDOWN_TYPE_STANDARD:
+ */
+ /* send close notify, but don't wait for clients close notify
+ (standard compliant and safe, so it's the DEFAULT!) */
+ shutdown_type = SSL_RECEIVED_SHUTDOWN;
+ type = "standard";
+ break;
}
SSL_set_shutdown(ssl, shutdown_type);
diff --git a/modules/ssl/ssl_util_ssl.c b/modules/ssl/ssl_util_ssl.c
index 8da2512..a9a1aae 100644
--- a/modules/ssl/ssl_util_ssl.c
+++ b/modules/ssl/ssl_util_ssl.c
@@ -454,7 +454,7 @@
*/
apr_dir_t *dir;
apr_finfo_t dirent;
- apr_int32_t finfo_flags = APR_FINFO_MIN|APR_FINFO_NAME;
+ apr_int32_t finfo_flags = APR_FINFO_TYPE|APR_FINFO_NAME;
const char *fullname;
BOOL ok = FALSE;
diff --git a/os/netware/modules.c b/os/netware/modules.c
index 1ec622e..966f9c7 100644
--- a/os/netware/modules.c
+++ b/os/netware/modules.c
@@ -12,7 +12,8 @@
extern module http_module;
extern module so_module;
extern module mime_module;
-extern module authz_host_module;
+extern module access_module;
+extern module auth_module;
extern module negotiation_module;
extern module include_module;
extern module autoindex_module;
@@ -35,7 +36,8 @@
&http_module,
&so_module,
&mime_module,
- &authz_host_module,
+ &access_module,
+ &auth_module,
&negotiation_module,
&include_module,
&autoindex_module,
@@ -60,7 +62,8 @@
&http_module,
&so_module,
&mime_module,
- &authz_host_module,
+ &access_module,
+ &auth_module,
&negotiation_module,
&include_module,
&autoindex_module,
diff --git a/os/netware/util_nw.c b/os/netware/util_nw.c
index 005b1a9..41cd69a 100644
--- a/os/netware/util_nw.c
+++ b/os/netware/util_nw.c
@@ -60,8 +60,12 @@
#include "http_log.h"
#include <netware.h>
+#include <nks\netware.h>
-int nlmUnloadSignaled();
+int nlmUnloadSignaled(int wait);
+event_handle_t eh;
+Warn_t ref;
+Report_t dum;
AP_DECLARE(apr_status_t) ap_os_create_privileged_process(
const request_rec *r,
@@ -75,5 +79,69 @@
int _NonAppCheckUnload( void )
{
- return nlmUnloadSignaled();
+ return nlmUnloadSignaled(1);
}
+
+// down server event callback
+void ap_down_server_cb(void *, void *)
+{
+ nlmUnloadSignaled(0);
+ return;
+}
+
+// Required place holder event callback
+void ap_dummy_cb(void *, void *)
+{
+ return;
+}
+
+// destroy callback resources
+void ap_cb_destroy(void *)
+{
+ // cleanup down event notification
+ UnRegisterEventNotification(eh);
+ NX_UNWRAP_INTERFACE(ref);
+ NX_UNWRAP_INTERFACE(dum);
+}
+
+int _NonAppStart
+(
+ void *NLMHandle,
+ void *errorScreen,
+ const char *cmdLine,
+ const char *loadDirPath,
+ size_t uninitializedDataLength,
+ void *NLMFileHandle,
+ int (*readRoutineP)( int conn, void *fileHandle, size_t offset,
+ size_t nbytes, size_t *bytesRead, void *buffer ),
+ size_t customDataOffset,
+ size_t customDataSize,
+ int messageCount,
+ const char **messages
+)
+{
+#pragma unused(cmdLine)
+#pragma unused(loadDirPath)
+#pragma unused(uninitializedDataLength)
+#pragma unused(NLMFileHandle)
+#pragma unused(readRoutineP)
+#pragma unused(customDataOffset)
+#pragma unused(customDataSize)
+#pragma unused(messageCount)
+#pragma unused(messages)
+
+ // register for down server event
+ rtag_t rt = AllocateResourceTag(NLMHandle, "Apache2 Down Server Callback",
+ EventSignature);
+
+ NX_WRAP_INTERFACE((void *)ap_down_server_cb, 2, (void **)&ref);
+ NX_WRAP_INTERFACE((void *)ap_dummy_cb, 2, (void **)&dum);
+ eh = RegisterForEventNotification(rt, EVENT_DOWN_SERVER,
+ EVENT_PRIORITY_APPLICATION,
+ ref, dum, NULL);
+
+ // clean-up
+ NXVmRegisterExitHandler(ap_cb_destroy, NULL);
+
+}
+
diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 8243d37..7ee14d9 100644
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -9,7 +9,7 @@
; module name base-address max-size
libhttpd 0x6FF00000 0x000A0000
-mod_auth_basic 0x6FEF0000 0x00010000
+mod_auth_anon 0x6FEF0000 0x00010000
mod_auth_digest 0x6FED0000 0x00020000
mod_cern_meta 0x6FEC0000 0x00010000
mod_expires 0x6FEB0000 0x00010000
@@ -20,6 +20,7 @@
mod_status 0x6FE50000 0x00010000
mod_usertrack 0x6FE40000 0x00010000
mod_file_cache 0x6FE20000 0x00020000
+mod_auth_dbm 0x6FE10000 0x00010000
mod_unique_id 0x6FE00000 0x00010000
mod_vhost_alias 0x6FDF0000 0x00010000
mod_mime_magic 0x6FDE0000 0x00010000
@@ -30,9 +31,11 @@
mod_proxy_ftp 0x6FD80000 0x00010000
mod_proxy_http 0x6FD70000 0x00010000
mod_ssl 0x6FD00000 0x00070000
+mod_access 0x6FCF0000 0x00010000
mod_actions 0x6FCE0000 0x00010000
mod_alias 0x6FCD0000 0x00010000
mod_asis 0x6FCC0000 0x00010000
+mod_auth 0x6FCB0000 0x00010000
mod_autoindex 0x6FCA0000 0x00010000
mod_cgi 0x6FC90000 0x00010000
mod_dir 0x6FC80000 0x00010000
@@ -51,13 +54,6 @@
mod_deflate 0x6FBA0000 0x00020000
mod_ext_filter 0x6FB90000 0x00010000
mod_charset_lite 0x6FB80000 0x00010000
-mod_authn_anon 0x6FB70000 0x00010000
-mod_authn_dbm 0x6FB60000 0x00010000
-mod_authn_default 0x6FB50000 0x00010000
-mod_authn_file 0x6FB40000 0x00010000
-mod_authz_dbm 0x6FB30000 0x00010000
-mod_authz_default 0x6FB20000 0x00010000
-mod_authz_groupfile 0x6FB10000 0x00010000
-mod_authz_host 0x6FB00000 0x00010000
-mod_authz_user 0x6FAF0000 0x00010000
-mod_logio 0x6FAE0000 0x00010000
+mod_logio 0x6FB70000 0x00010000
+util_ldap 0x6FB60000 0x00010000
+mod_auth_ldap 0x6FB50000 0x00010000
diff --git a/os/win32/ap_regkey.c b/os/win32/ap_regkey.c
index 245e71e..2792773 100644
--- a/os/win32/ap_regkey.c
+++ b/os/win32/ap_regkey.c
@@ -59,8 +59,8 @@
#ifdef WIN32
#include "apr.h"
-#include "arch/win32/fileio.h"
-#include "arch/win32/misc.h"
+#include "arch/win32/apr_arch_file_io.h"
+#include "arch/win32/apr_arch_misc.h"
#include "ap_regkey.h"
struct ap_regkey_t {
@@ -683,4 +683,4 @@
return APR_SUCCESS;
}
-#endif /* defined WIN32 */
\ No newline at end of file
+#endif /* defined WIN32 */
diff --git a/os/win32/util_win32.c b/os/win32/util_win32.c
index 96fece4..0e5b2af 100644
--- a/os/win32/util_win32.c
+++ b/os/win32/util_win32.c
@@ -57,8 +57,8 @@
*/
#include "apr_strings.h"
-#include "arch/win32/fileio.h"
-#include "arch/win32/misc.h"
+#include "arch/win32/apr_arch_file_io.h"
+#include "arch/win32/apr_arch_misc.h"
#include "httpd.h"
#include "http_log.h"
diff --git a/server/.cvsignore b/server/.cvsignore
index a0a8268..e406311 100644
--- a/server/.cvsignore
+++ b/server/.cvsignore
@@ -5,6 +5,7 @@
*.la
test_char.h
gen_test_char
+export_files
exports.c
export_vars.h
Debug
diff --git a/server/config.c b/server/config.c
index 0fcbef6..69c495a 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1276,12 +1276,18 @@
AP_DECLARE(char *) ap_server_root_relative(apr_pool_t *p, const char *file)
{
- char *newpath;
- if (apr_filepath_merge(&newpath, ap_server_root, file,
- APR_FILEPATH_TRUENAME, p) == APR_SUCCESS)
+ char *newpath = NULL;
+ apr_status_t rv;
+ rv = apr_filepath_merge(&newpath, ap_server_root, file,
+ APR_FILEPATH_TRUENAME, p);
+ if (newpath && (rv == APR_SUCCESS || APR_STATUS_IS_EPATHWILD(rv)
+ || APR_STATUS_IS_ENOENT(rv)
+ || APR_STATUS_IS_ENOTDIR(rv))) {
return newpath;
- else
+ }
+ else {
return NULL;
+ }
}
AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive)
@@ -1445,6 +1451,9 @@
ap_configfile_t *cfp;
int ispatt;
+ /* XXX: lstat() won't work on the wildcard pattern...
+ */
+
/* don't require conf/httpd.conf if we have a -C or -c switch */
if ((ap_server_pre_read_config->nelts
|| ap_server_post_read_config->nelts)
diff --git a/server/core.c b/server/core.c
index ceb5627..cc9ba9e 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1635,8 +1635,9 @@
/*
* Ensure that the pathname is canonical, and append the trailing /
*/
- if (apr_filepath_merge(&newpath, NULL, cmd->path,
- APR_FILEPATH_TRUENAME, cmd->pool) != APR_SUCCESS) {
+ apr_status_t rv = apr_filepath_merge(&newpath, NULL, cmd->path,
+ APR_FILEPATH_TRUENAME, cmd->pool);
+ if (rv != APR_SUCCESS && rv != APR_EPATHWILD) {
return apr_pstrcat(cmd->pool, "<Directory \"", cmd->path,
"\"> path is invalid.", NULL);
}
@@ -2191,7 +2192,7 @@
{
ap_directive_t *conftree = NULL;
const char* conffile = ap_server_root_relative(cmd->pool, name);
-
+
if (!conffile) {
return apr_pstrcat(cmd->pool, "Invalid Include path ",
name, NULL);
@@ -3670,6 +3671,7 @@
core_net_rec *net = f->ctx;
core_output_filter_ctx_t *ctx = net->out_ctx;
apr_read_type_e eblock = APR_NONBLOCK_READ;
+ apr_pool_t *input_pool = b->p;
if (ctx == NULL) {
ctx = apr_pcalloc(c->pool, sizeof(*ctx));
@@ -3924,7 +3926,10 @@
}
}
}
- ap_save_brigade(f, &ctx->b, &b, c->pool);
+ if (!ctx->deferred_write_pool) {
+ apr_pool_create(&ctx->deferred_write_pool, c->pool);
+ }
+ ap_save_brigade(f, &ctx->b, &b, ctx->deferred_write_pool);
return APR_SUCCESS;
}
@@ -3995,6 +4000,30 @@
}
apr_brigade_destroy(b);
+
+ /* drive cleanups for resources which were set aside
+ * this may occur before or after termination of the request which
+ * created the resource
+ */
+ if (ctx->deferred_write_pool) {
+ if (more && more->p == ctx->deferred_write_pool) {
+ /* "more" belongs to the deferred_write_pool,
+ * which is about to be cleared.
+ */
+ if (APR_BRIGADE_EMPTY(more)) {
+ more = NULL;
+ }
+ else {
+ /* uh oh... change more's lifetime
+ * to the input brigade's lifetime
+ */
+ apr_bucket_brigade *tmp_more = more;
+ more = NULL;
+ ap_save_brigade(f, &more, &tmp_more, input_pool);
+ }
+ }
+ apr_pool_clear(ctx->deferred_write_pool);
+ }
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server,
diff --git a/server/listen.c b/server/listen.c
index cbdefae..148c0c7 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -118,14 +118,16 @@
}
#if APR_HAVE_IPV6
- stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
- if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
- ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
- "make_sock: for address %pI, apr_socket_opt_set: "
- "(IPV6_V6ONLY)",
- server->bind_addr);
- apr_socket_close(s);
- return stat;
+ if (server->bind_addr->family == APR_INET6) {
+ stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
+ if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
+ "make_sock: for address %pI, apr_socket_opt_set: "
+ "(IPV6_V6ONLY)",
+ server->bind_addr);
+ apr_socket_close(s);
+ return stat;
+ }
}
#endif
diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index 6bfff25..18d7994 100644
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -318,12 +318,14 @@
apr_signal(SIGABRT, sig_term);
}
-int nlmUnloadSignaled()
+int nlmUnloadSignaled(int wait)
{
shutdown_pending = 1;
- while (wait_to_finish) {
- NXThreadYield();
+ if (wait) {
+ while (wait_to_finish) {
+ NXThreadYield();
+ }
}
return 0;
@@ -912,8 +914,12 @@
startup_workers(ap_threads_to_start);
- /* Allow the Apache screen to be closed normally on exit()*/
- hold_screen_on_exit = 0;
+ /* Allow the Apache screen to be closed normally on exit() only if it
+ has not been explicitly forced to close on exit(). (ie. the -E flag
+ was specified at startup) */
+ if (hold_screen_on_exit > 0) {
+ hold_screen_on_exit = 0;
+ }
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,
"%s configured -- resuming normal operations",
diff --git a/server/provider.c b/server/provider.c
index d90a5e3..f9c7363 100644
--- a/server/provider.c
+++ b/server/provider.c
@@ -69,9 +69,11 @@
AP_DECLARE(apr_status_t) ap_register_provider(apr_pool_t *pool,
const char *provider_group,
const char *provider_name,
+ const char *provider_version,
const void *provider)
{
apr_hash_t *provider_group_hash;
+ apr_hash_t *provider_version_hash;
if (global_providers == NULL) {
global_providers = apr_hash_make(pool);
@@ -89,17 +91,28 @@
}
+ provider_version_hash = apr_hash_get(provider_group_hash, provider_name,
+ APR_HASH_KEY_STRING);
+
+ if (!provider_version_hash) {
+ provider_version_hash = apr_hash_make(pool);
+ apr_hash_set(provider_group_hash, provider_name, APR_HASH_KEY_STRING,
+ provider_version_hash);
+
+ }
+
/* just set it. no biggy if it was there before. */
- apr_hash_set(provider_group_hash, provider_name, APR_HASH_KEY_STRING,
+ apr_hash_set(provider_version_hash, provider_version, APR_HASH_KEY_STRING,
provider);
return APR_SUCCESS;
}
AP_DECLARE(void *) ap_lookup_provider(const char *provider_group,
- const char *provider_name)
+ const char *provider_name,
+ const char *provider_version)
{
- apr_hash_t *provider_group_hash;
+ apr_hash_t *provider_group_hash, *provider_name_hash;
if (global_providers == NULL) {
return NULL;
@@ -112,6 +125,13 @@
return NULL;
}
- return apr_hash_get(provider_group_hash, provider_name,
+ provider_name_hash = apr_hash_get(provider_group_hash, provider_name,
+ APR_HASH_KEY_STRING);
+
+ if (provider_name_hash == NULL) {
+ return NULL;
+ }
+
+ return apr_hash_get(provider_name_hash, provider_version,
APR_HASH_KEY_STRING);
}
diff --git a/server/request.c b/server/request.c
index f6388bb..3197bf2 100644
--- a/server/request.c
+++ b/server/request.c
@@ -363,25 +363,6 @@
* they change, all the way down.
*/
-/*
- * We don't want people able to serve up pipes, or unix sockets, or other
- * scary things. Note that symlink tests are performed later.
- */
-static int check_safe_file(request_rec *r)
-{
-
- if (r->finfo.filetype == 0 /* doesn't exist */
- || r->finfo.filetype == APR_DIR
- || r->finfo.filetype == APR_REG
- || r->finfo.filetype == APR_LNK) {
- return OK;
- }
-
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "object is not a file, directory or symlink: %s",
- r->filename);
- return HTTP_FORBIDDEN;
-}
/*
* resolve_symlink must _always_ be called on an APR_LNK file type!
@@ -577,7 +558,7 @@
* with APR_ENOENT, knowing that the path is good.
*/
if (!r->finfo.filetype || r->finfo.filetype == APR_LNK) {
- apr_stat(&r->finfo, r->filename, APR_FINFO_MIN, r->pool);
+ rv = apr_stat(&r->finfo, r->filename, APR_FINFO_MIN, r->pool);
/* some OSs will return APR_SUCCESS/APR_REG if we stat
* a regular file but we have '/' at the end of the name;
@@ -586,11 +567,14 @@
*
* handle it the same everywhere by simulating a failure
* if it looks like a directory but really isn't
+ *
+ * Also reset if the stat failed, just for safety.
*/
- if (r->finfo.filetype &&
- r->finfo.filetype != APR_DIR &&
- r->filename[strlen(r->filename) - 1] == '/') {
- r->finfo.filetype = 0; /* forget what we learned */
+ if ((rv != APR_SUCCESS) ||
+ (r->finfo.filetype &&
+ (r->finfo.filetype != APR_DIR) &&
+ (r->filename[strlen(r->filename) - 1] == '/'))) {
+ r->finfo.filetype = 0; /* forget what we learned */
}
}
@@ -1018,11 +1002,6 @@
return r->status = HTTP_FORBIDDEN;
}
- if ((res = check_safe_file(r))) {
- r->status = res;
- return res;
- }
-
/* Fix up the path now if we have a name, and they don't agree
*/
if ((thisinfo.valid & APR_FINFO_NAME)
@@ -1045,21 +1024,22 @@
r->filename);
return r->status = res;
}
+ }
- /* Ok, we are done with the link's info, test the real target
+ /* Ok, we are done with the link's info, test the real target
+ */
+ if (thisinfo.filetype == APR_REG ||
+ thisinfo.filetype == APR_NOFILE) {
+ /* That was fun, nothing left for us here
*/
- if (thisinfo.filetype == APR_REG) {
- /* That was fun, nothing left for us here
- */
- break;
- }
- else if (thisinfo.filetype != APR_DIR) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "symlink doesn't point to a file or "
- "directory: %s",
- r->filename);
- return r->status = HTTP_FORBIDDEN;
- }
+ break;
+ }
+ else if (thisinfo.filetype != APR_DIR) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "Forbidden: %s doesn't point to "
+ "a file or directory",
+ r->filename);
+ return r->status = HTTP_FORBIDDEN;
}
++seg;
diff --git a/srclib/pcre/NWGNUmakefile b/srclib/pcre/NWGNUmakefile
index 27dcce5..ae0eb03 100644
--- a/srclib/pcre/NWGNUmakefile
+++ b/srclib/pcre/NWGNUmakefile
@@ -37,6 +37,7 @@
XINCDIRS += \
$(APR)/pcre \
$(AP_WORK)/os/netware \
+ $(APR)/include/arch/netware \
$(EOLIST)
#
diff --git a/support/dbmmanage b/support/dbmmanage
deleted file mode 100644
index 49190f1..0000000
--- a/support/dbmmanage
+++ /dev/null
@@ -1,350 +0,0 @@
-#!/usr/bin/perl
-# ====================================================================
-# The Apache Software License, Version 1.1
-#
-# Copyright (c) 2000-2002 The Apache Software Foundation. All rights
-# reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The end-user documentation included with the redistribution,
-# if any, must include the following acknowledgment:
-# "This product includes software developed by the
-# Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowledgment may appear in the software itself,
-# if and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Apache" and "Apache Software Foundation" must
-# not be used to endorse or promote products derived from this
-# software without prior written permission. For written
-# permission, please contact apache@apache.org.
-#
-# 5. Products derived from this software may not be called "Apache",
-# nor may "Apache" appear in their name, without prior written
-# permission of the Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# ====================================================================
-#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Software Foundation. For more
-# information on the Apache Software Foundation, please see
-# <http://www.apache.org/>.
-#
-
-#for more functionality see the HTTPD::UserAdmin module:
-# http://www.perl.com/CPAN/modules/by-module/HTTPD/HTTPD-Tools-x.xx.tar.gz
-#
-# usage: dbmmanage <DBMfile> <command> <user> <password> <groups> <comment>
-
-package dbmmanage;
-# -ldb -lndbm -lgdbm -lsdbm
-BEGIN { @AnyDBM_File::ISA = qw(DB_File NDBM_File GDBM_File SDBM_File) }
-use strict;
-use Fcntl;
-use AnyDBM_File ();
-
-sub usage {
- my $cmds = join "|", sort keys %dbmc::;
- die <<SYNTAX;
-Usage: dbmmanage [enc] dbname command [username [pw [group[,group] [comment]]]]
-
- where enc is -d for crypt encryption (default except on Win32, Netware)
- -m for MD5 encryption (default on Win32, Netware)
- -s for SHA1 encryption
- -p for plaintext
-
- command is one of: $cmds
-
- pw of . for update command retains the old password
- pw of - (or blank) for update command prompts for the password
-
- groups or comment of . (or blank) for update command retains old values
- groups or comment of - for update command clears the existing value
- groups or comment of - for add and adduser commands is the empty value
-SYNTAX
-}
-
-sub need_sha1_crypt {
- if (!eval ('require "Digest/SHA1.pm";')) {
- print STDERR <<SHAERR;
-dbmmanage SHA1 passwords require the interface or the module Digest::SHA1
-available from CPAN:
-
- http://www.cpan.org/modules/by-module/Digest/Digest-MD5-2.12.tar.gz
-
-Please install Digest::SHA1 and try again, or use a different crypt option:
-
-SHAERR
- usage();
- }
-}
-
-sub need_md5_crypt {
- if (!eval ('require "Crypt/PasswdMD5.pm";')) {
- print STDERR <<MD5ERR;
-dbmmanage MD5 passwords require the module Crypt::PasswdMD5 available from CPAN
-
- http://www.cpan.org/modules/by-module/Crypt/Crypt-PasswdMD5-1.1.tar.gz
-
-Please install Crypt::PasswdMD5 and try again, or use a different crypt option:
-
-MD5ERR
- usage();
- }
-}
-
-# if your osname is in $newstyle_salt, then use new style salt (starts with '_' and contains
-# four bytes of iteration count and four bytes of salt). Otherwise, just use
-# the traditional two-byte salt.
-# see the man page on your system to decide if you have a newer crypt() lib.
-# I believe that 4.4BSD derived systems do (at least BSD/OS 2.0 does).
-# The new style crypt() allows up to 20 characters of the password to be
-# significant rather than only 8.
-#
-my $newstyle_salt_platforms = join '|', qw{bsdos}; #others?
-my $newstyle_salt = $^O =~ /(?:$newstyle_salt_platforms)/;
-
-# Some platforms just can't crypt() for Apache
-#
-my $crypt_not_supported_platforms = join '|', qw{MSWin32 NetWare}; #others?
-my $crypt_not_supported = $^O =~ /(?:$crypt_not_supported_platforms)/;
-
-my $crypt_method = "crypt";
-
-if ($crypt_not_supported) {
- $crypt_method = "md5";
-}
-
-# Some platforms won't jump through our favorite hoops
-#
-my $not_unix_platforms = join '|', qw{MSWin32 NetWare}; #others?
-my $not_unix = $^O =~ /(?:$not_unix_platforms)/;
-
-if ($crypt_not_supported) {
- $crypt_method = "md5";
-}
-
-if (@ARGV[0] eq "-d") {
- shift @ARGV;
- if ($crypt_not_supported) {
- print STDERR
- "Warning: Apache/$^O does not support crypt()ed passwords!\n\n";
- }
- $crypt_method = "crypt";
-}
-
-if (@ARGV[0] eq "-m") {
- shift @ARGV;
- $crypt_method = "md5";
-}
-
-if (@ARGV[0] eq "-p") {
- shift @ARGV;
- if (!$crypt_not_supported) {
- print STDERR
- "Warning: Apache/$^O does not support plaintext passwords!\n\n";
- }
- $crypt_method = "plain";
-}
-
-if (@ARGV[0] eq "-s") {
- shift @ARGV;
- need_sha1_crypt();
- $crypt_method = "sha1";
-}
-
-if ($crypt_method eq "md5") {
- need_md5_crypt();
-}
-
-my($file,$command,$key,$crypted_pwd,$groups,$comment) = @ARGV;
-
-usage() unless $file and $command and defined &{$dbmc::{$command}};
-
-# remove extension if any
-my $chop = join '|', qw{db.? pag dir};
-$file =~ s/\.($chop)$//;
-
-my $is_update = $command eq "update";
-my %DB = ();
-my @range = ();
-my($mode, $flags) = $command =~
- /^(?:view|check)$/ ? (0644, O_RDONLY) : (0644, O_RDWR|O_CREAT);
-
-tie (%DB, "AnyDBM_File", $file, $flags, $mode) || die "Can't tie $file: $!";
-dbmc->$command();
-untie %DB;
-
-
-my $x;
-sub genseed {
- my $psf;
- if ($not_unix) {
- srand (time ^ $$ or time ^ ($$ + ($$ << 15)));
- }
- else {
- for (qw(-xlwwa -le)) {
- `ps $_ 2>/dev/null`;
- $psf = $_, last unless $?;
- }
- srand (time ^ $$ ^ unpack("%L*", `ps $psf | gzip -f`));
- }
- @range = (qw(. /), '0'..'9','a'..'z','A'..'Z');
- $x = int scalar @range;
-}
-
-sub randchar {
- join '', map $range[rand $x], 1..shift||1;
-}
-
-sub saltpw_crypt {
- genseed() unless @range;
- return $newstyle_salt ?
- join '', "_", randchar, "a..", randchar(4) :
- randchar(2);
-}
-
-sub cryptpw_crypt {
- my ($pw, $salt) = @_;
- $salt = saltpw_crypt unless $salt;
- crypt $pw, $salt;
-}
-
-sub saltpw_md5 {
- genseed() unless @range;
- randchar(8);
-}
-
-sub cryptpw_md5 {
- my($pw, $salt) = @_;
- $salt = saltpw_md5 unless $salt;
- Crypt::PasswdMD5::apache_md5_crypt($pw, $salt);
-}
-
-sub cryptpw_sha1 {
- my($pw, $salt) = @_;
- '{SHA}' . Digest::SHA1::sha1_base64($pw) . "=";
-}
-
-sub cryptpw {
- if ($crypt_method eq "md5") {
- return cryptpw_md5(@_);
- } elsif ($crypt_method eq "sha1") {
- return cryptpw_sha1(@_);
- } elsif ($crypt_method eq "crypt") {
- return cryptpw_crypt(@_);
- }
- @_[0]; # otherwise return plaintext
-}
-
-sub getpass {
- my $prompt = shift || "Enter password:";
-
- unless($not_unix) {
- open STDIN, "/dev/tty" or warn "couldn't open /dev/tty $!\n";
- system "stty -echo;";
- }
-
- my($c,$pwd);
- print STDERR $prompt;
- while (($c = getc(STDIN)) ne '' and $c ne "\n" and $c ne "\r") {
- $pwd .= $c;
- }
-
- system "stty echo" unless $not_unix;
- print STDERR "\n";
- die "Can't use empty password!\n" unless length $pwd;
- return $pwd;
-}
-
-sub dbmc::update {
- die "Sorry, user `$key' doesn't exist!\n" unless $DB{$key};
- $crypted_pwd = (split /:/, $DB{$key}, 3)[0] if $crypted_pwd eq '.';
- $groups = (split /:/, $DB{$key}, 3)[1] if !$groups || $groups eq '.';
- $comment = (split /:/, $DB{$key}, 3)[2] if !$comment || $comment eq '.';
- if (!$crypted_pwd || $crypted_pwd eq '-') {
- dbmc->adduser;
- }
- else {
- dbmc->add;
- }
-}
-
-sub dbmc::add {
- die "Can't use empty password!\n" unless $crypted_pwd;
- unless($is_update) {
- die "Sorry, user `$key' already exists!\n" if $DB{$key};
- }
- $groups = '' if $groups eq '-';
- $comment = '' if $comment eq '-';
- $groups .= ":" . $comment if $comment;
- $crypted_pwd .= ":" . $groups if $groups;
- $DB{$key} = $crypted_pwd;
- my $action = $is_update ? "updated" : "added";
- print "User $key $action with password encrypted to $DB{$key} using $crypt_method\n";
-}
-
-sub dbmc::adduser {
- my $value = getpass "New password:";
- die "They don't match, sorry.\n" unless getpass("Re-type new password:") eq $value;
- $crypted_pwd = cryptpw $value;
- dbmc->add;
-}
-
-sub dbmc::delete {
- die "Sorry, user `$key' doesn't exist!\n" unless $DB{$key};
- delete $DB{$key}, print "`$key' deleted\n";
-}
-
-sub dbmc::view {
- print $key ? "$key:$DB{$key}\n" : map { "$_:$DB{$_}\n" if $DB{$_} } keys %DB;
-}
-
-sub dbmc::check {
- die "Sorry, user `$key' doesn't exist!\n" unless $DB{$key};
- my $chkpass = (split /:/, $DB{$key}, 3)[0];
- my $testpass = getpass();
- if (substr($chkpass, 0, 6) eq '$apr1$') {
- need_md5_crypt;
- $crypt_method = "md5";
- } elsif (substr($chkpass, 0, 5) eq '{SHA}') {
- need_sha1_crypt;
- $crypt_method = "sha1";
- } elsif (length($chkpass) == 13 && $chkpass ne $testpass) {
- $crypt_method = "crypt";
- } else {
- $crypt_method = "plain";
- }
- print $crypt_method . (cryptpw($testpass, $chkpass) eq $chkpass
- ? " password ok\n" : " password mismatch\n");
-}
-
-sub dbmc::import {
- while(defined($_ = <STDIN>) and chomp) {
- ($key,$crypted_pwd,$groups,$comment) = split /:/, $_, 4;
- dbmc->add;
- }
-}
-
diff --git a/support/log_server_status b/support/log_server_status
deleted file mode 100644
index f9c871d..0000000
--- a/support/log_server_status
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/perl
-# ====================================================================
-# The Apache Software License, Version 1.1
-#
-# Copyright (c) 2000-2002 The Apache Software Foundation. All rights
-# reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The end-user documentation included with the redistribution,
-# if any, must include the following acknowledgment:
-# "This product includes software developed by the
-# Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowledgment may appear in the software itself,
-# if and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Apache" and "Apache Software Foundation" must
-# not be used to endorse or promote products derived from this
-# software without prior written permission. For written
-# permission, please contact apache@apache.org.
-#
-# 5. Products derived from this software may not be called "Apache",
-# nor may "Apache" appear in their name, without prior written
-# permission of the Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# ====================================================================
-#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Software Foundation. For more
-# information on the Apache Software Foundation, please see
-# <http://www.apache.org/>.
-#
-# Log Server Status
-# Mark J Cox, UK Web Ltd 1996, mark@ukweb.com
-#
-# This script is designed to be run at a frequent interval by something
-# like cron. It connects to the server and downloads the status
-# information. It reformats the information to a single line and logs
-# it to a file. Make sure the directory $wherelog is writable by the
-# user who runs this script.
-#
-require 'sys/socket.ph';
-
-$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312"
-$server = "localhost"; # Name of server, could be "www.foo.com"
-$port = "80"; # Port on server
-$request = "/status/?auto"; # Request to send
-
-sub tcp_connect
-{
- local($host,$port) =@_;
- $sockaddr='S n a4 x8';
- chop($hostname=`hostname`);
- $port=(getservbyname($port, 'tcp'))[2] unless $port =~ /^\d+$/;
- $me=pack($sockaddr,&AF_INET,0,(gethostbyname($hostname))[4]);
- $them=pack($sockaddr,&AF_INET,$port,(gethostbyname($host))[4]);
- socket(S,&PF_INET,&SOCK_STREAM,(getprotobyname('tcp'))[2]) ||
- die "socket: $!";
- bind(S,$me) || return "bind: $!";
- connect(S,$them) || return "connect: $!";
- select(S);
- $| = 1;
- select(stdout);
- return "";
-}
-
-### Main
-
-{
- $year=`date +%y`;
- chomp($year);
- $year += ($year < 70) ? 2000 : 1900;
- $date = $year . `date +%m%d:%H%M%S`;
- chomp($date);
- ($day,$time)=split(/:/,$date);
- $res=&tcp_connect($server,$port);
- open(OUT,">>$wherelog$day");
- if ($res) {
- print OUT "$time:-1:-1:-1:-1:$res\n";
- exit 1;
- }
- print S "GET $request\n";
- while (<S>) {
- $requests=$1 if ( m|^BusyServers:\ (\S+)|);
- $idle=$1 if ( m|^IdleServers:\ (\S+)|);
- $number=$1 if ( m|sses:\ (\S+)|);
- $cpu=$1 if (m|^CPULoad:\ (\S+)|);
- }
- print OUT "$time:$requests:$idle:$number:$cpu\n";
-}
-
-
diff --git a/support/logresolve.pl b/support/logresolve.pl
deleted file mode 100644
index b99a5b8..0000000
--- a/support/logresolve.pl
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/usr/bin/perl
-# ====================================================================
-# The Apache Software License, Version 1.1
-#
-# Copyright (c) 2000-2002 The Apache Software Foundation. All rights
-# reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The end-user documentation included with the redistribution,
-# if any, must include the following acknowledgment:
-# "This product includes software developed by the
-# Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowledgment may appear in the software itself,
-# if and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Apache" and "Apache Software Foundation" must
-# not be used to endorse or promote products derived from this
-# software without prior written permission. For written
-# permission, please contact apache@apache.org.
-#
-# 5. Products derived from this software may not be called "Apache",
-# nor may "Apache" appear in their name, without prior written
-# permission of the Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# ====================================================================
-#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Software Foundation. For more
-# information on the Apache Software Foundation, please see
-# <http://www.apache.org/>.
-#
-# logresolve.pl
-#
-# v 1.2 by robh @ imdb.com
-#
-# usage: logresolve.pl <infile >outfile
-#
-# input = Apache/NCSA/.. logfile with IP numbers at start of lines
-# output = same logfile with IP addresses resolved to hostnames where
-# name lookups succeeded.
-#
-# this differs from the C based 'logresolve' in that this script
-# spawns a number ($CHILDREN) of subprocesses to resolve addresses
-# concurrently and sets a short timeout ($TIMEOUT) for each lookup in
-# order to keep things moving quickly.
-#
-# the parent process handles caching of IP->hostnames using a Perl hash
-# it also avoids sending the same IP to multiple child processes to be
-# resolved multiple times concurrently.
-#
-# Depending on the settings of $CHILDREN and $TIMEOUT you should see
-# significant reductions in the overall time taken to resolve your
-# logfiles. With $CHILDREN=40 and $TIMEOUT=5 I've seen 200,000 - 300,000
-# logfile lines processed per hour compared to ~45,000 per hour
-# with 'logresolve'.
-#
-# I haven't yet seen any noticable reduction in the percentage of IPs
-# that fail to get resolved. Your mileage will no doubt vary. 5s is long
-# enough to wait IMO.
-#
-# Known to work with FreeBSD 2.2
-# Known to have problems with Solaris
-#
-# 980417 - use 'sockaddr_un' for bind/connect to make the script work
-# with linux. Fix from Luuk de Boer <luuk_de_boer@pi.net>
-
-require 5.004;
-
-$|=1;
-
-use FileHandle;
-use Socket;
-
-use strict;
-no strict 'refs';
-
-use vars qw($PROTOCOL);
-$PROTOCOL = 0;
-
-my $CHILDREN = 40;
-my $TIMEOUT = 5;
-
-my $filename;
-my %hash = ();
-my $parent = $$;
-
-my @children = ();
-for (my $child = 1; $child <=$CHILDREN; $child++) {
- my $f = fork();
- if (!$f) {
- $filename = "./.socket.$parent.$child";
- if (-e $filename) { unlink($filename) || warn "$filename .. $!\n";}
- &child($child);
- exit(0);
- }
- push(@children, $f);
-}
-
-&parent;
-&cleanup;
-
-## remove all temporary files before shutting down
-sub cleanup {
- # die kiddies, die
- kill(15, @children);
- for (my $child = 1; $child <=$CHILDREN; $child++) {
- if (-e "./.socket.$parent.$child") {
- unlink("./.socket.$parent.$child")
- || warn ".socket.$parent.$child $!";
- }
- }
-}
-
-sub parent {
- # Trap some possible signals to trigger temp file cleanup
- $SIG{'KILL'} = $SIG{'INT'} = $SIG{'PIPE'} = \&cleanup;
-
- my %CHILDSOCK;
- my $filename;
-
- ## fork child processes. Each child will create a socket connection
- ## to this parent and use an unique temp filename to do so.
- for (my $child = 1; $child <=$CHILDREN; $child++) {
- $CHILDSOCK{$child}= FileHandle->new;
-
- if (!socket($CHILDSOCK{$child}, AF_UNIX, SOCK_STREAM, $PROTOCOL)) {
- warn "parent socket to child failed $!";
- }
- $filename = "./.socket.$parent.$child";
- my $response;
- do {
- $response = connect($CHILDSOCK{$child}, sockaddr_un($filename));
- if ($response != 1) {
- sleep(1);
- }
- } while ($response != 1);
- $CHILDSOCK{$child}->autoflush;
- }
- ## All child processes should now be ready or at worst warming up
-
- my (@buffer, $child, $ip, $rest, $hostname, $response);
- ## read the logfile lines from STDIN
- while(<STDIN>) {
- @buffer = (); # empty the logfile line buffer array.
- $child = 1; # children are numbered 1..N, start with #1
-
- # while we have a child to talk to and data to give it..
- do {
- push(@buffer, $_); # buffer the line
- ($ip, $rest) = split(/ /, $_, 2); # separate IP form rest
-
- unless ($hash{$ip}) { # resolve if unseen IP
- $CHILDSOCK{$child}->print("$ip\n"); # pass IP to next child
- $hash{$ip} = $ip; # don't look it up again.
- $child++;
- }
- } while (($child < ($CHILDREN-1)) and ($_ = <STDIN>));
-
- ## now poll each child for a response
- while (--$child > 0) {
- $response = $CHILDSOCK{$child}->getline;
- chomp($response);
- # child sends us back both the IP and HOSTNAME, no need for us
- # to remember what child received any given IP, and no worries
- # what order we talk to the children
- ($ip, $hostname) = split(/\|/, $response, 2);
- $hash{$ip} = $hostname;
- }
-
- # resolve all the logfiles lines held in the log buffer array..
- for (my $line = 0; $line <=$#buffer; $line++) {
- # get next buffered line
- ($ip, $rest) = split(/ /, $buffer[$line], 2);
- # separate IP from rest and replace with cached hostname
- printf STDOUT ("%s %s", $hash{$ip}, $rest);
- }
- }
-}
-
-########################################
-
-sub child {
- # arg = numeric ID - how the parent refers to me
- my $me = shift;
-
- # add trap for alarm signals.
- $SIG{'ALRM'} = sub { die "alarmed"; };
-
- # create a socket to communicate with parent
- socket(INBOUND, AF_UNIX, SOCK_STREAM, $PROTOCOL)
- || die "Error with Socket: !$\n";
- $filename = "./.socket.$parent.$me";
- bind(INBOUND, sockaddr_un($filename))
- || die "Error Binding $filename: $!\n";
- listen(INBOUND, 5) || die "Error Listening: $!\n";
-
- my ($ip, $send_back);
- my $talk = FileHandle->new;
-
- # accept a connection from the parent process. We only ever have
- # have one connection where we exchange 1 line of info with the
- # parent.. 1 line in (IP address), 1 line out (IP + hostname).
- accept($talk, INBOUND) || die "Error Accepting: $!\n";
- # disable I/O buffering just in case
- $talk->autoflush;
- # while the parent keeps sending data, we keep responding..
- while(($ip = $talk->getline)) {
- chomp($ip);
- # resolve the IP if time permits and send back what we found..
- $send_back = sprintf("%s|%s", $ip, &nslookup($ip));
- $talk->print($send_back."\n");
- }
-}
-
-# perform a time restricted hostname lookup.
-sub nslookup {
- # get the IP as an arg
- my $ip = shift;
- my $hostname = undef;
-
- # do the hostname lookup inside an eval. The eval will use the
- # already configured SIGnal handler and drop out of the {} block
- # regardless of whether the alarm occured or not.
- eval {
- alarm($TIMEOUT);
- $hostname = gethostbyaddr(gethostbyname($ip), AF_INET);
- alarm(0);
- };
- if ($@ =~ /alarm/) {
- # useful for debugging perhaps..
- # print "alarming, isn't it? ($ip)";
- }
-
- # return the hostname or the IP address itself if there is no hostname
- $hostname ne "" ? $hostname : $ip;
-}
-
-
diff --git a/support/phf_abuse_log.cgi b/support/phf_abuse_log.cgi
deleted file mode 100644
index 87543ce..0000000
--- a/support/phf_abuse_log.cgi
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/perl
-
-# This script is used to detect people trying to abuse the security hole which
-# existed in A CGI script direstributed with Apache 1.0.3 and earlier versions.
-# You can redirect them to here using the "<Location /cgi-bin/phf*>" suggestion
-# in httpd.conf.
-#
-# The format logged to is
-# "[date] remote_addr remote_host [date] referrer user_agent".
-
-$LOG = "/var/log/phf_log";
-
-require "ctime.pl";
-$when = &ctime(time);
-$when =~ s/\n//go;
-$ENV{HTTP_USER_AGENT} .= " via $ENV{HTTP_VIA}" if($ENV{HTTP_VIA});
-
-open(LOG, ">>$LOG") || die "boo hoo, phf_log $!";
-print LOG "[$when] $ENV{REMOTE_ADDR} $ENV{REMOTE_HOST} $ENV{$HTTP_REFERER} $ENV{HTTP_USER_AGENT}\n";
-close(LOG);
-
-print "Content-type: text/html\r\n\r\n<BLINK>Smile, you're on Candid Camera.</BLINK>\n";
diff --git a/support/split-logfile b/support/split-logfile
deleted file mode 100644
index c0f3486..0000000
--- a/support/split-logfile
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/perl
-# ====================================================================
-# The Apache Software License, Version 1.1
-#
-# Copyright (c) 2000-2001 The Apache Software Foundation. All rights
-# reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The end-user documentation included with the redistribution,
-# if any, must include the following acknowledgment:
-# "This product includes software developed by the
-# Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowledgment may appear in the software itself,
-# if and wherever such third-party acknowledgments normally appear.
-#
-# 4. The names "Apache" and "Apache Software Foundation" must
-# not be used to endorse or promote products derived from this
-# software without prior written permission. For written
-# permission, please contact apache@apache.org.
-#
-# 5. Products derived from this software may not be called "Apache",
-# nor may "Apache" appear in their name, without prior written
-# permission of the Apache Software Foundation.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# ====================================================================
-#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Software Foundation. For more
-# information on the Apache Software Foundation, please see
-# <http://www.apache.org/>.
-
-# This script will take a combined Web server access
-# log file and break its contents into separate files.
-# It assumes that the first field of each line is the
-# virtual host identity (put there by "%v"), and that
-# the logfiles should be named that+".log" in the current
-# directory.
-#
-# The combined log file is read from stdin. Records read
-# will be appended to any existing log files.
-#
-%is_open = ();
-
-while ($log_line = <STDIN>) {
- #
- # Get the first token from the log record; it's the
- # identity of the virtual host to which the record
- # applies.
- #
- ($vhost) = split (/\s/, $log_line);
- #
- # Normalize the virtual host name to all lowercase.
- # If it's blank, the request was handled by the default
- # server, so supply a default name. This shouldn't
- # happen, but caution rocks.
- #
- $vhost = lc ($vhost) or "access";
- #
- # If the log file for this virtual host isn't opened
- # yet, do it now.
- #
- if (! $is_open{$vhost}) {
- open $vhost, ">>${vhost}.log"
- or die ("Can't open ${vhost}.log");
- $is_open{$vhost} = 1;
- }
- #
- # Strip off the first token (which may be null in the
- # case of the default server), and write the edited
- # record to the current log file.
- #
- $log_line =~ s/^\S*\s+//;
- printf $vhost "%s", $log_line;
-}
-exit 0;
