Changeset 44b47a085a3312bcaf73253fde40e4f9781f12a1

Timestamp:

07/14/11 16:25:01 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1310660701 -0400

git-parent:

[a29e7fc578381672499281e5e8a970082194417f]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1310660701 -0400

Message:

If the livestream request data wasn't read in one go (i.e. EAGAIN was
hit), then it would recreate the context from scratch and attempt to
reread the whole request which would hang indefinitely and leak a jcl
context. This only seemed to present itself with hangle on with
localhost. Bug fixed.

Files:

• src/noit_livestream_listener.c (modified) (3 diffs)

src/noit_livestream_listener.c

@@ -233 +233 @@
-  if(!ac->service_ctx || !jcl->feed) {
-    int len;
-
+
+
-    /* Setup logger to this channel */
+    noitL(noit_debug, "livestream initializing on fd %d\n", e->fd);
-    if(!jcl->period) {
-      u_int32_t nperiod;
@@ -245 +247 @@
-        goto socket_error;
-      }
+      noitL(noit_debug, "livestream initializing on fd %d [period %d]\n",
+            e->fd, jcl->period);
-    }
-    while(jcl->uuid_read < 36) {
@@ -257 +261 @@
-      goto socket_error;
-    }
+    noitL(noit_debug, "livestream initializing on fd %d [uuid %s]\n",
+          e->fd, jcl->uuid_str);
-
-    jcl->feed = malloc(32);