feature: added support for ARM64 (AArch64).

now we require OpenResty's LuaJIT branch to work properly on ARM64 since
we make use of the thread.exdata Lua API.

also implemented the ndk.* API with FFI.

Thanks Dejiang Zhu and Zexuan Luo for the development work of this patch.

Thanks Cloudflare for sponsoring this work.

Signed-off-by: Yichun Zhang (agentzh) <[email protected]>

Author: spacewander

.travis.yml

@@ -66,7 +66,8 @@ install:
   - git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
   - git clone https://github.com/openresty/lua-resty-lrucache.git
   - git clone https://github.com/openresty/headers-more-nginx-module.git ../headers-more-nginx-module
-  - git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git
+  - git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git luajit2
+  - git clone https://github.com/openresty/set-misc-nginx-module.git ../set-misc-nginx-module
   - git clone https://github.com/openresty/mockeagain.git
   - git clone https://github.com/openresty/test-nginx.git
   - git clone https://github.com/openresty/stream-lua-nginx-module.git ../stream-lua-nginx-module
@@ -102,7 +103,7 @@ script:
   - export LD_LIBRARY_PATH=$PWD/mockeagain:$LD_LIBRARY_PATH
   - export TEST_NGINX_RESOLVER=8.8.4.4
   - export NGX_BUILD_CC=$CC
-  - ngx-build $NGINX_VERSION --with-ipv6 --with-http_realip_module --with-http_ssl_module --with-pcre-jit --with-cc-opt="-I$OPENSSL_INC -I$PCRE_INC" --with-ld-opt="-L$OPENSSL_LIB -Wl,-rpath,$OPENSSL_LIB -L$PCRE_LIB -Wl,-rpath,$PCRE_LIB" --add-module=../ndk-nginx-module --add-module=../echo-nginx-module --add-module=../headers-more-nginx-module --add-module=../lua-nginx-module --with-debug --with-stream_ssl_module --with-stream --with-ipv6 --add-module=../stream-lua-nginx-module > build.log 2>&1 || (cat build.log && exit 1)
+  - ngx-build $NGINX_VERSION --with-ipv6 --with-http_realip_module --with-http_ssl_module --with-pcre-jit --with-cc-opt="-I$OPENSSL_INC -I$PCRE_INC" --with-ld-opt="-L$OPENSSL_LIB -Wl,-rpath,$OPENSSL_LIB -L$PCRE_LIB -Wl,-rpath,$PCRE_LIB" --add-module=../ndk-nginx-module --add-module=../echo-nginx-module --add-module=../set-misc-nginx-module --add-module=../headers-more-nginx-module --add-module=../lua-nginx-module --with-debug --with-stream_ssl_module --with-stream --with-ipv6 --add-module=../stream-lua-nginx-module > build.log 2>&1 || (cat build.log && exit 1)
   - nginx -V
   - ldd `which nginx`|grep -E 'luajit|ssl|pcre'
   - prove -Itest-nginx/lib -j$JOBS -r t

README.markdown

@@ -230,6 +230,10 @@ API Implemented
 
 [Back to TOC](#table-of-contents)
 
+## resty.core.ndk
+
+* [ndk.set_var](https://github.com/openresty/lua-nginx-module#ndkset_vardirective)
+
 ## ngx.semaphore
 
 This Lua module implements a semaphore API for efficient "light thread" synchronization,

lib/ngx/balancer.lua

@@ -12,7 +12,7 @@ local errmsg = base.get_errmsg_ptr()
 local FFI_OK = base.FFI_OK
 local FFI_ERROR = base.FFI_ERROR
 local int_out = ffi.new("int[1]")
-local getfenv = getfenv
+local get_request = base.get_request
 local error = error
 local type = type
 local tonumber = tonumber
@@ -104,7 +104,7 @@ local _M = { version = base.version }
 
 
 function _M.set_current_peer(addr, port)
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -126,7 +126,7 @@ end
 
 
 function _M.set_more_tries(count)
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -144,7 +144,7 @@ end
 
 
 function _M.get_last_failure()
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -164,7 +164,7 @@ end
 
 
 function _M.set_timeouts(connect_timeout, send_timeout, read_timeout)
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end

lib/ngx/errlog.lua

@@ -15,7 +15,7 @@ local ffi_new = ffi.new
 local charpp = ffi_new("char *[1]")
 local intp = ffi.new("int[1]")
 local num_value = ffi_new("double[1]")
-local getfenv = getfenv
+local get_request = base.get_request
 local tonumber = tonumber
 local type = type
 local error = error
@@ -107,7 +107,7 @@ end
 
 
 function _M.get_sys_filter_level()
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     return tonumber(C.ngx_http_lua_ffi_errlog_get_sys_filter_level(r))
 end
 
@@ -121,7 +121,7 @@ function _M.raw_log(level, msg)
         error("bad argument #2 to 'raw_log' (must be a string)", 2)
     end
 
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
 
     local rc = C.ngx_http_lua_ffi_raw_log(r, level, msg, #msg)
 

lib/ngx/ocsp.lua

@@ -8,7 +8,7 @@ base.allows_subsystem('http')
 local ffi = require "ffi"
 local C = ffi.C
 local ffi_str = ffi.string
-local getfenv = getfenv
+local get_request = base.get_request
 local error = error
 local tonumber = tonumber
 local errmsg = base.get_errmsg_ptr()
@@ -123,7 +123,7 @@ end
 
 
 function _M.set_ocsp_status_resp(ocsp_resp)
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end

lib/ngx/re.lua

@@ -3,9 +3,6 @@
 
 
 local base = require "resty.core.base"
-base.allows_subsystem('http')
-
-
 local ffi = require 'ffi'
 local bit = require "bit"
 local core_regex = require "resty.core.regex"
@@ -27,6 +24,7 @@ local destroy_compiled_regex = core_regex.destroy_compiled_regex
 local get_string_buf = base.get_string_buf
 local get_size_ptr = base.get_size_ptr
 local FFI_OK = base.FFI_OK
+local subsystem = ngx.config.subsystem
 
 
 local MAX_ERR_MSG_LEN        = 128
@@ -36,12 +34,28 @@ local DEFAULT_SPLIT_RES_SIZE = 4
 
 
 local split_ctx = new_tab(0, 1)
+local ngx_lua_ffi_set_jit_stack_size
+local ngx_lua_ffi_exec_regex
 
 
-ffi.cdef[[
+if subsystem == 'http' then
+    ffi.cdef[[
 int ngx_http_lua_ffi_set_jit_stack_size(int size, unsigned char *errstr,
     size_t *errstr_size);
-]]
+    ]]
+
+    ngx_lua_ffi_exec_regex = C.ngx_http_lua_ffi_exec_regex
+    ngx_lua_ffi_set_jit_stack_size = C.ngx_http_lua_ffi_set_jit_stack_size
+
+elseif subsystem == 'stream' then
+    ffi.cdef[[
+int ngx_stream_lua_ffi_set_jit_stack_size(int size, unsigned char *errstr,
+    size_t *errstr_size);
+    ]]
+
+    ngx_lua_ffi_exec_regex = C.ngx_stream_lua_ffi_exec_regex
+    ngx_lua_ffi_set_jit_stack_size = C.ngx_stream_lua_ffi_set_jit_stack_size
+end
 
 
 local _M = { version = base.version }
@@ -52,7 +66,7 @@ local function re_split_helper(subj, compiled, compile_once, flags, ctx)
     do
         local pos = math_max(ctx.pos, 0)
 
-        rc = C.ngx_http_lua_ffi_exec_regex(compiled, flags, subj, #subj, pos)
+        rc = ngx_lua_ffi_exec_regex(compiled, flags, subj, #subj, pos)
     end
 
     if rc == PCRE_ERROR_NOMATCH then
@@ -282,7 +296,7 @@ function _M.opt(option, value)
         local sizep = get_size_ptr()
         sizep[0] = MAX_ERR_MSG_LEN
 
-        local rc = C.ngx_http_lua_ffi_set_jit_stack_size(value, errbuf, sizep)
+        local rc = ngx_lua_ffi_set_jit_stack_size(value, errbuf, sizep)
 
         if rc == FFI_OK then
             return

lib/ngx/semaphore.lua

@@ -19,7 +19,7 @@ local C = ffi.C
 local type = type
 local error = error
 local tonumber = tonumber
-local getfenv = getfenv
+local get_request = base.get_request
 local get_string_buf = base.get_string_buf
 local get_size_ptr = base.get_size_ptr
 local setmetatable = setmetatable
@@ -121,7 +121,7 @@ function _M.wait(self, seconds)
         error("not a semaphore instance", 2)
     end
 
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end

lib/ngx/ssl.lua

@@ -9,7 +9,7 @@ local ffi = require "ffi"
 local C = ffi.C
 local ffi_str = ffi.string
 local ffi_gc = ffi.gc
-local getfenv = getfenv
+local get_request = base.get_request
 local error = error
 local tonumber = tonumber
 local errmsg = base.get_errmsg_ptr()
@@ -73,7 +73,7 @@ local intp = ffi.new("int[1]")
 
 
 function _M.clear_certs()
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -88,7 +88,7 @@ end
 
 
 function _M.set_der_cert(data)
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -104,7 +104,7 @@ end
 
 
 function _M.set_der_priv_key(data)
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -127,7 +127,7 @@ local addr_types = {
 
 
 function _M.raw_server_addr()
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -149,7 +149,7 @@ end
 
 
 function _M.server_name()
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -170,7 +170,7 @@ end
 
 
 function _M.raw_client_addr()
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -217,7 +217,7 @@ end
 
 local function get_tls1_version()
 
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -258,7 +258,7 @@ end
 
 
 function _M.set_cert(cert)
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -273,7 +273,7 @@ end
 
 
 function _M.set_priv_key(priv_key)
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end

lib/ngx/ssl/session.lua

@@ -8,7 +8,7 @@ base.allows_subsystem('http')
 local ffi = require "ffi"
 local C = ffi.C
 local ffi_str = ffi.string
-local getfenv = getfenv
+local get_request = base.get_request
 local error = error
 local errmsg = base.get_errmsg_ptr()
 local get_string_buf = base.get_string_buf
@@ -38,7 +38,7 @@ local _M = { version = base.version }
 
 -- return session, err
 function _M.get_serialized_session()
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -66,7 +66,7 @@ end
 
 -- return session_id, err
 function _M.get_session_id()
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end
@@ -91,7 +91,7 @@ end
 
 -- return ok, err
 function _M.set_serialized_session(sess)
-    local r = getfenv(0).__ngx_req
+    local r = get_request()
     if not r then
         error("no request found")
     end

lib/resty/core.lua

@@ -3,7 +3,9 @@
 local subsystem = ngx.config.subsystem
 
 
+require "resty.core.regex"
 require "resty.core.shdict"
+require "resty.core.time"
 
 
 if subsystem == 'http' then
@@ -20,6 +22,7 @@ if subsystem == 'http' then
     require "resty.core.time"
     require "resty.core.worker"
     require "resty.core.phase"
+    require "resty.core.ndk"
 end