bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-05-18 10:22:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
811 Commits 5 Branches 30 Tags 2.6 MiB
4b67e82f40
Commit Graph

811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jendis
4b67e82f40
Merge 983df6f7ae into dc4e8d3427 2025-05-12 15:36:28 +02:00
Vladimir Dubrovin
dc4e8d3427 Fixed service name detection for auto / tlspr
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Details
2025-05-06 18:59:04 +03:00
Vladimir Dubrovin
57841074b9 Avoid sleep on service thread sync
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Details
2025-04-16 21:29:48 +03:00
Vladimir Dubrovin
7320094c11 SOCKSTRACE fixed
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Details
2025-04-15 19:51:01 +03:00
Vladimir Dubrovin
43d48adeb9 ssl_server_verify, ssl_server_ca_dir, ssl_server_ca_store added, ssl_server / ssl_client aliases added to ssl_serv / ssl_cli 2025-04-15 19:18:14 +03:00
Vladimir Dubrovin
6355f9659b ssl_noserv fixed, ssl_cli/ssl_nocli/ssl_client_cert/ssl_client_key added
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Details
2025-04-14 21:40:59 +03:00
Vladimir Dubrovin
7aad0205e1 Remove legacy NTLMv1 code
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Details
2025-03-17 19:44:48 +03:00
Vladimir Dubrovin
89b45b1b2a Support HAProxy proxy v1 protocol
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
Details
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Details 
Added:
-H option - expect HAProxy proxy v1 header, e.g. `proxy -H`

parent ha type - send HAProxy proxy v1 header (must be last in redirection), e.g.

allow *
parent 1000 ha
parent 1000 proxy 1.2.3.4 3128
socks
 2025-03-15 15:54:29 +03:00
Vladimir Dubrovin
27c9e62faa Merge branch 'master' of https://github.com/3proxy/3proxy
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Details
2025-03-15 13:03:25 +03:00
Vladimir Dubrovin
7888502cd5 Support tlspr in auto 2025-03-15 13:02:46 +03:00
z3apa3a
9429421314 Fix Makefile.llvm 2025-03-15 11:52:33 +03:00
z3apa3a
00b3e02e05 Add 3proxy.rc to Makefile.llvm 2025-03-15 11:50:51 +03:00
z3apa3a
08177f2161 Fix Makefile.win 2025-03-15 11:21:08 +03:00
z3apa3a
188b0a2841 Add resources compilation to Makefile.win 2025-03-15 11:17:59 +03:00
Vladimir Dubrovin
a37e6e5a81 Fix Makefile.win
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Details
2025-03-14 22:25:26 +03:00
Vladimir Dubrovin
8fc31a7336 return lost tabs into Makefiles 2025-03-14 22:23:15 +03:00
Vladimir Dubrovin
4eb0ca60b7
Update Makefile.win 2025-03-14 21:02:08 +03:00
Vladimir Dubrovin
584fdfd51f
Update Makefile.win 2025-03-14 21:00:22 +03:00
Vladimir Dubrovin
5a6e9c92e3
Update Makefile.win 2025-03-14 20:59:28 +03:00
Vladimir Dubrovin
eaf66dc8d1 Update git workflow
Some checks are pending
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Waiting to run
Details
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Waiting to run
Details
2025-03-14 20:44:43 +03:00
Vladimir Dubrovin
e6f5f7b5e0 make compatible with openssl 1.x 2025-03-14 20:14:57 +03:00
Vladimir Dubrovin
d48f24ac84 rsa.h not required 2025-03-14 19:56:58 +03:00
Vladimir Dubrovin
4de45ff3a8
Use PCRE_STATIC pcre_plugin.c 2025-03-14 18:03:26 +03:00
Vladimir Dubrovin
74081c8146
use PCRE_STATIC 2025-03-14 17:55:09 +03:00
Vladimir Dubrovin
c71370ec03
Update c-cpp.yml 
Do not try to install on mac
 2025-03-14 17:04:42 +03:00
Vladimir Dubrovin
b1b64972c5
Update c-cpp.yml 
add more targets
 2025-03-14 17:02:05 +03:00
Vladimir Dubrovin
db7ef4ba2f
Update c-cpp.yml 2025-03-14 16:52:11 +03:00
Vladimir Dubrovin
51fc2f6dcb
Update c-cpp.yml 2025-03-14 16:38:47 +03:00
Vladimir Dubrovin
16bd55a074
Update c-cpp.yml 2025-03-14 16:28:40 +03:00
Vladimir Dubrovin
0ca9030520
Update c-cpp.yml 2025-03-14 16:27:16 +03:00
Vladimir Dubrovin
87255a8201
Create c-cpp.yml 2025-03-14 16:22:13 +03:00
Vladimir Dubrovin
d80889474b
Update README 2025-03-10 14:07:43 +03:00
Vladimir Dubrovin
8133480b11
Update README 2025-03-10 14:06:29 +03:00
z3apa3a
f23fc4fc44 mention https:// proxy in README 2025-03-10 00:51:43 +03:00
z3apa3a
3668634781 Update readme for 0.9.5 2025-03-10 00:46:46 +03:00
Vladimir Dubrovin
46a230ebd3 Merge branch 'master' of https://github.com/3proxy/3proxy 2025-03-10 00:37:18 +03:00
z3apa3a
e8e1bdfbf1 switch windows / arm to DLL version of OpenSSL 2025-03-10 00:36:05 +03:00
Vladimir Dubrovin
a5f1f08b60 Use non-static openssl libs for windows arm64 2025-03-09 20:55:23 +03:00
z3apa3a
926ef71ba0 Fix Makefile.Linux 2025-03-09 19:51:17 +03:00
z3apa3a
bc92819572 Fix tlspr for compatibility with older compileres 2025-03-09 19:16:35 +03:00
z3apa3a
a76dd93e86 Add tlspr to install section 2025-03-09 18:38:04 +03:00
z3apa3a
2900b80d88 Prepare for 0.9.5 release 2025-03-09 17:29:17 +03:00
z3apa3a
d7b0061626 Fix ssl_plugin for windows building 2025-03-09 17:26:50 +03:00
z3apa3a
74134db09e Fix ssl_plugin for Windows 2025-03-09 17:22:18 +03:00
Vladimir Dubrovin
878025598b tlspr (SNI proxy) documented 2025-03-09 15:03:06 +03:00
Jan Smutny
983df6f7ae Extend SOCKS for AnyIP utilization 
Introduce '-k' parameter that overwrites the -e parameter (if given) and
uses the IP for the external connection that corresponds to the current client
connection. The benefit arises when the parameter '-i0.0.0.0' or '-i::' in case
of IPv6 is set. This allows the entire range configured as local on the system
to receive connections and establish connections to the target server using the
IP address to which the client connected.
Note: This feature is not applicable for Windows.
 2025-02-06 13:23:03 +01:00
Vladimir Dubrovin
6387bed4f2 Replace strcpy with memmove for overlapping regions 2024-12-20 14:38:58 +03:00
Vladimir Dubrovin
cb6a4166b7 Use -fPIC instead of -fPIE 2024-09-11 18:34:40 +03:00
Vladimir Dubrovin
cf6946cc8b Fix: IPv6 address may be invalid on some plafrorms for SOCKSv5 UDP ASSOCIATE 2024-07-18 12:50:59 +03:00
Vladimir Dubrovin
ab8db00b1f Fix type for ssl_poll 2024-06-04 19:26:34 +03:00