change: retired the old CFunction API when newer FFI implementations are available.

Author: thibaultcha

config

@@ -278,17 +278,14 @@ HTTP_LUA_DEPS=" \
             $ngx_addon_dir/src/ngx_http_lua_subrequest.h \
             $ngx_addon_dir/src/ngx_http_lua_ndk.h \
             $ngx_addon_dir/src/ngx_http_lua_control.h \
-            $ngx_addon_dir/src/ngx_http_lua_time.h \
             $ngx_addon_dir/src/ngx_http_lua_string.h \
             $ngx_addon_dir/src/ngx_http_lua_misc.h \
-            $ngx_addon_dir/src/ngx_http_lua_variable.h \
             $ngx_addon_dir/src/ngx_http_lua_output.h \
             $ngx_addon_dir/src/ngx_http_lua_headers.h \
             $ngx_addon_dir/src/ngx_http_lua_uri.h \
             $ngx_addon_dir/src/ngx_http_lua_req_body.h \
             $ngx_addon_dir/src/ngx_http_lua_args.h \
             $ngx_addon_dir/src/ngx_http_lua_ctx.h \
-            $ngx_addon_dir/src/ngx_http_lua_regex.h \
             $ngx_addon_dir/src/ngx_http_lua_common.h \
             $ngx_addon_dir/src/ngx_http_lua_directive.h \
             $ngx_addon_dir/src/ngx_http_lua_headers_out.h \
@@ -316,13 +313,10 @@ HTTP_LUA_DEPS=" \
             $ngx_addon_dir/src/ngx_http_lua_initby.h \
             $ngx_addon_dir/src/ngx_http_lua_initworkerby.h \
             $ngx_addon_dir/src/ngx_http_lua_socket_udp.h \
-            $ngx_addon_dir/src/ngx_http_lua_req_method.h \
-            $ngx_addon_dir/src/ngx_http_lua_phase.h \
             $ngx_addon_dir/src/ngx_http_lua_probe.h \
             $ngx_addon_dir/src/ngx_http_lua_uthread.h \
             $ngx_addon_dir/src/ngx_http_lua_timer.h \
             $ngx_addon_dir/src/ngx_http_lua_config.h \
-            $ngx_addon_dir/src/ngx_http_lua_worker.h \
             $ngx_addon_dir/src/ngx_http_lua_ssl_certby.h \
             $ngx_addon_dir/src/ngx_http_lua_lex.h \
             $ngx_addon_dir/src/ngx_http_lua_balancer.h \

src/ngx_http_lua_args.c

@@ -16,7 +16,6 @@
 
 
 static int ngx_http_lua_ngx_req_set_uri_args(lua_State *L);
-static int ngx_http_lua_ngx_req_get_uri_args(lua_State *L);
 static int ngx_http_lua_ngx_req_get_post_args(lua_State *L);
 
 
@@ -80,64 +79,6 @@ ngx_http_lua_ngx_req_set_uri_args(lua_State *L)
 }
 
 
-static int
-ngx_http_lua_ngx_req_get_uri_args(lua_State *L)
-{
-    ngx_http_request_t          *r;
-    u_char                      *buf;
-    u_char                      *last;
-    int                          retval;
-    int                          n;
-    int                          max;
-
-    n = lua_gettop(L);
-
-    if (n != 0 && n != 1) {
-        return luaL_error(L, "expecting 0 or 1 arguments but seen %d", n);
-    }
-
-    if (n == 1) {
-        max = luaL_checkinteger(L, 1);
-        lua_pop(L, 1);
-
-    } else {
-        max = NGX_HTTP_LUA_MAX_ARGS;
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object found");
-    }
-
-    ngx_http_lua_check_fake_request(L, r);
-
-    if (r->args.len == 0) {
-        lua_createtable(L, 0, 0);
-        return 1;
-    }
-
-    /* we copy r->args over to buf to simplify
-     * unescaping query arg keys and values */
-
-    buf = ngx_palloc(r->pool, r->args.len);
-    if (buf == NULL) {
-        return luaL_error(L, "no memory");
-    }
-
-    lua_createtable(L, 0, 4);
-
-    ngx_memcpy(buf, r->args.data, r->args.len);
-
-    last = buf + r->args.len;
-
-    retval = ngx_http_lua_parse_args(L, buf, last, max);
-
-    ngx_pfree(r->pool, buf);
-
-    return retval;
-}
-
-
 static int
 ngx_http_lua_ngx_req_get_post_args(lua_State *L)
 {
@@ -368,18 +309,11 @@ ngx_http_lua_inject_req_args_api(lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_ngx_req_set_uri_args);
     lua_setfield(L, -2, "set_uri_args");
 
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_get_uri_args);
-    lua_setfield(L, -2, "get_uri_args");
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_req_get_uri_args);
-    lua_setfield(L, -2, "get_query_args"); /* deprecated */
-
     lua_pushcfunction(L, ngx_http_lua_ngx_req_get_post_args);
     lua_setfield(L, -2, "get_post_args");
 }
 
 
-#ifndef NGX_LUA_NO_FFI_API
 size_t
 ngx_http_lua_ffi_req_get_querystring_len(ngx_http_request_t *r)
 {
@@ -549,7 +483,6 @@ ngx_http_lua_ffi_req_get_uri_args(ngx_http_request_t *r, u_char *buf,
 
     return i;
 }
-#endif /* NGX_LUA_NO_FFI_API */
 
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */

src/ngx_http_lua_balancer.c

@@ -457,8 +457,6 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
 #endif
 
 
-#ifndef NGX_LUA_NO_FFI_API
-
 int
 ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
     const u_char *addr, size_t addr_len, int port, char **err)
@@ -754,4 +752,5 @@ ngx_http_lua_ffi_balancer_get_last_failure(ngx_http_request_t *r,
     return bp->last_peer_state;
 }
 
-#endif  /* NGX_LUA_NO_FFI_API */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */

src/ngx_http_lua_bodyfilterby.c

@@ -15,12 +15,9 @@
 #include "ngx_http_lua_exception.h"
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_pcrefix.h"
-#include "ngx_http_lua_time.h"
 #include "ngx_http_lua_log.h"
-#include "ngx_http_lua_regex.h"
 #include "ngx_http_lua_cache.h"
 #include "ngx_http_lua_headers.h"
-#include "ngx_http_lua_variable.h"
 #include "ngx_http_lua_string.h"
 #include "ngx_http_lua_misc.h"
 #include "ngx_http_lua_consts.h"

src/ngx_http_lua_common.h

@@ -140,10 +140,8 @@ typedef struct {
 #define NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH 0x1000
 
 
-#ifndef NGX_LUA_NO_FFI_API
 #define NGX_HTTP_LUA_FFI_NO_REQ_CTX         -100
 #define NGX_HTTP_LUA_FFI_BAD_CONTEXT        -101
-#endif
 
 
 #if (NGX_PTR_SIZE >= 8 && !defined(_WIN64))

src/ngx_http_lua_control.c

@@ -18,7 +18,6 @@
 
 static int ngx_http_lua_ngx_exec(lua_State *L);
 static int ngx_http_lua_ngx_redirect(lua_State *L);
-static int ngx_http_lua_ngx_exit(lua_State *L);
 static int ngx_http_lua_on_abort(lua_State *L);
 
 
@@ -35,14 +34,6 @@ ngx_http_lua_inject_control_api(ngx_log_t *log, lua_State *L)
     lua_pushcfunction(L, ngx_http_lua_ngx_exec);
     lua_setfield(L, -2, "exec");
 
-    lua_pushcfunction(L, ngx_http_lua_ngx_exit);
-    lua_setfield(L, -2, "throw_error"); /* deprecated */
-
-    /* ngx.exit */
-
-    lua_pushcfunction(L, ngx_http_lua_ngx_exit);
-    lua_setfield(L, -2, "exit");
-
     /* ngx.on_abort */
 
     lua_pushcfunction(L, ngx_http_lua_on_abort);
@@ -297,108 +288,6 @@ ngx_http_lua_ngx_redirect(lua_State *L)
 }
 
 
-static int
-ngx_http_lua_ngx_exit(lua_State *L)
-{
-    ngx_int_t                    rc;
-    ngx_http_request_t          *r;
-    ngx_http_lua_ctx_t          *ctx;
-
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one argument");
-    }
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return luaL_error(L, "no request object 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
-                               | NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
-                               | NGX_HTTP_LUA_CONTEXT_BALANCER
-                               | NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE
-                               | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH);
-
-    rc = (ngx_int_t) luaL_checkinteger(L, 1);
-
-    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_SSL_CERT
-                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE
-                        | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH))
-    {
-
-#if (NGX_HTTP_SSL)
-
-        ctx->exit_code = rc;
-        ctx->exited = 1;
-
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "lua exit with code %i", rc);
-
-        if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE) {
-            return 0;
-        }
-
-        return lua_yield(L, 0);
-
-#else
-
-        return luaL_error(L, "no SSL support");
-
-#endif
-    }
-
-    if (ctx->no_abort
-        && rc != NGX_ERROR
-        && rc != NGX_HTTP_CLOSE
-        && rc != NGX_HTTP_REQUEST_TIME_OUT
-        && rc != NGX_HTTP_CLIENT_CLOSED_REQUEST)
-    {
-        return luaL_error(L, "attempt to abort with pending subrequests");
-    }
-
-    if ((r->header_sent || ctx->header_sent)
-        && rc >= NGX_HTTP_SPECIAL_RESPONSE
-        && rc != NGX_HTTP_REQUEST_TIME_OUT
-        && rc != NGX_HTTP_CLIENT_CLOSED_REQUEST
-        && rc != NGX_HTTP_CLOSE)
-    {
-        if (rc != (ngx_int_t) r->headers_out.status) {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "attempt to "
-                          "set status %i via ngx.exit after sending out the "
-                          "response status %ui", rc, r->headers_out.status);
-        }
-
-        rc = NGX_HTTP_OK;
-    }
-
-    dd("setting exit code: %d", (int) rc);
-
-    ctx->exit_code = rc;
-    ctx->exited = 1;
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "lua exit with code %i", ctx->exit_code);
-
-    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_HEADER_FILTER
-                        | NGX_HTTP_LUA_CONTEXT_BALANCER))
-    {
-        return 0;
-    }
-
-    dd("calling yield");
-    return lua_yield(L, 0);
-}
-
-
 static int
 ngx_http_lua_on_abort(lua_State *L)
 {
@@ -457,7 +346,6 @@ ngx_http_lua_on_abort(lua_State *L)
 }
 
 
-#ifndef NGX_LUA_NO_FFI_API
 int
 ngx_http_lua_ffi_exit(ngx_http_request_t *r, int status, u_char *err,
     size_t *errlen)
@@ -553,6 +441,6 @@ ngx_http_lua_ffi_exit(ngx_http_request_t *r, int status, u_char *err,
 
     return NGX_OK;
 }
-#endif  /* NGX_LUA_NO_FFI_API */
+
 
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */