Merge pull request #21 from cloudflare/master

Twemcache starts spinning with 100% CPU because of bad UDP packages
twitter · Jan 31, 2013 · 1d0d8a5 · 1d0d8a5
2 parents 23b6c0e + 40fcc8a
commit 1d0d8a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/mc_connection.c b/src/mc_connection.c
@@ -312,6 +312,10 @@ conn_cleanup(struct conn *c)
     if (c->write_and_free != NULL) {
         mc_free(c->write_and_free);
     }
+
+    if (c->udp) {
+        conn_set_state(c, CONN_READ);
+    }
 }
 
 void

diff --git a/src/mc_core.c b/src/mc_core.c
@@ -147,7 +147,7 @@ core_read_udp(struct conn *c)
         res -= 8;
         memmove(c->rbuf, c->rbuf + 8, res);
 
-        c->rbytes += res;
+        c->rbytes = res;
         c->rcurr = c->rbuf;
 
         return READ_DATA_RECEIVED;