diff options
| author | Micael Karlberg <[email protected]> | 2011-11-01 18:39:48 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-11-01 18:39:48 +0100 |
| commit | f8f0496c1b85169f6e72b6f875c521f09a471bbf (patch) | |
| tree | 26c5761f96eabdd7f4f1ec83e5edb7853b180db6 /lib/inets/vsn.mk | |
| parent | 2da7b99f186e7a8f9a74b1c7aa60b1354cbc31ea (diff) | |
| parent | 5fdd7be5b5b99658f7f9d05e7df3a572d73dd6cb (diff) | |
| download | otp-f8f0496c1b85169f6e72b6f875c521f09a471bbf.tar.gz otp-f8f0496c1b85169f6e72b6f875c521f09a471bbf.tar.bz2 otp-f8f0496c1b85169f6e72b6f875c521f09a471bbf.zip | |
[httpd] GET request with malformed header date caused
server crash (non-fatal) with no reply to client. Will
now result in a reply with status code 400.
OTP-9674
Merge branch 'bmk/inets/httpd/xss_with_bad_header_date/OTP-9674' into bmk/inets/inets536_integration
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
lib/inets/test/httpd_test_lib.erl
lib/inets/vsn.mk
Diffstat (limited to 'lib/inets/vsn.mk')
| -rw-r--r-- | lib/inets/vsn.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 6f5f4eb9f7..778b1ddaf7 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -3,11 +3,14 @@ INETS_VSN = 5.3.6 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" -TICKETS = OTP-9655 +TICKETS = OTP-9655 OTP-9674 TICKETS_5_3_5 = OTP-8940 -TICKETS_5_3_4 = OTP-8739 OTP-8741 OTP-8742 +TICKETS_5_3_4 = \ + OTP-8739 \ + OTP-8741 \ + OTP-8742 TICKETS_5_3_3 = \ OTP-8609 \ |