Commit Graph
100 Commits
Author SHA1 Message Date
z3APA3A 70ed1233fb Remove outdated LastFRipper plugin 2019-08-13 12:35:47 +03:00
z3APA3A 5471e0faf4 attempt to support IPv6 in netfilter transparent redirection 2019-08-12 14:11:08 +03:00
z3APA3A bf4ef2284b Fix: out-of-bounds write and few more bugs in 'admin' configuration upload 2019-08-01 16:46:22 +03:00
z3APA3A 19203381db documentation update 2019-08-01 16:44:30 +03:00
z3APA3A 4e2d4d56ac Do not add admin user by default 2019-08-01 16:43:56 +03:00
z3APA3A a905d00008 documentation update 2019-06-26 16:52:55 +03:00
z3APA3A 38a1ab80bc minor changes 2019-06-20 11:19:58 +03:00
z3APA3A 43b4c893ad Minor documentation updates 2019-06-20 11:18:13 +03:00
z3APA3A 96c28c6cba man update 2019-03-25 18:01:14 +03:00
z3APA3A 189b227853 typo in Makefile.Linux corrected 2019-03-05 15:03:24 +03:00
z3APA3A d89134be33 minor doc update 2019-03-05 15:02:04 +03:00
z3APA3A 3a1f8c2328 typo corrected 2019-02-22 17:16:36 +03:00
z3APA3A 158bacc087 Highload documentation update 2019-02-22 17:05:22 +03:00
z3APA3A b88d07a1a7 Minor make install changes 2019-02-21 17:44:11 +03:00
z3APA3A e07054e8d0 minor man update 2019-02-21 17:41:54 +03:00
z3APA3A 536c8327ff Minor man updates 2019-02-14 18:35:12 +03:00
z3APA3A 0565cf050b Linux installation: do not allow proxy account to write to chrooted config dir 2019-02-08 12:34:44 +03:00
z3APA3A ac429c8d52 minor README correction 2019-01-28 18:05:48 +03:00
z3APA3A 09507a2fe9 prevent warnings in proxymain 2019-01-25 23:40:35 +03:00
z3APA3A 5ee553e9a9 Correct: do not log 98/99 as an error 2019-01-20 17:52:00 +03:00
z3APA3A eed6e2962e Do not log events 98 and 99 as errors 2019-01-20 17:33:35 +03:00
z3APA3A 76b040bfb8 minor man update 2019-01-17 17:31:15 +03:00
z3APA3A 941baaa311 minor man update 2019-01-17 17:24:42 +03:00
z3APA3A 92fbb0d2f5 More minor documentation updates 2019-01-17 12:26:38 +03:00
z3APA3A 1c7ce8744c Minor doc update 2019-01-17 12:08:25 +03:00
z3APA3A 02d52e89e9 Fix: config change may stop log rotation 2019-01-15 11:51:10 +03:00
z3APA3A d7373be071 Revert "Fixed: logrotation may stop after config change"
This reverts commit ede4aee619.
2019-01-14 20:14:08 +03:00
z3APA3A ede4aee619 Fixed: logrotation may stop after config change 2019-01-14 18:02:16 +03:00
z3APA3A 8af9ea8de8 back to non-blockin splice on sending 2019-01-11 23:26:52 +03:00
z3APA3A 603ab8187f make spliced sockmap more reliable 2019-01-11 23:10:39 +03:00
z3APA3A 953959efab print file descriptors 2019-01-11 19:38:34 +03:00
z3APA3A 480f999d21 Add _GNU_SOURCE to compile options for Linux 2019-01-11 19:17:44 +03:00
z3APA3A 03efdc451b Add POLLRDHUP support to spliced sockmap 2019-01-11 19:12:03 +03:00
z3APA3A 54e9f9cedd Highload docs correction 2019-01-11 19:11:31 +03:00
z3APA3A 930d9823ea Use futex instead of pthread_mutex on Linux 2018-12-28 18:49:45 +03:00
z3APA3A 6fe36b01d1 Fixed: admin always starts with -s under Linux 2018-12-28 12:45:52 +03:00
z3APA3A dec10d4edd Add rundir creation to linux start script 2018-12-28 12:45:15 +03:00
z3APA3A 37cebe08af Disable strict aliasing and add stripping for MIPS cross compile example makefile 2018-12-07 14:26:11 +03:00
z3APA3A 3f2e621902 Correct socket polling on mapping 2018-12-06 00:32:37 +03:00
z3APA3A b7e3a85e88 Use non-blocking splice only on write to socket
to prevent race condition data is not copied to the pipe yet
2018-12-05 23:41:37 +03:00
z3APA3A 79ea433caf Can go to 100% CPU if one side have closed connection 2018-12-05 21:44:59 +03:00
z3APA3A a0591c9786 Fix: $ is ignored in the begginning of quoted line 2018-12-05 14:21:03 +03:00
z3APA3A cc503ba925 Add IPv6 hostname question to FAQ 2018-07-04 00:56:33 +03:00
z3APA3A 68823c2921 Fix sockets option parsing 2018-05-25 18:19:19 +03:00
z3APA3A 46be58ab1d Add filename to XML data 2018-05-22 19:15:31 +03:00
z3APA3A 3d9ac1e1fb Flush splice pipe on socket close 2018-05-12 01:19:11 +03:00
z3APA3A 68fed46ea0 fix 'radius' is not applied correctly on configuration reload 2018-05-11 16:23:05 +03:00
z3APA3A 92b3dd8638 Use overloadable poll 2018-05-05 20:07:59 +03:00
z3APA3A d8b5900be6 Update Makefile.BSD 2018-05-05 20:07:26 +03:00
z3APA3A 20fa72bd42 Add connback timeouts / improve logging 2018-05-05 19:59:37 +03:00
z3APA3A eb09ae7c58 Support socket options for connback sockets and connection timeouts 2018-05-05 17:16:51 +03:00
z3APA3A b8127257f9 Remove pstdin.h 2018-05-01 18:30:04 +03:00
z3APA3A a5f7222a19 minor README correction 2018-04-28 18:27:45 +03:00
z3APA3A b56c294c01 Update highload.html with splice() requirements 2018-04-28 01:56:13 +03:00
z3APA3A b583e423c8 Install plugins to /usr/local/3proxy/libexec 2018-04-27 22:18:26 +03:00
z3APA3A 951304e18e Send Connection instead of Proxy-Connection to parent proxy 2018-04-27 22:17:37 +03:00
z3APA3A 0376e54196 simlify sockgetline 2018-04-27 19:23:20 +03:00
z3APA3A 572a5b3c34 Fixed: socks fails on 1-character username or password 2018-04-27 15:09:18 +03:00
z3APA3A 9bd81a18b9 Use native OpenSSL 1.0 static build for Windows 2018-04-27 01:54:28 +03:00
z3APA3A f35f0a0608 Print counters traffic in megabytes in admin 2018-04-27 01:53:10 +03:00
z3APA3A 12b5ad143f correct trafic accounting in spliced map 2018-04-27 01:52:08 +03:00
z3APA3A 73438cc378 use useradd in make install 2018-04-25 17:30:10 +03:00
z3APA3A f860ea9e54 Install chrooted configuration with make install on linux 2018-04-25 17:14:03 +03:00
z3APA3A 836fffddbe Include openssl/applink.c in windows plugin DLL 2018-04-25 14:38:32 +03:00
z3APA3A 4a9b924064 Readme update 2018-04-25 02:53:40 +03:00
z3APA3A 4fce1f41b5 update readme 2018-04-25 02:52:31 +03:00
z3APA3A 46630a9b1b move installation to beginning 2018-04-25 02:51:18 +03:00
z3APA3A 52ec3738d8 README update 2018-04-25 02:47:25 +03:00
z3APA3A 775530e28e Correct make install and installation scripts for Linux 2018-04-25 02:40:11 +03:00
z3APA3A 1af6e65fba Fix getting group id by groupname 2018-04-24 19:21:35 +03:00
z3APA3A acc64b03fd Fix recently broken admin -s 2018-04-23 13:49:39 +03:00
z3APA3A 0f9a9d6e37 Fix redirection to http in lite version 2018-04-23 02:34:36 +03:00
z3APA3A 8d36bb6453 Correct install scripts to take binaries from bin/ 2018-04-23 02:24:24 +03:00
z3APA3A 531e0707cf Simplify splicemap 2018-04-23 02:00:19 +03:00
z3APA3A b3abf80a50 slicedmap - replace usleep with poll, remove SPLICE_F_MOVE
use poll instead of usleep (to get rid of potential blocking in future)
remove SPLICE_F_MOVE
2018-04-22 23:23:22 +03:00
z3APA3A fd588949c9 remove unneeded check 2018-04-22 22:44:06 +03:00
z3APA3A 0b0de0d2ee cleaunup signed/unsigned mismatch 2018-04-22 21:57:17 +03:00
z3APA3A d971601316 Rmove more icqpr related things 2018-04-22 21:46:18 +03:00
z3APA3A 24127196ce Remove ICQPR because OSCAR is outdated 2018-04-22 21:46:00 +03:00
z3APA3A 0425cbbdb5 corre usesplice setting 2018-04-22 20:30:16 +03:00
z3APA3A d2705df891 Use splice by default if no filteers set
-s0 to disable splice
2018-04-22 20:03:04 +03:00
z3APA3A a4bc89dc8f Fixed recently introduced logging bug
Logging could stop after configuration reload, introduced with
50277692f4
2018-04-22 01:12:54 +03:00
z3APA3A a42bb38d76 Use WSAPoll on Windows (except lite version) 2018-04-21 23:57:42 +03:00
z3APA3A db485dd4c4 Build binaries in bin folder 2018-04-21 22:39:55 +03:00
z3APA3A 93e410cd7a Merge remote-tracking branch 'refs/remotes/origin/devel-epoll' into devel 2018-04-21 22:36:57 +03:00
z3APA3A 78e180a054 fixed: race condition on service stop / restart
Do not close -l file descriptor while there are alive childrent
2018-04-21 17:25:01 +03:00
z3APA3A de21bd0f6a potential memory leak fixed + TCP_CORK support
potential memleak fixed in very unlikely configuration
TCP_CORK used to prevent sending request apart of headers
2018-04-21 17:05:36 +03:00
z3APA3A 39be30ba5d Simplify socket options printing
+ add supported options to 3proxy help message
2018-04-21 17:02:20 +03:00
z3APA3A e2906f1219 pass version thorugh building environment 2018-04-21 03:26:49 +03:00
z3APA3A b76b3b49fa rename static buffer 2018-04-21 01:45:09 +03:00
z3APA3A 83441eebc7 Move log buffer to stack
Move log bufer to stack and remove mutex
2018-04-21 01:37:31 +03:00
z3APA3A e469e9e369 Increase default stacksize 2018-04-21 01:29:15 +03:00
z3APA3A d1b527b523 Minor logging changes 2018-04-21 01:24:18 +03:00
z3APA3A 098b6194df Update copyright 2018-04-21 00:30:16 +03:00
z3APA3A 50277692f4 Replace fclose+fopen with freopen where possible 2018-04-21 00:30:02 +03:00
z3APA3A 819d61f5b6 3proxy.rc - add builddate to version 2018-04-20 22:44:29 +03:00
z3APA3A 63fdeb4bff MSVC ARM Makefile added 2018-04-20 21:56:04 +03:00
z3APA3A 6c3a5db52f Get rid of pstdint.h 2018-04-20 19:32:49 +03:00
z3APA3A 5149996b20 Added support for username/groupname
Added support for username/groupname to seuid, setgid, chroot.
2018-04-17 18:46:01 +03:00
z3APA3A 68e05d54d7 -fno-strict-aliasing added to gcc options 2018-04-16 19:35:11 +03:00