Attachment 15172 Details for Bug 28214 – file.diff

[patch] file.diff

file.diff (text/plain), 1.08 KB, created by anders on 2001-06-17 03:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: anders

Created: 2001-06-17 03:00:02 UTC

Size: 1.08 KB

patch

obsolete

>diff -Nur oftpd.old/files/patch-ftp_session.c oftpd/files/patch-ftp_session.c
>--- oftpd.old/files/patch-ftp_session.c	Thu Jan  1 01:00:00 1970
>+++ oftpd/files/patch-ftp_session.c	Sun Jun 17 03:46:42 2001
>@@ -0,0 +1,29 @@
>+--- src/ftp_session.c.orig	Sun Jun 17 03:45:08 2001
>++++ src/ftp_session.c	Sun Jun 17 03:46:26 2001
>+@@ -1165,7 +1165,7 @@
>+         /* for sendfile(), we still have to use a loop to avoid 
>+            having our watchdog time us out on large files - it does
>+            allow us to avoid an extra copy to/from user space */
>+-#ifdef HAVE_SENDFILE
>++/* #ifdef HAVE_SENDFILE
>+         offset = f->file_offset;
>+         file_size = stat_buf.st_size - offset;
>+         while (offset < stat_buf.st_size) {
>+@@ -1200,7 +1200,7 @@
>+ 
>+ 	    watchdog_defer_watched(f->watched);
>+         }
>+-#else
>++#else */
>+         for (;;) {
>+             read_ret = read(file_fd, buf, sizeof(buf));
>+ 	    if (read_ret == -1) {
>+@@ -1219,7 +1219,7 @@
>+ 
>+ 	    watchdog_defer_watched(f->watched);
>+ 	}
>+-#endif  /* HAVE_SENDFILE */
>++/* #endif */ /* HAVE_SENDFILE */
>+     }
>+ 
>+     /* disconnect */

Actions: View | Diff

Attachments on bug 28214: 15172