diff options
| author | Micael Karlberg <[email protected]> | 2011-03-23 11:36:56 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-23 11:36:56 +0100 |
| commit | 04623176f365ac58eba1df64d3054eba6c482ce4 (patch) | |
| tree | c266155aa96b0eef6bb52e38cd891447a53de530 /lib/inets/doc/src/httpd.xml | |
| parent | f39147b4c35dd06f48eba0a446dd6881aa46c917 (diff) | |
| parent | 30779c7f9e9c2e961548df333df842c7aa39b297 (diff) | |
| download | otp-04623176f365ac58eba1df64d3054eba6c482ce4.tar.gz otp-04623176f365ac58eba1df64d3054eba6c482ce4.tar.bz2 otp-04623176f365ac58eba1df64d3054eba6c482ce4.zip | |
Merge branch 'bmk/inets/httpd/mod_sec_prop_docs_data_file/OTP-9131' into bmk/inets/inet56_integration
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/inets/doc/src/httpd.xml')
| -rw-r--r-- | lib/inets/doc/src/httpd.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml index 62f4e18f82..91a55f6920 100644 --- a/lib/inets/doc/src/httpd.xml +++ b/lib/inets/doc/src/httpd.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>1997</year><year>2010</year> + <year>1997</year><year>2011</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -793,14 +793,14 @@ bytes <marker id="sdir_prop"></marker> <p> Here follows the valid properties for security directories</p> <taglist> - <tag>{security_data_file, path()}</tag> + <tag>{data_file, path()}</tag> <item> Name of the security data file. The filename can either absolute or relative to the server_root. This file is used to store persistent data for the mod_security module. </item> - <tag>{security_max_retries, integer()}</tag> + <tag>{max_retries, integer()}</tag> <item> Specifies the maximum number of tries to authenticate a user has before the user is blocked out. If a user @@ -810,13 +810,13 @@ bytes server will return 401 (Unauthorized), for security reasons. Defaults to 3 may also be set to infinity.</item> - <tag>{security_block_time, integer()}</tag> + <tag>{block_time, integer()}</tag> <item> Specifies the number of minutes a user is blocked. After this amount of time, he automatically regains access. Defaults to 60</item> - <tag>{security_fail_expire_time, integer()}</tag> + <tag>{fail_expire_time, integer()}</tag> <item> Specifies the number of minutes a failed user authentication @@ -824,7 +824,7 @@ bytes time, his previous failed authentications are forgotten. Defaults to 30</item> - <tag>{security_auth_timeout, integer()}</tag> + <tag>{auth_timeout, integer()}</tag> <item> Specifies the number of seconds a successful user |