svn commit: r470827 - in /perl/modperl/trunk: ModPerl-Registry/t/fatalstobrowser.t t/filter/both_str_req_proxy.t t/hooks/TestHooks/stacked_handlers2.pm t/hooks/stacked_handlers2.t t/modules/include.t t/modules/proxy.t

[geoff]

Author: geoff
Date: Fri Nov  3 06:04:28 2006
New Revision: 470827

URL: http://svn.apache.org/viewvc?view=rev&rev=470827
Log:
prevent perl-based module namespace collisions by
adding mod_ prefix to all httpd modules we want to
check in need_module
same as Apache-Test PR 22748

Modified:
    perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t
    perl/modperl/trunk/t/filter/both_str_req_proxy.t
    perl/modperl/trunk/t/hooks/TestHooks/stacked_handlers2.pm
    perl/modperl/trunk/t/hooks/stacked_handlers2.t
    perl/modperl/trunk/t/modules/include.t
    perl/modperl/trunk/t/modules/proxy.t

Modified: perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t?view=diff&rev=470827&r1=470826&r2=470827
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t Fri Nov  3 06:04:28 
2006
@@ -10,7 +10,7 @@
 
 use File::Spec::Functions qw(catfile);
 
-plan tests => 4, need need_module(qw(alias)),
+plan tests => 4, need need_module(qw(mod_alias)),
                       need_cgi,
                       need_min_module_version CGI => 99.99,
                       skip_reason('fatalsToBrowser known not to work');

Modified: perl/modperl/trunk/t/filter/both_str_req_proxy.t
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/t/filter/both_str_req_proxy.t?view=diff&rev=470827&r1=470826&r2=470827
==============================================================================
--- perl/modperl/trunk/t/filter/both_str_req_proxy.t (original)
+++ perl/modperl/trunk/t/filter/both_str_req_proxy.t Fri Nov  3 06:04:28 2006
@@ -5,7 +5,7 @@
 use Apache::TestRequest;
 use Apache::TestUtil;
 
-plan tests => 1, need need_module(qw(proxy proxy_http.c)),
+plan tests => 1, need need_module(qw(mod_proxy proxy_http.c)),
     need_access;
 
 my $data = join ' ', 'A'..'Z', 0..9;

Modified: perl/modperl/trunk/t/hooks/TestHooks/stacked_handlers2.pm
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/t/hooks/TestHooks/stacked_handlers2.pm?view=diff&rev=470827&r1=470826&r2=470827
==============================================================================
--- perl/modperl/trunk/t/hooks/TestHooks/stacked_handlers2.pm (original)
+++ perl/modperl/trunk/t/hooks/TestHooks/stacked_handlers2.pm Fri Nov  3 
06:04:28 2006
@@ -45,6 +45,17 @@
     return Apache2::Const::SERVER_ERROR;
 }
 
+sub push_handlers {
+
+    my $r = shift;
+
+    $r->push_handlers(PerlFixupHandler => \&ok);
+
+    callback($r);
+
+    return Apache2::Const::OK;
+}
+
 sub callback {
 
     my $obj = shift;
@@ -167,8 +178,9 @@
         # 1 run, 1 left behind
         PerlTypeHandler  TestHooks::stacked_handlers2::ok 
TestHooks::stacked_handlers3::server_error
 
-        # all 2 run
+        # all 4 run
         PerlFixupHandler TestHooks::stacked_handlers2::ok 
TestHooks::stacked_handlers2::ok
+        PerlFixupHandler TestHooks::stacked_handlers2::push_handlers
 
         # 2 run, 2 left behind
         PerlResponseHandler TestHooks::stacked_handlers2::declined 
TestHooks::stacked_handlers2 

Modified: perl/modperl/trunk/t/hooks/stacked_handlers2.t
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/t/hooks/stacked_handlers2.t?view=diff&rev=470827&r1=470826&r2=470827
==============================================================================
--- perl/modperl/trunk/t/hooks/stacked_handlers2.t (original)
+++ perl/modperl/trunk/t/hooks/stacked_handlers2.t Fri Nov  3 06:04:28 2006
@@ -26,7 +26,7 @@
 ran 2 PerlAuthenHandler handlers
 ran 2 PerlAuthzHandler handlers
 ran 1 PerlTypeHandler handlers
-ran 2 PerlFixupHandler handlers
+ran 4 PerlFixupHandler handlers
 ran 2 PerlResponseHandler handlers
 ran 2 PerlOutputFilterHandler handlers!;
 

Modified: perl/modperl/trunk/t/modules/include.t
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/t/modules/include.t?view=diff&rev=470827&r1=470826&r2=470827
==============================================================================
--- perl/modperl/trunk/t/modules/include.t (original)
+++ perl/modperl/trunk/t/modules/include.t Fri Nov  3 06:04:28 2006
@@ -13,7 +13,7 @@
     'footer',
 );
 
-plan tests => 2 + @patterns, need need_module('include', 'mod_mime'),
+plan tests => 2 + @patterns, need need_module('mod_include', 'mod_mime'),
     need_min_module_version(CGI => 3.08);
 
 my $location = "/includes/test.shtml";

Modified: perl/modperl/trunk/t/modules/proxy.t
URL: 
http://svn.apache.org/viewvc/perl/modperl/trunk/t/modules/proxy.t?view=diff&rev=470827&r1=470826&r2=470827
==============================================================================
--- perl/modperl/trunk/t/modules/proxy.t (original)
+++ perl/modperl/trunk/t/modules/proxy.t Fri Nov  3 06:04:28 2006
@@ -10,7 +10,7 @@
 
 t_debug("connecting to $url");
 
-plan tests => 1, need need_module(qw(proxy proxy_http.c)),
+plan tests => 1, need need_module(qw(mod_proxy proxy_http.c)),
     need_access;
 
 my $expected = "ok";