Index: tlsBIO.c
==================================================================
--- tlsBIO.c
+++ tlsBIO.c
@@ -262,11 +262,11 @@
 			dprintf("Got BIO_CTRL_EOF");
 			ret = Tcl_Eof(chan);
 			break;
 		case BIO_CTRL_PENDING:
 			dprintf("Got BIO_CTRL_PENDING");
-			ret = ((chan) ? 1 : 0);
+			ret = ((chan) ? Tcl_InputBuffered(chan) : 0);
 			dprintf("BIO_CTRL_PENDING(%d)", (int) ret);
 			break;
 		case BIO_CTRL_WPENDING:
 			dprintf("Got BIO_CTRL_WPENDING");
 			ret = 0;

Index: tlsIO.c
==================================================================
--- tlsIO.c
+++ tlsIO.c
@@ -743,18 +743,19 @@
             dprintf("A timer was found, deleting it");
 	    Tcl_DeleteTimerHandler(statePtr->timer);
 	    statePtr->timer = (Tcl_TimerToken) NULL;
 	}
 
-	if ((mask & TCL_READABLE) && Tcl_InputBuffered(statePtr->self) > 0) {
-	    /*
-	     * There is interest in readable events and we actually have
-	     * data waiting, so generate a timer to flush that.
-	     */
-            dprintf("Creating a new timer since data appears to be waiting");
-	    statePtr->timer = Tcl_CreateTimerHandler(TLS_TCL_DELAY,
-		    TlsChannelHandlerTimer, (ClientData) statePtr);
+	if (mask & TCL_READABLE) {
+		if (Tcl_InputBuffered(statePtr->self) > 0 || BIO_ctrl_pending(statePtr->bio) > 0) {
+			/*
+			 * There is interest in readable events and we actually have
+			 * data waiting, so generate a timer to flush that.
+			 */
+			dprintf("Creating a new timer since data appears to be waiting");
+			statePtr->timer = Tcl_CreateTimerHandler(TLS_TCL_DELAY, TlsChannelHandlerTimer, (ClientData) statePtr);
+		}
 	}
 }
 
 /*
  *-------------------------------------------------------------------