From: Jim Jagielski Date: Thu, 12 Feb 2009 19:43:52 +0000 (+0000) Subject: Merge r743589 from trunk: X-Git-Tag: 2.2.12~211 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25909a1241b6b3f829407a471e3a297dcf2a42e5;p=thirdparty%2Fapache%2Fhttpd.git Merge r743589 from trunk: mod_version needs to be compiled because the test framework requires it (and the feature doesn't make much sense if it crashes httpd on test). Submitted by: fielding Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@743852 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index fa93bffe19a..4c05395c2a5 100644 --- a/STATUS +++ b/STATUS @@ -86,11 +86,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_version: add to 'yes' category in config.m4 so that it - will be compiled by default. - http://svn.apache.org/viewvc?view=rev&revision=743589 - +1: fielding, jim, trawick - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/metadata/config.m4 b/modules/metadata/config.m4 index c970a717238..6eb0e4e9afc 100644 --- a/modules/metadata/config.m4 +++ b/modules/metadata/config.m4 @@ -18,6 +18,6 @@ APACHE_MODULE(usertrack, user-session tracking, , , , [ APACHE_MODULE(unique_id, per-request unique ids) APACHE_MODULE(setenvif, basing ENV vars on headers, , , yes) -APACHE_MODULE(version, determining httpd version in config files) +APACHE_MODULE(version, determining httpd version in config files, , , yes) APACHE_MODPATH_FINISH