Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- protect against socket signal in ftp server

Browse Source
This commit is contained in:
Mark Vejvoda 2011-01-09 08:01:14 +00:00
parent 74824fe753
commit 34c089b9ad
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c
View File

@ -189,7 +189,12 @@ int ftpSend(socket_t s, const void *data, int len)
do
{
currLen = send(s, data, len, 0);
#ifdef __APPLE__
currLen = send(s, data, len, SO_NOSIGPIPE);
#else
currLen = send(s, data, len, MSG_NOSIGNAL);
#endif
if(currLen >= 0)
{
len -= currLen;

11
source/shared_lib/sources/feathery_ftp/ftpTargetWin32.c
View File

@ -31,6 +31,8 @@
#pragma comment(lib, "ws2_32")
#pragma comment(lib, "MSWSOCK")
#define MSG_NOSIGNAL 0
ip_t ownIp;
@ -218,8 +220,13 @@ int ftpSend(socket_t s, const void *data, int len)
int currLen = 0;
do
{
currLen = send((SOCKET)s, data, len, 0);
{
#ifdef __APPLE__
currLen = send((SOCKET)s, data, len, SO_NOSIGPIPE);
#else
currLen = send((SOCKET)s, data, len, MSG_NOSIGNAL);
#endif
if(currLen >= 0)
{
len -= currLen;