Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Subrequest API - method can be passed as a string #289

Closed
wants to merge 18 commits into from
Closed

Subrequest API - method can be passed as a string #289

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3f39535
Added an optional parameter for ngx.req.set_header and ngx.req.clear_…
Apr 24, 2013
886e27b
Merged with 0.8.1
May 8, 2013
1c5e5b9
Changed the replace_underscores parameter to a table of parameters (o…
May 8, 2013
f2e849a
Added an options table to clean_header as well.
May 8, 2013
e1281a2
Merge branch 'master' of https://github.com/chaoslawful/lua-nginx-module
Sep 29, 2013
d4d2988
Removed unneeded variable.
Sep 29, 2013
2799aad
Lua subrequests - added support for passing the method optional param…
Sep 30, 2013
e699fcc
Merge branch 'master' of https://github.com/chaoslawful/lua-nginx-module
Oct 3, 2013
e9e1dec
Reverted unnecessary changes.
Oct 3, 2013
24cb685
Reverted unnecessary changes.
Oct 3, 2013
aa7ff33
Reverted unnecessary changes.
Oct 3, 2013
974112f
Merge remote-tracking branch 'original-repository/master'
Dec 10, 2013
d40c3f6
Merge branch 'master' into subrequest-methods
Dec 10, 2013
48fdf3d
Merge branch 'master' of https://github.com/chaoslawful/lua-nginx-module
Dec 18, 2013
9ff14e7
Merge branch 'master' into subrequest-methods
Dec 18, 2013
305f0a5
Merge branch 'master' of https://github.com/chaoslawful/lua-nginx-module
Dec 24, 2013
e7ae6ea
Merge branch 'master' into subrequest-methods
Dec 24, 2013
8958951
Merge branch 'integration-v0.9.16rc1' into subrequest-methods
Mar 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 89 additions & 11 deletions src/ngx_http_lua_subrequest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,23 @@ ngx_str_t ngx_http_lua_patch_method =
ngx_str_t ngx_http_lua_trace_method =
ngx_http_lua_method_name("TRACE");

ngx_str_t * ngx_http_lua_ordered_methods[] = {
&ngx_http_lua_get_method,
&ngx_http_lua_head_method,
&ngx_http_lua_post_method,
&ngx_http_lua_put_method,
&ngx_http_lua_delete_method,
&ngx_http_lua_mkcol_method,
&ngx_http_lua_copy_method,
&ngx_http_lua_move_method,
&ngx_http_lua_options_method,
&ngx_http_lua_propfind_method,
&ngx_http_lua_proppatch_method,
&ngx_http_lua_lock_method,
&ngx_http_lua_unlock_method,
&ngx_http_lua_patch_method,
&ngx_http_lua_trace_method,
};

static ngx_str_t ngx_http_lua_content_length_header_key =
ngx_string("Content-Length");
Expand All @@ -59,7 +76,7 @@ static ngx_str_t ngx_http_lua_content_length_header_key =
static ngx_int_t ngx_http_lua_set_content_length_header(ngx_http_request_t *r,
off_t len);
static ngx_int_t ngx_http_lua_adjust_subrequest(ngx_http_request_t *sr,
ngx_uint_t method, int forward_body,
ngx_uint_t method, ngx_str_t *method_name, int forward_body,
ngx_http_request_body_t *body, unsigned vars_action,
ngx_array_t *extra_vars);
static int ngx_http_lua_ngx_location_capture(lua_State *L);
Expand Down Expand Up @@ -139,6 +156,11 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
unsigned vars_action;
ngx_uint_t nsubreqs;
ngx_uint_t index;
ngx_uint_t method_index;
ngx_uint_t methods_number;
ngx_str_t *ngx_method_name = NULL;
u_char *lua_method_name;
size_t method_name_length;
size_t sr_statuses_len;
size_t sr_headers_len;
size_t sr_bodies_len;
Expand Down Expand Up @@ -382,15 +404,62 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)

type = lua_type(L, -1);

if (type == LUA_TNIL) {
method = NGX_HTTP_GET;
switch (type) {
case LUA_TNIL:
method = NGX_HTTP_GET;
break;
case LUA_TNUMBER:
method = (ngx_uint_t) lua_tonumber(L, -1);
break;
case LUA_TSTRING:
lua_method_name = (u_char *) lua_tolstring(L, -1,
&method_name_length);
if (method_name_length == 0) {
return luaL_error(L, "Bad http request method");
}

methods_number = sizeof(ngx_http_lua_ordered_methods) /
sizeof(ngx_http_lua_ordered_methods[0]);
for (method_index = 0; method_index < methods_number;
method_index++) {
if (ngx_strncasecmp(
ngx_http_lua_ordered_methods[method_index]->data,
lua_method_name,
method_name_length)
== 0) {
break;
}
}

} else {
if (type != LUA_TNUMBER) {
if (method_index == methods_number) {
/* unknown method */
method = NGX_HTTP_UNKNOWN;
ngx_method_name = ngx_palloc(r->pool,
sizeof(ngx_str_t));
if (ngx_method_name == NULL) {
return luaL_error(L, "out of memory");
}
ngx_method_name->data = ngx_palloc(r->pool,
method_name_length);
if (ngx_method_name->data == NULL) {
return luaL_error(L, "out of memory");
}
ngx_memcpy(ngx_method_name->data,
lua_method_name,
method_name_length);
ngx_memcpy(ngx_method_name->data + method_name_length,
" ",
1);
ngx_method_name->len = method_name_length;
} else {
/* the method is a bit field, the first value is
of NGX_HTTP_GET */
method = NGX_HTTP_GET << method_index;
ngx_method_name = NULL;
}
break;
default:
return luaL_error(L, "Bad http request method");
}

method = (ngx_uint_t) lua_tonumber(L, -1);
}

lua_pop(L, 1);
Expand Down Expand Up @@ -573,7 +642,8 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)

ngx_http_set_ctx(sr, sr_ctx, ngx_http_lua_module);

rc = ngx_http_lua_adjust_subrequest(sr, method, always_forward_body,
rc = ngx_http_lua_adjust_subrequest(sr, method, ngx_method_name,
always_forward_body,
body, vars_action, extra_vars);

if (rc != NGX_OK) {
Expand Down Expand Up @@ -609,8 +679,9 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)

static ngx_int_t
ngx_http_lua_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method,
int always_forward_body, ngx_http_request_body_t *body,
unsigned vars_action, ngx_array_t *extra_vars)
ngx_str_t *method_name, int always_forward_body,
ngx_http_request_body_t *body, unsigned vars_action,
ngx_array_t *extra_vars)
{
ngx_http_request_t *r;
ngx_int_t rc;
Expand Down Expand Up @@ -667,6 +738,13 @@ ngx_http_lua_adjust_subrequest(ngx_http_request_t *sr, ngx_uint_t method,
sr->method = method;

switch (method) {
case NGX_HTTP_UNKNOWN:
if (method_name == NULL) {
return NGX_ERROR;
}
sr->method_name = *method_name;
break;

case NGX_HTTP_GET:
sr->method_name = ngx_http_lua_get_method;
break;
Expand Down