diff options
| author | Erlang/OTP <[email protected]> | 2015-01-30 16:56:49 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-01-30 16:56:49 +0100 |
| commit | 7b8af304c9e45540013eefc5b17ae03f8c36bc85 (patch) | |
| tree | 6009f89882310a22c224313987445ada8fea912d /lib/inets/doc/src/httpd.xml | |
| parent | af87b1c3d4897840d8247589a88d3611106ecedc (diff) | |
| parent | a0a7d8d312ca1ce329bce1432638096a13a9c52f (diff) | |
| download | otp-7b8af304c9e45540013eefc5b17ae03f8c36bc85.tar.gz otp-7b8af304c9e45540013eefc5b17ae03f8c36bc85.tar.bz2 otp-7b8af304c9e45540013eefc5b17ae03f8c36bc85.zip | |
Merge branch 'ia/maint/inets/invalid-content-length/mod_alias_https/consistent_keep_alive_timeout/OTP-12429/OTP-12436' into maint-17
* ia/maint/inets/invalid-content-length/mod_alias_https/consistent_keep_alive_timeout/OTP-12429/OTP-12436:
inets: Consistent view of configuration parameter keep_alive_timeout
inets: httpd - mod_alias now handles https URIs
inets: httpd - Sanity check of content-length header
Diffstat (limited to 'lib/inets/doc/src/httpd.xml')
| -rw-r--r-- | lib/inets/doc/src/httpd.xml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml index 4ca038cc99..20c8a6b1b1 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>2013</year> + <year>1997</year><year>2015</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -249,7 +249,16 @@ <p>Limits the size of the message header of HTTP request. Defaults to 10240. </p> </item> - + + <marker id="prop_max_content_length"></marker> + <tag>{max_content_length, integer()}</tag> + <item> + <p>Maximum Content-Length in an incoming request, in bytes. Requests + with content larger than this are answered with Status 413. + Defaults to 100000000 (100 MB). + </p> + </item> + <marker id="prop_max_uri"></marker> <tag>{max_uri_size, integer()}</tag> <item> |