perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: modperl-2.0/t/response/TestModperl method.pm
Date Fri, 18 Apr 2003 06:18:59 GMT
stas        2003/04/17 23:18:59

  Modified:    .        Changes
               perl-framework/Apache-Test/lib/Apache TestConfigPerl.pm
                        TestRequest.pm
               t/apache cgihandler.t post.t read.t scanhdrs.t scanhdrs2.t
                        send_cgi_header.t
               t/api    sendfile.t
               t/compat conn_authen.t request_body.t send_fd.t
               t/directive perlloadmodule2.t perlloadmodule3.t
                        perlloadmodule4.t perlloadmodule5.t
                        perlloadmodule6.t perlmodule.t perlrequire.t
                        setupenv.t
               t/error  push_handlers.t runtime.t syntax.t
               t/filter both_str_con_add.t both_str_req_add.t in_bbs_body.t
                        in_bbs_msg.t in_init_basic.t in_str_consume.t
                        in_str_declined.t in_str_lc.t in_str_sandwich.t
                        out_bbs_ctx.t out_init_basic.t out_str_ctx.t
                        out_str_declined.t out_str_remove.t
                        out_str_req_eos.t out_str_req_mix.t
                        out_str_reverse.t
               t/filter/TestFilter both_str_con_add.pm both_str_req_add.pm
                        in_bbs_msg.pm in_str_msg.pm out_str_api.pm
                        out_str_req_eos.pm out_str_req_mix.pm
               t/hooks  access.t authen.t authz.t cleanup.t push_handlers.t
                        stacked_handlers.t
               t/hooks/TestHooks cleanup.pm push_handlers.pm
                        stacked_handlers.pm trans.pm
               t/modperl getc.t readline.t sameinterp.t
               t/modules cgi.t cgiupload.t
               t/preconnection note.t
               t/preconnection/TestPreConnection note.pm
               t/response/TestAPI r_subclass.pm request_rec.pm rutil.pm
                        uri.pm
               t/response/TestDirective perlloadmodule2.pm
                        perlloadmodule3.pm perlloadmodule4.pm
                        perlloadmodule5.pm perlloadmodule6.pm perlmodule.pm
                        perlrequire.pm
               t/response/TestModperl method.pm
  Log:
  httpd (1.3 && 2) / winFU have problems when the first path's segment
  includes ':' (security precaution which breaks the rfc) so we can't
  use /TestFoo::bar as path_info in Apache::Test. Adjusting all tests
  to use /TestFoo__bar.
  
  Revision  Changes    Path
  1.175     +5 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.174
  retrieving revision 1.175
  diff -u -r1.174 -r1.175
  --- Changes	17 Apr 2003 08:04:47 -0000	1.174
  +++ Changes	18 Apr 2003 06:18:54 -0000	1.175
  @@ -10,6 +10,11 @@
   
   =item 1.99_09-dev
   
  +httpd (1.3 && 2) / winFU have problems when the first path's segment
  +includes ':' (security precaution which breaks the rfc) so we can't
  +use /TestFoo::bar as path_info in Apache::Tests. Adjusting all tests
  +to use /TestFoo__bar. [Stas]
  +
   implement init filter handlers + tests [Stas]
   
   improving ModPerl::MethodLookup to:
  
  
  
  1.69      +7 -4      httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm
  
  Index: TestConfigPerl.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- TestConfigPerl.pm	28 Mar 2003 04:50:12 -0000	1.68
  +++ TestConfigPerl.pm	18 Apr 2003 06:18:54 -0000	1.69
  @@ -7,6 +7,7 @@
   use File::Spec::Functions qw(catfile splitdir abs2rel);
   use File::Find qw(finddepth);
   use Apache::TestTrace;
  +use Apache::TestRequest;
   use Config;
   
   my %libmodperl  = (1 => 'libperl.so', 2 => 'mod_perl.so');
  @@ -92,7 +93,7 @@
   }
   
   sub write_pm_test {
  -    my($self, $pm, $base, $sub) = @_;
  +    my($self, $module, $base, $sub) = @_;
   
       my $dir = catfile $self->{vars}->{t_dir}, $base;
       my $t = catfile $dir, "$sub.t";
  @@ -101,9 +102,11 @@
       $self->gendir($dir);
       my $fh = $self->genfile($t);
   
  +    my $path = Apache::TestRequest::module2path($module);
  +
       print $fh <<EOF;
   use Apache::TestRequest 'GET';
  -my \$res = GET "/$pm";
  +my \$res = GET "/$path";
   if (\$res->is_success) {
       print \$res->content;
   }
  @@ -193,7 +196,8 @@
   
   sub location_container {
       my($self, $module) = @_;
  -    Location => "/$module";
  +    my $path = Apache::TestRequest::module2path($module);
  +    Location => "/$path";
   }
   
   sub vhost_container {
  @@ -491,7 +495,6 @@
           $self->write_pm_test($module, lc $base, lc $sub);
       }
   }
  -
   
   # turn a balanced (key=>val) list with potentially multiple indentical
   # keys into a hash of lists.
  
  
  
  1.76      +11 -0     httpd-test/perl-framework/Apache-Test/lib/Apache/TestRequest.pm
  
  Index: TestRequest.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRequest.pm,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- TestRequest.pm	3 Apr 2003 06:13:30 -0000	1.75
  +++ TestRequest.pm	18 Apr 2003 06:18:54 -0000	1.76
  @@ -68,6 +68,17 @@
       $Apache::TestRequest::Scheme;
   }
   
  +sub module2path {
  +    my $package = shift;
  +
  +    # httpd (1.3 && 2) / winFU have problems when the first path's
  +    # segment includes ':' (security precaution which breaks the rfc)
  +    # so we can't use /TestFoo::bar as path_info
  +    (my $path = $package) =~ s/::/__/g;
  +
  +    return $path;
  +}
  +
   sub user_agent {
       my $args = {@_};
   
  
  
  
  1.3       +1 -1      modperl-2.0/t/apache/cgihandler.t
  
  Index: cgihandler.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/apache/cgihandler.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- cgihandler.t	20 Dec 2001 03:54:40 -0000	1.2
  +++ cgihandler.t	18 Apr 2003 06:18:55 -0000	1.3
  @@ -6,7 +6,7 @@
   
   plan tests => 2;
   
  -my $location = "/TestApache::cgihandler";
  +my $location = "/TestApache__cgihandler";
   my $str;
   
   my $data = "1..3\nok 1\nok 2\nok 3\n";
  
  
  
  1.5       +1 -1      modperl-2.0/t/apache/post.t
  
  Index: post.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/apache/post.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- post.t	1 Jan 2002 10:07:55 -0000	1.4
  +++ post.t	18 Apr 2003 06:18:55 -0000	1.5
  @@ -7,7 +7,7 @@
   
   plan tests => 2;
   
  -my $location = "/TestApache::post";
  +my $location = "/TestApache__post";
   my $str;
   
   my @data = (arizona => 'wildcats');
  
  
  
  1.5       +1 -1      modperl-2.0/t/apache/read.t
  
  Index: read.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/apache/read.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- read.t	13 May 2002 03:25:31 -0000	1.4
  +++ read.t	18 Apr 2003 06:18:55 -0000	1.5
  @@ -9,7 +9,7 @@
   #force test to go over http, since this doesn't work with t/TEST -ssl
   Apache::TestRequest::scheme('http');
   
  -my $location = "/TestApache::read";
  +my $location = "/TestApache__read";
   
   my $socket = Apache::TestRequest::vhost_socket('default');
   
  
  
  
  1.5       +1 -1      modperl-2.0/t/apache/scanhdrs.t
  
  Index: scanhdrs.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/apache/scanhdrs.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- scanhdrs.t	8 Mar 2003 08:54:03 -0000	1.4
  +++ scanhdrs.t	18 Apr 2003 06:18:55 -0000	1.5
  @@ -8,7 +8,7 @@
   plan tests => 4;
   
   my $module = 'TestApache::scanhdrs';
  -my $location = "/$module";
  +my $location = "/" . Apache::TestRequest::module2path($module);
   
   my $res = GET $location;
   
  
  
  
  1.3       +1 -1      modperl-2.0/t/apache/scanhdrs2.t
  
  Index: scanhdrs2.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/apache/scanhdrs2.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- scanhdrs2.t	11 Jan 2003 07:41:04 -0000	1.2
  +++ scanhdrs2.t	18 Apr 2003 06:18:55 -0000	1.3
  @@ -7,7 +7,7 @@
   
   plan tests => 5;
   
  -my $module = 'TestApache::scanhdrs2';
  +my $module = 'TestApache__scanhdrs2';
   my $location = "/$module";
   
   my $redirect = 'http://perl.apache.org/';
  
  
  
  1.2       +1 -1      modperl-2.0/t/apache/send_cgi_header.t
  
  Index: send_cgi_header.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/apache/send_cgi_header.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- send_cgi_header.t	14 Mar 2003 05:36:48 -0000	1.1
  +++ send_cgi_header.t	18 Apr 2003 06:18:55 -0000	1.2
  @@ -7,7 +7,7 @@
   
   plan tests => 3;
   
  -my $location = "/TestApache::send_cgi_header";
  +my $location = "/TestApache__send_cgi_header";
   my $res = GET $location;
   
   ok t_cmp('X-Bar',
  
  
  
  1.5       +1 -1      modperl-2.0/t/api/sendfile.t
  
  Index: sendfile.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/api/sendfile.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sendfile.t	21 Dec 2001 11:30:38 -0000	1.4
  +++ sendfile.t	18 Apr 2003 06:18:55 -0000	1.5
  @@ -8,7 +8,7 @@
   
   my $config = Apache::Test::config();
   
  -my $url = '/TestAPI::sendfile';
  +my $url = '/TestAPI__sendfile';
   
   my $data = GET_BODY($url);
   
  
  
  
  1.2       +1 -1      modperl-2.0/t/compat/conn_authen.t
  
  Index: conn_authen.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/compat/conn_authen.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- conn_authen.t	12 Feb 2003 23:42:22 -0000	1.1
  +++ conn_authen.t	18 Apr 2003 06:18:55 -0000	1.2
  @@ -6,7 +6,7 @@
   
   plan tests => 1, \&have_lwp;
   
  -my $location = "/TestCompat::conn_authen";
  +my $location = "/TestCompat__conn_authen";
   
   ok GET_OK $location, username => 'dougm', password => 'foo';
   
  
  
  
  1.3       +1 -1      modperl-2.0/t/compat/request_body.t
  
  Index: request_body.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/compat/request_body.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- request_body.t	15 Dec 2002 08:30:40 -0000	1.2
  +++ request_body.t	18 Apr 2003 06:18:55 -0000	1.3
  @@ -8,7 +8,7 @@
   
   plan tests => 5;
   
  -my $location = "/TestCompat::request_body";
  +my $location = "/TestCompat__request_body";
   
   # $r->send_http_header('text/plain');
   {
  
  
  
  1.2       +1 -1      modperl-2.0/t/compat/send_fd.t
  
  Index: send_fd.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/compat/send_fd.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- send_fd.t	15 Aug 2002 13:11:06 -0000	1.1
  +++ send_fd.t	18 Apr 2003 06:18:55 -0000	1.2
  @@ -8,7 +8,7 @@
   
   my $config = Apache::Test::config();
   
  -my $url = '/TestCompat::send_fd';
  +my $url = '/TestCompat__send_fd';
   
   my $data = GET_BODY($url);
   
  
  
  
  1.2       +1 -1      modperl-2.0/t/directive/perlloadmodule2.t
  
  Index: perlloadmodule2.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/directive/perlloadmodule2.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- perlloadmodule2.t	5 Dec 2002 03:31:09 -0000	1.1
  +++ perlloadmodule2.t	18 Apr 2003 06:18:55 -0000	1.2
  @@ -5,7 +5,7 @@
   use Apache::TestUtil;
   use Apache::TestRequest;
   
  -my $url = "/TestDirective::perlloadmodule2";
  +my $url = "/TestDirective__perlloadmodule2";
   
   plan tests => 3;
   
  
  
  
  1.4       +4 -3      modperl-2.0/t/directive/perlloadmodule3.t
  
  Index: perlloadmodule3.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/directive/perlloadmodule3.t,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- perlloadmodule3.t	30 Dec 2002 00:59:23 -0000	1.3
  +++ perlloadmodule3.t	18 Apr 2003 06:18:55 -0000	1.4
  @@ -8,6 +8,7 @@
   my $module = "TestDirective::perlloadmodule3";
   my $config   = Apache::Test::config();
   my $base_hostport = Apache::TestRequest::hostport($config);
  +my $path = Apache::TestRequest::module2path($module);
   
   # XXX: probably a good idea to split into more sub-tests, that test
   # smaller portions of information, but requires a more elaborate
  @@ -32,7 +33,7 @@
   MyOverride : MainServer
   MyPlus     : 5
   EOI
  -    my $location = "http://$base_hostport/$module";
  +    my $location = "http://$base_hostport/$path";
       my $received = GET_BODY $location;
       ok t_cmp($expected, $received, "server merge");
   }
  @@ -63,7 +64,7 @@
   MyOverride : Dir
   MyPlus     : 10
   EOI
  -    my $location = "http://$hostport/$module";
  +    my $location = "http://$hostport/$path";
       my $received = GET_BODY $location;
       ok t_cmp($expected, $received, "server/dir merge");
   }
  @@ -91,7 +92,7 @@
   MyPlus     : 11
   EOI
   
  -    my $location = "http://$hostport/$module/subdir";
  +    my $location = "http://$hostport/$path/subdir";
       my $received = GET_BODY $location;
       ok t_cmp($expected, $received, "server/dir/subdir merge");
   }
  
  
  
  1.2       +3 -1      modperl-2.0/t/directive/perlloadmodule4.t
  
  Index: perlloadmodule4.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/directive/perlloadmodule4.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- perlloadmodule4.t	12 Dec 2002 10:13:56 -0000	1.1
  +++ perlloadmodule4.t	18 Apr 2003 06:18:55 -0000	1.2
  @@ -2,10 +2,12 @@
   use warnings FATAL => 'all';
   
   use Apache::TestRequest;
  +use Apache::Test;
   
   my $module = "TestDirective::perlloadmodule4";
   my $config   = Apache::Test::config();
   Apache::TestRequest::module($module);
   my $hostport = Apache::TestRequest::hostport($config);
  +my $path = Apache::TestRequest::module2path($module);
   
  -print GET_BODY "http://$hostport/$module";
  +print GET_BODY "http://$hostport/$path";
  
  
  
  1.2       +3 -1      modperl-2.0/t/directive/perlloadmodule5.t
  
  Index: perlloadmodule5.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/directive/perlloadmodule5.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- perlloadmodule5.t	12 Dec 2002 10:13:56 -0000	1.1
  +++ perlloadmodule5.t	18 Apr 2003 06:18:55 -0000	1.2
  @@ -2,10 +2,12 @@
   use warnings FATAL => 'all';
   
   use Apache::TestRequest;
  +use Apache::Test;
   
   my $module = "TestDirective::perlloadmodule5";
   my $config   = Apache::Test::config();
   Apache::TestRequest::module($module);
   my $hostport = Apache::TestRequest::hostport($config);
  +my $path = Apache::TestRequest::module2path($module);
   
  -print GET_BODY "http://$hostport/$module";
  +print GET_BODY "http://$hostport/$path";
  
  
  
  1.2       +3 -1      modperl-2.0/t/directive/perlloadmodule6.t
  
  Index: perlloadmodule6.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/directive/perlloadmodule6.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- perlloadmodule6.t	12 Dec 2002 10:13:56 -0000	1.1
  +++ perlloadmodule6.t	18 Apr 2003 06:18:55 -0000	1.2
  @@ -2,10 +2,12 @@
   use warnings FATAL => 'all';
   
   use Apache::TestRequest;
  +use Apache::Test;
   
   my $module = "TestDirective::perlloadmodule6";
   my $config   = Apache::Test::config();
   Apache::TestRequest::module($module);
   my $hostport = Apache::TestRequest::hostport($config);
  +my $path = Apache::TestRequest::module2path($module);
   
  -print GET_BODY "http://$hostport/$module";
  +print GET_BODY "http://$hostport/$path";
  
  
  
  1.2       +2 -1      modperl-2.0/t/directive/perlmodule.t
  
  Index: perlmodule.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/directive/perlmodule.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- perlmodule.t	18 Jan 2002 06:52:01 -0000	1.1
  +++ perlmodule.t	18 Apr 2003 06:18:55 -0000	1.2
  @@ -16,9 +16,10 @@
   
   my $config   = Apache::Test::config();
   my $hostport = Apache::TestRequest::hostport($config);
  +my $path = Apache::TestRequest::module2path($module);
   t_debug("connecting to $hostport");
   
   ok t_cmp($module,
  -         GET_BODY("/TestDirective::perlmodule"),
  +         GET_BODY("/$path"),
            "testing PerlModule in $module");
   
  
  
  
  1.5       +5 -3      modperl-2.0/t/directive/perlrequire.t
  
  Index: perlrequire.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/directive/perlrequire.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- perlrequire.t	20 Dec 2001 03:54:41 -0000	1.4
  +++ perlrequire.t	18 Apr 2003 06:18:55 -0000	1.5
  @@ -8,6 +8,9 @@
   use Apache::TestUtil;
   use Apache::TestRequest;
   
  +my $config = Apache::Test::config();
  +my $path = Apache::TestRequest::module2path('TestDirective::perlrequire');
  +
   my %checks = (
       'default'                    => 'PerlRequired by Parent',
       'TestDirective::perlrequire' => 'PerlRequired by VirtualHost',
  @@ -18,13 +21,12 @@
   plan tests => scalar keys %checks;
   
   for my $module (sort keys %checks) {
  -    Apache::TestRequest::module($module);
   
  -    my $config   = Apache::Test::config();
  +    Apache::TestRequest::module($module);
       my $hostport = Apache::TestRequest::hostport($config);
       t_debug("connecting to $hostport");
   
       ok t_cmp($checks{$module},
  -             GET_BODY("/TestDirective::perlrequire"),
  +             GET_BODY("http://$hostport/$path"),
                "testing PerlRequire in $module");
   }
  
  
  
  1.3       +1 -1      modperl-2.0/t/directive/setupenv.t
  
  Index: setupenv.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/directive/setupenv.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- setupenv.t	19 Nov 2001 18:23:20 -0000	1.2
  +++ setupenv.t	18 Apr 2003 06:18:55 -0000	1.3
  @@ -7,7 +7,7 @@
   
   plan tests => 3;
   
  -my $location = '/TestDirective::setupenv';
  +my $location = '/TestDirective__setupenv';
   
   my $env = GET_BODY $location;
   
  
  
  
  1.4       +1 -1      modperl-2.0/t/error/push_handlers.t
  
  Index: push_handlers.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/error/push_handlers.t,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- push_handlers.t	22 Jan 2003 07:00:29 -0000	1.3
  +++ push_handlers.t	18 Apr 2003 06:18:56 -0000	1.4
  @@ -9,7 +9,7 @@
   # at least on FreeBSD, so it fails, skip for now.
   plan tests => 1, under_construction;
   
  -my $location = "/TestError::push_handlers";
  +my $location = "/TestError__push_handlers";
   my $expected = "ok";
   my $received = GET_BODY $location;
   
  
  
  
  1.2       +1 -1      modperl-2.0/t/error/runtime.t
  
  Index: runtime.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/error/runtime.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- runtime.t	23 Jan 2003 01:32:21 -0000	1.1
  +++ runtime.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -7,7 +7,7 @@
   
   plan tests => 1;
   
  -my $location = "/TestError::runtime";
  +my $location = "/TestError__runtime";
   my $res = GET($location);
   #t_debug($res->content);
   ok t_cmp(
  
  
  
  1.2       +1 -1      modperl-2.0/t/error/syntax.t
  
  Index: syntax.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/error/syntax.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- syntax.t	23 Jan 2003 01:32:21 -0000	1.1
  +++ syntax.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -7,7 +7,7 @@
   
   plan tests => 1;
   
  -my $location = "/TestError::syntax";
  +my $location = "/TestError__syntax";
   my $res = GET($location);
   #t_debug($res->content);
   ok t_cmp(
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/both_str_con_add.t
  
  Index: both_str_con_add.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/both_str_con_add.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- both_str_con_add.t	24 Jan 2003 07:39:28 -0000	1.1
  +++ both_str_con_add.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -9,7 +9,7 @@
   
   plan tests => 1 + @test_strings;
   
  -my $module = "TestFilter::both_str_con_add";
  +my $module = "TestFilter__both_str_con_add";
   my $socket = Apache::TestRequest::vhost_socket($module);
   
   ok $socket;
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/both_str_req_add.t
  
  Index: both_str_req_add.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/both_str_req_add.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- both_str_req_add.t	2 Apr 2003 02:44:13 -0000	1.1
  +++ both_str_req_add.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -10,7 +10,7 @@
   my $data = join ' ', 'A'..'Z', 0..9;
   my $expected = lc $data; # that's what the input filter does
   $expected =~ s/\s+//g;   # that's what the output filter does
  -my $location = '/TestFilter::both_str_req_add';
  +my $location = '/TestFilter__both_str_req_add';
   my $response = POST_BODY $location, content => $data;
   ok t_cmp($expected, $response, "lc input and reverse output filters");
   
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/in_bbs_body.t
  
  Index: in_bbs_body.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/in_bbs_body.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- in_bbs_body.t	15 Jan 2003 06:47:15 -0000	1.1
  +++ in_bbs_body.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -6,7 +6,7 @@
   
   plan tests => 2;
   
  -my $location = '/TestFilter::in_bbs_body';
  +my $location = '/TestFilter__in_bbs_body';
   
   for my $x (1,2) {
       my $data = scalar reverse "ok $x\n";
  
  
  
  1.3       +1 -1      modperl-2.0/t/filter/in_bbs_msg.t
  
  Index: in_bbs_msg.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/in_bbs_msg.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- in_bbs_msg.t	2 Apr 2003 03:01:27 -0000	1.2
  +++ in_bbs_msg.t	18 Apr 2003 06:18:56 -0000	1.3
  @@ -12,7 +12,7 @@
   my $hostport = Apache::TestRequest::hostport($config);
   t_debug("connecting to $hostport");
   
  -my $res = GET "/input_filter.html";
  +my $res = GET "http://$hostport/input_filter.html";
   if ($res->is_success) {
       print $res->content;
   }
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/in_init_basic.t
  
  Index: in_init_basic.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/in_init_basic.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- in_init_basic.t	17 Apr 2003 08:04:46 -0000	1.1
  +++ in_init_basic.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -10,6 +10,6 @@
   my $content = "content ok\n";
   my $expected = join '', $content, "init 1\n", "run 2\n";
   
  -my $location = '/TestFilter::in_init_basic';
  +my $location = '/TestFilter__in_init_basic';
   my $response = POST_BODY $location, content => $content;
   ok t_cmp($expected, $response, "test filter init functionality");
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/in_str_consume.t
  
  Index: in_str_consume.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/in_str_consume.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- in_str_consume.t	16 Jan 2003 05:15:18 -0000	1.1
  +++ in_str_consume.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -7,7 +7,7 @@
   
   plan tests => 1;
   
  -my $location = '/TestFilter::in_str_consume';
  +my $location = '/TestFilter__in_str_consume';
   
   # send a message bigger than 8k, so to make sure that the input filter
   # will get more than one bucket brigade with data.
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/in_str_declined.t
  
  Index: in_str_declined.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/in_str_declined.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- in_str_declined.t	2 Mar 2003 10:30:56 -0000	1.1
  +++ in_str_declined.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -3,7 +3,7 @@
   
   use Apache::TestRequest;
   
  -my $location = '/TestFilter::in_str_declined';
  +my $location = '/TestFilter__in_str_declined';
   
   my $chunk = "1234567890";
   my $data = $chunk x 2000;
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/in_str_lc.t
  
  Index: in_str_lc.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/in_str_lc.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- in_str_lc.t	15 Jan 2003 06:19:25 -0000	1.1
  +++ in_str_lc.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -7,7 +7,7 @@
   
   plan tests => 1;
   
  -my $location = '/TestFilter::in_str_lc';
  +my $location = '/TestFilter__in_str_lc';
   
   my $chunk = "[Foo BaR] ";
   my $data = $chunk x 250;
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/in_str_sandwich.t
  
  Index: in_str_sandwich.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/in_str_sandwich.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- in_str_sandwich.t	15 Jan 2003 06:19:25 -0000	1.1
  +++ in_str_sandwich.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -7,7 +7,7 @@
   
   plan tests => 1;
   
  -my $location = '/TestFilter::in_str_sandwich';
  +my $location = '/TestFilter__in_str_sandwich';
   
   my $expected = join "\n", qw(HEADER BODY TAIL), '';
   my $received = POST_BODY $location, content => "BODY\n";
  
  
  
  1.3       +1 -1      modperl-2.0/t/filter/out_bbs_ctx.t
  
  Index: out_bbs_ctx.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/out_bbs_ctx.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- out_bbs_ctx.t	3 Mar 2003 03:39:06 -0000	1.2
  +++ out_bbs_ctx.t	18 Apr 2003 06:18:56 -0000	1.3
  @@ -17,7 +17,7 @@
   
   {
       # test the filtering of the mod_perl response handler
  -    my $location = '/TestFilter::out_bbs_ctx';
  +    my $location = '/TestFilter__out_bbs_ctx';
       my $response = GET_BODY $location;
       ok t_cmp($expected, $response, "context filter");
   }
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/out_init_basic.t
  
  Index: out_init_basic.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/out_init_basic.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- out_init_basic.t	17 Apr 2003 08:04:46 -0000	1.1
  +++ out_init_basic.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -10,6 +10,6 @@
   my $content = "content ok\n";
   my $expected = join '', "init 1\n", "run 1\n", $content, "run 2\n", "run 3\n";
   
  -my $location = '/TestFilter::out_init_basic';
  +my $location = '/TestFilter__out_init_basic';
   my $response = POST_BODY $location, content => $content;
   ok t_cmp($expected, $response, "test filter init functionality");
  
  
  
  1.3       +1 -1      modperl-2.0/t/filter/out_str_ctx.t
  
  Index: out_str_ctx.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/out_str_ctx.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- out_str_ctx.t	3 Mar 2003 03:39:06 -0000	1.2
  +++ out_str_ctx.t	18 Apr 2003 06:18:56 -0000	1.3
  @@ -18,7 +18,7 @@
   
   {
       # test the filtering of the mod_perl response handler
  -    my $location = '/TestFilter::out_str_ctx';
  +    my $location = '/TestFilter__out_str_ctx';
       my $response = GET_BODY $location;
       ok t_cmp($expected, $response, "context stream filter");
   }
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/out_str_declined.t
  
  Index: out_str_declined.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/out_str_declined.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- out_str_declined.t	3 Mar 2003 03:42:06 -0000	1.1
  +++ out_str_declined.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -9,7 +9,7 @@
   
   my $expected = 11; # 10 flushes and 1 EOS bb
   
  -my $location = '/TestFilter::out_str_declined';
  +my $location = '/TestFilter__out_str_declined';
   my $response = GET_BODY $location;
   ok t_cmp($expected, $response, "an output filter handler returning DECLINED");
   
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/out_str_remove.t
  
  Index: out_str_remove.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/out_str_remove.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- out_str_remove.t	1 Apr 2003 05:20:50 -0000	1.1
  +++ out_str_remove.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -8,7 +8,7 @@
   plan tests => 1;
   
   my $expected = "F_O_O_b_a_r_";
  -my $location = '/TestFilter::out_str_remove';
  +my $location = '/TestFilter__out_str_remove';
   my $response = GET_BODY $location;
   ok t_cmp($expected, $response, "a filter that removes itself");
   
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/out_str_req_eos.t
  
  Index: out_str_req_eos.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/out_str_req_eos.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- out_str_req_eos.t	3 Apr 2003 05:51:23 -0000	1.1
  +++ out_str_req_eos.t	18 Apr 2003 06:18:56 -0000	1.2
  @@ -7,7 +7,7 @@
   
   plan tests => 1, ['include'];
   
  -my $location = '/TestFilter::out_str_req_eos';
  +my $location = '/TestFilter__out_str_req_eos';
   
   my $content = 'BODY';
   my $prefix = 'PREFIX_';
  
  
  
  1.3       +1 -1      modperl-2.0/t/filter/out_str_req_mix.t
  
  Index: out_str_req_mix.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/out_str_req_mix.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- out_str_req_mix.t	3 Apr 2003 06:50:37 -0000	1.2
  +++ out_str_req_mix.t	18 Apr 2003 06:18:56 -0000	1.3
  @@ -7,7 +7,7 @@
   
   plan tests => 1, ['include'];
   
  -my $location = '/TestFilter::out_str_req_mix';
  +my $location = '/TestFilter__out_str_req_mix';
   
   my $content = '<!--#include virtual="/includes/REMOVEclear.shtml" -->';
   
  
  
  
  1.3       +1 -1      modperl-2.0/t/filter/out_str_reverse.t
  
  Index: out_str_reverse.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/out_str_reverse.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- out_str_reverse.t	5 Mar 2003 09:13:18 -0000	1.2
  +++ out_str_reverse.t	18 Apr 2003 06:18:56 -0000	1.3
  @@ -17,7 +17,7 @@
   
   {
       # test the filtering of the mod_perl response handler
  -    my $location = '/TestFilter::out_str_reverse';
  +    my $location = '/TestFilter__out_str_reverse';
       my $response = POST_BODY $location, content => $reversed_data;
       ok t_cmp($expected, $response, "reverse filter");
   }
  
  
  
  1.5       +1 -1      modperl-2.0/t/filter/TestFilter/both_str_con_add.pm
  
  Index: both_str_con_add.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/both_str_con_add.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- both_str_con_add.pm	31 Mar 2003 01:50:51 -0000	1.4
  +++ both_str_con_add.pm	18 Apr 2003 06:18:57 -0000	1.5
  @@ -78,7 +78,7 @@
   1;
   __END__
   <NoAutoConfig>
  -  <VirtualHost TestFilter::both_str_con_add>
  +  <VirtualHost TestFilter__both_str_con_add>
         PerlModule                   TestFilter::both_str_con_add
         PerlPreConnectionHandler     TestFilter::both_str_con_add::pre_connection
         PerlProcessConnectionHandler TestFilter::both_str_con_add
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/TestFilter/both_str_req_add.pm
  
  Index: both_str_req_add.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/both_str_req_add.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- both_str_req_add.pm	2 Apr 2003 02:44:15 -0000	1.1
  +++ both_str_req_add.pm	18 Apr 2003 06:18:57 -0000	1.2
  @@ -59,7 +59,7 @@
   __DATA__
   <NoAutoConfig>
       PerlModule TestFilter::both_str_req_add
  -    <Location /TestFilter::both_str_req_add>
  +    <Location /TestFilter__both_str_req_add>
           SetHandler modperl
           PerlHeaderParserHandler TestFilter::both_str_req_add::header_parser
           PerlResponseHandler     TestFilter::both_str_req_add
  
  
  
  1.2       +2 -2      modperl-2.0/t/filter/TestFilter/in_bbs_msg.pm
  
  Index: in_bbs_msg.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/in_bbs_msg.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- in_bbs_msg.pm	15 Jan 2003 06:47:15 -0000	1.1
  +++ in_bbs_msg.pm	18 Apr 2003 06:18:57 -0000	1.2
  @@ -14,7 +14,7 @@
   use APR::Const -compile => ':common';
   
   my $from_url = '/input_filter.html';
  -my $to_url = '/TestFilter::in_bbs_msg::response';
  +my $to_url = '/TestFilter__in_bbs_msg';
   
   sub handler : FilterConnectionHandler {
       my($filter, $bb, $mode, $block, $readbytes) = @_;
  @@ -76,7 +76,7 @@
     PerlModule TestFilter::in_bbs_msg
     PerlInputFilterHandler TestFilter::in_bbs_msg
   
  -  <Location /TestFilter::in_bbs_msg::response>
  +  <Location /TestFilter__in_bbs_msg>
        SetHandler modperl
        PerlResponseHandler TestFilter::in_bbs_msg::response
     </Location>
  
  
  
  1.4       +2 -2      modperl-2.0/t/filter/TestFilter/in_str_msg.pm
  
  Index: in_str_msg.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/in_str_msg.pm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- in_str_msg.pm	25 Jan 2003 03:08:05 -0000	1.3
  +++ in_str_msg.pm	18 Apr 2003 06:18:57 -0000	1.4
  @@ -14,7 +14,7 @@
   use APR::Const -compile => ':common';
   
   my $from_url = '/input_filter.html';
  -my $to_url = '/TestFilter::in_str_msg::response';
  +my $to_url = '/TestFilter__in_str_msg';
   
   sub handler : FilterConnectionHandler {
       my $filter = shift;
  @@ -53,7 +53,7 @@
     PerlModule TestFilter::in_str_msg
     PerlInputFilterHandler TestFilter::in_str_msg
   
  -  <Location /TestFilter::in_str_msg::response>
  +  <Location /TestFilter__in_str_msg>
        SetHandler modperl
        PerlResponseHandler TestFilter::in_str_msg::response
     </Location>
  
  
  
  1.3       +3 -1      modperl-2.0/t/filter/TestFilter/out_str_api.pm
  
  Index: out_str_api.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/out_str_api.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- out_str_api.pm	31 Mar 2003 01:50:51 -0000	1.2
  +++ out_str_api.pm	18 Apr 2003 06:18:57 -0000	1.3
  @@ -9,6 +9,7 @@
   use Apache::FilterRec ();
   
   use Apache::Test;
  +use Apache::TestRequest;
   
   use Apache::Const -compile => 'OK';
   
  @@ -44,7 +45,8 @@
   
           ok $r->isa('Apache::RequestRec');
   
  -        ok $r->uri eq '/' . __PACKAGE__;
  +        my $path = '/' . Apache::TestRequest::module2path(__PACKAGE__);
  +        ok $r->uri eq $path;
   
           untie *STDOUT;
   
  
  
  
  1.2       +1 -1      modperl-2.0/t/filter/TestFilter/out_str_req_eos.pm
  
  Index: out_str_req_eos.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/out_str_req_eos.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- out_str_req_eos.pm	3 Apr 2003 05:51:23 -0000	1.1
  +++ out_str_req_eos.pm	18 Apr 2003 06:18:57 -0000	1.2
  @@ -65,7 +65,7 @@
   __DATA__
   <NoAutoConfig>
       PerlModule TestFilter::out_str_req_eos
  -    <Location /TestFilter::out_str_req_eos>
  +    <Location /TestFilter__out_str_req_eos>
           SetHandler modperl
           PerlResponseHandler     TestFilter::out_str_req_eos
           PerlOutputFilterHandler TestFilter::out_str_req_eos::add_prefix
  
  
  
  1.3       +1 -1      modperl-2.0/t/filter/TestFilter/out_str_req_mix.pm
  
  Index: out_str_req_mix.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/out_str_req_mix.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- out_str_req_mix.pm	3 Apr 2003 06:50:38 -0000	1.2
  +++ out_str_req_mix.pm	18 Apr 2003 06:18:57 -0000	1.3
  @@ -69,7 +69,7 @@
   __DATA__
   <NoAutoConfig>
       PerlModule TestFilter::out_str_req_mix
  -    <Location /TestFilter::out_str_req_mix> 
  +    <Location /TestFilter__out_str_req_mix>
           Options +Includes
           PerlOutputFilterHandler TestFilter::out_str_req_mix::adjust
           PerlSetOutputFilter INCLUDES
  
  
  
  1.3       +1 -1      modperl-2.0/t/hooks/access.t
  
  Index: access.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/hooks/access.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- access.t	20 Dec 2001 03:54:41 -0000	1.2
  +++ access.t	18 Apr 2003 06:18:57 -0000	1.3
  @@ -6,7 +6,7 @@
   
   plan tests => 4;
   
  -my $location = "/TestHooks::access";
  +my $location = "/TestHooks__access";
   
   ok ! GET_OK $location;
   
  
  
  
  1.5       +1 -1      modperl-2.0/t/hooks/authen.t
  
  Index: authen.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/hooks/authen.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- authen.t	6 Oct 2001 00:05:59 -0000	1.4
  +++ authen.t	18 Apr 2003 06:18:57 -0000	1.5
  @@ -6,7 +6,7 @@
   
   plan tests => 4, \&have_lwp;
   
  -my $location = "/TestHooks::authen";
  +my $location = "/TestHooks__authen";
   
   sok {
       ! GET_OK $location;
  
  
  
  1.2       +1 -1      modperl-2.0/t/hooks/authz.t
  
  Index: authz.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/hooks/authz.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- authz.t	13 Apr 2001 01:26:56 -0000	1.1
  +++ authz.t	18 Apr 2003 06:18:57 -0000	1.2
  @@ -6,7 +6,7 @@
   
   plan tests => 4, \&have_lwp;
   
  -my $location = "/TestHooks::authz";
  +my $location = "/TestHooks__authz";
   
   ok ! GET_OK $location;
   
  
  
  
  1.2       +1 -1      modperl-2.0/t/hooks/cleanup.t
  
  Index: cleanup.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/hooks/cleanup.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cleanup.t	3 Feb 2003 06:40:33 -0000	1.1
  +++ cleanup.t	18 Apr 2003 06:18:57 -0000	1.2
  @@ -16,7 +16,7 @@
   {
       # this registers and performs cleanups, but we test whether the
       # cleanup was run only in the next sub-test
  -    my $location = "/TestHooks::cleanup";
  +    my $location = "/TestHooks__cleanup";
       my $expected = 'ok';
       my $received = GET_BODY $location;
       ok t_cmp($expected, $received, "register req cleanup");
  
  
  
  1.3       +1 -1      modperl-2.0/t/hooks/push_handlers.t
  
  Index: push_handlers.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/hooks/push_handlers.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- push_handlers.t	29 Jan 2003 01:33:17 -0000	1.2
  +++ push_handlers.t	18 Apr 2003 06:18:57 -0000	1.3
  @@ -16,7 +16,7 @@
   # XXX: anon-handlers unsupported yet
   # push @strings, @anon
   
  -my $location = "/TestHooks::push_handlers";
  +my $location = "/TestHooks__push_handlers";
   my $expected = join "\n", @strings, '';
   my $received = GET_BODY $location;
   
  
  
  
  1.2       +1 -1      modperl-2.0/t/hooks/stacked_handlers.t
  
  Index: stacked_handlers.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/hooks/stacked_handlers.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- stacked_handlers.t	29 Jan 2003 01:04:33 -0000	1.1
  +++ stacked_handlers.t	18 Apr 2003 06:18:57 -0000	1.2
  @@ -7,7 +7,7 @@
   
   plan tests => 1;
   
  -my $location = "/TestHooks::stacked_handlers";
  +my $location = "/TestHooks__stacked_handlers";
   my $expected = join "\n", qw(one two three), '';
   my $received = GET_BODY $location;
   
  
  
  
  1.2       +1 -1      modperl-2.0/t/hooks/TestHooks/cleanup.pm
  
  Index: cleanup.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/hooks/TestHooks/cleanup.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cleanup.pm	3 Feb 2003 06:40:33 -0000	1.1
  +++ cleanup.pm	18 Apr 2003 06:18:57 -0000	1.2
  @@ -52,7 +52,7 @@
   1;
   __DATA__
   <NoAutoConfig>
  -  <Location /TestHooks::cleanup>
  +  <Location /TestHooks__cleanup>
         SetHandler modperl
         PerlCleanupHandler  TestHooks::cleanup::cleanup1
         PerlResponseHandler TestHooks::cleanup
  
  
  
  1.5       +1 -1      modperl-2.0/t/hooks/TestHooks/push_handlers.pm
  
  Index: push_handlers.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/hooks/TestHooks/push_handlers.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- push_handlers.pm	29 Jan 2003 02:37:59 -0000	1.4
  +++ push_handlers.pm	18 Apr 2003 06:18:57 -0000	1.5
  @@ -60,7 +60,7 @@
   1;
   __DATA__
   <NoAutoConfig>
  -  <Location /TestHooks::push_handlers>
  +  <Location /TestHooks__push_handlers>
         SetHandler modperl
         PerlHeaderParserHandler TestHooks::push_handlers
         PerlResponseHandler     TestHooks::push_handlers::conf
  
  
  
  1.5       +1 -1      modperl-2.0/t/hooks/TestHooks/stacked_handlers.pm
  
  Index: stacked_handlers.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/hooks/TestHooks/stacked_handlers.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- stacked_handlers.pm	29 Jan 2003 02:37:59 -0000	1.4
  +++ stacked_handlers.pm	18 Apr 2003 06:18:57 -0000	1.5
  @@ -61,7 +61,7 @@
   1;
   __DATA__
   <NoAutoConfig>
  -  <Location /TestHooks::stacked_handlers>
  +  <Location /TestHooks__stacked_handlers>
         SetHandler modperl
         PerlHeaderParserHandler TestHooks::stacked_handlers
     </Location>
  
  
  
  1.5       +0 -8      modperl-2.0/t/hooks/TestHooks/trans.pm
  
  Index: trans.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/hooks/TestHooks/trans.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- trans.pm	11 Apr 2002 11:08:43 -0000	1.4
  +++ trans.pm	18 Apr 2003 06:18:58 -0000	1.5
  @@ -28,14 +28,6 @@
   
       my $uri = $r->uri;
   
  -    #XXX: temp workaround, core_translate trips on :'s
  -    if (Apache::TestConfig::WIN32()) {
  -        if ($uri =~ m,^/Test[A-Z]\w+::,) {
  -            $r->filename(__FILE__);
  -            return Apache::OK;
  -        }
  -    }
  -
       my $handler = $trans{ $uri };
   
       return Apache::DECLINED unless $handler;
  
  
  
  1.3       +1 -1      modperl-2.0/t/modperl/getc.t
  
  Index: getc.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/modperl/getc.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- getc.t	20 Dec 2001 03:54:41 -0000	1.2
  +++ getc.t	18 Apr 2003 06:18:58 -0000	1.3
  @@ -7,7 +7,7 @@
   
   plan tests => 2;
   
  -my $location = "/TestModperl::getc";
  +my $location = "/TestModperl__getc";
   
   my $expect = join '', 'a'..'Z';
   
  
  
  
  1.3       +1 -1      modperl-2.0/t/modperl/readline.t
  
  Index: readline.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/modperl/readline.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- readline.t	20 Dec 2001 03:54:41 -0000	1.2
  +++ readline.t	18 Apr 2003 06:18:58 -0000	1.3
  @@ -7,7 +7,7 @@
   
   plan tests => 2;
   
  -my $location = "/TestModperl::readline";
  +my $location = "/TestModperl__readline";
   
   my $expect = join "\n", map { $_ x 24 } 'a'..'e';
   
  
  
  
  1.3       +1 -1      modperl-2.0/t/modperl/sameinterp.t
  
  Index: sameinterp.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/modperl/sameinterp.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sameinterp.t	20 Dec 2001 03:54:41 -0000	1.2
  +++ sameinterp.t	18 Apr 2003 06:18:58 -0000	1.3
  @@ -10,7 +10,7 @@
   
   plan tests => 12;
   
  -my $url = "/TestModperl::sameinterp";
  +my $url = "/TestModperl__sameinterp";
   
   # test the tie and re-tie
   for (1..2) {
  
  
  
  1.7       +1 -1      modperl-2.0/t/modules/cgi.t
  
  Index: cgi.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/modules/cgi.t,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- cgi.t	7 Apr 2003 05:01:48 -0000	1.6
  +++ cgi.t	18 Apr 2003 06:18:58 -0000	1.7
  @@ -11,7 +11,7 @@
       {"MP_COMPAT_1X is disabled" => $build->{MP_COMPAT_1X}};
   
   my $module = 'TestModules::cgi';
  -my $location = "/$module";
  +my $location = '/' . Apache::TestRequest::module2path($module);
   
   my($res, $str);
   
  
  
  
  1.6       +1 -1      modperl-2.0/t/modules/cgiupload.t
  
  Index: cgiupload.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/modules/cgiupload.t,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- cgiupload.t	7 Apr 2003 05:01:48 -0000	1.5
  +++ cgiupload.t	18 Apr 2003 06:18:58 -0000	1.6
  @@ -10,7 +10,7 @@
   plan tests => 2, have 'LWP',
       {"MP_COMPAT_1X is disabled" => $build->{MP_COMPAT_1X}};
   
  -my $location = "/TestModules::cgiupload";
  +my $location = "/TestModules__cgiupload";
   
   my $filename;
   my $pod = 'pod/perlfunc.pod';
  
  
  
  1.2       +1 -1      modperl-2.0/t/preconnection/note.t
  
  Index: note.t
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/preconnection/note.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- note.t	20 Jan 2003 07:56:17 -0000	1.1
  +++ note.t	18 Apr 2003 06:18:58 -0000	1.2
  @@ -8,7 +8,7 @@
   my $module = "TestPreConnection::note";
   Apache::TestRequest::module($module);
   my $hostport = Apache::TestRequest::hostport(Apache::Test::config());
  -my $location = "http://$hostport/$module";
  +my $location = "http://$hostport/" . Apache::TestRequest::module2path($module);
   t_debug("connecting to $location");
   plan tests => 1;
   
  
  
  
  1.3       +1 -1      modperl-2.0/t/preconnection/TestPreConnection/note.pm
  
  Index: note.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/preconnection/TestPreConnection/note.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- note.pm	20 Jan 2003 07:59:44 -0000	1.2
  +++ note.pm	18 Apr 2003 06:18:58 -0000	1.3
  @@ -30,7 +30,7 @@
     <VirtualHost TestPreConnection::note>
       PerlPreConnectionHandler TestPreConnection::note
     
  -    <Location /TestPreConnection::note>
  +    <Location /TestPreConnection__note>
         SetHandler modperl
         PerlResponseHandler TestPreConnection::note::response
       </Location>
  
  
  
  1.5       +2 -1      modperl-2.0/t/response/TestAPI/r_subclass.pm
  
  Index: r_subclass.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/r_subclass.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- r_subclass.pm	31 Jan 2003 04:37:07 -0000	1.4
  +++ r_subclass.pm	18 Apr 2003 06:18:58 -0000	1.5
  @@ -7,6 +7,7 @@
   our @ISA = qw(Apache::RequestRec);
   
   use Apache::Test;
  +use Apache::TestRequest;
   
   use Apache::Const -compile => 'OK';
   
  @@ -16,7 +17,7 @@
       bless { r => $r }, $class;
   }
   
  -my $location = '/' . __PACKAGE__;
  +my $location = '/' . Apache::TestRequest::module2path(__PACKAGE__);
   
   sub handler {
       my $r = __PACKAGE__->new(shift);
  
  
  
  1.17      +3 -3      modperl-2.0/t/response/TestAPI/request_rec.pm
  
  Index: request_rec.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/request_rec.pm,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- request_rec.pm	19 Feb 2003 14:12:02 -0000	1.16
  +++ request_rec.pm	18 Apr 2003 06:18:58 -0000	1.17
  @@ -5,6 +5,7 @@
   
   use Apache::Test;
   use Apache::TestUtil;
  +use Apache::TestRequest;
   
   use Apache::RequestRec ();
   use Apache::RequestUtil ();
  @@ -117,9 +118,8 @@
   
       ok $r->filename;
   
  -    ok t_cmp('/' . __PACKAGE__,
  -             $r->location,
  -             "location");
  +    my $location = '/' . Apache::TestRequest::module2path(__PACKAGE__);
  +    ok t_cmp($location, $r->location, "location");
   
       my $mtime = (stat __FILE__)[9];
       $r->mtime($mtime);
  
  
  
  1.7       +1 -1      modperl-2.0/t/response/TestAPI/rutil.pm
  
  Index: rutil.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/rutil.pm,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- rutil.pm	3 Mar 2003 02:41:15 -0000	1.6
  +++ rutil.pm	18 Apr 2003 06:18:58 -0000	1.7
  @@ -57,7 +57,7 @@
       # test for the request_line, status_ling, and few 
       # headers that should always be there
       ok $r->as_string =~ 
  -        m!GET /TestAPI::rutil.*Host:.*200 OK.*Content-Type:!s;
  +        m!GET /TestAPI__rutil.*Host:.*200 OK.*Content-Type:!s;
   
       Apache::OK;
   }
  
  
  
  1.11      +2 -1      modperl-2.0/t/response/TestAPI/uri.pm
  
  Index: uri.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/uri.pm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- uri.pm	9 Mar 2003 08:57:55 -0000	1.10
  +++ uri.pm	18 Apr 2003 06:18:58 -0000	1.11
  @@ -5,6 +5,7 @@
   
   use Apache::Test;
   use Apache::TestUtil;
  +use Apache::TestRequest;
   
   use APR::URI ();
   use Apache::URI ();
  @@ -13,7 +14,7 @@
   
   use Apache::Const -compile => 'OK';
   
  -my $location = '/' . __PACKAGE__;
  +my $location = '/' . Apache::TestRequest::module2path(__PACKAGE__);
   
   sub handler {
       my $r = shift;
  
  
  
  1.6       +2 -2      modperl-2.0/t/response/TestDirective/perlloadmodule2.pm
  
  Index: perlloadmodule2.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule2.pm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- perlloadmodule2.pm	13 Dec 2002 10:06:54 -0000	1.5
  +++ perlloadmodule2.pm	18 Apr 2003 06:18:58 -0000	1.6
  @@ -102,10 +102,10 @@
   
       MyMergeTest one two
   </Base>
  -<Location /TestDirective::perlloadmodule2>
  +<Location /TestDirective__perlloadmodule2>
       MyMergeTest three four
   </Location>
  -<Location /TestDirective::perlloadmodule2/subdir>
  +<Location /TestDirective__perlloadmodule2/subdir>
      MyMergeTest five
      MyMergeTest six
   </Location>
  
  
  
  1.3       +2 -2      modperl-2.0/t/response/TestDirective/perlloadmodule3.pm
  
  Index: perlloadmodule3.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule3.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- perlloadmodule3.pm	13 Dec 2002 10:08:09 -0000	1.2
  +++ perlloadmodule3.pm	18 Apr 2003 06:18:58 -0000	1.3
  @@ -145,7 +145,7 @@
       MyList     "VHost"
       MyAppend   "VHost"
       MyOverride "VHost"
  -    <Location /TestDirective::perlloadmodule3>
  +    <Location /TestDirective__perlloadmodule3>
           MyPlus 3
           MyList     "Dir"
           MyAppend   "Dir"
  @@ -153,7 +153,7 @@
           SetHandler modperl
           PerlResponseHandler TestDirective::perlloadmodule3
       </Location>
  -    <Location /TestDirective::perlloadmodule3/subdir>
  +    <Location /TestDirective__perlloadmodule3/subdir>
           MyPlus 1
           MyList     "SubDir"
           MyAppend   "SubDir"
  
  
  
  1.3       +1 -1      modperl-2.0/t/response/TestDirective/perlloadmodule4.pm
  
  Index: perlloadmodule4.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule4.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- perlloadmodule4.pm	13 Dec 2002 10:08:09 -0000	1.2
  +++ perlloadmodule4.pm	18 Apr 2003 06:18:58 -0000	1.3
  @@ -85,7 +85,7 @@
   <VirtualHost TestDirective::perlloadmodule4>
       # here perlloadmodule sets scfg on behalf of the base server
       MyTest4 "Vhost"
  -    <Location /TestDirective::perlloadmodule4>
  +    <Location /TestDirective__perlloadmodule4>
           MyTest4 "Dir"
           SetHandler modperl
           PerlResponseHandler TestDirective::perlloadmodule4
  
  
  
  1.4       +1 -1      modperl-2.0/t/response/TestDirective/perlloadmodule5.pm
  
  Index: perlloadmodule5.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule5.pm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- perlloadmodule5.pm	1 Jan 2003 23:13:29 -0000	1.3
  +++ perlloadmodule5.pm	18 Apr 2003 06:18:58 -0000	1.4
  @@ -85,7 +85,7 @@
       # here mod_perl sets the scfg by itself for this vhost
       PerlModule File::Spec
       MyTest5 "Vhost"
  -    <Location /TestDirective::perlloadmodule5>
  +    <Location /TestDirective__perlloadmodule5>
           MyTest5 "Dir"
           SetHandler modperl
           PerlResponseHandler TestDirective::perlloadmodule5
  
  
  
  1.3       +1 -1      modperl-2.0/t/response/TestDirective/perlloadmodule6.pm
  
  Index: perlloadmodule6.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule6.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- perlloadmodule6.pm	13 Dec 2002 10:08:09 -0000	1.2
  +++ perlloadmodule6.pm	18 Apr 2003 06:18:58 -0000	1.3
  @@ -79,7 +79,7 @@
   <VirtualHost TestDirective::perlloadmodule6>
       PerlLoadModule TestDirective::perlloadmodule6
       MyTest6 "Vhost"
  -    <Location /TestDirective::perlloadmodule6>
  +    <Location /TestDirective__perlloadmodule6>
           MyTest6 "Dir"
           SetHandler modperl
           PerlResponseHandler TestDirective::perlloadmodule6
  
  
  
  1.8       +1 -1      modperl-2.0/t/response/TestDirective/perlmodule.pm
  
  Index: perlmodule.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlmodule.pm,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- perlmodule.pm	13 Dec 2002 10:08:09 -0000	1.7
  +++ perlmodule.pm	18 Apr 2003 06:18:58 -0000	1.8
  @@ -53,7 +53,7 @@
   <VirtualHost TestDirective::perlmodule>
       PerlModule ApacheTest::PerlModuleTest
   
  -    <Location /TestDirective::perlmodule>
  +    <Location /TestDirective__perlmodule>
           SetHandler modperl
           PerlResponseHandler TestDirective::perlmodule
       </Location>
  
  
  
  1.12      +1 -1      modperl-2.0/t/response/TestDirective/perlrequire.pm
  
  Index: perlrequire.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlrequire.pm,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- perlrequire.pm	16 Apr 2003 03:33:42 -0000	1.11
  +++ perlrequire.pm	18 Apr 2003 06:18:58 -0000	1.12
  @@ -76,7 +76,7 @@
       PerlSwitches -I@documentroot@/testdirective/vh
       PerlRequire "ApacheTest/PerlRequireTest.pm"
   
  -    <Location /TestDirective::perlrequire>
  +    <Location /TestDirective__perlrequire>
           SetHandler modperl
           PerlResponseHandler TestDirective::perlrequire
       </Location>
  
  
  
  1.3       +5 -2      modperl-2.0/t/response/TestModperl/method.pm
  
  Index: method.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/method.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- method.pm	18 May 2002 02:14:47 -0000	1.2
  +++ method.pm	18 Apr 2003 06:18:59 -0000	1.3
  @@ -5,6 +5,7 @@
   
   use Apache::Test;
   use Apache::TestUtil;
  +use Apache::TestRequest;
   
   use Apache::Const -compile => 'OK';
   
  @@ -37,8 +38,10 @@
       ok t_cmp($class, $class,
                'handler class');
   
  -    ok t_cmp('/' . $class, $r->uri,
  -             '$r->uri eq __PACKAGE__');
  +    ok t_cmp(
  +        '/' . Apache::TestRequest::module2path($class), 
  +        $r->uri,
  +        '$r->uri eq $location');
   
       if ($is_obj) {
           ok t_cmp($], $self->{perl_version},
  
  
  

Mime
View raw message