Merge branch 'master' into ffi

Author: agentzh

.gitignore

@@ -150,6 +150,7 @@ src/phase.[ch]
 src/probe.h
 src/uthread.[ch]
 src/timer.[ch]
+src/config.[ch]
 *.plist
 lua
 ttimer

README

@@ -207,6 +207,13 @@ Description
 
     *   lua-resty-upload (<https://github.com/agentzh/lua-resty-upload>)
 
+    *   lua-resty-websocket
+        (<https://github.com/agentzh/lua-resty-websocket>)
+
+    *   lua-resty-lock (<https://github.com/agentzh/lua-resty-lock>)
+
+    *   lua-resty-string (<https://github.com/agentzh/lua-resty-string>)
+
     *   ngx_memc
 
     *   ngx_postgres (<https://github.com/FRiCKLE/ngx_postgres>)
@@ -3822,21 +3829,21 @@ Nginx API for Lua
 
     The optional fourth argument, "ctx", can be a Lua table holding an
     optional "pos" field. When the "pos" field in the "ctx" table argument
-    is specified, "ngx.re.match" will start matching from that offset.
-    Regardless of the presence of the "pos" field in the "ctx" table,
-    "ngx.re.match" will always set this "pos" field to the position *after*
-    the substring matched by the whole pattern in case of a successful
-    match. When match fails, the "ctx" table will be left intact.
+    is specified, "ngx.re.match" will start matching from that offset
+    (starting from 1). Regardless of the presence of the "pos" field in the
+    "ctx" table, "ngx.re.match" will always set this "pos" field to the
+    position *after* the substring matched by the whole pattern in case of a
+    successful match. When match fails, the "ctx" table will be left intact.
 
         local ctx = {}
         local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
              -- m[0] = "1234"
-             -- ctx.pos == 4
+             -- ctx.pos == 5
 
         local ctx = { pos = 2 }
         local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
              -- m[0] = "34"
-             -- ctx.pos == 4
+             -- ctx.pos == 5
 
     The "ctx" table argument combined with the "a" regex modifier can be
     used to construct a lexer atop "ngx.re.match".

README.markdown

@@ -400,6 +400,9 @@ At least the following Lua libraries and Nginx modules can be used with this ngx
 * [lua-resty-redis](https://github.com/agentzh/lua-resty-redis)
 * [lua-resty-dns](https://github.com/agentzh/lua-resty-dns)
 * [lua-resty-upload](https://github.com/agentzh/lua-resty-upload)
+* [lua-resty-websocket](https://github.com/agentzh/lua-resty-websocket)
+* [lua-resty-lock](https://github.com/agentzh/lua-resty-lock)
+* [lua-resty-string](https://github.com/agentzh/lua-resty-string)
 * [ngx_memc](http://github.com/agentzh/memc-nginx-module)
 * [ngx_postgres](https://github.com/FRiCKLE/ngx_postgres)
 * [ngx_redis2](http://github.com/agentzh/redis2-nginx-module)
@@ -4079,22 +4082,22 @@ These options can be combined:
 
 The `o` option is useful for performance tuning, because the regex pattern in question will only be compiled once, cached in the worker-process level, and shared among all requests in the current Nginx worker process. The upper limit of the regex cache can be tuned via the [lua_regex_cache_max_entries](#lua_regex_cache_max_entries) directive.
 
-The optional fourth argument, `ctx`, can be a Lua table holding an optional `pos` field. When the `pos` field in the `ctx` table argument is specified, `ngx.re.match` will start matching from that offset. Regardless of the presence of the `pos` field in the `ctx` table, `ngx.re.match` will always set this `pos` field to the position *after* the substring matched by the whole pattern in case of a successful match. When match fails, the `ctx` table will be left intact.
+The optional fourth argument, `ctx`, can be a Lua table holding an optional `pos` field. When the `pos` field in the `ctx` table argument is specified, `ngx.re.match` will start matching from that offset (starting from 1). Regardless of the presence of the `pos` field in the `ctx` table, `ngx.re.match` will always set this `pos` field to the position *after* the substring matched by the whole pattern in case of a successful match. When match fails, the `ctx` table will be left intact.
 
 ```lua
 
     local ctx = {}
     local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
          -- m[0] = "1234"
-         -- ctx.pos == 4
+         -- ctx.pos == 5
 ```
 
 ```lua
 
     local ctx = { pos = 2 }
     local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
          -- m[0] = "34"
-         -- ctx.pos == 4
+         -- ctx.pos == 5
 ```
 
 The `ctx` table argument combined with the `a` regex modifier can be used to construct a lexer atop `ngx.re.match`.

doc/HttpLuaModule.wiki

@@ -195,6 +195,9 @@ At least the following Lua libraries and Nginx modules can be used with this ngx
 * [https://github.com/agentzh/lua-resty-redis lua-resty-redis]
 * [https://github.com/agentzh/lua-resty-dns lua-resty-dns]
 * [https://github.com/agentzh/lua-resty-upload lua-resty-upload]
+* [https://github.com/agentzh/lua-resty-websocket lua-resty-websocket]
+* [https://github.com/agentzh/lua-resty-lock lua-resty-lock]
+* [https://github.com/agentzh/lua-resty-string lua-resty-string]
 * [[HttpMemcModule|ngx_memc]]
 * [https://github.com/FRiCKLE/ngx_postgres ngx_postgres]
 * [[HttpRedis2Module|ngx_redis2]]
@@ -3394,20 +3397,20 @@ These options can be combined:
 
 The <code>o</code> option is useful for performance tuning, because the regex pattern in question will only be compiled once, cached in the worker-process level, and shared among all requests in the current Nginx worker process. The upper limit of the regex cache can be tuned via the [[#lua_regex_cache_max_entries|lua_regex_cache_max_entries]] directive.
 
-The optional fourth argument, <code>ctx</code>, can be a Lua table holding an optional <code>pos</code> field. When the <code>pos</code> field in the <code>ctx</code> table argument is specified, <code>ngx.re.match</code> will start matching from that offset. Regardless of the presence of the <code>pos</code> field in the <code>ctx</code> table, <code>ngx.re.match</code> will always set this <code>pos</code> field to the position ''after'' the substring matched by the whole pattern in case of a successful match. When match fails, the <code>ctx</code> table will be left intact.
+The optional fourth argument, <code>ctx</code>, can be a Lua table holding an optional <code>pos</code> field. When the <code>pos</code> field in the <code>ctx</code> table argument is specified, <code>ngx.re.match</code> will start matching from that offset (starting from 1). Regardless of the presence of the <code>pos</code> field in the <code>ctx</code> table, <code>ngx.re.match</code> will always set this <code>pos</code> field to the position ''after'' the substring matched by the whole pattern in case of a successful match. When match fails, the <code>ctx</code> table will be left intact.
 
 <geshi lang="lua">
     local ctx = {}
     local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
          -- m[0] = "1234"
-         -- ctx.pos == 4
+         -- ctx.pos == 5
 </geshi>
 
 <geshi lang="lua">
     local ctx = { pos = 2 }
     local m, err = ngx.re.match("1234, hello", "[0-9]+", "", ctx)
          -- m[0] = "34"
-         -- ctx.pos == 4
+         -- ctx.pos == 5
 </geshi>
 
 The <code>ctx</code> table argument combined with the <code>a</code> regex modifier can be used to construct a lexer atop <code>ngx.re.match</code>.

src/ngx_http_lua_module.c

@@ -738,9 +738,9 @@ ngx_http_lua_cleanup_vm(void *data)
     lua_State *L = data;
 
     if (L != NULL) {
+        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "lua close the "
+                       "global Lua VM");
         lua_close(L);
-
-        dd("Lua VM closed!");
     }
 }
 
@@ -753,8 +753,11 @@ ngx_http_lua_init_vm(ngx_conf_t *cf, ngx_http_lua_main_conf_t *lmcf)
     lua_State                       *L;
     ngx_uint_t                       i;
 
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, "lua initialize the "
+                   "global Lua VM");
+
     ngx_http_lua_content_length_hash =
-        ngx_http_lua_hash_literal("content-length");
+                                  ngx_http_lua_hash_literal("content-length");
 
     ngx_http_lua_location_hash = ngx_http_lua_hash_literal("location");
 

src/ngx_http_lua_regex.c

@@ -88,6 +88,8 @@ static int ngx_http_lua_ngx_re_gmatch_iterator(lua_State *L);
 static ngx_uint_t ngx_http_lua_ngx_re_parse_opts(lua_State *L,
     ngx_http_lua_regex_compile_t *re, ngx_str_t *opts, int narg);
 static int ngx_http_lua_ngx_re_sub_helper(lua_State *L, unsigned global);
+static int ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps);
+static int ngx_http_lua_ngx_re_find(lua_State *L);
 static int ngx_http_lua_ngx_re_match(lua_State *L);
 static int ngx_http_lua_ngx_re_gmatch(lua_State *L);
 static int ngx_http_lua_ngx_re_sub(lua_State *L);
@@ -115,6 +117,20 @@ static void ngx_http_lua_re_collect_named_captures(lua_State *L,
 
 static int
 ngx_http_lua_ngx_re_match(lua_State *L)
+{
+    return ngx_http_lua_ngx_re_match_helper(L, 1 /* want captures */);
+}
+
+
+static int
+ngx_http_lua_ngx_re_find(lua_State *L)
+{
+    return ngx_http_lua_ngx_re_match_helper(L, 0 /* want captures */);
+}
+
+
+static int
+ngx_http_lua_ngx_re_match_helper(lua_State *L, int wantcaps)
 {
     /* u_char                      *p; */
     ngx_http_request_t          *r;
@@ -166,8 +182,11 @@ ngx_http_lua_ngx_re_match(lua_State *L)
             lua_getfield(L, 4, "pos");
             if (lua_isnumber(L, -1)) {
                 pos = (ngx_int_t) lua_tointeger(L, -1);
-                if (pos < 0) {
+                if (pos <= 0) {
                     pos = 0;
+
+                } else {
+                    pos--;  /* 1-based on the Lua land */
                 }
 
             } else if (lua_isnil(L, -1)) {
@@ -293,8 +312,11 @@ ngx_http_lua_ngx_re_match(lua_State *L)
         dd("compile failed");
 
         lua_pushnil(L);
+        if (!wantcaps) {
+            lua_pushnil(L);
+        }
         lua_pushlstring(L, (char *) re_comp.err.data, re_comp.err.len);
-        return 2;
+        return wantcaps ? 2 : 3;
     }
 
 #if (LUA_HAVE_PCRE_JIT)
@@ -480,7 +502,10 @@ ngx_http_lua_ngx_re_match(lua_State *L)
         }
 
         lua_pushnil(L);
-        return 1;
+        if (!wantcaps) {
+            lua_pushnil(L);
+        }
+        return wantcaps ? 1 : 2;
     }
 
     if (rc < 0) {
@@ -500,6 +525,18 @@ ngx_http_lua_ngx_re_match(lua_State *L)
 
     dd("rc = %d", (int) rc);
 
+    if (nargs == 4) { /* having ctx table */
+        pos = cap[1];
+        lua_pushinteger(L, (lua_Integer) (pos + 1));
+        lua_setfield(L, 4, "pos");
+    }
+
+    if (!wantcaps) {
+        lua_pushinteger(L, cap[0] + 1);
+        lua_pushinteger(L, cap[1]);
+        return 2;
+    }
+
     lua_createtable(L, rc /* narr */, 0 /* nrec */);
 
     for (i = 0, n = 0; i < rc; i++, n += 2) {
@@ -522,12 +559,6 @@ ngx_http_lua_ngx_re_match(lua_State *L)
                                                name_entry_size, flags, &subj);
     }
 
-    if (nargs == 4) { /* having ctx table */
-        pos = cap[1];
-        lua_pushinteger(L, (lua_Integer) pos);
-        lua_setfield(L, 4, "pos");
-    }
-
     if (!(flags & NGX_LUA_RE_COMPILE_ONCE)) {
 
         if (sd) {
@@ -556,8 +587,11 @@ ngx_http_lua_ngx_re_match(lua_State *L)
     }
 
     lua_pushnil(L);
+    if (!wantcaps) {
+        lua_pushnil(L);
+    }
     lua_pushstring(L, msg);
-    return 2;
+    return wantcaps ? 2 : 3;
 }
 
 
@@ -1815,7 +1849,10 @@ ngx_http_lua_inject_regex_api(lua_State *L)
 {
     /* ngx.re */
 
-    lua_createtable(L, 0, 4 /* nrec */);    /* .re */
+    lua_createtable(L, 0, 5 /* nrec */);    /* .re */
+
+    lua_pushcfunction(L, ngx_http_lua_ngx_re_find);
+    lua_setfield(L, -2, "find");
 
     lua_pushcfunction(L, ngx_http_lua_ngx_re_match);
     lua_setfield(L, -2, "match");

src/ngx_http_lua_util.h

@@ -48,6 +48,11 @@ extern char ngx_http_lua_req_get_headers_metatable_key;
 #endif
 
 
+#if defined(nginx_version) && nginx_version < 1000000
+#define ngx_memmove(dst, src, n)   (void) memmove(dst, src, n)
+#endif
+
+
 #define ngx_http_lua_context_name(c)                                         \
     ((c) == NGX_HTTP_LUA_CONTEXT_SET ? "set_by_lua*"                         \
      : (c) == NGX_HTTP_LUA_CONTEXT_REWRITE ? "rewrite_by_lua*"               \

t/034-match.t

@@ -202,7 +202,7 @@ not matched: nil
 
 
 
-=== TEST 10: case sensitive by default
+=== TEST 10: case insensitive
 --- config
     location /re {
         content_by_lua '
@@ -495,15 +495,15 @@ not matched!
     GET /re
 --- response_body
 1234
-4
+5
 
 
 
 === TEST 24: match with ctx and a pos
 --- config
     location /re {
         content_by_lua '
-            local ctx = { pos = 2 }
+            local ctx = { pos = 3 }
             m = ngx.re.match("1234, hello", "([0-9]+)", "", ctx)
             if m then
                 ngx.say(m[0])
@@ -518,7 +518,7 @@ not matched!
     GET /re
 --- response_body
 34
-4
+5
 
 
 
@@ -732,7 +732,7 @@ done
 --- request
     GET /re
 --- response_body
-pos: 0
+pos: 1
 m: 
 --- no_error_log
 [error]

t/038-match-o.t

@@ -471,15 +471,15 @@ not matched!
     GET /re
 --- response_body
 1234
-4
+5
 
 
 
 === TEST 23: match with ctx and a pos
 --- config
     location /re {
         content_by_lua '
-            local ctx = { pos = 2 }
+            local ctx = { pos = 3 }
             m = ngx.re.match("1234, hello", "([0-9]+)", "o", ctx)
             if m then
                 ngx.say(m[0])
@@ -494,7 +494,7 @@ not matched!
     GET /re
 --- response_body
 34
-4
+5
 
 
 
@@ -574,7 +574,7 @@ nil
             ngx.say(m and m[0])
             ngx.say(ctx.pos)
 
-            ctx.pos = 0
+            ctx.pos = 1
             m = ngx.re.match("hi, 1234", "([A-Z]+)", "o", ctx)
             ngx.say(m and m[0])
             ngx.say(ctx.pos)
@@ -584,11 +584,11 @@ nil
     GET /re
 --- response_body
 hello
-5
+6
 okay
-10
+11
 nil
-0
+1
 
 
 

t/062-count.t

@@ -359,7 +359,7 @@ n = 2
 --- request
 GET /test
 --- response_body
-n = 4
+n = 5
 --- no_error_log
 [error]