[httpcomponents-core] branch 4.4.x updated: HTTPCORE-600: SSLIOSession incorrectly disables input interest when there is still decrypted data available in the session input buffer

[ol...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

olegk pushed a commit to branch 4.4.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git


The following commit(s) were added to refs/heads/4.4.x by this push:
     new 6337dca  HTTPCORE-600: SSLIOSession incorrectly disables input interest when there is still decrypted data available in the session input buffer
6337dca is described below

commit 6337dca3d9ec33b3fdbead45a14d5bbe2a4a3b08
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sat Sep 14 11:04:59 2019 +0200

    HTTPCORE-600: SSLIOSession incorrectly disables input interest when there is still decrypted data available in the session input buffer
---
 .../src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java b/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
index 5b571d8..96447d7 100644
--- a/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
+++ b/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
@@ -405,7 +405,9 @@ public class SSLIOSession implements IOSession, SessionBufferStatus, SocketAcces
             break;
         }
 
-        if (this.endOfStream && (this.appBufferStatus == null || !this.appBufferStatus.hasBufferedInput())) {
+        if (this.endOfStream &&
+                !this.inPlain.hasData() &&
+                (this.appBufferStatus == null || !this.appBufferStatus.hasBufferedInput())) {
             newMask = newMask & ~EventMask.READ;
         }