diff options
| author | Zandra Hird <[email protected]> | 2015-05-18 10:52:01 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-05-18 10:52:01 +0200 |
| commit | bcc5248a76ee692ede18367a1f3d6cd9acd6cde7 (patch) | |
| tree | aef5714d1f5caa9292e5891ab9c580a2d53d7e14 /lib/inets | |
| parent | 40732b962a7bf6300f82f5662a68df2f940b2026 (diff) | |
| parent | 10e8677c632df5f9433eb771076d1ff71c7ed75d (diff) | |
| download | otp-bcc5248a76ee692ede18367a1f3d6cd9acd6cde7.tar.gz otp-bcc5248a76ee692ede18367a1f3d6cd9acd6cde7.tar.bz2 otp-bcc5248a76ee692ede18367a1f3d6cd9acd6cde7.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
lib/ssh/doc/src/ssh.xml
lib/ssh/vsn.mk
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 17 | ||||
| -rw-r--r-- | lib/inets/src/http_server/httpd_request.erl | 8 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
3 files changed, 23 insertions, 4 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 12bbc2b736..bae8e327a3 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -32,7 +32,22 @@ <file>notes.xml</file> </header> - <section><title>Inets 5.10.7</title> + <section><title>Inets 5.10.8</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Reject messages with a Content-Length less than 0</p> + <p> + Own Id: OTP-12739 Aux Id: seq12860 </p> + </item> + </list> + </section> + +</section> + +<section><title>Inets 5.10.7</title> <section><title>Improvements and New Features</title> <list> diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl index 6985065c3e..3ff07616f9 100644 --- a/lib/inets/src/http_server/httpd_request.erl +++ b/lib/inets/src/http_server/httpd_request.erl @@ -417,8 +417,12 @@ check_header({"content-length", Value}, Maxsizes) -> case length(Value) =< MaxLen of true -> try - _ = list_to_integer(Value), - ok + list_to_integer(Value) + of + I when I>= 0 -> + ok; + _ -> + {error, {size_error, Max, 411, "negative content-length"}} catch _:_ -> {error, {size_error, Max, 411, "content-length not an integer"}} end; diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index e9ecb2632a..ecb84e447c 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -18,6 +18,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 5.10.7 +INETS_VSN = 5.10.8 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |