diff options
| author | Péter Dimitrov <[email protected]> | 2017-09-14 17:38:40 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2017-09-14 17:38:40 +0200 |
| commit | 29c8936ac73bfff98dddcfcc3b48e169f28c06d6 (patch) | |
| tree | 3afc43f525b0258553d9f1c717df1bbb640f2464 /lib/inets/src | |
| parent | 722293a988485cce7cbc975bd5ac9096d2a91b9b (diff) | |
| parent | 94333e038485030f385012c99c0e7995ae03f499 (diff) | |
| download | otp-29c8936ac73bfff98dddcfcc3b48e169f28c06d6.tar.gz otp-29c8936ac73bfff98dddcfcc3b48e169f28c06d6.tar.bz2 otp-29c8936ac73bfff98dddcfcc3b48e169f28c06d6.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
inets: httpd correct server_name environment value
inets: httpd - Add chunk handling of client data
inets: Restore old behavior when parsing "+"
inets: prepare for release
Diffstat (limited to 'lib/inets/src')
| -rw-r--r-- | lib/inets/src/http_lib/http_uri.erl | 4 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/lib/inets/src/http_lib/http_uri.erl b/lib/inets/src/http_lib/http_uri.erl index c4be5abd7c..7f1ca02014 100644 --- a/lib/inets/src/http_lib/http_uri.erl +++ b/lib/inets/src/http_lib/http_uri.erl @@ -117,8 +117,6 @@ decode(String) when is_list(String) -> decode(String) when is_binary(String) -> do_decode_binary(String). -do_decode([$+|Rest]) -> - [$ |do_decode(Rest)]; do_decode([$%,Hex1,Hex2|Rest]) -> [hex2dec(Hex1)*16+hex2dec(Hex2)|do_decode(Rest)]; do_decode([First|Rest]) -> @@ -126,8 +124,6 @@ do_decode([First|Rest]) -> do_decode([]) -> []. -do_decode_binary(<<$+, Rest/bits>>) -> - <<$ , (do_decode_binary(Rest))/binary>>; do_decode_binary(<<$%, Hex:2/binary, Rest/bits>>) -> <<(binary_to_integer(Hex, 16)), (do_decode_binary(Rest))/binary>>; do_decode_binary(<<First:1/binary, Rest/bits>>) -> diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index f9ad8709d9..a86413147c 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,14 +18,10 @@ %% %CopyrightEnd% {"%VSN%", [ - {<<"6.2.4">>, [{load_module, httpd_request_handler, - soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ - {<<"6.2.4">>, [{load_module, httpd_request_handler, - soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] |