diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-01-11 23:03:43 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-01-11 23:03:43 +0000 |
| commit | 1bc9c43ec86a94bc65fe195c74622470af5cc334 (patch) | |
| tree | 3f2cb9b5290e43509ae38d39f26e74b8092acf0f /ftp/bsdftpd-ssl/files/patch-aa | |
| parent | - Update to version 0.5.2 (diff) | |
- Data transfere may be aborted now with the next message,
because the EINTR error isn't handled: "426 Data connection:
Interrupted system call".
PR: 61221
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=97955
Diffstat (limited to 'ftp/bsdftpd-ssl/files/patch-aa')
| -rw-r--r-- | ftp/bsdftpd-ssl/files/patch-aa | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/ftp/bsdftpd-ssl/files/patch-aa b/ftp/bsdftpd-ssl/files/patch-aa new file mode 100644 index 000000000000..533d6dab3b3c --- /dev/null +++ b/ftp/bsdftpd-ssl/files/patch-aa @@ -0,0 +1,40 @@ +--- ftpd/Makefile.FreeBSD.ORI Wed Oct 8 00:59:49 2003 ++++ ftpd/Makefile.FreeBSD Mon Jan 12 00:33:53 2004 +@@ -44,7 +44,7 @@ + CFLAGS+=-Wall + ## Feature flags + CFLAGS+=-DSETPROCTITLE -DLOGIN_CAP -DVIRTUAL_HOSTING +-CFLAGS+=-DUSE_SENDFILE ++#CFLAGS+=-DUSE_SENDFILE + #CFLAGS+=-DINET6 + + YFLAGS= +--- ftpd/ftpd.c.ORI Mon Nov 10 11:42:45 2003 ++++ ftpd/ftpd.c Mon Jan 12 00:36:04 2004 +@@ -2810,6 +2810,17 @@ + goto oldway; + } else + #endif /* USE_SSL */ ++/* workaround for the problem described in ++ * http://bsdftpd-ssl.sc.ru/news/bfa_20040112.txt */ ++#if __FreeBSD__ >= 5 ++# if __FreeBSD_version >= 502000 ++# define USE_SENDFILE = 1 ++# endif ++#else ++# if __FreeBSD_version > 490000 ++# define USE_SENDFILE = 1 ++# endif ++#endif /* __FreeBSD__ */ + #ifdef USE_SENDFILE + while (err != -1 && filesize > 0) { + #ifdef LINUX /* Linux port */ +@@ -2834,7 +2845,7 @@ + + if (err == -1) { + #ifndef LINUX /* BSD source */ +- if (errno == EAGAIN) { ++ if (errno == EAGAIN || errno == EINTR) { + err = 0; + continue; + } |