Commit 139d12ba authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 7945ede8

build/rpm/httpd.spec.in

+6 −6
Changes for build/rpm/httpd.spec.in: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line 
%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