Changeset 1d24f9eb2f57e2ec2176345ab54522661ae88465

Timestamp:

10/04/11 03:27:09 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[a24b16602b2109f5f6aa6e2349c56510b0c4d427]

git-author:

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

Message:

If the SSL connect "completed" (good or bad) without blocking, we
would lua_resume while already in lua. That resume should only
happen when we're called from the scheduler. So, from the original
instigator, we'll just do the SSL connect manually and handle the
"immediate" connection correctly.

Files:

• src/modules/lua_noit.c (modified) (4 diffs)

src/modules/lua_noit.c

@@ -506 +506 @@
-  struct nl_slcl *cl = vcl;
-  int rv;
-
+
-  rv = eventer_SSL_connect(e, &mask);
-  if(rv <= 0 && errno == EAGAIN) return mask | EVENTER_EXCEPTION;
@@ -513 +513 @@
-  assert(ci);
-  noit_lua_check_deregister_event(ci, e, 0);
-
+
-  *(cl->eptr) = eventer_alloc();
-  memcpy(*cl->eptr, e, sizeof(*e));
@@ -530 +530 @@
-  eventer_t e, *eptr;
-  struct timeval now;
+  int tmpmask, rv;
-
-  ci = get_ci(L);
@@ -551 +552 @@
-  eventer_ssl_ctx_set_verify(sslctx, eventer_ssl_verify_cert, NULL);
-  EVENTER_ATTACH_SSL(e, sslctx);
-
-
-
-
+
+
+
+
+
+
+
-    /* Need completion */
+    e->mask = tmpmask | EVENTER_EXCEPTION;
+    e->callback = noit_lua_ssl_upgrade;
-    eventer_add(e);
-    return noit_lua_yield(ci, 0);
-  }
-0
+(rv > 0) ? 0 : -1
-  return 1;
-}