summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElisamuel Resto2010-04-28 17:13:25 -0400
committerElisamuel Resto2010-04-28 17:14:00 -0400
commitfbbf3b94249cbd646b5043c94ba004a9b71a40e0 (patch)
tree4f833d1cbb0b032711e66348eedb802b58de780f
parent05f78cd7aea2e3ddff295d14a556865aff4c557a (diff)
http/apache22: Allow picking of MPM modules
-rwxr-xr-xhttp/apache22/BUILD3
-rwxr-xr-xhttp/apache22/CONFIGURE3
-rw-r--r--http/apache22/HISTORY3
3 files changed, 9 insertions, 0 deletions
diff --git a/http/apache22/BUILD b/http/apache22/BUILD
index e87b05c4e1..32db176807 100755
--- a/http/apache22/BUILD
+++ b/http/apache22/BUILD
@@ -1,3 +1,6 @@
+# use user-specific worker
+APACHE22_EXTRA="${APACHE22_EXTRA} --with-mpm=${APACHE22_MPM}" &&
+
# remove APR and APU and reconfigure to use external ones
rm -fr srclib/apr*/ &&
diff --git a/http/apache22/CONFIGURE b/http/apache22/CONFIGURE
index e3712b7081..54bc751e7d 100755
--- a/http/apache22/CONFIGURE
+++ b/http/apache22/CONFIGURE
@@ -1,3 +1,6 @@
+message "${PROBLEM_COLOR}Before picking a MPM, please see: http://sourcemage.org/ApacheMPM${DEFAULT_COLOR}" &&
+config_query_list APACHE22_MPM "Which MPM would you like?" prefork worker event &&
+
# Apache2 CONFIGURE script
#
# Created 2003-07-21 by Gareth Clay <g.clay@warwick.ac.uk> with a
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index ba9afc5c81..eb630055ed 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2010-04-28 Elisamuel Resto <ryuji@simplysam.us>
+ * BUILD, CONFIGURE: Allow picking of MPM modules
+
2010-03-08 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.2.15, SECURITY_PATCH=9