New features for ngx_lua

config

@@ -219,6 +219,7 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
                 $ngx_addon_dir/src/ngx_http_lua_initby.c \
                 $ngx_addon_dir/src/ngx_http_lua_socket_udp.c \
                 $ngx_addon_dir/src/ngx_http_lua_req_method.c \
+                $ngx_addon_dir/src/ngx_http_lua_req_keepalive.c \
                 $ngx_addon_dir/src/ngx_http_lua_phase.c \
                 $ngx_addon_dir/src/ngx_http_lua_uthread.c \
                 $ngx_addon_dir/src/ngx_http_lua_timer.c \
@@ -269,6 +270,7 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
                 $ngx_addon_dir/src/ngx_http_lua_initby.h \
                 $ngx_addon_dir/src/ngx_http_lua_socket_udp.h \
                 $ngx_addon_dir/src/ngx_http_lua_req_method.h \
+                $ngx_addon_dir/src/ngx_http_lua_req_keepalive.h \
                 $ngx_addon_dir/src/ngx_http_lua_phase.h \
                 $ngx_addon_dir/src/ngx_http_lua_probe.h \
                 $ngx_addon_dir/src/ngx_http_lua_uthread.h \

src/ngx_http_lua_capturefilter.c

@@ -16,7 +16,7 @@
 #include "ngx_http_lua_util.h"
 #include "ngx_http_lua_exception.h"
 #include "ngx_http_lua_subrequest.h"
-
+#include "ngx_http_lua_contentby.h"
 
 ngx_http_output_header_filter_pt ngx_http_lua_next_header_filter;
 ngx_http_output_body_filter_pt ngx_http_lua_next_body_filter;
@@ -104,6 +104,15 @@ ngx_http_lua_capture_header_filter(ngx_http_request_t *r)
 }
 
 
+#ifdef NGX_LUA_CAPTURE_DOWN_STREAMING
+static ngx_int_t
+_should_store_chain_link(ngx_chain_t *in)
+{
+    return ((in != NULL) && ((in->buf->pos != in->buf->last)));
+}
+#endif
+
+
 static ngx_int_t
 ngx_http_lua_capture_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 {
@@ -162,6 +171,40 @@ ngx_http_lua_capture_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
         ctx->seen_last_for_subreq = 1;
     }
 
+#ifdef NGX_LUA_CAPTURE_DOWN_STREAMING
+    if (pr_ctx->async_capture) {
+        /* In order to wake the parent up, we should call post and not discard
+           the buffer */
+        pr_ctx->current_subrequest = r;       /* Required for wake up (?) */
+        pr_ctx->current_subrequest_ctx = ctx; /* Required for the buffer */
+
+        /* XXX: In some cases, pr_ctx->current_subrequest_buffer is being
+                cleaned by Nginx and buf gets the value 0x1... */
+        if (((pr_ctx->current_subrequest_buffer == NULL)
+             || (pr_ctx->current_subrequest_buffer->buf == (void *) 1))
+            && (_should_store_chain_link(in))) {
+            pr_ctx->current_subrequest_buffer = in;
+        }
+
+        /* TODO: Is this line needed? */
+        r->parent->write_event_handler = ngx_http_lua_content_wev_handler;
+
+        if (!eof) {
+            pr_ctx->wakeup_subrequest = 1;
+            /* On EOF, the post subrequest callback is called, and it handles
+               the setting of the resume handler. The parent request would be
+               woken up anyway by Nginx.
+             */
+            if (ngx_http_post_request(r->parent, NULL) != NGX_OK) {
+                return NGX_ERROR;
+            }
+            return NGX_OK;
+        } else {
+            pr_ctx->wakeup_subrequest = 0;
+        }
+    }
+#endif
+
     ngx_http_lua_discard_bufs(r->pool, in);
 
     return NGX_OK;

src/ngx_http_lua_common.h

@@ -201,6 +201,16 @@ typedef struct {
     ngx_flag_t                       transform_underscores_in_resp_headers;
     ngx_flag_t                       log_socket_errors;
     ngx_flag_t                       check_client_abort;
+
+    ngx_flag_t                       enforce_content_type;
+    ngx_flag_t                       correct_location_header;
+
+#if (NGX_HTTP_SSL)
+    ngx_ssl_t                       *ssl;
+    ngx_flag_t                       ssl_verify;
+    ngx_uint_t                       ssl_verify_depth;
+    ngx_str_t                        ssl_trusted_certificate;
+#endif
 } ngx_http_lua_loc_conf_t;
 
 
@@ -330,6 +340,19 @@ typedef struct ngx_http_lua_ctx_s {
 
     ngx_int_t                exit_code;
 
+#ifdef NGX_LUA_CAPTURE_DOWN_STREAMING
+    ngx_int_t                  async_capture;
+    ngx_http_request_t        *current_subrequest;
+    struct ngx_http_lua_ctx_s *current_subrequest_ctx;
+    ngx_chain_t               *current_subrequest_buffer;
+    ngx_int_t                  returned_headers;
+#endif
+
+    ngx_http_lua_co_ctx_t     *calling_coctx; /* co ctx for the caller to location.capture */
+
+    ngx_http_lua_co_ctx_t   *req_body_reader_co_ctx; /* co ctx for the coroutine
+                                                        reading the request
+                                                        body */
     ngx_http_lua_co_ctx_t   *downstream_co_ctx; /* co ctx for the coroutine
                                                    reading the request body */
 
@@ -371,6 +394,11 @@ typedef struct ngx_http_lua_ctx_s {
     unsigned         headers_set:1; /* whether the user has set custom
                                        response headers */
 
+#ifdef NGX_LUA_CAPTURE_DOWN_STREAMING
+    unsigned         wakeup_subrequest:1;
+    unsigned         subrequest_yield:1;
+#endif
+
     unsigned         entered_rewrite_phase:1;
     unsigned         entered_access_phase:1;
     unsigned         entered_content_phase:1;

src/ngx_http_lua_contentby.c

@@ -20,6 +20,12 @@
 
 static void ngx_http_lua_content_phase_post_read(ngx_http_request_t *r);
 
+#ifdef NGX_LUA_CAPTURE_DOWN_STREAMING
+static ngx_int_t _is_chain_valid(ngx_chain_t * cl);
+static ngx_int_t _is_last_chain_link(ngx_chain_t * cl);
+static ngx_int_t _post_request_if_not_posted(ngx_http_request_t *r,
+    ngx_http_posted_request_t *pr);
+#endif
 
 ngx_int_t
 ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
@@ -115,17 +121,67 @@ ngx_http_lua_content_by_chunk(lua_State *L, ngx_http_request_t *r)
 }
 
 
+#ifdef NGX_LUA_CAPTURE_DOWN_STREAMING
+static ngx_int_t
+_post_request_if_not_posted(ngx_http_request_t *r, ngx_http_posted_request_t *pr)
+{
+    ngx_http_posted_request_t  *p;
+
+    /* Search request in the posted requests list, so that it would not be posted twice. */
+    for (p = r->main->posted_requests; p; p = p->next) {
+        if (p->request == r) {
+            return NGX_OK;
+        }
+    }
+
+    return ngx_http_post_request(r, pr);
+}
+
+static ngx_int_t
+_is_chain_valid(ngx_chain_t * cl)
+{
+    /* For some reason, sometimes when cl->buf is cleaned, 1 is assigned to it. */
+    return ((cl != NULL) && (cl->buf != NULL) && (cl->buf != (void *) 1));
+}
+static ngx_int_t
+_is_last_chain_link(ngx_chain_t * cl)
+{
+    /* last_in_chain is for subrequests. */
+    return cl->buf->last_in_chain || cl->buf->last_buf;
+}
+#endif
+
 void
 ngx_http_lua_content_wev_handler(ngx_http_request_t *r)
 {
     ngx_http_lua_ctx_t          *ctx;
+    ngx_int_t rc;
 
     ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
     if (ctx == NULL) {
         return;
     }
 
-    (void) ctx->resume_handler(r);
+    rc = ctx->resume_handler(r);
+
+    if (rc == NGX_DONE) {
+        return;
+    }
+
+#ifdef NGX_LUA_CAPTURE_DOWN_STREAMING
+    if (ctx->current_subrequest && ctx->wakeup_subrequest) {
+        /* Make sure that the subrequest continues */
+        if (_post_request_if_not_posted(ctx->current_subrequest, NULL) != NGX_OK) {
+            ngx_http_lua_finalize_request(r, NGX_ERROR);
+        }
+        /* Don't try to discard the last buffer, as it will cause a NULL dereference... */
+        if (_is_chain_valid(ctx->current_subrequest_buffer) && (!_is_last_chain_link(ctx->current_subrequest_buffer))) {
+            ngx_http_lua_discard_bufs(ctx->current_subrequest->pool, ctx->current_subrequest_buffer);
+        }
+        ctx->current_subrequest_buffer = NULL;
+        ctx->wakeup_subrequest = 0;
+    }
+#endif
 }
 
 

src/ngx_http_lua_headers.c

@@ -485,7 +485,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
         }
     }
 
-    if (!ctx->headers_set) {
+    if (!ctx->headers_set && llcf->enforce_content_type) {
         rc = ngx_http_set_content_type(r);
         if (rc != NGX_OK) {
             return luaL_error(L,
@@ -531,6 +531,7 @@ ngx_http_lua_ngx_header_set(lua_State *L)
                 }
             }
 
+            ctx->headers_set = 1;
             return 0;
         }
 
@@ -555,19 +556,28 @@ ngx_http_lua_ngx_header_set(lua_State *L)
                           key.data, (int) rc);
     }
 
+    ctx->headers_set = 1;
     return 0;
 }
 
 
 static int
 ngx_http_lua_ngx_req_header_clear(lua_State *L)
 {
-    if (lua_gettop(L) != 1) {
-        return luaL_error(L, "expecting one arguments, but seen %d",
+    ngx_uint_t n;
+    n = lua_gettop(L);
+    if ((n != 1) && (n != 2)) {
+        return luaL_error(L, "expecting one or two arguments, but seen %d",
                           lua_gettop(L));
     }
 
-    lua_pushnil(L);
+    if (n == 2) {
+        lua_pushnil(L);
+        /* Top element is now 3, replace it with element 3 */
+        lua_insert(L, 2);
+    } else {
+        lua_pushnil(L);
+    }
 
     return ngx_http_lua_ngx_req_header_set_helper(L);
 }
@@ -576,7 +586,7 @@ ngx_http_lua_ngx_req_header_clear(lua_State *L)
 static int
 ngx_http_lua_ngx_req_header_set(lua_State *L)
 {
-    if (lua_gettop(L) != 2) {
+    if ((lua_gettop(L) != 2) && (lua_gettop(L) != 3)) {
         return luaL_error(L, "expecting two arguments, but seen %d",
                           lua_gettop(L));
     }
@@ -614,9 +624,10 @@ ngx_http_lua_ngx_req_header_set_helper(lua_State *L)
 
 #if 0
     /* replace "_" with "-" */
-    for (i = 0; i < len; i++) {
-        if (p[i] == '_') {
-            p[i] = '-';
+        for (i = 0; i < len; i++) {
+            if (p[i] == '_') {
+                p[i] = '-';
+            }
         }
     }
 #endif

src/ngx_http_lua_headers_out.c

@@ -434,6 +434,9 @@ ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
     ngx_http_lua_header_val_t         hv;
     ngx_http_lua_set_header_t        *handlers = ngx_http_lua_set_handlers;
     ngx_uint_t                        i;
+    ngx_http_lua_loc_conf_t          *llcf;
+
+    llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
 
     dd("set header value: %.*s", (int) value.len, value.data);
 
@@ -455,6 +458,17 @@ ngx_http_lua_set_output_header(ngx_http_request_t *r, ngx_str_t key,
             continue;
         }
 
+        if (!llcf->correct_location_header
+            && ngx_strncasecmp(hv.key.data,
+                               (u_char *) "Location",
+                               sizeof("Location"))
+            == 0) {
+            /* XXX The best way to get the index of the last of the structure */
+            i = (sizeof(ngx_http_lua_set_handlers) /
+                 sizeof(ngx_http_lua_set_handlers[0])) - 1;
+            break;
+        }
+
         dd("Matched handler: %s %s", handlers[i].name.data, hv.key.data);
 
         hv.offset = handlers[i].offset;