httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1294159 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/filters/mod_proxy_html.c modules/filters/mod_xml2enc.c
Date Mon, 27 Feb 2012 13:56:47 GMT
Author: sf
Date: Mon Feb 27 13:56:47 2012
New Revision: 1294159

URL: http://svn.apache.org/viewvc?rev=1294159&view=rev
Log:
Merge r1293708:
Enable per-module loglevel for mod_xml2enc and mod_proxy_html

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c
    httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 13:56:47 2012
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1200496,1200556,1200702,1200955,1200968,1201032,1201042,1201111,1201194,1201198,1201202,1201450,1201956,1202236,1202453,1202456,1202886,1203400,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213381,1213391,1213567,1214003,1214005,1214015,1215514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,12
 25795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1293405,1293658,1293678
+/httpd/httpd/trunk:1200496,1200556,1200702,1200955,1200968,1201032,1201042,1201111,1201194,1201198,1201202,1201450,1201956,1202236,1202453,1202456,1202886,1203400,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213381,1213391,1213567,1214003,1214005,1214015,1215514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,12
 25795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1293405,1293658,1293678,1293708

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1294159&r1=1294158&r2=1294159&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Feb 27 13:56:47 2012
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1294159&r1=1294158&r2=1294159&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Feb 27 13:56:47 2012
@@ -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

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c?rev=1294159&r1=1294158&r2=1294159&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c Mon Feb 27 13:56:47 2012
@@ -1265,7 +1265,8 @@ static void proxy_html_hooks(apr_pool_t 
     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,

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c?rev=1294159&r1=1294158&r2=1294159&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_xml2enc.c Mon Feb 27 13:56:47 2012
@@ -614,7 +614,8 @@ static void* xml2enc_merge(apr_pool_t* p
     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_mo
     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)



Mime
View raw message