The Event MPM is no longer experimental; move it out of that ghetto.

Yank the few bits that implement the concept of an experimental MPM.

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

diff --git a/LAYOUT b/LAYOUT
index 49aa1e88ab83f742d3c244c242b326f7e303a69c..7c4dada1686ec041143a13f0b4c32c23400dff1f 100644 (file)
--- a/LAYOUT
+++ b/LAYOUT
@@ -151,9 +151,7 @@ server/ .................
 
   mpm/ .................... 
 
-    experimental/ ........... 
-
-      event/ ................. 
+    event/ .................. 
 
     netware/ ................ 
 

diff --git a/configure.in b/configure.in
index 6967bfb4aca87e7cc1823b5484aa18bbb7825148..45083891c4928db47ef787aa4c80293f59f41236 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -716,23 +716,3 @@ AC_SUBST(HTTPD_VERSION)
 AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config_vars.sh,[true],[
   APACHE_GEN_MAKEFILES
 ])
-
-case $MPM_SUBDIR_NAME in
-*experimental*)
-    echo ""
-    echo ""
-    echo "============================================================"
-    echo "    WARNING: THE '${APACHE_MPM}' MPM IS EXPERIMENTAL"
-    echo "============================================================"
-    echo " The selected MPM might not be fully functional!"
-    echo ""
-    echo " Development of this MPM is not complete. Do not use this"
-    echo " MPM unless you are a programmer willing to help fix it."
-    echo ""
-    echo " If you are looking for a stable server, you should not use"
-    echo " the '${APACHE_MPM}' MPM until it is moved out of experimental."
-    echo "============================================================"
-    echo ""
-    echo ""
-    ;;
-esac

diff --git a/docs/manual/mod/event.xml b/docs/manual/mod/event.xml
index 65bcf003fdf0ceac0dd78bdbfce2e3ed1d9b1f3d..9439e1899d15f6d04948280c733c5560adc6eeec 100644 (file)
--- a/docs/manual/mod/event.xml
+++ b/docs/manual/mod/event.xml
@@ -22,18 +22,13 @@
 
 <modulesynopsis metafile="event.xml.meta">
 <name>event</name>
-<description>An experimental variant of the standard <module>worker</module>
-MPM</description>
+<description>A variant of the <module>worker</module> MPM with the goal
+of consuming threads only for connections with active processing</description>
 <status>MPM</status>
 <sourcefile>event.c</sourcefile>
 <identifier>mpm_event_module</identifier>
 
 <summary>
-    <note type="warning"><title>Warning</title>
-      <p>This MPM is experimental, so it may or may not work as
-      expected.</p> 
-    </note>
-
     <p>The <module>event</module> Multi-Processing Module (MPM) is
     designed to allow more requests to be served simultaneously by
     passing off some processing work to supporting threads, freeing up

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index a4a7e325d7d3e8e6a7ff390781e2cadb14ce08db..fa61ff0a7ca3203646021114bedc7a44edf8acf4 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -24,16 +24,6 @@ ap_mpm_is_threaded ()
     fi
 }
 
-dnl No such check for a shared MPM.
-ap_mpm_is_experimental ()
-{
-    if test "$apache_cv_mpm" = "event"; then
-        return 0
-    else
-        return 1
-    fi
-}
-
 if ap_mpm_is_threaded; then
   APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
 
@@ -70,12 +60,7 @@ if test "$apache_cv_mpm" = "shared"; then
   MPM_DIR=""
 else
   MPM_NAME=$apache_cv_mpm
-  if ap_mpm_is_experimental; then
-    AC_MSG_WARN(You have selected an EXPERIMENTAL MPM.  Be warned!)
-    MPM_SUBDIR_NAME=experimental/$MPM_NAME
-  else
-    MPM_SUBDIR_NAME=$MPM_NAME
-  fi
+  MPM_SUBDIR_NAME=$MPM_NAME
   MPM_DIR=server/mpm/$MPM_SUBDIR_NAME
   MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
 

diff --git a/server/mpm/experimental/event/Makefile.in b/server/mpm/event/Makefile.in
similarity index 100%
rename from server/mpm/experimental/event/Makefile.in
rename to server/mpm/event/Makefile.in

diff --git a/server/mpm/experimental/event/config5.m4 b/server/mpm/event/config5.m4
similarity index 100%
rename from server/mpm/experimental/event/config5.m4
rename to server/mpm/event/config5.m4

diff --git a/server/mpm/experimental/event/event.c b/server/mpm/event/event.c
similarity index 100%
rename from server/mpm/experimental/event/event.c
rename to server/mpm/event/event.c

diff --git a/server/mpm/experimental/event/fdqueue.c b/server/mpm/event/fdqueue.c
similarity index 100%
rename from server/mpm/experimental/event/fdqueue.c
rename to server/mpm/event/fdqueue.c

diff --git a/server/mpm/experimental/event/fdqueue.h b/server/mpm/event/fdqueue.h
similarity index 100%
rename from server/mpm/experimental/event/fdqueue.h
rename to server/mpm/event/fdqueue.h

diff --git a/server/mpm/experimental/event/mpm_default.h b/server/mpm/event/mpm_default.h
similarity index 100%
rename from server/mpm/experimental/event/mpm_default.h
rename to server/mpm/event/mpm_default.h

diff --git a/server/mpm/experimental/event/pod.c b/server/mpm/event/pod.c
similarity index 100%
rename from server/mpm/experimental/event/pod.c
rename to server/mpm/event/pod.c

diff --git a/server/mpm/experimental/event/pod.h b/server/mpm/event/pod.h
similarity index 100%
rename from server/mpm/experimental/event/pod.h
rename to server/mpm/event/pod.h