aboutsummaryrefslogtreecommitdiff
path: root/ssl.c
diff options
context:
space:
mode:
authorDavid Sommerseth <dazo@users.sourceforge.net>2010-11-18 22:17:58 +0100
committerDavid Sommerseth <dazo@users.sourceforge.net>2010-11-18 22:17:58 +0100
commit529df9922d85574828d95020eebcd228ba3a8164 (patch)
tree8524b46dd4bbbd163d4ce273ea6e82edd7c4b947 /ssl.c
parentMerge branch 'bugfix2.1' into beta2.2 (diff)
parentMerged add_bypass_address() and add_host_route_if_nonlocal() (diff)
downloadopenvpn-529df9922d85574828d95020eebcd228ba3a8164.tar.xz
Merge branch 'feat_misc' into beta2.2
Conflicts: acinclude.m4 config-win32.h configure.ac misc.c thread.c thread.h - These conflicts was mainly due to feat_misc getting old and mostly caused by the pthread clean-up patches in feat_misc Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'ssl.c')
-rw-r--r--ssl.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/ssl.c b/ssl.c
index e7fd071..2fa091a 100644
--- a/ssl.c
+++ b/ssl.c
@@ -43,7 +43,6 @@
#include "common.h"
#include "integer.h"
#include "socket.h"
-#include "thread.h"
#include "misc.h"
#include "fdmisc.h"
#include "interval.h"
@@ -4041,8 +4040,6 @@ tls_process (struct tls_multi *multi,
msg (D_TLS_DEBUG_LOW, "TLS: tls_process: killed expiring key");
}
- /*mutex_cycle (multi->mutex);*/
-
do
{
update_time ();
@@ -4329,7 +4326,6 @@ tls_process (struct tls_multi *multi,
}
}
}
- /*mutex_cycle (multi->mutex);*/
}
while (state_change);
@@ -4483,7 +4479,6 @@ tls_multi_process (struct tls_multi *multi,
reset_session (multi, session);
}
}
- /*mutex_cycle (multi->mutex);*/
}
update_time ();