Changeset 1807

Timestamp:

08/14/08 11:38:44 (3 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/thread.c (modified) (9 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-08-14  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/thread.c (cherokee_thread_step_MULTI_THREAD): Fixes a
+        problem with the Keep-Alive timeout.
-
-        * cherokee/connection.c: Allows 3xx replies to keep the connection

cherokee/trunk/cherokee/thread.c

@@ -1496 +1496 @@
-        cherokee_bogotime_try_update();
-
-        /* Reset the server socket.
-         * // cherokee_fdpoll_reset (thd->fdpoll, S_SOCKET_FD(srv->socket));
-         */
-#if 0
-        if (unlikely (cherokee_fdpoll_is_full (thd->fdpoll))) {
@@ -1516 +1513 @@
-        if (re <= 0)
-                goto out;
+
+        update_bogo_now (thd);
-
-        /* If the thread is full of connections, it should not
@@ -1567 +1566 @@
-                return ret_error;
-        }
-
-
+
-        cherokee_fdpoll_watch (thd->fdpoll, fdwatch_msecs);
-        
-        /* This thread might be blocked for long long time, so it's
-         * really important to update the local bogo now values before
-         * accepting new connections.  Otherwhise, it will use an old
-         * value for the new connections timeout which might be dropped
-         * in the next step.
-         */
-        update_bogo_now (thd);
-
@@ -1626 +1617 @@
-
-        cherokee_fdpoll_watch (thd->fdpoll, fdwatch_msecs);
+        update_bogo_now (thd);
-
-        /* It should either accept o discard a connection
@@ -1691 +1683 @@
-         */
-        cherokee_fdpoll_watch (thd->fdpoll, fdwatch_msecs);
+        update_bogo_now (thd);
-                
-        /* accept o discard a connections
@@ -1778 +1771 @@
-        }
-
-        /* cherokee_fdpoll_reset (thd->fdpoll, socket1); */
-         
-
-        /* Try to lock the optional groups
-         */
@@ -1792 +1782 @@
-                        return ret_error;
-                }
-                /* cherokee_fdpoll_reset (thd->fdpoll, socket2);
-                 */
-        }
-#endif
@@ -1800 +1788 @@
-         */
-        cherokee_fdpoll_watch (thd->fdpoll, fdwatch_msecs);
-
-        /* Update the thread time values before accept new connections.
-         * This ensures an updated timeout value for it.
-         */
-        update_bogo_now (thd);
-                
@@ -1908 +1892 @@
-        
-out:
+        update_bogo_now (thd);
+
-        /* Adquire the ownership of the thread
-         */