feature: implemented the set_by_lua_block directive.

Author: agentzh

src/ngx_http_lua_directive.c

@@ -205,6 +205,25 @@ ngx_http_lua_package_path(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 
 
 #if defined(NDK) && NDK
+char *
+ngx_http_lua_set_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    char        *rv;
+    ngx_conf_t   save;
+
+    save = *cf;
+    cf->handler = ngx_http_lua_set_by_lua;
+    cf->handler_conf = conf;
+
+    rv = ngx_http_lua_conf_lua_block_parse(cf, cmd);
+
+    *cf = save;
+
+    return rv;
+}
+
+
 char *
 ngx_http_lua_set_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -1356,7 +1375,9 @@ ngx_http_lua_conf_lua_block_parse(ngx_conf_t *cf, ngx_command_t *cmd)
 
                 dd("saved nelts: %d", (int) saved->nelts);
                 dd("temp nelts: %d", (int) cf->args->nelts);
+#if 0
                 ngx_http_lua_assert(saved->nelts == 1);
+#endif
 
                 dst = ngx_array_push(saved);
                 if (dst == NULL) {

src/ngx_http_lua_directive.h

@@ -53,6 +53,8 @@ char *ngx_http_lua_code_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
 
 #if defined(NDK) && NDK
 
+char *ngx_http_lua_set_by_lua_block(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 char *ngx_http_lua_set_by_lua(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
 char *ngx_http_lua_set_by_lua_file(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);

src/ngx_http_lua_module.c

@@ -192,6 +192,15 @@ static ngx_command_t ngx_http_lua_cmds[] = {
       (void *) ngx_http_lua_init_worker_by_file },
 
 #if defined(NDK) && NDK
+    /* set_by_lua $res { inline Lua code } [$arg1 [$arg2 [...]]] */
+    { ngx_string("set_by_lua_block"),
+      NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                       |NGX_CONF_1MORE|NGX_CONF_BLOCK,
+      ngx_http_lua_set_by_lua_block,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      (void *) ngx_http_lua_filter_set_by_lua_inline },
+
     /* set_by_lua $res <inline script> [$arg1 [$arg2 [...]]] */
     { ngx_string("set_by_lua"),
       NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF

t/132-lua-blocks.t

@@ -381,3 +381,33 @@ GET /t
 --- error_log eval
 qr{\[emerg\] .*? unexpected lua closing long-bracket in .*?/nginx\.conf:41}
 --- must_die
+
+
+
+=== TEST 15: simple set_by_lua_block (integer)
+--- config
+    location /lua {
+        set_by_lua_block $res { return 1+1 }
+        echo $res;
+    }
+--- request
+GET /lua
+--- response_body
+2
+--- no_error_log
+[error]
+
+
+
+=== TEST 16: set_by_lua_block with arguments
+--- config
+    location /lua {
+        set_by_lua $res "return ngx.arg[1] + ngx.arg[2]" $arg_a $arg_b;
+        echo $res;
+    }
+--- request
+GET /lua?a=1&b=2
+--- response_body
+3
+--- no_error_log
+[error]