diff options
author | Kurt Jaeger <pi@FreeBSD.org> | 2016-09-06 18:03:38 +0000 |
---|---|---|
committer | Kurt Jaeger <pi@FreeBSD.org> | 2016-09-06 18:03:38 +0000 |
commit | 4d971b2400ff9250e0def4d790345586ee2d7fb2 (patch) | |
tree | e2eeb2650dbbf55a78be7a0cafbd4241e0c2fb08 /net/3proxy/files | |
parent | 15004661f2c016531033f2625c935a9d1a30e53c (diff) | |
download | ports-4d971b2400ff9250e0def4d790345586ee2d7fb2.tar.gz ports-4d971b2400ff9250e0def4d790345586ee2d7fb2.zip |
net/3proxy: 0.8.6 -> 0.8.7
- remove patches, now included upstream
PR: 212403
Submitted by: Pavel Timofeev <timp87@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=421452
Diffstat (limited to 'net/3proxy/files')
-rw-r--r-- | net/3proxy/files/patch-src_common.c | 12 | ||||
-rw-r--r-- | net/3proxy/files/patch-src_ftp.c | 40 |
2 files changed, 0 insertions, 52 deletions
diff --git a/net/3proxy/files/patch-src_common.c b/net/3proxy/files/patch-src_common.c deleted file mode 100644 index 1cfaa16d09f8..000000000000 --- a/net/3proxy/files/patch-src_common.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/common.c.orig 2016-08-24 03:41:59 UTC -+++ src/common.c -@@ -692,8 +692,8 @@ int doconnect(struct clientparam * param - #else - fcntl(param->remsock,F_SETFL,O_NONBLOCK); - #endif -- size = sizeof(param->sinsl); - } -+ size = sizeof(param->sinsl); - if(so._getsockname(param->remsock, (struct sockaddr *)¶m->sinsl, &size)==-1) {return (15);} - } - return 0; diff --git a/net/3proxy/files/patch-src_ftp.c b/net/3proxy/files/patch-src_ftp.c deleted file mode 100644 index 86c1a2d0bcc5..000000000000 --- a/net/3proxy/files/patch-src_ftp.c +++ /dev/null @@ -1,40 +0,0 @@ ---- src/ftp.c.orig 2016-08-24 03:43:37 UTC -+++ src/ftp.c -@@ -174,6 +174,7 @@ SOCKET ftpdata(struct clientparam *param - SOCKET s = INVALID_SOCKET, rem; - unsigned long b1, b2, b3, b4; - unsigned short b5, b6; -+ SASIZETYPE sasize; - - if(socksend(param->remsock, (unsigned char *)"PASV\r\n", 6, conf.timeouts[STRING_S]) != 6){ - return INVALID_SOCKET; -@@ -187,15 +188,27 @@ SOCKET ftpdata(struct clientparam *param - buf[i-2] = 0; - if(!(sb = strchr(buf+4, '(')) || !(se= strchr(sb, ')'))) return INVALID_SOCKET; - if(sscanf(sb+1, "%lu,%lu,%lu,%lu,%hu,%hu", &b1, &b2, &b3, &b4, &b5, &b6)!=6) return INVALID_SOCKET; -+ sasize = sizeof(param->sinsl); -+ if(so._getsockname(param->remsock, (struct sockaddr *)¶m->sinsl, &sasize)){return INVALID_SOCKET;} -+ sasize = sizeof(param->sinsr); -+ if(so._getpeername(param->remsock, (struct sockaddr *)¶m->sinsr, &sasize)){return INVALID_SOCKET;} - rem = param->remsock; - param->remsock = INVALID_SOCKET; - param->req = param->sinsr; - *SAPORT(¶m->req) = *SAPORT(¶m->sinsr) = htons((unsigned short)((b5<<8)^b6)); -+ *SAPORT(¶m->sinsl) = 0; - i = param->operation; - param->operation = FTP_DATA; - if((param->res = (*param->srv->authfunc)(param))) { -- param->remsock = rem; -- return INVALID_SOCKET; -+ if(param->remsock != INVALID_SOCKET) { -+ so._closesocket(param->remsock); -+ param->remsock = INVALID_SOCKET; -+ } -+ memset(¶m->sinsl, 0, sizeof(param->sinsl)); -+ if((param->res = (*param->srv->authfunc)(param))) { -+ param->remsock = rem; -+ return INVALID_SOCKET; -+ } - } - param->operation = i; - s = param->remsock; |