Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jetty-9 ssl cleanups

This commit is contained in:
Greg Wilkins 2012-06-07 23:56:16 +02:00
parent ad689a6a57
commit 1676031906
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
View File

@ -246,8 +246,7 @@ public class SslConnection extends AbstractAsyncConnection
if (_fillWrap ) if (_fillWrap )
{ {
// we must be blocked trying to write before we can read // we must be blocked trying to write before we can read
// If we have written the net data
// Do we don't have some netdata to write
if (BufferUtil.isEmpty(_netOut)) if (BufferUtil.isEmpty(_netOut))
{ {
// pretend we are readable so the wrap is done by next readable callback // pretend we are readable so the wrap is done by next readable callback
@ -379,6 +378,9 @@ public class SslConnection extends AbstractAsyncConnection
{ {
_fillWrap=true; _fillWrap=true;
flush(BufferUtil.EMPTY_BUFFER); flush(BufferUtil.EMPTY_BUFFER);
if (BufferUtil.hasContent(_netOut))
return 0;
_fillWrap=false;
} }
return -1; return -1;
@ -415,10 +417,14 @@ public class SslConnection extends AbstractAsyncConnection
continue; continue;
case NEED_WRAP: case NEED_WRAP:
// TODO maybe just do the wrap here ourselves?
// we need to send some handshake data // we need to send some handshake data
if (_flushUnwrap)
return 0;
_fillWrap=true; _fillWrap=true;
flush(BufferUtil.EMPTY_BUFFER); flush(BufferUtil.EMPTY_BUFFER);
if (BufferUtil.hasContent(_netOut))
return 0;
_fillWrap=false;
continue; continue;
case NEED_UNWRAP: case NEED_UNWRAP: