mirror of
https://github.com/3proxy/3proxy.git
synced 2026-08-04 14:46:18 +00:00
Fix deadlock in ftppr
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
74d5b67ef4
commit
ab11e6c4a3
1 changed files with 5 additions and 0 deletions
|
|
@ -215,6 +215,11 @@ void * ftpprchild(struct clientparam* param) {
|
|||
sasize = sizeof(param->sincr);
|
||||
ss = param->srv->so._accept(param->sostate, clidatasock, (struct sockaddr *)¶m->sincr, &sasize);
|
||||
if (ss == INVALID_SOCKET) { RETURN (858);}
|
||||
#ifdef _WIN32
|
||||
{ unsigned long ul = 1; ioctlsocket(ss, FIONBIO, &ul); }
|
||||
#else
|
||||
fcntl(ss, F_SETFL, O_NONBLOCK | fcntl(ss, F_GETFL));
|
||||
#endif
|
||||
param->srv->so._shutdown(param->sostate, clidatasock, SHUT_RDWR);
|
||||
param->srv->so._closesocket(param->sostate, clidatasock);
|
||||
clidatasock = ss;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue