Title: [748] trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java: JRUBY-1310: file descriptor leak (by T Meyarivan)
- Revision
- 748
- Author
- enebo
- Date
- 2007-09-26 10:51:32 -0400 (Wed, 26 Sep 2007)
Log Message
JRUBY-1310: file descriptor leak (by T Meyarivan)
JRUBY-1312: SSLSocket.readAndUnwrap() discards data (by T Meyarivan)
Modified Paths
Diff
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java (747 => 748)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java 2007-09-26 13:27:54 UTC (rev 747)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java 2007-09-26 14:51:32 UTC (rev 748)
@@ -322,7 +322,9 @@
int bytesRead = c.read(peerNetData);
if(bytesRead == -1) {
// engine.closeInbound();
- return -1;
+ if ((peerNetData.position() == 0) || (status == SSLEngineResult.Status.BUFFER_UNDERFLOW)) {
+ return -1;
+ }
}
peerAppData.clear();
peerNetData.flip();
@@ -369,6 +371,10 @@
}
netData.flip();
flushData();
+
+ rsel.close();
+ wsel.close();
+ asel.close();
}
public IRubyObject sysread(IRubyObject[] args) throws Exception {
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
