Merge pull request #1 from openresty/master

upgrade nginx

Author: splitice

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,27 @@
+This place is for bug reports and development discussions only. For general questions and
+discussions, please join the openresty-en mailing list instead: https://groups.google.com/group/openresty-en.
+If you want to use Chinese, please join the openresty (Chinese) mailing list instead: https://groups.google.com/group/openresty.
+Do not use Chinese in this place.
+
+Before you open a new issue, please search the internet and make sure it is not duplicate.
+
+Ensure you have provided the following details while reporting a problem:
+
+- [ ] The exact version of the related software, including but not limited to the OpenResty version
+(if any), the NGINX core version, the `ngx_lua` module version(via `openresty -V` or `nginx -V`),
+and the `lua-resty-core` version(via `resty -e 'print(require("resty.core").version)'`),
+and your operating system version(via `uname -a`).
+- [ ] **A minimal and standalone test case** that others can easily run on their side and
+reproduce the issue you are seeing.
+- [ ] Do not simply say "something is broken" or "something does not work". Always provide
+as much details as possible. Always describe **the symptoms and your expected results**.
+
+You can (temporarily) enable the nginx debugging logs to see the internal workings
+of NGINX in your nginx''s `error.log` file. See http://nginx.org/en/docs/debugging_log.html
+The same instructions apply equally well to OpenResty.
+
+If you are seeing crashes, please provide the full backtrace for the crash. See
+https://www.nginx.com/resources/wiki/start/topics/tutorials/debugging/#core-dump
+for more details.
+
+Thanks for your cooperation.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,2 @@
+I hereby granted the copyright of the changes in this pull request
+to the authors of this lua-resty-core project.

.luacheckrc

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

.travis.yml

@@ -9,37 +9,52 @@ compiler:
   - gcc
   - clang
 
+addons:
+  apt:
+    packages:
+    - cpanminus
+    - axel
+    - luarocks
+
 cache:
   directories:
   - download-cache
 
 env:
   global:
-    - JOBS=3
+    - JOBS=2
     - NGX_BUILD_JOBS=$JOBS
     - LUAJIT_PREFIX=/opt/luajit21
     - LUAJIT_LIB=$LUAJIT_PREFIX/lib
     - LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
     - LUA_INCLUDE_DIR=$LUAJIT_INC
     - LUA_CMODULE_DIR=/lib
+    - PCRE_VER=8.40
     - OPENSSL_PREFIX=/opt/ssl
     - OPENSSL_LIB=$OPENSSL_PREFIX/lib
     - OPENSSL_INC=$OPENSSL_PREFIX/include
-    - OPENSSL_VER=1.0.2h
+    - OPENSSL_VER=1.0.2j
     - LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
-    - TEST_NGINX_SLEEP=0.006
+    - TEST_NGINX_SLEEP=0.005
+    - TEST_NGINX_RANDOMIZE=1
   matrix:
     - NGINX_VERSION=1.9.15
-#    - NGINX_VERSION=1.10.0
+    - NGINX_VERSION=1.11.2
+
+before_install:
+  - sudo luarocks install luacheck
+  - 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)
 
 install:
   - if [ ! -d download-cache ]; then mkdir download-cache; fi
   - if [ ! -f download-cache/openssl-$OPENSSL_VER.tar.gz ]; then wget -O download-cache/openssl-$OPENSSL_VER.tar.gz https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz; fi
-  - sudo apt-get install -qq -y cpanminus axel
-  - sudo cpanm --notest Test::Nginx > build.log 2>&1 || (cat build.log && exit 1)
+  - if [ ! -f download-cache/pcre-$PCRE_VER.tar.gz ]; then wget -P download-cache http://ftp.cs.stanford.edu/pub/exim/pcre/pcre-$PCRE_VER.tar.gz; fi
   - wget http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
   - git clone https://github.com/openresty/openresty.git ../openresty
-  - git clone https://github.com/openresty/nginx-devel-utils.git
+  - git clone https://github.com/openresty/openresty-devel-utils.git
   - git clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module
   - git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module
   - git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
@@ -48,27 +63,29 @@ install:
   - 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 https://github.com/openresty/mockeagain.git
+  - git clone https://github.com/openresty/test-nginx.git
 
 script:
   - cd luajit2/
-  - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT' > build.log 2>&1 || (cat build.log && exit 1)
+  - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT -msse4.2' > build.log 2>&1 || (cat build.log && exit 1)
   - sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1)
   - cd ..
   - cd lua-resty-lrucache && sudo make DESTDIR=$LUAJIT_PREFIX LUA_LIB_DIR=/share/lua/5.1 install && cd ..
   - tar zxf download-cache/openssl-$OPENSSL_VER.tar.gz
   - cd openssl-$OPENSSL_VER/
-  - wget https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-$OPENSSL_VER-sess_set_get_cb_yield.patch
-  - patch -p1 < openssl-$OPENSSL_VER-sess_set_get_cb_yield.patch
+  - if [ ! -f openssl-1.0.2h-sess_set_get_cb_yield.patch ]; then wget -O openssl-1.0.2h-sess_set_get_cb_yield.patch https://raw.githubusercontent.com/openresty/openresty/master/patches/openssl-1.0.2h-sess_set_get_cb_yield.patch; fi
+  - patch -p1 < openssl-1.0.2h-sess_set_get_cb_yield.patch
   - ./config shared --prefix=$OPENSSL_PREFIX -DPURIFY > build.log 2>&1 || (cat build.log && exit 1)
   - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1)
   - sudo make PATH=$PATH install_sw > build.log 2>&1 || (cat build.log && exit 1)
   - cd ../mockeagain/ && make CC=$CC -j$JOBS && cd ..
-  - export PATH=$PWD/work/nginx/sbin:$PWD/nginx-devel-utils:$PATH
+  - tar zxf download-cache/pcre-$PCRE_VER.tar.gz
+  - export PATH=$PWD/work/nginx/sbin:$PWD/openresty-devel-utils:$PATH
   - export LD_PRELOAD=$PWD/mockeagain/mockeagain.so
   - 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-cc-opt="-I$OPENSSL_INC" --with-ld-opt="-L$OPENSSL_LIB -Wl,-rpath,$OPENSSL_LIB" --add-module=../ndk-nginx-module --add-module=../echo-nginx-module --add-module=../headers-more-nginx-module --add-module=../lua-nginx-module --with-debug > 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=../../pcre-$PCRE_VER --with-pcre-jit --with-cc-opt="-I$OPENSSL_INC" --with-ld-opt="-L$OPENSSL_LIB -Wl,-rpath,$OPENSSL_LIB" --add-module=../ndk-nginx-module --add-module=../echo-nginx-module --add-module=../headers-more-nginx-module --add-module=../lua-nginx-module --with-debug > build.log 2>&1 || (cat build.log && exit 1)
   - nginx -V
   - ldd `which nginx`|grep -E 'luajit|ssl|pcre'
-  - prove -r t
+  - prove -Itest-nginx/lib -j$JOBS -r t

README.markdown

@@ -29,6 +29,9 @@ Table of Contents
     * [ngx.balancer](#ngxbalancer)
     * [ngx.ssl](#ngxssl)
     * [ngx.ssl.session](#ngxsslsession)
+    * [ngx.re](#ngxre)
+    * [ngx.process](#ngxprocess)
+    * [ngx.errlog](#ngxerrlog)
 * [Caveat](#caveat)
 * [TODO](#todo)
 * [Author](#author)
@@ -83,8 +86,12 @@ and requirements.
 Prerequisites
 =============
 
+**WARNING** This library is included with every OpenResty release. You should use the bundled version
+of this library in the particular OpenResty release you are using. Otherwise you may run
+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.6 or later.
+* [ngx_lua](https://github.com/openresty/lua-nginx-module) v0.10.9 or later.
 * [lua-resty-lrucache](https://github.com/openresty/lua-resty-lrucache)
 
 [Back to TOC](#table-of-contents)
@@ -235,6 +242,35 @@ See the [documentation](./lib/ngx/ssl/session.md) for this Lua module for more d
 
 [Back to TOC](#table-of-contents)
 
+## ngx.re
+
+This Lua module provides a Lua API which implements convenience utilities for
+the `ngx.re` API.
+
+See the [documentation](./lib/ngx/re.md) for this Lua module for more details.
+
+[Back to TOC](#table-of-contents)
+
+## ngx.process
+
+This Lua module is used to manage the nginx process in Lua.
+
+See the [documentation](./lib/ngx/process.md) for this Lua module for more details.
+
+This module was first introduced in lua-resty-core v0.1.12.
+
+[Back to TOC](#table-of-contents)
+
+## ngx.errlog
+
+This Lua module provides Lua API to capture and manage nginx error log messages.
+
+See the [documentation](./lib/ngx/errlog.md) for this Lua module for more details.
+
+This module was first introduced in lua-resty-core v0.1.12.
+
+[Back to TOC](#table-of-contents)
+
 Caveat
 ======
 
@@ -256,7 +292,7 @@ TODO
 Author
 ======
 
-Yichun "agentzh" Zhang (章亦春) <[email protected]>, CloudFlare Inc.
+Yichun "agentzh" Zhang (章亦春) <[email protected]>, OpenResty Inc.
 
 [Back to TOC](#table-of-contents)
 
@@ -265,7 +301,7 @@ Copyright and License
 
 This module is licensed under the BSD license.
 
-Copyright (C) 2013-2016, by Yichun "agentzh" Zhang, CloudFlare Inc.
+Copyright (C) 2013-2017, by Yichun "agentzh" Zhang, OpenResty Inc.
 
 All rights reserved.
 

dist.ini

@@ -0,0 +1,10 @@
+name=lua-resty-core
+abstract=New FFI-based Lua API for the ngx_lua module
+author=Yichun "agentzh" Zhang (agentzh)
+is_original=yes
+license=2bsd
+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.9, openresty/lua-resty-lrucache >= 0.06

lib/ngx/balancer.md

@@ -80,8 +80,8 @@ Description
 ===========
 
 This Lua module provides API functions to allow defining highly dynamic NGINX load balancers for
-any existing nginx upstream modules like [http://nginx.org/en/docs/http/ngx_http_proxy_module.html ngx_proxy] and
-[http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html ngx_fastcgi].
+any existing nginx upstream modules like [ngx_proxy](http://nginx.org/en/docs/http/ngx_http_proxy_module.html) and
+[ngx_fastcgi](http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html).
 
 It allows you to dynamically select a backend peer to connect to (or retry) on a per-request
 basis from a list of backend peers which may also be dynamic.
@@ -173,7 +173,7 @@ Zero and negative timeout values are not allowed.
 
 You can specify millisecond precision in the timeout values by using floating point numbers like 0.001 (which means 1ms).
 
-Returns `true` when the operation is successul; returns `nil` and a string describing the error
+Returns `true` when the operation is successful; returns `nil` and a string describing the error
 otherwise.
 
 This only affects the current downstream request. It is not a global change.
@@ -216,7 +216,7 @@ Please report bugs or submit patches by
 Author
 ======
 
-Yichun Zhang <[email protected]> (agentzh), CloudFlare Inc.
+Yichun Zhang <[email protected]> (agentzh), OpenResty Inc.
 
 [Back to TOC](#table-of-contents)
 
@@ -225,7 +225,7 @@ Copyright and License
 
 This module is licensed under the BSD license.
 
-Copyright (C) 2015, by Yichun "agentzh" Zhang, CloudFlare Inc.
+Copyright (C) 2015-2017, by Yichun "agentzh" Zhang, OpenResty Inc.
 
 All rights reserved.
 

lib/ngx/errlog.lua

@@ -0,0 +1,107 @@
+-- Copyright (C) Yichun Zhang (agentzh)
+
+
+local ffi = require 'ffi'
+local base = require "resty.core.base"
+local ffi_string = ffi.string
+local get_string_buf = base.get_string_buf
+local get_size_ptr = base.get_size_ptr
+local C = ffi.C
+local new_tab = base.new_tab
+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 tonumber = tonumber
+
+
+local _M = { version = base.version }
+
+
+ffi.cdef[[
+int ngx_http_lua_ffi_errlog_set_filter_level(int level, unsigned char *err,
+    size_t *errlen);
+int ngx_http_lua_ffi_errlog_get_msg(char **log, int *loglevel,
+    unsigned char *err, size_t *errlen, double *log_time);
+
+int ngx_http_lua_ffi_errlog_get_sys_filter_level(ngx_http_request_t *r);
+]]
+
+
+local ERR_BUF_SIZE = 128
+local FFI_ERROR = base.FFI_ERROR
+
+
+function _M.set_filter_level(level)
+    if not level then
+        return nil, [[missing "level" argument]]
+    end
+
+    local err = get_string_buf(ERR_BUF_SIZE)
+    local errlen = get_size_ptr()
+    errlen[0] = ERR_BUF_SIZE
+    local rc = C.ngx_http_lua_ffi_errlog_set_filter_level(level, err, errlen)
+
+    if rc == FFI_ERROR then
+        return nil, ffi_string(err, errlen[0])
+    end
+
+    return true
+end
+
+
+function _M.get_logs(max, logs)
+    local err = get_string_buf(ERR_BUF_SIZE)
+    local errlen = get_size_ptr()
+    errlen[0] = ERR_BUF_SIZE
+
+    local log = charpp
+    local loglevel = intp
+    local log_time = num_value
+
+    max = max or 10
+
+    if not logs then
+        logs = new_tab(max * 3 + 1, 0)
+    end
+
+    local count = 0
+
+    for i = 1, max do
+        local loglen = C.ngx_http_lua_ffi_errlog_get_msg(log, loglevel, err,
+                                                         errlen, log_time)
+        if loglen == FFI_ERROR then
+            return nil, ffi_string(err, errlen[0])
+        end
+
+        if loglen > 0 then
+            logs[count + 1] = loglevel[0]
+            logs[count + 2] = log_time[0]
+            logs[count + 3] = ffi_string(log[0], loglen)
+
+            count = count + 3
+        end
+
+        if loglen < 0 then  -- no error log
+            logs[count + 1] = nil
+            break
+        end
+
+        if i == max then    -- last one
+            logs[count + 1] = nil
+            break
+        end
+    end
+
+    return logs
+end
+
+
+function _M.get_sys_filter_level()
+    local r = getfenv(0).__ngx_req
+    return tonumber(C.ngx_http_lua_ffi_errlog_get_sys_filter_level(r))
+end
+
+
+return _M