aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/http_lib/http_internal.hrl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2014-05-27 13:42:15 +0200
committerErlang/OTP <[email protected]>2014-05-27 13:42:15 +0200
commite35e0db4d7527cebd14a655d7686c8c375d42f94 (patch)
tree871bd2166f24aea9a650cf8927774849b57f4777 /lib/inets/src/http_lib/http_internal.hrl
parented485d3bcba0aefaa5cb7e489a8438e3c012a99a (diff)
parentee3fd715255a865b80532ad1cf88e51a8a4147ba (diff)
downloadotp-e35e0db4d7527cebd14a655d7686c8c375d42f94.tar.gz
otp-e35e0db4d7527cebd14a655d7686c8c375d42f94.tar.bz2
otp-e35e0db4d7527cebd14a655d7686c8c375d42f94.zip
Merge branch 'ia/inets/maint-17/string-lengths/OTP-11925' into maint-17
* ia/inets/maint-17/string-lengths/OTP-11925: inets: httpd - Behave well on not so long but wrong request lines inets: httpc - update test suite framwork to adopt to change in httpd inets: httpd - Reject incorrect large request lines early
Diffstat (limited to 'lib/inets/src/http_lib/http_internal.hrl')
-rw-r--r--lib/inets/src/http_lib/http_internal.hrl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/inets/src/http_lib/http_internal.hrl b/lib/inets/src/http_lib/http_internal.hrl
index 97cf474ab9..53b776c4e7 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-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2014. 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
@@ -26,6 +26,8 @@
-define(HTTP_MAX_BODY_SIZE, nolimit).
-define(HTTP_MAX_HEADER_SIZE, 10240).
-define(HTTP_MAX_URI_SIZE, nolimit).
+-define(HTTP_MAX_VERSION_STRING, 8).
+-define(HTTP_MAX_METHOD_STRING, 20).
-ifndef(HTTP_DEFAULT_SSL_KIND).
-define(HTTP_DEFAULT_SSL_KIND, essl).