ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/server.c
(Generate patch)

Comparing ircd-hybrid/trunk/src/server.c (file contents):
Revision 4736 by michael, Sun Oct 12 11:41:26 2014 UTC vs.
Revision 4737 by michael, Sun Oct 12 12:06:07 2014 UTC

# Line 802 | Line 802 | ssl_server_handshake(fde_t *fd, void *da
802  
803    if ((ret = SSL_connect(client_p->connection->fd.ssl)) <= 0)
804    {
805 <    if ((CurrentTime - client_p->connection->firsttime) > 30)
805 >    if ((CurrentTime - client_p->connection->firsttime) > CONNECTTIMEOUT)
806      {
807        exit_client(client_p, "Timeout during SSL handshake");
808        return;
# Line 812 | Line 812 | ssl_server_handshake(fde_t *fd, void *da
812      {
813        case SSL_ERROR_WANT_WRITE:
814          comm_setselect(&client_p->connection->fd, COMM_SELECT_WRITE,
815 <                       ssl_server_handshake, client_p, 30);
815 >                       ssl_server_handshake, client_p, CONNECTTIMEOUT);
816          return;
817        case SSL_ERROR_WANT_READ:
818          comm_setselect(&client_p->connection->fd, COMM_SELECT_READ,
819 <                       ssl_server_handshake, client_p, 30);
819 >                       ssl_server_handshake, client_p, CONNECTTIMEOUT);
820          return;
821        default:
822        {

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)