diff options
| author | Jim Jagielski <jim@apache.org> | 2011-01-25 19:37:47 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2011-01-25 19:37:47 +0000 |
| commit | 4839408e488acd78d87d4f206dd836bdaebbcc78 (patch) | |
| tree | 91e31eca9e80e25cf644b30c05bc9a5c7996f4d9 /build/rpm | |
| parent | f67156b2216b14f3b9f31acc359d1c68cfdcf441 (diff) | |
| download | httpd-4839408e488acd78d87d4f206dd836bdaebbcc78.tar.gz | |
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
Diffstat (limited to 'build/rpm')
| -rw-r--r-- | build/rpm/httpd.spec.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in index 816be26fa5..42ebbc2590 100644 --- 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 |