Commit Graph
52 Commits
Author SHA1 Message Date
Vladimir Dubrovin f271a57238 Fix build
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
C/C++ CI cmake / ubuntu-latest (wolfSSL) (push) Has been cancelled
Update version files / version (push) Has been cancelled
2026-10-10 19:37:04 +03:00
Vladimir Dubrovin 6c4663a045 Build the mail proxies and FTP only when they are asked for
pop3p, imapp and smtpp are built with MAILPROXY=true, and ftppr and the
ftp:// scheme of the HTTP proxy with FTP=true; with CMake the switches are
3PROXY_USE_MAILPROXY and 3PROXY_USE_FTP. Neither is in a default build, and
the standalone binaries follow what was built.

A configuration naming one of them is still read either way. The three mail
protocols amount to a STARTTLS negotiation now that mail is carried over
TLS, so without a proxy of their own those names are tlspr speaking the
protocol: the file holds a stand-in which sets the protocol for the
connection and returns tlspr for the caller to run, which serves the
service name and a parent chain alike and leaves conf.c and the redirect
table untouched. FTP has no such fallback, so the service is known, answers
nothing and logs the refusal.

The Linux workflow builds both, so all of it is still compiled and run.
2026-09-16 20:11:50 +03:00
Vladimir Dubrovin da66016c7f Transparent moved to main code (TransparentPlugin removed), BSD pf support added
(cherry picked from commit 88b3225bdf)
2026-08-26 16:48:08 +03:00
Vladimir Dubrovin 3526759e59 implement small http server for admin and testing 2026-08-25 17:21:33 +03:00
Vladimir Dubrovin d2fa99fbd4 Fix library detection under shells whose echo does not expand escapes
The OpenSSL, wolfSSL, PCRE2 and PAM probes built their test program with
echo "...\n...". make runs recipes through /bin/sh, which is dash on Debian
and Ubuntu, where the builtin echo expands \n. On distributions where /bin/sh
is bash - every RPM based distribution, and macOS - it does not, so the probe
compiled

    #include <openssl/ssl.h>n int main(){return 0;}

which is not valid C. Every probe therefore failed and the build silently
dropped TLS, PCRE2 and PAM support with no diagnostic.

Use printf, which expands escapes the same way everywhere.
2026-08-22 10:43:32 +03:00
Vladimir Dubrovin 5f1ed7363b Fix: race conditions / stack overflow on FreeBSD / minor bugs 2026-07-31 13:27:33 +03:00
Vladimir Dubrovin 9ab2e820b5 Added imapp, starttls support for smtpp, pop3p, tlspr 2026-07-22 16:15:50 +03:00
Vladimir Dubrovin 8de071aa87 fix wolfSSL build
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
C/C++ CI cmake / ubuntu-latest (wolfSSL) (push) Has been cancelled
2026-07-13 20:50:27 +03:00
Vladimir Dubrovin f173f8860d wolfSSL support added 2026-07-13 20:24:51 +03:00
Vladimir Dubrovin c893e866bd Use Solar Designer's md4/md5 on non-Windows
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2026-07-10 14:01:29 +03:00
Vladimir Dubrovin 1772295a36 Fix installation
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
2026-05-29 21:11:32 +03:00
Vladimir Dubrovin f0a672b16a Unify installation environment 2026-05-29 20:29:25 +03:00
Vladimir Dubrovin d66311a045 Support STATIC and LIBSTATIC in Makefile's, fix dockerfiles 2026-05-27 17:04:34 +03:00
Vladimir Dubrovin 5fdd4a4d6f NOODBC inverted to WITH_ODBC 2026-05-08 20:30:14 +03:00
Vladimir Dubrovin ff7f4b8ea6 Dynamic link with ssl/pcre by default, static as option in makefiles
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Waiting to run
2026-05-07 11:55:42 +03:00
Vladimir Dubrovin ef9386e29d More accurate flags in linking 2026-05-05 18:13:32 +03:00
Vladimir Dubrovin 4068a6955f Fix UDP parent for SOCKSv5
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Waiting to run
2026-05-02 00:00:45 +03:00
Vladimir Dubrovin 8107f03062 Move PCRE/SSL to main code 2026-05-01 15:11:08 +03:00
Vladimir Dubrovin 57d687fcb8 add 3proxy_crypt man 2026-04-28 14:41:14 +03:00
Vladimir Dubrovin 05096c222a Return standalone udppm; do not build standalone modules by default in cmake
Allow to set prefix in cmake, 3proxy_ by default
2026-04-28 12:21:11 +03:00
Vladimir Dubrovin 68ef9dcc59 Fix Windows compilation 2026-04-21 16:10:17 +03:00
Vladimir Dubrovin bba9871ed8 Use 3proxy_crypt instead of mycrypt 2026-04-18 15:19:06 +03:00
Vladimir Dubrovin c206349ee2 Support unix sockets for internal and -i
Example configuration:

log
auto -iunix:/path/to/3proxy.sock

test with

curl --unix-socket /path/to/3proxy.sock https://3proxy.ru
2026-04-12 00:30:35 +03:00
Vladimir Dubrovin c853ea5b9e More accurate libraries detection in Makefiles 2026-04-11 12:21:07 +03:00
Vladimir Dubrovin 44c86236cd add rc.d script 2026-04-08 19:21:30 +03:00
Vladimir Dubrovin 3ee78a3195 Use non-chroot configuration in cmake; remove older script 2026-04-08 19:21:30 +03:00
Vladimir Dubrovin 2e534c7794 Add cmake environment 2026-04-08 19:21:30 +03:00
Vladimir Dubrovin 237fa15e36 Fix external libraries 2026-04-08 19:21:30 +03:00
Vladimir Dubrovin 6f1bb65841 Update workflows and makefiles (11 commits squashed) 2026-04-08 19:21:30 +03:00
Vladimir Dubrovin 238b314c90 switch PCREPlugin to PCRE2 2026-04-08 19:21:29 +03:00
Vladimir Dubrovin 0252f4978c Update workflows and makefiles (1 commits squashed) 2026-04-08 19:21:29 +03:00
Vladimir Dubrovin 23b9e698e0 Update workflows and makefiles (15 commits squashed) 2026-04-08 19:21:28 +03:00
Vladimir Dubrovin 1e8130cae8 Update workflows and makefiles (5 commits squashed) 2026-04-08 19:21:27 +03:00
Vladimir Dubrovin 35db214b78 Use external PCRE library 2026-04-08 19:21:27 +03:00
Vladimir Dubrovin 1ba0008055 Update workflows and makefiles (6 commits squashed) 2026-04-08 19:21:27 +03:00
Vladimir Dubrovin 71c58e0c77 Update workflows and makefiles (2 commits squashed) 2026-04-08 19:21:27 +03:00
Vladimir Dubrovin 662603f9d8 Update workflows and makefiles (1 commits squashed) 2026-04-08 19:21:27 +03:00
Vladimir Dubrovin 8b57982a09 Fix FreeBSD install 2023-06-10 12:22:59 +03:00
Vladimir Dubrovin cebb45c095 Fix FreeBSD install secrion 2023-06-01 11:42:16 +03:00
Vladimir Dubrovin 34c4162cea Update Makefile.FreeBSD 2021-10-29 19:25:58 +03:00
Vladimir Dubrovin 9fae0082a3 Change clean command for BSD 2021-01-22 18:17:09 +03:00
z3APA3A 8ec14c131d Do not fail on clean 2020-11-29 14:00:19 +03:00
z3APA3A daf4a56665 Remove .o and binaries after clean 2020-11-20 13:30:38 +03:00
z3APA3A 35153001ed Use -fPIC instead of -fpic 2020-08-06 16:19:55 +03:00
z3APA3A d8b5900be6 Update Makefile.BSD 2018-05-05 20:07:26 +03:00
z3APA3A 8d36bb6453 Correct install scripts to take binaries from bin/ 2018-04-23 02:24:24 +03:00
z3APA3A db485dd4c4 Build binaries in bin folder 2018-04-21 22:39:55 +03:00
z3APA3A 68e05d54d7 -fno-strict-aliasing added to gcc options 2018-04-16 19:35:11 +03:00
z3APA3A acb248c035 Remove external CFLAGS from Makefile.FreeBSD 2017-11-06 18:34:24 +03:00
z3APA3A 7ba3e25813 correct makefile for FreeBSD 2017-10-30 17:29:03 +03:00