passenger 4.0.59 → 4.0.60

data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_timer.h

@@ -0,0 +1,20 @@
+
+/*
+ * Copyright (C) Xiaozhe Wang (chaoslawful)
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_LUA_TIMER_H_INCLUDED_
+#define _NGX_HTTP_LUA_TIMER_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+void ngx_http_lua_inject_timer_api(lua_State *L);
+
+
+#endif /* _NGX_HTTP_LUA_TIMER_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */

data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_uri.c

@@ -0,0 +1,110 @@
+
+/*
+ * Copyright (C) Xiaozhe Wang (chaoslawful)
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_uri.h"
+#include "ngx_http_lua_util.h"
+
+
+static int ngx_http_lua_ngx_req_set_uri(lua_State *L);
+
+
+void
+ngx_http_lua_inject_req_uri_api(ngx_log_t *log, lua_State *L)
+{
+    lua_pushcfunction(L, ngx_http_lua_ngx_req_set_uri);
+    lua_setfield(L, -2, "set_uri");
+}
+
+
+static int
+ngx_http_lua_ngx_req_set_uri(lua_State *L)
+{
+    ngx_http_request_t          *r;
+    size_t                       len;
+    u_char                      *p;
+    int                          n;
+    int                          jump = 0;
+    ngx_http_lua_ctx_t          *ctx;
+
+    n = lua_gettop(L);
+
+    if (n != 1 && n != 2) {
+        return luaL_error(L, "expecting 1 or 2 arguments but seen %d", n);
+    }
+
+    r = ngx_http_lua_get_req(L);
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ngx_http_lua_check_fake_request(L, r);
+
+    p = (u_char *) luaL_checklstring(L, 1, &len);
+
+    if (len == 0) {
+        return luaL_error(L, "attempt to use zero-length uri");
+    }
+
+    if (n == 2) {
+
+        luaL_checktype(L, 2, LUA_TBOOLEAN);
+        jump = lua_toboolean(L, 2);
+
+        if (jump) {
+
+            ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+            if (ctx == NULL) {
+                return luaL_error(L, "no ctx found");
+            }
+
+            dd("rewrite: %d, access: %d, content: %d",
+               (int) ctx->entered_rewrite_phase,
+               (int) ctx->entered_access_phase,
+               (int) ctx->entered_content_phase);
+
+            ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE);
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "lua set uri jump to \"%*s\"", len, p);
+
+            ngx_http_lua_check_if_abortable(L, ctx);
+        }
+    }
+
+    r->uri.data = ngx_palloc(r->pool, len);
+    if (r->uri.data == NULL) {
+        return luaL_error(L, "no memory");
+    }
+
+    ngx_memcpy(r->uri.data, p, len);
+
+    r->uri.len = len;
+
+    r->internal = 1;
+    r->valid_unparsed_uri = 0;
+
+    ngx_http_set_exten(r);
+
+    if (jump) {
+        r->uri_changed = 1;
+
+        return lua_yield(L, 0);
+    }
+
+    r->valid_location = 0;
+    r->uri_changed = 0;
+
+    return 0;
+}
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */

data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_uri.h

@@ -0,0 +1,20 @@
+
+/*
+ * Copyright (C) Xiaozhe Wang (chaoslawful)
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_LUA_URI_H_INCLUDED_
+#define _NGX_HTTP_LUA_URI_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+void ngx_http_lua_inject_req_uri_api(ngx_log_t *log, lua_State *L);
+
+
+#endif /* _NGX_HTTP_LUA_URI_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */

data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_uthread.c

@@ -0,0 +1,283 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_uthread.h"
+#include "ngx_http_lua_coroutine.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_probe.h"
+
+
+#if 1
+#undef ngx_http_lua_probe_info
+#define ngx_http_lua_probe_info(msg)
+#endif
+
+
+static int ngx_http_lua_uthread_spawn(lua_State *L);
+static int ngx_http_lua_uthread_wait(lua_State *L);
+static int ngx_http_lua_uthread_kill(lua_State *L);
+
+
+void
+ngx_http_lua_inject_uthread_api(ngx_log_t *log, lua_State *L)
+{
+    /* new thread table */
+    lua_createtable(L, 0 /* narr */, 3 /* nrec */);
+
+    lua_pushcfunction(L, ngx_http_lua_uthread_spawn);
+    lua_setfield(L, -2, "spawn");
+
+    lua_pushcfunction(L, ngx_http_lua_uthread_wait);
+    lua_setfield(L, -2, "wait");
+
+    lua_pushcfunction(L, ngx_http_lua_uthread_kill);
+    lua_setfield(L, -2, "kill");
+
+    lua_setfield(L, -2, "thread");
+}
+
+
+static int
+ngx_http_lua_uthread_spawn(lua_State *L)
+{
+    int                           n;
+    ngx_http_request_t           *r;
+    ngx_http_lua_ctx_t           *ctx;
+    ngx_http_lua_co_ctx_t        *coctx = NULL;
+
+    n = lua_gettop(L);
+
+    r = ngx_http_lua_get_req(L);
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    ngx_http_lua_coroutine_create_helper(L, r, ctx, &coctx);
+
+    /* anchor the newly created coroutine into the Lua registry */
+
+    lua_pushlightuserdata(L, &ngx_http_lua_coroutines_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    lua_pushvalue(L, -2);
+    coctx->co_ref = luaL_ref(L, -2);
+    lua_pop(L, 1);
+
+    if (n > 1) {
+        lua_replace(L, 1);
+        lua_xmove(L, coctx->co, n - 1);
+    }
+
+    coctx->is_uthread = 1;
+    ctx->uthreads++;
+
+    coctx->co_status = NGX_HTTP_LUA_CO_RUNNING;
+    ctx->co_op = NGX_HTTP_LUA_USER_THREAD_RESUME;
+
+    ctx->cur_co_ctx->thread_spawn_yielded = 1;
+
+    if (ngx_http_lua_post_thread(r, ctx, ctx->cur_co_ctx) != NGX_OK) {
+        return luaL_error(L, "no memory");
+    }
+
+    coctx->parent_co_ctx = ctx->cur_co_ctx;
+    ctx->cur_co_ctx = coctx;
+
+    ngx_http_lua_probe_user_thread_spawn(r, L, coctx->co);
+
+    dd("yielding with arg %s, top=%d, index-1:%s", luaL_typename(L, -1),
+       (int) lua_gettop(L), luaL_typename(L, 1));
+    return lua_yield(L, 1);
+}
+
+
+static int
+ngx_http_lua_uthread_wait(lua_State *L)
+{
+    int                          i, nargs, nrets;
+    lua_State                   *sub_co;
+    ngx_http_request_t          *r;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx, *sub_coctx;
+
+    r = ngx_http_lua_get_req(L);
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT
+                               | NGX_HTTP_LUA_CONTEXT_TIMER);
+
+    coctx = ctx->cur_co_ctx;
+
+    nargs = lua_gettop(L);
+
+    for (i = 1; i <= nargs; i++) {
+        sub_co = lua_tothread(L, i);
+
+        luaL_argcheck(L, sub_co, i, "lua thread expected");
+
+        sub_coctx = ngx_http_lua_get_co_ctx(sub_co, ctx);
+        if (sub_coctx == NULL) {
+            return luaL_error(L, "no co ctx found");
+        }
+
+        if (!sub_coctx->is_uthread) {
+            return luaL_error(L, "attempt to wait on a coroutine that is "
+                              "not a user thread");
+        }
+
+        if (sub_coctx->parent_co_ctx != coctx) {
+            return luaL_error(L, "only the parent coroutine can wait on the "
+                              "thread");
+        }
+
+        switch (sub_coctx->co_status) {
+        case NGX_HTTP_LUA_CO_ZOMBIE:
+
+            ngx_http_lua_probe_info("found zombie child");
+
+            nrets = lua_gettop(sub_coctx->co);
+
+            dd("child retval count: %d, %s: %s", (int) nrets,
+               luaL_typename(sub_coctx->co, -1),
+               lua_tostring(sub_coctx->co, -1));
+
+            if (nrets) {
+                lua_xmove(sub_coctx->co, L, nrets);
+            }
+
+#if 1
+            ngx_http_lua_del_thread(r, L, ctx, sub_coctx);
+            ctx->uthreads--;
+#endif
+
+            return nrets;
+
+        case NGX_HTTP_LUA_CO_DEAD:
+            dd("uthread already waited: %p (parent %p)", sub_coctx,
+               coctx);
+
+            if (i < nargs) {
+                /* just ignore it if it is not the last one */
+                continue;
+            }
+
+            /* being the last one */
+            lua_pushnil(L);
+            lua_pushliteral(L, "already waited or killed");
+            return 2;
+
+        default:
+            dd("uthread %p still alive, status: %d, parent %p", sub_coctx,
+               sub_coctx->co_status, coctx);
+            break;
+        }
+
+        ngx_http_lua_probe_user_thread_wait(L, sub_coctx->co);
+        sub_coctx->waited_by_parent = 1;
+    }
+
+    return lua_yield(L, 0);
+}
+
+
+static int
+ngx_http_lua_uthread_kill(lua_State *L)
+{
+    lua_State                   *sub_co;
+    ngx_http_request_t          *r;
+    ngx_http_lua_ctx_t          *ctx;
+    ngx_http_lua_co_ctx_t       *coctx, *sub_coctx;
+
+    r = ngx_http_lua_get_req(L);
+    if (r == NULL) {
+        return luaL_error(L, "no request found");
+    }
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return luaL_error(L, "no request ctx found");
+    }
+
+    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_REWRITE
+                               | NGX_HTTP_LUA_CONTEXT_ACCESS
+                               | NGX_HTTP_LUA_CONTEXT_CONTENT
+                               | NGX_HTTP_LUA_CONTEXT_TIMER);
+
+    coctx = ctx->cur_co_ctx;
+
+    sub_co = lua_tothread(L, 1);
+    luaL_argcheck(L, sub_co, 1, "lua thread expected");
+
+    sub_coctx = ngx_http_lua_get_co_ctx(sub_co, ctx);
+
+    if (sub_coctx == NULL) {
+        return luaL_error(L, "no co ctx found");
+    }
+
+    if (!sub_coctx->is_uthread) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "not user thread");
+        return 2;
+    }
+
+    if (sub_coctx->parent_co_ctx != coctx) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "killer not parent");
+        return 2;
+    }
+
+    if (sub_coctx->pending_subreqs > 0) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "pending subrequests");
+        return 2;
+    }
+
+    switch (sub_coctx->co_status) {
+    case NGX_HTTP_LUA_CO_ZOMBIE:
+        ngx_http_lua_del_thread(r, L, ctx, sub_coctx);
+        ctx->uthreads--;
+
+        lua_pushnil(L);
+        lua_pushliteral(L, "already terminated");
+        return 2;
+
+    case NGX_HTTP_LUA_CO_DEAD:
+        lua_pushnil(L);
+        lua_pushliteral(L, "already waited or killed");
+        return 2;
+
+    default:
+        ngx_http_lua_cleanup_pending_operation(sub_coctx);
+        ngx_http_lua_del_thread(r, L, ctx, sub_coctx);
+        ctx->uthreads--;
+
+        lua_pushinteger(L, 1);
+        return 1;
+    }
+
+    /* not reacheable */
+}
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */

data/packaging/debian/debian_specs/nginx/modules/nginx-lua/src/ngx_http_lua_uthread.h

@@ -0,0 +1,36 @@
+
+/*
+ * Copyright (C) Yichun Zhang (agentzh)
+ */
+
+
+#ifndef _NGX_HTTP_LUA_UTHREAD_H_INCLUDED_
+#define _NGX_HTTP_LUA_UTHREAD_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+#define ngx_http_lua_is_thread(ctx)                                          \
+    ((ctx)->cur_co_ctx->is_uthread || (ctx)->cur_co_ctx == &(ctx)->entry_co_ctx)
+
+
+#define ngx_http_lua_is_entry_thread(ctx)                                    \
+    ((ctx)->cur_co_ctx == &(ctx)->entry_co_ctx)
+
+
+#define ngx_http_lua_entry_thread_alive(ctx)                                 \
+    ((ctx)->entry_co_ctx.co_ref != LUA_NOREF)
+
+
+#define ngx_http_lua_coroutine_alive(coctx)                                  \
+    ((coctx)->co_status != NGX_HTTP_LUA_CO_DEAD                              \
+     && (coctx)->co_status != NGX_HTTP_LUA_CO_ZOMBIE)
+
+
+void ngx_http_lua_inject_uthread_api(ngx_log_t *log, lua_State *L);
+
+
+#endif /* _NGX_HTTP_LUA_UTHREAD_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */