stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8265776: Improve Stream handling for SSL

Browse Source 
Reviewed-by: dfuchs, chegar, rhalade, ahgross
This commit is contained in:
Michael McMahon 2021-05-20 11:37:13 +00:00 committed by Henry Jen
parent 34628ff8ac
commit 3a7b663b6f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jdk.httpserver/share/classes/sun/net/httpserver/SSLStreams.java
View File

@ -515,7 +515,7 @@ class SSLStreams {
throw new IOException ("SSL stream is closed"); throw new IOException ("SSL stream is closed");
} }
if (eof) { if (eof) {
return 0; return -1;
} }
int available=0; int available=0;
if (!needData) { if (!needData) {
@ -528,7 +528,7 @@ class SSLStreams {
bbuf = r.buf== bbuf? bbuf: r.buf; bbuf = r.buf== bbuf? bbuf: r.buf;
if ((available=bbuf.remaining()) == 0) { if ((available=bbuf.remaining()) == 0) {
eof = true; eof = true;
return 0; return -1;
} else { } else {
needData = false; needData = false;
} }
@ -579,7 +579,7 @@ class SSLStreams {
/** /**
* close the SSL connection. All data must have been consumed * close the SSL connection. All data must have been consumed
* before this is called. Otherwise an exception will be thrown. * before this is called. Otherwise an exception will be thrown.
* [Note. May need to revisit this. not quite the normal close() symantics * [Note. May need to revisit this. not quite the normal close() semantics
*/ */
public void close () throws IOException { public void close () throws IOException {
eof = true; eof = true;
@ -593,8 +593,11 @@ class SSLStreams {
byte single[] = new byte [1]; byte single[] = new byte [1];
public int read () throws IOException { public int read () throws IOException {
if (eof) {
return -1;
}
int n = read (single, 0, 1); int n = read (single, 0, 1);
if (n == 0) { if (n <= 0) {
return -1; return -1;
} else { } else {
return single[0] & 0xFF; return single[0] & 0xFF;