mirror of
https://github.com/3proxy/3proxy.git
synced 2026-07-10 10:04:07 +00:00
Fix: invalid socket in poll(): can break sockmap() on Windows
Some checks are pending
C/C++ CI Linux / ubuntu-24.04-arm (push) Waiting to run
C/C++ CI Linux / ubuntu-latest (push) Waiting to run
C/C++ CI MacOS / macos-15 (push) Waiting to run
C/C++ CI Windows / windows-2022 (push) Waiting to run
C/C++ CI cmake / macos-15 (push) Waiting to run
C/C++ CI cmake / ubuntu-24.04-arm (push) Waiting to run
C/C++ CI cmake / ubuntu-latest (push) Waiting to run
C/C++ CI cmake / windows-2022 (push) Waiting to run
Some checks are pending
C/C++ CI Linux / ubuntu-24.04-arm (push) Waiting to run
C/C++ CI Linux / ubuntu-latest (push) Waiting to run
C/C++ CI MacOS / macos-15 (push) Waiting to run
C/C++ CI Windows / windows-2022 (push) Waiting to run
C/C++ CI cmake / macos-15 (push) Waiting to run
C/C++ CI cmake / ubuntu-24.04-arm (push) Waiting to run
C/C++ CI cmake / ubuntu-latest (push) Waiting to run
C/C++ CI cmake / windows-2022 (push) Waiting to run
This commit is contained in:
parent
d77dc00fd1
commit
af9f23ece7
1 changed files with 2 additions and 0 deletions
|
|
@ -544,6 +544,7 @@ log("done read from server to buf");
|
|||
}
|
||||
// if(!CLIENTTERMREAD || !CLIENTTERMWRITE){
|
||||
if(!after){
|
||||
fds[fdsc].fd = param->clisock;
|
||||
if(fromclient && !CLIENTTERMREAD && !FROMCLIENT && ((
|
||||
#ifdef WITHSPLICE
|
||||
!usesplice &&
|
||||
|
|
@ -603,6 +604,7 @@ log("ready to write to client");
|
|||
|
||||
// if(!SERVERTERMREAD || !SERVERTERMWRITE){
|
||||
if(!after){
|
||||
fds[fdsc].fd = param->remsock;
|
||||
if(fromserver && !SERVERTERMREAD && !FROMSERVER && ((
|
||||
#ifdef WITHSPLICE
|
||||
!usesplice &&
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue