Changeset 1933

Timestamp:

08/17/2007 10:18:18 PM (14 months ago)

Author:

jan

Message:

fixed endless loop on shrinked files with sendfile() on BSD

- merged the shrinked file handling from linux-sendfile

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/network_freebsd_sendfile.c (modified) (4 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -15 +15 @@
   * fixed invalid char in header values (#1286)
   * fixed invalid "304 Not Modified" on broken timestamps
+  * fixed endless loop on shrinked files with sendfile() on BSD (#1289)
 
 - 1.4.16 - 

branches/lighttpd-1.4.x/src/network_freebsd_sendfile.c

@@ -137 +137 @@
                         size_t toSend;
                         stat_cache_entry *sce = NULL;
-                        int ifd;
 
                         if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->file.name, &sce)) {
@@ -150 +149 @@
                                 ((1 << 30) - 1) : c->file.length - c->offset;
 
-                        if (offset > sce->st.st_size) {
-                                log_error_write(srv, __FILE__, __LINE__, "sb", "file was shrinked:", c->file.name);
-
-                                return -1;
-                        }
-
-                        if (-1 == (ifd = open(c->file.name->ptr, O_RDONLY))) {
-                                log_error_write(srv, __FILE__, __LINE__, "ss", "open failed: ", strerror(errno));
-
-                                return -1;
+                        if (-1 == c->file.fd) {
+                                if (-1 == (c->file.fd = open(c->file.name->ptr, O_RDONLY))) {
+                                        log_error_write(srv, __FILE__, __LINE__, "ss", "open failed: ", strerror(errno));
+
+                                        return -1;
+                                }
+
+#ifdef FD_CLOEXEC
+                                fcntl(c->file.fd, F_SETFD, FD_CLOEXEC);
+#endif
                         }
 
@@ -165 +164 @@
 
                         /* FreeBSD sendfile() */
-                        if (-1 == sendfile(ifd, fd, offset, toSend, NULL, &r, 0)) {
+                        if (-1 == sendfile(c->file.fd, fd, offset, toSend, NULL, &r, 0)) {
                                 switch(errno) {
                                 case EAGAIN:
@@ -178 +177 @@
                                 }
                         }
-                        close(ifd);
+
+                        if (r == 0) {
+                                int oerrno = errno;
+                                /* We got an event to write but we wrote nothing
+                                 *
+                                 * - the file shrinked -> error
+                                 * - the remote side closed inbetween -> remote-close */
+
+                                if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->file.name, &sce)) {
+                                        /* file is gone ? */
+                                        return -1;
+                                }
+
+                                if (offset >= sce->st.st_size) {
+                                        /* file shrinked, close the connection */
+                                        errno = oerrno;
+
+                                        return -1;
+                                }
+
+                                errno = oerrno;
+                                return -2;
+                        }
 
                         c->offset += r;