From d4f4e4a8072ae3e0f2972cec436fb8f63db7d3a9 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Mon, 4 May 2015 18:12:46 +0300 Subject: [PATCH] Deadlock in SSLPlugin corrected deadlock due to typo in previous SSL patch --- src/plugins/SSLPlugin/ssl_plugin.c | 2 +- src/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/SSLPlugin/ssl_plugin.c b/src/plugins/SSLPlugin/ssl_plugin.c index 172969c..a8e16c8 100644 --- a/src/plugins/SSLPlugin/ssl_plugin.c +++ b/src/plugins/SSLPlugin/ssl_plugin.c @@ -60,7 +60,7 @@ static struct SSLqueue *searchSSL(SOCKET s){ pthread_mutex_lock(&ssl_mutex); for(sslq = SSLq; sslq; sslq = sslq->next) if(sslq->s == s) break; - pthread_mutex_lock(&ssl_mutex); + pthread_mutex_unlock(&ssl_mutex); return sslq; } diff --git a/src/version.h b/src/version.h index c770653..a74b143 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ #define VERSION "3proxy-0.8b-devel" -#define BUILDDATE "150504180421" +#define BUILDDATE "150504181054"