- update to 2.0.9-rc2

- install modules file instead activating the module with apxs

RC2 has really gone a long way, and is a real candidate to
become the next official release.

Tested against apache22/24 MPM prefork/event/worker.

Changes:
========
Remove PerlInterpScope. This has not been working properly with threaded
MPMs with httpd-2.4.x and the use-case of this directive was questionable.
[Jan Kaluza]

Allow running the test suite with httpd-2.4.x when mod_access_compat is not
loaded. [Steve Hay]

Add support for Apache httpd-2.4.x. [Torsten Foertsch, Jan Kaluza,
Steve Hay, Gozer]

Don't call modperl_threaded_mpm() et al. from XS code. Fixes Debian Bug
#765174. [Niko Tyni <ntyni@debian.org>]

Make sure modperl_interp_select uses r->server rather than the passed s
parameter to find the interpreter pool to pull an interpreter from. This
fixes an issue with vhosts with a separate interpreter pool and runtime
dir-config merges that used to pull the interpreter from the wrong pool.
[Torsten Foertsch]

PerlInterpScope is now more advisory. Using $(c|r)->pnotes will bind
the current interpreter to that object for it's lifetime.
$(c|r)->pnotes_kill() can be used to prematurely drop pnotes and
remove this binding. [Torsten Foertsch]

Now correctly invokes PerlCleanupHandlers, even if they are the only
handler type configured for that request [Torsten Foertsch]

For threaded MPMs, change interpreter managment to a new, reference-counted
allocation model. [Torsten Foertsch]

Expose modperl_interp_pool_t via ModPerl::InterpPool, modperl_tipool_t
via ModPerl::TiPool and modperl_tipool_config_t via ModPerl::TiPoolConfig
[Torsten Foertsch]

Expose modperl_interp_t via ModPerl::Interpreter [Torsten Foertsch]

Fix t/compat/apache_file.t on Windows. Apache::File->tmpfile() wants TMPDIR
or TEMP from the environment, or else defaults to /tmp. The latter is no
good on Windows, so make sure the environment variables are passed through.
(TEMP should be set to something suitable on Windows.) [Steve Hay]

Fix t/api/err_headers_out.t with HTTP::Headers > 6.00. [Rolando
<rolosworld@gmail.com>]

with haed apache@

1 files changed, 15 insertions, 19 deletions

diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index 9c0f27d435b2..f8f00bfd8360 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -1,4 +1,5 @@
 bin/mp2bug
+%%APACHEETCDIR%%/modules.d/%%APMOD_FILE%%
 %%APACHEINCLUDEDIR%%/modperl_apr_perlio.h
 %%APACHEINCLUDEDIR%%/modperl_xs_sv_convert.h
 %%APACHEINCLUDEDIR%%/modperl_xs_typedefs.h
@@ -70,8 +71,8 @@ bin/mp2bug
 %%SITE_ARCH%%/APR/Status.pm
 %%SITE_ARCH%%/APR/String.pm
 %%SITE_ARCH%%/APR/Table.pm
-%%THREADMUTEX%%%%SITE_ARCH%%/APR/ThreadMutex.pm
-%%THREADRWLOCK%%%%SITE_ARCH%%/APR/ThreadRWLock.pm
+%%SITE_ARCH%%/APR/ThreadMutex.pm
+%%SITE_ARCH%%/APR/ThreadRWLock.pm
 %%SITE_ARCH%%/APR/URI.pm
 %%SITE_ARCH%%/APR/UUID.pm
 %%SITE_ARCH%%/APR/Util.pm
@@ -130,7 +131,7 @@ bin/mp2bug
 %%SITE_ARCH%%/Apache2/PerlSections.pm
 %%SITE_ARCH%%/Apache2/PerlSections/Dump.pm
 %%SITE_ARCH%%/Apache2/Process.pm
-%%AP22%%%%AP24%%%%SITE_ARCH%%/Apache2/Provider.pm
+%%AP22%%%%SITE_ARCH%%/Apache2/Provider.pm
 %%SITE_ARCH%%/Apache2/Reload.pm
 %%SITE_ARCH%%/Apache2/RequestIO.pm
 %%SITE_ARCH%%/Apache2/RequestRec.pm
@@ -159,8 +160,8 @@ bin/mp2bug
 %%SITE_ARCH%%/ModPerl/Const.pm
 %%SITE_ARCH%%/ModPerl/FunctionMap.pm
 %%SITE_ARCH%%/ModPerl/Global.pm
-%%AP24%%%%SITE_ARCH%%/ModPerl/InterpPool.pm
-%%AP24%%%%SITE_ARCH%%/ModPerl/Interpreter.pm
+%%SITE_ARCH%%/ModPerl/InterpPool.pm
+%%SITE_ARCH%%/ModPerl/Interpreter.pm
 %%SITE_ARCH%%/ModPerl/MM.pm
 %%SITE_ARCH%%/ModPerl/Manifest.pm
 %%SITE_ARCH%%/ModPerl/MapUtil.pm
@@ -176,12 +177,11 @@ bin/mp2bug
 %%SITE_ARCH%%/ModPerl/StructureMap.pm
 %%SITE_ARCH%%/ModPerl/TestReport.pm
 %%SITE_ARCH%%/ModPerl/TestRun.pm
-%%AP24%%%%SITE_ARCH%%/ModPerl/TiPool.pm
-%%AP24%%%%SITE_ARCH%%/ModPerl/TiPoolConfig.pm
+%%SITE_ARCH%%/ModPerl/TiPool.pm
+%%SITE_ARCH%%/ModPerl/TiPoolConfig.pm
 %%SITE_ARCH%%/ModPerl/TypeMap.pm
 %%SITE_ARCH%%/ModPerl/Util.pm
 %%SITE_ARCH%%/ModPerl/WrapXS.pm
-%%AP24%%%%SITE_ARCH%%/MyTest/Util.pm
 %%SITE_ARCH%%/auto/APR/APR.so
 %%SITE_ARCH%%/auto/APR/Base64/Base64.so
 %%SITE_ARCH%%/auto/APR/Brigade/Brigade.so
@@ -201,8 +201,8 @@ bin/mp2bug
 %%SITE_ARCH%%/auto/APR/Status/Status.so
 %%SITE_ARCH%%/auto/APR/String/String.so
 %%SITE_ARCH%%/auto/APR/Table/Table.so
-%%THREADMUTEX%%%%SITE_ARCH%%/auto/APR/ThreadMutex/ThreadMutex.so
-%%THREADRWLOCK%%%%SITE_ARCH%%/auto/APR/ThreadRWLock/ThreadRWLock.so
+%%SITE_ARCH%%/auto/APR/ThreadMutex/ThreadMutex.so
+%%SITE_ARCH%%/auto/APR/ThreadRWLock/ThreadRWLock.so
 %%SITE_ARCH%%/auto/APR/URI/URI.so
 %%SITE_ARCH%%/auto/APR/UUID/UUID.so
 %%SITE_ARCH%%/auto/APR/Util/Util.so
@@ -221,7 +221,7 @@ bin/mp2bug
 %%SITE_ARCH%%/auto/Apache2/MPM/MPM.so
 %%SITE_ARCH%%/auto/Apache2/Module/Module.so
 %%SITE_ARCH%%/auto/Apache2/Process/Process.so
-%%AP22%%%%AP24%%%%SITE_ARCH%%/auto/Apache2/Provider/Provider.so
+%%AP22%%%%SITE_ARCH%%/auto/Apache2/Provider/Provider.so
 %%SITE_ARCH%%/auto/Apache2/RequestIO/RequestIO.so
 %%SITE_ARCH%%/auto/Apache2/RequestRec/RequestRec.so
 %%SITE_ARCH%%/auto/Apache2/RequestUtil/RequestUtil.so
@@ -235,10 +235,10 @@ bin/mp2bug
 %%SITE_ARCH%%/auto/Apache2/typemap
 %%SITE_ARCH%%/auto/ModPerl/Const/Const.so
 %%SITE_ARCH%%/auto/ModPerl/Global/Global.so
-%%AP24%%%%SITE_ARCH%%/auto/ModPerl/InterpPool/InterpPool.so
-%%AP24%%%%SITE_ARCH%%/auto/ModPerl/Interpreter/Interpreter.so
-%%AP24%%%%SITE_ARCH%%/auto/ModPerl/TiPool/TiPool.so
-%%AP24%%%%SITE_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so
+%%SITE_ARCH%%/auto/ModPerl/InterpPool/InterpPool.so
+%%SITE_ARCH%%/auto/ModPerl/Interpreter/Interpreter.so
+%%SITE_ARCH%%/auto/ModPerl/TiPool/TiPool.so
+%%SITE_ARCH%%/auto/ModPerl/TiPoolConfig/TiPoolConfig.so
 %%SITE_ARCH%%/auto/ModPerl/Util/Util.so
 %%SITE_ARCH%%/mod_perl2.pm
 %%PERL5_MAN3%%/APR.3.gz
@@ -332,9 +332,5 @@ bin/mp2bug
 %%PERL5_MAN3%%/ModPerl::RegistryLoader.3.gz
 %%PERL5_MAN3%%/ModPerl::RegistryPrefork.3.gz
 %%PERL5_MAN3%%/ModPerl::Util.3.gz
-%%AP24%%%%PERL5_MAN3%%/MyTest::Util.3.gz
 %%PERL5_MAN3%%/mod_perl2.3.gz
-@unexec sed -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf
-@unexec echo "Don't forget to remove all mod_perl2-related directives in your httpd.conf"
 %%APACHEMODDIR%%/%%AP_MODULE%%
-@exec %D/sbin/apxs -e %%AP_MOD_EN%% -n %%AP_NAME%% %D/%F