X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=apps%2Fs_client.c;h=277417efd8ae72bfd7aaa19b4cf405c6ee196c7e;hb=a9ef75c50d35afc115d443ddc7dd35956fc5a2ef;hp=e629f8e7f13f6a5c2e03c3bc70ace073d782d65f;hpb=7edd20916a35735f809bccd6d595c209814b1c2e;p=openssl.git

diff --git a/apps/s_client.c b/apps/s_client.c
index e629f8e7f1..277417efd8 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -523,7 +523,7 @@ re_start:
 					tv.tv_usec = 0;
 					i=select(width,(void *)&readfds,(void *)&writefds,
 						 NULL,&tv);
-					if(!i && (!_kbhit() || !read_tty) ) continue;
+					if(!i && (!((_kbhit()) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0))) || !read_tty) ) continue;
 				} else 	i=select(width,(void *)&readfds,(void *)&writefds,
 					 NULL,NULL);
 			}
@@ -689,7 +689,7 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
 			}
 
 #ifdef WINDOWS
-		else if (_kbhit())
+		else if ((_kbhit()) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
 #else
 		else if (FD_ISSET(fileno(stdin),&readfds))
 #endif