Merge r1293708:

Enable per-module loglevel for mod_xml2enc and mod_proxy_html

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1294159 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 6fdd5682eb3e233767aac49e3a839de68a035087..0e313adbb2fe14a7e9480a2ed4b352618ff2fb6d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.2
 
+  *) mod_xml2enc, mod_proxy_html: Enable per-module loglevels.
+     [Stefan Fritsch]
+
   *) mod_filter: Fix segfault with AddOutputFilterByType. PR 52755.
      [Stefan Fritsch]
 

diff --git a/STATUS b/STATUS
index 512428c2f4c3854184e32f0d0be1f1b46d4430d2..b25db5ce9a7d854d2327f7cc79eb0b0b4b20676d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,11 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * Enable per-module loglevel for mod_xml2enc and mod_proxy_html
-    Trunk patches: http://svn.apache.org/viewvc?view=revision&revision=1293708
-    2.4.x patch: Trunk patch works
-    +1: minfrin, sf, trawick
-
   * Fix another compiler warning
     Submitted by: Daniel Shahaf <danielsh elego de>
     Trunk patches: http://svn.apache.org/viewvc?view=revision&revision=1293535

diff --git a/modules/filters/mod_proxy_html.c b/modules/filters/mod_proxy_html.c
index 3bac8982ab996eb4b5d034632b033ba667648650..6cbe87a96882c004cb3c01ad6b35cd594f13a2e8 100644 (file)
--- a/modules/filters/mod_proxy_html.c
+++ b/modules/filters/mod_proxy_html.c
@@ -1265,7 +1265,8 @@ static void proxy_html_hooks(apr_pool_t *p)
     ap_hook_pre_config(mod_proxy_html, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_insert_filter(proxy_html_insert, NULL, aszSucc, APR_HOOK_MIDDLE);
 }
-module AP_MODULE_DECLARE_DATA proxy_html_module = {
+
+AP_DECLARE_MODULE(proxy_html) = {
     STANDARD20_MODULE_STUFF,
     proxy_html_config,
     proxy_html_merge,

diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
index fd544444ed61f711710bea1ff2c6502f689ddd7b..5b082fb43111d94bb8e3045e32fc7fcaeed7802f 100644 (file)
--- a/modules/filters/mod_xml2enc.c
+++ b/modules/filters/mod_xml2enc.c
@@ -614,7 +614,8 @@ static void* xml2enc_merge(apr_pool_t* pool, void* BASE, void* ADD)
     ret->skipto = add->skipto ? add->skipto : base->skipto;
     return ret;
 }
-module AP_MODULE_DECLARE_DATA xml2enc_module = {
+
+AP_DECLARE_MODULE(xml2enc) = {
     STANDARD20_MODULE_STUFF,
     xml2enc_config,
     xml2enc_merge,
@@ -623,6 +624,7 @@ module AP_MODULE_DECLARE_DATA xml2enc_module = {
     xml2enc_cmds,
     xml2enc_hooks
 };
+
 APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(xml2enc, XML2ENC, int, preprocess,
                       (ap_filter_t *f, char** bufp, apr_size_t* bytesp),
                       (f, bufp, bytesp), OK, DECLINED)