@@ -6014,12 +6014,6 @@ inline void calc_actual_timeout(time_t global_timeout_msec,
6014
6014
time_t duration_msec, time_t timeout_sec,
6015
6015
time_t timeout_usec, time_t &actual_timeout_sec,
6016
6016
time_t &actual_timeout_usec) {
6017
- if (global_timeout_msec <= 0 ) {
6018
- actual_timeout_sec = timeout_sec;
6019
- actual_timeout_usec = timeout_usec;
6020
- return ;
6021
- }
6022
-
6023
6017
auto timeout_msec = (timeout_sec * 1000 ) + (timeout_usec / 1000 );
6024
6018
6025
6019
auto actual_timeout_msec =
@@ -6045,6 +6039,10 @@ inline SocketStream::SocketStream(
6045
6039
inline SocketStream::~SocketStream () = default ;
6046
6040
6047
6041
inline bool SocketStream::is_readable () const {
6042
+ if (global_timeout_msec_ <= 0 ) {
6043
+ return select_read (sock_, read_timeout_sec_, read_timeout_usec_) > 0 ;
6044
+ }
6045
+
6048
6046
time_t read_timeout_sec;
6049
6047
time_t read_timeout_usec;
6050
6048
calc_actual_timeout (global_timeout_msec_, duration (), read_timeout_sec_,
@@ -9190,6 +9188,10 @@ inline SSLSocketStream::SSLSocketStream(
9190
9188
inline SSLSocketStream::~SSLSocketStream () = default ;
9191
9189
9192
9190
inline bool SSLSocketStream::is_readable () const {
9191
+ if (global_timeout_msec_ <= 0 ) {
9192
+ return select_read (sock_, read_timeout_sec_, read_timeout_usec_) > 0 ;
9193
+ }
9194
+
9193
9195
time_t read_timeout_sec;
9194
9196
time_t read_timeout_usec;
9195
9197
calc_actual_timeout (global_timeout_msec_, duration (), read_timeout_sec_,
0 commit comments