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/src/http_lib/http_internal.hrl | |
| 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/src/http_lib/http_internal.hrl')
| -rw-r--r-- | lib/inets/src/http_lib/http_internal.hrl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/inets/src/http_lib/http_internal.hrl b/lib/inets/src/http_lib/http_internal.hrl index 53b776c4e7..54425740b5 100644 --- a/lib/inets/src/http_lib/http_internal.hrl +++ b/lib/inets/src/http_lib/http_internal.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2014. All Rights Reserved. +%% Copyright Ericsson AB 2002-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -28,6 +28,7 @@ -define(HTTP_MAX_URI_SIZE, nolimit). -define(HTTP_MAX_VERSION_STRING, 8). -define(HTTP_MAX_METHOD_STRING, 20). +-define(HTTP_MAX_CONTENT_LENGTH, 100000000). -ifndef(HTTP_DEFAULT_SSL_KIND). -define(HTTP_DEFAULT_SSL_KIND, essl). |