Commit 630b0e05 authored by Paul Querna's avatar Paul Querna
Browse files

Finish removing dependecy on apreq 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/wombat-integration@723654 13f79535-47bb-0310-9956-ffa450edef68
parent 4af650a7

modules/wombat/request.c

+6 −7
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



#include "mod_wombat.h"

#include "util_script.h"

#include "apr_lua.h"



typedef char* (*req_field_string_f) (request_rec* r);
@@ -141,10 +142,9 @@ static int req_parseargs(lua_State* L) { 
    request_rec* r = apw_check_request_rec(L, 1);

    lua_newtable(L);

    lua_newtable(L); /* [table, table] */

    const apr_table_t* form_table;

    if (ap_args_to_table(r, &form_table) == APR_SUCCESS) {

    apr_table_t* form_table;

    ap_args_to_table(r, &form_table);

    apr_table_do(req_aprtable2luatable_cb, L, form_table, NULL);                

    }

    return 2; /* [table<string, string>, table<string, array<string>>] */

}
@@ -174,11 +174,10 @@ static int req_write(lua_State* L) { 
/* r:parsebody() */

static int req_parsebody(lua_State* L) {

    request_rec* r = apw_check_request_rec(L, 1);

    apreq_handle_t* h = apreq_handle_apache2(r);

    lua_newtable(L);

    lua_newtable(L);

    const apr_table_t* form_table;

    if (apreq_body(h, &form_table) == APR_SUCCESS) {

    apr_table_t* form_table;

    if (ap_body_to_table(r, &form_table) == APR_SUCCESS) {

        apr_table_do(req_aprtable2luatable_cb, L, form_table, NULL);        

    }

    return 2;