You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by jo...@apache.org on 2005/03/08 06:17:00 UTC
svn commit: r156503 - in perl/modperl/branches/apache2-rename-unstable/t:
apache/ apache2/ conf/ filter/TestFilter/ htdocs/vhost/ response/TestAPI/
response/TestApache/ response/TestApache2/ response/TestCompat/
response/TestDirective/ response/TestError/ response/TestModperl/
response/TestModules/ response/TestVhost/ vhost/
Author: joes
Date: Mon Mar 7 21:16:47 2005
New Revision: 156503
URL: http://svn.apache.org/viewcvs?view=rev&rev=156503
Log:
Move t/apache to t/apache2. Include temporary
workaround for CGI.pm's use of original Apache:: API.
With this commit, most tests outside of t/compat and t/modules
should pass again.
Added:
perl/modperl/branches/apache2-rename-unstable/t/apache2/
- copied from r156466, perl/modperl/branches/apache2-rename-unstable/t/apache/
perl/modperl/branches/apache2-rename-unstable/t/apache2/add_config.t
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/add_config.t
perl/modperl/branches/apache2-rename-unstable/t/apache2/cgihandler.t
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/cgihandler.t
perl/modperl/branches/apache2-rename-unstable/t/apache2/constants.t
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/constants.t
perl/modperl/branches/apache2-rename-unstable/t/apache2/content_length_header.t
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/content_length_header.t
perl/modperl/branches/apache2-rename-unstable/t/apache2/discard_rbody.t
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/discard_rbody.t
perl/modperl/branches/apache2-rename-unstable/t/apache2/post.t
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/post.t
perl/modperl/branches/apache2-rename-unstable/t/apache2/read.t
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/read.t
perl/modperl/branches/apache2-rename-unstable/t/apache2/read2.t
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/read2.t
perl/modperl/branches/apache2-rename-unstable/t/apache2/scanhdrs.t
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/scanhdrs.t
perl/modperl/branches/apache2-rename-unstable/t/apache2/scanhdrs2.t
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/scanhdrs2.t
perl/modperl/branches/apache2-rename-unstable/t/apache2/send_cgi_header.t
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/send_cgi_header.t
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/
- copied from r156466, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/cgihandler.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/cgihandler.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/conftree.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/conftree.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/content_length_header.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/content_length_header.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/discard_rbody.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/discard_rbody.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/post.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/post.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/read.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/read.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/read2.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/read2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/scanhdrs.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/scanhdrs.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/scanhdrs2.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/scanhdrs2.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/send_cgi_header.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/send_cgi_header.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/subprocess.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/subprocess.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/util.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/util.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/write.pm
- copied, changed from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/write.pm
Removed:
perl/modperl/branches/apache2-rename-unstable/t/apache/
perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/
Modified:
perl/modperl/branches/apache2-rename-unstable/t/conf/extra.conf.in
perl/modperl/branches/apache2-rename-unstable/t/conf/extra.last.conf.in
perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl
perl/modperl/branches/apache2-rename-unstable/t/conf/post_config_startup.pl
perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_api.pm
perl/modperl/branches/apache2-rename-unstable/t/htdocs/vhost/post_config.pl
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/aplog.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/conn_util.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/content_encoding.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/err_headers_out.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/in_out_filters.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/module.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/process.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/query.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_rec.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_subclass.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/server_util.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_file.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_table.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_uri.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_util.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_authen.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_rec.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request_body.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlloadmodule3.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestError/api.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/dir_config.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/request_rec_perlio_api.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModperl/taint.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestModules/reload.pm
perl/modperl/branches/apache2-rename-unstable/t/response/TestVhost/log.pm
perl/modperl/branches/apache2-rename-unstable/t/vhost/config.t
Copied: perl/modperl/branches/apache2-rename-unstable/t/apache2/add_config.t (from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/add_config.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/apache2/add_config.t?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/apache/add_config.t&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/apache2/add_config.t&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/apache/add_config.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/apache2/add_config.t Mon Mar 7 21:16:47 2005
@@ -1,5 +1,5 @@
# the handler is configured in modperl_extra.pl via
-# Apache->server->add_config
+# Apache2->server->add_config
use Apache::TestRequest 'GET_BODY_ASSERT';
-print GET_BODY_ASSERT "/apache/add_config";
+print GET_BODY_ASSERT "/apache2/add_config";
Copied: perl/modperl/branches/apache2-rename-unstable/t/apache2/cgihandler.t (from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/cgihandler.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/apache2/cgihandler.t?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/apache/cgihandler.t&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/apache2/cgihandler.t&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/apache/cgihandler.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/apache2/cgihandler.t Mon Mar 7 21:16:47 2005
@@ -7,7 +7,7 @@
plan tests => 2;
-my $location = "/TestApache__cgihandler";
+my $location = "/TestApache2__cgihandler";
my $expected = "1..3\nok 1\nok 2\nok 3\n";
Copied: perl/modperl/branches/apache2-rename-unstable/t/apache2/constants.t (from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/constants.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/apache2/constants.t?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/apache/constants.t&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/apache2/constants.t&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/apache/constants.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/apache2/constants.t Mon Mar 7 21:16:47 2005
@@ -5,13 +5,11 @@
use Apache::Test;
use Apache::TestUtil;
-use Apache2 ();
-
-# -compile puts constants into the Apache:: namespace
+# -compile puts constants into the Apache2:: namespace
use Apache2::Const -compile => qw(:http :common :mpmq
- TAKE23 &OPT_EXECCGI
- DECLINE_CMD DIR_MAGIC_TYPE
- CRLF);
+ TAKE23 &OPT_EXECCGI
+ DECLINE_CMD DIR_MAGIC_TYPE
+ CRLF);
# without -compile, constants are in the
# caller namespace. also defaults to :common
@@ -25,11 +23,11 @@
ok t_cmp(OK, 0, 'OK');
-ok t_cmp(Apache2::OK, 0, 'Apache::OK');
+ok t_cmp(Apache2::OK, 0, 'Apache2::OK');
-ok t_cmp(Apache2::DECLINED, -1, 'Apache::DECLINED');
+ok t_cmp(Apache2::DECLINED, -1, 'Apache2::DECLINED');
-ok t_cmp(Apache2::HTTP_GONE, 410, 'Apache::HTTP_GONE');
+ok t_cmp(Apache2::HTTP_GONE, 410, 'Apache2::HTTP_GONE');
ok t_cmp(Apache2::DIR_MAGIC_TYPE,
'httpd/unix-directory',
Copied: perl/modperl/branches/apache2-rename-unstable/t/apache2/content_length_header.t (from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/content_length_header.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/apache2/content_length_header.t?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/apache/content_length_header.t&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/apache2/content_length_header.t&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/apache/content_length_header.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/apache2/content_length_header.t Mon Mar 7 21:16:47 2005
@@ -7,7 +7,7 @@
plan tests => 12 * 2 + 3;
-my $location = "/TestApache__content_length_header";
+my $location = "/TestApache2__content_length_header";
# 1. because Apache proclaims itself governor of the C-L header via
# the C-L filter (ap_content_length_filter at
Copied: perl/modperl/branches/apache2-rename-unstable/t/apache2/discard_rbody.t (from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/discard_rbody.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/apache2/discard_rbody.t?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/apache/discard_rbody.t&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/apache2/discard_rbody.t&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/apache/discard_rbody.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/apache2/discard_rbody.t Mon Mar 7 21:16:47 2005
@@ -5,7 +5,7 @@
use Apache::Test;
use Apache::TestRequest;
-my $location = "/TestApache__discard_rbody";
+my $location = "/TestApache2__discard_rbody";
my $content = "Y" x 100000; # more than one bucket
plan tests => 3;
Copied: perl/modperl/branches/apache2-rename-unstable/t/apache2/post.t (from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/post.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/apache2/post.t?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/apache/post.t&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/apache2/post.t&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/apache/post.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/apache2/post.t Mon Mar 7 21:16:47 2005
@@ -7,7 +7,7 @@
plan tests => 2;
-my $location = "/TestApache__post";
+my $location = "/TestApache2__post";
my $str;
my @data = (arizona => 'wildcats');
Copied: perl/modperl/branches/apache2-rename-unstable/t/apache2/read.t (from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/read.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/apache2/read.t?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/apache/read.t&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/apache2/read.t&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/apache/read.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/apache2/read.t Mon Mar 7 21:16:47 2005
@@ -11,7 +11,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 = "/TestApache2__read";
my $socket = Apache::TestRequest::vhost_socket('default');
Copied: perl/modperl/branches/apache2-rename-unstable/t/apache2/read2.t (from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/read2.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/apache2/read2.t?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/apache/read2.t&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/apache2/read2.t&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/apache/read2.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/apache2/read2.t Mon Mar 7 21:16:47 2005
@@ -1,3 +1,3 @@
use Apache::TestRequest 'POST_BODY_ASSERT';
-print POST_BODY_ASSERT "/TestApache__read2",
+print POST_BODY_ASSERT "/TestApache2__read2",
content => "foobar";
Copied: perl/modperl/branches/apache2-rename-unstable/t/apache2/scanhdrs.t (from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/scanhdrs.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/apache2/scanhdrs.t?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/apache/scanhdrs.t&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/apache2/scanhdrs.t&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/apache/scanhdrs.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/apache2/scanhdrs.t Mon Mar 7 21:16:47 2005
@@ -7,7 +7,7 @@
plan tests => 4;
-my $module = 'TestApache::scanhdrs';
+my $module = 'TestApache2::scanhdrs';
my $location = "/" . Apache::TestRequest::module2path($module);
my $res = GET $location;
Copied: perl/modperl/branches/apache2-rename-unstable/t/apache2/scanhdrs2.t (from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/scanhdrs2.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/apache2/scanhdrs2.t?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/apache/scanhdrs2.t&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/apache2/scanhdrs2.t&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/apache/scanhdrs2.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/apache2/scanhdrs2.t Mon Mar 7 21:16:47 2005
@@ -7,7 +7,7 @@
plan tests => 5;
-my $module = 'TestApache__scanhdrs2';
+my $module = 'TestApache2__scanhdrs2';
my $location = "/$module";
my $redirect = 'http://perl.apache.org/';
Copied: perl/modperl/branches/apache2-rename-unstable/t/apache2/send_cgi_header.t (from r156499, perl/modperl/branches/apache2-rename-unstable/t/apache/send_cgi_header.t)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/apache2/send_cgi_header.t?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/apache/send_cgi_header.t&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/apache2/send_cgi_header.t&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/apache/send_cgi_header.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/apache2/send_cgi_header.t Mon Mar 7 21:16:47 2005
@@ -7,7 +7,7 @@
plan tests => 4;
-my $location = "/TestApache__send_cgi_header";
+my $location = "/TestApache2__send_cgi_header";
my $res = GET $location;
ok t_cmp($res->header('X-Foo'),
Modified: perl/modperl/branches/apache2-rename-unstable/t/conf/extra.conf.in
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/conf/extra.conf.in?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/conf/extra.conf.in (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/conf/extra.conf.in Mon Mar 7 21:16:47 2005
@@ -82,10 +82,10 @@
# PerlSetVar StatusTerseSize On
# PerlSetVar StatusTerseSizeMainSummary On
SetHandler modperl
- PerlResponseHandler Apache::Status
+ PerlResponseHandler Apache2::Status
</Location>
-# for TestApache::util
+# for TestApache2::util
PerlPassEnv LC_CTYPE
PerlPassEnv LC_TIME
Modified: perl/modperl/branches/apache2-rename-unstable/t/conf/extra.last.conf.in
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/conf/extra.last.conf.in?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/conf/extra.last.conf.in (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/conf/extra.last.conf.in Mon Mar 7 21:16:47 2005
@@ -19,7 +19,7 @@
tie %Location, 'TestCommon::TiePerlSection';
$Location{'/tied'} = 'test_tied';
-$Apache::PerlSections::Save = 1;
+$Apache2::PerlSections::Save = 1;
$Location{'/perl_sections_saved'} = {
'AuthName' => 'PerlSection',
};
@@ -29,7 +29,7 @@
</Perl>
<Perl >
-$Apache::PerlSections::Save = 1;
+$Apache2::PerlSections::Save = 1;
$TestDirective::perl::filename = __FILE__;
$TestDirective::perl::dollar_zero = $0;
$TestDirective::perl::line = __LINE__;
@@ -45,11 +45,11 @@
$Include = $file;
</Perl>
-#Deprecated access to Apache::ReadConfig:: still works
+#Deprecated access to Apache2::ReadConfig:: still works
<Perl >
-push @Apache::ReadConfig::Alias,
+push @Apache2::ReadConfig::Alias,
['/perl_sections_readconfig', '@DocumentRoot@'];
-$Apache::ReadConfig::Location{'/perl_sections_readconfig'} = {
+$Apache2::ReadConfig::Location{'/perl_sections_readconfig'} = {
'PerlInitHandler' => 'ModPerl::Test::add_config',
'AuthType' => 'Basic',
'AuthName' => 'PerlSection',
Modified: perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/conf/modperl_extra.pl Mon Mar 7 21:16:47 2005
@@ -22,7 +22,18 @@
use File::Spec::Functions qw(canonpath catdir);
-use Apache2 ();
+BEGIN {
+ ## XXX: Block of temporary hacks for Apache::compat and CGI.pm
+ *Apache::request = *Apache2::request;
+ *Apache::server = *Apache2::server;
+
+ for (qw/Response RequestRec RequestUtil/) {
+ eval qq(package Apache::$_;
+ use base "Apache2::$_";
+ \$INC{"Apache/$_.pm"} = ') . __FILE__ . "';";
+ die $@ if $@;
+ }
+}
use Apache2::ServerUtil ();
use Apache2::ServerRec ();
@@ -73,10 +84,10 @@
# run during config phase, so it's logged only once (even though it's
# run the second time, but STDERR == /dev/null)
sub startup_info {
- my $ap_mods = scalar grep { /^Apache/ } keys %INC;
+ my $ap_mods = scalar grep { /^Apache2/ } keys %INC;
my $apr_mods = scalar grep { /^APR/ } keys %INC;
- Apache2::Log->info("$ap_mods Apache:: modules loaded");
+ Apache2::Log->info("$ap_mods Apache2:: modules loaded");
Apache2::ServerRec->log->info("$apr_mods APR:: modules loaded");
my $server = Apache2->server;
@@ -94,7 +105,7 @@
my $conf = <<'EOC';
# must use PerlModule here to check for segfaults
PerlModule Apache::TestHandler
-<Location /apache/add_config>
+<Location /apache2/add_config>
SetHandler perl-script
PerlResponseHandler Apache::TestHandler::ok1
</Location>
Modified: perl/modperl/branches/apache2-rename-unstable/t/conf/post_config_startup.pl
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/conf/post_config_startup.pl?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/conf/post_config_startup.pl (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/conf/post_config_startup.pl Mon Mar 7 21:16:47 2005
@@ -84,7 +84,7 @@
my($r, $q) = @_; #request and CGI objects
return ["This is just a test entry"];
}
- ) if Apache2::Module::loaded('Apache::Status');
+ ) if Apache2::Module::loaded('Apache2::Status');
}
# test startup loglevel setting (under threaded mpms loglevel can be
Modified: perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_api.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_api.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_api.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/filter/TestFilter/out_str_api.pm Mon Mar 7 21:16:47 2005
@@ -1,6 +1,6 @@
package TestFilter::out_str_api;
-# Test Apache2::FilterRec and Apache::Filter accessors
+# Test Apache2::FilterRec and Apache2::Filter accessors
use strict;
use warnings FATAL => 'all';
Modified: perl/modperl/branches/apache2-rename-unstable/t/htdocs/vhost/post_config.pl
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/htdocs/vhost/post_config.pl?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/htdocs/vhost/post_config.pl (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/htdocs/vhost/post_config.pl Mon Mar 7 21:16:47 2005
@@ -1,7 +1,6 @@
use strict;
use warnings FATAL => 'all';
-use Apache2;
use Apache2::ServerUtil ();
$TestVhost::config::restart_count = Apache2::ServerUtil::restart_count();
@@ -10,7 +9,6 @@
use warnings;
use strict;
-use Apache2;
use Apache2::ServerUtil ();
$TestVhost::config::Restart_Count = Apache2::ServerUtil::restart_count();
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/aplog.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/aplog.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/aplog.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/aplog.pm Mon Mar 7 21:16:47 2005
@@ -61,7 +61,7 @@
{
t_server_log_warn_is_expected();
$s->log_serror(Apache2::Log::LOG_MARK,
- Apache2::LOG_INFO|Apache::LOG_STARTUP,
+ Apache2::LOG_INFO|Apache2::LOG_STARTUP,
APR::SUCCESS, "This log message comes with no header");
ok t_cmp $logdiff->diff,
qr/^This log message comes with no header$/m,
@@ -80,7 +80,7 @@
: "Error string not specified yet";
t_server_log_warn_is_expected();
- $s->log_serror(Apache2::Log::LOG_MARK, Apache::LOG_DEBUG,
+ $s->log_serror(Apache2::Log::LOG_MARK, Apache2::LOG_DEBUG,
APR::EGENERAL, "log_serror test 2");
ok t_cmp $logdiff->diff,
qr/$egeneral: log_serror test 2/,
@@ -89,7 +89,7 @@
# log_rerror
t_server_log_error_is_expected();
- $r->log_rerror(Apache2::Log::LOG_MARK, Apache::LOG_CRIT,
+ $r->log_rerror(Apache2::Log::LOG_MARK, Apache2::LOG_CRIT,
APR::ENOTIME, "log_rerror test");
# can't match against the error string, since a locale may kick in
ok t_cmp $logdiff->diff,
@@ -183,18 +183,18 @@
{
t_server_log_warn_is_expected();
# this uses global server to get $s internally
- Apache2::ServerRec::warn("Apache::ServerRec::warn test");
+ Apache2::ServerRec::warn("Apache2::ServerRec::warn test");
ok t_cmp $logdiff->diff,
qr/\[warn\] Apache2::ServerRec::warn test/,
- 'Apache2::ServerRec::warn() w/o Apache->request ';
+ 'Apache2::ServerRec::warn() w/o Apache2->request ';
- Apache->request($r);
+ Apache2->request($r);
t_server_log_warn_is_expected();
# this uses the global $r to get $s internally
- Apache2::ServerRec::warn("Apache::ServerRec::warn test");
+ Apache2::ServerRec::warn("Apache2::ServerRec::warn test");
ok t_cmp $logdiff->diff,
qr/\[warn\] Apache2::ServerRec::warn test/,
- 'Apache2::ServerRec::warn() w/ Apache->request ';
+ 'Apache2::ServerRec::warn() w/ Apache2->request ';
}
t_server_log_warn_is_expected();
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/conn_util.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/conn_util.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/conn_util.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/conn_util.pm Mon Mar 7 21:16:47 2005
@@ -22,8 +22,8 @@
ok $c->get_remote_host() || 1;
- for (Apache2::REMOTE_HOST, Apache::REMOTE_NAME,
- Apache2::REMOTE_NOLOOKUP, Apache::REMOTE_DOUBLE_REV) {
+ for (Apache2::REMOTE_HOST, Apache2::REMOTE_NAME,
+ Apache2::REMOTE_NOLOOKUP, Apache2::REMOTE_DOUBLE_REV) {
ok $c->get_remote_host($_) || 1;
}
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/content_encoding.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/content_encoding.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/content_encoding.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/content_encoding.pm Mon Mar 7 21:16:47 2005
@@ -15,7 +15,7 @@
sub handler {
my $r = shift;
- return Apache2::DECLINED unless $r->method_number == Apache::M_POST;
+ return Apache2::DECLINED unless $r->method_number == Apache2::M_POST;
my $data = TestCommon::Utils::read_post($r);
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/err_headers_out.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/err_headers_out.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/err_headers_out.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/err_headers_out.pm Mon Mar 7 21:16:47 2005
@@ -23,7 +23,7 @@
# this header will make it to the client only on 2xx response
$r->headers_out->add('X-headers_out' => "headers_out");
- return $r->args eq "404" ? Apache2::NOT_FOUND : Apache::OK;
+ return $r->args eq "404" ? Apache2::NOT_FOUND : Apache2::OK;
}
1;
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/in_out_filters.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/in_out_filters.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/in_out_filters.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/in_out_filters.pm Mon Mar 7 21:16:47 2005
@@ -23,7 +23,7 @@
sub handler {
my $r = shift;
- return Apache2::DECLINED unless $r->method_number == Apache::M_POST;
+ return Apache2::DECLINED unless $r->method_number == Apache2::M_POST;
$r->content_type("text/plain");
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/module.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/module.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/module.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/module.pm Mon Mar 7 21:16:47 2005
@@ -52,8 +52,8 @@
#perl
{
- ok t_cmp Apache2::Module::loaded('Apache::Module'), 1,
- "Apache2::Module::loaded('Apache::Module')";
+ ok t_cmp Apache2::Module::loaded('Apache2::Module'), 1,
+ "Apache2::Module::loaded('Apache2::Module')";
ok t_cmp Apache2::Module::loaded('Apache__Module_foo'), 0,
"Apache2::Module::loaded('Apache__Module_foo')";
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/process.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/process.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/process.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/process.pm Mon Mar 7 21:16:47 2005
@@ -19,7 +19,7 @@
my $s = $r->server;
my $proc = $s->process;
- ok t_cmp(1, $proc->isa('Apache2::Process'), "isa('Apache::Process')");
+ ok t_cmp(1, $proc->isa('Apache2::Process'), "isa('Apache2::Process')");
my $global_pool = $proc->pool;
ok t_cmp(1, $global_pool->isa('APR::Pool'), "pglob isa('APR::Pool')");
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/query.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/query.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/query.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/query.pm Mon Mar 7 21:16:47 2005
@@ -28,7 +28,7 @@
if ($mpm eq 'prefork') {
{
- my $query = Apache2::MPM->query(Apache::MPMQ_IS_THREADED);
+ my $query = Apache2::MPM->query(Apache2::MPMQ_IS_THREADED);
ok t_cmp($query,
Apache2::MPMQ_NOT_SUPPORTED,
@@ -41,12 +41,12 @@
Apache2::MPM->is_threaded,
"Apache2::MPM->is_threaded() equivalent to query(MPMQ_IS_THREADED)");
- t_debug('Apache2::MPM->is_threaded returned ' . Apache::MPM->is_threaded);
+ t_debug('Apache2::MPM->is_threaded returned ' . Apache2::MPM->is_threaded);
ok (! Apache2::MPM->is_threaded);
}
{
- my $query = Apache2::MPM->query(Apache::MPMQ_IS_FORKED);
+ my $query = Apache2::MPM->query(Apache2::MPMQ_IS_FORKED);
ok t_cmp($query,
Apache2::MPMQ_DYNAMIC,
@@ -57,7 +57,7 @@
elsif ($mpm eq 'worker') {
{
- my $query = Apache2::MPM->query(Apache::MPMQ_IS_THREADED);
+ my $query = Apache2::MPM->query(Apache2::MPMQ_IS_THREADED);
ok t_cmp($query,
Apache2::MPMQ_STATIC,
@@ -67,12 +67,12 @@
Apache2::MPM->is_threaded,
"Apache2::MPM->is_threaded() equivalent to query(MPMQ_IS_THREADED)");
- t_debug('Apache2::MPM->is_threaded returned ' . Apache::MPM->is_threaded);
+ t_debug('Apache2::MPM->is_threaded returned ' . Apache2::MPM->is_threaded);
ok (Apache2::MPM->is_threaded);
}
{
- my $query = Apache2::MPM->query(Apache::MPMQ_IS_FORKED);
+ my $query = Apache2::MPM->query(Apache2::MPMQ_IS_FORKED);
ok t_cmp($query,
Apache2::MPMQ_DYNAMIC,
@@ -82,7 +82,7 @@
elsif ($mpm eq 'leader') {
{
- my $query = Apache2::MPM->query(Apache::MPMQ_IS_THREADED);
+ my $query = Apache2::MPM->query(Apache2::MPMQ_IS_THREADED);
ok t_cmp($query,
Apache2::MPMQ_STATIC,
@@ -92,12 +92,12 @@
Apache2::MPM->is_threaded,
"Apache2::MPM->is_threaded() equivalent to query(MPMQ_IS_THREADED)");
- t_debug('Apache2::MPM->is_threaded returned ' . Apache::MPM->is_threaded);
+ t_debug('Apache2::MPM->is_threaded returned ' . Apache2::MPM->is_threaded);
ok (Apache2::MPM->is_threaded);
}
{
- my $query = Apache2::MPM->query(Apache::MPMQ_IS_FORKED);
+ my $query = Apache2::MPM->query(Apache2::MPMQ_IS_FORKED);
ok t_cmp($query,
Apache2::MPMQ_DYNAMIC,
@@ -107,7 +107,7 @@
elsif ($mpm eq 'winnt') {
{
- my $query = Apache2::MPM->query(Apache::MPMQ_IS_THREADED);
+ my $query = Apache2::MPM->query(Apache2::MPMQ_IS_THREADED);
ok t_cmp($query,
Apache2::MPMQ_STATIC,
@@ -117,12 +117,12 @@
Apache2::MPM->is_threaded,
"Apache2::MPM->is_threaded() equivalent to query(MPMQ_IS_THREADED)");
- t_debug('Apache2::MPM->is_threaded returned ' . Apache::MPM->is_threaded);
+ t_debug('Apache2::MPM->is_threaded returned ' . Apache2::MPM->is_threaded);
ok (Apache2::MPM->is_threaded);
}
{
- my $query = Apache2::MPM->query(Apache::MPMQ_IS_FORKED);
+ my $query = Apache2::MPM->query(Apache2::MPMQ_IS_FORKED);
ok t_cmp($query,
Apache2::MPMQ_NOT_SUPPORTED,
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_rec.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_rec.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_rec.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_rec.pm Mon Mar 7 21:16:47 2005
@@ -26,18 +26,18 @@
plan $r, tests => 54;
- #Apache->request($r); #PerlOptions +GlobalRequest takes care
- my $gr = Apache->request;
+ #Apache2->request($r); #PerlOptions +GlobalRequest takes care
+ my $gr = Apache2->request;
ok $$gr == $$r;
my $newr = Apache2::RequestRec->new($r->connection, $r->pool);
- Apache->request($newr);
- $gr = Apache->request;
+ Apache2->request($newr);
+ $gr = Apache2->request;
ok $$gr == $$newr;
- Apache->request($r);
+ Apache2->request($r);
ok $r->pool->isa('APR::Pool');
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_subclass.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_subclass.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_subclass.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/request_subclass.pm Mon Mar 7 21:16:47 2005
@@ -24,7 +24,7 @@
plan $r, tests => 5;
- eval { my $gr = Apache->request; };
+ eval { my $gr = Apache2->request; };
ok $@;
ok $r->uri eq $location;
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/server_util.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/server_util.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/server_util.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestAPI/server_util.pm Mon Mar 7 21:16:47 2005
@@ -71,7 +71,7 @@
'$r->connection->pool' => $r->connection->pool,
'$r->server->process->pool' => $r->server->process->pool,
'$r->server->process->pconf' => $r->server->process->pconf,
- 'Apache->server->process->pconf' => Apache->server->process->pconf,
+ 'Apache2->server->process->pconf' => Apache2->server->process->pconf,
'APR::Pool->new' => APR::Pool->new,
);
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/cgihandler.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/cgihandler.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/cgihandler.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/cgihandler.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/cgihandler.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/cgihandler.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/cgihandler.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::cgihandler;
+package TestApache2::cgihandler;
use strict;
use warnings FATAL => 'all';
@@ -41,5 +41,5 @@
1;
__END__
SetHandler perl-script
-PerlResponseHandler TestApache::cgihandler
+PerlResponseHandler TestApache2::cgihandler
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/conftree.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/conftree.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/conftree.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/conftree.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/conftree.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/conftree.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/conftree.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::conftree;
+package TestApache2::conftree;
use strict;
use warnings FATAL => 'all';
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/content_length_header.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/content_length_header.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/content_length_header.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/content_length_header.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/content_length_header.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/content_length_header.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/content_length_header.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::content_length_header;
+package TestApache2::content_length_header;
# see the client t/apache/content_length_header.t for the comments
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/discard_rbody.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/discard_rbody.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/discard_rbody.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/discard_rbody.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/discard_rbody.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/discard_rbody.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/discard_rbody.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::discard_rbody;
+package TestApache2::discard_rbody;
# test $r->discard_request_body when the input body wasn't read at
# all, read partially or completely.
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/post.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/post.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/post.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/post.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/post.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/post.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/post.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::post;
+package TestApache2::post;
use strict;
use warnings FATAL => 'all';
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/read.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/read.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/read.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/read.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/read.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/read.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/read.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::read;
+package TestApache2::read;
use strict;
use warnings FATAL => 'all';
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/read2.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/read2.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/read2.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/read2.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/read2.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/read2.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/read2.pm Mon Mar 7 21:16:47 2005
@@ -1,6 +1,6 @@
-package TestApache::read2;
+package TestApache2::read2;
-# extra tests in addition to TestApache::read
+# extra tests in addition to TestApache2::read
use strict;
use warnings FATAL => 'all';
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/scanhdrs.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/scanhdrs.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/scanhdrs.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/scanhdrs.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/scanhdrs.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/scanhdrs.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/scanhdrs.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::scanhdrs;
+package TestApache2::scanhdrs;
use strict;
use warnings FATAL => 'all';
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/scanhdrs2.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/scanhdrs2.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/scanhdrs2.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/scanhdrs2.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/scanhdrs2.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/scanhdrs2.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/scanhdrs2.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::scanhdrs2;
+package TestApache2::scanhdrs2;
use strict;
use warnings FATAL => 'all';
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/send_cgi_header.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/send_cgi_header.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/send_cgi_header.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/send_cgi_header.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/send_cgi_header.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/send_cgi_header.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/send_cgi_header.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::send_cgi_header;
+package TestApache2::send_cgi_header;
use strict;
use warnings FATAL => 'all';
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/subprocess.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/subprocess.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/subprocess.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/subprocess.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/subprocess.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/subprocess.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/subprocess.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::subprocess;
+package TestApache2::subprocess;
use strict;
use warnings FATAL => 'all';
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/util.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/util.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/util.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/util.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/util.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/util.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/util.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::util;
+package TestApache2::util;
# Apache2::Util tests
Copied: perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/write.pm (from r156499, perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/write.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/write.pm?view=diff&rev=156503&p1=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/write.pm&r1=156499&p2=perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/write.pm&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestApache/write.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestApache2/write.pm Mon Mar 7 21:16:47 2005
@@ -1,4 +1,4 @@
-package TestApache::write;
+package TestApache2::write;
use strict;
use warnings FATAL => 'all';
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache.pm Mon Mar 7 21:16:47 2005
@@ -12,7 +12,7 @@
use ModPerl::Util ();
use Apache2::compat ();
-use Apache2::Constants qw(DIR_MAGIC_TYPE :common :response);
+use Apache::Constants qw(DIR_MAGIC_TYPE :common :response);
use File::Spec::Functions qw(catfile canonpath);
@@ -32,7 +32,6 @@
ok t_cmp(Apache->module('mod_ne_exists.c'), 0,
"Apache2::module('mod_ne_exists.c')");
-
ok t_cmp(Apache->define('MODPERL2'),
Apache2::ServerUtil::exists_config_define('MODPERL2'),
'Apache->define');
@@ -42,7 +41,7 @@
'inside PerlResponseHandler');
t_server_log_error_is_expected();
- Apache2::log_error("Apache::log_error test ok");
+ Apache::log_error("Apache::log_error test ok");
ok 1;
t_server_log_warn_is_expected();
@@ -50,15 +49,15 @@
ok 1;
t_server_log_warn_is_expected();
- Apache2::warn('Apache::warn ok');
+ Apache::warn('Apache::warn ok');
ok 1;
t_server_log_warn_is_expected();
- Apache2::Server->warn('Apache::Server->warn ok');
+ Apache::Server->warn('Apache::Server->warn ok');
ok 1;
t_server_log_warn_is_expected();
- Apache2::Server::warn('Apache::Server::warn ok');
+ Apache::Server::warn('Apache::Server::warn ok');
ok 1;
# explicitly imported
@@ -85,7 +84,7 @@
# (Apache||$r)->server_root_relative
{
my $server_root = Apache::Test::config()->{vars}->{serverroot};
- ok t_filepath_cmp(canonpath($Apache2::Server::CWD),
+ ok t_filepath_cmp(canonpath($Apache::Server::CWD),
canonpath($server_root),
'$server_root');
@@ -99,11 +98,11 @@
ok t_filepath_cmp(canonpath(Apache->server_root_relative('conf')),
catfile($server_root, 'conf'),
- "Apache->server_root_relative('conf')");
+ "Apache2->server_root_relative('conf')");
ok t_filepath_cmp(canonpath(Apache->server_root_relative),
canonpath($server_root),
- 'Apache->server_root_relative()');
+ 'Apache2->server_root_relative()');
my $path = catfile(Apache2::ServerUtil::server_root, 'logs');
ok t_filepath_cmp(canonpath(Apache->server_root_relative($path)),
@@ -115,8 +114,8 @@
'/foo bar baz',
'Apache->unescape_url_info');
- ok t_cmp $Apache2::Server::Starting, 0, '$Apache::Server::Starting';
- ok t_cmp $Apache2::Server::ReStarting, 1, '$Apache::Server::ReStarting';
+ ok t_cmp $Apache::Server::Starting, 0, '$Apache::Server::Starting';
+ ok t_cmp $Apache::Server::ReStarting, 1, '$Apache::Server::ReStarting';
OK;
}
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_file.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_file.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_file.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_file.pm Mon Mar 7 21:16:47 2005
@@ -11,7 +11,7 @@
use Apache::Test;
use Apache2::compat ();
-use Apache2::Constants qw(OK);
+use Apache::Constants qw(OK);
sub handler {
my $r = shift;
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_table.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_table.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_table.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_table.pm Mon Mar 7 21:16:47 2005
@@ -1,6 +1,6 @@
package TestCompat::apache_table;
-# Apache2::Table compat layer tests
+# Apache::Table compat layer tests
# these tests are all run and validated on the server side.
@@ -11,7 +11,7 @@
use Apache::Test;
use Apache2::compat ();
-use Apache2::Constants qw(OK);
+use Apache::Constants qw(OK);
sub handler {
my $r = shift;
@@ -20,10 +20,10 @@
$r->send_http_header('text/plain');
- my $t = Apache2::Table->new($r);
+ my $t = Apache::Table->new($r);
my $t_class = ref $t;
- ok t_cmp($t_class, 'APR::Table', "Apache2::Table->new");
+ ok t_cmp($t_class, 'APR::Table', "Apache::Table->new");
ok t_cmp($r->is_main, !$r->main,
'$r->is_main');
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_uri.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_uri.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_uri.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_uri.pm Mon Mar 7 21:16:47 2005
@@ -1,6 +1,6 @@
package TestCompat::apache_uri;
-# Apache2::Util compat layer tests
+# Apache::Util compat layer tests
# these tests are all run and validated on the server side.
@@ -11,7 +11,7 @@
use Apache::Test;
use Apache2::compat ();
-use Apache2::Constants qw(OK);
+use Apache::Constants qw(OK);
sub handler {
my $r = shift;
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_util.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_util.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_util.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/apache_util.pm Mon Mar 7 21:16:47 2005
@@ -1,6 +1,6 @@
package TestCompat::apache_util;
-# Apache2::Util compat layer tests
+# Apache::Util compat layer tests
# these tests are all run and validated on the server side.
@@ -11,7 +11,7 @@
use Apache::Test;
use Apache2::compat ();
-use Apache2::Constants qw(OK);
+use Apache::Constants qw(OK);
my %string_size = (
'-1' => " -",
@@ -52,13 +52,13 @@
(my $esc_uri = $uri) =~ s/ /\%20/g;
my $uri2 = $uri;
- $uri = Apache2::Util::escape_uri($uri);
- $uri2 = Apache2::Util::escape_path($uri2, $r->pool);
+ $uri = Apache::Util::escape_uri($uri);
+ $uri2 = Apache::Util::escape_path($uri2, $r->pool);
- ok t_cmp($uri, $esc_uri, "Apache2::Util::escape_uri");
- ok t_cmp($uri2, $esc_uri, "Apache2::Util::escape_path");
+ ok t_cmp($uri, $esc_uri, "Apache::Util::escape_uri");
+ ok t_cmp($uri2, $esc_uri, "Apache::Util::escape_path");
- ok t_cmp(Apache2::Util::unescape_uri($uri2),
+ ok t_cmp(Apache::Util::unescape_uri($uri2),
Apache2::URI::unescape_url($uri),
"Apache2::URI::unescape_uri vs Apache::Util::unescape_uri");
@@ -76,15 +76,15 @@
# ht_time(), parsedate()
my $time = time;
- Apache2::compat::override_mp2_api('Apache::Util::ht_time');
+ Apache2::compat::override_mp2_api('Apache2::Util::ht_time');
my $fmtdate = Apache2::Util::ht_time($time);
- Apache2::compat::restore_mp2_api('Apache::Util::ht_time');
+ Apache2::compat::restore_mp2_api('Apache2::Util::ht_time');
- ok t_cmp($fmtdate, $fmtdate, "Apache2::Util::ht_time");
+ ok t_cmp($fmtdate, $fmtdate, "Apache::Util::ht_time");
if ($parse_time_ok) {
- my $ptime = Apache2::Util::parsedate($fmtdate);
- ok t_cmp($ptime, $time, "Apache2::Util::parsedate");
+ my $ptime = Apache::Util::parsedate($fmtdate);
+ ok t_cmp($ptime, $time, "Apache::Util::parsedate");
}
if ($crypt_ok) {
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_authen.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_authen.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_authen.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_authen.pm Mon Mar 7 21:16:47 2005
@@ -4,7 +4,7 @@
# $r->connection->auth_type
# $r->connection->user
# both records don't exist in 2.0 conn_rec and therefore require
-# 'PerlOptions +GlobalRequest' to retrieve those via Apache->request
+# 'PerlOptions +GlobalRequest' to retrieve those via Apache2->request
use strict;
use warnings FATAL => 'all';
@@ -13,7 +13,7 @@
use Apache::Test;
use Apache2::compat ();
-use Apache2::Constants qw(OK REMOTE_HOST);
+use Apache::Constants qw(OK REMOTE_HOST);
sub handler {
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_rec.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_rec.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_rec.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/conn_rec.pm Mon Mar 7 21:16:47 2005
@@ -20,16 +20,16 @@
plan $r, tests => 4;
- Apache2::compat::override_mp2_api('Apache::Connection::local_addr');
+ Apache2::compat::override_mp2_api('Apache2::Connection::local_addr');
my ($local_port, $local_addr) = sockaddr_in($c->local_addr);
- Apache2::compat::restore_mp2_api('Apache::Connection::local_addr');
+ Apache2::compat::restore_mp2_api('Apache2::Connection::local_addr');
t_debug inet_ntoa($local_addr) . " :$local_port";
ok $local_port;
ok inet_ntoa($local_addr);
- Apache2::compat::override_mp2_api('Apache::Connection::remote_addr');
+ Apache2::compat::override_mp2_api('Apache2::Connection::remote_addr');
my ($remote_port, $remote_addr) = sockaddr_in($c->remote_addr);
- Apache2::compat::restore_mp2_api('Apache::Connection::remote_addr');
+ Apache2::compat::restore_mp2_api('Apache2::Connection::remote_addr');
t_debug inet_ntoa($remote_addr) . " :$remote_port";
ok $remote_port;
ok inet_ntoa($remote_addr);
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request.pm Mon Mar 7 21:16:47 2005
@@ -15,7 +15,7 @@
use File::Spec::Functions qw(catfile);
use Apache2::compat ();
-use Apache2::Constants qw(OK REMOTE_HOST);
+use Apache::Constants qw(OK REMOTE_HOST);
sub handler {
my $r = shift;
@@ -78,7 +78,7 @@
# $r->filename
{
- Apache2::compat::override_mp2_api('Apache::RequestRec::filename');
+ Apache2::compat::override_mp2_api('Apache2::RequestRec::filename');
my $orig = $r->filename;
my $new = catfile Apache::Test::vars("serverroot"),
"conf", "httpd.conf";
@@ -94,12 +94,12 @@
# restore the real 2.0 filename() method, now that we are done
# with the compat one
- Apache2::compat::restore_mp2_api('Apache::RequestRec::filename');
+ Apache2::compat::restore_mp2_api('Apache2::RequestRec::filename');
}
# $r->notes
{
- Apache2::compat::override_mp2_api('Apache::RequestRec::notes');
+ Apache2::compat::override_mp2_api('Apache2::RequestRec::notes');
my $key = 'notes-test';
# get/set scalar context
@@ -127,7 +127,7 @@
# restore the real 2.0 notes() method, now that we are done
# with the compat one
- Apache2::compat::restore_mp2_api('Apache::RequestRec::notes');
+ Apache2::compat::restore_mp2_api('Apache2::RequestRec::notes');
}
# get_remote_host()
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request_body.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request_body.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request_body.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestCompat/request_body.pm Mon Mar 7 21:16:47 2005
@@ -9,7 +9,7 @@
use Apache::Test ();
use Apache2::compat ();
-use Apache2::Constants qw(OK M_POST DECLINED);
+use Apache::Constants qw(OK M_POST DECLINED);
use subs qw(ok debug);
my $gr;
@@ -28,7 +28,7 @@
%data = $r->content;
}
else {
- %data = $r->Apache2::args;
+ %data = $r->Apache::args;
}
return DECLINED unless exists $data{test};
Modified: perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlloadmodule3.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlloadmodule3.pm?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlloadmodule3.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/response/TestDirective/perlloadmodule3.pm Mon Mar 7 21:16:47 2005
@@ -103,7 +103,7 @@
my $srv_cfg = get_config($s);
if ($s->is_virtual) {
- $secs{"1: Main Server"} = get_config(Apache->server);
+ $secs{"1: Main Server"} = get_config(Apache2->server);
$secs{"2: Virtual Host"} = $srv_cfg;
$secs{"3: Location"} = $dir_cfg;
}
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=156502&r2=156503
==============================================================================
--- 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 21:16:47 2005
@@ -19,7 +19,7 @@
$r->content_type('text/plain');
# PerlOptions -GlobalRequest is in effect
- eval { my $gr = Apache->request; };
+ eval { my $gr = Apache2->request; };
ok t_cmp($@,
qr/\$r object is not available/,
"unavailable global $r object");
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=156502&r2=156503
==============================================================================
--- 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 21:16:47 2005
@@ -137,7 +137,7 @@
{
# base server test
- my $bs = Apache->server;
+ my $bs = Apache2->server;
ok t_cmp(($bs && ref($bs)),
'Apache2::ServerRec',
"base server's object retrieval");
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=156502&r2=156503
==============================================================================
--- 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 21:16:47 2005
@@ -93,8 +93,8 @@
# now close it completely and restore it, without using any dupped
# filehandle
close STDOUT;
- open STDOUT, ">:Apache", $r
- or die "can't open STDOUT via :Apache layer : $!";
+ open STDOUT, ">:Apache2", $r
+ or die "can't open STDOUT via :Apache2 layer : $!";
print "next you reincarnate...";
}
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=156502&r2=156503
==============================================================================
--- 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 21:16:47 2005
@@ -27,7 +27,7 @@
ok t_cmp($@, qr/read-only/, "\${^TAINT} is read-only");
if ($build->{MP_COMPAT_1X}) {
- ok t_cmp($Apache2::__T, 1, "\$Apache::__T");
+ ok t_cmp($Apache2::__T, 1, "\$Apache2::__T");
eval { $Apache2::__T = 0 };
ok t_cmp($@, qr/read-only/, "\$Apache2::__T is read-only");
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=156502&r2=156503
==============================================================================
--- 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 21:16:47 2005
@@ -30,6 +30,6 @@
__END__
PerlModule Apache2::Reload
-PerlInitHandler Apache::TestHandler::same_interp_fixup Apache::Reload
+PerlInitHandler Apache::TestHandler::same_interp_fixup Apache2::Reload
PerlSetVar ReloadDebug Off
PerlSetVar ReloadAll Off
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=156502&r2=156503
==============================================================================
--- 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 21:16:47 2005
@@ -54,11 +54,11 @@
}
### object-less logging
- # set Apache->request($r) instead of using
+ # set Apache2->request($r) instead of using
# PerlOptions +GlobalRequest
# in order to make sure that the above tests work fine,
# w/o having the global request set
- Apache->request($r);
+ Apache2->request($r);
for my $m (@methods2) {
eval "$m(q[$m])";
ok t_cmp $logdiff->diff, qr/\Q$m/, $m;
Modified: perl/modperl/branches/apache2-rename-unstable/t/vhost/config.t
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/vhost/config.t?view=diff&r1=156502&r2=156503
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/vhost/config.t (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/vhost/config.t Mon Mar 7 21:16:47 2005
@@ -1,5 +1,5 @@
# the handler is configured in modperl_extra.pl via
-# Apache->server->add_config
+# Apache2->server->add_config
use Apache::Test;
use Apache::TestUtil;
Re: svn commit: r156503 - in perl/modperl/branches/apache2-rename-unstable/t:
apache/ apache2/ conf/ filter/TestFilter/ htdocs/vhost/ response/TestAPI/
response/TestApache/ response/TestApache2/ respo
Posted by Randy Kobes <ra...@theoryx5.uwinnipeg.ca>.
On Tue, 8 Mar 2005, Geoffrey Young wrote:
> some other thoughts I've had
>
> - Apache2::OK seems odd.
>
> - ditto with Apache2->server.
>
> in both these cases Apache.pm is a virtual package with no
> corresponding real file, so I'm not sure that we need to
> use Apache2. except that it would be consistent with all
> the other Apache2 foo. but Apache2::OK seems really,
> really strange to me.
>
> in general, as we moved away from using the Apache::
> namespace at all (like favoring
> Apache::ServerUtil::server_root_relative) it has been
> unclear on what to do with things like the above.
>
> so, thoughts at this point? anyone :)
Apache2::OK seems a bit strange to me as well. However, I
like the clean separation of the mp2 Apache2::* stuff from
the mp1/Apache-Test Apache::* stuff; I think it will make
migration easier.
--
best regards,
randy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: svn commit: r156503 -
in perl/modperl/branches/apache2-rename-unstable/t: apache/ apache2/
conf/ filter/TestFilter/ htdocs/vhost/ response/TestAPI/
response/TestApache/ response/TestApache2/ response/TestCompat/
response/TestDirective/ response/TestError/ response/TestModperl/
response/TestModules/ response/TestVhost/ vhost/
Posted by Perrin Harkins <pe...@elem.com>.
On Tue, 2005-03-08 at 13:44 -0500, Geoffrey Young wrote:
> personally, Apache2::Const::OK may be more consistent but seems like quite a
> lot to type.
I always prefer more typing over confusing magic. My reservation would
be existing code, but I guess people have to change that anyway.
- Perrin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: svn commit: r156503 - in perl/modperl/branches/apache2-rename-unstable/t:
apache/ apache2/ conf/ filter/TestFilter/ htdocs/vhost/ response/TestAPI/
response/TestApache/ response/TestApache2/ response/TestCompat/ response/TestDirective/
response/TestError/ response/TestModperl/ response/TestModules/ response/TestVhost/
vhost/
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
Perrin Harkins wrote:
> On Tue, 2005-03-08 at 10:33 -0500, Geoffrey Young wrote:
>
>>some other thoughts I've had
>>
>> - Apache2::OK seems odd.
>>
>> - ditto with Apache2->server.
>>
>>in both these cases Apache.pm is a virtual package with no corresponding
>>real file, so I'm not sure that we need to use Apache2. except that it
>>would be consistent with all the other Apache2 foo. but Apache2::OK seems
>>really, really strange to me.
>
>
> It doesn't seem strange to me. This is Apache2, and OK is a constant it
> provides.
ok.
>
> Dumb question: Why isn't it Apache2::Const::OK?
hmm...
well, I think it evolved somewhat like this...
in mp1 we had OK, but it was the same symbol duplicated in each package
which is wasteful
mp2 reduced the waste by precompiling constants into a single namespace
(leaving the old OK as an option, though). Apache:: probably seemed as good
as anything since it was both short and had precident - at the time we had
quite a few other things in the Apache:: namespace.
currently in mp2 we've shifted away from Apache:: as a namespace, in favor
of things living in real packages. the exceptions to this are the constants
and a handful of class methods like Apache->request and Apache->server.
with the migration away from Apache:: we didn't know exactly what do to with
these outliers, so we left them as is.
anyway, that's what I can recall off the top of my head.
personally, Apache2::Const::OK may be more consistent but seems like quite a
lot to type. so, I think I'm ok with just keeping Apache2::OK over making
it longer, but I don't feel strongly about it.
?
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: svn commit: r156503 - in
perl/modperl/branches/apache2-rename-unstable/t: apache/ apache2/ conf/
filter/TestFilter/ htdocs/vhost/ response/TestAPI/ response/TestApache/
response/TestApache2/ response/TestCompat/ response/TestDirective/
response/TestError/ response/TestModperl/ response/TestModules/
response/TestVhost/ vhost/
Posted by Perrin Harkins <pe...@elem.com>.
On Tue, 2005-03-08 at 10:33 -0500, Geoffrey Young wrote:
> some other thoughts I've had
>
> - Apache2::OK seems odd.
>
> - ditto with Apache2->server.
>
> in both these cases Apache.pm is a virtual package with no corresponding
> real file, so I'm not sure that we need to use Apache2. except that it
> would be consistent with all the other Apache2 foo. but Apache2::OK seems
> really, really strange to me.
It doesn't seem strange to me. This is Apache2, and OK is a constant it
provides.
Dumb question: Why isn't it Apache2::Const::OK?
- Perrin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: svn commit: r156503 - in perl/modperl/branches/apache2-rename-unstable/t:
apache/ apache2/ conf/ filter/TestFilter/ htdocs/vhost/ response/TestAPI/
response/TestApache/ response/TestApache2/ response/TestCompat/ response/TestDirective/
response/TestError/ response/TestModperl/ response/TestModules/ response/TestVhost/
vhost/
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
joes@apache.org wrote:
> Author: joes
> Date: Mon Mar 7 21:16:47 2005
> New Revision: 156503
>
> URL: http://svn.apache.org/viewcvs?view=rev&rev=156503
> Log:
> Move t/apache to t/apache2. Include temporary
> workaround for CGI.pm's use of original Apache:: API.
actually, t/apache was supposed to represent exercises of the apache API
that wasn't really mod_perl specific but that should warn us when something
on the API level has changed that might affect users. see, for example,
t/apache/content_length_handler.t
so, I'm not so sure that the move to t/apache2 is warranted.
some other thoughts I've had
- Apache2::OK seems odd.
- ditto with Apache2->server.
in both these cases Apache.pm is a virtual package with no corresponding
real file, so I'm not sure that we need to use Apache2. except that it
would be consistent with all the other Apache2 foo. but Apache2::OK seems
really, really strange to me.
in general, as we moved away from using the Apache:: namespace at all (like
favoring Apache::ServerUtil::server_root_relative) it has been unclear on
what to do with things like the above.
so, thoughts at this point? anyone :)
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org