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

This commit is contained in:
z3APA3A 2016-01-15 03:07:59 +03:00
commit 999f9e856b

View File

@ -12,6 +12,7 @@ script for 3proxy executable.
Each line of the file is treated as a blank (space or tab) separated
command line. Additional space characters are ignored.
Think about 3proxy as "application level router" with console interface.
.br
Comments:
.br
@ -26,6 +27,7 @@ spaces or another special characters. To use quotation character inside
quotation character must be dubbed (BASIC convention). For example to use
HELLO "WORLD" as an argument you should use it as "HELLO ""WORLD"""\.
Good practice is to quote any argument you use.
.br
File inclusion:
.br
@ -39,9 +41,12 @@ Thus, include files are only useful to store long signle-line commands
(like userlist, network lists, etc).
To use dollar sign somewhere in argument it must be quoted.
Recursion is not allowed.
.br
Next commands start gateway services:
.br
.br
.B proxy
[options]
.br
@ -231,7 +236,7 @@ how many archived log files to keep
.br
.B logformat
<format>
.br
Format for log record. First symbol in format must be L (local time)
or G (absolute Grinwitch time).
It can be preceeded with -XXX+Y where XXX is list of characters to be
@ -366,7 +371,6 @@ performed over TCP.
.B nscache6
<cachesize>
.br
Cache <cachesize> records for name resolution (nscache for IPv4,
nscache6 for IPv6). Cachesize usually should be large enougth
(for example 65536).
@ -374,7 +378,7 @@ nscache6 for IPv6). Cachesize usually should be large enougth
.br
.B nsrecord
<hostname> <hostaddr>
.BR
.br
Adds static record to nscache. nscache must be enabled. If 0.0.0.0
is used as a hostaddr host will never resolve, it can be used to
blacklist something or together with
@ -383,7 +387,7 @@ command to set up UDL for dialing.
.br
.B fakeresolve
.BR
.br
All names are resolved to 127.0.0.2 address. Usefull if all requests are
redirected to parent proxy with http, socks4+, connect+ or socks5+.
@ -444,6 +448,7 @@ of the configuration file.
Type of user authorization. Currently supported:
.br
none - no authentication or authorization required.
.br
Note: is auth is none any ip based limitation, redirection, etc will not work.
This is default authentication type
.br
@ -571,10 +576,8 @@ Operation is one of:
.br
ADMIN - access to administration interface
.br
Weeksdays are week days numbers or periods (0 or 7 means Sunday, 1 is Monday, 1-5 means Monday through Friday). Timeperiodlists is a list of time
periods in HH:MM:SS-HH:MM:SS format. For example, 00:00:00-08:00:00,17:00:00-24:00:00
lists non-working hours.
Weeksdays are week days numbers or periods, 0 or 7 means Sunday, 1 is Monday, 1-5 means Monday through Friday. Timeperiodlists is a list of time
periods in HH:MM:SS-HH:MM:SS format. For example, 00:00:00-08:00:00,17:00:00-24:00:00 lists non-working hours.
.br
.B parent
@ -694,7 +697,7 @@ local HTTP proxy parses requests and allows only GET and POST requests.
.br
Changes external address for given connection to 1.2.3.4
(an equivalent to -e1.2.3.4)
.br
Optional username and password are used to authenticate on parent
proxy. Username of '*' means username must be supplied by user.
@ -702,6 +705,7 @@ proxy. Username of '*' means username must be supplied by user.
.br
.B nolog
<n>
.br
extends last allow or deny command to prevent logging, e.g.
.br
allow * * 192.168.1.1
@ -712,6 +716,7 @@ nolog
.br
.B weight
<n>
.br
extends last allow or deny command to set weight for this request
.br
allow * * 192.168.1.1
@ -851,6 +856,7 @@ and
.br
.B system
<command>
.br
execute system command