Make worker the default MPM for 2.3/2.4

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063419 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index 816be26fa50aba938e81420d89b0bb73371f1ba8..42ebbc25907ecbe60f799c26f9a9e27358f9b8cc 100644 (file)
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -1,7 +1,7 @@
 %define contentdir /var/www
 %define suexec_caller apache
 %define mmn APACHE_MMN
-%define mpms worker event
+%define mpms prefork event
 
 Summary: Apache HTTP Server
 Name: httpd
@@ -119,8 +119,8 @@ make %{?_smp_mflags}
 popd
 }
 
-# Build everything and the kitchen sink with the prefork build
-mpmbuild prefork \
+# Build everything and the kitchen sink with the worker build
+mpmbuild worker \
         --enable-mods-shared=all \
         --enable-ssl --with-ssl --enable-distcache \
         --enable-proxy \
@@ -141,7 +141,7 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd prefork
+pushd worker
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
 
@@ -246,10 +246,10 @@ if readelf -d $RPM_BUILD_ROOT%{_libdir}/httpd/modules/*.so | grep TEXTREL; then
 fi
 
 # Verify that the same modules were built into the httpd binaries
-./prefork/httpd -l | grep -v prefork > prefork.mods
+./worker/httpd -l | grep -v worker > worker.mods
 for mpm in %{mpms}; do
   ./${mpm}/httpd -l | grep -v ${mpm} > ${mpm}.mods
-  if ! diff -u prefork.mods ${mpm}.mods; then
+  if ! diff -u worker.mods ${mpm}.mods; then
     : Different modules built into httpd binaries, will not proceed
     exit 1
   fi