0
@@ -149,21 +149,21 @@ has_reserved_job(conn c)
0
 int
0
 conn_set_evq(conn c, const int events, evh handler)
0
 {
0
-    int r, margin = 0, should_timeout=0;
0
+    int r, margin = 0, should_timeout = 0;
0
     struct timeval tv = {INT_MAX, 0};
0
 
0
     event_set(&c->evq, c->fd, events, handler, c);
0
 
0
     if (conn_waiting(c)) margin = 1;
0
-    if (has_reserved_job(c)) {
0
+    if (c->pending_timeout >= 0) {
0
+        tv.tv_sec = c->pending_timeout;
0
+        should_timeout=1;
0
+    }
0
+    if (should_timeout == 0 && has_reserved_job(c)) {
0
         time_t t = soonest_job(c)->deadline - time(NULL) - margin;
0
         tv.tv_sec = t > 0 ? t : 0;
0
         should_timeout = 1;
0
     }
0
-    if (c->pending_timeout >= 0) {
0
-        tv.tv_sec = min(tv.tv_sec, c->pending_timeout);
0
-        should_timeout = 1;
0
-    }
0
 
0
     r = event_add(&c->evq, should_timeout ? &tv : NULL);
0
     if (r == -1) return twarn("event_add() err %d", errno), -1;