diff options
| author | Philip M. Gollucci <pgollucci@apache.org> | 2011-11-13 00:20:32 +0000 |
|---|---|---|
| committer | Philip M. Gollucci <pgollucci@apache.org> | 2011-11-13 00:20:32 +0000 |
| commit | 4472a86146a20a356383475792bae37870c7862a (patch) | |
| tree | 629b76803ce960183dc145c9f23c9e0c816309d7 /modules/apreq | |
| parent | 0d121a89f139bf148092c64239af3885f0ca9099 (diff) | |
| download | httpd-4472a86146a20a356383475792bae37870c7862a.tar.gz | |
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
Diffstat (limited to 'modules/apreq')
| -rw-r--r-- | modules/apreq/Makefile.in | 1 | ||||
| -rw-r--r-- | modules/apreq/config.m4 | 9 | ||||
| -rw-r--r-- | modules/apreq/filter.c | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/modules/apreq/Makefile.in b/modules/apreq/Makefile.in index e69de29bb2..f34af9cbd6 100644 --- a/modules/apreq/Makefile.in +++ b/modules/apreq/Makefile.in @@ -0,0 +1 @@ +include $(top_srcdir)/build/special.mk diff --git a/modules/apreq/config.m4 b/modules/apreq/config.m4 index e69de29bb2..a61c4231b0 100644 --- a/modules/apreq/config.m4 +++ b/modules/apreq/config.m4 @@ -0,0 +1,9 @@ +dnl modules enabled in this directory by default + +dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]]) + +APACHE_MODPATH_INIT(apreq) + +APACHE_MODULE(apreq, Apache Request Filter, filter.lo handle.lo, , most) + +APACHE_MODPATH_FINISH diff --git a/modules/apreq/filter.c b/modules/apreq/filter.c index ef122ba450..b682e6dbed 100644 --- a/modules/apreq/filter.c +++ b/modules/apreq/filter.c @@ -28,7 +28,6 @@ #include "apreq_private_apache2.h" #include "apreq_error.h" #include "apreq_util.h" -#include "apreq_version.h" static void *apreq_create_dir_config(apr_pool_t *p, char *d) { @@ -424,11 +423,6 @@ static int apreq_post_init(apr_pool_t *p, apr_pool_t *plog, { apr_status_t status; - ap_add_version_component(p, apr_psprintf(p, - "mod_apreq2-%d/%s", - APREQ_APACHE2_MMN, - apreq_version_string())); - status = apreq_post_initialize(p); if (status != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_ERR, status, base_server, |