andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix starttls support. Now SslHandler should be fully functional again

Browse Source
This commit is contained in:
norman 2012-06-06 08:06:12 +02:00
parent fd7767ccda
commit f759d30538
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
handler/src/main/java/io/netty/handler/ssl/SslHandler.java
View File

@ -168,7 +168,7 @@ public class SslHandler extends StreamToStreamCodec {
// TODO: Fix STARTTLS // TODO: Fix STARTTLS
private final boolean startTls; private final boolean startTls;
private boolean firstMessageSend; private boolean sentFirstMessage;
private volatile boolean enableRenegotiation = true; private volatile boolean enableRenegotiation = true;
@ -449,6 +449,15 @@ public class SslHandler extends StreamToStreamCodec {
@Override @Override
public void encode(ChannelOutboundHandlerContext<Byte> ctx, ChannelBuffer in, ChannelBuffer out) throws Exception { public void encode(ChannelOutboundHandlerContext<Byte> ctx, ChannelBuffer in, ChannelBuffer out) throws Exception {
// Do not encrypt the first write request if this handler is
// created with startTLS flag turned on.
if (startTls && !sentFirstMessage) {
sentFirstMessage = true;
out.writeBytes(in);
return;
}
ByteBuffer outNetBuf = bufferPool.acquireBuffer(); ByteBuffer outNetBuf = bufferPool.acquireBuffer();
boolean success = true; boolean success = true;
boolean needsUnwrap = false; boolean needsUnwrap = false;