diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2004-03-02 23:23:55 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2004-03-02 23:23:55 +0000 |
commit | bb56456c2c858df333e8bfdcbcdbc203718a4e81 (patch) | |
tree | 54509913e5d0af01c0b72ec9c97ed3dbfbb22446 /ftp/bsdftpd-ssl/files/patch-aa | |
parent | - Update to 1.10 (diff) |
- Update to 1.0.1
PR: ports/63650
Submitted by: Nick Leuta <skynick@mail.sc.ru> (maintainer)
Notes
Notes:
svn path=/head/; revision=102777
Diffstat (limited to 'ftp/bsdftpd-ssl/files/patch-aa')
-rw-r--r-- | ftp/bsdftpd-ssl/files/patch-aa | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/ftp/bsdftpd-ssl/files/patch-aa b/ftp/bsdftpd-ssl/files/patch-aa deleted file mode 100644 index 533d6dab3b3c..000000000000 --- a/ftp/bsdftpd-ssl/files/patch-aa +++ /dev/null @@ -1,40 +0,0 @@ ---- 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; - } |