perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r156472 [4/4] - in perl/modperl/branches/apache2-rename-unstable/t: conf/ filter/TestFilter/ hooks/TestHooks/ htdocs/includes-registry/ htdocs/vhost/ lib/TestCommon/ preconnection/TestPreConnection/ protocol/TestProtocol/ response/TestAPI/ response/TestAPR/ response/TestApache/ response/TestCompat/ response/TestDirective/ response/TestError/ response/TestModperl/ response/TestModules/ response/TestPerl/ response/TestUser/ response/TestVhost/
Date Tue, 08 Mar 2005 01:58:55 GMT
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/setupenv.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/setupenv.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/setupenv.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/setupenv.pm Mon Mar  7 17:58:09 2005
@@ -3,10 +3,10 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -18,7 +18,7 @@
         $r->puts("$key=$val\n");
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestError/api.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestError/api.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestError/api.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestError/api.pm Mon Mar  7 17:58:09 2005
@@ -3,13 +3,13 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
 
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
 
 sub handler {
     my $r = shift;
@@ -24,7 +24,7 @@
              qr/\$r object is not available/,
              "unavailable global $r object");
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestError/runtime.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestError/runtime.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestError/runtime.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestError/runtime.pm Mon Mar  7 17:58:09 2005
@@ -3,14 +3,14 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Connection ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Connection ();
 use APR::Socket ();
 
 use Apache::TestUtil;
 
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
 use APR::Const    -compile => qw(EACCES EAGAIN);
 
 use constant SIZE => 2048;
@@ -29,7 +29,7 @@
     no strict 'refs';
     $args->($r, $socket);
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub overload_test {

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestError/syntax.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestError/syntax.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestError/syntax.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestError/syntax.pm Mon Mar  7 17:58:09 2005
@@ -3,10 +3,10 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
 
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
 
 sub handler {
     my $r = shift;
@@ -18,7 +18,7 @@
 
     $r->print('ok');
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/cookie.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/cookie.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/cookie.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/cookie.pm Mon Mar  7 17:58:09 2005
@@ -5,10 +5,10 @@
 
 use Apache::TestTrace;
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub access {
     my $r = shift;
@@ -21,7 +21,7 @@
         ($r->args eq 'header' or $r->args eq 'env') ? 1 : 0;
     die "Can't get the cookie" if $cookie_is_expected && !defined $val;
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub handler {
@@ -30,7 +30,7 @@
     my($key, $val) = cookie($r);
     $r->print($val) if defined $val;
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub cookie {

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/cookie2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/cookie2.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/cookie2.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/cookie2.pm Mon Mar  7 17:58:09 2005
@@ -5,10 +5,10 @@
 
 use Apache::TestTrace;
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub access {
     my $r = shift;
@@ -17,7 +17,7 @@
     my($key, $val) = cookie($r);
     die "I shouldn't get the cookie" if $r->args eq 'env' && defined $val;
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub handler {
@@ -26,7 +26,7 @@
     my($key, $val) = cookie($r);
     $r->print($val) if defined $val;
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub cookie {

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/current_callback.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/current_callback.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/current_callback.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/current_callback.pm Mon Mar  7 17:58:09 2005
@@ -8,9 +8,9 @@
 use ModPerl::Util;
 
 use APR::Table ();
-use Apache::RequestRec ();
+use Apache2::RequestRec ();
 
-use Apache::Const -compile => qw(OK DECLINED);
+use Apache2::Const -compile => qw(OK DECLINED);
 
 sub handler {
     my $r = shift;
@@ -23,7 +23,7 @@
 
     #warn "in callback: $callback\n";
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 sub log          { check('Log')          }
@@ -36,7 +36,7 @@
     die "expecting $expected callback, instead got $callback" 
         unless $callback eq $expected;
     #warn "in callback: $callback\n";
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/dir_config.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/dir_config.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/dir_config.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/dir_config.pm Mon Mar  7 17:58:09 2005
@@ -3,22 +3,22 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::ServerRec ();
-use Apache::ServerUtil ();
-use Apache::RequestUtil ();
+use Apache2::ServerRec ();
+use Apache2::ServerUtil ();
+use Apache2::RequestUtil ();
 use APR::Table ();
 
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
 
     plan $r, tests => 14;
 
-    #Apache::RequestRec::dir_config tests
+    #Apache2::RequestRec::dir_config tests
 
     # this test doesn't test all $r->dir_config->*(), since
     # dir_config() returns a generic APR::Table which is tested in
@@ -113,7 +113,7 @@
     }
 
 
-    #Apache::ServerUtil::dir_config tests
+    #Apache2::ServerUtil::dir_config tests
 
     my $s = $r->server;
 
@@ -139,7 +139,7 @@
         # base server test
         my $bs = Apache->server;
         ok t_cmp(($bs && ref($bs)),
-                 'Apache::ServerRec',
+                 'Apache2::ServerRec',
                  "base server's object retrieval");
 
         my $key = 'TestModperl__server_rec_Key_set_in_Base';
@@ -148,7 +148,7 @@
                  "read dir_config of the base server");
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 my $key_base = "TestModperl__request_rec_Key";

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/endav.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/endav.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/endav.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/endav.pm Mon Mar  7 17:58:09 2005
@@ -7,7 +7,7 @@
 
 use Apache::Test;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -50,7 +50,7 @@
     # one plain ok 1 (4)
     ok 1;
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/env.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/env.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/env.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/env.pm Mon Mar  7 17:58:09 2005
@@ -3,13 +3,13 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestRec ();
+use Apache2::RequestRec ();
 use APR::Table ();
 
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -79,7 +79,7 @@
         ok t_cmp($@, '', $key);
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/exit.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/exit.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/exit.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/exit.pm Mon Mar  7 17:58:09 2005
@@ -10,7 +10,7 @@
 
 use ModPerl::Util ();
 
-use Apache::Const  -compile => 'OK';
+use Apache2::Const  -compile => 'OK';
 use ModPerl::Const -compile => 'EXIT';
 
 sub handler {
@@ -36,7 +36,7 @@
     # must not be reached
     $r->print("must not be reached");
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/getc.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/getc.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/getc.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/getc.pm Mon Mar  7 17:58:09 2005
@@ -3,11 +3,11 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestIO ();
+use Apache2::RequestIO ();
 
 use Apache::Test;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -22,7 +22,7 @@
 
     untie *STDIN;
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/io_nested_with_closed_stds.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/io_nested_with_closed_stds.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/io_nested_with_closed_stds.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/io_nested_with_closed_stds.pm Mon Mar  7 17:58:09 2005
@@ -12,14 +12,14 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::SubRequest ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::SubRequest ();
 
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -54,7 +54,7 @@
         close OLDOUT;
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/io_with_closed_stds.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/io_with_closed_stds.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/io_with_closed_stds.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/io_with_closed_stds.pm Mon Mar  7 17:58:09 2005
@@ -12,14 +12,14 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestRec ();
-use Apache::RequestUtil ();
-use Apache::RequestIO ();
-use Apache::SubRequest ();
+use Apache2::RequestRec ();
+use Apache2::RequestUtil ();
+use Apache2::RequestIO ();
+use Apache2::SubRequest ();
 
 use Apache::Test;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub fixup {
     my $r = shift;
@@ -32,7 +32,7 @@
     close STDIN;
     close STDOUT;
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 sub handler {
@@ -42,7 +42,7 @@
 
     ok 1;
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 sub cleanup {
@@ -54,7 +54,7 @@
     close OLDIN;
     close OLDOUT;
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/merge.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/merge.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/merge.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/merge.pm Mon Mar  7 17:58:09 2005
@@ -3,15 +3,15 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::ServerRec ();
-use Apache::ServerUtil ();
-use Apache::RequestUtil ();
+use Apache2::ServerRec ();
+use Apache2::ServerUtil ();
+use Apache2::RequestUtil ();
 use APR::Table ();
 
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 # this is the configuration and handler for t/modperl/merge.t,
 # t/modperl/merge2.t, and t/modperl/merge3.t.  see any of those
@@ -123,7 +123,7 @@
         }
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/method.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/method.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/method.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/method.pm Mon Mar  7 17:58:09 2005
@@ -7,7 +7,7 @@
 use Apache::TestUtil;
 use Apache::TestRequest;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub new {
     my $class = shift;
@@ -48,7 +48,7 @@
                  'object handler data');
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/methodname.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/methodname.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/methodname.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/methodname.pm Mon Mar  7 17:58:09 2005
@@ -6,7 +6,7 @@
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 use TestModperl::method ();
 

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/methodobj.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/methodobj.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/methodobj.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/methodobj.pm Mon Mar  7 17:58:09 2005
@@ -3,7 +3,7 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 use TestModperl::method ();
 

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/perl.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/perl.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/perl.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/perl.pm Mon Mar  7 17:58:09 2005
@@ -9,7 +9,7 @@
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -20,7 +20,7 @@
              crypt("testing", "SNXJvM5I.PJrE"),
              "crypt");
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/perl_options.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/perl_options.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/perl_options.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/perl_options.pm Mon Mar  7 17:58:09 2005
@@ -5,15 +5,15 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::RequestUtil ();
-use Apache::ServerUtil ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestUtil ();
+use Apache2::ServerUtil ();
 
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
 
 my @srv_plus  = qw(ChildInit ChildExit Fixup);
 my @srv_minus = qw(PreConnection ProcessConnection Autoload
@@ -39,7 +39,7 @@
     ok t_cmp($r->is_perl_option_enabled($_), 0,
              "PerlOptions -$_") for @dir_minus;
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/pnotes.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/pnotes.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/pnotes.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/pnotes.pm Mon Mar  7 17:58:09 2005
@@ -3,12 +3,12 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestUtil ();
+use Apache2::RequestUtil ();
 
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -44,7 +44,7 @@
              q{deleted entry contents});
     ok !exists $r->pnotes->{'pnotes_foo'};
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/post_utf8.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/post_utf8.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/post_utf8.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/post_utf8.pm Mon Mar  7 17:58:09 2005
@@ -7,13 +7,13 @@
 use Apache::TestUtil;
 use Apache::TestTrace;
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
 use APR::Table ();
 
 use TestCommon::Utils ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 my $expected_ascii = "I love you, (why lying?), but I belong to another";
 my $expected_utf8  = "\x{042F} \x{0432}\x{0430}\x{0441} \x{043B}\x{044E}" .
@@ -59,7 +59,7 @@
     debug "expected: $expected_utf8";
     debug "received: $received_utf8";
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print.pm Mon Mar  7 17:58:09 2005
@@ -3,18 +3,18 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestIO ();
+use Apache2::RequestIO ();
 
 use Apache::Test;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
 
     plan $r, tests => 6;
 
-    binmode STDOUT; #Apache::RequestRec::BINMODE (noop)
+    binmode STDOUT; #Apache2::RequestRec::BINMODE (noop)
 
     ok 1;
 
@@ -37,7 +37,7 @@
 
     printf "ok %d\n", 6;
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 END {

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print_utf8.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print_utf8.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print_utf8.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print_utf8.pm Mon Mar  7 17:58:09 2005
@@ -10,10 +10,10 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestIO ();
-use Apache::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestRec ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -21,13 +21,13 @@
     $r->content_type('text/plain; charset=UTF-8');
 
     # prevent warning: "Wide character in print"
-    binmode(STDOUT, ':utf8'); # Apache::RequestRec::BINMODE()
+    binmode(STDOUT, ':utf8'); # Apache2::RequestRec::BINMODE()
 
     # must be non-$r->print(), so we go through the tied STDOUT
     # \x{263A} == :-)
     print "Hello Ayhan \x{263A} perlio rules!";
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print_utf8_2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print_utf8_2.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print_utf8_2.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/print_utf8_2.pm Mon Mar  7 17:58:09 2005
@@ -7,10 +7,10 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestIO ();
-use Apache::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestRec ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -20,7 +20,7 @@
     # \x{263A} == :-)
     $r->print("\$r->print() just works \x{263A}");
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/printf.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/printf.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/printf.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/printf.pm Mon Mar  7 17:58:09 2005
@@ -3,11 +3,11 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestIO ();
-use Apache::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestRec ();
 use APR::Table ();
 
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
 
 sub handler {
     my $r = shift;
@@ -42,7 +42,7 @@
         $r->notes->clear;
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 sub fixup {
@@ -53,7 +53,7 @@
     eval { $r->printf("whatever") };
     $r->notes->set(fixup => "$@") if $@;
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/readline.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/readline.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/readline.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/readline.pm Mon Mar  7 17:58:09 2005
@@ -3,12 +3,12 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestIO ();
-use Apache::compat (); #XXX
+use Apache2::RequestIO ();
+use Apache2::compat (); #XXX
 
 use Apache::Test;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -22,7 +22,7 @@
 
     untie *STDIN;
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/request_rec_perlio_api.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/request_rec_perlio_api.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/request_rec_perlio_api.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/request_rec_perlio_api.pm Mon Mar  7 17:58:09 2005
@@ -6,21 +6,21 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestIO ();
-use Apache::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestRec ();
 
 use Apache::Test;
 
 use File::Spec::Functions qw(catfile catdir);
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
 
     $r->args eq 'STDIN' ? test_STDIN($r) : test_STDOUT($r);
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub test_STDIN {

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/request_rec_tie_api.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/request_rec_tie_api.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/request_rec_tie_api.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/request_rec_tie_api.pm Mon Mar  7 17:58:09 2005
@@ -6,7 +6,7 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestIO ();
+use Apache2::RequestIO ();
 
 use Apache::Test;
 use Apache::TestUtil;
@@ -14,16 +14,16 @@
 
 use File::Spec::Functions qw(catfile catdir);
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 use Config;
 
 sub handler {
     my $r = shift;
 
-    require Apache::Build;
+    require Apache2::Build;
     my @todo;
-    push @todo, 1 if Apache::Build::AIX();
+    push @todo, 1 if Apache2::Build::AIX();
     plan $r, tests => 3, todo => \@todo,
         need { "perl $]: PerlIO is used instead of TIEd IO"
                    => !($] >= 5.008 && $Config{useperlio}) };
@@ -61,7 +61,7 @@
         unlink $file;
     }
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/sameinterp.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/sameinterp.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/sameinterp.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/sameinterp.pm Mon Mar  7 17:58:09 2005
@@ -3,11 +3,11 @@
 use warnings FATAL => 'all';
 use strict;
 
-use Apache::RequestIO ();
+use Apache2::RequestIO ();
 
 use Apache::TestHandler ();
 
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
 
 my $value = '';
 
@@ -18,7 +18,7 @@
     $value = Apache::TestHandler::same_interp_counter();
     $r->puts($value);
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setauth.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setauth.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setauth.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setauth.pm Mon Mar  7 17:58:09 2005
@@ -3,12 +3,12 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::Access ();
+use Apache2::Access ();
 
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -22,7 +22,7 @@
 
     ok t_cmp($r->auth_type(), 'Basic', 'default auth_type');
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setupenv.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setupenv.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setupenv.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setupenv.pm Mon Mar  7 17:58:09 2005
@@ -3,13 +3,13 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestRec ();
+use Apache2::RequestRec ();
 use APR::Table ();
 
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::Const -compile => qw(OK DECLINED);
+use Apache2::Const -compile => qw(OK DECLINED);
 
 sub handler {
 
@@ -21,7 +21,7 @@
     # $requests locations with 7 tests each
     plan $r, tests => $requests * 7;
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub env {
@@ -61,7 +61,7 @@
              'server',
              'found per-server PerlSetEnv entry in %ENV');
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub noenv {
@@ -101,7 +101,7 @@
              'server',
              'found per-server PerlSetEnv entry in %ENV');
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub someenv {
@@ -142,21 +142,21 @@
              'server',
              'found per-server PerlSetEnv entry in %ENV');
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub subenv_void {
 
     shift->subprocess_env;
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub subenv_one {
 
     shift->subprocess_env->set(SRV_SUBPROCESS => 'server');
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub subenv_two {
@@ -167,7 +167,7 @@
 
     $r->subprocess_env->set(DIR_SUBPROCESS => $value);
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setupenv2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setupenv2.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setupenv2.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/setupenv2.pm Mon Mar  7 17:58:09 2005
@@ -7,24 +7,24 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::Const -compile => qw(OK OR_ALL NO_ARGS);
+use Apache2::Const -compile => qw(OK OR_ALL NO_ARGS);
 
-use Apache::CmdParms ();
-use Apache::Module ();
-use Apache::RequestIO ();
-use Apache::RequestRec ();
+use Apache2::CmdParms ();
+use Apache2::Module ();
+use Apache2::RequestIO ();
+use Apache2::RequestRec ();
 
 my @directives = (
     {
      name         => 'MyEnvRegister',
      func         => __PACKAGE__ . '::MyEnvRegister',
-     req_override => Apache::OR_ALL,
-     args_how     => Apache::NO_ARGS,
+     req_override => Apache2::OR_ALL,
+     args_how     => Apache2::NO_ARGS,
      errmsg       => 'cannot fail :)',
     },
 );
 
-Apache::Module::add(__PACKAGE__, \@directives);
+Apache2::Module::add(__PACKAGE__, \@directives);
 
 # testing PerlLoadModule
 $ENV{EnvChangeMixedTest} = 'loadmodule';
@@ -46,7 +46,7 @@
 
 sub get_config {
     my($self, $s) = (shift, shift);
-    Apache::Module::get_config($self, $s, @_);
+    Apache2::Module::get_config($self, $s, @_);
 }
 
 sub handler {
@@ -70,7 +70,7 @@
         die "no such case";
     }
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/status.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/status.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/status.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/status.pm Mon Mar  7 17:58:09 2005
@@ -3,8 +3,8 @@
 use strict;
 use warnings;
 
-use Apache::RequestRec;
-use Apache::Const -compile => qw(DECLINED);
+use Apache2::RequestRec;
+use Apache2::Const -compile => qw(DECLINED);
 
 use ModPerl::Util;
 use Apache::TestUtil qw(t_server_log_error_is_expected);
@@ -14,7 +14,7 @@
     my $rc = shift->args;
 
     if ($rc eq 'die' ||
-        $rc eq Apache::DECLINED ||
+        $rc eq Apache2::DECLINED ||
         $rc =~ m/foo/) {
         t_server_log_error_is_expected();
     }

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/subenv.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/subenv.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/subenv.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/subenv.pm Mon Mar  7 17:58:09 2005
@@ -3,12 +3,12 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::RequestRec ();
+use Apache2::RequestRec ();
 use APR::Table ();
 
 use Apache::Test;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
 
@@ -90,7 +90,7 @@
         ok ! $ENV{$key};              # still shouldn't affect %ENV
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 sub ok_true {

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/taint.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/taint.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/taint.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/taint.pm Mon Mar  7 17:58:09 2005
@@ -6,13 +6,13 @@
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::RequestIO ();
-use Apache::RequestUtil ();
-use Apache::Build ();
+use Apache2::RequestIO ();
+use Apache2::RequestUtil ();
+use Apache2::Build ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
-my $build = Apache::Build->build_config;
+my $build = Apache2::Build->build_config;
 
 sub handler {
     my $r = shift;
@@ -27,13 +27,13 @@
     ok t_cmp($@, qr/read-only/, "\${^TAINT} is read-only");
 
     if ($build->{MP_COMPAT_1X}) {
-        ok t_cmp($Apache::__T, 1, "\$Apache::__T");
+        ok t_cmp($Apache2::__T, 1, "\$Apache::__T");
 
-        eval { $Apache::__T = 0 };
-        ok t_cmp($@, qr/read-only/, "\$Apache::__T is read-only");
+        eval { $Apache2::__T = 0 };
+        ok t_cmp($@, qr/read-only/, "\$Apache2::__T is read-only");
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/util.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/util.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/util.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/util.pm Mon Mar  7 17:58:09 2005
@@ -10,7 +10,7 @@
 
 use ModPerl::Util ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -20,7 +20,7 @@
     ok t_cmp ModPerl::Util::current_perl_id(), qr/0x\w+/,
         "perl interpreter id";
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi.pm Mon Mar  7 17:58:09 2005
@@ -3,10 +3,10 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::compat ();
+use Apache2::compat ();
 use CGI ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -44,7 +44,7 @@
         print "no param or upload data\n";
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi2.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi2.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgi2.pm Mon Mar  7 17:58:09 2005
@@ -6,10 +6,10 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::compat ();
+use Apache2::compat ();
 use CGI ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -47,7 +47,7 @@
         $r->print("no param or upload data\n");
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgipost.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgipost.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgipost.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgipost.pm Mon Mar  7 17:58:09 2005
@@ -3,10 +3,10 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::compat ();
+use Apache2::compat ();
 use CGI ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -16,7 +16,7 @@
 
     print join ":", map { $cgi->param($_) } $cgi->param;
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgipost2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgipost2.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgipost2.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgipost2.pm Mon Mar  7 17:58:09 2005
@@ -6,10 +6,10 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::compat ();
+use Apache2::compat ();
 use CGI ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -19,7 +19,7 @@
 
     $r->print(join ":", map { $cgi->param($_) } $cgi->param);
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgiupload.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgiupload.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgiupload.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgiupload.pm Mon Mar  7 17:58:09 2005
@@ -3,10 +3,10 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::compat ();
+use Apache2::compat ();
 use CGI ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -19,7 +19,7 @@
         print;
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgiupload2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgiupload2.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgiupload2.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/cgiupload2.pm Mon Mar  7 17:58:09 2005
@@ -6,10 +6,10 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Apache::compat ();
+use Apache2::compat ();
 use CGI ();
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -21,7 +21,7 @@
     my $file = $cgi->param('filename');
     $r->print(<$file>);
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/include_subreq.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/include_subreq.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/include_subreq.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/include_subreq.pm Mon Mar  7 17:58:09 2005
@@ -25,7 +25,7 @@
 
 use Apache::TestTrace;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -54,7 +54,7 @@
         die "something is wrong, didn't get path_info";
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/proxy.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/proxy.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/proxy.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/proxy.pm Mon Mar  7 17:58:09 2005
@@ -5,19 +5,19 @@
 
 use Apache::Test;
 
-use Apache::ServerRec ();
-use Apache::RequestRec ();
-use Apache::RequestIO ();
+use Apache2::ServerRec ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
 
 my $uri_real = "/TestModules__proxy_real";
 
-use Apache::Const -compile => qw(DECLINED OK);
+use Apache2::Const -compile => qw(DECLINED OK);
 
 sub proxy {
     my $r = shift;
 
-    return Apache::DECLINED if $r->proxyreq;
-    return Apache::DECLINED unless $r->uri eq '/TestModules__proxy';
+    return Apache2::DECLINED if $r->proxyreq;
+    return Apache2::DECLINED unless $r->uri eq '/TestModules__proxy';
 
     my $s = $r->server;
     my $real_url = sprintf "http://%s:%d%s",
@@ -28,7 +28,7 @@
     $r->filename("proxy:$real_url");
     $r->handler('proxy-server');
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub response {
@@ -37,7 +37,7 @@
     $r->content_type('text/plain');
     $r->print("ok");
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/reload.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/reload.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/reload.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/reload.pm Mon Mar  7 17:58:09 2005
@@ -5,31 +5,31 @@
 
 use ModPerl::Util ();
 
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
 
-my $package = 'Apache::Reload::Test';
+my $package = 'Apache2::Reload::Test';
 
 sub handler {
     my $r = shift;
 
     if ($r->args eq 'last') {
-        Apache::Reload->unregister_module($package);
+        Apache2::Reload->unregister_module($package);
         ModPerl::Util::unload_package($package);
         $r->print("unregistered OK");
-        return Apache::OK;
+        return Apache2::OK;
     }
 
     eval "use $package";
 
-    Apache::Reload::Test::run($r);
+    Apache2::Reload::Test::run($r);
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 1;
 __END__
 
-PerlModule Apache::Reload
+PerlModule Apache2::Reload
 PerlInitHandler Apache::TestHandler::same_interp_fixup Apache::Reload
 PerlSetVar ReloadDebug Off
 PerlSetVar ReloadAll Off

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/api.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/api.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/api.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/api.pm Mon Mar  7 17:58:09 2005
@@ -9,9 +9,9 @@
 use Apache::TestUtil;
 use Apache::TestTrace;
 
-use Apache::Build;
+use Apache2::Build;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 sub handler {
     my $r = shift;
@@ -27,7 +27,7 @@
     # - win32 is an unrelated issue
     plan $r, tests => 2,
         need { "getppid() is not implemented on Win32"
-                   => !Apache::Build::WIN32(),
+                   => !Apache2::Build::WIN32(),
                "getppid() is having problems with perl 5.6"
                    => !($] < 5.008),
                };
@@ -47,7 +47,7 @@
         ok $ppid != $$;
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/hash_attack.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/hash_attack.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/hash_attack.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/hash_attack.pm Mon Mar  7 17:58:09 2005
@@ -23,7 +23,7 @@
 
 use Apache::TestTrace;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 use Math::BigInt;
 
@@ -43,18 +43,18 @@
     # define a new symbol (sub) after the attack has caused a re-hash
     # check that mod_perl finds that symbol (fixup2) in the stash
     no warnings 'redefine';
-    eval qq[sub fixup2 { return Apache::OK; }];
+    eval qq[sub fixup2 { return Apache2::OK; }];
     $r->push_handlers(PerlFixupHandler => \&fixup2);
 
-    return Apache::DECLINED;
+    return Apache2::DECLINED;
 }
 
-sub fixup { return Apache::OK; }
+sub fixup { return Apache2::OK; }
 
 sub handler {
     my $r = shift;
     $r->print("ok");
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub attack {

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/ithreads.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/ithreads.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/ithreads.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/ithreads.pm Mon Mar  7 17:58:09 2005
@@ -7,7 +7,7 @@
 use Apache::TestUtil;
 use Apache::TestTrace;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 # XXX: at this moment ithreads can be used only with 5.8.1. However
 # once ithreads will be available on CPAN, we will need to change the
@@ -71,7 +71,7 @@
         ok t_cmp($counter_priv, 2**10, "private counter");
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/signals.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/signals.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/signals.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestPerl/signals.pm Mon Mar  7 17:58:09 2005
@@ -5,18 +5,18 @@
 
 use Apache::Test;
 use Apache::TestUtil;
-use Apache::BuildConfig;
+use Apache2::BuildConfig;
 use Apache::TestConfig;
 
-use Apache::MPM ();
+use Apache2::MPM ();
 
 use POSIX qw(SIGALRM);
 
 use constant OSX => Apache::TestConfig::OSX;
 
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
 
-my $mpm = lc Apache::MPM->show;
+my $mpm = lc Apache2::MPM->show;
 
 # signal handlers don't work anywhere but with prefork, since signals
 # and threads don't mix
@@ -25,7 +25,7 @@
 sub handler {
     my $r = shift;
 
-    my $build = Apache::BuildConfig->new;
+    my $build = Apache2::BuildConfig->new;
     my $static = $build->should_build_apache ? 1 : 0;
 
     my $tests = $static ? 1 : 2;
@@ -70,7 +70,7 @@
         skip "POSIX::sigaction doesn't work under 5.6.x", 0;
     }
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub run_for_5_sec {

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestUser/rewrite.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestUser/rewrite.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestUser/rewrite.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestUser/rewrite.pm Mon Mar  7 17:58:09 2005
@@ -8,7 +8,7 @@
 # skipping the ap_directory_walk's stat() calls which speeds up the
 # whole thing.
 #
-# an alternative solution is to return Apache::DECLINED from the trans
+# an alternative solution is to return Apache2::DECLINED from the trans
 # handler, in which case map2storage is not required (but it'll do a
 # bunch of stat() calls then, which you may want to avoid)
 
@@ -18,11 +18,11 @@
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::URI ();
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::URI ();
 
-use Apache::Const -compile => qw(DECLINED OK);
+use Apache2::Const -compile => qw(DECLINED OK);
 
 my $uri_real = "/TestUser__rewrite_real";
 my $args_real = "foo=bar&boo=tar";
@@ -30,21 +30,21 @@
 sub trans {
     my $r = shift;
 
-    return Apache::DECLINED unless $r->uri eq '/TestUser__rewrite';
+    return Apache2::DECLINED unless $r->uri eq '/TestUser__rewrite';
 
     $r->uri($uri_real);
     $r->args($args_real);
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub map2storage {
     my $r = shift;
 
-    return Apache::DECLINED unless $r->uri eq $uri_real;
+    return Apache2::DECLINED unless $r->uri eq $uri_real;
 
     # skip ap_directory_walk stat() calls
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 sub response {
@@ -56,7 +56,7 @@
 
     ok t_cmp($args, $args_real, "args");
 
-    return Apache::OK;
+    return Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestVhost/config.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestVhost/config.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestVhost/config.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestVhost/config.pm Mon Mar  7 17:58:09 2005
@@ -10,12 +10,12 @@
 use Apache::Test;
 use Apache::TestUtil;
 
-use Apache::RequestUtil ();
+use Apache2::RequestUtil ();
 use APR::Table ();
 
 use File::Spec::Functions qw(canonpath catdir);
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 # initialized in t/htdocs/vhost/post_config.pl
 our $restart_count;
@@ -37,7 +37,7 @@
         ok t_cmp($restart_count, 2, "PerlPostConfigRequire");
     }
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;

Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestVhost/log.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestVhost/log.pm?view=diff&r1=156471&r2=156472
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestVhost/log.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestVhost/log.pm Mon Mar  7 17:58:09 2005
@@ -10,9 +10,9 @@
 # here as it breaks the $SIG{__WARN__} sub test for perl 5.6, though
 # it works fine with perl 5.8+
 
-use Apache::RequestUtil ();
-use Apache::Log ();
-use Apache::ServerRec qw(warn); # override warn locally
+use Apache2::RequestUtil ();
+use Apache2::Log ();
+use Apache2::ServerRec qw(warn); # override warn locally
 
 use File::Spec::Functions qw(catfile);
 
@@ -20,7 +20,7 @@
 use Apache::TestUtil;
 use TestCommon::LogDiff;
 
-use Apache::Const -compile => 'OK';
+use Apache2::Const -compile => 'OK';
 
 my @methods1 = (
     '$r->log->warn',
@@ -32,7 +32,7 @@
 );
 
 my @methods2 = (
-    'Apache::ServerRec::warn',
+    'Apache2::ServerRec::warn',
     'warn',
 );
 
@@ -68,7 +68,7 @@
     {
         no warnings; # avoid FATAL warnings
         use warnings;
-        local $SIG{__WARN__} = \&Apache::ServerRec::warn;
+        local $SIG{__WARN__} = \&Apache2::ServerRec::warn;
         eval q[my $x = "aaa" + 1;];
         ok t_cmp
             $logdiff->diff,
@@ -79,7 +79,7 @@
     # die logs into the vhost log just fine
     #die "horrible death!";
 
-    Apache::OK;
+    Apache2::OK;
 }
 
 1;



Mime
View raw message