Browse Source

don't timeout while uploading big messages

we did already set up the timeout when starting to send commands, but so
far we did not reset it when succeeding to send out data. rectify that.

REFFAIL: 87sgy92we3.fsf@jnanam.net
wip/unchecked-remove
Oswald Buddenhagen 5 years ago
parent
commit
dfa8c16f27
  1. 5
      src/socket.c

5
src/socket.c

@ -680,8 +680,6 @@ do_read( conn_t *sock, char *buf, int len )
int n; int n;
assert( sock->fd >= 0 ); assert( sock->fd >= 0 );
if (pending_wakeup( &sock->fd_timeout ))
conf_wakeup( &sock->fd_timeout, sock->conf->timeout );
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
if (sock->ssl) { if (sock->ssl) {
if ((n = ssl_return( "read from", sock, SSL_read( sock->ssl, buf, len ) )) <= 0) if ((n = ssl_return( "read from", sock, SSL_read( sock->ssl, buf, len ) )) <= 0)
@ -1055,6 +1053,9 @@ socket_fd_cb( int events, void *aux )
if (events & POLLOUT) if (events & POLLOUT)
conf_notifier( &conn->notify, POLLIN, 0 ); conf_notifier( &conn->notify, POLLIN, 0 );
if (pending_wakeup( &conn->fd_timeout ))
conf_wakeup( &conn->fd_timeout, conn->conf->timeout );
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
if (conn->state == SCK_STARTTLS) { if (conn->state == SCK_STARTTLS) {
start_tls_p2( conn ); start_tls_p2( conn );

Loading…
Cancel
Save