Explorar el Código

allow one to try out the experimental 'event' MPM

Ralf S. Engelschall hace 18 años
padre
commit
33cd0ca684
Se han modificado 1 ficheros con 7 adiciones y 6 borrados
  1. 7 6
      apache2/apache2.spec

+ 7 - 6
apache2/apache2.spec

@@ -39,7 +39,7 @@ Class:        PLUS
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20070110
+Release:      20070529
 
 #   package options (generic)
 %option       with_mpm                  prefork
@@ -131,11 +131,12 @@ Conflicts:    apache
 
 %prep
     #   some pre-flight checks on options specified
-%if "%{with_mpm}" != "prefork" && "%{with_mpm}" != "worker"
+%if "%{with_mpm}" != "prefork" && "%{with_mpm}" != "worker" && "%{with_mpm}" != "event"
     ( echo "Invalid value specified for option 'with_mpm'. Currently the"
       echo "only supported Multi-Processing Modules (MPMs) are ..."
       echo "- 'prefork' -- non-threaded, pre-forking web server (default)"
       echo "- 'worker'  -- hybrid multi-threaded multi-process web server"
+      echo "- 'event'   -- event-based I/O multiplexing web server"
     ) | %{l_rpmtool} msg -b -t error
     exit 1
 %endif
@@ -193,7 +194,7 @@ Conflicts:    apache
       case "%{l_platform -t}" in
           *-sunos* ) LIBS="$LIBS -lrt" ;;
       esac
-%if "%{with_mpm}" == "worker" || "%{with_mod_memcache}" == "yes"
+%if "%{with_mpm}" == "worker" || "%{with_mpm}" == "event" || "%{with_mod_memcache}" == "yes"
       THREADS="--enable-threads"
 %else
       THREADS="--disable-threads"
@@ -278,9 +279,9 @@ Conflicts:    apache
       #   setting might affect package dependencies, therefore fallbacks
       #   are not acceptable
       if ! grep '^MPM_NAME = %{with_mpm}$' build/config_vars.mk >/dev/null 2>&1; then
-          ( echo "The Multi-Processing Module (MPM) '%{with_mpm}' requested using the 'with_mpm'"
-            echo "option doesn't seem to be available on this particular platform."
-            echo "Please check corresponding 'config.log' for details."
+          ( echo "The Multi-Processing Module (MPM) '%{with_mpm}' requested using the"
+            echo "'with_mpm' option doesn't seem to be available on this particular"
+            echo "platform. Please check corresponding 'config.log' for details."
           ) | %{l_rpmtool} msg -b -t error
           exit 1
       fi