As discussed at AC NA 2011

o relocate srclib/libapreq/library/*.c -> server/apreq_${f}.c
o relocate srclib/libapreq/include/*.h -> include/*.h
o remove apreq_version.[hc] related stuff since its nolonger its own lib
o connect modules/apreq to the build under 'most' default comment out in httpd.conf
o update make_exports.awk to handle APREQ marcos




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201372 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 65 insertions, 0 deletions

diff --git a/server/apreq_module.c b/server/apreq_module.c
new file mode 100644
index 0000000000..9ba5a765ed
--- /dev/null
+++ b/server/apreq_module.c
@@ -0,0 +1,65 @@
+/*
+**  Licensed to the Apache Software Foundation (ASF) under one or more
+** contributor license agreements.  See the NOTICE file distributed with
+** this work for additional information regarding copyright ownership.
+** The ASF licenses this file to You under the Apache License, Version 2.0
+** (the "License"); you may not use this file except in compliance with
+** the License.  You may obtain a copy of the License at
+**
+**      http://www.apache.org/licenses/LICENSE-2.0
+**
+**  Unless required by applicable law or agreed to in writing, software
+**  distributed under the License is distributed on an "AS IS" BASIS,
+**  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+**  See the License for the specific language governing permissions and
+**  limitations under the License.
+*/
+
+#include "apreq_module.h"
+#include "apreq_error.h"
+#include "apr_strings.h"
+#include "apr_lib.h"
+#include "apr_file_io.h"
+
+APREQ_DECLARE(apreq_param_t *)apreq_param(apreq_handle_t *req, const char *key)
+{
+    apreq_param_t *param = apreq_args_get(req, key);
+    if (param == NULL)
+        return apreq_body_get(req, key);
+    else
+        return param;
+}
+
+APREQ_DECLARE(apr_table_t *)apreq_params(apreq_handle_t *req, apr_pool_t *p)
+{
+    const apr_table_t *args, *body;
+    apreq_args(req, &args);
+    apreq_body(req, &body);
+
+    if (args != NULL)
+        if (body != NULL)
+            return apr_table_overlay(p, args, body);
+        else
+            return apr_table_copy(p, args);
+    else
+        if (body != NULL)
+            return apr_table_copy(p, body);
+        else
+            return NULL;
+
+}
+
+APREQ_DECLARE(apr_table_t *)apreq_cookies(apreq_handle_t *req, apr_pool_t *p)
+{
+    const apr_table_t *jar;
+    apreq_jar(req, &jar);
+
+    if (jar != NULL)
+        return apr_table_copy(p, jar);
+    else
+        return NULL;
+
+}
+
+
+/** @} */