Changeset 490

Timestamp:

07/31/2005 11:02:57 AM (3 years ago)

Author:

jan

Message:

applied selective TCP_CORK from Christian von Roques (#97)

Files:

• branches/lighttpd-1.3.x/src/network.c (modified) (4 diffs)

branches/lighttpd-1.3.x/src/network.c

@@ -421 +421 @@
 
 int network_write_chunkqueue(server *srv, connection *con, chunkqueue *cq) {
-        int ret = -1, i;
+        int ret = -1;
         off_t written = 0;
-        
+#ifdef TCP_CORK 
+        int corked = 0;
+#endif
         server_socket *srv_socket = con->srv_socket;
 
@@ -439 +441 @@
 
 #ifdef TCP_CORK 
-        /* Linux: put a cork into the socket as we want to combine the write() calls */
-        i = 1;
-        setsockopt(con->fd, IPPROTO_TCP, TCP_CORK, &i, sizeof(i));
+        /* Linux: put a cork into the socket as we want to combine the write() calls
+         * but only if we really have multiple chunks
+         */
+        if (cq->first && cq->first->next) {
+                corked = 1;
+                setsockopt(con->fd, IPPROTO_TCP, TCP_CORK, &corked, sizeof(corked));
+        }
 #endif
         
@@ -477 +483 @@
                 
                 chunk *c, *pc = NULL;
+                int i;
                 
                 for (i = 0, c = cq->first; i < ret; i++, c = c->next) {
@@ -507 +514 @@
         
 #ifdef TCP_CORK
-        i = 0;
-        setsockopt(con->fd, IPPROTO_TCP, TCP_CORK, &i, sizeof(i));
+        if (corked) {
+                corked = 0;
+                setsockopt(con->fd, IPPROTO_TCP, TCP_CORK, &corked, sizeof(corked));
+        }
 #endif