You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2012/12/12 15:15:56 UTC
svn commit: r1420690 [1/9] - in /httpd/httpd/trunk/docs: man/ manual/
manual/howto/ manual/misc/ manual/mod/ manual/programs/
Author: rjung
Date: Wed Dec 12 14:15:38 2012
New Revision: 1420690
URL: http://svn.apache.org/viewvc?rev=1420690&view=rev
Log:
Docs xforms.
Modified:
httpd/httpd/trunk/docs/man/dbmmanage.1
httpd/httpd/trunk/docs/man/htdbm.1
httpd/httpd/trunk/docs/man/htpasswd.1
httpd/httpd/trunk/docs/manual/convenience.map
httpd/httpd/trunk/docs/manual/howto/auth.html.en
httpd/httpd/trunk/docs/manual/howto/auth.html.fr
httpd/httpd/trunk/docs/manual/howto/auth.xml.fr
httpd/httpd/trunk/docs/manual/howto/auth.xml.ja
httpd/httpd/trunk/docs/manual/howto/auth.xml.ko
httpd/httpd/trunk/docs/manual/howto/auth.xml.meta
httpd/httpd/trunk/docs/manual/howto/auth.xml.tr
httpd/httpd/trunk/docs/manual/misc/password_encryptions.html.en
httpd/httpd/trunk/docs/manual/mod/directives.html.de
httpd/httpd/trunk/docs/manual/mod/directives.html.en
httpd/httpd/trunk/docs/manual/mod/directives.html.es
httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8
httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr
httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8
httpd/httpd/trunk/docs/manual/mod/directives.html.zh-cn
httpd/httpd/trunk/docs/manual/mod/mod_authn_dbm.html.en
httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en
httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr
httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr
httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.ja.utf8
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_proxy_html.html.en
httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en
httpd/httpd/trunk/docs/manual/mod/quickreference.html.de
httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
httpd/httpd/trunk/docs/manual/mod/quickreference.html.es
httpd/httpd/trunk/docs/manual/mod/quickreference.html.ja.utf8
httpd/httpd/trunk/docs/manual/mod/quickreference.html.ko.euc-kr
httpd/httpd/trunk/docs/manual/mod/quickreference.html.tr.utf8
httpd/httpd/trunk/docs/manual/mod/quickreference.html.zh-cn
httpd/httpd/trunk/docs/manual/programs/dbmmanage.html.en
httpd/httpd/trunk/docs/manual/programs/htdbm.html.en
httpd/httpd/trunk/docs/manual/programs/htpasswd.html.en
Modified: httpd/httpd/trunk/docs/man/dbmmanage.1
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/man/dbmmanage.1?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/man/dbmmanage.1 (original)
+++ httpd/httpd/trunk/docs/man/dbmmanage.1 Wed Dec 12 14:15:38 2012
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "DBMMANAGE" 1 "2004-12-10" "Apache HTTP Server" "dbmmanage"
+.TH "DBMMANAGE" 1 "2012-12-12" "Apache HTTP Server" "dbmmanage"
.SH NAME
dbmmanage \- Manage user authentication files in DBM format
@@ -42,6 +42,9 @@ dbmmanage \- Manage user authentication
dbmmanage is used to create and update the DBM format files used to store usernames and password for basic authentication of HTTP users via mod_authn_dbm\&. Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by dbmmanage\&. This program can only be used when the usernames are stored in a DBM file\&. To use a flat-file database see htpasswd\&.
.PP
+Another tool to maintain a DBM password database is htdbm\&.
+
+.PP
This manual page only lists the command line arguments\&. For details of the directives necessary to configure user authentication in httpd see the httpd manual, which is part of the Apache distribution or can be found at http://httpd\&.apache\&.org/\&.
Modified: httpd/httpd/trunk/docs/man/htdbm.1
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/man/htdbm.1?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/man/htdbm.1 (original)
+++ httpd/httpd/trunk/docs/man/htdbm.1 Wed Dec 12 14:15:38 2012
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTDBM" 1 "2009-03-27" "Apache HTTP Server" "htdbm"
+.TH "HTDBM" 1 "2012-12-12" "Apache HTTP Server" "htdbm"
.SH NAME
htdbm \- Manipulate DBM password databases
@@ -27,25 +27,25 @@ htdbm \- Manipulate DBM password databas
.SH "SYNOPSIS"
.PP
-\fBhtdbm\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBx\fR ] \fIfilename\fR \fIusername\fR
+\fBhtdbm\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBi\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR
.PP
-\fBhtdbm\fR -\fBb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR
+\fBhtdbm\fR -\fBb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR
.PP
-\fBhtdbm\fR -\fBn\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR
+\fBhtdbm\fR -\fBn\fR [ -\fBi\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR
.PP
-\fBhtdbm\fR -\fBnb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR \fIpassword\fR
+\fBhtdbm\fR -\fBnb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIusername\fR \fIpassword\fR
.PP
-\fBhtdbm\fR -\fBv\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR
+\fBhtdbm\fR -\fBv\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBi\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR
.PP
-\fBhtdbm\fR -\fBvb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR
+\fBhtdbm\fR -\fBvb\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBt\fR ] [ -\fBv\fR ] \fIfilename\fR \fIusername\fR \fIpassword\fR
.PP
-\fBhtdbm\fR -\fBx\fR [ -\fBT\fR\fIDBTYPE\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] \fIfilename\fR \fIusername\fR
+\fBhtdbm\fR -\fBx\fR [ -\fBT\fR\fIDBTYPE\fR ] \fIfilename\fR \fIusername\fR
.PP
\fBhtdbm\fR -\fBl\fR [ -\fBT\fR\fIDBTYPE\fR ]
@@ -62,7 +62,10 @@ htdbm is used to manipulate the DBM form
.TP
-b
-Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&.
+Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&. For script use see the -i option\&.
+.TP
+-i
+Read the password from stdin without verification (for script usage)\&.
.TP
-c
Create the \fIpasswdfile\fR\&. If \fIpasswdfile\fR already exists, it is rewritten and truncated\&. This option cannot be combined with the -n option\&.
@@ -73,11 +76,17 @@ Display the results on standard output r
-m
Use MD5 encryption for passwords\&. On Windows and Netware, this is the default\&.
.TP
+-B
+Use bcrypt encryption for passwords\&. This is currently considered to be very secure\&.
+.TP
+-C
+This flag is only allowed in combination with -B (bcrypt encryption)\&. It sets the computing time used for the bcrypt algorithm (higher is more secure but slower, default: 5, valid: 4 to 31)\&.
+.TP
-d
-Use crypt() encryption for passwords\&. The default on all platforms but Windows and Netware\&. Though possibly supported by htdbm on all platforms, it is not supported by the httpd server on Windows and Netware\&.
+Use crypt() encryption for passwords\&. The default on all platforms but Windows and Netware\&. Though possibly supported by htdbm on all platforms, it is not supported by the httpd server on Windows and Netware\&. This algorithm is \fBinsecure\fR by today's standards\&.
.TP
-s
-Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&.
+Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&. This algorithm is \fBinsecure\fR by today's standards\&.
.TP
-p
Use plaintext passwords\&. Though htdbm will support creation on all platforms, the httpd daemon will only accept plain text passwords on Windows and Netware\&.
@@ -85,15 +94,15 @@ Use plaintext passwords\&. Though htdbm
-l
Print each of the usernames and comments from the database on stdout\&.
.TP
--t
-Interpret the final parameter as a comment\&. When this option is specified, an additional string can be appended to the command line; this string will be stored in the "Comment" field of the database, associated with the specified username\&.
-.TP
-v
Verify the username and password\&. The program will print a message indicating whether the supplied password is valid\&. If the password is invalid, the program exits with error code 3\&.
.TP
-x
Delete user\&. If the username exists in the specified DBM file, it will be deleted\&.
.TP
+-t
+Interpret the final parameter as a comment\&. When this option is specified, an additional string can be appended to the command line; this string will be stored in the "Comment" field of the database, associated with the specified username\&.
+.TP
\fIfilename\fR
The filename of the DBM format file\&. Usually without the extension \&.db, \&.pag, or \&.dir\&. If -c is given, the DBM file is created if it does not already exist, or updated if it does exist\&.
.TP
@@ -156,6 +165,15 @@ Web password files such as those managed
.PP
The use of the -b option is discouraged, since when it is used the unencrypted password appears on the command line\&.
+.PP
+When using the crypt() algorithm, note that only the first 8 characters of the password are used to form the password\&. If the supplied password is longer, the extra characters will be silently discarded\&.
+
+.PP
+The SHA encryption format does not use salting: for a given password, there is only one encrypted representation\&. The crypt() and MD5 formats permute the representation by prepending a random salt string, to make dictionary attacks against the passwords more difficult\&.
+
+.PP
+The SHA and crypt() formats are insecure by today's standards\&.
+
.SH "RESTRICTIONS"
.PP
Modified: httpd/httpd/trunk/docs/man/htpasswd.1
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/man/htpasswd.1?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/man/htpasswd.1 (original)
+++ httpd/httpd/trunk/docs/man/htpasswd.1 Wed Dec 12 14:15:38 2012
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTPASSWD" 1 "2012-06-22" "Apache HTTP Server" "htpasswd"
+.TH "HTPASSWD" 1 "2012-12-12" "Apache HTTP Server" "htpasswd"
.SH NAME
htpasswd \- Manage user files for basic authentication
@@ -27,16 +27,16 @@ htpasswd \- Manage user files for basic
.SH "SYNOPSIS"
.PP
-\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBm\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR
+\fBhtpasswd\fR [ -\fBc\fR ] [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR
.PP
-\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBd\fR | -\fBp\fR | -\fBs\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR
+\fBhtpasswd\fR -\fBb\fR [ -\fBc\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] [ -\fBD\fR ] \fIpasswdfile\fR \fIusername\fR \fIpassword\fR
.PP
-\fBhtpasswd\fR -\fBn\fR [ -\fBm\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] \fIusername\fR
+\fBhtpasswd\fR -\fBn\fR [ -\fBi\fR ] [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR
.PP
-\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] \fIusername\fR \fIpassword\fR
+\fBhtpasswd\fR -\fBnb\fR [ -\fBm\fR | -\fBB\fR | -\fBd\fR | -\fBs\fR | -\fBp\fR ] [ -\fBC\fR \fIcost\fR ] \fIusername\fR \fIpassword\fR
.SH "SUMMARY"
@@ -45,10 +45,10 @@ htpasswd \- Manage user files for basic
htpasswd is used to create and update the flat-files used to store usernames and password for basic authentication of HTTP users\&. If htpasswd cannot access a file, such as not being able to write to the output file or not being able to read the file in order to update it, it returns an error status and makes no changes\&.
.PP
-Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by htpasswd\&. This program can only manage usernames and passwords stored in a flat-file\&. It can encrypt and display password information for use in other types of data stores, though\&. To use a DBM database see dbmmanage\&.
+Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by htpasswd\&. This program can only manage usernames and passwords stored in a flat-file\&. It can encrypt and display password information for use in other types of data stores, though\&. To use a DBM database see dbmmanage or htdbm\&.
.PP
-htpasswd encrypts passwords using either a version of MD5 modified for Apache, or the system's crypt() routine\&. Files managed by htpasswd may contain both types of passwords; some user records may have MD5-encrypted passwords while others in the same file may have passwords encrypted with crypt()\&.
+htpasswd encrypts passwords using either bcrypt, a version of MD5 modified for Apache, SHA1, or the system's crypt() routine\&. Files managed by htpasswd may contain a mixture of different encoding types of passwords; some user records may have bcrypt or MD5-encrypted passwords while others in the same file may have passwords encrypted with crypt()\&.
.PP
This manual page only lists the command line arguments\&. For details of the directives necessary to configure user authentication in httpd see the Apache manual, which is part of the Apache distribution or can be found at http://httpd\&.apache\&.org/\&.
@@ -59,7 +59,10 @@ This manual page only lists the command
.TP
-b
-Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&.
+Use batch mode; \fIi\&.e\&.\fR, get the password from the command line rather than prompting for it\&. This option should be used with extreme care, since \fBthe password is clearly visible\fR on the command line\&. For script use see the -i option\&.
+.TP
+-i
+Read the password from stdin without verification (for script usage)\&.
.TP
-c
Create the \fIpasswdfile\fR\&. If \fIpasswdfile\fR already exists, it is rewritten and truncated\&. This option cannot be combined with the -n option\&.
@@ -70,6 +73,12 @@ Display the results on standard output r
-m
Use MD5 encryption for passwords\&. This is the default\&.
.TP
+-B
+Use bcrypt encryption for passwords\&. This is currently considered to be very secure\&.
+.TP
+-C
+This flag is only allowed in combination with -B (bcrypt encryption)\&. It sets the computing time used for the bcrypt algorithm (higher is more secure but slower, default: 5, valid: 4 to 31)\&.
+.TP
-d
Use crypt() encryption for passwords\&. This is not supported by the httpd server on Windows and Netware\&. This algorithm limits the password length to 8 characters\&. This algorithm is \fBinsecure\fR by today's standards\&.
.TP
Modified: httpd/httpd/trunk/docs/manual/convenience.map
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/convenience.map?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/convenience.map (original)
+++ httpd/httpd/trunk/docs/manual/convenience.map Wed Dec 12 14:15:38 2012
@@ -32,6 +32,7 @@ aliasmatch mod/mod_alias.html#aliasmatch
allow mod/mod_access_compat.html#allow
allowconnect mod/mod_proxy_connect.html#allowconnect
allowencodedslashes mod/core.html#allowencodedslashes
+allowhandlers mod/mod_allowhandlers.html#allowhandlers
allowmethods mod/mod_allowmethods.html#allowmethods
allowoverride mod/core.html#allowoverride
allowoverridelist mod/core.html#allowoverridelist
@@ -108,7 +109,6 @@ authzdbmtype mod/mod_authz_dbm.html#auth
authzprovideralias mod/mod_authz_core.html#authzprovideralias
authzsendforbiddenonfailure mod/mod_authz_core.html#authzsendforbiddenonfailure
balancergrowth mod/mod_proxy.html#balancergrowth
-balancerinherit mod/mod_proxy.html#balancerinherit
balancermember mod/mod_proxy.html#balancermember
balancerpersist mod/mod_proxy.html#balancerpersist
browsermatch mod/mod_setenvif.html#browsermatch
@@ -308,6 +308,7 @@ location mod/core.html#location
locationmatch mod/core.html#locationmatch
logformat mod/mod_log_config.html#logformat
loglevel mod/core.html#loglevel
+logleveloverride mod/core.html#logleveloverride
logmessage mod/mod_log_debug.html#logmessage
luaauthzprovider mod/mod_lua.html#luaauthzprovider
luacodecache mod/mod_lua.html#luacodecache
@@ -409,6 +410,7 @@ proxyiobuffersize mod/mod_proxy.html#pro
proxymatch mod/mod_proxy.html#proxymatch
proxymaxforwards mod/mod_proxy.html#proxymaxforwards
proxypass mod/mod_proxy.html#proxypass
+proxypassinherit mod/mod_proxy.html#proxypassinherit
proxypassinterpolateenv mod/mod_proxy.html#proxypassinterpolateenv
proxypassmatch mod/mod_proxy.html#proxypassmatch
proxypassreverse mod/mod_proxy.html#proxypassreverse
@@ -433,6 +435,7 @@ redirectmatch mod/mod_alias.html#redirec
redirectpermanent mod/mod_alias.html#redirectpermanent
redirecttemp mod/mod_alias.html#redirecttemp
reflectorheader mod/mod_reflector.html#reflectorheader
+registerhttpmethod mod/core.html#registerhttpmethod
remoteipheader mod/mod_remoteip.html#remoteipheader
remoteipinternalproxy mod/mod_remoteip.html#remoteipinternalproxy
remoteipinternalproxylist mod/mod_remoteip.html#remoteipinternalproxylist
@@ -611,6 +614,7 @@ virtualdocumentrootip mod/mod_vhost_alia
virtualhost mod/core.html#virtualhost
virtualscriptalias mod/mod_vhost_alias.html#virtualscriptalias
virtualscriptaliasip mod/mod_vhost_alias.html#virtualscriptaliasip
+warning mod/core.html#warning
watchdoginterval mod/mod_watchdog.html#watchdoginterval
xbithack mod/mod_include.html#xbithack
xml2encalias mod/mod_xml2enc.html#xml2encalias
Modified: httpd/httpd/trunk/docs/manual/howto/auth.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.html.en?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.html.en (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.html.en Wed Dec 12 14:15:38 2012
@@ -266,7 +266,7 @@ Require user rbowen
file to authenticate the user on each request. Apache also has
the ability to store user information in fast database files.
The <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code> module provides the <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code> directive. These
- files can be created and manipulated with the <code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code> program. Many
+ files can be created and manipulated with the <code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code> and <code class="program"><a href="../programs/htdbm.html">htdbm</a></code> programs. Many
other types of authentication options are available from third
party modules in the <a href="http://modules.apache.org/">Apache Modules
Database</a>.</p>
@@ -377,7 +377,7 @@ Require group GroupName
you can choose <code>dbm</code> or <code>dbd</code> as your storage
format.</p>
- <p>To select a dbd file rather than a text file, for example:</p>
+ <p>To select a dbm file rather than a text file, for example:</p>
<pre class="prettyprint lang-config">
<Directory /www/docs/private>
Modified: httpd/httpd/trunk/docs/manual/howto/auth.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.html.fr?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.html.fr Wed Dec 12 14:15:38 2012
@@ -27,6 +27,8 @@
<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
<a href="../tr/howto/auth.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<p>L'authentification est un processus qui vous permet de vérifier
qu'une personne est bien celle qu'elle prétend être. L'autorisation
Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.xml.fr?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml.fr Wed Dec 12 14:15:38 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1341749 -->
+<!-- English Revision: 1341749:1420149 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviwed by : Vincent Deffontaines -->
Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.xml.ja?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml.ja [utf-8] Wed Dec 12 14:15:38 2012
@@ -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.ja.xsl"?>
-<!-- English Revision: 479777:1341749 (outdated) -->
+<!-- English Revision: 479777:1420149 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.xml.ko?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml.ko [euc-kr] Wed Dec 12 14:15:38 2012
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1341749 (outdated) -->
+<!-- English Revision: 105989:1420149 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.xml.meta?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml.meta Wed Dec 12 14:15:38 2012
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
<variant outdated="yes">tr</variant>
Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.xml.tr?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml.tr [utf-8] Wed Dec 12 14:15:38 2012
@@ -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.tr.xsl"?>
-<!-- English Revision: 1070891:1341749 (outdated) -->
+<!-- English Revision: 1070891:1420149 (outdated) -->
<!-- =====================================================
Translated by: Umut Samuk <umut belgeler.org>
Reviewed by: Nilgün Belma Bugüner <nilgun belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/misc/password_encryptions.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/password_encryptions.html.en?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/password_encryptions.html.en (original)
+++ httpd/httpd/trunk/docs/manual/misc/password_encryptions.html.en Wed Dec 12 14:15:38 2012
@@ -34,20 +34,15 @@
<div class="section">
<h2><a name="basic" id="basic">Basic Authentication</a></h2>
- <p>There are four formats that Apache recognizes for basic-authentication
+ <p>There are five formats that Apache recognizes for basic-authentication
passwords. Note that not all formats work on every platform:</p>
<dl>
- <dt>PLAIN TEXT (i.e. <em>unencrypted</em>)</dt>
- <dd>Windows & Netware only.</dd>
-
- <dt>CRYPT</dt>
- <dd>Unix only. Uses the traditional Unix <code>crypt(3)</code> function
- with a randomly-generated 32-bit salt (only 12 bits used) and the first 8
- characters of the password.</dd>
-
- <dt>SHA1</dt>
- <dd>"{SHA}" + Base64-encoded SHA-1 digest of the password.</dd>
+ <dt>bcrypt</dt>
+ <dd>"$2y$" + the result of the crypt_blowfish algorithm.
+ See the APR source file
+ <a href="http://svn.apache.org/viewvc/apr/apr/trunk/crypto/crypt_blowfish.c?view=markup">crypt_blowfish.c</a>
+ for the details of the algorithm.</dd>
<dt>MD5</dt>
<dd>"$apr1$" + the result of an Apache-specific algorithm using an
@@ -55,10 +50,26 @@
random 32-bit salt and the password. See the APR source file
<a href="http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_md5.c?view=markup">apr_md5.c</a>
for the details of the algorithm.</dd>
+
+ <dt>SHA1</dt>
+ <dd>"{SHA}" + Base64-encoded SHA-1 digest of the password. Insecure.</dd>
+
+ <dt>CRYPT</dt>
+ <dd>Unix only. Uses the traditional Unix <code>crypt(3)</code> function
+ with a randomly-generated 32-bit salt (only 12 bits used) and the first 8
+ characters of the password. Insecure.</dd>
+
+ <dt>PLAIN TEXT (i.e. <em>unencrypted</em>)</dt>
+ <dd>Windows & Netware only. Insecure.</dd>
</dl>
<h3>Generating values with htpasswd</h3>
+ <div class="example"><h3>bcrypt</h3><p><code>
+ $ htpasswd -nbB myName myPassword<br />
+ myName:$2y$05$c4WoMPo3SXsafkva.HHa6uXQZWr7oboPiC2bT/r7q1BB8I2s0BRqC
+ </code></p></div>
+
<div class="example"><h3>MD5</h3><p><code>
$ htpasswd -nbm myName myPassword<br />
myName:$apr1$r31.....$HqJZimcKQFAMYayBlzkrA/
Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.de?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.de Wed Dec 12 14:15:38 2012
@@ -148,7 +148,6 @@
<li><a href="mod_authz_core.html#authzprovideralias"><AuthzProviderAlias></a></li>
<li><a href="mod_authz_core.html#authzsendforbiddenonfailure">AuthzSendForbiddenOnFailure</a></li>
<li><a href="mod_proxy.html#balancergrowth" id="B" name="B">BalancerGrowth</a></li>
-<li><a href="mod_proxy.html#balancerinherit">BalancerInherit</a></li>
<li><a href="mod_proxy.html#balancermember">BalancerMember</a></li>
<li><a href="mod_proxy.html#balancerpersist">BalancerPersist</a></li>
<li><a href="mod_setenvif.html#browsermatch">BrowserMatch</a></li>
@@ -450,6 +449,7 @@
<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#proxypassinherit">ProxyPassInherit</a></li>
<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
<li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.en?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.en Wed Dec 12 14:15:38 2012
@@ -149,7 +149,6 @@
<li><a href="mod_authz_core.html#authzprovideralias"><AuthzProviderAlias></a></li>
<li><a href="mod_authz_core.html#authzsendforbiddenonfailure">AuthzSendForbiddenOnFailure</a></li>
<li><a href="mod_proxy.html#balancergrowth" id="B" name="B">BalancerGrowth</a></li>
-<li><a href="mod_proxy.html#balancerinherit">BalancerInherit</a></li>
<li><a href="mod_proxy.html#balancermember">BalancerMember</a></li>
<li><a href="mod_proxy.html#balancerpersist">BalancerPersist</a></li>
<li><a href="mod_setenvif.html#browsermatch">BrowserMatch</a></li>
@@ -451,6 +450,7 @@
<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#proxypassinherit">ProxyPassInherit</a></li>
<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
<li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.es
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.es?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.es (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.es Wed Dec 12 14:15:38 2012
@@ -151,7 +151,6 @@
<li><a href="mod_authz_core.html#authzprovideralias"><AuthzProviderAlias></a></li>
<li><a href="mod_authz_core.html#authzsendforbiddenonfailure">AuthzSendForbiddenOnFailure</a></li>
<li><a href="mod_proxy.html#balancergrowth" id="B" name="B">BalancerGrowth</a></li>
-<li><a href="mod_proxy.html#balancerinherit">BalancerInherit</a></li>
<li><a href="mod_proxy.html#balancermember">BalancerMember</a></li>
<li><a href="mod_proxy.html#balancerpersist">BalancerPersist</a></li>
<li><a href="mod_setenvif.html#browsermatch">BrowserMatch</a></li>
@@ -453,6 +452,7 @@
<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#proxypassinherit">ProxyPassInherit</a></li>
<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
<li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.ja.utf8 [utf-8] Wed Dec 12 14:15:38 2012
@@ -146,7 +146,6 @@
<li><a href="mod_authz_core.html#authzprovideralias"><AuthzProviderAlias></a></li>
<li><a href="mod_authz_core.html#authzsendforbiddenonfailure">AuthzSendForbiddenOnFailure</a></li>
<li><a href="mod_proxy.html#balancergrowth" id="B" name="B">BalancerGrowth</a></li>
-<li><a href="mod_proxy.html#balancerinherit">BalancerInherit</a></li>
<li><a href="mod_proxy.html#balancermember">BalancerMember</a></li>
<li><a href="mod_proxy.html#balancerpersist">BalancerPersist</a></li>
<li><a href="mod_setenvif.html#browsermatch">BrowserMatch</a></li>
@@ -448,6 +447,7 @@
<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#proxypassinherit">ProxyPassInherit</a></li>
<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
<li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.ko.euc-kr [euc-kr] Wed Dec 12 14:15:38 2012
@@ -146,7 +146,6 @@
<li><a href="mod_authz_core.html#authzprovideralias"><AuthzProviderAlias></a></li>
<li><a href="mod_authz_core.html#authzsendforbiddenonfailure">AuthzSendForbiddenOnFailure</a></li>
<li><a href="mod_proxy.html#balancergrowth" id="B" name="B">BalancerGrowth</a></li>
-<li><a href="mod_proxy.html#balancerinherit">BalancerInherit</a></li>
<li><a href="mod_proxy.html#balancermember">BalancerMember</a></li>
<li><a href="mod_proxy.html#balancerpersist">BalancerPersist</a></li>
<li><a href="mod_setenvif.html#browsermatch">BrowserMatch</a></li>
@@ -448,6 +447,7 @@
<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#proxypassinherit">ProxyPassInherit</a></li>
<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
<li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.tr.utf8 [utf-8] Wed Dec 12 14:15:38 2012
@@ -145,7 +145,6 @@
<li><a href="mod_authz_core.html#authzprovideralias"><AuthzProviderAlias></a></li>
<li><a href="mod_authz_core.html#authzsendforbiddenonfailure">AuthzSendForbiddenOnFailure</a></li>
<li><a href="mod_proxy.html#balancergrowth" id="B" name="B">BalancerGrowth</a></li>
-<li><a href="mod_proxy.html#balancerinherit">BalancerInherit</a></li>
<li><a href="mod_proxy.html#balancermember">BalancerMember</a></li>
<li><a href="mod_proxy.html#balancerpersist">BalancerPersist</a></li>
<li><a href="mod_setenvif.html#browsermatch">BrowserMatch</a></li>
@@ -447,6 +446,7 @@
<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#proxypassinherit">ProxyPassInherit</a></li>
<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
<li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.zh-cn
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.zh-cn?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.zh-cn (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.zh-cn Wed Dec 12 14:15:38 2012
@@ -144,7 +144,6 @@
<li><a href="mod_authz_core.html#authzprovideralias"><AuthzProviderAlias></a></li>
<li><a href="mod_authz_core.html#authzsendforbiddenonfailure">AuthzSendForbiddenOnFailure</a></li>
<li><a href="mod_proxy.html#balancergrowth" id="B" name="B">BalancerGrowth</a></li>
-<li><a href="mod_proxy.html#balancerinherit">BalancerInherit</a></li>
<li><a href="mod_proxy.html#balancermember">BalancerMember</a></li>
<li><a href="mod_proxy.html#balancerpersist">BalancerPersist</a></li>
<li><a href="mod_setenvif.html#browsermatch">BrowserMatch</a></li>
@@ -446,6 +445,7 @@
<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#proxypassinherit">ProxyPassInherit</a></li>
<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
<li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_authn_dbm.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authn_dbm.html.en?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authn_dbm.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authn_dbm.html.en Wed Dec 12 14:15:38 2012
@@ -62,6 +62,8 @@
<li>
<code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code>
</li>
+<li><code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code></li>
+<li><code class="program"><a href="../programs/htdbm.html">htdbm</a></code></li>
<li><a href="../misc/password_encryptions.html">Password Formats</a></li>
</ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
@@ -131,7 +133,9 @@ passwords for authentication</td></tr>
<p>A perl script called
<code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code> is included with
Apache. This program can be used to create and update DBM
- format password files for use with this module.</p>
+ format password files for use with this module. Another
+ tool for maintaining the DBM files is the included program
+ <code class="program"><a href="../programs/htdbm.html">htdbm</a></code>.</p>
</div>
</div>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en Wed Dec 12 14:15:38 2012
@@ -673,7 +673,7 @@ end
<pre class="prettyprint lang-lua">
-r:parsebody([sizeLimit]) -- parse the request body as a POST and return a lua table.
+ r:parsebody([sizeLimit]) -- parse the request body as a POST and return a lua table.
-- An optional number may be passed to specify the maximum number
-- of bytes to parse. Default is 8192 bytes.
</pre>
@@ -693,6 +693,188 @@ r:parsebody([sizeLimit]) -- parse the re
r:escape_html("<html>test</html>") -- Escapes HTML code and returns the escaped result
</pre>
+
+ <pre class="prettyprint lang-lua">
+ r:base64_encode(string) -- Encodes a string using the Base64 encoding standard
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:base64_decode(string) -- Decodes a Base64-encoded string
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:md5(string) -- Calculates and returns the MD5 digest of a string (binary safe)
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:sha1(string) -- Calculates and returns the SHA1 digest of a string (binary safe)
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:escape(string) -- URL-Escapes a string
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:unescape(string) -- Unescapes an URL-escaped string
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:banner() -- Returns the current server banner
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:port() -- Returns the current server port used for the request
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:mpm_query(number) -- Queries the server for MPM information using ap_mpm_query
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:expr(string) -- Evaluates an <a href="../expr.html">expr</a> string.
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:scoreboard_process(a) -- Queries the server for information about the process at position <code>a</code>
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:scoreboard_worker(a, b) -- Queries for information about the worker thread, <code>b</code>, in process <code>a</code>
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:started() -- Returns the time of the last server (re)start
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:clock() -- Returns the current time with microsecond precision
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+r:requestbody(filename) -- Reads and returns the request body of a request.
+ -- If 'filename' is specified, it instead saves the
+ -- contents to that file.
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:add_input_filter(filter_name) -- Adds 'filter_name' as an input filter
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:module_info(module_name) -- Queries the server for information about a module
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:loaded_modules() -- Returns a list of modules loaded by httpd
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+r:runtime_dir_relative(filename) -- Compute the name of a run-time file (e.g., shared memory "file")
+ -- relative to the appropriate run-time directory.
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:server_info() -- Returns a table containing server information, such as
+ -- the name of the httpd executable file, mpm used etc.
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:set_document_root(file_path) -- Sets the document root for the request to file_path
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:add_version_component(component_string) -- Adds a component to the server banner.
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:set_context_info(prefix, docroot) -- Sets the context prefix and context document root for a request
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:os_escape_path(file_path) -- Converts an OS path to a URL in an OS dependant way
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:escape_logitem(string) -- Escapes a string for logging
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+r:strcmp_match(string, pattern) -- Checks if 'string' matches 'pattern' using strcmp_match (GLOBs).
+ -- fx. whether 'www.example.com' matches '*.example.com'
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:set_keepalive() -- Sets the keepalive status for a request. Returns true if possible, false otherwise.
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:make_etag() -- Constructs and returns the etag for the current request.
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+r:send_interim_response(clear) -- Sends an interim (1xx) response to the client.
+ -- if 'clear' is true, available headers will be sent and cleared.
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+r:custom_response(status_code, string) -- Construct and set a custom response for a given status code.
+ -- This works much like the ErrorDocument directive.
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:exists_config_define(string) -- Checks whether a configuration definition exists or not.
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:state_query(string) -- Queries the server for state information
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:stat(filename) -- Runs stat() on a file, and returns a table with file information
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:regex(string, pattern) -- Runs a regular expression match on a string, returning captures if matched.
+ </pre>
+
+
+ <pre class="prettyprint lang-lua">
+ r:sleep(number_of_seconds) -- Puts the script to sleep for a given number of seconds.
+ </pre>
+
</dd>
</dl>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr Wed Dec 12 14:15:38 2012
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1375917:1377592 (outdated) -->
+<!-- English Revision: 1375917:1420377 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en Wed Dec 12 14:15:38 2012
@@ -86,7 +86,6 @@
<div id="quickview"><h3 class="directives">Directives</h3>
<ul id="toc">
<li><img alt="" src="../images/down.gif" /> <a href="#balancergrowth">BalancerGrowth</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#balancerinherit">BalancerInherit</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#balancermember">BalancerMember</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#balancerpersist">BalancerPersist</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#noproxy">NoProxy</a></li>
@@ -100,6 +99,7 @@
<li><img alt="" src="../images/down.gif" /> <a href="#proxymatch"><ProxyMatch></a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxymaxforwards">ProxyMaxForwards</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypass">ProxyPass</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxypassinherit">ProxyPassInherit</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassmatch">ProxyPassMatch</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassreverse">ProxyPassReverse</a></li>
@@ -489,24 +489,6 @@ ProxyPass /examples http://backend.examp
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="BalancerInherit" id="BalancerInherit">BalancerInherit</a> <a name="balancerinherit" id="balancerinherit">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Inherit Balancers from the main server</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>BalancerInherit On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>BalancerInherit 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>BalancerInherit is only available in Apache HTTP Server 2.5.0
- and later.</td></tr>
-</table>
- <p>This directive will cause the current server/vhost to "inherit" Balancers
- defined in the main server. This can cause issues and inconsistent
- behavior if using the Balancer Manager and so is disabled
- 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="BalancerMember" id="BalancerMember">BalancerMember</a> <a name="balancermember" id="balancermember">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Add a member to a load balancing group</td></tr>
@@ -1401,6 +1383,24 @@ ProxyPass / balancer://hotcluster/
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPassInherit" id="ProxyPassInherit">ProxyPassInherit</a> <a name="proxypassinherit" id="proxypassinherit">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Inherit ProxyPass Balancers/Workers from the main server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPassInherit On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyPassInherit 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>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>ProxyPassInherit is only available in Apache HTTP Server 2.5.0
+ and later.</td></tr>
+</table>
+ <p>This directive will cause the current server/vhost to "inherit" ProxyPass
+ Balancers and Workers defined in the main server. This can cause issues and
+ inconsistent behavior if using the Balancer Manager and so should be disabled
+ if using that feature.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ProxyPassInterpolateEnv" id="ProxyPassInterpolateEnv">ProxyPassInterpolateEnv</a> <a name="proxypassinterpolateenv" id="proxypassinterpolateenv">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable Environment Variable interpolation in Reverse Proxy configurations</td></tr>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr Wed Dec 12 14:15:38 2012
@@ -28,6 +28,8 @@
<a href="../fr/mod/mod_proxy.html" title="Français"> fr </a> |
<a href="../ja/mod/mod_proxy.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Serveur mandataire/passerelle multi-protocole</td></tr>
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>proxy_module</td></tr>
@@ -93,7 +95,6 @@
<div id="quickview"><h3 class="directives">Directives</h3>
<ul id="toc">
<li><img alt="" src="../images/down.gif" /> <a href="#balancergrowth">BalancerGrowth</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#balancerinherit">BalancerInherit</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#balancermember">BalancerMember</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#balancerpersist">BalancerPersist</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#noproxy">NoProxy</a></li>
@@ -107,6 +108,7 @@
<li><img alt="" src="../images/down.gif" /> <a href="#proxymatch"><ProxyMatch></a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxymaxforwards">ProxyMaxForwards</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypass">ProxyPass</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxypassinherit">ProxyPassInherit</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassmatch">ProxyPassMatch</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassreverse">ProxyPassReverse</a></li>
@@ -543,26 +545,6 @@ serveur HTTP Apache</td></tr>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="BalancerInherit" id="BalancerInherit">BalancerInherit</a> <a name="balancerinherit" id="balancerinherit">Directive</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Héritage des répartiteurs de charge du serveur
- principal</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>BalancerInherit On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>BalancerInherit Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</td></tr>
-<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>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">Compatibilité:</a></th><td>BalancerInherit n'est disponible qu'à partir de la
- version 2.5.0 du serveur HTTP Apache.</td></tr>
-</table>
- <p>Cette directive permet au serveur virtuel courant d'"hériter"
- des répartiteurs de charge définis au niveau du serveur
- principal. Des problèmes et des comportements inattendus sont
- cependant à prévoir si on utilise le gestionnaire de répartition
- de charge, et cette directive est donc désactivée par défaut.</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="BalancerMember" id="BalancerMember">BalancerMember</a> <a name="balancermember" id="balancermember">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Ajoute un membre à un groupe de répartition de
@@ -1573,6 +1555,20 @@ ProxyPass / balancer://hotcluster/
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPassInherit" id="ProxyPassInherit">ProxyPassInherit</a> <a name="proxypassinherit" id="proxypassinherit">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Inherit ProxyPass Balancers/Workers from the main server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>ProxyPassInherit On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>ProxyPassInherit On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur, serveur virtuel</td></tr>
+<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibilité:</a></th><td>ProxyPassInherit is only available in Apache HTTP Server 2.5.0
+ and later.</td></tr>
+</table><p>La documentation de cette directive
+ n'a pas encore t traduite. Veuillez vous reporter la version
+ en langue anglaise.</p></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ProxyPassInterpolateEnv" id="ProxyPassInterpolateEnv">ProxyPassInterpolateEnv</a> <a name="proxypassinterpolateenv" id="proxypassinterpolateenv">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Active l'interpolation des variables d'environnement dans
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.ja.utf8?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.ja.utf8 [utf-8] Wed Dec 12 14:15:38 2012
@@ -71,7 +71,6 @@
<div id="quickview"><h3 class="directives">ディレクティブ</h3>
<ul id="toc">
<li><img alt="" src="../images/down.gif" /> <a href="#balancergrowth">BalancerGrowth</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#balancerinherit">BalancerInherit</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#balancermember">BalancerMember</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#balancerpersist">BalancerPersist</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#noproxy">NoProxy</a></li>
@@ -85,6 +84,7 @@
<li><img alt="" src="../images/down.gif" /> <a href="#proxymatch"><ProxyMatch></a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxymaxforwards">ProxyMaxForwards</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypass">ProxyPass</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxypassinherit">ProxyPassInherit</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassmatch">ProxyPassMatch</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#proxypassreverse">ProxyPassReverse</a></li>
@@ -323,20 +323,6 @@
まだ翻訳されていません。英語版をご覧ください。
</p></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="BalancerInherit" id="BalancerInherit">BalancerInherit</a> <a name="balancerinherit" id="balancerinherit">ディレクティブ</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Inherit Balancers from the main server</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>BalancerInherit On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>BalancerInherit Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
-<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>BalancerInherit is only available in Apache HTTP Server 2.5.0
- and later.</td></tr>
-</table><p>このディレクティブの解説文書は
- まだ翻訳されていません。英語版をご覧ください。
- </p></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="BalancerMember" id="BalancerMember">BalancerMember</a> <a name="balancermember" id="balancermember">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Add a member to a load balancing group</td></tr>
@@ -915,6 +901,20 @@
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPassInherit" id="ProxyPassInherit">ProxyPassInherit</a> <a name="proxypassinherit" id="proxypassinherit">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Inherit ProxyPass Balancers/Workers from the main server</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyPassInherit On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ProxyPassInherit On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サーバ設定ファイル, バーチャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互換性:</a></th><td>ProxyPassInherit is only available in Apache HTTP Server 2.5.0
+ and later.</td></tr>
+</table><p>このディレクティブの解説文書は
+ まだ翻訳されていません。英語版をご覧ください。
+ </p></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="ProxyPassInterpolateEnv" id="ProxyPassInterpolateEnv">ProxyPassInterpolateEnv</a> <a name="proxypassinterpolateenv" id="proxypassinterpolateenv">ディレクティブ</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Enable Environment Variable interpolation in Reverse Proxy configurations</td></tr>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr Wed Dec 12 14:15:38 2012
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1404653 -->
+<!-- English Revision: 1404653:1420124 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] Wed Dec 12 14:15:38 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 344971:1404653 (outdated) -->
+<!-- English Revision: 344971:1420124 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta Wed Dec 12 14:15:38 2012
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_html.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_html.html.en?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_html.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_html.html.en Wed Dec 12 14:15:38 2012
@@ -71,12 +71,13 @@ stylesheets.</td></tr>
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.4 and later; available as a third-party
for earlier 2.x versions</td></tr>
</table>
-<p>In order to parse non-HTML content (stylesheets and scripts), mod_proxy_html
+<p>In order to parse non-HTML content (stylesheets and scripts) embedded
+in HTML documents, mod_proxy_html
has to read the entire script or stylesheet into a buffer. This buffer will
be expanded as necessary to hold the largest script or stylesheet in a page,
-in increments of [nnnn] as set by this directive.</p>
+in increments of <var>bytes</var> as set by this directive.</p>
<p>The default is 8192, and will work well for almost all pages. However,
-if you know you're proxying a lot of pages containing stylesheets and/or
+if you know you're proxying pages containing stylesheets and/or
scripts bigger than 8K (that is, for a single script or stylesheet,
NOT in total), it will be more efficient to set a larger buffer
size and avoid the need to resize the buffer dynamically during a request.
@@ -138,6 +139,7 @@ It will also optionally log other errors
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Turns the proxy_html filter on or off.</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyHTMLEnable <var>On|Off</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyHTMLEnable 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>Base</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy_html</td></tr>
@@ -165,11 +167,14 @@ module for earlier 2.x versions.</td></t
for earlier 2.x versions</td></tr>
</table>
<p>Specifies one or more attributes to treat as scripting events and
-apply <code class="directive">ProxyHTMLURLMap</code>s to where appropriate.
+apply <code class="directive">ProxyHTMLURLMap</code>s to where enabled.
You can specify any number of attributes in one or more
<code>ProxyHTMLEvents</code> directives.</p>
-<p>The default configuration defines the events in standard HTML 4
-and XHTML 1.</p>
+<p>Normally you'll set this globally. If you set ProxyHTMLEvents in more than
+one scope so that one overrides the other, you'll need to specify a complete
+set in each of those scopes.</p>
+<p>A default configuration is supplied in <var>proxy-html.conf</var>
+and defines the events in standard HTML 4 and XHTML 1.</p>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -178,19 +183,27 @@ and XHTML 1.</p>
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines whether to fix links in inline scripts, stylesheets,
and scripting events.</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyHTMLExtended <var>On|Off</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyHTMLExtended 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>Base</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy_html</td></tr>
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.4 and later; available as a third-party
for earlier 2.x versions</td></tr>
</table>
-<p>Set to <code>Off</code>, HTML links are rewritten according
+<p>Set to <code>Off</code>, HTML links are rewritten according to the
<code class="directive">ProxyHTMLURLMap</code> directives, but links appearing
in Javascript and CSS are ignored.</p>
-<p>Set to <code>On</code>, all scripting events and embedded scripts or
+<p>Set to <code>On</code>, all scripting events (as determined by
+<code class="directive">ProxyHTMLEvents</code>) and embedded scripts or
stylesheets are also processed by the <code class="directive">ProxyHTMLURLMap</code>
rules, according to the flags set for each rule. Since this requires more
-parsing, performance will be best if you only enable it when strictly necessary.</p>
+parsing, performance will be best if you only enable it when strictly necessary.
+</p><p>
+You'll also need to take care over patterns matched, since the parser has no
+knowledge of what is a URL within an embedded script or stylesheet.
+In particular, extended matching of <code>/</code> is likely to lead to
+false matches.
+</p>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -221,6 +234,7 @@ Only use them if you know you have a bro
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enables per-request interpolation of
<code class="directive">ProxyHTMLURLMap</code> rules.</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyHTMLInterp <var>On|Off</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyHTMLInterp 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>Base</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy_html</td></tr>
@@ -249,8 +263,11 @@ for earlier 2.x versions</td></tr>
<p>Specifies elements that have URL attributes that should be rewritten
using standard <code class="directive">ProxyHTMLURLMap</code>s. You will need one
ProxyHTMLLinks directive per element, but it can have any number of attributes.</p>
-<p>The default configuration defines the HTML links for standard HTML 4
-and XHTML 1.</p>
+<p>Normally you'll set this globally. If you set ProxyHTMLLinks in more than
+one scope so that one overrides the other, you'll need to specify a complete
+set in each of those scopes.</p>
+<p>A default configuration is supplied in <var>proxy-html.conf</var>
+and defines the HTML links for standard HTML 4 and XHTML 1.</p>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -259,6 +276,7 @@ and XHTML 1.</p>
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Turns on or off extra pre-parsing of metadata in HTML
<code><head></code> sections.</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyHTMLMeta <var>On|Off</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyHTMLMeta 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>Base</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy_html</td></tr>
@@ -293,6 +311,7 @@ module for earlier 2.x versions.</td></t
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determines whether to strip HTML comments.</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyHTMLStripComments <var>On|Off</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyHTMLStripComments 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>Base</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy_html</td></tr>
@@ -322,7 +341,8 @@ module for earlier 2.x versions.</td></t
<p>This is the key directive for rewriting HTML links. When parsing a document,
whenever a link target matches <var>from-pattern</var>, the matching
portion will be rewritten to <var>to-pattern</var>, as modified by any
-flags supplied.</p>
+flags supplied and by the <code class="directive">ProxyHTMLExtended</code>
+directive.</p>
<p>The optional third argument may define any of the following
<strong>Flags</strong>. Flags are case-sensitive.</p>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en?rev=1420690&r1=1420689&r2=1420690&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl.html.en Wed Dec 12 14:15:38 2012
@@ -2103,8 +2103,6 @@ be protected with file permissions simil
<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>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in httpd 2.5.0 and later, if using OpenSSL 1.0.1 or
-later</td></tr>
</table>
<p>
This directive sets the seed used to fake SRP user parameters for unknown
@@ -2125,8 +2123,6 @@ SSLSRPUnknownUserSeed "secret"
<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>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in httpd 2.5.0 and later, if using OpenSSL 1.0.1 or
-later</td></tr>
</table>
<p>
This directive enables TLS-SRP and sets the path to the OpenSSL SRP (Secure