Github user sohami commented on a diff in the pull request: https://github.com/apache/drill/pull/950#discussion_r140400536 --- Diff: exec/rpc/src/main/java/org/apache/drill/exec/rpc/BasicServer.java --- @@ -82,6 +83,9 @@ protected void initChannel(SocketChannel ch) throws Exception { ch.closeFuture().addListener(getCloseHandler(ch, connection)); final ChannelPipeline pipe = ch.pipeline(); + // Make sure that the SSL handler is the first handler in the pipeline so everything is encrypted + setupSSL(pipe); --- End diff -- how about checking `isSslEnabled()` and then calling `setupSSL(..)` here and in `BasicClient` ? instead of checking it inside the `setupSSL` function. Since cases when SSL is disabled that will avoid the function call.
---