From 1361f0e88138653d2437f45ddf940206ed0e93b7 Mon Sep 17 00:00:00 2001
From: Jakub Sławiński
Date: Thu, 6 Apr 2006 23:34:51 +0200
Subject: v0.8.1

  - Fixed: enableproxy option in server's config file
  - Added: clients idle time
  - Added: 'maxidle' option
  - Modified: task scheduling subsystem has been completely rewritten
  - Fixed: segmentation fault in http tunnels after multiple simultaneous POST
	         connections from the same source
  - Fixed: unexpected connection close when http proxy was too slow
  - Fixed: SIGSEGV in http proxy mode under cygwin
  - Added: enabled the SO_KEEPALIVE option for all the sockets used by the apf
  - Added: 60 seconds timeout for SSL_connect
---
 src/client_initialization.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/client_initialization.c')

diff --git a/src/client_initialization.c b/src/client_initialization.c
index 77c0e48..5dc3717 100644
--- a/src/client_initialization.c
+++ b/src/client_initialization.c
@@ -27,6 +27,7 @@
 #include "base64.h"
 #include "ssl_routines.h"
 #include "client_configuration_struct.h"
+#include "client_signals.h"
 
 int
 initialize_client_stage1(ClientRealm* cr, SSL_CTX* ctx, unsigned char* buff, char wanttoexit,
@@ -126,6 +127,8 @@ initialize_client_stage1(ClientRealm* cr, SSL_CTX* ctx, unsigned char* buff, cha
     }
   }
 
+  alarm(60);
+  
   aflog(LOG_T_INIT, LOG_I_INFO,
       "Trying SSL_connect");
   if ((n = SSL_connect(SslFd_get_ssl(ClientRealm_get_masterSslFd(cr)))) == 1) {
@@ -201,6 +204,7 @@ initialize_client_stage1(ClientRealm* cr, SSL_CTX* ctx, unsigned char* buff, cha
         "SSL_connect successful");
   }
   else {
+    alarm(0);
     aflog(LOG_T_INIT, LOG_I_CRIT,
         "SSL_connect has failed (%d | %d)... exiting", n,
         SSL_get_error(SslFd_get_ssl(ClientRealm_get_masterSslFd(cr)), n));
@@ -212,6 +216,7 @@ initialize_client_stage1(ClientRealm* cr, SSL_CTX* ctx, unsigned char* buff, cha
       return 3;
     }
   }
+  alarm(0);
 
   buff[0] = AF_S_LOGIN;
   buff[1] = ClientRealm_get_password(cr)[0];
-- 
cgit v1.1