Merge branch 'upstream/master' into ssl-psk

Author: Tuure Vartiainen

.luacheckrc

@@ -1,4 +1,5 @@
 std = 'ngx_lua'
+globals = { 'ngx' }
 unused_args = false
 read_globals = {
     "coroutine._yield"

.travis.yml

@@ -37,16 +37,17 @@ env:
     - LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
     - TEST_NGINX_SLEEP=0.005
     - TEST_NGINX_RANDOMIZE=1
+    - LUACHECK_VER=0.21.1
   matrix:
-    - NGINX_VERSION=1.9.15
     - NGINX_VERSION=1.11.2
+    - NGINX_VERSION=1.13.5
 
 before_install:
-  - sudo luarocks install luacheck
+  - sudo luarocks install luacheck $LUACHECK_VER
   - luacheck -q .
   - '! grep -n -P ''(?<=.{80}).+'' --color `find . -name ''*.lua''` || (echo "ERROR: Found Lua source lines exceeding 80 columns." > /dev/stderr; exit 1)'
   - '! grep -n -P ''\t+'' --color `find . -name ''*.lua''` || (echo "ERROR: Cannot use tabs." > /dev/stderr; exit 1)'
-  - sudo cpanm --notest Test::Nginx > build.log 2>&1 || (cat build.log && exit 1)
+  - sudo cpanm --notest Test::Nginx IPC::Run > build.log 2>&1 || (cat build.log && exit 1)
 
 install:
   - if [ ! -d download-cache ]; then mkdir download-cache; fi

README.markdown

@@ -91,7 +91,7 @@ of this library in the particular OpenResty release you are using. Otherwise you
 into serious comaptibility issues.
 
 * LuaJIT 2.1 (for now, it is the v2.1 git branch in the official luajit-2.0 git repository: http://luajit.org/download.html )
-* [ngx_lua](https://github.com/openresty/lua-nginx-module) v0.10.9 or later.
+* [ngx_lua](https://github.com/openresty/lua-nginx-module) v0.10.11 or later.
 * [lua-resty-lrucache](https://github.com/openresty/lua-resty-lrucache)
 
 [Back to TOC](#table-of-contents)
@@ -149,6 +149,8 @@ API Implemented
 * [ngx.shared.DICT.safe_add](https://github.com/openresty/lua-nginx-module#ngxshareddictsafe_add)
 * [ngx.shared.DICT.replace](https://github.com/openresty/lua-nginx-module#ngxshareddictreplace)
 * [ngx.shared.DICT.delete](https://github.com/openresty/lua-nginx-module#ngxshareddictdelete)
+* [ngx.shared.DICT.ttl](https://github.com/openresty/lua-nginx-module#ngxshareddictttl)
+* [ngx.shared.DICT.expire](https://github.com/openresty/lua-nginx-module#ngxshareddictexpire)
 * [ngx.shared.DICT.flush_all](https://github.com/openresty/lua-nginx-module#ngxshareddictflush_all)
 
 [Back to TOC](#table-of-contents)

dist.ini

@@ -7,4 +7,4 @@ lib_dir=lib
 doc_dir=lib
 repo_link=https://github.com/openresty/lua-resty-core
 main_module=lib/resty/core/base.lua
-requires = luajit >= 2.1.0, nginx >= 1.11.2, ngx_http_lua = 0.10.8, openresty/lua-resty-lrucache >= 0.06
+requires = luajit >= 2.1.0, nginx >= 1.11.2, ngx_http_lua = 0.10.9, openresty/lua-resty-lrucache >= 0.06

lib/ngx/balancer.md

@@ -138,7 +138,7 @@ get_last_failure
 **context:** *balancer_by_lua**
 
 Retrieves the failure details about the previous failed attempt (if any) when the `next_upstream` retrying
-mechanism is in action. When there was indeed a failed previous attempt, it returned a string descrbing
+mechanism is in action. When there was indeed a failed previous attempt, it returned a string describing
 that attempt's state name, as well as an integer describing the status code of that attempt.
 
 Possible state names are as follows:

lib/ngx/ssl.md

@@ -371,6 +371,10 @@ Sets the SSL certificate chain opaque pointer returned by the
 
 Returns `true` on success, or a `nil` value and a string describing the error otherwise.
 
+Note that this `set_cert` function will run slightly faster, in terms of CPU cycles wasted, than the
+[set_der_cert](#set_der_cert) variant, since the first function uses opaque cdata pointers
+which do not require any additional conversion needed to be performed by the SSL library during the SSL handshake.
+
 This function was first added in version `0.1.7`.
 
 [Back to TOC](#table-of-contents)
@@ -386,6 +390,10 @@ Sets the SSL private key opaque pointer returned by the
 
 Returns `true` on success, or a `nil` value and a string describing the error otherwise.
 
+Note that this `set_priv_key` function will run slightly faster, in terms of CPU cycles wasted, than the
+[set_der_priv_key](#set_der_priv_key) variant, since the first function uses opaque cdata pointers
+which do not require any additional conversion needed to be performed by the SSL library during the SSL handshake.
+
 This function was first added in version `0.1.7`.
 
 [Back to TOC](#table-of-contents)

lib/resty/core/base.lua

@@ -15,9 +15,9 @@ local FREE_LIST_REF = 0
 
 if not ngx.config
    or not ngx.config.ngx_lua_version
-   or ngx.config.ngx_lua_version < 10009
+   or ngx.config.ngx_lua_version < 10011
 then
-    error("ngx_lua 0.10.9+ required")
+    error("ngx_lua 0.10.11+ required")
 end
 
 
@@ -96,7 +96,7 @@ local c_buf_type = ffi.typeof("char[?]")
 local _M = new_tab(0, 16)
 
 
-_M.version = "0.1.12"
+_M.version = "0.1.13"
 _M.new_tab = new_tab
 _M.clear_tab = clear_tab
 

lib/resty/core/shdict.lua

@@ -17,6 +17,8 @@ local type = type
 local error = error
 local ngx_shared = ngx.shared
 local getmetatable = getmetatable
+local FFI_ERROR = base.FFI_ERROR
+local FFI_DECLINED = base.FFI_DECLINED
 
 
 ffi.cdef[[
@@ -36,6 +38,12 @@ ffi.cdef[[
         int *forcible);
 
     int ngx_http_lua_ffi_shdict_flush_all(void *zone);
+
+    int ngx_http_lua_ffi_shdict_get_ttl(void *zone,
+        const unsigned char *key, size_t key_len);
+
+    int ngx_http_lua_ffi_shdict_set_expire(void *zone,
+        const unsigned char *key, size_t key_len, int exptime);
 ]]
 
 
@@ -387,6 +395,81 @@ local function shdict_flush_all(zone)
 end
 
 
+local function shdict_ttl(zone, key)
+    zone = check_zone(zone)
+
+    if key == nil then
+        return nil, "nil key"
+    end
+
+    if type(key) ~= "string" then
+        key = tostring(key)
+    end
+
+    local key_len = #key
+    if key_len == 0 then
+        return nil, "empty key"
+    end
+
+    if key_len > 65535 then
+        return nil, "key too long"
+    end
+
+    local rc = C.ngx_http_lua_ffi_shdict_get_ttl(zone, key, key_len)
+
+    if rc == FFI_ERROR then
+        return nil, "bad zone"
+    end
+
+    if rc == FFI_DECLINED then
+        return nil, "not found"
+    end
+
+    return tonumber(rc) / 1000
+end
+
+
+local function shdict_expire(zone, key, exptime)
+    zone = check_zone(zone)
+
+    if not exptime then
+        error('bad "exptime" argument', 2)
+    end
+
+    if key == nil then
+        return nil, "nil key"
+    end
+
+    if type(key) ~= "string" then
+        key = tostring(key)
+    end
+
+    local key_len = #key
+    if key_len == 0 then
+        return nil, "empty key"
+    end
+
+    if key_len > 65535 then
+        return nil, "key too long"
+    end
+
+    local rc = C.ngx_http_lua_ffi_shdict_set_expire(zone, key, key_len,
+                                                    exptime * 1000)
+
+    if rc == FFI_ERROR then
+        return nil, "bad zone"
+    end
+
+    if rc == FFI_DECLINED then
+        return nil, "not found"
+    end
+
+    -- NGINX_OK/FFI_OK
+
+    return true
+end
+
+
 if ngx_shared then
     local _, dict = next(ngx_shared, nil)
     if dict then
@@ -404,6 +487,8 @@ if ngx_shared then
                 mt.replace = shdict_replace
                 mt.delete = shdict_delete
                 mt.flush_all = shdict_flush_all
+                mt.ttl = shdict_ttl
+                mt.expire = shdict_expire
             end
         end
     end

t/balancer.t

@@ -707,7 +707,7 @@ qr/\[error] .*? upstream prematurely closed connection while reading response he
 
 
 === TEST 16: https (keepalive)
---- skip_nginx: 4: < 1.7.5
+--- skip_nginx: 5: < 1.7.5
 --- http_config
     lua_package_path "$TEST_NGINX_CWD/lib/?.lua;;";
 

t/ocsp.t

@@ -1,4 +1,4 @@
-# vim:set ft=ts=4 sw=4 et fdm=marker:
+# vim:set ft= ts=4 sw=4 et fdm=marker:
 
 use Test::Nginx::Socket::Lua;
 use Cwd qw(cwd);