diff options
| author | Erlang/OTP <[email protected]> | 2011-11-01 18:42:42 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-11-01 18:42:42 +0100 |
| commit | 65db6eb562b0376dd29fc60e9378d7b3b8ac386b (patch) | |
| tree | 26c5761f96eabdd7f4f1ec83e5edb7853b180db6 /lib/inets/vsn.mk | |
| parent | f8b20b4a995727f0339074d23a0fae50712683d2 (diff) | |
| parent | f8f0496c1b85169f6e72b6f875c521f09a471bbf (diff) | |
| download | otp-65db6eb562b0376dd29fc60e9378d7b3b8ac386b.tar.gz otp-65db6eb562b0376dd29fc60e9378d7b3b8ac386b.tar.bz2 otp-65db6eb562b0376dd29fc60e9378d7b3b8ac386b.zip | |
Merge branch 'bmk/inets/inets536_integration' into maint-r13
* bmk/inets/inets536_integration:
[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
Added versions 5.2, 5.1.3 and 5.1.2 again. OTP-9655
Uncommented ipv6 test cases. OTP-9655
Fixed HTML encode. First *try* to hex decode uri, and then do the actual html encode. OTP-9655
Skip catching hex decode failure. OTP-9655
Fixed hex-decoding. OTP-9655
Problems with proxy test cases. OTP-9655
Added release notes, appup and correct version. OTP-9655
The XSS prevention methods used was confused if the URL was encoded (hex-encoded). OTP-9655
Diffstat (limited to 'lib/inets/vsn.mk')
| -rw-r--r-- | lib/inets/vsn.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index feb29107bf..778b1ddaf7 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -1,11 +1,16 @@ APPLICATION = inets -INETS_VSN = 5.3.5 +INETS_VSN = 5.3.6 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" -TICKETS = OTP-8940 +TICKETS = OTP-9655 OTP-9674 -TICKETS_5_3_4 = OTP-8739 OTP-8741 OTP-8742 +TICKETS_5_3_5 = OTP-8940 + +TICKETS_5_3_4 = \ + OTP-8739 \ + OTP-8741 \ + OTP-8742 TICKETS_5_3_3 = \ OTP-8609 \ |