From e3fb268b641fca62796174387fdabf18dd42244e Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Wed, 20 Jan 2016 01:08:48 +0300 Subject: [PATCH 01/10] publish as 0.8 --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index a22a3c7..91d48b8 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define VERSION "3proxy-0.8-pre" -#define BUILDDATE "160113233318" +#define VERSION "3proxy-0.8" +#define BUILDDATE "160120010803" From 244be504051a3c7dba2775b82984de9bf359983d Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Wed, 20 Jan 2016 01:20:05 +0300 Subject: [PATCH 02/10] publish as 0.8.0 only version number is changed --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index 91d48b8..4806be3 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define VERSION "3proxy-0.8" -#define BUILDDATE "160120010803" +#define VERSION "3proxy-0.8.0" +#define BUILDDATE "160120012001" From 3a4f3b5cd1eed59d7f31f897d6c469eef262edff Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Thu, 21 Jan 2016 16:26:08 +0300 Subject: [PATCH 03/10] publish as 0.8.1 --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index 4806be3..55f207a 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define VERSION "3proxy-0.8.0" -#define BUILDDATE "160120012001" +#define VERSION "3proxy-0.8.1" +#define BUILDDATE "160121162300" From 3cbbe1aef7e644e4a70533eece8dbb5a85c41c5b Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Sat, 23 Jan 2016 19:17:36 +0300 Subject: [PATCH 04/10] publish as 0.8.2 --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index 55f207a..e068383 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define VERSION "3proxy-0.8.1" -#define BUILDDATE "160121162300" +#define VERSION "3proxy-0.8.2" +#define BUILDDATE "160123191510" From 331c933508eaa55ea0f93e8ad2d5db5548eb0168 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Mon, 25 Jan 2016 22:55:08 +0300 Subject: [PATCH 05/10] publish as 0.8.3 --- src/version.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index e068383..1db5b77 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1 @@ -#define VERSION "3proxy-0.8.2" -#define BUILDDATE "160123191510" +#define VERSION "3proxy-0.8.3" From 79170af2bc7b2f8db3fa5f29c077bb871e4370b2 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Tue, 26 Jan 2016 12:10:55 +0300 Subject: [PATCH 06/10] publish as 0.8.3 --- src/version.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/version.h b/src/version.h index 1db5b77..05c45e0 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1,2 @@ #define VERSION "3proxy-0.8.3" +#define BUILDDATE "160126120751" From 4f7a82ed92d4a66f84f80772c6ea45d17b7f9798 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Sun, 31 Jan 2016 15:07:08 +0300 Subject: [PATCH 07/10] Update rc for 0.8.4 --- 3proxy.rc | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/3proxy.rc b/3proxy.rc index 3ff2cfa..ce5d8ae 100644 --- a/3proxy.rc +++ b/3proxy.rc @@ -1,26 +1,25 @@ #include "src/version.h" -LANGUAGE 0x09, 0x01 -VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,8,0,0 - PRODUCTVERSION 0,8,0,0 - FILETYPE 0x1L - FILESUBTYPE 0x0L +1 VERSIONINFO +FILEVERSION 0,8,4,0 +PRODUCTVERSION 0,8,4,0 +FILETYPE 1 +FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "000004b0" + BLOCK "040904E4" BEGIN - VALUE "Comments", "3proxy - tiny proxy server, http://3proxy.ru/" - VALUE "CompanyName", "Vladimir Dubrovin" - VALUE "FileDescription", "3proxy - tiny proxy server" - VALUE "FileVersion", VERSION "-" BUILDDATE - VALUE "InternalName", "3proxy" - VALUE "LegalCopyright", "Copyright (C) 2002-2014 Vladimir Dubrovin" - VALUE "OriginalFilename", "3proxy.exe" - VALUE "ProductName", "3proxy - tiny proxy server" - VALUE "ProductVersion", VERSION + 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.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.8.4\0" END END BLOCK "VarFileInfo" From 026357465526052a023baecb6c4933affda3f551 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Sun, 31 Jan 2016 23:22:02 +0300 Subject: [PATCH 08/10] minor documentation correction --- doc/html/howtor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/html/howtor.html b/doc/html/howtor.html index 8aa200c..0d2268c 100644 --- a/doc/html/howtor.html +++ b/doc/html/howtor.html @@ -783,7 +783,7 @@ ... deny * * 127.0.0.2 добавляет статическую запись в кэш. Статические записи так же влияют на разрешение через dnspr если не указана опция -s. Начиная с версии 0.8 для dnspr могут быть сконфигурированы родительские прокси.

-
  • Как использовать IPv6 +
  • Как использовать IPv6

    IPv6 поддерживается с версии 0.8. Обратите внимание, что в некоторых видах прокси (например SOCKSv4) IPv6 не поддерживает на уровне протокола. В SOCKSv5 есть поддержка IPv6 с помощью отдельного вида From 604cc22d166d3b4d75af70301521edd33df3a550 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Mon, 22 Feb 2016 00:53:10 +0300 Subject: [PATCH 09/10] mark as 0.8.4 --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index 05c45e0..61891c6 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define VERSION "3proxy-0.8.3" -#define BUILDDATE "160126120751" +#define VERSION "3proxy-0.8.4" +#define BUILDDATE "160222003547" From c96d415020166801bb78a36bcd4fcf6f957b08a6 Mon Sep 17 00:00:00 2001 From: z3APA3A <3APA3A@3proxy.ru> Date: Mon, 22 Feb 2016 21:14:17 +0300 Subject: [PATCH 10/10] Defer SSL init to first command in ssl_plugin --- src/plugins/SSLPlugin/ssl_plugin.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/SSLPlugin/ssl_plugin.c b/src/plugins/SSLPlugin/ssl_plugin.c index 2739164..0214f5a 100644 --- a/src/plugins/SSLPlugin/ssl_plugin.c +++ b/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");