bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-23 18:45:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
z3APA3A 2016-02-22 21:16:18 +03:00
commit aa38dd2ad2
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3proxy.rc
View File

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

7
src/plugins/SSLPlugin/ssl_plugin.c
View File

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

4
src/version.h
View File

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