0
@@ -29,6 +29,7 @@
0
               (char *) c->write_buffer.ptr + c->write_buffer.current,
0
               c->write_buffer.len - c->write_buffer.current,
0
               0);
0
+  ev_timer_again(c->loop, &c->timeout_watcher);
0
   
0
   if (sent > 0) {
0
     c->write_buffer.current += sent;
0
@@ -49,6 +50,7 @@
0
   char          buf[BUFFER_SIZE];
0
   
0
   n = recv(c->fd, buf, BUFFER_SIZE, 0);
0
+  ev_timer_again(c->loop, &c->timeout_watcher);
0
   
0
   if (n == -1) {
0
     connection_errno(c);
0
0
@@ -58,7 +60,15 @@
0
   connection_parse(c, buf, n);
0
 }
0
 
0
+static void connection_timeout_cb(EV_P_ struct ev_timer *watcher, int revents)
0
+{
0
+  connection_t *c = get_ev_data(connection, watcher, timeout);
0
+    
0
+  connection_close(c);
0
+}
0
 
0
+
0
+
0
 /* public api */
0
 
0
 void connection_start(backend_t *backend, int fd, struct sockaddr_in remote_addr)
0
@@ -114,8 +124,10 @@
0
   
0
   /* init libev stuff */
0
   watch(c, connection_readable_cb, read, EV_READ);
0
-  
0
-  /* TODO add timeout watcher */
0
+  /* timeout watcher, close connection when peer not responding */
0
+  c->timeout_watcher.data = c;
0
+  ev_timer_init(&c->timeout_watcher, connection_timeout_cb, CONNECTION_TIMEOUT, CONNECTION_TIMEOUT);
0
+  ev_timer_start(c->loop, &c->timeout_watcher);
0
 }
0
 
0
 void connection_parse(connection_t *c, char *buf, int len)
0
@@ -234,6 +246,7 @@
0
 {
0
   unwatch(c, read);
0
   unwatch(c, write);
0
+  ev_timer_stop(c->loop, &c->timeout_watcher);
0
 
0
   close(c->fd);
0
   

0
@@ -26,14 +26,15 @@
0
 #include "status.h"
0
 
0
 #ifdef __FreeBSD__
0
-#define LISTEN_BACKLOG        -1
0
+#define LISTEN_BACKLOG        -1
0
 #else
0
-#define LISTEN_BACKLOG        511
0
+#define LISTEN_BACKLOG        511
0
 #endif
0
-#define CONNECTIONS_SIZE  100
0
-#define BUFFER_SLICES     (80 + 32) /* big enough so we can fit MAX_HEADER */
0
-#define BUFFER_SIZE       1024
0
-#define MAX_HEADER        1024 * (80 + 32)
0
+#define CONNECTIONS_SIZE   100
0
+#define CONNECTION_TIMEOUT 30.0
0
+#define BUFFER_SLICES      (80 + 32) /* big enough so we can fit MAX_HEADER */
0
+#define BUFFER_SIZE        1024
0
+#define MAX_HEADER         1024 * (80 + 32)
0
 
0
 
0
 #define LF     (u_char) 10
0
@@ -67,6 +68,7 @@
0
   struct ev_loop     *loop;
0
   ev_io               read_watcher;
0
   ev_io               write_watcher;  
0
+  ev_timer            timeout_watcher;
0
 };
0
 
0
 struct backend_s {