diff options
| author | Erlang/OTP <[email protected]> | 2011-11-11 11:14:54 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-11-11 11:14:54 +0100 |
| commit | f02b4691e1d53a49b1dda9e716649cad4f060ecc (patch) | |
| tree | 476e13929469a3061f82510a0b3d39b6bdb5aabc /lib/inets/src/http_lib/http_util.erl | |
| parent | 758e7b817293f7da71c5bdf2c2e2eb6f70e23687 (diff) | |
| parent | d84a96ec6caed792972c1d5359ef193e608882cf (diff) | |
| download | otp-f02b4691e1d53a49b1dda9e716649cad4f060ecc.tar.gz otp-f02b4691e1d53a49b1dda9e716649cad4f060ecc.tar.bz2 otp-f02b4691e1d53a49b1dda9e716649cad4f060ecc.zip | |
Merge branch 'bmk/inets/inets572_integration' into maint-r14
* bmk/inets/inets572_integration:
Commas and more commas...
More merge cleanup.
Aftermerge cleanup.
[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/src/http_lib/http_util.erl')
| -rw-r--r-- | lib/inets/src/http_lib/http_util.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/inets/src/http_lib/http_util.erl b/lib/inets/src/http_lib/http_util.erl index 973600d7be..5b21170b78 100644 --- a/lib/inets/src/http_lib/http_util.erl +++ b/lib/inets/src/http_lib/http_util.erl @@ -206,9 +206,7 @@ timeout(Timeout, Started) -> html_encode(Chars) -> Reserved = sets:from_list([$&, $<, $>, $\", $', $/]), - lists:append(lists:map(fun(Char) -> - char_to_html_entity(Char, Reserved) - end, Chars)). + lists:append([char_to_html_entity(Char, Reserved) || Char <- Chars]). %%%======================================================================== |