www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00
Code Activity

mod_lua: Redesign the table construction/access mechanism, so we pass on a struct with the request_rec, the table pointer and the table name instead of just the table pointer. This allows us to use the request_rec for logging/editing purposes, as well as inform the user which exact table in the request_rec was modified.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1582858 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daniel Gruno
2014-03-28 18:38:41 +00:00
parent 8ae663bc78
commit d38e1b6e83
5 changed files with 74 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
modules/lua/lua_request.c
View File

@@ -44,7 +44,7 @@ APLOG_USE_MODULE(lua);
typedef char *(*req_field_string_f) (request_rec * r);
typedef int (*req_field_int_f) (request_rec * r);
typedef apr_table_t *(*req_field_apr_table_f) (request_rec * r);
typedef req_table_t *(*req_field_apr_table_f) (request_rec * r);
void ap_lua_rstack_dump(lua_State *L, request_rec *r, const char *msg)
@@ -644,29 +644,49 @@ static int req_assbackwards_field(request_rec *r)
return r->assbackwards;
}
static apr_table_t* req_headers_in(request_rec *r)
static req_table_t* req_headers_in(request_rec *r)
{
return r->headers_in;
req_table_t* t = apr_palloc(r->pool, sizeof(req_table_t));
t->r = r;
t->t = r->headers_in;
t->n = "headers_in";
return t;
}
static apr_table_t* req_headers_out(request_rec *r)
static req_table_t* req_headers_out(request_rec *r)
{
return r->headers_out;
req_table_t* t = apr_palloc(r->pool, sizeof(req_table_t));
t->r = r;
t->t = r->headers_out;
t->n = "headers_out";
return t;
}
static apr_table_t* req_err_headers_out(request_rec *r)
static req_table_t* req_err_headers_out(request_rec *r)
{
return r->err_headers_out;
req_table_t* t = apr_palloc(r->pool, sizeof(req_table_t));
t->r = r;
t->t = r->err_headers_out;
t->n = "err_headers_out";
return t;
}
static apr_table_t* req_subprocess_env(request_rec *r)
static req_table_t* req_subprocess_env(request_rec *r)
{
return r->subprocess_env;
req_table_t* t = apr_palloc(r->pool, sizeof(req_table_t));
t->r = r;
t->t = r->subprocess_env;
t->n = "subprocess_env";
return t;
}
static apr_table_t* req_notes(request_rec *r)
static req_table_t* req_notes(request_rec *r)
{
return r->notes;
req_table_t* t = apr_palloc(r->pool, sizeof(req_table_t));
t->r = r;
t->t = r->notes;
t->n = "notes";
return t;
}
static int req_ssl_is_https_field(request_rec *r)
@@ -1788,7 +1808,7 @@ static int req_dispatch(lua_State *L)
if (rft) {
switch (rft->type) {
case APL_REQ_FUNTYPE_TABLE:{
apr_table_t *rs;
req_table_t *rs;
req_field_apr_table_f func = (req_field_apr_table_f)rft->fun;
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01486)
"request_rec->dispatching %s -> apr table",
@@ -2858,12 +2878,17 @@ void ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p)
void ap_lua_push_connection(lua_State *L, conn_rec *c)
{
req_table_t* t;
lua_boxpointer(L, c);
luaL_getmetatable(L, "Apache2.Connection");
lua_setmetatable(L, -2);
luaL_getmetatable(L, "Apache2.Connection");
ap_lua_push_apr_table(L, c->notes);
t = apr_pcalloc(c->pool, sizeof(req_table_t));
t->t = c->notes;
t->r = NULL;
t->n = "notes";
ap_lua_push_apr_table(L, t);
lua_setfield(L, -2, "notes");
lua_pushstring(L, c->client_ip);