Author: stas
Date: Tue May 24 11:53:49 2005
New Revision: 178247
URL: http://svn.apache.org/viewcvs?rev=178247&view=rev
Log:
deal with potentially unavailable mod_alias
Modified:
perl/modperl/trunk/ModPerl-Registry/t/206.t
perl/modperl/trunk/ModPerl-Registry/t/304.t
perl/modperl/trunk/ModPerl-Registry/t/404.t
perl/modperl/trunk/ModPerl-Registry/t/500.t
perl/modperl/trunk/ModPerl-Registry/t/bad_scripts.t
perl/modperl/trunk/ModPerl-Registry/t/basic.t
perl/modperl/trunk/ModPerl-Registry/t/bin_resp.t
perl/modperl/trunk/ModPerl-Registry/t/cgi.t
perl/modperl/trunk/ModPerl-Registry/t/closure.t
perl/modperl/trunk/ModPerl-Registry/t/conf/extra.conf.in
perl/modperl/trunk/ModPerl-Registry/t/flush.t
perl/modperl/trunk/ModPerl-Registry/t/ithreads.t
perl/modperl/trunk/ModPerl-Registry/t/nph.t
perl/modperl/trunk/ModPerl-Registry/t/perlrun_extload.t
perl/modperl/trunk/ModPerl-Registry/t/prefork.t
perl/modperl/trunk/ModPerl-Registry/t/redirect.t
perl/modperl/trunk/ModPerl-Registry/t/special_blocks.t
Modified: perl/modperl/trunk/ModPerl-Registry/t/206.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/206.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/206.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/206.t Tue May 24 11:53:49 2005
@@ -5,7 +5,7 @@
use Apache::TestUtil;
use Apache::TestRequest qw(GET);
-plan tests => 2;
+plan tests => 2, need 'mod_alias.c';
my $url = "/registry/206.pl";
my $res = GET($url);
Modified: perl/modperl/trunk/ModPerl-Registry/t/304.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/304.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/304.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/304.t Tue May 24 11:53:49 2005
@@ -5,7 +5,7 @@
use Apache::TestUtil;
use Apache::TestRequest qw(GET);
-plan tests => 10;
+plan tests => 10, need 'mod_alias.c';
my $url = "/registry/304.pl";
Modified: perl/modperl/trunk/ModPerl-Registry/t/404.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/404.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/404.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/404.t Tue May 24 11:53:49 2005
@@ -5,7 +5,7 @@
use Apache::TestUtil;
use Apache::TestRequest qw(GET_BODY GET);
-plan tests => 2;
+plan tests => 2, need 'mod_alias.c';
{
t_client_log_error_is_expected();
Modified: perl/modperl/trunk/ModPerl-Registry/t/500.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/500.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/500.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/500.t Tue May 24 11:53:49 2005
@@ -5,7 +5,7 @@
use Apache::TestUtil;
use Apache::TestRequest qw(GET);
-plan tests => 7;
+plan tests => 7, need 'mod_alias.c';
{
# the script changes the status before the run-time error happens,
Modified: perl/modperl/trunk/ModPerl-Registry/t/bad_scripts.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/bad_scripts.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/bad_scripts.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/bad_scripts.t Tue May 24 11:53:49 2005
@@ -5,7 +5,7 @@
use Apache::TestUtil;
use Apache::TestRequest qw(GET);
-plan tests => 1;
+plan tests => 1, need 'mod_alias.c';
{
t_client_log_error_is_expected();
Modified: perl/modperl/trunk/ModPerl-Registry/t/basic.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/basic.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/basic.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/basic.t Tue May 24 11:53:49 2005
@@ -14,7 +14,7 @@
my @aliases = sort keys %modules;
-plan tests => @aliases * 5 + 3;
+plan tests => @aliases * 5 + 3, need 'mod_alias.c';
my $vars = Apache::Test::config()->{vars};
my $script_file = t_catfile_apache $vars->{serverroot}, 'cgi-bin', 'basic.pl';
Modified: perl/modperl/trunk/ModPerl-Registry/t/bin_resp.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/bin_resp.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/bin_resp.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/bin_resp.t Tue May 24 11:53:49 2005
@@ -7,7 +7,7 @@
use Apache::TestUtil;
use Apache::TestRequest;
-plan tests => 2;
+plan tests => 2, need 'mod_alias.c';
# 2 sub-tests
{
Modified: perl/modperl/trunk/ModPerl-Registry/t/cgi.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/cgi.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/cgi.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/cgi.t Tue May 24 11:53:49 2005
@@ -5,7 +5,7 @@
use Apache::TestUtil;
use Apache::TestRequest qw(GET);
-plan tests => 2, need_min_module_version CGI => 3.08;
+plan tests => 2, need 'mod_alias.c', need_min_module_version CGI => 3.08;
my $url = "/registry/cgi.pl";
my $res = GET $url;
Modified: perl/modperl/trunk/ModPerl-Registry/t/closure.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/closure.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/closure.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/closure.t Tue May 24 11:53:49 2005
@@ -17,7 +17,7 @@
my @modules = qw(registry registry_bb perlrun);
-plan tests => 6;
+plan tests => 6, need 'mod_alias.c';
my $cfg = Apache::Test::config();
Modified: perl/modperl/trunk/ModPerl-Registry/t/conf/extra.conf.in
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/conf/extra.conf.in?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/conf/extra.conf.in (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/conf/extra.conf.in Tue May 24
11:53:49 2005
@@ -35,16 +35,18 @@
#############################
### Normal registry setup ###
#############################
-Alias /registry/ @ServerRoot@/cgi-bin/
-Alias /registry_bb/ @ServerRoot@/cgi-bin/
-Alias /registry_oo_conf/ @ServerRoot@/cgi-bin/
-Alias /registry_prefork/ @ServerRoot@/cgi-bin/
-Alias /perlrun/ @ServerRoot@/cgi-bin/
-Alias /perlrun_prefork/ @ServerRoot@/cgi-bin/
-Alias /nph/ @ServerRoot@/cgi-bin/
-Alias /registry_modperl_handler/ @ServerRoot@/cgi-bin/
+<IfModule mod_alias.c>
+ Alias /registry/ @ServerRoot@/cgi-bin/
+ Alias /registry_bb/ @ServerRoot@/cgi-bin/
+ Alias /registry_oo_conf/ @ServerRoot@/cgi-bin/
+ Alias /registry_prefork/ @ServerRoot@/cgi-bin/
+ Alias /perlrun/ @ServerRoot@/cgi-bin/
+ Alias /perlrun_prefork/ @ServerRoot@/cgi-bin/
+ Alias /nph/ @ServerRoot@/cgi-bin/
+ Alias /registry_modperl_handler/ @ServerRoot@/cgi-bin/
-ScriptAlias /cgi-bin/ @ServerRoot@/cgi-bin/
+ ScriptAlias /cgi-bin/ @ServerRoot@/cgi-bin/
+</IfModule>
PerlModule ModPerl::RegistryBB
<Location /registry_bb>
@@ -112,11 +114,12 @@
#######################################
### Same interpreter registry setup ###
#######################################
-
-Alias /same_interp/registry/ @ServerRoot@/cgi-bin/
-Alias /same_interp/registry_bb/ @ServerRoot@/cgi-bin/
-Alias /same_interp/registry_oo_conf/ @ServerRoot@/cgi-bin/
-Alias /same_interp/perlrun/ @ServerRoot@/cgi-bin/
+<IfModule mod_alias.c>
+ Alias /same_interp/registry/ @ServerRoot@/cgi-bin/
+ Alias /same_interp/registry_bb/ @ServerRoot@/cgi-bin/
+ Alias /same_interp/registry_oo_conf/ @ServerRoot@/cgi-bin/
+ Alias /same_interp/perlrun/ @ServerRoot@/cgi-bin/
+</IfModule>
PerlModule Apache::TestHandler
@@ -157,8 +160,10 @@
</Location>
### the 404 test ###
+<IfModule mod_alias.c>
+ Alias /error_document/ @ServerRoot@/cgi-bin/
+</IfModule>
-Alias /error_document/ @ServerRoot@/cgi-bin/
<Location /error_document>
ErrorDocument 404 /error_document/404.pl
SetHandler perl-script
@@ -167,8 +172,9 @@
</Location>
### deflate tests ###
-
-Alias /registry_bb_deflate/ @ServerRoot@/cgi-bin/
+<IfModule mod_alias.c>
+ Alias /registry_bb_deflate/ @ServerRoot@/cgi-bin/
+</IfModule>
#PerlOutputFilterHandler ModPerl::TestFilterDebug::snoop_connection
PerlModule ModPerl::RegistryBB
Modified: perl/modperl/trunk/ModPerl-Registry/t/flush.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/flush.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/flush.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/flush.t Tue May 24 11:53:49 2005
@@ -5,7 +5,7 @@
use Apache::TestUtil;
use Apache::TestRequest qw(GET_BODY);
-plan tests => 1, need 'deflate',
+plan tests => 1, need 'deflate', 'mod_alias.c',
need_min_module_version("Compress::Zlib", "1.09"),
need_min_apache_version("2.0.48");
# it requires httpd 2.0.48 because of the bug in mod_deflate:
Modified: perl/modperl/trunk/ModPerl-Registry/t/ithreads.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/ithreads.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/ithreads.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/ithreads.t Tue May 24 11:53:49 2005
@@ -9,7 +9,7 @@
use constant HAS_ITHREADS => ($] >= 5.008001 && $Config{useithreads});
-plan tests => 1, need
+plan tests => 1, need 'mod_alias.c',
{"perl 5.8.1 or higher w/ithreads enabled is required" => HAS_ITHREADS};
{
Modified: perl/modperl/trunk/ModPerl-Registry/t/nph.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/nph.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/nph.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/nph.t Tue May 24 11:53:49 2005
@@ -5,7 +5,7 @@
use Apache::TestUtil;
use Apache::TestRequest;
-plan tests => 6;
+plan tests => 6, need 'mod_alias.c';
my $url = "/nph/nph-foo.pl";
Modified: perl/modperl/trunk/ModPerl-Registry/t/perlrun_extload.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/perlrun_extload.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/perlrun_extload.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/perlrun_extload.t Tue May 24 11:53:49
2005
@@ -6,7 +6,7 @@
use Apache::TestRequest qw(GET);
use TestCommon::SameInterp;
-plan tests => 2;
+plan tests => 2, need 'mod_alias.c';
my $url = "/same_interp/perlrun/perlrun_extload.pl";
my $same_interp = Apache::TestRequest::same_interp_tie($url);
Modified: perl/modperl/trunk/ModPerl-Registry/t/prefork.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/prefork.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/prefork.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/prefork.t Tue May 24 11:53:49 2005
@@ -19,8 +19,8 @@
my @aliases = sort keys %modules;
-plan tests => [EMAIL PROTECTED], need {
- "can't run under threaded MPMs" => !$mpm_is_threaded };
+plan tests => [EMAIL PROTECTED], need 'mod_alias.c',
+ { "can't run under threaded MPMs" => !$mpm_is_threaded };
my $script = "prefork.pl";
Modified: perl/modperl/trunk/ModPerl-Registry/t/redirect.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/redirect.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/redirect.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/redirect.t Tue May 24 11:53:49 2005
@@ -7,7 +7,7 @@
use Apache::TestUtil qw(t_catfile_apache);
-plan tests => 4, need_lwp;
+plan tests => 4, need 'mod_alias.c', need_lwp;
# need LWP to handle redirects
my $base_url = "/registry/redirect.pl";
Modified: perl/modperl/trunk/ModPerl-Registry/t/special_blocks.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/t/special_blocks.t?rev=178247&r1=178246&r2=178247&view=diff
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/special_blocks.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/special_blocks.t Tue May 24 11:53:49
2005
@@ -16,7 +16,7 @@
my @aliases = sort keys %modules;
-plan tests => @aliases * 4;
+plan tests => @aliases * 4, need 'mod_alias.c';
{
# PerlRun always run BEGIN/END since it's never cached
