Move the error_bucket definition from the HTTP module to the core server.

Every protocol will need this definition, so it belongs in the core.

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

diff --git a/CHANGES b/CHANGES
index 53deaf75bdd6b1acf415ed6d1090d61a72c49afb..430d5206aedeebd4cd33131c8a5ddcd8a4c2f6af 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.12-dev
 
+  *) Move the error_bucket definition from the http module to the
+     core server.  Every protocol will need this ability, not just
+     HTTP.  [Ryan Bloom]
+
   *) Modify mod_file_cache to save pre-formatted strings for 
      content-length and last-modified headers for performance. 
      [Mike Abbot <mja@trudge.engr.sgi.com>]

diff --git a/modules/http/config.m4 b/modules/http/config.m4
index 6c646533c1310c27cc877f13e3b692685c6dceb6..4a5c9b06e86350e289b6e5c8311c49433b68dfef 100644 (file)
--- a/modules/http/config.m4
+++ b/modules/http/config.m4
@@ -2,7 +2,7 @@ dnl modules enabled in this directory by default
 
 APACHE_MODPATH_INIT(http)
 
-http_objects="http_core.lo http_protocol.lo http_request.lo error_bucket.lo"
+http_objects="http_core.lo http_protocol.lo http_request.lo"
 
 APACHE_MODULE(core, HTTP protocol handling, $http_objects, , yes)
 APACHE_MODULE(mime, mapping of file-extension to MIME, , , yes)

diff --git a/server/Makefile.in b/server/Makefile.in
index bcbee0e851ff61013265e8d98f4d1148fc993e95..9e98d7c5ef911d16059b22c9007853091c354b9c 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -12,7 +12,8 @@ LTLIBRARY_SOURCES = \
        util_script.c util_uri.c util_md5.c util_cfgtree.c util_ebcdic.c \
        rfc1413.c connection.c listen.c \
         mpm_common.c util_charset.c util_debug.c util_xml.c \
-       util_filter.c exports.c buildmark.c scoreboard.c
+       util_filter.c exports.c buildmark.c scoreboard.c \
+       error_bucket.c
 
 targets = delete-exports $(LTLIBRARY_NAME)
 

diff --git a/modules/http/error_bucket.c b/server/error_bucket.c
similarity index 100%
rename from modules/http/error_bucket.c
rename to server/error_bucket.c