httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r723654 - /httpd/httpd/branches/wombat-integration/modules/wombat/request.c
Date Fri, 05 Dec 2008 08:37:56 GMT
Author: pquerna
Date: Fri Dec  5 00:37:56 2008
New Revision: 723654

URL: http://svn.apache.org/viewvc?rev=723654&view=rev
Log:
Finish removing dependecy on apreq

Modified:
    httpd/httpd/branches/wombat-integration/modules/wombat/request.c

Modified: httpd/httpd/branches/wombat-integration/modules/wombat/request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/wombat-integration/modules/wombat/request.c?rev=723654&r1=723653&r2=723654&view=diff
==============================================================================
--- httpd/httpd/branches/wombat-integration/modules/wombat/request.c (original)
+++ httpd/httpd/branches/wombat-integration/modules/wombat/request.c Fri Dec  5 00:37:56 2008
@@ -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 @@
     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_do(req_aprtable2luatable_cb, L, form_table, NULL);                
-    }
+    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 @@
 /* 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;



Mime
View raw message