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 ge...@apache.org on 2005/04/04 22:41:20 UTC
svn commit: r160097 [3/3] - in perl/modperl/trunk: ./
ModPerl-Registry/lib/ModPerl/ ModPerl-Registry/t/cgi-bin/ lib/Apache2/
src/modules/perl/ t/apache/ t/api/ t/conf/ t/filter/TestFilter/
t/hooks/TestHooks/ t/lib/TestCommon/ t/lib/TestExit/ t/modperl/
t/preconnection/TestPreConnection/ t/protocol/TestProtocol/
t/response/TestAPI/ t/response/TestAPR/ t/response/TestApache/
t/response/TestCompat/ t/response/TestDirective/ t/response/TestError/
t/response/TestModperl/ t/response/TestModules/ t/response/TestPerl/
t/response/TestUser/ t/response/TestVhost/
Modified: perl/modperl/trunk/t/response/TestModperl/request_rec_perlio_api.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/request_rec_perlio_api.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/request_rec_perlio_api.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/request_rec_perlio_api.pm Mon Apr 4 13:40:20 2005
@@ -20,7 +20,7 @@
$r->args eq 'STDIN' ? test_STDIN($r) : test_STDOUT($r);
- return Apache2::OK;
+ return Apache2::Const::OK;
}
sub test_STDIN {
Modified: perl/modperl/trunk/t/response/TestModperl/request_rec_tie_api.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/request_rec_tie_api.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/request_rec_tie_api.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/request_rec_tie_api.pm Mon Apr 4 13:40:20 2005
@@ -61,7 +61,7 @@
unlink $file;
}
- return Apache2::OK;
+ return Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModperl/sameinterp.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/sameinterp.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/sameinterp.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/sameinterp.pm Mon Apr 4 13:40:20 2005
@@ -18,7 +18,7 @@
$value = Apache::TestHandler::same_interp_counter();
$r->puts($value);
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModperl/setauth.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/setauth.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/setauth.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/setauth.pm Mon Apr 4 13:40:20 2005
@@ -22,7 +22,7 @@
ok t_cmp($r->auth_type(), 'Basic', 'default auth_type');
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModperl/setupenv.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/setupenv.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/setupenv.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/setupenv.pm Mon Apr 4 13:40:20 2005
@@ -21,7 +21,7 @@
# $requests locations with 7 tests each
plan $r, tests => $requests * 7;
- return Apache2::OK;
+ return Apache2::Const::OK;
}
sub env {
@@ -61,7 +61,7 @@
'server',
'found per-server PerlSetEnv entry in %ENV');
- return Apache2::OK;
+ return Apache2::Const::OK;
}
sub noenv {
@@ -101,7 +101,7 @@
'server',
'found per-server PerlSetEnv entry in %ENV');
- return Apache2::OK;
+ return Apache2::Const::OK;
}
sub someenv {
@@ -142,21 +142,21 @@
'server',
'found per-server PerlSetEnv entry in %ENV');
- return Apache2::OK;
+ return Apache2::Const::OK;
}
sub subenv_void {
shift->subprocess_env;
- return Apache2::OK;
+ return Apache2::Const::OK;
}
sub subenv_one {
shift->subprocess_env->set(SRV_SUBPROCESS => 'server');
- return Apache2::OK;
+ return Apache2::Const::OK;
}
sub subenv_two {
@@ -167,7 +167,7 @@
$r->subprocess_env->set(DIR_SUBPROCESS => $value);
- return Apache2::OK;
+ return Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModperl/setupenv2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/setupenv2.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/setupenv2.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/setupenv2.pm Mon Apr 4 13:40:20 2005
@@ -18,8 +18,8 @@
{
name => 'MyEnvRegister',
func => __PACKAGE__ . '::MyEnvRegister',
- req_override => Apache2::OR_ALL,
- args_how => Apache2::NO_ARGS,
+ req_override => Apache2::Const::OR_ALL,
+ args_how => Apache2::Const::NO_ARGS,
errmsg => 'cannot fail :)',
},
);
@@ -70,7 +70,7 @@
die "no such case";
}
- return Apache2::OK;
+ return Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModperl/status.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/status.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/status.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/status.pm Mon Apr 4 13:40:20 2005
@@ -14,7 +14,7 @@
my $rc = shift->args;
if ($rc eq 'die' ||
- $rc eq Apache2::DECLINED ||
+ $rc eq Apache2::Const::DECLINED ||
$rc =~ m/foo/) {
t_server_log_error_is_expected();
}
Modified: perl/modperl/trunk/t/response/TestModperl/subenv.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/subenv.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/subenv.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/subenv.pm Mon Apr 4 13:40:20 2005
@@ -90,7 +90,7 @@
ok ! $ENV{$key}; # still shouldn't affect %ENV
}
- Apache2::OK;
+ Apache2::Const::OK;
}
sub ok_true {
Modified: perl/modperl/trunk/t/response/TestModperl/taint.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/taint.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/taint.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/taint.pm Mon Apr 4 13:40:20 2005
@@ -33,7 +33,7 @@
ok t_cmp($@, qr/read-only/, "\$Apache2::__T is read-only");
}
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModperl/util.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModperl/util.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModperl/util.pm (original)
+++ perl/modperl/trunk/t/response/TestModperl/util.pm Mon Apr 4 13:40:20 2005
@@ -20,7 +20,7 @@
ok t_cmp ModPerl::Util::current_perl_id(), qr/0x\w+/,
"perl interpreter id";
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModules/cgi.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModules/cgi.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModules/cgi.pm (original)
+++ perl/modperl/trunk/t/response/TestModules/cgi.pm Mon Apr 4 13:40:20 2005
@@ -48,7 +48,7 @@
print "no param or upload data\n";
}
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModules/cgi2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModules/cgi2.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModules/cgi2.pm (original)
+++ perl/modperl/trunk/t/response/TestModules/cgi2.pm Mon Apr 4 13:40:20 2005
@@ -51,7 +51,7 @@
$r->print("no param or upload data\n");
}
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModules/cgipost.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModules/cgipost.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModules/cgipost.pm (original)
+++ perl/modperl/trunk/t/response/TestModules/cgipost.pm Mon Apr 4 13:40:20 2005
@@ -16,7 +16,7 @@
print join ":", map { $cgi->param($_) } $cgi->param;
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModules/cgipost2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModules/cgipost2.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModules/cgipost2.pm (original)
+++ perl/modperl/trunk/t/response/TestModules/cgipost2.pm Mon Apr 4 13:40:20 2005
@@ -19,7 +19,7 @@
$r->print(join ":", map { $cgi->param($_) } $cgi->param);
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModules/cgiupload.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModules/cgiupload.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModules/cgiupload.pm (original)
+++ perl/modperl/trunk/t/response/TestModules/cgiupload.pm Mon Apr 4 13:40:20 2005
@@ -19,7 +19,7 @@
print;
}
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModules/cgiupload2.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModules/cgiupload2.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModules/cgiupload2.pm (original)
+++ perl/modperl/trunk/t/response/TestModules/cgiupload2.pm Mon Apr 4 13:40:20 2005
@@ -21,7 +21,7 @@
my $file = $cgi->param('filename');
$r->print(<$file>);
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModules/include_subreq.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModules/include_subreq.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModules/include_subreq.pm (original)
+++ perl/modperl/trunk/t/response/TestModules/include_subreq.pm Mon Apr 4 13:40:20 2005
@@ -54,7 +54,7 @@
die "something is wrong, didn't get path_info";
}
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModules/proxy.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModules/proxy.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModules/proxy.pm (original)
+++ perl/modperl/trunk/t/response/TestModules/proxy.pm Mon Apr 4 13:40:20 2005
@@ -16,8 +16,8 @@
sub proxy {
my $r = shift;
- return Apache2::DECLINED if $r->proxyreq;
- return Apache2::DECLINED unless $r->uri eq '/TestModules__proxy';
+ return Apache2::Const::DECLINED if $r->proxyreq;
+ return Apache2::Const::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 Apache2::OK;
+ return Apache2::Const::OK;
}
sub response {
@@ -37,7 +37,7 @@
$r->content_type('text/plain');
$r->print("ok");
- return Apache2::OK;
+ return Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestModules/reload.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestModules/reload.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestModules/reload.pm (original)
+++ perl/modperl/trunk/t/response/TestModules/reload.pm Mon Apr 4 13:40:20 2005
@@ -16,14 +16,14 @@
Apache2::Reload->unregister_module($package);
ModPerl::Util::unload_package($package);
$r->print("unregistered OK");
- return Apache2::OK;
+ return Apache2::Const::OK;
}
eval "use $package";
Apache2::Reload::Test::run($r);
- return Apache2::OK;
+ return Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestPerl/api.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestPerl/api.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestPerl/api.pm (original)
+++ perl/modperl/trunk/t/response/TestPerl/api.pm Mon Apr 4 13:40:20 2005
@@ -47,7 +47,7 @@
ok $ppid != $$;
}
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestPerl/hash_attack.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestPerl/hash_attack.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestPerl/hash_attack.pm (original)
+++ perl/modperl/trunk/t/response/TestPerl/hash_attack.pm Mon Apr 4 13:40:20 2005
@@ -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 Apache2::OK; }];
+ eval qq[sub fixup2 { return Apache2::Const::OK; }];
$r->push_handlers(PerlFixupHandler => \&fixup2);
- return Apache2::DECLINED;
+ return Apache2::Const::DECLINED;
}
-sub fixup { return Apache2::OK; }
+sub fixup { return Apache2::Const::OK; }
sub handler {
my $r = shift;
$r->print("ok");
- return Apache2::OK;
+ return Apache2::Const::OK;
}
sub attack {
Modified: perl/modperl/trunk/t/response/TestPerl/ithreads.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestPerl/ithreads.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestPerl/ithreads.pm (original)
+++ perl/modperl/trunk/t/response/TestPerl/ithreads.pm Mon Apr 4 13:40:20 2005
@@ -71,7 +71,7 @@
ok t_cmp($counter_priv, 2**10, "private counter");
}
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestPerl/ithreads_eval.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestPerl/ithreads_eval.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestPerl/ithreads_eval.pm (original)
+++ perl/modperl/trunk/t/response/TestPerl/ithreads_eval.pm Mon Apr 4 13:40:20 2005
@@ -44,7 +44,7 @@
ok 1;
- return Apache2::OK;
+ return Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestPerl/signals.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestPerl/signals.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestPerl/signals.pm (original)
+++ perl/modperl/trunk/t/response/TestPerl/signals.pm Mon Apr 4 13:40:20 2005
@@ -70,7 +70,7 @@
skip "POSIX::sigaction doesn't work under 5.6.x", 0;
}
- return Apache2::OK;
+ return Apache2::Const::OK;
}
sub run_for_5_sec {
Modified: perl/modperl/trunk/t/response/TestUser/rewrite.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestUser/rewrite.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestUser/rewrite.pm (original)
+++ perl/modperl/trunk/t/response/TestUser/rewrite.pm Mon Apr 4 13:40:20 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 Apache2::DECLINED from the trans
+# an alternative solution is to return Apache2::Const::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)
@@ -30,21 +30,21 @@
sub trans {
my $r = shift;
- return Apache2::DECLINED unless $r->uri eq '/TestUser__rewrite';
+ return Apache2::Const::DECLINED unless $r->uri eq '/TestUser__rewrite';
$r->uri($uri_real);
$r->args($args_real);
- return Apache2::OK;
+ return Apache2::Const::OK;
}
sub map2storage {
my $r = shift;
- return Apache2::DECLINED unless $r->uri eq $uri_real;
+ return Apache2::Const::DECLINED unless $r->uri eq $uri_real;
# skip ap_directory_walk stat() calls
- return Apache2::OK;
+ return Apache2::Const::OK;
}
sub response {
@@ -56,7 +56,7 @@
ok t_cmp($args, $args_real, "args");
- return Apache2::OK;
+ return Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestVhost/config.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestVhost/config.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestVhost/config.pm (original)
+++ perl/modperl/trunk/t/response/TestVhost/config.pm Mon Apr 4 13:40:20 2005
@@ -37,7 +37,7 @@
ok t_cmp($restart_count, 2, "PerlPostConfigRequire");
}
- Apache2::OK;
+ Apache2::Const::OK;
}
1;
Modified: perl/modperl/trunk/t/response/TestVhost/log.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestVhost/log.pm?view=diff&r1=160096&r2=160097
==============================================================================
--- perl/modperl/trunk/t/response/TestVhost/log.pm (original)
+++ perl/modperl/trunk/t/response/TestVhost/log.pm Mon Apr 4 13:40:20 2005
@@ -79,7 +79,7 @@
# die logs into the vhost log just fine
#die "horrible death!";
- Apache2::OK;
+ Apache2::Const::OK;
}
1;