From e1b4e502422f808ab08c4deffced9528ac71b662 Mon Sep 17 00:00:00 2001 From: z3apa3a <3proxy@3proxy.ru> Date: Fri, 2 Jul 2021 11:50:33 +0300 Subject: [PATCH] Copyright update --- README | 2 +- authors | 2 +- copying | 8 ++--- doc/html/howtoe.html | 2 +- doc/html/howtor.html | 16 +++------- man/3proxy.8 | 4 +-- man/3proxy.cfg.3 | 4 +-- man/ftppr.8 | 4 +-- man/pop3p.8 | 4 +-- man/proxy.8 | 4 +-- man/smtpp.8 | 4 +-- man/socks.8 | 4 +-- man/tcppm.8 | 4 +-- man/udppm.8 | 4 +-- rus.3ps | 2 +- src/3proxy.c | 2 +- src/3proxy.rc | 2 +- src/auth.c | 2 +- src/authradius.c | 2 +- src/base64.c | 2 +- src/common.c | 2 +- src/conf.c | 2 +- src/datatypes.c | 2 +- src/dnspr.c | 2 +- src/ftp.c | 2 +- src/ftppr.c | 2 +- src/log.c | 2 +- src/mycrypt.c | 2 +- src/ntlm.c | 2 +- src/plugins.c | 2 +- src/plugins/FilePlugin/FilePlugin.c | 3 +- src/plugins/PCREPlugin/pcre_plugin.c | 3 +- src/plugins/SSLPlugin/my_ssl.c | 6 ++++ src/plugins/SSLPlugin/ssl_plugin.c | 3 +- .../TransparentPlugin/transparent_plugin.c | 2 +- .../WindowsAuthentication.c | 3 +- src/plugins/WindowsAuthentication/copying | 31 ------------------- src/plugins/utf8tocp1251/utf8tocp1251.c | 3 +- src/pop3p.c | 2 +- src/proxy.c | 2 +- src/proxy.h | 6 ++-- src/proxymain.c | 2 +- src/smtpp.c | 2 +- src/sockgetchar.c | 2 +- src/sockmap.c | 2 +- src/socks.c | 2 +- src/stringtable.c | 6 ++-- src/structures.h | 2 +- src/tcppm.c | 2 +- src/udppm.c | 2 +- src/webadmin.c | 2 +- 51 files changed, 75 insertions(+), 111 deletions(-) delete mode 100644 src/plugins/WindowsAuthentication/copying diff --git a/README b/README index 29df0d7..1d104e6 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ # 3APA3A 3proxy tiny proxy server -(c) 2002-2020 by Vladimir '3APA3A' Dubrovin <3proxy@3proxy.ru> +(c) 2002-2021 by Vladimir '3APA3A' Dubrovin <3proxy@3proxy.org> Branches: diff --git a/authors b/authors index fb31660..a8f7522 100644 --- a/authors +++ b/authors @@ -1 +1 @@ -(c) 2002-2019 by Vladimir '3APA3A' Dubrovin \ No newline at end of file +(c) 2002-2021 by Vladimir '3APA3A' Dubrovin \ No newline at end of file diff --git a/copying b/copying index 6a0ce50..40351c1 100644 --- a/copying +++ b/copying @@ -2,7 +2,7 @@ (c) 2000-2020 by 3APA3A (3APA3A@3proxy.ru) (c) 2000-2020 by 3proxy.org (https://3proxy.org/) -(c) 2000-2020 by Vladimir Dubrovin (vlad@3proxy.ru) +(c) 2000-2020 by Vladimir Dubrovin (vlad@3proxy.org) THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -38,20 +38,20 @@ terms of compatible license, including: 1. Apache License, Version 2.0 or (at your option) any later version You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 2. GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. You may obtain a copy of the License at - http://www.gnu.org/licenses/gpl.txt + https://www.gnu.org/licenses/gpl.txt 3. GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. You may obtain a copy of the License at - http://www.gnu.org/licenses/lgpl.txt + https://www.gnu.org/licenses/lgpl.txt diff --git a/doc/html/howtoe.html b/doc/html/howtoe.html index 0fffb14..8adcfb0 100644 --- a/doc/html/howtoe.html +++ b/doc/html/howtoe.html @@ -947,7 +947,7 @@ allowed traffic in Megabytes (MB). nocountin allows you to set exclusions.
  • How to obtain latest 3proxy version

    Latest version of 3proxy may be obtained -here. +here. New version may have changes and incompatibilities with previous one in files format or commands. Please, read CHANGELOG file and another documentation before installing new version. diff --git a/doc/html/howtor.html b/doc/html/howtor.html index 708f3bd..3cdee45 100644 --- a/doc/html/howtor.html +++ b/doc/html/howtor.html @@ -1066,9 +1066,9 @@ прокси-серверы для доступа к разным ресурсам. Эта возможность разбирается в статьях
    Microsoft: Q296591 A Description of the Automatic Discovery Feature -
    http://support.microsoft.com/default.aspx?scid=kb;EN-US;296591 +
    http://support.microsoft.com/default.aspx?scid=kb;EN-US;296591
    Netscape: Navigator Proxy Auto-Config File Format -
    http://wp.netscape.com/eng/mozilla/2.0/relnotes/demo/proxy-live.html +
    http://wp.netscape.com/eng/mozilla/2.0/relnotes/demo/proxy-live.html

  • Как настраивать FTP клиент

    Настройка FTP клиента для работы через SOCKS прокси не отличается от настройки @@ -1124,20 +1124,14 @@

  • Как использовать 3proxy с программой, не поддерживающей работу с прокси-сервером

    - Можно использовать любую программу-редиректор, например, - SocksCAP или - FreeCAP. 3proxy поддерживает исходящие + Можно использовать любую программу-редиректор. 3proxy поддерживает исходящие и обратные TCP и UDP соединения, но редиректоры могут иметь свои ограничения, кроме того, некоторые плохо написаные приложения не поддаются "соксификации". Если программе требуется обращаться к небольшому набору серверов (например, игровых), то проблему можно решить с помощью портмаппинга.

  • Как использовать 3proxy с играми

    - Оптимальный варинт - использовать соксификатор (Как использовать - 3proxy с программой, не поддерживающей работу с прокси-сервером). - FreeCap 3.13 проверен с играми на движке - Unreal (включая Unreal Tournament), Half-Life (включая Counter-Strike) и - другими. Если по каким-то причинам соксификатор не работает или недоступен, + Если по каким-то причинам соксификатор не работает или недоступен, то необходимо использовать отображения портов (обычно игры, кроме mood-подобных, работают по протоколу UDP, надо использовать udppm). Нужно иметь ввиду, что для udppm требуется отдельный маппинг для каждого @@ -1162,7 +1156,7 @@

  • Где взять свежую версию

    Свежую версию всегда можно взять - здесь. Обратите внимание, + здесь. Обратите внимание, что в новой версии может измениться порядок лицензирования или команды конфигурации, поэтому прежде чем устанавливать новую версии программы обязательно ознакомьтесь с документацией. diff --git a/man/3proxy.8 b/man/3proxy.8 index 0a26479..66cd39e 100644 --- a/man/3proxy.8 +++ b/man/3proxy.8 @@ -138,7 +138,7 @@ wget to automate this task. configuration file .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), kill(1), syslogd(8), @@ -148,4 +148,4 @@ https://3proxy.org/ 3APA3A is pronounced as \`\`zaraza\'\'. .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/3proxy.cfg.3 b/man/3proxy.cfg.3 index 047ad27..c29d5c3 100644 --- a/man/3proxy.cfg.3 +++ b/man/3proxy.cfg.3 @@ -1055,7 +1055,7 @@ corruption and/or Content-Length chaging. Default is 1MB (1048576). .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8), .br @@ -1064,4 +1064,4 @@ Report all bugs to 3APA3A is pronounced as \`\`zaraza\'\'. .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/ftppr.8 b/man/ftppr.8 index 3f477aa..0ad5216 100644 --- a/man/ftppr.8 +++ b/man/ftppr.8 @@ -77,11 +77,11 @@ is user\'s login on this FTP server. Login itself may contain \'@\' sign. Only cleartext authentication is currently supported. .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/pop3p.8 b/man/pop3p.8 index 338337b..7bfa230 100644 --- a/man/pop3p.8 +++ b/man/pop3p.8 @@ -73,11 +73,11 @@ authentication (APOP, CRAM-MD5, etc) requires challenge from server before we know which server to connect. .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/proxy.8 b/man/proxy.8 index 4ddbf17..eaa2252 100644 --- a/man/proxy.8 +++ b/man/proxy.8 @@ -68,11 +68,11 @@ limit clients, use instead. .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/smtpp.8 b/man/smtpp.8 index 6669509..bd14e30 100644 --- a/man/smtpp.8 +++ b/man/smtpp.8 @@ -74,11 +74,11 @@ authentication (CRAM-MD5, SPA, etc) requires challenge from server before we know which server to connect. .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/socks.8 b/man/socks.8 index 8a7960c..6bc127b 100644 --- a/man/socks.8 +++ b/man/socks.8 @@ -74,11 +74,11 @@ sufficient privileges). If you need to control access use instead. .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/tcppm.8 b/man/tcppm.8 index de65ec5..42929ee 100644 --- a/man/tcppm.8 +++ b/man/tcppm.8 @@ -63,11 +63,11 @@ as a destination in client application. Connection is forwarded to .IR remote_host : remote_port .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/man/udppm.8 b/man/udppm.8 index 9f704c8..2ae8db4 100644 --- a/man/udppm.8 +++ b/man/udppm.8 @@ -69,11 +69,11 @@ as a destination in client application. All datagrams are forwarded to .IR remote_host : remote_port .SH BUGS Report all bugs to -.BR 3proxy@3proxy.ru +.BR 3proxy@3proxy.org .SH SEE ALSO 3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8), .br https://3proxy.org/ .SH AUTHORS 3proxy is designed by Vladimir 3APA3A Dubrovin -.RI ( 3proxy@3proxy.ru ) +.RI ( 3proxy@3proxy.org ) diff --git a/rus.3ps b/rus.3ps index c55d3cd..9c91621 100644 --- a/rus.3ps +++ b/rus.3ps @@ -95,7 +95,7 @@ value {\n [end]










    \n 

    
-(c)3APA3A, Владимир Дубровин и 3proxy.ru\n
+(c)3APA3A, Владимир Дубровин и 3proxy.ru\n
 \n
 
 [end]
diff --git a/src/3proxy.c b/src/3proxy.c
index cce4e78..9082f50 100644
--- a/src/3proxy.c
+++ b/src/3proxy.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/3proxy.rc b/src/3proxy.rc
index 041646d..e65242c 100644
--- a/src/3proxy.rc
+++ b/src/3proxy.rc
@@ -10,7 +10,7 @@ BEGIN
     BEGIN
         BLOCK "040904E4"
         BEGIN
-            VALUE "Comments", "3proxy - tiny proxy server, http://3proxy.org/\0"
+            VALUE "Comments", "3proxy - tiny proxy server, https://3proxy.org/\0"
             VALUE "CompanyName", "Vladimir Dubrovin\0"
             VALUE "FileDescription", "3proxy - tiny proxy server\0"
             VALUE "FileVersion", RELEASE3PROXY
diff --git a/src/auth.c b/src/auth.c
index 634b092..cc525f2 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/authradius.c b/src/authradius.c
index 862e02d..750c30e 100644
--- a/src/authradius.c
+++ b/src/authradius.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2000-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2000-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/base64.c b/src/base64.c
index e6d0295..242b214 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -1,5 +1,5 @@
 /*
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/common.c b/src/common.c
index 001a4a7..53e6847 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/conf.c b/src/conf.c
index fcdecdc..8436b96 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/datatypes.c b/src/datatypes.c
index fb304ed..0d991c6 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -1,5 +1,5 @@
 /*
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/dnspr.c b/src/dnspr.c
index bdf2e61..3ec4f5f 100644
--- a/src/dnspr.c
+++ b/src/dnspr.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/ftp.c b/src/ftp.c
index 6f6931c..adc35bb 100644
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -1,5 +1,5 @@
 /*
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/ftppr.c b/src/ftppr.c
index 71eb8cc..d3bf9f1 100644
--- a/src/ftppr.c
+++ b/src/ftppr.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/log.c b/src/log.c
index ca9daea..abeea86 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2020 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/mycrypt.c b/src/mycrypt.c
index c07725f..4629042 100644
--- a/src/mycrypt.c
+++ b/src/mycrypt.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/ntlm.c b/src/ntlm.c
index 21bd0da..8f966d3 100644
--- a/src/ntlm.c
+++ b/src/ntlm.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/plugins.c b/src/plugins.c
index a0681df..509b58b 100644
--- a/src/plugins.c
+++ b/src/plugins.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/plugins/FilePlugin/FilePlugin.c b/src/plugins/FilePlugin/FilePlugin.c
index 6833c2c..0b8255e 100644
--- a/src/plugins/FilePlugin/FilePlugin.c
+++ b/src/plugins/FilePlugin/FilePlugin.c
@@ -1,6 +1,5 @@
 /*
-   3APA3A simpliest proxy server
-   (c) 2007-2008 by ZARAZA <3APA3A@security.nnov.ru>
+   (c) 2007-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/plugins/PCREPlugin/pcre_plugin.c b/src/plugins/PCREPlugin/pcre_plugin.c
index a444035..fbf65b4 100644
--- a/src/plugins/PCREPlugin/pcre_plugin.c
+++ b/src/plugins/PCREPlugin/pcre_plugin.c
@@ -1,6 +1,5 @@
 /*
-   3APA3A simpliest proxy server
-   (c) 2007-2008 by ZARAZA <3APA3A@security.nnov.ru>
+   (c) 2007-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/plugins/SSLPlugin/my_ssl.c b/src/plugins/SSLPlugin/my_ssl.c
index 86bf2fb..9ad421a 100644
--- a/src/plugins/SSLPlugin/my_ssl.c
+++ b/src/plugins/SSLPlugin/my_ssl.c
@@ -1,3 +1,9 @@
+/*
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
+
+   please read License Agreement
+
+*/
 
 #define _CRT_SECURE_NO_WARNINGS
 
diff --git a/src/plugins/SSLPlugin/ssl_plugin.c b/src/plugins/SSLPlugin/ssl_plugin.c
index 6d7d729..1365821 100644
--- a/src/plugins/SSLPlugin/ssl_plugin.c
+++ b/src/plugins/SSLPlugin/ssl_plugin.c
@@ -1,6 +1,5 @@
 /*
-   3APA3A simpliest proxy server
-   (c) 2007-2008 by ZARAZA <3APA3A@security.nnov.ru>
+   (c) 2007-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/plugins/TransparentPlugin/transparent_plugin.c b/src/plugins/TransparentPlugin/transparent_plugin.c
index 0619bac..5ac9cc0 100644
--- a/src/plugins/TransparentPlugin/transparent_plugin.c
+++ b/src/plugins/TransparentPlugin/transparent_plugin.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2017 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/plugins/WindowsAuthentication/WindowsAuthentication.c b/src/plugins/WindowsAuthentication/WindowsAuthentication.c
index 818237e..e8d26bc 100644
--- a/src/plugins/WindowsAuthentication/WindowsAuthentication.c
+++ b/src/plugins/WindowsAuthentication/WindowsAuthentication.c
@@ -1,6 +1,5 @@
 /*
-   3APA3A simpliest proxy server
-   (c) 2007-2008 by ZARAZA <3APA3A@security.nnov.ru>
+   (c) 2007-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/plugins/WindowsAuthentication/copying b/src/plugins/WindowsAuthentication/copying
deleted file mode 100644
index 177ffa7..0000000
--- a/src/plugins/WindowsAuthentication/copying
+++ /dev/null
@@ -1,31 +0,0 @@
-3proxy 0.6 Windows Authentication Plugin Public License Agreement
-
-This software provided "as is" without any guaranties or support.
-
-This software is FREEWARE. You can use it under terms of current version
-of GNU GPL (General Public License) available from 
-http://www.gnu.org/licenses/gpl.txt or under conditions below:
-
-1. You are granted non-exclusive rights to compile, modify, use and
-re-distribute this program.
-2. In case this software is redistributed in binary form, source code
-MUST be available for user for free.
-3. In case this software redistributed embedded in hardware device or
-pre-installed version of operation system and source code is not available,
-documentation MUST refer to http://www.security.nnov.ru/ as a source of
-software.
-4. In case this software is modified or is used as a part of another project
-license MUST NOT be modified.
-5. Authors of this software MAY change terms of this license for future
-versions of this product.
-
-(c) 2000-2009 by 3APA3A (3APA3A@security.nnov.ru)
-(c) 2000-2009 by SECURITY.NNOV (http://www.security.nnov.ru)
-(c) 2000-2009 by Vladimir Dubrovin (vlad@sandy.ru)
-
-
-This software uses:
-  RSA Data Security, Inc. MD4 Message-Digest Algorithm
-  RSA Data Security, Inc. MD5 Message-Digest Algorithm
-
-$Id: copying,v 1.1 2006/02/13 16:08:03 vlad Exp $
diff --git a/src/plugins/utf8tocp1251/utf8tocp1251.c b/src/plugins/utf8tocp1251/utf8tocp1251.c
index 412c927..cb8d632 100644
--- a/src/plugins/utf8tocp1251/utf8tocp1251.c
+++ b/src/plugins/utf8tocp1251/utf8tocp1251.c
@@ -1,6 +1,5 @@
 /*
-   3APA3A simpliest proxy server
-   (c) 2007-2008 by ZARAZA <3APA3A@security.nnov.ru>
+   (c) 2007-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/pop3p.c b/src/pop3p.c
index b433998..912a9c5 100644
--- a/src/pop3p.c
+++ b/src/pop3p.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/proxy.c b/src/proxy.c
index fa41e67..52220ca 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/proxy.h b/src/proxy.h
index 9ff920e..b30ebe8 100644
--- a/src/proxy.h
+++ b/src/proxy.h
@@ -1,13 +1,13 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
 */
 
-#define COPYRIGHT "(c)3APA3A, Vladimir Dubrovin & 3proxy.ru\n"\
-		 "Documentation and sources: http://3proxy.ru/\n"\
+#define COPYRIGHT "(c)3APA3A, Vladimir Dubrovin & 3proxy.org\n"\
+		 "Documentation and sources: https://3proxy.org/\n"\
 		 "Please read license agreement in \'copying\' file.\n"\
 		 "You may not use this program without accepting license agreement"
 
diff --git a/src/proxymain.c b/src/proxymain.c
index 53856db..065d088 100644
--- a/src/proxymain.c
+++ b/src/proxymain.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2017 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/smtpp.c b/src/smtpp.c
index 01519ca..e7748b2 100644
--- a/src/smtpp.c
+++ b/src/smtpp.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/sockgetchar.c b/src/sockgetchar.c
index da2105c..89e3e5b 100644
--- a/src/sockgetchar.c
+++ b/src/sockgetchar.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 */
diff --git a/src/sockmap.c b/src/sockmap.c
index 77234ea..19b603f 100644
--- a/src/sockmap.c
+++ b/src/sockmap.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2020 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/socks.c b/src/socks.c
index 9b59a30..30d2a1c 100644
--- a/src/socks.c
+++ b/src/socks.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/stringtable.c b/src/stringtable.c
index 4bfc7c2..e9330c1 100644
--- a/src/stringtable.c
+++ b/src/stringtable.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
@@ -61,9 +61,9 @@ unsigned char * strings[] = {
 	"is coded right now. What you see is a part of work that is done\n"
 	"already.\n"
 	"
    Please send all your comments to\n"
-	"3proxy@security.nnov.ru\n"
+	"3proxy@3proxy.org\n"
 	"
    Documentation:\n"
-	"http://3proxy.ru/\n"
+	"http://3proxy.org/\n"
 	"",
 /* 36 */	NULL,
 /* 37 */	NULL,
diff --git a/src/structures.h b/src/structures.h
index 61a4f31..6d929ca 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/tcppm.c b/src/tcppm.c
index a53cd65..92cc094 100644
--- a/src/tcppm.c
+++ b/src/tcppm.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/udppm.c b/src/udppm.c
index 4b252ef..f732ba2 100644
--- a/src/udppm.c
+++ b/src/udppm.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement
 
diff --git a/src/webadmin.c b/src/webadmin.c
index 936ef2a..0aefc38 100644
--- a/src/webadmin.c
+++ b/src/webadmin.c
@@ -1,6 +1,6 @@
 /*
    3APA3A simpliest proxy server
-   (c) 2002-2016 by Vladimir Dubrovin <3proxy@3proxy.ru>
+   (c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
 
    please read License Agreement