Merge branch 'master' into ssl-cert-by-lua

Author: agentzh

README.markdown

@@ -57,7 +57,7 @@ Production ready.
 Version
 =======
 
-This document describes ngx_lua [v0.9.13](https://github.com/openresty/lua-nginx-module/tags) released on 21 November 2014.
+This document describes ngx_lua [v0.9.15](https://github.com/openresty/lua-nginx-module/tags) released on 18 February 2015.
 
 Synopsis
 ========
@@ -197,10 +197,11 @@ Synopsis
      }
 
      # use nginx var in code path
-     # WARN: contents in nginx var must be carefully filtered,
+     # WARNING: contents in nginx var must be carefully filtered,
      # otherwise there'll be great security risk!
-     location ~ ^/app/(.+) {
-             content_by_lua_file /path/to/lua/app/root/$1.lua;
+     location ~ ^/app/([-_a-zA-Z0-9/]+) {
+         set $path $1;
+         content_by_lua_file /path/to/lua/app/root/$path.lua;
      }
 
      location / {
@@ -290,7 +291,7 @@ Nginx Compatibility
 ===================
 The latest module is compatible with the following versions of Nginx:
 
-* 1.7.x (last tested: 1.7.7)
+* 1.7.x (last tested: 1.7.10)
 * 1.6.x
 * 1.5.x (last tested: 1.5.12)
 * 1.4.x (last tested: 1.4.4)
@@ -306,7 +307,7 @@ The latest module is compatible with the following versions of Nginx:
 Installation
 ============
 
-The [ngx_openresty bundle](http://openresty.org) can be used to install Nginx, ngx_lua, either one of the standard Lua 5.1 interpreter or LuaJIT 2.0/2.1, as well as a package of powerful companion Nginx modules. The basic installation step is a simple `./configure --with-luajit && make && make install`.
+It is highly recommended to use the [ngx_openresty bundle](http://openresty.org) that bundles Nginx, ngx_lua,  LuaJIT 2.0/2.1 (or the optional standard Lua 5.1 interpreter), as well as a package of powerful companion Nginx modules. The basic installation step is a simple command: `./configure --with-luajit && make && make install`.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
@@ -319,9 +320,9 @@ Build the source with this module:
 
 ```bash
 
- wget 'http://nginx.org/download/nginx-1.7.7.tar.gz'
- tar -xzvf nginx-1.7.7.tar.gz
- cd nginx-1.7.7/
+ wget 'http://nginx.org/download/nginx-1.7.10.tar.gz'
+ tar -xzvf nginx-1.7.10.tar.gz
+ cd nginx-1.7.10/
 
  # tell nginx's build system where to find LuaJIT 2.0:
  export LUAJIT_LIB=/path/to/luajit/lib
@@ -337,6 +338,7 @@ Build the source with this module:
 
  # Here we assume Nginx is to be installed under /opt/nginx/.
  ./configure --prefix=/opt/nginx \
+         --with-ld-opt='-Wl,-rpath,/path/to/luajit-or-lua/lib" \
          --add-module=/path/to/ngx_devel_kit \
          --add-module=/path/to/lua-nginx-module
 
@@ -985,9 +987,9 @@ Copyright and License
 
 This module is licensed under the BSD license.
 
-Copyright (C) 2009-2014, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
+Copyright (C) 2009-2015, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2014, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+Copyright (C) 2009-2015, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
 
 All rights reserved.
 
@@ -1470,6 +1472,20 @@ and the Nginx config must be reloaded each time the Lua source file is modified.
 The Lua code cache can be temporarily disabled during development by 
 switching [lua_code_cache](#lua_code_cache) `off` in `nginx.conf` to avoid reloading Nginx.
 
+Nginx variables are supported in the file path for dynamic dispatch, for example:
+
+```nginx
+
+ # WARNING: contents in nginx var must be carefully filtered,
+ # otherwise there'll be great security risk!
+ location ~ ^/app/([-_a-zA-Z0-9/]+) {
+     set $path $1;
+     content_by_lua_file /path/to/lua/app/root/$path.lua;
+ }
+```
+
+But be very careful about malicious user inputs and always carefully validate or filter out the user-supplied path components.
+
 [Back to TOC](#directives)
 
 rewrite_by_lua
@@ -1615,6 +1631,8 @@ When the Lua code cache is turned on (by default), the user code is loaded once
 
 The `rewrite_by_lua_file` code will always run at the end of the `rewrite` request-processing phase unless [rewrite_by_lua_no_postpone](#rewrite_by_lua_no_postpone) is turned on.
 
+Nginx variables are supported in the file path for dynamic dispatch just as in [content_by_lua_file](#content_by_lua_file).
+
 [Back to TOC](#directives)
 
 access_by_lua
@@ -1709,6 +1727,8 @@ When the Lua code cache is turned on (by default), the user code is loaded once
 and the Nginx config must be reloaded each time the Lua source file is modified.
 The Lua code cache can be temporarily disabled during development by switching [lua_code_cache](#lua_code_cache) `off` in `nginx.conf` to avoid repeatedly reloading Nginx.
 
+Nginx variables are supported in the file path for dynamic dispatch just as in [content_by_lua_file](#content_by_lua_file).
+
 [Back to TOC](#directives)
 
 header_filter_by_lua

doc/HttpLuaModule.wiki

@@ -10,7 +10,7 @@ Production ready.
 
 = Version =
 
-This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.9.13] released on 21 November 2014.
+This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.9.15] released on 18 February 2015.
 
 = Synopsis =
 <geshi lang="nginx">
@@ -148,10 +148,11 @@ This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/t
         }
  
         # use nginx var in code path
-        # WARN: contents in nginx var must be carefully filtered,
+        # WARNING: contents in nginx var must be carefully filtered,
         # otherwise there'll be great security risk!
-        location ~ ^/app/(.+) {
-                content_by_lua_file /path/to/lua/app/root/$1.lua;
+        location ~ ^/app/([-_a-zA-Z0-9/]+) {
+            set $path $1;
+            content_by_lua_file /path/to/lua/app/root/$path.lua;
         }
  
         location / {
@@ -232,7 +233,7 @@ The Lua state (Lua VM instance) is shared across all the requests handled by a s
 = Nginx Compatibility =
 The latest module is compatible with the following versions of Nginx:
 
-* 1.7.x (last tested: 1.7.7)
+* 1.7.x (last tested: 1.7.10)
 * 1.6.x
 * 1.5.x (last tested: 1.5.12)
 * 1.4.x (last tested: 1.4.4)
@@ -245,7 +246,7 @@ The latest module is compatible with the following versions of Nginx:
 
 = Installation =
 
-The [http://openresty.org ngx_openresty bundle] can be used to install Nginx, ngx_lua, either one of the standard Lua 5.1 interpreter or LuaJIT 2.0/2.1, as well as a package of powerful companion Nginx modules. The basic installation step is a simple <code>./configure --with-luajit && make && make install</code>.
+It is highly recommended to use the [http://openresty.org ngx_openresty bundle] that bundles Nginx, ngx_lua,  LuaJIT 2.0/2.1 (or the optional standard Lua 5.1 interpreter), as well as a package of powerful companion Nginx modules. The basic installation step is a simple command: <code>./configure --with-luajit && make && make install</code>.
 
 Alternatively, ngx_lua can be manually compiled into Nginx:
 
@@ -257,9 +258,9 @@ Alternatively, ngx_lua can be manually compiled into Nginx:
 Build the source with this module:
 
 <geshi lang="bash">
-    wget 'http://nginx.org/download/nginx-1.7.7.tar.gz'
-    tar -xzvf nginx-1.7.7.tar.gz
-    cd nginx-1.7.7/
+    wget 'http://nginx.org/download/nginx-1.7.10.tar.gz'
+    tar -xzvf nginx-1.7.10.tar.gz
+    cd nginx-1.7.10/
 
     # tell nginx's build system where to find LuaJIT 2.0:
     export LUAJIT_LIB=/path/to/luajit/lib
@@ -275,6 +276,7 @@ Build the source with this module:
  
     # Here we assume Nginx is to be installed under /opt/nginx/.
     ./configure --prefix=/opt/nginx \
+            --with-ld-opt='-Wl,-rpath,/path/to/luajit-or-lua/lib" \
             --add-module=/path/to/ngx_devel_kit \
             --add-module=/path/to/lua-nginx-module
  
@@ -818,9 +820,9 @@ There are also various testing modes based on mockeagain, valgrind, and etc. Ref
 
 This module is licensed under the BSD license.
 
-Copyright (C) 2009-2014, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
+Copyright (C) 2009-2015, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
 
-Copyright (C) 2009-2014, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+Copyright (C) 2009-2015, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
 
 All rights reserved.
 
@@ -1205,6 +1207,19 @@ and the Nginx config must be reloaded each time the Lua source file is modified.
 The Lua code cache can be temporarily disabled during development by 
 switching [[#lua_code_cache|lua_code_cache]] <code>off</code> in <code>nginx.conf</code> to avoid reloading Nginx.
 
+Nginx variables are supported in the file path for dynamic dispatch, for example:
+
+<geshi lang="nginx">
+    # WARNING: contents in nginx var must be carefully filtered,
+    # otherwise there'll be great security risk!
+    location ~ ^/app/([-_a-zA-Z0-9/]+) {
+        set $path $1;
+        content_by_lua_file /path/to/lua/app/root/$path.lua;
+    }
+</geshi>
+
+But be very careful about malicious user inputs and always carefully validate or filter out the user-supplied path components.
+
 == rewrite_by_lua ==
 
 '''syntax:''' ''rewrite_by_lua <lua-script-str>''
@@ -1338,6 +1353,8 @@ When the Lua code cache is turned on (by default), the user code is loaded once
 
 The <code>rewrite_by_lua_file</code> code will always run at the end of the <code>rewrite</code> request-processing phase unless [[#rewrite_by_lua_no_postpone|rewrite_by_lua_no_postpone]] is turned on.
 
+Nginx variables are supported in the file path for dynamic dispatch just as in [[#content_by_lua_file|content_by_lua_file]].
+
 == access_by_lua ==
 
 '''syntax:''' ''access_by_lua <lua-script-str>''
@@ -1423,6 +1440,8 @@ When the Lua code cache is turned on (by default), the user code is loaded once
 and the Nginx config must be reloaded each time the Lua source file is modified.
 The Lua code cache can be temporarily disabled during development by switching [[#lua_code_cache|lua_code_cache]] <code>off</code> in <code>nginx.conf</code> to avoid repeatedly reloading Nginx.
 
+Nginx variables are supported in the file path for dynamic dispatch just as in [[#content_by_lua_file|content_by_lua_file]].
+
 == header_filter_by_lua ==
 
 '''syntax:''' ''header_filter_by_lua <lua-script-str>''

src/api/ngx_http_lua_api.h

@@ -19,7 +19,7 @@
 /* Public API for other Nginx modules */
 
 
-#define ngx_http_lua_version  9014
+#define ngx_http_lua_version  9015
 
 
 typedef struct {

src/ngx_http_lua_common.h

@@ -300,9 +300,6 @@ struct ngx_http_lua_co_ctx_s {
 
     ngx_http_cleanup_pt      cleanup;
 
-    unsigned                 nsubreqs;  /* number of subrequests of the
-                                         * current request */
-
     ngx_int_t               *sr_statuses; /* all capture subrequest statuses */
 
     ngx_http_headers_out_t **sr_headers;
@@ -311,6 +308,9 @@ struct ngx_http_lua_co_ctx_s {
 
     uint8_t                 *sr_flags;
 
+    unsigned                 nsubreqs;  /* number of subrequests of the
+                                         * current request */
+
     unsigned                 pending_subreqs; /* number of subrequests being
                                                  waited */
 
@@ -378,8 +378,6 @@ typedef struct ngx_http_lua_ctx_s {
     unsigned                 flushing_coros; /* number of coroutines waiting on
                                                 ngx.flush(true) */
 
-    int                      uthreads; /* number of active user threads */
-
     ngx_chain_t             *out;  /* buffered output chain for HTTP 1.0 */
     ngx_chain_t             *free_bufs;
     ngx_chain_t             *busy_bufs;
@@ -406,6 +404,8 @@ typedef struct ngx_http_lua_ctx_s {
 
     ngx_http_lua_posted_thread_t   *posted_threads;
 
+    int                      uthreads; /* number of active user threads */
+
     uint16_t                 context;   /* the current running directive context
                                            (or running phase) for the current
                                            Lua chunk */

src/ngx_http_lua_control.c

@@ -196,6 +196,7 @@ ngx_http_lua_ngx_redirect(lua_State *L)
     u_char                      *p;
     u_char                      *uri;
     size_t                       len;
+    ngx_table_elt_t             *h;
     ngx_http_request_t          *r;
 
     n = lua_gettop(L);
@@ -247,23 +248,23 @@ ngx_http_lua_ngx_redirect(lua_State *L)
 
     ngx_memcpy(uri, p, len);
 
-    r->headers_out.location = ngx_list_push(&r->headers_out.headers);
-    if (r->headers_out.location == NULL) {
+    h = ngx_list_push(&r->headers_out.headers);
+    if (h == NULL) {
         return luaL_error(L, "no memory");
     }
 
-    r->headers_out.location->hash = ngx_http_lua_location_hash;
+    h->hash = ngx_http_lua_location_hash;
 
 #if 0
     dd("location hash: %lu == %lu",
-            (unsigned long) r->headers_out.location->hash,
+            (unsigned long) h->hash,
             (unsigned long) ngx_hash_key_lc((u_char *) "Location",
             sizeof("Location") - 1));
 #endif
 
-    r->headers_out.location->value.len = len;
-    r->headers_out.location->value.data = uri;
-    ngx_str_set(&r->headers_out.location->key, "Location");
+    h->value.len = len;
+    h->value.data = uri;
+    ngx_str_set(&h->key, "Location");
 
     r->headers_out.status = rc;
 
@@ -272,7 +273,16 @@ ngx_http_lua_ngx_redirect(lua_State *L)
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                    "lua redirect to \"%V\" with code %i",
-                   &r->headers_out.location->value, ctx->exit_code);
+                   &h->value, ctx->exit_code);
+
+    if (len && uri[0] != '/') {
+        r->headers_out.location = h;
+    }
+
+    /*
+     * we do not set r->headers_out.location here to avoid the handling
+     * the local redirects without a host name by ngx_http_header_filter()
+     */
 
     return lua_yield(L, 0);
 }

src/ngx_http_lua_headerfilterby.c

@@ -28,10 +28,6 @@
 static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
 
 
-/* light user data key for the "ngx" table in the Lua VM regsitry */
-static char ngx_http_lua_headerfilterby_ngx_key;
-
-
 /**
  * Set environment table for the given code closure.
  *
@@ -64,12 +60,6 @@ ngx_http_lua_header_filter_by_lua_env(lua_State *L, ngx_http_request_t *r)
      * */
     ngx_http_lua_create_new_globals_table(L, 0 /* narr */, 1 /* nrec */);
 
-    /*  {{{ initialize ngx.* namespace */
-    lua_pushlightuserdata(L, &ngx_http_lua_headerfilterby_ngx_key);
-    lua_rawget(L, LUA_REGISTRYINDEX);
-    lua_setfield(L, -2, "ngx");
-    /*  }}} */
-
     /*  {{{ make new env inheriting main thread's globals table */
     lua_createtable(L, 0, 1 /* nrec */);   /* the metatable for the new env */
     ngx_http_lua_get_globals_table(L);
@@ -141,6 +131,11 @@ ngx_http_lua_header_filter_by_chunk(lua_State *L, ngx_http_request_t *r)
     dd("exited: %d, exit code: %d, old exit code: %d",
        (int) ctx->exited, (int) ctx->exit_code, (int) old_exit_code);
 
+#if 1
+    /*  clear Lua stack */
+    lua_settop(L, 0);
+#endif
+
     if (ctx->exited && ctx->exit_code != old_exit_code) {
         if (ctx->exit_code == NGX_ERROR) {
             return NGX_ERROR;
@@ -157,9 +152,6 @@ ngx_http_lua_header_filter_by_chunk(lua_State *L, ngx_http_request_t *r)
         return NGX_DECLINED;
     }
 
-    /*  clear Lua stack */
-    lua_settop(L, 0);
-
     return NGX_OK;
 }