www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Add the missing parsebody function to mod_lua, for parsing POST data.

Browse Source 
PR 53064.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1352047 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daniel Gruno
2012-06-20 11:20:36 +00:00
parent 076532d574
commit 68bbfde6ea
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -19,6 +19,9 @@ Changes with Apache 2.5.0
*) mod_lua: Change prototype of vm_construct, to work around gcc bug which *) mod_lua: Change prototype of vm_construct, to work around gcc bug which
causes a segfault. PR 52779. [Dick Snippe <Dick Snippe tech omroep nl>] causes a segfault. PR 52779. [Dick Snippe <Dick Snippe tech omroep nl>]
*) mod_lua: Add the parsebody function for parsing POST data. PR 53064.
[Daniel Gruno]
*) mod_ssl: If exiting during initialization because of a fatal error, *) mod_ssl: If exiting during initialization because of a fatal error,
log a message to the main error log pointing to the appropriate log a message to the main error log pointing to the appropriate
virtual host error log. [Stefan Fritsch] virtual host error log. [Stefan Fritsch]

28
modules/lua/lua_request.c
View File

@@ -164,6 +164,32 @@ static int req_parseargs(lua_State *L)
return 2; /* [table<string, string>, table<string, array<string>>] */ return 2; /* [table<string, string>, table<string, array<string>>] */
} }
/* r:parsebody() returning a lua table */
static int req_parsebody(lua_State *L)
{
apr_array_header_t *pairs;
apr_off_t len;
int res;
apr_size_t size;
char *buffer;
request_rec *r = ap_lua_check_request_rec(L, 1);
lua_newtable(L);
lua_newtable(L); /* [table, table] */
res = ap_parse_form_data(r, NULL, &pairs, -1, MAX_STRING_LEN); /*XXX: Maybe increase this value? */
if (res == OK) {
while(pairs && !apr_is_empty_array(pairs)) {
ap_form_pair_t *pair = (ap_form_pair_t *) apr_array_pop(pairs);
apr_brigade_length(pair->value, 1, &len);
size = (apr_size_t) len;
buffer = apr_palloc(r->pool, size + 1);
apr_brigade_flatten(pair->value, buffer, &size);
buffer[len] = 0;
req_aprtable2luatable_cb(L, pair->name, buffer);
}
}
return 2; /* [table<string, string>, table<string, array<string>>] */
}
/* wrap ap_rputs as r:puts(String) */ /* wrap ap_rputs as r:puts(String) */
static int req_puts(lua_State *L) static int req_puts(lua_State *L)
{ {
@@ -625,6 +651,8 @@ AP_LUA_DECLARE(void) ap_lua_load_request_lmodule(lua_State *L, apr_pool_t *p)
makefun(&req_context_document_root, APL_REQ_FUNTYPE_STRING, p)); makefun(&req_context_document_root, APL_REQ_FUNTYPE_STRING, p));
apr_hash_set(dispatch, "parseargs", APR_HASH_KEY_STRING, apr_hash_set(dispatch, "parseargs", APR_HASH_KEY_STRING,
makefun(&req_parseargs, APL_REQ_FUNTYPE_LUACFUN, p)); makefun(&req_parseargs, APL_REQ_FUNTYPE_LUACFUN, p));
apr_hash_set(dispatch, "parsebody", APR_HASH_KEY_STRING,
makefun(&req_parsebody, APL_REQ_FUNTYPE_LUACFUN, p));
apr_hash_set(dispatch, "debug", APR_HASH_KEY_STRING, apr_hash_set(dispatch, "debug", APR_HASH_KEY_STRING,
makefun(&req_debug, APL_REQ_FUNTYPE_LUACFUN, p)); makefun(&req_debug, APL_REQ_FUNTYPE_LUACFUN, p));
apr_hash_set(dispatch, "info", APR_HASH_KEY_STRING, apr_hash_set(dispatch, "info", APR_HASH_KEY_STRING,