diff options
| author | David Robakowski <david.robakowski@synlay.com> | 2013-08-07 05:51:00 +0200 |
|---|---|---|
| committer | Nobuaki Sukegawa <nsuke@apache.org> | 2015-11-01 18:30:46 +0900 |
| commit | a7d6a970339ff11ed60dbb8b73e59b1ed6482acb (patch) | |
| tree | 940a18f42cf64bdded3f3817dfac4c32f9649542 /test/erl | |
| parent | 7ab56e835c8e44198c4f6875a8b2d761ae31ee40 (diff) | |
| download | thrift-a7d6a970339ff11ed60dbb8b73e59b1ed6482acb.tar.gz | |
THRIFT-2113 Erlang SSL Socket Support
Client: Erlang
Patch: David Robakowski
Diffstat (limited to 'test/erl')
| -rw-r--r-- | test/erl/src/test_client.erl | 8 | ||||
| -rw-r--r-- | test/erl/src/test_thrift_server.erl | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/test/erl/src/test_client.erl b/test/erl/src/test_client.erl index 8cfeb8b59..7b9efd6f4 100644 --- a/test/erl/src/test_client.erl +++ b/test/erl/src/test_client.erl @@ -47,6 +47,14 @@ parse_args([Head | Rest], Opts) -> _Else -> Opts end; + "--ssl" -> + ssl:start(), + SslOptions = + {ssloptions, [ + {certfile, "../keys/client.crt"} + ,{keyfile, "../keys/server.key"} + ]}, + Opts#options{client_opts = [{ssltransport, true} | [SslOptions | Opts#options.client_opts]]}; "--protocol=binary" -> % TODO: Enable JSON protocol Opts; diff --git a/test/erl/src/test_thrift_server.erl b/test/erl/src/test_thrift_server.erl index 51457f50f..884eb9e60 100644 --- a/test/erl/src/test_thrift_server.erl +++ b/test/erl/src/test_thrift_server.erl @@ -47,6 +47,14 @@ parse_args([Head | Rest], Opts) -> _Else -> Opts end; + "--ssl" -> + ssl:start(), + SslOptions = + {ssloptions, [ + {certfile, "../keys/server.crt"} + ,{keyfile, "../keys/server.key"} + ]}, + Opts#options{server_opts = [{ssltransport, true} | [SslOptions | Opts#options.server_opts]]}; "--protocol=" ++ _ -> Opts; _Else -> erlang:error({bad_arg, Head}) |