0
@@ -1,3 +1,2 @@
0
-* Set timeout from Ruby
0
 * BUG: hangs on file upload 1 time out of 2

0
@@ -56,6 +56,7 @@
0
   DATA_GET(self, backend_t, backend);
0
   
0
   backend->app = rb_ivar_get(self, rb_intern("@app"));
0
+  backend->timeout = NUM2DBL(rb_ivar_get(self, rb_intern("@timeout")));
0
   backend->address = RSTRING_PTR(address);
0
   backend->port = FIX2INT(port);
0
   

0
@@ -112,6 +112,7 @@
0
   c->timeout_watcher.data = c;
0
   ev_io_init(&c->read_watcher, connection_readable_cb, c->fd, EV_READ);
0
   ev_io_init(&c->write_watcher, connection_writable_cb, c->fd, EV_WRITE);
0
+  ev_timer_init(&c->timeout_watcher, connection_timeout_cb, backend->timeout, backend->timeout);
0
   
0
   /* start event watchers */
0
   ev_timer_start(c->loop, &c->timeout_watcher);
0
@@ -172,8 +173,6 @@
0
     
0
     buffer_init(&c->read_buffer);
0
     buffer_init(&c->write_buffer);
0
-    
0
-    ev_timer_init(&c->timeout_watcher, connection_timeout_cb, CONNECTION_TIMEOUT, CONNECTION_TIMEOUT);
0
     
0
     queue_push(&backend->connections, c);
0
   }

0
@@ -35,10 +35,6 @@
0
 /* initialize number of connections in the pool, will grow */
0
 #define CONNECTIONS_SIZE   100
0
 
0
-/* number of seconds before we give up reading/writing to a socket and close the connection
0
- * TODO make this configurable */
0
-#define CONNECTION_TIMEOUT 30.0
0
-
0
 /* when write buffer reach this size, it is sent right away, it controls the speed
0
  * at which a response is streamed. */
0
 #define STREAM_SIZE        1024
0
@@ -97,6 +93,7 @@
0
   size_t              thread_count;
0
   
0
   /* libev */
0
+  ev_tstamp           timeout;
0
   struct ev_loop     *loop;
0
   ev_io               accept_watcher;
0
   ev_idle             idle_watcher;

0
@@ -26,8 +26,9 @@
0
       attr_accessor :persistent_connection_count
0
       
0
       def initialize(host, port, options={})
0
-        @host = host
0
-        @port = port.to_i
0
+        @host    = host
0
+        @port    = port.to_i
0
+        @timeout = 30
0
       end
0
       
0
       def start