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 fa93bffe19aa7c06f97206266251799f61ceecdc..4c05395c2a5479ef78c8677277f526a2f58fe023 100644 (file)
--- 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 c970a717238b78a1b5791e10d07753c2cee16a37..6eb0e4e9afc94312e294dcd107976a098872b87a 100644 (file)
--- 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