Merge remote-tracking branch 'refs/remotes/origin/master' into devel

Author: z3APA3A

3proxy.rc

@@ -2,8 +2,8 @@
 
 
 1 VERSIONINFO
-FILEVERSION 0,9,0,0
-PRODUCTVERSION 0,9,0,0
+FILEVERSION 0,8,4,0
+PRODUCTVERSION 0,8,4,0
 FILETYPE 1
 FILESUBTYPE 0x0L
 BEGIN
@@ -14,12 +14,12 @@ BEGIN
             VALUE "Comments", "3proxy - tiny proxy server, http://3proxy.ru/\0"
             VALUE "CompanyName", "Vladimir Dubrovin\0"
             VALUE "FileDescription", "3proxy - tiny proxy server\0"
-            VALUE "FileVersion", "0.9-devel-" BUILDDATE "\0"
+            VALUE "FileVersion", "0.8.4\0"
             VALUE "InternalName", "3proxy\0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2016 Vladimir Dubrovin\0"
             VALUE "OriginalFilename", "3proxy.exe\0"
             VALUE "ProductName", "3proxy\0"
-            VALUE "ProductVersion", "0.9-devel-" BUILDDATE "\0"
+            VALUE "ProductVersion", "0.8.4\0"
         END
     END
     BLOCK "VarFileInfo"

src/plugins/SSLPlugin/ssl_plugin.c

@@ -326,8 +326,13 @@ static struct filter ssl_filter = {
 };
 
 int mitm = 0;
+int ssl_inited = 0;
 
 static int h_mitm(int argc, unsigned char **argv){
+	if(!ssl_inited) {
+		ssl_init();
+		ssl_inited = 1;
+	}
 	if((mitm&1)) return 1;
 	if(mitm) usleep(100*SLEEPTIME);
 	ssl_filter.next = pl->conf->filters;
@@ -389,9 +394,9 @@ __declspec(dllexport)
 	}
 	else {
 		ssl_release();
+		ssl_inited = 0;
 	}
 
-	ssl_init();
 	tcppmfunc = (PROXYFUNC)pl->findbyname("tcppm");	
 	if(!tcppmfunc){return 13;}
 	proxyfunc = (PROXYFUNC)pl->findbyname("proxy");	

src/version.h

@@ -1,2 +1,2 @@
-#define VERSION "3proxy-0.9-devel"
-#define BUILDDATE "160128011858"
+#define VERSION "3proxy-0.8.4"
+#define BUILDDATE "160222003547"