Skip to content

Commit 28e0e1f

Browse files
committed
change: allowing both ngx_lua 0.10.16 and 0.10.17.
1 parent 0085a9b commit 28e0e1f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

README.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ of this library in the particular OpenResty release you are using. Otherwise you
108108
into serious compatibility issues.
109109

110110
* 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 )
111-
* [ngx_http_lua_module](https://github.com/openresty/lua-nginx-module) v0.10.16.
111+
* [ngx_http_lua_module](https://github.com/openresty/lua-nginx-module) v0.10.16 or v0.10.17.
112112
* [ngx_stream_lua_module](https://github.com/openresty/stream-lua-nginx-module) v0.0.8.
113113
* [lua-resty-lrucache](https://github.com/openresty/lua-resty-lrucache)
114114

lib/resty/core/base.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ local FREE_LIST_REF = 0
1616

1717

1818
if subsystem == 'http' then
19+
local ngx_lua_v = ngx.config.ngx_lua_version
1920
if not ngx.config
2021
or not ngx.config.ngx_lua_version
21-
or ngx.config.ngx_lua_version ~= 10016
22+
or (ngx_lua_v ~= 10016 and ngx_lua_v ~= 10017)
2223
then
23-
error("ngx_http_lua_module 0.10.16 required")
24+
error("ngx_http_lua_module 0.10.16 or 0.10.17 required")
2425
end
2526

2627
elseif subsystem == 'stream' then

0 commit comments

Comments
 (0)