New API, ap_body_to_table, a very ineffeicent and bad hack to remove an apreq dependency.

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

diff --git a/include/httpd.h b/include/httpd.h
index 0d708adfcfb4c60ba04a9d6002b64fbc74725c6a..876a5b1647b785bc8310a9b27495a26daecd0fe1 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1005,6 +1005,7 @@ struct request_rec {
 
     apr_thread_mutex_t *invoke_mtx;
 
+    apr_table_t *body_table;
 /* Things placed at the end of the record to avoid breaking binary
  * compatibility.  It would be nice to remember to reorder the entire
  * record to improve 64bit alignment the next time we need to break

diff --git a/include/util_script.h b/include/util_script.h
index d478aa658bff44c0c6ddf604e4dc14c8dac0b4bf..d7e7eae080cd0178302c1ef75d6d0db51733fd18 100644 (file)
--- a/include/util_script.h
+++ b/include/util_script.h
@@ -142,6 +142,8 @@ AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
 
 AP_DECLARE(void) ap_args_to_table(request_rec *r, apr_table_t **table);
 
+AP_DECLARE(apr_status_t) ap_body_to_table(request_rec *r, apr_table_t **table);
+    
 #ifdef __cplusplus
 }
 #endif

diff --git a/server/util_script.c b/server/util_script.c
index 674a215b9c85ac6871f7b056d41a48b4dc50e188..0c764903baf2f9bf818078558949c29014b58c39 100644 (file)
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -729,6 +729,10 @@ argstr_to_table(apr_pool_t *p, char *str, apr_table_t *parms)
     char *key;
     char *value;
     char *strtok_state;
+
+    if (str == NULL) {
+        return;
+    }
     
     key = apr_strtok(str, "&", &strtok_state);
     while (key) {
@@ -758,4 +762,77 @@ AP_DECLARE(void) ap_args_to_table(request_rec *r, apr_table_t **table)
     *table = t;
 }
 
+AP_DECLARE(apr_status_t) ap_body_to_table(request_rec *r, apr_table_t **table)
+{
+    apr_bucket_brigade *bb;
+    apr_bucket_brigade *tmpbb;
+    apr_status_t rv = APR_SUCCESS;
+
+    if (r->body_table) {
+        *table = r->body_table;
+        return APR_SUCCESS;
+    }
+    
+    *table = NULL;
+
+    bb = apr_brigade_create(r->pool, r->connection->bucket_alloc);
+    tmpbb = apr_brigade_create(r->pool, r->connection->bucket_alloc);
+
+    do {
+        apr_off_t len;
+
+        rv = ap_get_brigade(r->input_filters, tmpbb, AP_MODE_READBYTES,
+                            APR_BLOCK_READ, AP_IOBUFSIZE);
+        if (rv) {
+            break;
+        }
+
+        rv = apr_brigade_length(tmpbb, 1, &len);
+        if (rv) {
+            break;
+        }
+        
+        if (len == 0) {
+            break;
+        }
+
+        APR_BRIGADE_CONCAT(bb, tmpbb);
+    } while(1);
+
+    if (!rv) {
+        r->body_table = apr_table_make(r->pool, 10);
+        
+        if (!APR_BRIGADE_EMPTY(bb)) {
+            char *buffer;
+            apr_off_t len;
+            apr_pool_t *tpool;
+
+            apr_pool_create(&tpool, r->pool);
+            
+            rv = apr_brigade_length(bb, 1, &len);
+
+            if (!rv) {
+                apr_size_t total;
+                buffer = apr_palloc(tpool, len+1);
+                
+                total = len+1;
+
+                rv = apr_brigade_flatten(bb, buffer, &total);
+
+                buffer[total] = '\0';
+
+                argstr_to_table(r->pool, buffer, r->body_table);
+            }
+            apr_pool_destroy(tpool);
+        }
+    }
+
+    apr_brigade_destroy(bb);
+    apr_brigade_destroy(tmpbb);
+
+    *table = r->body_table;
+
+    return rv;
+}
+