PR: 1990
Update from 0.9.8-stable
This commit is contained in:
parent
3fa39ed723
commit
6aa220c935
@ -250,6 +250,10 @@ static void dgram_reset_rcv_timeout(BIO *b)
|
|||||||
{
|
{
|
||||||
#if defined(SO_RCVTIMEO)
|
#if defined(SO_RCVTIMEO)
|
||||||
bio_dgram_data *data = (bio_dgram_data *)b->ptr;
|
bio_dgram_data *data = (bio_dgram_data *)b->ptr;
|
||||||
|
|
||||||
|
/* Is a timer active? */
|
||||||
|
if (data->next_timeout.tv_sec > 0 || data->next_timeout.tv_usec > 0)
|
||||||
|
{
|
||||||
#ifdef OPENSSL_SYS_WINDOWS
|
#ifdef OPENSSL_SYS_WINDOWS
|
||||||
int timeout = data->socket_timeout.tv_sec * 1000 +
|
int timeout = data->socket_timeout.tv_sec * 1000 +
|
||||||
data->socket_timeout.tv_usec / 1000;
|
data->socket_timeout.tv_usec / 1000;
|
||||||
@ -261,6 +265,7 @@ static void dgram_reset_rcv_timeout(BIO *b)
|
|||||||
sizeof(struct timeval)) < 0)
|
sizeof(struct timeval)) < 0)
|
||||||
{ perror("setsockopt"); }
|
{ perror("setsockopt"); }
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user