diff options
| author | Péter Dimitrov <[email protected]> | 2018-03-09 15:32:03 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2018-03-09 15:32:03 +0100 |
| commit | 0217dbfee505ed8c88164c7a4ea5e1834e6ce8cd (patch) | |
| tree | b6ab2363a4a0256d75d486b63ea4672aeec5c0f5 /lib/common_test | |
| parent | 13e83e2e11b3d211c17c53140249a235b4d7a436 (diff) | |
| parent | 12f180722bc06656b0d8000813ba7fee06971cd4 (diff) | |
| download | otp-0217dbfee505ed8c88164c7a4ea5e1834e6ce8cd.tar.gz otp-0217dbfee505ed8c88164c7a4ea5e1834e6ce8cd.tar.bz2 otp-0217dbfee505ed8c88164c7a4ea5e1834e6ce8cd.zip | |
Merge branch 'peterdmv/use_uri_string/OTP-14902'
* peterdmv/use_uri_string/OTP-14902:
common_test: Use uri_string
ssl: Use uri_string
public_key: Use uri_string
observer: Use uri_string
Change-Id: I4beac2289db039cc7d566807727c5aaf7fadf942
Diffstat (limited to 'lib/common_test')
| -rw-r--r-- | lib/common_test/src/common_test.app.src | 2 | ||||
| -rw-r--r-- | lib/common_test/src/ct_webtool.erl | 2 | ||||
| -rw-r--r-- | lib/common_test/src/test_server_ctrl.erl | 2 | ||||
| -rw-r--r-- | lib/common_test/src/vts.erl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src index 0aa4aacf16..9becde110b 100644 --- a/lib/common_test/src/common_test.app.src +++ b/lib/common_test/src/common_test.app.src @@ -92,7 +92,7 @@ "sasl-2.4.2", "snmp-5.1.2", "ssh-4.0", - "stdlib-3.4", + "stdlib-3.5", "syntax_tools-1.7", "tools-2.8", "xmerl-1.3.8" diff --git a/lib/common_test/src/ct_webtool.erl b/lib/common_test/src/ct_webtool.erl index 82aa78fc4b..c7174b13f5 100644 --- a/lib/common_test/src/ct_webtool.erl +++ b/lib/common_test/src/ct_webtool.erl @@ -771,7 +771,7 @@ fill_out(Nr)-> %Controls whether the user selected a tool to start %---------------------------------------------------------------------- get_tools(Input)-> - case httpd:parse_query(Input) of + case uri_string:dissect_query(Input) of []-> no_tools; Tools-> diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl index 3a454a1e84..a76c8c12de 100644 --- a/lib/common_test/src/test_server_ctrl.erl +++ b/lib/common_test/src/test_server_ctrl.erl @@ -5739,7 +5739,7 @@ uri_encode_comp([Char|Chars],Encoding) -> Reserved = sets:is_element(Char, reserved()), case (Char>127 andalso Encoding==latin1) orelse Reserved of true -> - [ $% | http_util:integer_to_hexlist(Char)] ++ + [ $% | integer_to_list(Char, 16)] ++ uri_encode_comp(Chars,Encoding); false -> [Char | uri_encode_comp(Chars,Encoding)] diff --git a/lib/common_test/src/vts.erl b/lib/common_test/src/vts.erl index 83fcde2f48..2bf3e82ade 100644 --- a/lib/common_test/src/vts.erl +++ b/lib/common_test/src/vts.erl @@ -919,7 +919,7 @@ get_input_data(Input,Key)-> end. parse(Input) -> - httpd:parse_query(Input). + uri_string:dissect_query(Input). vts_integer_to_list(X) when is_atom(X) -> atom_to_list(X); |