1 files changed, 5 insertions, 7 deletions

diff --git a/opentracker.c b/opentracker.c
index 6160696..ec92fe0 100644
--- a/opentracker.c
+++ b/opentracker.c
@@ -180,12 +180,11 @@ static void handle_write(const int64_t sock) {
 
   /* In a chunked transfer, wait for the next piece once everything queued has gone out */
   if (chunked)
-    http_interest_drop(sock, cookie, EVENT_OUT);
+    http_interest_set(sock, cookie, 0);
   else if (keep_alive) {
-    /* The reply is out and the client asked to keep the connection, so stop
-       waiting to write and go back to waiting for the next request */
-    http_interest_drop(sock, cookie, EVENT_OUT);
-    http_interest_add(sock, cookie, EVENT_IN);
+    /* The reply is out and the client asked to keep the connection, so go
+       back to waiting for the next request */
+    http_interest_set(sock, cookie, EVENT_IN);
     fdstate_set_expiry(sock, time_future_seconds(OT_CLIENT_TIMEOUT));
   } else
     http_close(sock);
@@ -199,8 +198,6 @@ static void handle_accept(const int64_t serversocket, struct ot_workstruct *ws)
 
   while ((sock = socket_accept(serversocket, ip, &port)) != -1) {
 
-    socket_set_blocking((int)sock, 0);
-
     if (!(cookie = (struct http_data *)calloc(1, sizeof(struct http_data)))) {
       close((int)sock);
       continue;
@@ -342,6 +339,7 @@ static void listen_bind_one(ot_listen *entry) {
   if (entry->proto == FLAG_TCP) {
     if ((entry->sock = socket_tcp_listen(entry->ip, entry->port, sharing)) == -1)
       panic("socket_tcp_listen");
+    socket_defer_accept((int)entry->sock);
   } else {
     if ((entry->sock = socket_udp_bind(entry->ip, entry->port, sharing)) == -1)
       panic("socket_udp_bind");