feature: added pure C API for FFI-based API for ngx.status.

Author: agentzh

src/ngx_http_lua_common.h

@@ -82,6 +82,12 @@ typedef struct {
 #define NGX_HTTP_LUA_CONTEXT_TIMER          0x80
 
 
+#ifndef NGX_HTTP_LUA_NO_FFI_API
+#define NGX_HTTP_LUA_FFI_NO_REQ_CTX         -1
+#define NGX_HTTP_LUA_FFI_BAD_CONTEXT        -2
+#endif
+
+
 typedef struct ngx_http_lua_main_conf_s ngx_http_lua_main_conf_t;
 
 

src/ngx_http_lua_misc.c

@@ -115,7 +115,6 @@ ngx_http_lua_ngx_set(lua_State *L)
     ngx_http_request_t          *r;
     u_char                      *p;
     size_t                       len;
-    ngx_http_lua_ctx_t          *ctx;
 
     /* we skip the first argument that is the table */
     p = (u_char *) luaL_checklstring(L, 2, &len);
@@ -128,16 +127,14 @@ ngx_http_lua_ngx_set(lua_State *L)
             return luaL_error(L, "no request object found");
         }
 
-        ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-
         if (r->header_sent) {
             ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                           "attempt to set ngx.status after sending out "
                           "response headers");
             return 0;
         }
 
-        ngx_http_lua_check_fake_request2(L, r, ctx);
+        ngx_http_lua_check_fake_request(L, r);
 
         /* get the value */
         r->headers_out.status = (ngx_uint_t) luaL_checknumber(L, 3);
@@ -172,4 +169,61 @@ ngx_http_lua_ngx_set(lua_State *L)
     return 0;
 }
 
+
+#ifndef NGX_HTTP_LUA_NO_FFI_API
+int
+ngx_http_lua_ffi_get_resp_status(ngx_http_request_t *r)
+{
+    if (r->connection->fd == -1) {
+        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
+    }
+
+    if (r->err_status) {
+        return r->err_status;
+
+    } else if (r->headers_out.status) {
+        return r->headers_out.status;
+
+    } else if (r->http_version == NGX_HTTP_VERSION_9) {
+        return 9;
+
+    } else {
+        return 0;
+    }
+}
+
+
+int
+ngx_http_lua_ffi_set_resp_status(ngx_http_request_t *r, int status)
+{
+    if (r->connection->fd == -1) {
+        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
+    }
+
+    if (r->header_sent) {
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                      "attempt to set ngx.status after sending out "
+                      "response headers");
+        return NGX_DECLINED;
+    }
+
+    r->headers_out.status = status;
+
+    if (status == 101) {
+        /*
+         * XXX work-around a bug in the Nginx core older than 1.5.5
+         * that 101 does not have a default status line
+         */
+
+        ngx_str_set(&r->headers_out.status_line, "101 Switching Protocols");
+
+    } else {
+        r->headers_out.status_line.len = 0;
+    }
+
+    return NGX_OK;
+}
+#endif /* NGX_HTTP_LUA_NO_FFI_API */
+
+
 /* vi:set ft=c ts=4 sw=4 et fdm=marker: */

t/107-timer-errors.t

@@ -127,7 +127,7 @@ registered timer
 
 --- error_log eval
 [
-qr/\[error\] .*? runtime error: \[string "content_by_lua"\]:3: API disabled in the context of ngx\.timer/,
+qr/\[error\] .*? runtime error: \[string "content_by_lua"\]:3: API disabled in the current context/,
 "lua ngx.timer expired",
 "http lua close fake http connection"
 ]